From patchwork Tue Apr 27 12:33:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 51060 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 BF8EEB7D57 for ; Tue, 27 Apr 2010 22:43:20 +1000 (EST) Received: from localhost ([127.0.0.1]:40195 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6k4s-0006yF-4S for incoming@patchwork.ozlabs.org; Tue, 27 Apr 2010 08:39:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O6k1D-0005uI-VF for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:04 -0400 Received: from [140.186.70.92] (port=51150 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6k1A-0005sU-35 for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O6k18-0002fc-0P for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:35:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16551) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O6k16-0002ew-Tt for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:35:57 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3RCZte9025130 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 27 Apr 2010 08:35:55 -0400 Received: from localhost (vpn-238-78.phx2.redhat.com [10.3.238.78]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3RCZrfP005208; Tue, 27 Apr 2010 08:35:54 -0400 From: Amit Shah To: Anthony Liguori Date: Tue, 27 Apr 2010 18:03:55 +0530 Message-Id: <1272371652-23087-2-git-send-email-amit.shah@redhat.com> In-Reply-To: <1272371652-23087-1-git-send-email-amit.shah@redhat.com> References: <1272371652-23087-1-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , qemu list , Juan Quintela Subject: [Qemu-devel] [PATCH v6 01/18] virtio-serial: 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 | 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 */