From patchwork Fri Nov 5 21:16:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 70297 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]) by ozlabs.org (Postfix) with ESMTP id CBF031007D5 for ; Sat, 6 Nov 2010 08:25:24 +1100 (EST) Received: from localhost ([127.0.0.1]:54757 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PEThA-000223-MU for incoming@patchwork.ozlabs.org; Fri, 05 Nov 2010 17:19:36 -0400 Received: from [140.186.70.92] (port=33292 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PETeP-0000Et-Kj for qemu-devel@nongnu.org; Fri, 05 Nov 2010 17:16:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PETeM-0002mc-Hu for qemu-devel@nongnu.org; Fri, 05 Nov 2010 17:16:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PETeM-0002mT-9a for qemu-devel@nongnu.org; Fri, 05 Nov 2010 17:16:42 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA5LGfEc016308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Nov 2010 17:16:41 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oA5LGeWT012602; Fri, 5 Nov 2010 17:16:40 -0400 From: Alex Williamson To: qemu-devel@nongnu.org Date: Fri, 05 Nov 2010 15:16:40 -0600 Message-ID: <20101105211637.19958.3484.stgit@s20.home> In-Reply-To: <20101105211426.19958.86894.stgit@s20.home> References: <20101105211426.19958.86894.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: alex.williamson@redhat.com, cam@cs.ualberta.ca, quintela@redhat.com Subject: [Qemu-devel] [PATCH RESEND 4/6] virtio: Allow virtio_save() errors 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 Carry pci_device_save() error through to virtio_save(). Signed-off-by: Alex Williamson --- hw/virtio-balloon.c | 6 +++++- hw/virtio-blk.c | 6 +++++- hw/virtio-net.c | 6 +++++- hw/virtio-pci.c | 10 ++++++++-- hw/virtio-serial-bus.c | 6 +++++- hw/virtio.c | 14 ++++++++++---- hw/virtio.h | 4 ++-- 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index ed652f3..d9fa535 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -236,8 +236,12 @@ static void virtio_balloon_to_target(void *opaque, ram_addr_t target, static int virtio_balloon_save(QEMUFile *f, void *opaque) { VirtIOBalloon *s = opaque; + int ret; - virtio_save(&s->vdev, f); + ret = virtio_save(&s->vdev, f); + if (ret < 0) { + return ret; + } qemu_put_be32(f, s->num_pages); qemu_put_be32(f, s->actual); diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 84fb93e..cb27086 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -470,8 +470,12 @@ static int virtio_blk_save(QEMUFile *f, void *opaque) { VirtIOBlock *s = opaque; VirtIOBlockReq *req = s->rq; + int ret; - virtio_save(&s->vdev, f); + ret = virtio_save(&s->vdev, f); + if (ret < 0) { + return ret; + } while (req) { qemu_put_sbyte(f, 1); diff --git a/hw/virtio-net.c b/hw/virtio-net.c index a2308fa..9254fdf 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -813,11 +813,15 @@ static void virtio_net_tx_bh(void *opaque) static int virtio_net_save(QEMUFile *f, void *opaque) { VirtIONet *n = opaque; + int ret; /* At this point, backend must be stopped, otherwise * it might keep writing to memory. */ assert(!n->vhost_started); - virtio_save(&n->vdev, f); + ret = virtio_save(&n->vdev, f); + if (ret < 0) { + return ret; + } qemu_put_buffer(f, n->mac, ETH_ALEN); qemu_put_be32(f, n->tx_waiting); diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 729917d..afb8f5b 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -121,13 +121,19 @@ static void virtio_pci_notify(void *opaque, uint16_t vector) qemu_set_irq(proxy->pci_dev.irq[0], proxy->vdev->isr & 1); } -static void virtio_pci_save_config(void * opaque, QEMUFile *f) +static int virtio_pci_save_config(void * opaque, QEMUFile *f) { VirtIOPCIProxy *proxy = opaque; - pci_device_save(&proxy->pci_dev, f); + int ret; + + ret = pci_device_save(&proxy->pci_dev, f); + if (ret < 0) { + return ret; + } msix_save(&proxy->pci_dev, f); if (msix_present(&proxy->pci_dev)) qemu_put_be16(f, proxy->vdev->config_vector); + return 0; } static void virtio_pci_save_queue(void * opaque, int n, QEMUFile *f) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index 7f00fcf..ca57dda 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -459,9 +459,13 @@ static int virtio_serial_save(QEMUFile *f, void *opaque) VirtIOSerialPort *port; uint32_t nr_active_ports; unsigned int i; + int ret; /* The virtio device */ - virtio_save(&s->vdev, f); + ret = virtio_save(&s->vdev, f); + if (ret < 0) { + return ret; + } /* The config space */ qemu_put_be16s(f, &s->config.cols); diff --git a/hw/virtio.c b/hw/virtio.c index a2a657e..cb1b248 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -642,12 +642,16 @@ void virtio_notify_config(VirtIODevice *vdev) virtio_notify_vector(vdev, vdev->config_vector); } -void virtio_save(VirtIODevice *vdev, QEMUFile *f) +int virtio_save(VirtIODevice *vdev, QEMUFile *f) { - int i; + int i, ret; - if (vdev->binding->save_config) - vdev->binding->save_config(vdev->binding_opaque, f); + if (vdev->binding->save_config) { + ret = vdev->binding->save_config(vdev->binding_opaque, f); + if (ret < 0) { + return ret; + } + } qemu_put_8s(f, &vdev->status); qemu_put_8s(f, &vdev->isr); @@ -673,6 +677,8 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) if (vdev->binding->save_queue) vdev->binding->save_queue(vdev->binding_opaque, i, f); } + + return 0; } int virtio_load(VirtIODevice *vdev, QEMUFile *f) diff --git a/hw/virtio.h b/hw/virtio.h index 02fa312..a7e412c 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -88,7 +88,7 @@ typedef struct VirtQueueElement typedef struct { void (*notify)(void * opaque, uint16_t vector); - void (*save_config)(void * opaque, QEMUFile *f); + int (*save_config)(void * opaque, QEMUFile *f); void (*save_queue)(void * opaque, int n, QEMUFile *f); int (*load_config)(void * opaque, QEMUFile *f); int (*load_queue)(void * opaque, int n, QEMUFile *f); @@ -150,7 +150,7 @@ int virtqueue_avail_bytes(VirtQueue *vq, int in_bytes, int out_bytes); void virtio_notify(VirtIODevice *vdev, VirtQueue *vq); -void virtio_save(VirtIODevice *vdev, QEMUFile *f); +int virtio_save(VirtIODevice *vdev, QEMUFile *f); int virtio_load(VirtIODevice *vdev, QEMUFile *f);