ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: use virtio_bus_set_host_notifier to start/stop ioeventfd 

ioeventfd_disabled was the only reason for the default
implementation of virtio_device_start_ioeventfd not to use
virtio_bus_set_host_notifier.  This is now fixed, and the sole entry
point to set up ioeventfd can be virtio_bus_set_host_notifier.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-10-21 22:48:14 +02:00 committed by Michael S. Tsirkin
parent e616c2f390
commit ed08a2a0ba
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/virtio/virtio-bus.c
View File

@ -147,7 +147,7 @@ void virtio_bus_set_vdev_config(VirtioBusState *bus, uint8_t *config)
} }
} }
int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus, static int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus,
int n, bool assign) int n, bool assign)
{ {
VirtIODevice *vdev = virtio_bus_get_device(bus); VirtIODevice *vdev = virtio_bus_get_device(bus);

8
hw/virtio/virtio.c
View File

@ -2145,14 +2145,13 @@ static Property virtio_properties[] = {
static int virtio_device_start_ioeventfd_impl(VirtIODevice *vdev) static int virtio_device_start_ioeventfd_impl(VirtIODevice *vdev)
{ {
VirtioBusState *qbus = VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev))); VirtioBusState *qbus = VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev)));
DeviceState *proxy = DEVICE(BUS(qbus)->parent);
int n, r, err; int n, r, err;
for (n = 0; n < VIRTIO_QUEUE_MAX; n++) { for (n = 0; n < VIRTIO_QUEUE_MAX; n++) {
if (!virtio_queue_get_num(vdev, n)) { if (!virtio_queue_get_num(vdev, n)) {
continue; continue;
} }
r = set_host_notifier_internal(proxy, qbus, n, true); r = virtio_bus_set_host_notifier(qbus, n, true);
if (r < 0) { if (r < 0) {
err = r; err = r;
goto assign_error; goto assign_error;
@ -2176,7 +2175,7 @@ assign_error:
continue; continue;
} }
r = set_host_notifier_internal(proxy, qbus, n, false); r = virtio_bus_set_host_notifier(qbus, n, false);
assert(r >= 0); assert(r >= 0);
} }
return err; return err;
@ -2193,14 +2192,13 @@ int virtio_device_start_ioeventfd(VirtIODevice *vdev)
static void virtio_device_stop_ioeventfd_impl(VirtIODevice *vdev) static void virtio_device_stop_ioeventfd_impl(VirtIODevice *vdev)
{ {
VirtioBusState *qbus = VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev))); VirtioBusState *qbus = VIRTIO_BUS(qdev_get_parent_bus(DEVICE(vdev)));
DeviceState *proxy = DEVICE(BUS(qbus)->parent);
int n, r; int n, r;
for (n = 0; n < VIRTIO_QUEUE_MAX; n++) { for (n = 0; n < VIRTIO_QUEUE_MAX; n++) {
if (!virtio_queue_get_num(vdev, n)) { if (!virtio_queue_get_num(vdev, n)) {
continue; continue;
} }
r = set_host_notifier_internal(proxy, qbus, n, false); r = virtio_bus_set_host_notifier(qbus, n, false);
assert(r >= 0); assert(r >= 0);
} }
} }

5
include/hw/virtio/virtio-bus.h
View File

@ -134,9 +134,4 @@ void virtio_bus_stop_ioeventfd(VirtioBusState *bus);
/* Switch from/to the generic ioeventfd handler */ /* Switch from/to the generic ioeventfd handler */
int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign); int virtio_bus_set_host_notifier(VirtioBusState *bus, int n, bool assign);
/* This is temporary. It is only needed because virtio_bus_set_host_notifier
* sets ioeventfd_disabled but we will shortly get rid of it. */
int set_host_notifier_internal(DeviceState *proxy, VirtioBusState *bus,
int n, bool assign);
#endif /* VIRTIO_BUS_H */ #endif /* VIRTIO_BUS_H */