summaryrefslogtreecommitdiff
path: root/sysemu.h
diff options
context:
space:
mode:
authorzhlcindy@gmail.com <zhlcindy@gmail.com>2012-09-02 19:25:28 +0000
committerAlexander Graf <agraf@suse.de>2012-10-29 11:45:54 +0100
commit094b287f0b3b79d1e68df8f3a63cb144ec9cdfb6 (patch)
tree1f3d884968c40a2375be2b3d54a82e11bd25fae2 /sysemu.h
parent59de4f98d14fb84f04181a6f816ef6dd8b82dd79 (diff)
downloadqemu-094b287f0b3b79d1e68df8f3a63cb144ec9cdfb6.tar.gz
Add USB option in machine options
When -usb option is used, global varible usb_enabled is set. And all the plaform will create one USB controller according to this variable. In fact, global varibles make code hard to read. So this patch is to remove global variable usb_enabled and add USB option in machine options. All the plaforms will get USB option value from machine options. USB option of machine options will be set either by: * -usb * -machine type=pseries,usb=on Both these ways can work now. They both set USB option in machine options. In the future, the first way will be removed. Signed-off-by: Li Zhang <zhlcindy@linux.vnet.ibm.com> Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'sysemu.h')
-rw-r--r--sysemu.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysemu.h b/sysemu.h
index 0c39a3ac1a..f72b4ce125 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -116,7 +116,6 @@ extern const char *keyboard_layout;
extern int win2k_install_hack;
extern int alt_grab;
extern int ctrl_grab;
-extern int usb_enabled;
extern int smp_cpus;
extern int max_cpus;
extern int cursor_hide;
@@ -186,4 +185,7 @@ void register_devices(void);
void add_boot_device_path(int32_t bootindex, DeviceState *dev,
const char *suffix);
char *get_boot_devices_list(uint32_t *size);
+
+bool usb_enabled(bool default_usb);
+
#endif