From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYZv-0006cX-3x for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:39:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTYZp-0003Kn-7n for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:38:58 -0500 Received: from mail-yx0-f173.google.com ([209.85.213.173]:35031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTYZo-0003Kh-VW for qemu-devel@nongnu.org; Thu, 24 Nov 2011 07:38:53 -0500 Received: by yenq2 with SMTP id q2so2940231yen.4 for ; Thu, 24 Nov 2011 04:38:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 24 Nov 2011 13:38:24 +0100 Message-Id: <1322138308-31040-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1322138308-31040-1-git-send-email-pbonzini@redhat.com> References: <1322138308-31040-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 5/9] virtio-9p: move property declarations to header file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com No s390 change here, since s390 does not (yet?) support virtio-9p. Signed-off-by: Paolo Bonzini --- hw/9pfs/virtio-9p-device.h | 5 +++++ hw/virtio-pci.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/9pfs/virtio-9p-device.h b/hw/9pfs/virtio-9p-device.h index 65789db..7f2a4eb 100644 --- a/hw/9pfs/virtio-9p-device.h +++ b/hw/9pfs/virtio-9p-device.h @@ -21,4 +21,9 @@ typedef struct V9fsConf char *fsdev_id; } V9fsConf; +#define DEFINE_VIRTIO_9P_PROPERTIES(_state, _features_field, _conf_field) \ + DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, _features_field), \ + DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, _conf_field.tag), \ + DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, _conf_field.fsdev_id) + #endif diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 78c1790..f522156 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -883,9 +883,7 @@ static PCIDeviceInfo virtio_info[] = { 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_VIRTIO_9P_PROPERTIES(VirtIOPCIProxy, host_features, fsconf), DEFINE_PROP_END_OF_LIST(), }, .qdev.reset = virtio_pci_reset, -- 1.7.7.1