@@ -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
@@ -884,9 +884,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,
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/9pfs/virtio-9p-device.h | 5 +++++ hw/virtio-pci.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-)