From patchwork Wed Apr 14 05:28:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 50100 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id 63611B7D0C for ; Wed, 14 Apr 2010 15:43:16 +1000 (EST) Received: from localhost ([127.0.0.1]:38498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1vI7-0003Q6-K3 for incoming@patchwork.ozlabs.org; Wed, 14 Apr 2010 01:37:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1vBJ-00029b-E1 for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:33 -0400 Received: from [140.186.70.92] (port=47185 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1vBH-00028s-RI for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1vBD-0005wV-Em for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16074) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1vBC-0005w9-PB for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:27 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3E5UPKr027374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 14 Apr 2010 01:30:25 -0400 Received: from localhost (vpn-236-230.phx2.redhat.com [10.3.236.230]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3E5UJsB004033; Wed, 14 Apr 2010 01:30:22 -0400 From: Amit Shah To: Anthony Liguori Date: Wed, 14 Apr 2010 10:58:22 +0530 Message-Id: <1271222917-7803-3-git-send-email-amit.shah@redhat.com> In-Reply-To: <1271222917-7803-2-git-send-email-amit.shah@redhat.com> References: <1271222917-7803-1-git-send-email-amit.shah@redhat.com> <1271222917-7803-2-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu list , Amit Shah , Gerd Hoffmann , Juan Quintela Subject: [Qemu-devel] [PATCH v5 02/17] virtio-serial: save/load: Ensure nr_ports on src and dest are same. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Reported-by: Juan Quintela --- 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 */