Merge remote-tracking branch 'afaerber/qom-cpu' into staging

[qemu.git] / qapi / opts-visitor.c

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index a59d306e46594abdc4ef7cc0737a20307486a6a8..174bd8bdb085f03a530d8fa8d1cd95dfc27bcd6f 100644 (file)
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -10,10 +10,12 @@
  *
  */
 
-#include "opts-visitor.h"
-#include "qemu-queue.h"
-#include "qemu-option-internal.h"
-#include "qapi-visit-impl.h"
+#include "qemu-common.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/opts-visitor.h"
+#include "qemu/queue.h"
+#include "qemu/option_int.h"
+#include "qapi/visitor-impl.h"
 
 
 struct OptsVisitor
@@ -416,7 +418,7 @@ opts_visitor_cleanup(OptsVisitor *ov)
         g_hash_table_destroy(ov->unprocessed_opts);
     }
     g_free(ov->fake_id_opt);
-    memset(ov, '\0', sizeof *ov);
+    g_free(ov);
 }