From patchwork Thu Nov 24 12:38:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 127505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 254B81007D7 for ; Fri, 25 Nov 2011 00:29:36 +1100 (EST) Received: from localhost ([::1]:44908 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYaK-0007Q7-HF for incoming@patchwork.ozlabs.org; Thu, 24 Nov 2011 07:39:24 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYZs-0006TW-Pm for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:39:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTYZl-0003KW-N7 for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:38:56 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:53802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYZl-00038H-Ih for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:38:49 -0500 Received: by mail-iy0-f173.google.com with SMTP id k32so3301487iak.4 for ; Thu, 24 Nov 2011 04:38:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Q+roSONAGHpNa/D6NL9MtpHunQ9yaTFQFSsveJpcfYc=; b=Stn2Xy2hpngDPTJvt6N0OSUQmmZ+1AS0amf3DoHcFkCUq12o2cPR3bAUZqV9DNvyKG xh4B79plxokFN8zOAte33ePPVElCAQzUuErXK5RcubdjGVIyVOgYhfmEnqFk6Xl/btez C8gqCDjqIxnztPrTpoNuiYwe5YXItfhGTBM18= Received: by 10.42.168.202 with SMTP id x10mr7085045icy.4.1322138329332; Thu, 24 Nov 2011 04:38:49 -0800 (PST) Received: from localhost.localdomain (93-34-207-114.ip51.fastwebnet.it. [93.34.207.114]) by mx.google.com with ESMTPS id a2sm48637685igj.7.2011.11.24.04.38.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 Nov 2011 04:38:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 24 Nov 2011 13:38:23 +0100 Message-Id: <1322138308-31040-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1322138308-31040-1-git-send-email-pbonzini@redhat.com> References: <1322138308-31040-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.210.173 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 4/9] virtio-9p: remove PCI dependencies from hw/9pfs/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Also move the 9p.h file to 9pfs/virtio-9p-device.h, for consistency with the corresponding .c file. Signed-off-by: Paolo Bonzini --- hw/9pfs/virtio-9p-device.c | 35 +--------------------------------- hw/{9p.h => 9pfs/virtio-9p-device.h} | 4 +- hw/9pfs/virtio-9p.c | 1 - hw/virtio-pci.c | 35 ++++++++++++++++++++++++++++++++++ hw/virtio-pci.h | 1 + hw/virtio.h | 2 +- 6 files changed, 40 insertions(+), 38 deletions(-) rename hw/{9p.h => 9pfs/virtio-9p-device.h} (85%) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index bba4c54..509faa8 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -14,9 +14,9 @@ #include "hw/virtio.h" #include "hw/pc.h" #include "qemu_socket.h" -#include "hw/virtio-pci.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" +#include "virtio-9p-device.h" #include "virtio-9p-xattr.h" #include "virtio-9p-coth.h" @@ -147,41 +147,8 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) return &s->vdev; } -static int virtio_9p_init_pci(PCIDevice *pci_dev) -{ - VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); - VirtIODevice *vdev; - - vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf); - vdev->nvectors = proxy->nvectors; - virtio_init_pci(proxy, vdev); - /* make the actual value visible */ - proxy->nvectors = vdev->nvectors; - return 0; -} - -static PCIDeviceInfo virtio_9p_info = { - .qdev.name = "virtio-9p-pci", - .qdev.size = sizeof(VirtIOPCIProxy), - .init = virtio_9p_init_pci, - .vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET, - .device_id = 0x1009, - .revision = VIRTIO_PCI_ABI_VERSION, - .class_id = 0x2, - .qdev.props = (Property[]) { - DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), - DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), - DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), - DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag), - DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id), - DEFINE_PROP_END_OF_LIST(), - } -}; - static void virtio_9p_register_devices(void) { - pci_qdev_register(&virtio_9p_info); virtio_9p_set_fd_limit(); } diff --git a/hw/9p.h b/hw/9pfs/virtio-9p-device.h similarity index 85% rename from hw/9p.h rename to hw/9pfs/virtio-9p-device.h index d9951d6..65789db 100644 --- a/hw/9p.h +++ b/hw/9pfs/virtio-9p-device.h @@ -11,8 +11,8 @@ * */ -#ifndef QEMU_9P_H -#define QEMU_9P_H +#ifndef QEMU_VIRTIO_9P_DEVICE_H +#define QEMU_VIRTIO_9P_DEVICE_H typedef struct V9fsConf { diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 1b2fc5d..7b786e5 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -17,7 +17,6 @@ #include "hw/virtio.h" #include "hw/pc.h" #include "qemu_socket.h" -#include "hw/virtio-pci.h" #include "virtio-9p.h" #include "fsdev/qemu-fsdev.h" #include "virtio-9p-xattr.h" diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index d5cdc04..78c1790 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -779,6 +779,21 @@ static int virtio_balloon_exit_pci(PCIDevice *pci_dev) return virtio_exit_pci(pci_dev); } +#ifdef CONFIG_LINUX +static int virtio_9p_init_pci(PCIDevice *pci_dev) +{ + VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + VirtIODevice *vdev; + + vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf); + vdev->nvectors = proxy->nvectors; + virtio_init_pci(proxy, vdev); + /* make the actual value visible */ + proxy->nvectors = vdev->nvectors; + return 0; +} +#endif + static PCIDeviceInfo virtio_info[] = { { .qdev.name = "virtio-blk-pci", @@ -855,6 +870,26 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_END_OF_LIST(), }, .qdev.reset = virtio_pci_reset, +#ifdef CONFIG_LINUX + }, { + .qdev.name = "virtio-9p-pci", + .qdev.size = sizeof(VirtIOPCIProxy), + .init = virtio_9p_init_pci, + .vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET, + .device_id = 0x1009, + .revision = VIRTIO_PCI_ABI_VERSION, + .class_id = 0x2, + .qdev.props = (Property[]) { + DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, + VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true), + DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), + DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features), + DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag), + DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id), + DEFINE_PROP_END_OF_LIST(), + }, + .qdev.reset = virtio_pci_reset, +#endif },{ /* end of list */ } diff --git a/hw/virtio-pci.h b/hw/virtio-pci.h index 4126705..7654c84 100644 --- a/hw/virtio-pci.h +++ b/hw/virtio-pci.h @@ -17,6 +17,7 @@ #include "virtio-net.h" #include "virtio-serial.h" +#include "9pfs/virtio-9p-device.h" /* Performance improves when virtqueue kick processing is decoupled from the * vcpu thread using ioeventfd for some devices. */ diff --git a/hw/virtio.h b/hw/virtio.h index 7303b6c..9ed8dfc 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -21,7 +21,7 @@ #include "block.h" #include "event_notifier.h" #ifdef CONFIG_LINUX -#include "9p.h" +#include "9pfs/virtio-9p-device.h" #endif /* from Linux's linux/virtio_config.h */