virtio: cleanup layout assumptions
v2 cover virtio: cleanup layout assumptions
This patchset helps remove the assumption that vdev must be the 1st member in any virtio device implementation. Other assumptions (made by qdev) can be removed in a similar way separately, this patchset does not do this yet.
We also make it obvious that all of device structure is zero initialized, which devices seem to rely on, by virtue of calling mallocz directly in device code.
Note how code is simplified rather than made more complex.
Changes from v1:
Get rid of VIRTIO_COMMON_INIT macro:
simple function call, no magic now.
Michael S. Tsirkin (5):
virtio: add type safe API
virtio-net: remove layout assumptions
virtio-serial: remove struct layout assumptions
virtio-balloon: remove layout assumptions
virtio-blk: remove layout assumption
hw/virtio-balloon.c | 10 ++++------ hw/virtio-blk.c | 9 ++++----- hw/virtio-net.c | 11 +++++------ hw/virtio-serial-bus.c | 17 ++++++++--------- hw/virtio.c | 7 +++---- hw/virtio.h | 5 +++-- 6 files changed, 27 insertions(+), 32 deletions(-)
PATCH v2 1/5 virtio: add type safe API
This makes virtio_common_init typesafe in a way that will also let us get rid of struct layout assumptions and of zero initialization assumptions.
--- hw/virtio-balloon.c | 6 ++---- hw/virtio-blk.c | 7 +++---- hw/virtio-net.c | 7 +++---- hw/virtio-serial-bus.c | 9 ++++----- hw/virtio.c | 7 +++---- hw/virtio.h | 5 +++-- 6 files changed, 18 insertions(+), 23 deletions(-)
hw/virtio-balloon.c +2 -4
@@ -279,11 +279,9 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id)VirtIODevice *virtio_balloon_init (DeviceState *dev) { -VirtIOBalloon *s; +VirtIOBalloon *s =qemu_mallocz (sizeof (*s)); - s = (VirtIOBalloon *)virtio_common_init ("virtio-balloon" , -VIRTIO_ID_BALLOON , -8 ,sizeof (VirtIOBalloon)); +virtio_common_init (&s->vdev,"virtio-balloon" ,VIRTIO_ID_BALLOON ,8 ); s->vdev.get_config = virtio_balloon_get_config; s->vdev.set_config = virtio_balloon_set_config;
hw/virtio-blk.c +3 -4
@@ -478,13 +478,12 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id)VirtIODevice *virtio_blk_init (DeviceState *dev,BlockConf *conf) { -VirtIOBlock *s; +VirtIOBlock *s =qemu_mallocz (sizeof (*s));int cylinders, heads, secs;static int virtio_blk_id; - s = (VirtIOBlock *)virtio_common_init ("virtio-blk" ,VIRTIO_ID_BLOCK , -sizeof (struct virtio_blk_config ), -sizeof (VirtIOBlock)); +virtio_common_init (&s->vdev,"virtio-blk" ,VIRTIO_ID_BLOCK , +sizeof (struct virtio_blk_config )); s->vdev.get_config = virtio_blk_update_config; s->vdev.get_features = virtio_blk_get_features;
hw/virtio-net.c +3 -4
@@ -833,12 +833,11 @@ static NetClientInfo net_virtio_info = {VirtIODevice *virtio_net_init (DeviceState *dev,NICConf *conf) { -VirtIONet *n; +VirtIONet *n =qemu_mallocz (sizeof (*n));static int virtio_net_id; - n = (VirtIONet *)virtio_common_init ("virtio-net" ,VIRTIO_ID_NET , -sizeof (struct virtio_net_config ), -sizeof (VirtIONet)); +virtio_common_init (&n->vdev,"virtio-net" ,VIRTIO_ID_NET , +sizeof (struct virtio_net_config )) n->vdev.get_config = virtio_net_get_config; n->vdev.set_config = virtio_net_set_config;
hw/virtio-serial-bus.c +4 -5
@@ -560,18 +560,17 @@ void virtio_serial_port_qdev_register(VirtIOSerialPortInfo *info)VirtIODevice *virtio_serial_init (DeviceState *dev,uint32_t max_nr_ports) { -VirtIOSerial *vser; +VirtIOSerial *vser =qemu_mallocz (sizeof (*vser));VirtIODevice *vdev;uint32_t i;if (!max_nr_ports)return NULL ; - vdev =virtio_common_init ("virtio-serial" ,VIRTIO_ID_CONSOLE , -sizeof (struct virtio_console_config ), -sizeof (VirtIOSerial)); + vdev = &vser->vdev; - vser =DO_UPCAST (VirtIOSerial, vdev, vdev); +virtio_common_init (vdev,"virtio-serial" ,VIRTIO_ID_CONSOLE , +sizeof (struct virtio_console_config ))/* Spawn a new virtio-serial bus on which the ports will ride as devices */ vser->bus = virtser_bus_new(dev);
hw/virtio.c +3 -4
@@ -700,13 +700,12 @@ void virtio_cleanup(VirtIODevice *vdev)qemu_free (vdev->vq); } -VirtIODevice *virtio_common_init (const char *name,uint16_t device_id, -size_t config_size,size_t struct_size) +void virtio_common_init (VirtIODevice *vdev,const char *name, +uint16_t device_id,size_t config_size) { -VirtIODevice *vdev;int i; - vdev =qemu_mallocz (struct_size); +memset (vdev,0 ,sizeof (*vdev)); vdev->device_id = device_id; vdev->status =0 ;
hw/virtio.h +3 -2
@@ -149,8 +149,9 @@ int virtio_queue_empty(VirtQueue *vq);/* Host binding interface. */ -VirtIODevice *virtio_common_init (const char *name,uint16_t device_id, -size_t config_size,size_t struct_size); +void virtio_common_init (VirtIODevice *dev,const char *name, +uint16_t device_id,size_t config_size); +uint32_t virtio_config_readb (VirtIODevice *vdev,uint32_t addr);uint32_t virtio_config_readw (VirtIODevice *vdev,uint32_t addr);uint32_t virtio_config_readl (VirtIODevice *vdev,uint32_t addr);
Signature · 1 line
1.7.0.2.280.gc6f05
PATCH v2 2/5 virtio-net: remove layout assumptions
In reply to Michael S. TsirkinUse container_of so we do not depend on vdev being first member.
--- hw/virtio-net.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
hw/virtio-net.c +2 -2
@@ -64,7 +64,7 @@ typedef struct VirtIONetstatic VirtIONet *to_virtio_net (VirtIODevice *vdev) { -return (VirtIONet *)vdev; +return container_of (vdev, VirtIONet, vdev); }static void virtio_net_get_config (VirtIODevice *vdev,uint8_t *config)
@@ -873,7 +873,7 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf)void virtio_net_exit (VirtIODevice *vdev) { -VirtIONet *n =DO_UPCAST (VirtIONet, vdev, vdev); +VirtIONet *n =to_virtio_net (vdev);qemu_purge_queued_packets (&n->nic->nc);
Signature · 1 line
1.7.0.2.280.gc6f05
PATCH v2 3/5 virtio-serial: remove struct layout assumptions
In reply to Michael S. TsirkinUse container_of and remove assumption that vdev
is 1st member of structure.
--- hw/virtio-serial-bus.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
hw/virtio-serial-bus.c +4 -4
@@ -282,7 +282,7 @@ static void control_out(VirtIODevice *vdev, VirtQueue *vq)VirtQueueElement elem;VirtIOSerial *vser; - vser =DO_UPCAST (VirtIOSerial, vdev, vdev); + vser =container_of (vdev, VirtIOSerial, vdev);while (virtqueue_pop (vq, &elem)) {handle_control_message (vser, elem.out_sg[0 ].iov_base);
@@ -297,7 +297,7 @@ static void handle_output(VirtIODevice *vdev, VirtQueue *vq)VirtIOSerial *vser;VirtQueueElement elem; - vser =DO_UPCAST (VirtIOSerial, vdev, vdev); + vser =container_of (vdev, VirtIOSerial, vdev);while (virtqueue_pop (vq, &elem)) {VirtIOSerialPort *port;
@@ -335,7 +335,7 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq)static uint32_t get_features (VirtIODevice *vdev,uint32_t features) { -VirtIOSerial *vser =DO_UPCAST (VirtIOSerial, vdev, vdev); +VirtIOSerial *vser =container_of (vdev, VirtIOSerial, vdev);if (vser->bus->max_nr_ports >1 ) { features |= (1 <<VIRTIO_CONSOLE_F_MULTIPORT ); }
@@ -347,7 +347,7 @@ static void get_config(VirtIODevice *vdev, uint8_t *config_data) {VirtIOSerial *vser; - vser =DO_UPCAST (VirtIOSerial, vdev, vdev); + vser =container_of (vdev, VirtIOSerial, vdev);memcpy (config_data, &vser->config,sizeof (struct virtio_console_config )); }
Signature · 1 line
1.7.0.2.280.gc6f05
PATCH v2 4/5 virtio-balloon: remove layout assumptions
In reply to Michael S. Tsirkinuse container_of to remove assumption that vdev
is 1st member of structure.
--- hw/virtio-balloon.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
hw/virtio-balloon.c +2 -2
@@ -43,7 +43,7 @@ typedef struct VirtIOBalloonstatic VirtIOBalloon *to_virtio_balloon (VirtIODevice *vdev) { -return (VirtIOBalloon *)vdev; +return container_of (vdev, VirtIOBalloon, vdev); }static void balloon_page (void *addr,int deflate)
@@ -165,7 +165,7 @@ static void complete_stats_request(VirtIOBalloon *vb)static void virtio_balloon_receive_stats (VirtIODevice *vdev,VirtQueue *vq) { -VirtIOBalloon *s =DO_UPCAST (VirtIOBalloon, vdev, vdev); +VirtIOBalloon *s =to_virtio_balloon (vdev);VirtQueueElement *elem = &s->stats_vq_elem;VirtIOBalloonStat stat;size_t offset =0 ;
Signature · 1 line
1.7.0.2.280.gc6f05
PATCH v2 5/5 virtio-blk: remove layout assumption
In reply to Michael S. TsirkinUse container_of to remove assumption that vdev
is 1st member of device state.
--- hw/virtio-blk.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/virtio-blk.c +1 -1
@@ -32,7 +32,7 @@ typedef struct VirtIOBlockstatic VirtIOBlock *to_virtio_blk (VirtIODevice *vdev) { -return (VirtIOBlock *)vdev; +return container_of (vdev, VirtIOBlock, vdev); } typedef struct VirtIOBlockReq
Signature · 1 line
1.7.0.2.280.gc6f05