[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] vl.c: Fix broken -usb option
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 5/6] vl.c: Fix broken -usb option |
Date: |
Mon, 26 Nov 2012 19:55:56 +0100 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
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:
--
1.6.0.2
- [Qemu-devel] [PULL 1.3 0/6] ppc 1.3 patch queue 2012-11-26, Alexander Graf, 2012/11/26
- [Qemu-devel] [PATCH 3/6] kvm: fix incorrect length in a loop over kvm dirty pages map, Alexander Graf, 2012/11/26
- [Qemu-devel] [PATCH 1/6] hw/ide/macio: Fix segfault caused by NULL DMAContext*, Alexander Graf, 2012/11/26
- [Qemu-devel] [PATCH 6/6] fbdev: fix pixman compile on old pixman, Alexander Graf, 2012/11/26
- [Qemu-devel] [PATCH 4/6] pseries: Fix bug in PCI MSI allocation, Alexander Graf, 2012/11/26
- [Qemu-devel] [PATCH 2/6] PPC: Fix missing TRACE exception, Alexander Graf, 2012/11/26
- [Qemu-devel] [PATCH 5/6] vl.c: Fix broken -usb option,
Alexander Graf <=
- Re: [Qemu-devel] [PULL 1.3 0/6] ppc 1.3 patch queue 2012-11-26, Anthony Liguori, 2012/11/28