From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33493 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PiIjY-0005JX-Bi for qemu-devel@nongnu.org; Wed, 26 Jan 2011 22:41:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PiIjX-0003my-6P for qemu-devel@nongnu.org; Wed, 26 Jan 2011 22:41:20 -0500 Received: from mail.valinux.co.jp ([210.128.90.3]:44106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PiIjW-0003ml-M5 for qemu-devel@nongnu.org; Wed, 26 Jan 2011 22:41:19 -0500 Date: Thu, 27 Jan 2011 12:41:12 +0900 From: Isaku Yamahata Message-ID: <20110127034112.GC4395@valinux.co.jp> References: <1296050691.6390.2.camel@x201> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1296050691.6390.2.camel@x201> Subject: [Qemu-devel] Re: [PATCH] savevm: unbreak register_savevm_live()/vmstate_register_with_alias_id() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: qemu-devel@nongnu.org I sent the patch out too early. I found the issue is in pcibus_get_dev_path(). Sorry for noise. On Wed, Jan 26, 2011 at 07:04:51AM -0700, Alex Williamson wrote: > On Wed, 2011-01-26 at 18:45 +0900, Isaku Yamahata wrote: > > 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. > > Can you give an example of where this is needed? The point of > get_dev_path is that when it's available, it's supposed to provide a > unique string per device. Since get_dev_path is really only implemented > for PCI, does this mean you have two independent devices at the same PCI > address? Thanks, > > Alex > > > 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; > > > -- yamahata