From patchwork Wed Mar 31 07:33:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 49090 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 935AFB7C67 for ; Wed, 31 Mar 2010 19:01:26 +1100 (EST) Received: from localhost ([127.0.0.1]:48783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nwspd-0002A4-HC for incoming@patchwork.ozlabs.org; Wed, 31 Mar 2010 03:59:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NwsT0-00069Z-Qq for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:59 -0400 Received: from [140.186.70.92] (port=33072 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NwsSv-00068R-Qk for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NwsSs-000781-9I for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25752) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NwsSr-00077l-W8 for qemu-devel@nongnu.org; Wed, 31 Mar 2010 03:35:50 -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 o2V7ZkR7010080 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 31 Mar 2010 03:35:46 -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 o2V7Zhss009877; Wed, 31 Mar 2010 03:35:44 -0400 From: Amit Shah To: qemu list Date: Wed, 31 Mar 2010 13:03:54 +0530 Message-Id: <1270020848-15526-4-git-send-email-amit.shah@redhat.com> In-Reply-To: <1270020848-15526-3-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> <1270020848-15526-3-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 03/17] virtio-serial: save/load: Ensure we have hot-plugged ports instantiated 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 If some ports that were hot-plugged on the source are not available on the destination, fail migration instead of trying to deref a NULL pointer. Signed-off-by: Amit Shah Reported-by: Juan Quintela --- hw/virtio-serial-bus.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index d31e62d..5316ef6 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -451,6 +451,13 @@ static int virtio_serial_load(QEMUFile *f, void *opaque, int version_id) id = qemu_get_be32(f); port = find_port_by_id(s, id); + if (!port) { + /* + * The requested port was hot-plugged on the source but we + * don't have it + */ + return -EINVAL; + } port->guest_connected = qemu_get_byte(f); }