virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Amit Shah <amit.shah@redhat.com>
To: qemu-devel@nongnu.org
Cc: Amit Shah <amit.shah@redhat.com>,
	quintela@redhat.com, mst@redhat.com,
	virtualization@lists.linux-foundation.org
Subject: [PATCH 1/9] virtio-serial-bus: save/load: Ensure target has enough ports
Date: Fri, 19 Mar 2010 17:28:38 +0530	[thread overview]
Message-ID: <1268999926-29560-2-git-send-email-amit.shah@redhat.com> (raw)
In-Reply-To: <1268999926-29560-1-git-send-email-amit.shah@redhat.com>

The target could be started with max_nr_ports for a virtio-serial device
lesser than what was available on the source machine. Fail the migration
in such a case.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
Reported-by: Juan Quintela <quintela@redhat.com>
---
 hw/virtio-serial-bus.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 17c1ec1..36985a1 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -374,6 +374,8 @@ static void virtio_serial_save(QEMUFile *f, void *opaque)
 
     /* Items in struct VirtIOSerial */
 
+    qemu_put_be32s(f, &s->bus->max_nr_ports);
+
     /* Do this because we might have hot-unplugged some ports */
     nr_active_ports = 0;
     QTAILQ_FOREACH(port, &s->ports, next)
@@ -399,7 +401,7 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)
 {
     VirtIOSerial *s = opaque;
     VirtIOSerialPort *port;
-    uint32_t nr_active_ports;
+    uint32_t max_nr_ports, nr_active_ports;
     unsigned int i;
 
     if (version_id > 2) {
@@ -420,6 +422,12 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id)
 
     /* Items in struct VirtIOSerial */
 
+    qemu_get_be32s(f, &max_nr_ports);
+    if (max_nr_ports > s->bus->max_nr_ports) {
+        /* Source could have more ports than us. Fail migration. */
+        return -EINVAL;
+    }
+
     qemu_get_be32s(f, &nr_active_ports);
 
     /* Items in struct VirtIOSerialPort */
-- 
1.6.2.5

  reply	other threads:[~2010-03-19 11:58 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-19 11:58 [PATCH 0/9] virtio-serial fixes, ABI updates Amit Shah
2010-03-19 11:58 ` Amit Shah [this message]
2010-03-19 11:58   ` [PATCH 2/9] virtio-serial-bus: save/load: Ensure nr_ports on src and dest are same Amit Shah
2010-03-19 11:58     ` [PATCH 3/9] virtio-serial: save/load: Ensure we have hot-plugged ports instantiated Amit Shah
2010-03-19 11:58       ` [PATCH 4/9] virtio-serial: Handle scatter-gather buffers for control messages Amit Shah
2010-03-19 11:58         ` [PATCH 5/9] virtio-serial: Handle scatter/gather input from the guest Amit Shah
2010-03-19 11:58           ` [PATCH 6/9] virtio-serial: Remove redundant check for 0-sized write request Amit Shah
2010-03-19 11:58             ` [PATCH 7/9] virtio-serial: Update copyright year to 2010 Amit Shah
2010-03-19 11:58               ` [PATCH 8/9] virtio-serial-bus: Use a bitmap in virtio config space for active ports Amit Shah
2010-03-19 11:58                 ` [PATCH 9/9] virtio-serial-bus: Let the guest know of host connection changes after migration Amit Shah
2010-03-20  7:40         ` [PATCH 4/9] virtio-serial: Handle scatter-gather buffers for control messages Avi Kivity
2010-03-22  5:18           ` [Qemu-devel] " Amit Shah
2010-03-23 15:51             ` Michael S. Tsirkin
2010-03-23 16:15               ` Amit Shah
2010-03-23 16:23                 ` Michael S. Tsirkin
2010-03-21 13:47 ` [PATCH 0/9] virtio-serial fixes, ABI updates Michael S. Tsirkin
2010-03-22  4:55   ` Amit Shah

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1268999926-29560-2-git-send-email-amit.shah@redhat.com \
    --to=amit.shah@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=virtualization@lists.linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).