From patchwork Sun Oct 31 11:40:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 69711 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 79153B6F07 for ; Sun, 31 Oct 2010 22:50:21 +1100 (EST) Received: from localhost ([127.0.0.1]:52514 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCWQU-0004sd-Bn for incoming@patchwork.ozlabs.org; Sun, 31 Oct 2010 07:50:18 -0400 Received: from [140.186.70.92] (port=55461 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PCWGr-0007nW-9M for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PCWGn-0008EE-3q for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58197) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PCWGm-0008Dt-OC for qemu-devel@nongnu.org; Sun, 31 Oct 2010 07:40:17 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9VBeCeC003238 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 31 Oct 2010 07:40:13 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id o9VBeAIN001771; Sun, 31 Oct 2010 07:40:11 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id D8DC918D46E; Sun, 31 Oct 2010 13:40:09 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Sun, 31 Oct 2010 13:40:02 +0200 Message-Id: <1288525209-3303-2-git-send-email-gleb@redhat.com> In-Reply-To: <1288525209-3303-1-git-send-email-gleb@redhat.com> References: <1288525209-3303-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCHv2 1/8] Introduce deriver_name field to DeviceInfo structure. 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 Add "deriver_name" to DeviceInfo to use in device path building. In contrast to "name" "driver_name" should refer to functionality device provides instead of particular device model like "name" does. Signed-off-by: Gleb Natapov --- hw/fdc.c | 1 + hw/ide/isa.c | 1 + hw/ide/piix.c | 1 + hw/ide/qdev.c | 1 + hw/isa-bus.c | 1 + hw/piix_pci.c | 2 ++ hw/qdev.h | 6 ++++++ hw/virtio-pci.c | 2 ++ 8 files changed, 15 insertions(+), 0 deletions(-) diff --git a/hw/fdc.c b/hw/fdc.c index c159dcb..b4217a3 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -2040,6 +2040,7 @@ static const VMStateDescription vmstate_isa_fdc ={ static ISADeviceInfo isa_fdc_info = { .init = isabus_fdc_init1, .qdev.name = "isa-fdc", + .qdev.driver_name = "fdc", .qdev.size = sizeof(FDCtrlISABus), .qdev.no_user = 1, .qdev.vmsd = &vmstate_isa_fdc, diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 6b57e0d..489cc99 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -98,6 +98,7 @@ ISADevice *isa_ide_init(int iobase, int iobase2, int isairq, static ISADeviceInfo isa_ide_info = { .qdev.name = "isa-ide", + .qdev.driver_name = "ata", .qdev.size = sizeof(ISAIDEState), .init = isa_ide_initfn, .qdev.reset = isa_ide_reset, diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 07483e8..6206201 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -182,6 +182,7 @@ PCIDevice *pci_piix4_ide_init(PCIBus *bus, DriveInfo **hd_table, int devfn) static PCIDeviceInfo piix_ide_info[] = { { .qdev.name = "piix3-ide", + .qdev.driver_name = "ata", .qdev.size = sizeof(PCIIDEState), .qdev.no_user = 1, .init = pci_piix3_ide_initfn, diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index 0808760..341548e 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -134,6 +134,7 @@ static int ide_drive_initfn(IDEDevice *dev) static IDEDeviceInfo ide_drive_info = { .qdev.name = "ide-drive", + .qdev.driver_name = "ata-disk", .qdev.size = sizeof(IDEDrive), .init = ide_drive_initfn, .qdev.props = (Property[]) { diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4e306de..2c42b80 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -153,6 +153,7 @@ static int isabus_bridge_init(SysBusDevice *dev) static SysBusDeviceInfo isabus_bridge_info = { .init = isabus_bridge_init, .qdev.name = "isabus-bridge", + .qdev.driver_name = "isa", .qdev.size = sizeof(SysBusDevice), .qdev.no_user = 1, }; diff --git a/hw/piix_pci.c b/hw/piix_pci.c index 00060f3..4e5e5df 100644 --- a/hw/piix_pci.c +++ b/hw/piix_pci.c @@ -364,6 +364,7 @@ static PCIDeviceInfo i440fx_info[] = { .config_write = i440fx_write_config, },{ .qdev.name = "PIIX3", + .qdev.driver_name = "pci-isa-bridge", .qdev.desc = "ISA bridge", .qdev.size = sizeof(PIIX3State), .qdev.vmsd = &vmstate_piix3, @@ -377,6 +378,7 @@ static PCIDeviceInfo i440fx_info[] = { static SysBusDeviceInfo i440fx_pcihost_info = { .init = i440fx_pcihost_initfn, .qdev.name = "i440FX-pcihost", + .qdev.driver_name = "pci", .qdev.size = sizeof(I440FXState), .qdev.no_user = 1, }; diff --git a/hw/qdev.h b/hw/qdev.h index 579328a..a9a98f8 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -139,6 +139,7 @@ typedef void (*qdev_resetfn)(DeviceState *dev); struct DeviceInfo { const char *name; + const char *driver_name; const char *alias; const char *desc; size_t size; @@ -288,6 +289,11 @@ void qdev_prop_set_defaults(DeviceState *dev, Property *props); void qdev_prop_register_global_list(GlobalProperty *props); void qdev_prop_set_globals(DeviceState *dev); +static inline const char *qdev_driver_name(DeviceState *dev) +{ + return dev->info->driver_name ? : dev->info->name; +} + /* This is a nasty hack to allow passing a NULL bus to qdev_create. */ extern struct BusInfo system_bus_info; diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 2d78ca6..b67ded6 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -769,6 +769,7 @@ static int virtio_9p_init_pci(PCIDevice *pci_dev) static PCIDeviceInfo virtio_info[] = { { .qdev.name = "virtio-blk-pci", + .qdev.driver_name = "virtio-blk", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_blk_init_pci, .exit = virtio_blk_exit_pci, @@ -782,6 +783,7 @@ static PCIDeviceInfo virtio_info[] = { .qdev.reset = virtio_pci_reset, },{ .qdev.name = "virtio-net-pci", + .qdev.driver_name = "ethernet", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_net_init_pci, .exit = virtio_net_exit_pci,