From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8Ipd-0008Pk-DC for qemu-devel@nongnu.org; Mon, 05 Jan 2015 20:21:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y8IpZ-000194-Bo for qemu-devel@nongnu.org; Mon, 05 Jan 2015 20:21:13 -0500 Received: from mga09.intel.com ([134.134.136.24]:11098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y8IpZ-00018s-56 for qemu-devel@nongnu.org; Mon, 05 Jan 2015 20:21:09 -0500 Message-ID: <54AB387F.4010208@intel.com> Date: Tue, 06 Jan 2015 09:21:03 +0800 From: "Chen, Tiejun" MIME-Version: 1.0 References: <1420436129-8467-1-git-send-email-tiejun.chen@intel.com> <54AAC62A.2030906@redhat.com> In-Reply-To: <54AAC62A.2030906@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC][PATCH] qemu_opt_get_bool_helper: back finding desc by name just if !opt->desc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , marcel.a@redhat.com, peter.maydell@linaro.org, agraf@suse.de, greg.bellows@linaro.org Cc: qemu-devel@nongnu.org On 2015/1/6 1:13, Eric Blake wrote: > On 01/04/2015 10:35 PM, Tiejun Chen wrote: >> After one commit 49d2e648e808, "machine: remove qemu_machine_opts >> global list", is introduced, QEMU doesn't keep a global list of >> options but set desc lately. Then we can see the following, >> >> $ x86_64-softmmu/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. >> Aborted (core dumped) >> >> So inside qemu_opt_get_bool_helper, we need to call find_desc_by_name() >> to work parse_option_bool() out just in case of !opt->desc. >> >> Signed-off-by: Tiejun Chen >> --- >> 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) { > > Over-parenthesized, and looks like you also introduced a spurious space. > Simpler to just have: > > if (!opt || !opt->desc) { Looks good. > > Also, there are other threads about the same topic. > https://lists.gnu.org/archive/html/qemu-devel/2015-01/msg00130.html Yeah, I already notice that. Thanks Tiejun