[Qemu-devel] [PATCH for-2.1 0/2] Module cleanups

[Qemu-devel] [PATCH for-2.1 0/2] Module cleanups

[Andreas Färber]

Hello,

This mini-series resolves an error message emitted when a module is absent.
It was prompted by a downstream user bug report about the new message.

Proposing this for rc2 as Peter would like to keep the rc3 delta low.

Regards,
Andreas

Andreas Färber (2):
  module: Simplify module_load()
  module: Don't complain when a module is absent

 util/module.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

-- 
1.8.4.5

[Qemu-devel] [PATCH for-2.1 1/2] module: Simplify module_load()

[Andreas Färber]

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

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 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.8.4.5

[Qemu-devel] [PATCH for-2.1 2/2] module: Don't complain when a module is absent

[Andreas Färber]

The current implementation depends on a configure-time generated list of
block modules. When any of them is absent, module_load() emits a warning.

This is suboptimal because extracting code to modules was mainly done to
allow separate packaging of modules with intrusive dependencies. Absence
of optional packages then leads to absence of modules and an error
message, which users may recognize as new and report as error.

Cc: Fam Zheng <famz@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 util/module.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/util/module.c b/util/module.c
index 9fd3030..4bd4a94 100644
--- a/util/module.c
+++ b/util/module.c
@@ -209,9 +209,6 @@ static void module_load(module_init_type type)
                 break;
             }
         }
-        if (ret == -ENOENT) {
-            fprintf(stderr, "Can't find module: %s\n", *mp);
-        }
     }
 
     for (i = 0; i < ARRAY_SIZE(dirs); i++) {
-- 
1.8.4.5

Re: [Qemu-devel] [PATCH for-2.1 0/2] Module cleanups

[Fam Zheng]

On Tue, 07/15 16:04, Andreas Färber wrote:
> Hello,
> 
> This mini-series resolves an error message emitted when a module is absent.
> It was prompted by a downstream user bug report about the new message.
> 
> Proposing this for rc2 as Peter would like to keep the rc3 delta low.
> 
> Regards,
> Andreas
> 
> Andreas Färber (2):
>   module: Simplify module_load()
>   module: Don't complain when a module is absent
> 
>  util/module.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

Both patches look good to me.

Reviewed-by: Fam Zheng <famz@redhat.com>

Re: [Qemu-devel] [PATCH for-2.1 0/2] Module cleanups

[Paolo Bonzini]

Il 15/07/2014 17:39, Fam Zheng ha scritto:
> On Tue, 07/15 16:04, Andreas Färber wrote:
>> Hello,
>>
>> This mini-series resolves an error message emitted when a module is absent.
>> It was prompted by a downstream user bug report about the new message.
>>
>> Proposing this for rc2 as Peter would like to keep the rc3 delta low.
>>
>> Regards,
>> Andreas
>>
>> Andreas Färber (2):
>>   module: Simplify module_load()
>>   module: Don't complain when a module is absent
>>
>>  util/module.c | 9 ++-------
>>  1 file changed, 2 insertions(+), 7 deletions(-)
>
> Both patches look good to me.
>
> Reviewed-by: Fam Zheng <famz@redhat.com>
>

Thanks, queued for -rc3.

Paolo

Re: [Qemu-devel] [PATCH for-2.1 0/2] Module cleanups

[Peter Maydell]

On 15 July 2014 15:04, Andreas Färber <afaerber@suse.de> wrote:
> This mini-series resolves an error message emitted when a module is absent.
> It was prompted by a downstream user bug report about the new message.
>
> Proposing this for rc2 as Peter would like to keep the rc3 delta low.
>
> Regards,
> Andreas
>
> Andreas Färber (2):
>   module: Simplify module_load()
>   module: Don't complain when a module is absent
>
>  util/module.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)

I hadn't realized the changes were this minor; it's
missed the rc2 boat but 9 lines of change are
no problem for rc3.

thanks
-- PMM