From patchwork Wed Jan 26 09:45:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 80497 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 2376AB70F9 for ; Wed, 26 Jan 2011 22:11:13 +1100 (EST) Received: from localhost ([127.0.0.1]:55386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi3HK-00017H-D0 for incoming@patchwork.ozlabs.org; Wed, 26 Jan 2011 06:11:10 -0500 Received: from [140.186.70.92] (port=57366 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi1we-0005VE-JC for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pi1wW-0006qd-1W for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:44 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:43643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pi1wV-0006qS-OJ for qemu-devel@nongnu.org; Wed, 26 Jan 2011 04:45:35 -0500 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 7EF9C8748B; Wed, 26 Jan 2011 18:45:34 +0900 (JST) Received: (nullmailer pid 10223 invoked by uid 1000); Wed, 26 Jan 2011 09:45:34 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Wed, 26 Jan 2011 18:45:34 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: yamahata@valinux.co.jp, Alex Williamson Subject: [Qemu-devel] [PATCH] savevm: unbreak register_savevm_live()/vmstate_register_with_alias_id() 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 This patch unbreaks 7685ee6abcb939104801f84b3fe9645412528088. With the changeset, more than one instances of same device on bus that provides get_dev_path method can't be created because it hits the assertion. This patch removes the assertion whose assumption isn't correct. Cc: Alex Williamson Signed-off-by: Isaku Yamahata --- savevm.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/savevm.c b/savevm.c index fcd8db4..cd29eb8 100644 --- a/savevm.c +++ b/savevm.c @@ -1126,7 +1126,6 @@ int register_savevm_live(DeviceState *dev, } else { se->instance_id = instance_id; } - assert(!se->compat || se->instance_id == 0); /* add at the end of list */ QTAILQ_INSERT_TAIL(&savevm_handlers, se, entry); return 0; @@ -1236,7 +1235,6 @@ int vmstate_register_with_alias_id(DeviceState *dev, int instance_id, } else { se->instance_id = instance_id; } - assert(!se->compat || se->instance_id == 0); /* add at the end of list */ QTAILQ_INSERT_TAIL(&savevm_handlers, se, entry); return 0;