[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] We should check virtio_load return code
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH] We should check virtio_load return code |
Date: |
Tue, 28 Feb 2012 14:40:00 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:10.0.1) Gecko/20120216 Thunderbird/10.0.1 |
Il 28/02/2012 14:31, Orit Wasserman ha scritto:
> Otherwise we crash on error.
>
> Signed-off-by: Orit Wasserman <address@hidden>
> Signed-off-by: Ulrich Obergfell <address@hidden>
> ---
> 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 <address@hidden>