From patchwork Wed Mar 31 07:33:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 49088 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B8C62B6EFF for ; Wed, 31 Mar 2010 18:42:23 +1100 (EST) Received: from localhost ([127.0.0.1]:38241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwsZ9-0007eB-4y for incoming@patchwork.ozlabs.org; Wed, 31 Mar 2010 03:42:19 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwsSs-00067j-Qd for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:50 -0400 Received: from [140.186.70.92] (port=33042 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwsSq-00066r-8k for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwsSo-00077C-3r for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17564) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwsSl-00076t-RI for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:45 -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 o2V7ZgTf023249 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 31 Mar 2010 03:35:42 -0400 Received: from localhost (vpn-235-197.phx2.redhat.com [10.3.235.197]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2V7ZdwI009872; Wed, 31 Mar 2010 03:35:41 -0400 From: Amit Shah To: qemu list Date: Wed, 31 Mar 2010 13:03:53 +0530 Message-Id: <1270020848-15526-3-git-send-email-amit.shah@redhat.com> In-Reply-To: <1270020848-15526-2-git-send-email-amit.shah@redhat.com> References: <1270020848-15526-1-git-send-email-amit.shah@redhat.com> <1270020848-15526-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: Amit Shah , "Michael S. Tsirkin" , Gerd Hoffmann , Juan Quintela Subject: [Qemu-devel] [PATCH 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 */