From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=39457 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PQoOZ-0002cG-IT
	for qemu-devel@nongnu.org; Thu, 09 Dec 2010 16:51:31 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1PQoMP-0008T9-Hw
	for qemu-devel@nongnu.org; Thu, 09 Dec 2010 16:49:10 -0500
Received: from mx1.redhat.com ([209.132.183.28]:47968)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <quintela@redhat.com>) id 1PQoMP-0008T2-8e
	for qemu-devel@nongnu.org; Thu, 09 Dec 2010 16:49:09 -0500
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB9Ln8uK015435
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Thu, 9 Dec 2010 16:49:08 -0500
From: Juan Quintela <quintela@redhat.com>
In-Reply-To: <20101209191623.15450.19696.stgit@s20.home> (Alex Williamson's
	message of "Thu, 09 Dec 2010 12:16:24 -0700")
References: <20101209191623.15450.19696.stgit@s20.home>
Date: Thu, 09 Dec 2010 22:49:01 +0100
Message-ID: <m3k4jihb1u.fsf@trasno.mitica>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: [Qemu-devel] Re: [PATCH] rtl8139: IO memory is not part of vmstate
Reply-To: quintela@redhat.com
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alex Williamson <alex.williamson@redhat.com>
Cc: qemu-devel@nongnu.org, mst@redhat.com

Alex Williamson <alex.williamson@redhat.com> wrote:
> The cpu_register_io_memory() value is unique to the VM instance and
> should not be restored after migration/save.  Doing so means we
> could be pointing at arbitrary device's io regions after migration/restore.
>
> In this case, if we start a VM with a single rtl8139, hot add a 2nd,
> migrate the VM, then hot remove the added NIC, the 1st NIC stops
> working and the VM segfaults on reboot.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>
>  hw/rtl8139.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/rtl8139.c b/hw/rtl8139.c
> index d92981d..9c5fc84 100644
> --- a/hw/rtl8139.c
> +++ b/hw/rtl8139.c
> @@ -3186,7 +3186,7 @@ static void rtl8139_pre_save(void *opaque)
>  
>  static const VMStateDescription vmstate_rtl8139 = {
>      .name = "rtl8139",
> -    .version_id = 4,
> +    .version_id = 5,

No need to change version, format is still the same.

>      .minimum_version_id = 3,
>      .minimum_version_id_old = 3,
>      .post_load = rtl8139_post_load,
> @@ -3234,7 +3234,7 @@ static const VMStateDescription vmstate_rtl8139 = {
>  
>          VMSTATE_UNUSED(4),
>          VMSTATE_MACADDR(conf.macaddr, RTL8139State),
> -        VMSTATE_INT32(rtl8139_mmio_io_addr, RTL8139State),
> +        VMSTATE_UNUSED(4),

If we migrate from an old guest: we just ignore the value.
If we migrate to one old guest, we send garbage, but as you told that we
were already sending garbage, it looks ok, no?

>          VMSTATE_UINT32(currTxDesc, RTL8139State),
>          VMSTATE_UINT32(currCPlusRxDesc, RTL8139State),

Later, Juan.