9pfs: fix multiple flush for same request

[mirror_qemu.git] / bootdevice.c

diff --git a/bootdevice.c b/bootdevice.c
index dbc0159392bd8c614bd8216a3f4b626c260ec31a..33e3029e40f4017ea6c548fd0d119cc89e497b5e 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -23,10 +23,12 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"
 #include "hw/hw.h"
+#include "hw/qdev-core.h"
 
 typedef struct FWBootEntry FWBootEntry;
 
@@ -300,9 +302,7 @@ static void device_set_bootindex(Object *obj, Visitor *v, const char *name,
     add_boot_device_path(*prop->bootindex, prop->dev, prop->suffix);
 
 out:
-    if (local_err) {
-        error_propagate(errp, local_err);
-    }
+    error_propagate(errp, local_err);
 }
 
 static void property_release_bootindex(Object *obj, const char *name,