From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N1GPX-0007zv-Bq for qemu-devel@nongnu.org; Fri, 23 Oct 2009 05:26:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N1GPS-0007y7-I8 for qemu-devel@nongnu.org; Fri, 23 Oct 2009 05:26:14 -0400 Received: from [199.232.76.173] (port=40161 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N1GPS-0007xp-8f for qemu-devel@nongnu.org; Fri, 23 Oct 2009 05:26:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26214) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N1GPR-0002Ab-Jq for qemu-devel@nongnu.org; Fri, 23 Oct 2009 05:26:09 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9N9Q8WC002400 for ; Fri, 23 Oct 2009 05:26:08 -0400 From: Gerd Hoffmann Date: Fri, 23 Oct 2009 11:26:00 +0200 Message-Id: <1256289963-26430-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1256289963-26430-1-git-send-email-kraxel@redhat.com> References: <1256289963-26430-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/5] usb-hid: use qdev for -usbdevice List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/usb-hid.c | 3 +++ hw/usb-wacom.c | 1 + vl.c | 29 ----------------------------- 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/hw/usb-hid.c b/hw/usb-hid.c index d1cc45e..f4a2a48 100644 --- a/hw/usb-hid.c +++ b/hw/usb-hid.c @@ -882,6 +882,7 @@ static struct USBDeviceInfo hid_info[] = { { .qdev.name = "QEMU USB Tablet", .qdev.alias = "usb-tablet", + .usbdevice_name = "tablet", .qdev.size = sizeof(USBHIDState), .init = usb_tablet_initfn, .handle_packet = usb_generic_handle_packet, @@ -892,6 +893,7 @@ static struct USBDeviceInfo hid_info[] = { },{ .qdev.name = "QEMU USB Mouse", .qdev.alias = "usb-mouse", + .usbdevice_name = "mouse", .qdev.size = sizeof(USBHIDState), .init = usb_mouse_initfn, .handle_packet = usb_generic_handle_packet, @@ -902,6 +904,7 @@ static struct USBDeviceInfo hid_info[] = { },{ .qdev.name = "QEMU USB Keyboard", .qdev.alias = "usb-kbd", + .usbdevice_name = "keyboard", .qdev.size = sizeof(USBHIDState), .init = usb_keyboard_initfn, .handle_packet = usb_generic_handle_packet, diff --git a/hw/usb-wacom.c b/hw/usb-wacom.c index fa97db2..ef61376 100644 --- a/hw/usb-wacom.c +++ b/hw/usb-wacom.c @@ -411,6 +411,7 @@ static int usb_wacom_initfn(USBDevice *dev) static struct USBDeviceInfo wacom_info = { .qdev.name = "QEMU PenPartner Tablet", .qdev.alias = "wacom-tablet", + .usbdevice_name = "wacom-tablet", .qdev.size = sizeof(USBWacomState), .init = usb_wacom_initfn, .handle_packet = usb_generic_handle_packet, diff --git a/vl.c b/vl.c index 30b5306..52ab14f 100644 --- a/vl.c +++ b/vl.c @@ -2533,31 +2533,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; @@ -2567,14 +2546,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); -- 1.6.2.5