From patchwork Mon Oct 26 14:56:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 36919 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CFC3FB7BB4 for ; Tue, 27 Oct 2009 02:00:45 +1100 (EST) Received: from localhost ([127.0.0.1]:37327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N2R3r-0000Xl-7Y for incoming@patchwork.ozlabs.org; Mon, 26 Oct 2009 11:00:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N2R0K-00083Q-PJ for qemu-devel@nongnu.org; Mon, 26 Oct 2009 10:57:04 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N2R0F-000825-OY for qemu-devel@nongnu.org; Mon, 26 Oct 2009 10:57:03 -0400 Received: from [199.232.76.173] (port=54447 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N2R0F-00081l-Bq for qemu-devel@nongnu.org; Mon, 26 Oct 2009 10:56:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23699) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N2R0D-0007uv-Ge for qemu-devel@nongnu.org; Mon, 26 Oct 2009 10:56:58 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9QEut4a019889 for ; Mon, 26 Oct 2009 10:56:56 -0400 Received: from zweiblum.home.kraxel.org (vpn1-5-193.ams2.redhat.com [10.36.5.193]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id n9QEurkF015198; Mon, 26 Oct 2009 10:56:54 -0400 Received: by zweiblum.home.kraxel.org (Postfix, from userid 500) id DA4117010C; Mon, 26 Oct 2009 15:56:51 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 26 Oct 2009 15:56:46 +0100 Message-Id: <1256569011-20256-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1256569011-20256-1-git-send-email-kraxel@redhat.com> References: <1256569011-20256-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 2/7] usb-hid: use qdev for -usbdevice X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);