From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y85z2-0004fq-UL for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:38:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y85yz-0002t9-Pf for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:38:04 -0500 Received: from goliath.siemens.de ([192.35.17.28]:55240) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y85yz-0002su-Gb for qemu-devel@nongnu.org; Mon, 05 Jan 2015 06:38:01 -0500 Message-ID: <54AA7791.9060705@siemens.com> Date: Mon, 05 Jan 2015 12:37:53 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1420456961-19631-1-git-send-email-stefanha@redhat.com> In-Reply-To: <1420456961-19631-1-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] vl.c: fix -usb option assertion failure in qemu_opt_get_bool_helper() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: plucinski.mariusz@gmail.com, Tiejun Chen , Marcel Apfelbaum , Peter Maydell On 2015-01-05 12:22, Stefan Hajnoczi wrote: > Commit 49d2e648e8087d154d8bf8b91f27c8e05e79d5a6 ("machine: remove > qemu_machine_opts global list") removed option descriptions from the > -machine QemuOptsList to avoid repeating MachineState's QOM properties. > > This change broke vl.c:usb_enabled() because qemu_opt_get_bool() cannot > be used on QemuOptsList without option descriptions since QemuOpts > doesn't know the type and therefore left an unparsed string value. > > This patch avoids calling qemu_opt_get_bool() to fix the assertion > failure: > > $ qemu-system-x86_64 -usb > qemu_opt_get_bool_helper: Assertion `opt->desc && opt->desc->type == QEMU_OPT_BOOL' failed. > > Test the presence of -usb using qemu_opt_find() but use the > MachineState->usb field instead of qemu_opt_get_bool(). > > Cc: Marcel Apfelbaum > Cc: Tiejun Chen > Signed-off-by: Stefan Hajnoczi > --- > vl.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/vl.c b/vl.c > index bea9656..6e8889c 100644 > --- a/vl.c > +++ b/vl.c > @@ -999,8 +999,11 @@ static int parse_name(QemuOpts *opts, void *opaque) > > bool usb_enabled(bool default_usb) > { > - return qemu_opt_get_bool(qemu_get_machine_opts(), "usb", > - has_defaults && default_usb); > + if (qemu_opt_find(qemu_get_machine_opts(), "usb")) { > + return current_machine->usb; > + } else { > + return has_defaults && default_usb; > + } > } > > #ifndef _WIN32 > That still leaves the other boolean machine options broken. A generic fix would be good. Or revert the original commit until we have one. Jan -- Siemens AG, Corporate Technology, CT RTC ITP SES-DE Corporate Competence Center Embedded Linux