diff options
author | Kevin Wolf <kwolf@redhat.com> | 2011-10-20 16:37:26 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-21 17:34:13 +0200 |
commit | 34d4260e1846d69d7241f690534e3dd4b3e6fd5b (patch) | |
tree | e83d8de7cd4b1eee4a5a10e31e9922a78318adaf /hw/pc.h | |
parent | 8f1efd00c4b2aa2b75fd20b5ee592ed47d33d5a7 (diff) | |
download | qemu-34d4260e1846d69d7241f690534e3dd4b3e6fd5b.zip qemu-34d4260e1846d69d7241f690534e3dd4b3e6fd5b.tar.gz qemu-34d4260e1846d69d7241f690534e3dd4b3e6fd5b.tar.bz2 |
pc: Fix floppy drives with if=none
Commit 63ffb564 broke floppy devices specified on the command line like
-drive file=...,if=none,id=floppy -global isa-fdc.driveA=floppy because it
relies on drive_get() which works only with -fda/-drive if=floppy.
This patch resembles what we're already doing for IDE, i.e. remember the floppy
device that was created and use that to extract the BlockDriverStates where
needed.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'hw/pc.h')
-rw-r--r-- | hw/pc.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -142,11 +142,12 @@ qemu_irq *pc_allocate_cpu_irq(void); void pc_vga_init(PCIBus *pci_bus); void pc_basic_device_init(qemu_irq *gsi, ISADevice **rtc_state, + ISADevice **floppy, bool no_vmport); void pc_init_ne2k_isa(NICInfo *nd); void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size, const char *boot_device, - BusState *ide0, BusState *ide1, + ISADevice *floppy, BusState *ide0, BusState *ide1, ISADevice *s); void pc_pci_device_init(PCIBus *pci_bus); |