From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbaDp-0003C5-1n for qemu-devel@nongnu.org; Thu, 22 Nov 2012 12:06:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbaDf-0000oQ-7M for qemu-devel@nongnu.org; Thu, 22 Nov 2012 12:05:52 -0500 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:39466) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbaDe-0000mX-Go for qemu-devel@nongnu.org; Thu, 22 Nov 2012 12:05:42 -0500 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 23 Nov 2012 03:00:14 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAMGsngO4325634 for ; Fri, 23 Nov 2012 03:54:51 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAMH5Uh7009229 for ; Fri, 23 Nov 2012 04:05:30 +1100 Message-ID: <50AE5B56.9070402@linux.vnet.ibm.com> Date: Fri, 23 Nov 2012 01:05:26 +0800 From: Li Zhang MIME-Version: 1.0 References: <1353602925-28887-1-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1353602925-28887-1-git-send-email-peter.maydell@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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 Cc: Alexander Graf , Anthony Liguori , qemu-devel@nongnu.org, patches@linaro.org On 2012年11月23日 00:48, Peter Maydell wrote: > 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. > > 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: Looks good to me. Thanks. -- Li Zhang IBM China Linux Technology Centre