From patchwork Mon Nov 26 18:55:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5/6] vl.c: Fix broken -usb option Date: Mon, 26 Nov 2012 08:55:56 -0000 From: Alexander Graf X-Patchwork-Id: 202009 Message-Id: <1353956157-26879-6-git-send-email-agraf@suse.de> To: "qemu-devel@nongnu.org qemu-devel" Cc: Blue Swirl , Peter Maydell , "qemu-ppc@nongnu.org List" , Aurelien Jarno From: Peter Maydell 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 Signed-off-by: Alexander Graf --- vl.c | 12 ++++-------- 1 files 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: