From patchwork Tue Mar 16 17:11:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 47875 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BAD05B7DA3 for ; Wed, 17 Mar 2010 04:25:26 +1100 (EST) Received: from localhost ([127.0.0.1]:55700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NraVN-0002rE-Ki for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2010 13:24:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NraLl-0006et-Kh for qemu-devel@nongnu.org; Tue, 16 Mar 2010 13:14:37 -0400 Received: from [199.232.76.173] (port=42388 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NraLl-0006eb-89 for qemu-devel@nongnu.org; Tue, 16 Mar 2010 13:14:37 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NraLj-0003MU-Fp for qemu-devel@nongnu.org; Tue, 16 Mar 2010 13:14:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58323) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NraLj-0003MO-3x for qemu-devel@nongnu.org; Tue, 16 Mar 2010 13:14:35 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2GHER1N017010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 16 Mar 2010 13:14:27 -0400 Received: from redhat.com (vpn1-6-9.ams2.redhat.com [10.36.6.9]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id o2GHEOwP024604; Tue, 16 Mar 2010 13:14:25 -0400 Date: Tue, 16 Mar 2010 19:11:03 +0200 From: "Michael S. Tsirkin" To: Anthony Liguori , qemu-devel@nongnu.org Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mutt-Fcc: =sent User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: amit.shah@redhat.com, kraxel@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCHv5 05/11] virtio: add set_status callback X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 9fc01e9..3efbaab 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..abf0370 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 & 0xFF); if (vdev->status == 0) virtio_reset(vdev); break; diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 799f664..ee67a8a 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 a074a65..5b07176 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 *));