From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbZxX-0002m2-Sy for qemu-devel@nongnu.org; Thu, 22 Nov 2012 11:49:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbZxU-0003Ha-1d for qemu-devel@nongnu.org; Thu, 22 Nov 2012 11:49:03 -0500 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:38295 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbZxT-0003Gq-Qa for qemu-devel@nongnu.org; Thu, 22 Nov 2012 11:48:59 -0500 From: Peter Maydell Date: Thu, 22 Nov 2012 16:48:45 +0000 Message-Id: <1353602925-28887-1-git-send-email-peter.maydell@linaro.org> Subject: [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: qemu-devel@nongnu.org Cc: Anthony Liguori , Alexander Graf , Li Zhang , patches@linaro.org 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: -- 1.7.9.5