[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 01/17] virtio-serial: save/load: Ensure target ha
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH v5 01/17] virtio-serial: save/load: Ensure target has enough ports |
Date: |
Wed, 14 Apr 2010 10:58:21 +0530 |
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 <address@hidden>
Reported-by: Juan Quintela <address@hidden>
---
hw/virtio-serial-bus.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 17c1ec1..9a7f0c1 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -374,10 +374,13 @@ 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)
+ QTAILQ_FOREACH(port, &s->ports, next) {
nr_active_ports++;
+ }
qemu_put_be32s(f, &nr_active_ports);
@@ -399,7 +402,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 +423,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
- [Qemu-devel] [PATCH v5 00/17] virtio-serial fixes, new abi for port discovery, flow control, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 01/17] virtio-serial: save/load: Ensure target has enough ports,
Amit Shah <=
- [Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports on src and dest are same., Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 03/17] virtio-serial: save/load: Ensure we have hot-plugged ports instantiated, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 04/17] virtio-serial: save/load: Send target host connection status if different, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 05/17] virtio-serial: Use control messages to notify guest of new ports, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 06/17] virtio-serial: whitespace: match surrounding code, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 07/17] virtio-serial: Remove redundant check for 0-sized write request, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 08/17] virtio-serial: Update copyright year to 2010, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 09/17] virtio-serial: Propagate errors in initialising ports / devices in guest, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 10/17] virtio-serial: Send out guest data to ports only if port is opened, Amit Shah, 2010/04/14
- [Qemu-devel] [PATCH v5 11/17] iov: Introduce a new file for helpers around iovs, add iov_from_buf(), Amit Shah, 2010/04/14