From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:46980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2NI1-0001h1-S3 for qemu-devel@nongnu.org; Tue, 28 Feb 2012 08:40:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2NHz-0002x0-Vy for qemu-devel@nongnu.org; Tue, 28 Feb 2012 08:40:25 -0500 Received: from plane.gmane.org ([80.91.229.3]:41080) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2NHz-0002wf-EM for qemu-devel@nongnu.org; Tue, 28 Feb 2012 08:40:23 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1S2NHx-0004ln-GK for qemu-devel@nongnu.org; Tue, 28 Feb 2012 14:40:21 +0100 Received: from 93-34-182-16.ip50.fastwebnet.it ([93.34.182.16]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 28 Feb 2012 14:40:21 +0100 Received: from pbonzini by 93-34-182-16.ip50.fastwebnet.it with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 28 Feb 2012 14:40:21 +0100 From: Paolo Bonzini Date: Tue, 28 Feb 2012 14:40:00 +0100 Message-ID: References: <1330435867-17860-1-git-send-email-owasserm@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit In-Reply-To: <1330435867-17860-1-git-send-email-owasserm@redhat.com> Subject: Re: [Qemu-devel] [PATCH] We should check virtio_load return code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Il 28/02/2012 14:31, Orit Wasserman ha scritto: > Otherwise we crash on error. > > Signed-off-by: Orit Wasserman > Signed-off-by: Ulrich Obergfell > --- > hw/virtio-balloon.c | 6 +++++- > hw/virtio-blk.c | 7 ++++++- > hw/virtio-net.c | 6 +++++- > hw/virtio-scsi.c | 7 ++++++- > hw/virtio-serial-bus.c | 6 +++++- > 5 files changed, 27 insertions(+), 5 deletions(-) > > diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c > index ce9d2c9..075ed87 100644 > --- a/hw/virtio-balloon.c > +++ b/hw/virtio-balloon.c > @@ -211,11 +211,15 @@ static void virtio_balloon_save(QEMUFile *f, void *opaque) > static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) > { > VirtIOBalloon *s = opaque; > + int ret; > > if (version_id != 1) > return -EINVAL; > > - virtio_load(&s->vdev, f); > + ret = virtio_load(&s->vdev, f); > + if (ret) { > + return ret; > + } > > s->num_pages = qemu_get_be32(f); > s->actual = qemu_get_be32(f); > diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c > index 49990f8..d4bb400 100644 > --- a/hw/virtio-blk.c > +++ b/hw/virtio-blk.c > @@ -537,11 +537,16 @@ static void virtio_blk_save(QEMUFile *f, void *opaque) > static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id) > { > VirtIOBlock *s = opaque; > + int ret; > > if (version_id != 2) > return -EINVAL; > > - virtio_load(&s->vdev, f); > + ret = virtio_load(&s->vdev, f); > + if (ret) { > + return ret; > + } > + > while (qemu_get_sbyte(f)) { > VirtIOBlockReq *req = virtio_blk_alloc_request(s); > qemu_get_buffer(f, (unsigned char*)&req->elem, sizeof(req->elem)); > diff --git a/hw/virtio-net.c b/hw/virtio-net.c > index bc5e3a8..3f190d4 100644 > --- a/hw/virtio-net.c > +++ b/hw/virtio-net.c > @@ -891,11 +891,15 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) > { > VirtIONet *n = opaque; > int i; > + int ret; > > if (version_id < 2 || version_id > VIRTIO_NET_VM_VERSION) > return -EINVAL; > > - virtio_load(&n->vdev, f); > + ret = virtio_load(&n->vdev, f); > + if (ret) { > + return ret; > + } > > qemu_get_buffer(f, n->mac, ETH_ALEN); > n->tx_waiting = qemu_get_be32(f); > diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c > index e607edc..9797847 100644 > --- a/hw/virtio-scsi.c > +++ b/hw/virtio-scsi.c > @@ -558,7 +558,12 @@ static void virtio_scsi_save(QEMUFile *f, void *opaque) > static int virtio_scsi_load(QEMUFile *f, void *opaque, int version_id) > { > VirtIOSCSI *s = opaque; > - virtio_load(&s->vdev, f); > + int ret; > + > + ret = virtio_load(&s->vdev, f); > + if (ret) { > + return ret; > + } > return 0; > } > > diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c > index e22940e..4a33872 100644 > --- a/hw/virtio-serial-bus.c > +++ b/hw/virtio-serial-bus.c > @@ -590,13 +590,17 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id) > VirtIOSerialPort *port; > uint32_t max_nr_ports, nr_active_ports, ports_map; > unsigned int i; > + int ret; > > if (version_id > 3) { > return -EINVAL; > } > > /* The virtio device */ > - virtio_load(&s->vdev, f); > + ret = virtio_load(&s->vdev, f); > + if (ret) { > + return ret; > + } > > if (version_id < 2) { > return 0; Acked-by: Paolo Bonzini