* [Qemu-devel] [PATCH] We should check virtio_load return code
@ 2012-02-28 13:31 Orit Wasserman
2012-02-28 13:40 ` Paolo Bonzini
2012-03-01 9:29 ` Amit Shah
0 siblings, 2 replies; 6+ messages in thread
From: Orit Wasserman @ 2012-02-28 13:31 UTC (permalink / raw)
To: qemu-devel; +Cc: amit.shah, pbonzini, Orit Wasserman, Ulrich Obergfell, mst
Otherwise we crash on error.
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
---
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;
--
1.7.6.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] We should check virtio_load return code
2012-02-28 13:31 [Qemu-devel] [PATCH] We should check virtio_load return code Orit Wasserman
@ 2012-02-28 13:40 ` Paolo Bonzini
2012-03-01 9:29 ` Amit Shah
1 sibling, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2012-02-28 13:40 UTC (permalink / raw)
To: qemu-devel
Il 28/02/2012 14:31, Orit Wasserman ha scritto:
> Otherwise we crash on error.
>
> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
> Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
> ---
> 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 <pbonzini@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] We should check virtio_load return code
2012-02-28 13:31 [Qemu-devel] [PATCH] We should check virtio_load return code Orit Wasserman
2012-02-28 13:40 ` Paolo Bonzini
@ 2012-03-01 9:29 ` Amit Shah
2012-03-01 9:56 ` Markus Armbruster
2012-03-01 11:00 ` Orit Wasserman
1 sibling, 2 replies; 6+ messages in thread
From: Amit Shah @ 2012-03-01 9:29 UTC (permalink / raw)
To: Orit Wasserman; +Cc: pbonzini, Ulrich Obergfell, qemu-devel, mst
On (Tue) 28 Feb 2012 [15:31:07], Orit Wasserman wrote:
> Otherwise we crash on error.
A description on how to reproduce the crash would be nice.
> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
> Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
Acked-by: Amit Shah <amit.shah@redhat.com>
Amit
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] We should check virtio_load return code
2012-03-01 9:29 ` Amit Shah
@ 2012-03-01 9:56 ` Markus Armbruster
2012-03-01 11:00 ` Orit Wasserman
1 sibling, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2012-03-01 9:56 UTC (permalink / raw)
To: Amit Shah; +Cc: qemu-devel, Orit Wasserman, mst, Ulrich Obergfell, pbonzini
Amit Shah <amit.shah@redhat.com> writes:
> On (Tue) 28 Feb 2012 [15:31:07], Orit Wasserman wrote:
>> Otherwise we crash on error.
>
> A description on how to reproduce the crash would be nice.
Seconded. No bug fix is complete without instructions to reproduce.
[...]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] We should check virtio_load return code
2012-03-01 9:29 ` Amit Shah
2012-03-01 9:56 ` Markus Armbruster
@ 2012-03-01 11:00 ` Orit Wasserman
2012-03-01 11:14 ` Paolo Bonzini
1 sibling, 1 reply; 6+ messages in thread
From: Orit Wasserman @ 2012-03-01 11:00 UTC (permalink / raw)
To: Amit Shah; +Cc: pbonzini, Ulrich Obergfell, qemu-devel, mst
On 03/01/2012 11:29 AM, Amit Shah wrote:
> On (Tue) 28 Feb 2012 [15:31:07], Orit Wasserman wrote:
>> Otherwise we crash on error.
>
> A description on how to reproduce the crash would be nice.
We changed the default of the command -device virtio-blk-pci,drive=...
from scsi=on to scsi=off for security reasons (disable SG_IO).
If you try to migrate from an older version (which had the default scsi=on) to a newer version
(that has default scsi=off) we get the crash.
Orit
>
>> Signed-off-by: Orit Wasserman <owasserm@redhat.com>
>> Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
>
> Acked-by: Amit Shah <amit.shah@redhat.com>
>
> Amit
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] We should check virtio_load return code
2012-03-01 11:00 ` Orit Wasserman
@ 2012-03-01 11:14 ` Paolo Bonzini
0 siblings, 0 replies; 6+ messages in thread
From: Paolo Bonzini @ 2012-03-01 11:14 UTC (permalink / raw)
To: Orit Wasserman; +Cc: Amit Shah, Ulrich Obergfell, qemu-devel, mst
Il 01/03/2012 12:00, Orit Wasserman ha scritto:
>> > A description on how to reproduce the crash would be nice.
> We changed the default of the command -device virtio-blk-pci,drive=...
> from scsi=on to scsi=off for security reasons (disable SG_IO).
> If you try to migrate from an older version (which had the default scsi=on) to a newer version
> (that has default scsi=off) we get the crash.
Actually the default didn't change in QEMU. It's libvirt that changed
the command-line with which it invokes QEMU.
This patch fixes the crash, I'll post one to fix migration later.
Paolo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-01 11:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-28 13:31 [Qemu-devel] [PATCH] We should check virtio_load return code Orit Wasserman
2012-02-28 13:40 ` Paolo Bonzini
2012-03-01 9:29 ` Amit Shah
2012-03-01 9:56 ` Markus Armbruster
2012-03-01 11:00 ` Orit Wasserman
2012-03-01 11:14 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).