[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] '-usb' regressed by 49d2e648 ("machine: remove qemu_mac
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] '-usb' regressed by 49d2e648 ("machine: remove qemu_machine_opts global list") |
Date: |
Wed, 24 Dec 2014 12:55:13 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 |
On 24/12/2014 12:03, Laszlo Ersek wrote:
> On 12/24/14 10:30, Paolo Bonzini wrote:
>>
>>
>> On 23/12/2014 23:12, Laszlo Ersek wrote:
>>> Apologies if this problem is known. After building qemu at ab0302ee:
>>>
>>> $ qemu-system-x86_64 -usb
>>>
>>> qemu-system-x86_64: util/qemu-option.c:387: qemu_opt_get_bool_helper:
>>> Assertion `opt->desc && opt->desc->type == QEMU_OPT_BOOL' failed.
>>
>> Does this work?
>>
>> diff --git a/util/qemu-option.c b/util/qemu-option.c
>> index a708241..4f1f86a 100644
>> --- a/util/qemu-option.c
>> +++ b/util/qemu-option.c
>> @@ -384,7 +384,7 @@ static bool qemu_opt_get_bool_helper(QemuOpts *opts,
>> const char *name,
>> }
>> return ret;
>> }
>> - assert(opt->desc && opt->desc->type == QEMU_OPT_BOOL);
>> + assert(!opt->desc || opt->desc->type == QEMU_OPT_BOOL);
>> ret = opt->value.boolean;
>> if (del) {
>> qemu_opt_del_all(opts, name);
>> @@ -420,7 +420,7 @@ static uint64_t qemu_opt_get_number_helper(QemuOpts
>> *opts, const char *name,
>> }
>> return ret;
>> }
>> - assert(opt->desc && opt->desc->type == QEMU_OPT_NUMBER);
>> + assert(!opt->desc || opt->desc->type == QEMU_OPT_NUMBER);
>> ret = opt->value.uint;
>> if (del) {
>> qemu_opt_del_all(opts, name);
>> @@ -457,7 +457,7 @@ static uint64_t qemu_opt_get_size_helper(QemuOpts
>> *opts, const char *name,
>> }
>> return ret;
>> }
>> - assert(opt->desc && opt->desc->type == QEMU_OPT_SIZE);
>> + assert(!opt->desc || opt->desc->type == QEMU_OPT_SIZE);
>> ret = opt->value.uint;
>> if (del) {
>> qemu_opt_del_all(opts, name);
>
> Tested-by: Laszlo Ersek <address@hidden>
Hmm, it doesn't work though. parse_option_bool is not called.
Something for new year I guess.
Paolo