From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NmsEf-0001sh-6j for qemu-devel@nongnu.org; Wed, 03 Mar 2010 12:19:49 -0500 Received: from [199.232.76.173] (port=36540 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NmsEe-0001rw-Nb for qemu-devel@nongnu.org; Wed, 03 Mar 2010 12:19:48 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NmsEc-00055p-M0 for qemu-devel@nongnu.org; Wed, 03 Mar 2010 12:19:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19875) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NmsEc-00055h-8U for qemu-devel@nongnu.org; Wed, 03 Mar 2010 12:19:46 -0500 Date: Wed, 3 Mar 2010 19:16:13 +0200 From: "Michael S. Tsirkin" Message-ID: <7742aeff63b55344dc6d8826b8a4f3a00cb3c035.1267636215.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCHv4 06/12] virtio: add set_status callback List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , qemu-devel@nongnu.org Cc: amit.shah@redhat.com, kraxel@redhat.com, quintela@redhat.com vhost net backend needs to be notified when frontend status changes. Add a callback, similar to set_features. Signed-off-by: Michael S. Tsirkin --- hw/s390-virtio-bus.c | 2 +- hw/syborg_virtio.c | 2 +- hw/virtio-pci.c | 5 +++-- hw/virtio.h | 9 +++++++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index fa0a74f..6f93d67 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -242,7 +242,7 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev) VirtIODevice *vdev = dev->vdev; uint32_t features; - vdev->status = ldub_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS); + virtio_set_status(vdev, ldub_phys(dev->dev_offs + VIRTIO_DEV_OFFS_STATUS)); /* Update guest supported feature bitmap */ diff --git a/hw/syborg_virtio.c b/hw/syborg_virtio.c index 65239a0..c7b1162 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, value); 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