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>
This commit is contained in:
parent
8f1efd00c4
commit
34d4260e18
12
hw/fdc.c
12
hw/fdc.c
@ -1947,6 +1947,18 @@ static int sun4m_fdc_init1(SysBusDevice *dev)
|
|||||||
return fdctrl_init_common(fdctrl);
|
return fdctrl_init_common(fdctrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void fdc_get_bs(BlockDriverState *bs[], ISADevice *dev)
|
||||||
|
{
|
||||||
|
FDCtrlISABus *isa = DO_UPCAST(FDCtrlISABus, busdev, dev);
|
||||||
|
FDCtrl *fdctrl = &isa->state;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < MAX_FD; i++) {
|
||||||
|
bs[i] = fdctrl->drives[i].bs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static const VMStateDescription vmstate_isa_fdc ={
|
static const VMStateDescription vmstate_isa_fdc ={
|
||||||
.name = "fdc",
|
.name = "fdc",
|
||||||
.version_id = 2,
|
.version_id = 2,
|
||||||
|
9
hw/fdc.h
9
hw/fdc.h
@ -7,14 +7,15 @@
|
|||||||
/* fdc.c */
|
/* fdc.c */
|
||||||
#define MAX_FD 2
|
#define MAX_FD 2
|
||||||
|
|
||||||
static inline void fdctrl_init_isa(DriveInfo **fds)
|
static inline ISADevice *fdctrl_init_isa(DriveInfo **fds)
|
||||||
{
|
{
|
||||||
ISADevice *dev;
|
ISADevice *dev;
|
||||||
|
|
||||||
dev = isa_try_create("isa-fdc");
|
dev = isa_try_create("isa-fdc");
|
||||||
if (!dev) {
|
if (!dev) {
|
||||||
return;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fds[0]) {
|
if (fds[0]) {
|
||||||
qdev_prop_set_drive_nofail(&dev->qdev, "driveA", fds[0]->bdrv);
|
qdev_prop_set_drive_nofail(&dev->qdev, "driveA", fds[0]->bdrv);
|
||||||
}
|
}
|
||||||
@ -22,10 +23,14 @@ static inline void fdctrl_init_isa(DriveInfo **fds)
|
|||||||
qdev_prop_set_drive_nofail(&dev->qdev, "driveB", fds[1]->bdrv);
|
qdev_prop_set_drive_nofail(&dev->qdev, "driveB", fds[1]->bdrv);
|
||||||
}
|
}
|
||||||
qdev_init_nofail(&dev->qdev);
|
qdev_init_nofail(&dev->qdev);
|
||||||
|
|
||||||
|
return dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
||||||
target_phys_addr_t mmio_base, DriveInfo **fds);
|
target_phys_addr_t mmio_base, DriveInfo **fds);
|
||||||
void sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base,
|
void sun4m_fdctrl_init(qemu_irq irq, target_phys_addr_t io_base,
|
||||||
DriveInfo **fds, qemu_irq *fdc_tc);
|
DriveInfo **fds, qemu_irq *fdc_tc);
|
||||||
|
void fdc_get_bs(BlockDriverState *bs[], ISADevice *dev);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
25
hw/pc.c
25
hw/pc.c
@ -331,12 +331,12 @@ static void pc_cmos_init_late(void *opaque)
|
|||||||
|
|
||||||
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
|
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
|
||||||
const char *boot_device,
|
const char *boot_device,
|
||||||
BusState *idebus0, BusState *idebus1,
|
ISADevice *floppy, BusState *idebus0, BusState *idebus1,
|
||||||
ISADevice *s)
|
ISADevice *s)
|
||||||
{
|
{
|
||||||
int val, nb, nb_heads, max_track, last_sect, i;
|
int val, nb, nb_heads, max_track, last_sect, i;
|
||||||
FDriveType fd_type[2];
|
FDriveType fd_type[2];
|
||||||
DriveInfo *fd[2];
|
BlockDriverState *fd[MAX_FD];
|
||||||
static pc_cmos_init_late_arg arg;
|
static pc_cmos_init_late_arg arg;
|
||||||
|
|
||||||
/* various important CMOS locations needed by PC/Bochs bios */
|
/* various important CMOS locations needed by PC/Bochs bios */
|
||||||
@ -378,14 +378,16 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* floppy type */
|
/* floppy type */
|
||||||
for (i = 0; i < 2; i++) {
|
if (floppy) {
|
||||||
fd[i] = drive_get(IF_FLOPPY, 0, i);
|
fdc_get_bs(fd, floppy);
|
||||||
if (fd[i] && bdrv_is_inserted(fd[i]->bdrv)) {
|
for (i = 0; i < 2; i++) {
|
||||||
bdrv_get_floppy_geometry_hint(fd[i]->bdrv, &nb_heads, &max_track,
|
if (fd[i] && bdrv_is_inserted(fd[i])) {
|
||||||
&last_sect, FDRIVE_DRV_NONE,
|
bdrv_get_floppy_geometry_hint(fd[i], &nb_heads, &max_track,
|
||||||
&fd_type[i]);
|
&last_sect, FDRIVE_DRV_NONE,
|
||||||
} else {
|
&fd_type[i]);
|
||||||
fd_type[i] = FDRIVE_DRV_NONE;
|
} else {
|
||||||
|
fd_type[i] = FDRIVE_DRV_NONE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val = (cmos_get_fd_drive_type(fd_type[0]) << 4) |
|
val = (cmos_get_fd_drive_type(fd_type[0]) << 4) |
|
||||||
@ -1124,6 +1126,7 @@ static void cpu_request_exit(void *opaque, int irq, int level)
|
|||||||
|
|
||||||
void pc_basic_device_init(qemu_irq *gsi,
|
void pc_basic_device_init(qemu_irq *gsi,
|
||||||
ISADevice **rtc_state,
|
ISADevice **rtc_state,
|
||||||
|
ISADevice **floppy,
|
||||||
bool no_vmport)
|
bool no_vmport)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
@ -1188,7 +1191,7 @@ void pc_basic_device_init(qemu_irq *gsi,
|
|||||||
for(i = 0; i < MAX_FD; i++) {
|
for(i = 0; i < MAX_FD; i++) {
|
||||||
fd[i] = drive_get(IF_FLOPPY, 0, i);
|
fd[i] = drive_get(IF_FLOPPY, 0, i);
|
||||||
}
|
}
|
||||||
fdctrl_init_isa(fd);
|
*floppy = fdctrl_init_isa(fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
void pc_pci_device_init(PCIBus *pci_bus)
|
void pc_pci_device_init(PCIBus *pci_bus)
|
||||||
|
3
hw/pc.h
3
hw/pc.h
@ -142,11 +142,12 @@ qemu_irq *pc_allocate_cpu_irq(void);
|
|||||||
void pc_vga_init(PCIBus *pci_bus);
|
void pc_vga_init(PCIBus *pci_bus);
|
||||||
void pc_basic_device_init(qemu_irq *gsi,
|
void pc_basic_device_init(qemu_irq *gsi,
|
||||||
ISADevice **rtc_state,
|
ISADevice **rtc_state,
|
||||||
|
ISADevice **floppy,
|
||||||
bool no_vmport);
|
bool no_vmport);
|
||||||
void pc_init_ne2k_isa(NICInfo *nd);
|
void pc_init_ne2k_isa(NICInfo *nd);
|
||||||
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
|
void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
|
||||||
const char *boot_device,
|
const char *boot_device,
|
||||||
BusState *ide0, BusState *ide1,
|
ISADevice *floppy, BusState *ide0, BusState *ide1,
|
||||||
ISADevice *s);
|
ISADevice *s);
|
||||||
void pc_pci_device_init(PCIBus *pci_bus);
|
void pc_pci_device_init(PCIBus *pci_bus);
|
||||||
|
|
||||||
|
@ -95,6 +95,7 @@ static void pc_init1(MemoryRegion *system_memory,
|
|||||||
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
|
||||||
BusState *idebus[MAX_IDE_BUS];
|
BusState *idebus[MAX_IDE_BUS];
|
||||||
ISADevice *rtc_state;
|
ISADevice *rtc_state;
|
||||||
|
ISADevice *floppy;
|
||||||
MemoryRegion *ram_memory;
|
MemoryRegion *ram_memory;
|
||||||
MemoryRegion *pci_memory;
|
MemoryRegion *pci_memory;
|
||||||
MemoryRegion *rom_memory;
|
MemoryRegion *rom_memory;
|
||||||
@ -174,7 +175,7 @@ static void pc_init1(MemoryRegion *system_memory,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* init basic PC hardware */
|
/* init basic PC hardware */
|
||||||
pc_basic_device_init(gsi, &rtc_state, xen_enabled());
|
pc_basic_device_init(gsi, &rtc_state, &floppy, xen_enabled());
|
||||||
|
|
||||||
for(i = 0; i < nb_nics; i++) {
|
for(i = 0; i < nb_nics; i++) {
|
||||||
NICInfo *nd = &nd_table[i];
|
NICInfo *nd = &nd_table[i];
|
||||||
@ -207,7 +208,7 @@ static void pc_init1(MemoryRegion *system_memory,
|
|||||||
audio_init(gsi, pci_enabled ? pci_bus : NULL);
|
audio_init(gsi, pci_enabled ? pci_bus : NULL);
|
||||||
|
|
||||||
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
|
pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
|
||||||
idebus[0], idebus[1], rtc_state);
|
floppy, idebus[0], idebus[1], rtc_state);
|
||||||
|
|
||||||
if (pci_enabled && usb_enabled) {
|
if (pci_enabled && usb_enabled) {
|
||||||
usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);
|
usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);
|
||||||
|
Loading…
Reference in New Issue
Block a user