[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 08/15] virtio-blk: move property declarations to
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 08/15] virtio-blk: move property declarations to header file |
Date: |
Mon, 2 Jan 2012 18:59:19 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/s390-virtio-bus.c | 2 +-
hw/virtio-blk.h | 5 +++++
hw/virtio-pci.c | 3 +--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index cf7cfef..71720b9 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -348,7 +348,7 @@ static VirtIOS390DeviceInfo s390_virtio_blk = {
.qdev.size = sizeof(VirtIOS390Device),
.qdev.props = (Property[]) {
DEFINE_BLOCK_PROPERTIES(VirtIOS390Device, block),
- DEFINE_PROP_STRING("serial", VirtIOS390Device, blk.serial),
+ DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOS390Device, host_features, blk),
DEFINE_PROP_END_OF_LIST(),
},
};
diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index 5f150f8..dd26ae7 100644
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -110,4 +110,9 @@ struct VirtIOBlkConf
#define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \
DEFINE_VIRTIO_COMMON_FEATURES(_state, _field)
#endif
+
+#define DEFINE_VIRTIO_BLK_PROPERTIES(_state, _features_field, _conf_field) \
+ DEFINE_VIRTIO_BLK_FEATURES(_state, _features_field), \
+ DEFINE_PROP_STRING("serial", _state, _conf_field.serial)
+
#endif
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index a24b7fd..a91fc68 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -809,11 +809,10 @@ static PCIDeviceInfo virtio_info[] = {
.qdev.props = (Property[]) {
DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, block),
- DEFINE_PROP_STRING("serial", VirtIOPCIProxy, blk.serial),
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
- DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),
+ DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOPCIProxy, host_features, blk),
DEFINE_PROP_END_OF_LIST(),
},
.qdev.reset = virtio_pci_reset,
--
1.7.7.1
- [Qemu-devel] [PATCH v2 00/15] virtio: device configuration and headers cleanup, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 01/15] virtio-net: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 02/15] virtio-net: move NICConf into virtio_net_conf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 03/15] virtio-serial: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 05/15] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 04/15] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 06/15] virtio-9p: move property declarations to header file, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 07/15] virtio-blk: define VirtIOBlkConf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 08/15] virtio-blk: move property declarations to header file,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 09/15] virtio-blk: move BlockConf into VirtIOBlkConf, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 11/15] virtio-net: move init function to virtio-net.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 12/15] virtio-serial: move init function to virtio-serial.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 13/15] virtio-balloon: move init function to virtio-balloon.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 14/15] virtio-9p: move init function to virtio-9p-device.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 15/15] virtio-blk: move init function to virtio-blk.h, Paolo Bonzini, 2012/01/02
- [Qemu-devel] [PATCH v2 10/15] virtio: move conf fields into an anonymous union, Paolo Bonzini, 2012/01/02