From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=38387 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OmNT7-0001OS-Ea
	for qemu-devel@nongnu.org; Fri, 20 Aug 2010 05:00:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <armbru@redhat.com>) id 1OmNT6-0006hw-Aa
	for qemu-devel@nongnu.org; Fri, 20 Aug 2010 05:00:57 -0400
Received: from mx1.redhat.com ([209.132.183.28]:20196)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <armbru@redhat.com>) id 1OmNT6-0006hl-3B
	for qemu-devel@nongnu.org; Fri, 20 Aug 2010 05:00:56 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o7K90tFU025001
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 20 Aug 2010 05:00:55 -0400
From: Markus Armbruster <armbru@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] qdev: Reset hotplugged devices
References: <20100803161914.15514.59304.stgit@localhost6.localdomain6>
Date: Fri, 20 Aug 2010 11:00:53 +0200
In-Reply-To: <20100803161914.15514.59304.stgit@localhost6.localdomain6> (Alex
	Williamson's message of "Tue, 03 Aug 2010 10:19:47 -0600")
Message-ID: <m38w41psje.fsf@blackfin.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
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: glommer@redhat.com, qemu-devel@nongnu.org

Alex Williamson <alex.williamson@redhat.com> writes:

> Several devices rely on their reset() function being called to
> initialize device state, e1000 and rtl8139 in particular.  When
> the device is hot added, the reset doesn't occur, often leaving
> the device in an unusable state.  Adding a call to reset() after
> init() for hotplugged devices puts the device in the expected
> state for the guest.
>
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>
>  0.13 candidate?
>
>  hw/qdev.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/hw/qdev.c b/hw/qdev.c
> index e99c73f..b156272 100644
> --- a/hw/qdev.c
> +++ b/hw/qdev.c
> @@ -278,6 +278,9 @@ int qdev_init(DeviceState *dev)
>          qdev_free(dev);
>          return rc;
>      }
> +    if (dev->hotplugged) {
> +        qdev_reset(dev);
> +    }
>      qemu_register_reset(qdev_reset, dev);
>      if (dev->info->vmsd) {
>          vmstate_register_with_alias_id(dev, -1, dev->info->vmsd, dev,

qdev_reset() isn't necessary when !dev->hotplugged, because then
qemu_system_reset() will run shortly, which will call qdev_reset().
Correct?