From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YseSY-0002rF-5P for qemu-devel@nongnu.org; Wed, 13 May 2015 17:44:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YseST-0007pI-66 for qemu-devel@nongnu.org; Wed, 13 May 2015 17:44:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YseST-0007p9-0n for qemu-devel@nongnu.org; Wed, 13 May 2015 17:44:53 -0400 Date: Wed, 13 May 2015 23:44:48 +0200 From: "Michael S. Tsirkin" Message-ID: <20150513234344-mutt-send-email-mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH] Do not emulate a floppy drive when -nodefaults List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefano Stabellini Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, rth@twiddle.net On Wed, May 13, 2015 at 06:29:46PM +0100, Stefano Stabellini wrote: > Do not emulate a floppy drive if no drives are supposed to be present. > > This fixes the behavior of -nodefaults, that should remove the floppy > drive (see docs/qdev-device-use.txt:Default Devices), but actually > doesn't. > > Signed-off-by: Stefano Stabellini No telling what this might break. I think a flag or a property to disable fdc would be safer. Default to enabled to make sure we don't break existing users. > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index a8e6be1..c9f50b3 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1410,6 +1410,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > qemu_irq *cpu_exit_irq; > MemoryRegion *ioport80_io = g_new(MemoryRegion, 1); > MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1); > + bool floppy_exist; > > memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1); > memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io); > @@ -1487,10 +1488,17 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); > DMA_init(0, cpu_exit_irq); > > + *floppy = NULL; > + floppy_exist = false; > for(i = 0; i < MAX_FD; i++) { > fd[i] = drive_get(IF_FLOPPY, 0, i); > + if (fd[i] != NULL) { > + floppy_exist = true; > + } > + } > + if (floppy_exist) { > + *floppy = fdctrl_init_isa(isa_bus, fd); > } > - *floppy = fdctrl_init_isa(isa_bus, fd); > } > > void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus) From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH] Do not emulate a floppy drive when -nodefaults Date: Wed, 13 May 2015 23:44:48 +0200 Message-ID: <20150513234344-mutt-send-email-mst@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org To: Stefano Stabellini Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, rth@twiddle.net List-Id: xen-devel@lists.xenproject.org On Wed, May 13, 2015 at 06:29:46PM +0100, Stefano Stabellini wrote: > Do not emulate a floppy drive if no drives are supposed to be present. > > This fixes the behavior of -nodefaults, that should remove the floppy > drive (see docs/qdev-device-use.txt:Default Devices), but actually > doesn't. > > Signed-off-by: Stefano Stabellini No telling what this might break. I think a flag or a property to disable fdc would be safer. Default to enabled to make sure we don't break existing users. > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index a8e6be1..c9f50b3 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1410,6 +1410,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > qemu_irq *cpu_exit_irq; > MemoryRegion *ioport80_io = g_new(MemoryRegion, 1); > MemoryRegion *ioportF0_io = g_new(MemoryRegion, 1); > + bool floppy_exist; > > memory_region_init_io(ioport80_io, NULL, &ioport80_io_ops, NULL, "ioport80", 1); > memory_region_add_subregion(isa_bus->address_space_io, 0x80, ioport80_io); > @@ -1487,10 +1488,17 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, > cpu_exit_irq = qemu_allocate_irqs(cpu_request_exit, NULL, 1); > DMA_init(0, cpu_exit_irq); > > + *floppy = NULL; > + floppy_exist = false; > for(i = 0; i < MAX_FD; i++) { > fd[i] = drive_get(IF_FLOPPY, 0, i); > + if (fd[i] != NULL) { > + floppy_exist = true; > + } > + } > + if (floppy_exist) { > + *floppy = fdctrl_init_isa(isa_bus, fd); > } > - *floppy = fdctrl_init_isa(isa_bus, fd); > } > > void pc_nic_init(ISABus *isa_bus, PCIBus *pci_bus)