[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 06/12] virtio: add set_status callback
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCHv3 06/12] virtio: add set_status callback |
Date: |
Tue, 2 Mar 2010 20:43:48 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
vhost net backend needs to be notified when
frontend status changes. Add a callback,
similar to set_features.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/s390-virtio-bus.c | 4 +++-
hw/syborg_virtio.c | 2 +-
hw/virtio-pci.c | 5 +++--
hw/virtio.h | 9 +++++++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index fa0a74f..8e05cfc 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -241,8 +241,10 @@ void s390_virtio_device_update_status(VirtIOS390Device
*dev)
{
VirtIODevice *vdev = dev->vdev;
uint32_t features;
+ uint8_t status;
- vdev->status = ldub_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS);
+ status = ldub_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS);
+ virtio_set_status(vdev, status);
/* Update guest supported feature bitmap */
diff --git a/hw/syborg_virtio.c b/hw/syborg_virtio.c
index 65239a0..71f271c 100644
--- a/hw/syborg_virtio.c
+++ b/hw/syborg_virtio.c
@@ -149,7 +149,7 @@ static void syborg_virtio_writel(void *opaque,
target_phys_addr_t offset,
virtio_queue_notify(vdev, value);
break;
case SYBORG_VIRTIO_STATUS:
- vdev->status = value & 0xFF;
+ virtio_set_status(vdev, status);
if (vdev->status == 0)
virtio_reset(vdev);
break;
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index bcd40f7..fd9759a 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -206,7 +206,7 @@ static void virtio_ioport_write(void *opaque, uint32_t
addr, uint32_t val)
virtio_queue_notify(vdev, val);
break;
case VIRTIO_PCI_STATUS:
- vdev->status = val & 0xFF;
+ virtio_set_status(vdev, val & 0xFF);
if (vdev->status == 0) {
virtio_reset(proxy->vdev);
msix_unuse_all_vectors(&proxy->pci_dev);
@@ -377,7 +377,8 @@ static void virtio_write_config(PCIDevice *pci_dev,
uint32_t address,
if (PCI_COMMAND == address) {
if (!(val & PCI_COMMAND_MASTER)) {
- proxy->vdev->status &= ~VIRTIO_CONFIG_S_DRIVER_OK;
+ virtio_set_status(proxy->vdev,
+ proxy->vdev->status &
~VIRTIO_CONFIG_S_DRIVER_OK);
}
}
diff --git a/hw/virtio.h b/hw/virtio.h
index 26cf5fd..58b06bf 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -115,12 +115,21 @@ struct VirtIODevice
void (*get_config)(VirtIODevice *vdev, uint8_t *config);
void (*set_config)(VirtIODevice *vdev, const uint8_t *config);
void (*reset)(VirtIODevice *vdev);
+ void (*set_status)(VirtIODevice *vdev, uint8_t val);
VirtQueue *vq;
const VirtIOBindings *binding;
void *binding_opaque;
uint16_t device_id;
};
+static inline void virtio_set_status(VirtIODevice *vdev, uint8_t val)
+{
+ if (vdev->set_status) {
+ vdev->set_status(vdev, val);
+ }
+ vdev->status = val;
+}
+
VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void (*handle_output)(VirtIODevice *,
VirtQueue *));
--
1.7.0.18.g0d53a5
- [Qemu-devel] [PATCHv3 00/12] vhost-net: upstream integration, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 01/12] tap: add interface to get device fd, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 02/12] kvm: add API to set ioeventfd, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 03/12] notifier: event notifier implementation, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 04/12] virtio: add notifier support, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 05/12] virtio: add APIs for queue fields, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 06/12] virtio: add set_status callback,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCHv3 07/12] virtio: move typedef to qemu-common, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 08/12] virtio-pci: fill in notifier support, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 09/12] vhost: vhost net support, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 10/12] tap: add vhost/vhostfd options, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 12/12] virtio-net: vhost net support, Michael S. Tsirkin, 2010/03/02
- [Qemu-devel] [PATCHv3 11/12] tap: add API to retrieve vhost net header, Michael S. Tsirkin, 2010/03/02