From patchwork Fri Mar 19 11:58:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 48140 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 1EE39B7C48 for ; Fri, 19 Mar 2010 23:10:54 +1100 (EST) Received: from localhost ([127.0.0.1]:46162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsavP-00015O-3A for incoming@patchwork.ozlabs.org; Fri, 19 Mar 2010 08:03:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nsat0-00014R-V2 for qemu-devel@nongnu.org; Fri, 19 Mar 2010 08:01:07 -0400 Received: from [199.232.76.173] (port=35574 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nsat0-00013W-3f for qemu-devel@nongnu.org; Fri, 19 Mar 2010 08:01:06 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nsass-0004fv-34 for qemu-devel@nongnu.org; Fri, 19 Mar 2010 08:01:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22542) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nsasq-0004ez-Pv for qemu-devel@nongnu.org; Fri, 19 Mar 2010 08:00:57 -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 o2JC0Isq028054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 19 Mar 2010 08:00:18 -0400 Received: from localhost (vpn-235-201.phx2.redhat.com [10.3.235.201]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2JC0GUj025461; Fri, 19 Mar 2010 08:00:17 -0400 From: Amit Shah To: qemu-devel@nongnu.org Date: Fri, 19 Mar 2010 17:28:38 +0530 Message-Id: <1268999926-29560-2-git-send-email-amit.shah@redhat.com> In-Reply-To: <1268999926-29560-1-git-send-email-amit.shah@redhat.com> References: <1268999926-29560-1-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , quintela@redhat.com, mst@redhat.com, kraxel@redhat.com, virtualization@lists.linux-foundation.org Subject: [Qemu-devel] [PATCH 1/9] virtio-serial-bus: save/load: Ensure target has enough ports 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 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 Reported-by: Juan Quintela --- 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 */