From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:48625)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1SbjvC-0007zo-Dk
	for qemu-devel@nongnu.org; Mon, 04 Jun 2012 22:55:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1SbjvA-0002G1-NG
	for qemu-devel@nongnu.org; Mon, 04 Jun 2012 22:55:01 -0400
Received: from mx1.redhat.com ([209.132.183.28]:43604)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1SbjvA-0002Fs-FY
	for qemu-devel@nongnu.org; Mon, 04 Jun 2012 22:55:00 -0400
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.14.4/8.14.4) with ESMTP id q552swJX012844
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Mon, 4 Jun 2012 22:54:58 -0400
Date: Mon, 4 Jun 2012 23:54:29 -0300
From: Marcelo Tosatti <mtosatti@redhat.com>
Message-ID: <20120605025429.GA19285@amt.cnet>
References: <cover.1337849630.git.phrdina@redhat.com>
	<1cab04f5945f130fad0d576378d71acd36c0c13e.1337849630.git.phrdina@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1cab04f5945f130fad0d576378d71acd36c0c13e.1337849630.git.phrdina@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v4 1/3] fdc: floppy drive should be visible
 after start without media
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/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: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Pavel Hrdina <phrdina@redhat.com>
Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-devel@nongnu.org, Avi Kivity <avi@redhat.com>

On Thu, May 24, 2012 at 11:02:28AM +0200, Pavel Hrdina wrote:
> If you start guest with floppy drive but without media inserted, guest
> still should see floppy drive pressent.
> 
> Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
> ---
>  hw/pc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/pc.c b/hw/pc.c
> index 4d34a33..967c17a 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -382,7 +382,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
>      if (floppy) {
>          fdc_get_bs(fd, floppy);
>          for (i = 0; i < 2; i++) {
> -            if (fd[i] && bdrv_is_inserted(fd[i])) {
> +            if (fd[i]) {
>                  bdrv_get_floppy_geometry_hint(fd[i], &nb_heads, &max_track,
>                                                &last_sect, FDRIVE_DRV_NONE,
>                                                &fd_type[i], &rate);
> -- 

This commit breaks WinXP.32 installation. It crashes during early setup 
stage, without a floppy disk specified.

Specifying a floppy disk with -fda fixes the problem.