diff mbox

[Bug,1407454] Re: assertion failed when using "-usb" option

Message ID 20150105054817.22315.27766.malone@gac.canonical.com
State New
Headers show

Commit Message

Tiejun Chen Jan. 5, 2015, 5:48 a.m. UTC 
Could you test this?

Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
---
 util/qemu-option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--

Comments

Stefan Hajnoczi Jan. 5, 2015, 10:45 a.m. UTC | #1 
On Mon, Jan 5, 2015 at 5:48 AM, Tiejun Chen <tiejun.chen@intel.com> wrote:
> Could you test this?
>
> Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
> ---
>  util/qemu-option.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/qemu-option.c b/util/qemu-option.c
> index a708241..7cb3601 100644
> --- a/util/qemu-option.c
> +++ b/util/qemu-option.c
> @@ -377,7 +377,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name,
>      }
>
>      opt = qemu_opt_find(opts, name);
> - if (opt == NULL) {
> + if ((opt == NULL) || !opt->desc) {
>          const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
>          if (desc && desc->def_value_str) {
>              parse_option_bool(name, desc->def_value_str, &ret, &error_abort);

This doesn't work because it discards the usb=on|off value that was
set on the command-line.

I will send a fix.

Stefan
diff mbox

Patch

diff --git a/util/qemu-option.c b/util/qemu-option.c
index a708241..7cb3601 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -377,7 +377,7 @@  static bool qemu_opt_get_bool_helper(QemuOpts *opts, const char *name,
     }

     opt = qemu_opt_find(opts, name);
- if (opt == NULL) {
+ if ((opt == NULL) || !opt->desc) {
         const QemuOptDesc *desc = find_desc_by_name(opts->list->desc, name);
         if (desc && desc->def_value_str) {
             parse_option_bool(name, desc->def_value_str, &ret, &error_abort);