Merge tag 'pull-misc-2022-12-14' of https://repo.or.cz/qemu/armbru into staging

[mirror_qemu.git] / hw / core / machine.c

diff --git a/hw/core/machine.c b/hw/core/machine.c
index c76e402bbfee05657caa3761ece974876fa351d3..644b34cd24d080cb86fee327cc12724c79168011 100644 (file)
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -554,12 +554,11 @@ static void machine_get_mem(Object *obj, Visitor *v, const char *name,
 static void machine_set_mem(Object *obj, Visitor *v, const char *name,
                             void *opaque, Error **errp)
 {
+    ERRP_GUARD();
     MachineState *ms = MACHINE(obj);
     MachineClass *mc = MACHINE_GET_CLASS(obj);
     MemorySizeConfiguration *mem;
 
-    ERRP_GUARD();
-
     if (!visit_type_MemorySizeConfiguration(v, name, &mem, errp)) {
         return;
     }