vl: remove dead code in parse_memory_options()

[PATCH] vl: remove dead code in parse_memory_options()

Posted by Paolo Bonzini 1 year, 8 months ago

mem_str will never be an empty string, because qemu_opt_get_size() fails
if it encounters one:

   $ ./qemu-system-x86_64 -m size=
   qemu-system-x86_64: -m size=: Parameter size expects a non-negative number below 2^64
   Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta-
   and exabytes, respectively.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 softmmu/vl.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/softmmu/vl.c b/softmmu/vl.c
index 45e919de9f..706bd7cff7 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1960,13 +1960,8 @@ static void parse_memory_options(void)
     prop = qdict_new();
 
     if (qemu_opt_get_size(opts, "size", 0) != 0) {
-        mem_str = qemu_opt_get(opts, "size");
-        if (!*mem_str) {
-            error_report("missing 'size' option value");
-            exit(EXIT_FAILURE);
-        }
-
         /* Fix up legacy suffix-less format */
+        mem_str = qemu_opt_get(opts, "size");
         if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) {
             g_autofree char *mib_str = g_strdup_printf("%sM", mem_str);
             qdict_put_str(prop, "size", mib_str);
-- 
2.37.1

Re: [PATCH] vl: remove dead code in parse_memory_options()

Posted by Markus Armbruster 1 year, 8 months ago

Paolo Bonzini <pbonzini@redhat.com> writes:

> mem_str will never be an empty string, because qemu_opt_get_size() fails
> if it encounters one:
>
>    $ ./qemu-system-x86_64 -m size=
>    qemu-system-x86_64: -m size=: Parameter size expects a non-negative number below 2^64
>    Optional suffix k, M, G, T, P or E means kilo-, mega-, giga-, tera-, peta-
>    and exabytes, respectively.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  softmmu/vl.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index 45e919de9f..706bd7cff7 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -1960,13 +1960,8 @@ static void parse_memory_options(void)
>      prop = qdict_new();
>  
>      if (qemu_opt_get_size(opts, "size", 0) != 0) {
> -        mem_str = qemu_opt_get(opts, "size");
> -        if (!*mem_str) {
> -            error_report("missing 'size' option value");
> -            exit(EXIT_FAILURE);
> -        }
> -
>          /* Fix up legacy suffix-less format */
> +        mem_str = qemu_opt_get(opts, "size");
>          if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) {
>              g_autofree char *mib_str = g_strdup_printf("%sM", mem_str);
>              qdict_put_str(prop, "size", mib_str);

Reviewed-by: Markus Armbruster <armbru@redhat.com>