From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41742)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Y3iH2-0007WW-Ej
	for qemu-devel@nongnu.org; Wed, 24 Dec 2014 04:30:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Y3iGz-0006bo-9l
	for qemu-devel@nongnu.org; Wed, 24 Dec 2014 04:30:32 -0500
Received: from mail-wg0-x230.google.com ([2a00:1450:400c:c00::230]:38411)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1Y3iGy-0006bH-UW
	for qemu-devel@nongnu.org; Wed, 24 Dec 2014 04:30:29 -0500
Received: by mail-wg0-f48.google.com with SMTP id y19so10874016wgg.21
	for <qemu-devel@nongnu.org>; Wed, 24 Dec 2014 01:30:28 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <549A87B0.7010002@redhat.com>
Date: Wed, 24 Dec 2014 10:30:24 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <5499E8D4.4010903@redhat.com>
In-Reply-To: <5499E8D4.4010903@redhat.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] '-usb' regressed by 49d2e648 ("machine: remove
 qemu_machine_opts global list")
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Laszlo Ersek <lersek@redhat.com>, Marcel Apfelbaum <marcel.a@redhat.com>
Cc: qemu devel list <qemu-devel@nongnu.org>



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);

Paolo