From 0c59f95a08629140d0cff2ac15b6db7d73148591 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 26 Oct 2009 15:56:46 +0100 Subject: usb-hid: use qdev for -usbdevice Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- vl.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'vl.c') diff --git a/vl.c b/vl.c index a58bc06412..e103e51e0b 100644 --- a/vl.c +++ b/vl.c @@ -2527,31 +2527,10 @@ static void usb_msd_password_cb(void *opaque, int err) dev->info->handle_destroy(dev); } -static struct { - const char *name; - const char *qdev; -} usbdevs[] = { - { - .name = "mouse", - .qdev = "QEMU USB Mouse", - },{ - .name = "tablet", - .qdev = "QEMU USB Tablet", - },{ - .name = "keyboard", - .qdev = "QEMU USB Keyboard", - },{ - .name = "wacom-tablet", - .qdev = "QEMU PenPartner Tablet", - } -}; - static int usb_device_add(const char *devname, int is_hotplug) { const char *p; - USBBus *bus = usb_bus_find(-1 /* any */); USBDevice *dev = NULL; - int i; if (!usb_enabled) return -1; @@ -2561,14 +2540,6 @@ static int usb_device_add(const char *devname, int is_hotplug) if (dev) goto done; - /* simple devices which don't need extra care */ - for (i = 0; i < ARRAY_SIZE(usbdevs); i++) { - if (strcmp(devname, usbdevs[i].name) != 0) - continue; - dev = usb_create_simple(bus, usbdevs[i].qdev); - goto done; - } - /* the other ones */ if (strstart(devname, "host:", &p)) { dev = usb_host_device_open(p); -- cgit v1.2.3