qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com
Subject: [PATCH 2/4] vl: Free accel_list in configure_accelerators
Date: Thu,  9 Jan 2020 13:17:08 +1100	[thread overview]
Message-ID: <20200109021710.1219-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200109021710.1219-1-richard.henderson@linaro.org>

We allocate the list with g_strsplit, so free it too.
This freeing was lost during one of the rearrangements.

Fixes: 6f6e1698a68c
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 vl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vl.c b/vl.c
index be79b03c1a..c9329fe699 100644
--- a/vl.c
+++ b/vl.c
@@ -2748,7 +2748,6 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
 static void configure_accelerators(const char *progname)
 {
     const char *accel;
-    char **accel_list, **tmp;
     bool init_failed = false;
 
     qemu_opts_foreach(qemu_find_opts("icount"),
@@ -2756,6 +2755,8 @@ static void configure_accelerators(const char *progname)
 
     accel = qemu_opt_get(qemu_get_machine_opts(), "accel");
     if (QTAILQ_EMPTY(&qemu_accel_opts.head)) {
+        char **accel_list, **tmp;
+
         if (accel == NULL) {
             /* Select the default accelerator */
             if (!accel_find("tcg") && !accel_find("kvm")) {
@@ -2787,6 +2788,7 @@ static void configure_accelerators(const char *progname)
                 error_report("invalid accelerator %s", *tmp);
             }
         }
+        g_strfreev(accel_list);
     } else {
         if (accel != NULL) {
             error_report("The -accel and \"-machine accel=\" options are incompatible");
-- 
2.20.1



  parent reply	other threads:[~2020-01-09  2:19 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-09  2:17 [PATCH 0/4] vl: Fixes for cleanups to -accel Richard Henderson
2020-01-09  2:17 ` [PATCH 1/4] vl: Remove unused variable in configure_accelerators Richard Henderson
2020-01-09 11:01   ` Alex Bennée
2020-01-09 12:06   ` Aleksandar Markovic
2020-01-09 12:23   ` Philippe Mathieu-Daudé
2020-01-09  2:17 ` Richard Henderson [this message]
2020-01-09  8:18   ` [PATCH 2/4] vl: Free accel_list " Thomas Huth
2020-01-09  8:24     ` Laurent Vivier
2020-01-09 11:59       ` Aleksandar Markovic
2020-01-09 11:04   ` Alex Bennée
2020-01-09  2:17 ` [PATCH 3/4] vl: Remove useless test " Richard Henderson
2020-01-09 11:05   ` Alex Bennée
2020-01-09 12:07   ` Aleksandar Markovic
2020-01-09 12:24   ` Philippe Mathieu-Daudé
2020-01-09  2:17 ` [PATCH 4/4] vl: Only choose enabled accelerators " Richard Henderson
2020-01-09 11:35   ` Alex Bennée
2020-01-09 12:10     ` Aleksandar Markovic
2020-01-09  9:00 ` [PATCH 0/4] vl: Fixes for cleanups to -accel Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200109021710.1219-3-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).