[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports on src and dest are same. |
Date: |
Wed, 14 Apr 2010 10:58:22 +0530 |
The number of ports on the source as well as the destination machines
should match. If they don't, it means some ports that got hotplugged on
the source aren't instantiated on the destination. Or that ports that
were hot-unplugged on the source are created on the destination.
Signed-off-by: Amit Shah <address@hidden>
Reported-by: Juan Quintela <address@hidden>
---
hw/virtio-serial-bus.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 9a7f0c1..d31e62d 100644
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -402,7 +402,7 @@ static int virtio_serial_load(QEMUFile *f, void *opaque,
int version_id)
{
VirtIOSerial *s = opaque;
VirtIOSerialPort *port;
- uint32_t max_nr_ports, nr_active_ports;
+ uint32_t max_nr_ports, nr_active_ports, nr_ports;
unsigned int i;
if (version_id > 2) {
@@ -419,7 +419,21 @@ static int virtio_serial_load(QEMUFile *f, void *opaque,
int version_id)
/* The config space */
qemu_get_be16s(f, &s->config.cols);
qemu_get_be16s(f, &s->config.rows);
- s->config.nr_ports = qemu_get_be32(f);
+ nr_ports = qemu_get_be32(f);
+
+ if (nr_ports != s->config.nr_ports) {
+ /*
+ * Source hot-plugged/unplugged ports and we don't have all of
+ * them here.
+ *
+ * Note: This condition cannot check for all hotplug/unplug
+ * events: eg, if one port was hot-plugged and one was
+ * unplugged, the nr_ports remains the same but the port id's
+ * would have changed and we won't catch it here. A later
+ * check for !find_port_by_id() will confirm if this happened.
+ */
+ return -EINVAL;
+ }
/* Items in struct VirtIOSerial */
--
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, 2010/04/14
- [Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports on src and dest are same.,
Amit Shah <=
- [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
- [Qemu-devel] [PATCH v5 12/17] iov: Add iov_to_buf and iov_size helpers, Amit Shah, 2010/04/14