qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PULL 3/6] module: Simplify module_load()
Date: Fri, 18 Jul 2014 15:31:39 +0200	[thread overview]
Message-ID: <1405690302-5393-4-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1405690302-5393-1-git-send-email-pbonzini@redhat.com>

From: Andreas Färber <afaerber@suse.de>

The file path is not used for error reporting, so we can free it
directly after use.

Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 util/module.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/util/module.c b/util/module.c
index 214effb..9fd3030 100644
--- a/util/module.c
+++ b/util/module.c
@@ -202,18 +202,16 @@ static void module_load(module_init_type type)
         for (i = 0; i < ARRAY_SIZE(dirs); i++) {
             fname = g_strdup_printf("%s/%s%s", dirs[i], *mp, HOST_DSOSUF);
             ret = module_load_file(fname);
+            g_free(fname);
+            fname = NULL;
             /* Try loading until loaded a module file */
             if (!ret) {
                 break;
             }
-            g_free(fname);
-            fname = NULL;
         }
         if (ret == -ENOENT) {
             fprintf(stderr, "Can't find module: %s\n", *mp);
         }
-
-        g_free(fname);
     }
 
     for (i = 0; i < ARRAY_SIZE(dirs); i++) {
-- 
1.9.3

  parent reply	other threads:[~2014-07-18 13:32 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-18 13:31 [Qemu-devel] [PULL v2 for-2.1 0/6] target-i386, module, qtest patches for 2014-07-18 Paolo Bonzini
2014-07-18 13:31 ` [Qemu-devel] [PULL 1/6] target-i386: Allow execute from user mode when SMEP is enabled Paolo Bonzini
2014-07-18 13:31 ` [Qemu-devel] [PULL 2/6] qtest: new test for wdt_ib700 Paolo Bonzini
2014-07-18 13:31 ` Paolo Bonzini [this message]
2014-07-18 13:31 ` [Qemu-devel] [PULL 4/6] module: Don't complain when a module is absent Paolo Bonzini
2014-07-18 13:31 ` [Qemu-devel] [PULL 5/6] Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation" Paolo Bonzini
2014-07-18 13:31 ` [Qemu-devel] [PULL 6/6] Revert "kvmclock: Ensure time in migration never goes backward" Paolo Bonzini
2014-07-18 15:58 ` [Qemu-devel] [PULL v2 for-2.1 0/6] target-i386, module, qtest patches for 2014-07-18 Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2014-07-18  9:04 [Qemu-devel] [PULL " Paolo Bonzini
2014-07-18  9:04 ` [Qemu-devel] [PULL 3/6] module: Simplify module_load() 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=1405690302-5393-4-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=afaerber@suse.de \
    --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).