revert to use of g_free to make future qemu integrations easier (#695)

* revert to use of g_free to make future qemu integrations easier

* bracing

qemu/util/error.c

@@ -67,7 +67,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class,
     msg1 = g_strdup_vprintf(fmt, ap);
     if (os_errno != 0) {
         err->msg = g_strdup_printf("%s: %s", msg1, strerror(os_errno));
-        free(msg1);
+        g_free(msg1);
     } else {
         err->msg = msg1;
     }
@@ -110,8 +110,8 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class,
         char *msg2 = g_win32_error_message(win32_err);
         err->msg = g_strdup_printf("%s: %s (error: %x)", msg1, msg2,
                                    (unsigned)win32_err);
-        free(msg2);
-        free(msg1);
+        g_free(msg2);
+        g_free(msg1);
     } else {
         err->msg = msg1;
     }
@@ -152,8 +152,8 @@ const char *error_get_pretty(Error *err)
 void error_free(Error *err)
 {
     if (err) {
-        free(err->msg);
-        free(err);
+        g_free(err->msg);
+        g_free(err);
     }
 }
 

qemu/util/qemu-option.c

@@ -288,9 +288,9 @@ QemuOpt *qemu_opt_find(QemuOpts *opts, const char *name)
 static void qemu_opt_del(QemuOpt *opt)
 {
     QTAILQ_REMOVE(&opt->opts->head, opt, next);
-    free(opt->name);
-    free(opt->str);
-    free(opt);
+    g_free(opt->name);
+    g_free(opt->str);
+    g_free(opt);
 }
 
 /* qemu_opt_set allows many settings for the same option.
@@ -327,7 +327,7 @@ const char *qemu_opt_get(QemuOpts *opts, const char *name)
 
 /* Get a known option (or its default) and remove it from the list
  * all in one action. Return a malloced string of the option value.
- * Result must be freed by caller with free().
+ * Result must be freed by caller with g_free().
  */
 char *qemu_opt_get_del(QemuOpts *opts, const char *name)
 {
@@ -576,7 +576,7 @@ int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val)
     opt->desc = find_desc_by_name(desc, name);
     if (!opt->desc && !opts_accepts_any(opts)) {
         qerror_report(QERR_INVALID_PARAMETER, name);
-        free(opt);
+        g_free(opt);
         return -1;
     }
 
@@ -598,7 +598,7 @@ int qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val)
     opt->desc = find_desc_by_name(desc, name);
     if (!opt->desc && !opts_accepts_any(opts)) {
         qerror_report(QERR_INVALID_PARAMETER, name);
-        free(opt);
+        g_free(opt);
         return -1;
     }
 
@@ -698,7 +698,7 @@ const char *qemu_opts_id(QemuOpts *opts)
     return opts->id;
 }
 
-/* The id string will be free()d by qemu_opts_del */
+/* The id string will be g_free()d by qemu_opts_del */
 void qemu_opts_set_id(QemuOpts *opts, char *id)
 {
     opts->id = id;
@@ -719,8 +719,8 @@ void qemu_opts_del(QemuOpts *opts)
         qemu_opt_del(opt);
     }
     QTAILQ_REMOVE(&opts->list->head, opts, next);
-    free(opts->id);
-    free(opts);
+    g_free(opts->id);
+    g_free(opts);
 }
 
 void qemu_opts_print(QemuOpts *opts)
@@ -1064,7 +1064,7 @@ static size_t count_opts_list(QemuOptsList *list)
 
 void qemu_opts_free(QemuOptsList *list)
 {
-    free(list);
+    g_free(list);
 }
 
 /* Realloc dst option list and append options from an option list (list)

qemu/util/qemu-thread-win32.c

@@ -277,7 +277,7 @@ static unsigned __stdcall win32_start_routine(void *arg)
 
     if (data->mode == QEMU_THREAD_DETACHED) {
         data->uc->qemu_thread_data = NULL;
-        free(data);
+        g_free(data);
         data = NULL;
     }
     qemu_thread_exit(data->uc, start_routine(thread_arg));
@@ -323,7 +323,7 @@ void *qemu_thread_join(QemuThread *thread)
     ret = data->ret;
     assert(data->mode != QEMU_THREAD_DETACHED);
     DeleteCriticalSection(&data->cs);
-    free(data);
+    g_free(data);
     return ret;
 }