From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td6Yl-0000jb-5C for qemu-devel@nongnu.org; Mon, 26 Nov 2012 16:49:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Td6Yk-0003y5-2u for qemu-devel@nongnu.org; Mon, 26 Nov 2012 16:49:47 -0500 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:52870) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Td6Yj-0003wu-E3 for qemu-devel@nongnu.org; Mon, 26 Nov 2012 16:49:46 -0500 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 27 Nov 2012 03:19:43 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAQLnfkj31916124 for ; Tue, 27 Nov 2012 03:19:41 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAR3JVYb001868 for ; Tue, 27 Nov 2012 14:19:32 +1100 From: Anthony Liguori In-Reply-To: <1353602925-28887-1-git-send-email-peter.maydell@linaro.org> References: <1353602925-28887-1-git-send-email-peter.maydell@linaro.org> Date: Mon, 26 Nov 2012 15:49:33 -0600 Message-ID: <87ip8srq4y.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PATCH for-1.3] vl.c: Fix broken -usb option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: Alexander Graf , Li Zhang , patches@linaro.org Peter Maydell writes: > Commit 094b287f0b accidentally broke the "-usb" command line > option, so it would have no effect if the user had not specified > any machine options at that point. (the return value from > 'qemu_opts_find(qemu_find_opts("machine"), 0);' is NULL if there > are no user specified options, so it is only to be used for > looking up an option, not when trying to set one.) Similarly, > would '-usbdevice' no longer cause USB to default to enabled. > > Fix this regression by using the same style of code for forcing > the usb=on machine option that we use for other aliases such as > '-enable-kvm'. > > Signed-off-by: Peter Maydell > --- > For 1.3 as this is a regression which would presumably cause > breakage for migrations and existing working qemu command lines. > Applied. Thanks. Regards, Anthony Liguori > vl.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/vl.c b/vl.c > index c8e9c78..a3ab384 100644 > --- a/vl.c > +++ b/vl.c > @@ -3273,16 +3273,12 @@ int main(int argc, char **argv, char **envp) > break; > } > case QEMU_OPTION_usb: > - machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); > - if (machine_opts) { > - qemu_opt_set_bool(machine_opts, "usb", true); > - } > + olist = qemu_find_opts("machine"); > + qemu_opts_parse(olist, "usb=on", 0); > break; > case QEMU_OPTION_usbdevice: > - machine_opts = qemu_opts_find(qemu_find_opts("machine"), 0); > - if (machine_opts) { > - qemu_opt_set_bool(machine_opts, "usb", true); > - } > + olist = qemu_find_opts("machine"); > + qemu_opts_parse(olist, "usb=on", 0); > add_device_config(DEV_USB, optarg); > break; > case QEMU_OPTION_device: > -- > 1.7.9.5