diff options
-rw-r--r-- | MAINTAINERS | 21 | ||||
-rw-r--r-- | hw/block/fdc.c | 17 | ||||
-rw-r--r-- | hw/i386/vmmouse.c | 1 | ||||
-rw-r--r-- | hw/i386/xen/xen_platform.c | 13 | ||||
-rw-r--r-- | hw/mem/nvdimm.c | 1 | ||||
-rw-r--r-- | hw/misc/aspeed_xdma.c | 2 | ||||
-rw-r--r-- | hw/misc/sbsa_ec.c | 2 | ||||
-rw-r--r-- | hw/scsi/megasas.c | 4 | ||||
-rw-r--r-- | hw/sd/aspeed_sdhci.c | 2 | ||||
-rw-r--r-- | hw/tpm/tpm_tis_isa.c | 1 | ||||
-rw-r--r-- | hw/tpm/tpm_tis_sysbus.c | 1 | ||||
-rw-r--r-- | hw/usb/u2f-passthru.c | 1 | ||||
-rw-r--r-- | hw/virtio/virtio-pmem.c | 1 | ||||
-rw-r--r-- | include/hw/misc/aspeed_xdma.h | 2 | ||||
-rw-r--r-- | include/hw/sd/aspeed_sdhci.h | 2 | ||||
-rw-r--r-- | target/avr/cpu.c | 4 | ||||
-rw-r--r-- | tests/qemu-iotests/172.out | 35 |
17 files changed, 29 insertions, 81 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5eeba79c5a..da10756abf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -87,7 +87,7 @@ S390 general architecture support M: Cornelia Huck <cohuck@redhat.com> M: Thomas Huth <thuth@redhat.com> S: Supported -F: default-configs/s390x-softmmu.mak +F: default-configs/*/s390x-softmmu.mak F: gdb-xml/s390*.xml F: hw/char/sclp*.[hc] F: hw/char/terminal3270.c @@ -239,7 +239,7 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com> R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> S: Odd Fixes F: target/mips/ -F: default-configs/*mips* +F: default-configs/*/*mips* F: disas/mips.c F: docs/system/cpu-models-mips.rst.inc F: hw/intc/mips_gic.c @@ -263,7 +263,7 @@ S: Maintained F: target/moxie/ F: disas/moxie.c F: hw/moxie/ -F: default-configs/moxie-softmmu.mak +F: default-configs/*/moxie-softmmu.mak NiosII TCG CPUs M: Chris Wulff <crwulff@gmail.com> @@ -272,7 +272,7 @@ S: Maintained F: target/nios2/ F: hw/nios2/ F: disas/nios2.c -F: default-configs/nios2-softmmu.mak +F: default-configs/*/nios2-softmmu.mak OpenRISC TCG CPUs M: Stafford Horne <shorne@gmail.com> @@ -367,7 +367,7 @@ F: hw/xtensa/ F: tests/tcg/xtensa/ F: disas/xtensa.c F: include/hw/xtensa/xtensa-isa.h -F: default-configs/xtensa*.mak +F: default-configs/*/xtensa*.mak TriCore TCG CPUs M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> @@ -1038,7 +1038,7 @@ AVR MCUs M: Michael Rolnik <mrolnik@gmail.com> R: Sarah Harris <S.E.Harris@kent.ac.uk> S: Maintained -F: default-configs/avr-softmmu.mak +F: default-configs/*/avr-softmmu.mak F: hw/avr/ F: include/hw/char/avr_usart.h F: hw/char/avr_usart.c @@ -1067,7 +1067,7 @@ HP B160L M: Richard Henderson <richard.henderson@linaro.org> R: Helge Deller <deller@gmx.de> S: Odd Fixes -F: default-configs/hppa-softmmu.mak +F: default-configs/*/hppa-softmmu.mak F: hw/hppa/ F: pc-bios/hppa-firmware.img @@ -1458,7 +1458,7 @@ F: hw/s390x/ F: include/hw/s390x/ F: hw/watchdog/wdt_diag288.c F: include/hw/watchdog/wdt_diag288.h -F: default-configs/s390x-softmmu.mak +F: default-configs/*/s390x-softmmu.mak F: tests/acceptance/machine_s390_ccw_virtio.py T: git https://gitlab.com/cohuck/qemu.git s390-next T: git https://github.com/borntraeger/qemu.git s390-next @@ -1849,6 +1849,7 @@ F: fsdev/ F: docs/interop/virtfs-proxy-helper.rst F: tests/qtest/virtio-9p-test.c T: git https://gitlab.com/gkurz/qemu.git 9p-next +T: git https://github.com/cschoenebeck/qemu.git 9p.next virtio-blk M: Stefan Hajnoczi <stefanha@redhat.com> @@ -2887,13 +2888,13 @@ F: accel/tcg/user-exec*.c BSD user S: Orphan F: bsd-user/ -F: default-configs/*-bsd-user.mak +F: default-configs/targets/*-bsd-user.mak Linux user M: Laurent Vivier <laurent@vivier.eu> S: Maintained F: linux-user/ -F: default-configs/*-linux-user.mak +F: default-configs/targets/*linux-user.mak F: scripts/qemu-binfmt-conf.sh F: scripts/update-syscalltbl.sh F: scripts/update-mips-syscall-args.sh diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 292ea87805..198940e737 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -874,7 +874,6 @@ struct FDCtrl { FloppyDriveType type; } qdev_for_drives[MAX_FD]; int reset_sensei; - uint32_t check_media_rate; FloppyDriveType fallback; /* type=auto failure fallback */ /* Timers state */ uint8_t timer0; @@ -1021,18 +1020,10 @@ static const VMStateDescription vmstate_fdrive_media_changed = { } }; -static bool fdrive_media_rate_needed(void *opaque) -{ - FDrive *drive = opaque; - - return drive->fdctrl->check_media_rate; -} - static const VMStateDescription vmstate_fdrive_media_rate = { .name = "fdrive/media_rate", .version_id = 1, .minimum_version_id = 1, - .needed = fdrive_media_rate_needed, .fields = (VMStateField[]) { VMSTATE_UINT8(media_rate, FDrive), VMSTATE_END_OF_LIST() @@ -1689,8 +1680,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction) /* Check the data rate. If the programmed data rate does not match * the currently inserted medium, the operation has to fail. */ - if (fdctrl->check_media_rate && - (fdctrl->dsr & FD_DSR_DRATEMASK) != cur_drv->media_rate) { + if ((fdctrl->dsr & FD_DSR_DRATEMASK) != cur_drv->media_rate) { FLOPPY_DPRINTF("data rate mismatch (fdc=%d, media=%d)\n", fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); @@ -2489,8 +2479,7 @@ static void fdctrl_result_timer(void *opaque) cur_drv->sect = (cur_drv->sect % cur_drv->last_sect) + 1; } /* READ_ID can't automatically succeed! */ - if (fdctrl->check_media_rate && - (fdctrl->dsr & FD_DSR_DRATEMASK) != cur_drv->media_rate) { + if ((fdctrl->dsr & FD_DSR_DRATEMASK) != cur_drv->media_rate) { FLOPPY_DPRINTF("read id rate mismatch (fdc=%d, media=%d)\n", fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); @@ -2895,8 +2884,6 @@ static Property isa_fdc_properties[] = { DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.qdev_for_drives[0].blk), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.qdev_for_drives[1].blk), - DEFINE_PROP_BIT("check_media_rate", FDCtrlISABus, state.check_media_rate, - 0, true), DEFINE_PROP_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].type, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index a3556438f0..df4798f502 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -308,6 +308,7 @@ static void vmmouse_class_initfn(ObjectClass *klass, void *data) dc->reset = vmmouse_reset; dc->vmsd = &vmstate_vmmouse; device_class_set_props(dc, vmmouse_properties); + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } static const TypeInfo vmmouse_info = { diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c index 7c4db35deb..01ae1fb161 100644 --- a/hw/i386/xen/xen_platform.c +++ b/hw/i386/xen/xen_platform.c @@ -60,7 +60,6 @@ struct PCIXenPlatformState { MemoryRegion bar; MemoryRegion mmio_bar; uint8_t flags; /* used only for version_id == 2 */ - int drivers_blacklisted; uint16_t driver_product_version; /* Log from guest drivers */ @@ -245,18 +244,10 @@ static void platform_fixed_ioport_writeb(void *opaque, uint32_t addr, uint32_t v static uint32_t platform_fixed_ioport_readw(void *opaque, uint32_t addr) { - PCIXenPlatformState *s = opaque; - switch (addr) { case 0: - if (s->drivers_blacklisted) { - /* The drivers will recognise this magic number and refuse - * to do anything. */ - return 0xd249; - } else { - /* Magic value so that you can identify the interface. */ - return 0x49d2; - } + /* Magic value so that you can identify the interface. */ + return 0x49d2; default: return 0xffff; } diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index e0a9d606e1..7397b67156 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -245,6 +245,7 @@ static void nvdimm_class_init(ObjectClass *oc, void *data) nvc->read_label_data = nvdimm_read_label_data; nvc->write_label_data = nvdimm_write_label_data; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } static TypeInfo nvdimm_info = { diff --git a/hw/misc/aspeed_xdma.c b/hw/misc/aspeed_xdma.c index dca5585a75..533d237e3c 100644 --- a/hw/misc/aspeed_xdma.c +++ b/hw/misc/aspeed_xdma.c @@ -3,7 +3,7 @@ * Eddie James <eajames@linux.ibm.com> * * Copyright (C) 2019 IBM Corp - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/hw/misc/sbsa_ec.c b/hw/misc/sbsa_ec.c index 9a7d7f914a..83020fe9ac 100644 --- a/hw/misc/sbsa_ec.c +++ b/hw/misc/sbsa_ec.c @@ -7,7 +7,7 @@ * Copyright (c) 2020 Nuvia Inc * Written by Graeme Gregory <graeme@nuviainc.com> * - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 1a5fc5857d..5bfc92fca1 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2384,8 +2384,8 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) if (!s->sas_addr) { s->sas_addr = ((NAA_LOCALLY_ASSIGNED_ID << 24) | IEEE_COMPANY_LOCALLY_ASSIGNED) << 36; - s->sas_addr |= (pci_dev_bus_num(dev) << 16); - s->sas_addr |= (PCI_SLOT(dev->devfn) << 8); + s->sas_addr |= pci_dev_bus_num(dev) << 16; + s->sas_addr |= PCI_SLOT(dev->devfn) << 8; s->sas_addr |= PCI_FUNC(dev->devfn); } if (!s->hba_serial) { diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c index 4f24b7d2f9..3299844de6 100644 --- a/hw/sd/aspeed_sdhci.c +++ b/hw/sd/aspeed_sdhci.c @@ -3,7 +3,7 @@ * Eddie James <eajames@linux.ibm.com> * * Copyright (C) 2019 IBM Corp - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later */ #include "qemu/osdep.h" diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 6fd876eebf..10d8a14f19 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -150,6 +150,7 @@ static void tpm_tis_isa_class_init(ObjectClass *klass, void *data) dc->reset = tpm_tis_isa_reset; tc->request_completed = tpm_tis_isa_request_completed; tc->get_version = tpm_tis_isa_get_tpm_version; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static const TypeInfo tpm_tis_isa_info = { diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index 2c32aa7099..45e63efd63 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -139,6 +139,7 @@ static void tpm_tis_sysbus_class_init(ObjectClass *klass, void *data) dc->reset = tpm_tis_sysbus_reset; tc->request_completed = tpm_tis_sysbus_request_completed; tc->get_version = tpm_tis_sysbus_get_tpm_version; + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static const TypeInfo tpm_tis_sysbus_info = { diff --git a/hw/usb/u2f-passthru.c b/hw/usb/u2f-passthru.c index ae00e93f35..fc93429c9c 100644 --- a/hw/usb/u2f-passthru.c +++ b/hw/usb/u2f-passthru.c @@ -534,6 +534,7 @@ static void u2f_passthru_class_init(ObjectClass *klass, void *data) dc->desc = "QEMU U2F passthrough key"; dc->vmsd = &u2f_passthru_vmstate; device_class_set_props(dc, u2f_passthru_properties); + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } static const TypeInfo u2f_key_passthru_info = { diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c index d83e973bf2..a3e0688a89 100644 --- a/hw/virtio/virtio-pmem.c +++ b/hw/virtio/virtio-pmem.c @@ -179,6 +179,7 @@ static void virtio_pmem_class_init(ObjectClass *klass, void *data) vpc->fill_device_info = virtio_pmem_fill_device_info; vpc->get_memory_region = virtio_pmem_get_memory_region; + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } static TypeInfo virtio_pmem_info = { diff --git a/include/hw/misc/aspeed_xdma.h b/include/hw/misc/aspeed_xdma.h index 9869ef4728..a2dea96984 100644 --- a/include/hw/misc/aspeed_xdma.h +++ b/include/hw/misc/aspeed_xdma.h @@ -3,7 +3,7 @@ * Eddie James <eajames@linux.ibm.com> * * Copyright (C) 2019 IBM Corp. - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ASPEED_XDMA_H diff --git a/include/hw/sd/aspeed_sdhci.h b/include/hw/sd/aspeed_sdhci.h index b093d1b861..057bc5f3d1 100644 --- a/include/hw/sd/aspeed_sdhci.h +++ b/include/hw/sd/aspeed_sdhci.h @@ -3,7 +3,7 @@ * Eddie James <eajames@linux.ibm.com> * * Copyright (C) 2019 IBM Corp - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later */ #ifndef ASPEED_SDHCI_H diff --git a/target/avr/cpu.c b/target/avr/cpu.c index fa0f8e0e80..0f4596932b 100644 --- a/target/avr/cpu.c +++ b/target/avr/cpu.c @@ -203,9 +203,7 @@ static void avr_cpu_class_init(ObjectClass *oc, void *data) CPUClass *cc = CPU_CLASS(oc); AVRCPUClass *mcc = AVR_CPU_CLASS(oc); - mcc->parent_realize = dc->realize; - dc->realize = avr_cpu_realizefn; - + device_class_set_parent_realize(dc, avr_cpu_realizefn, &mcc->parent_realize); device_class_set_parent_reset(dc, avr_cpu_reset, &mcc->parent_reset); cc->class_by_name = avr_cpu_class_by_name; diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 2cd4a8fd83..349ae51d6c 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -14,7 +14,6 @@ Testing: dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -44,7 +43,6 @@ Testing: -fda TEST_DIR/t.qcow2 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -84,7 +82,6 @@ Testing: -fdb TEST_DIR/t.qcow2 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -139,7 +136,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -195,7 +191,6 @@ Testing: -fdb dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -236,7 +231,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -276,7 +270,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -331,7 +324,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -392,7 +384,6 @@ Use -device floppy,unit=0,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -434,7 +425,6 @@ Use -device floppy,unit=1,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -478,7 +468,6 @@ Use -device floppy,unit=1,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -537,7 +526,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -577,7 +565,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -617,7 +604,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -678,7 +664,6 @@ Use -device floppy,unit=1,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -736,7 +721,6 @@ Use -device floppy,unit=0,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -808,7 +792,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -864,7 +847,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -920,7 +902,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -976,7 +957,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1041,7 +1021,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1097,7 +1076,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1161,7 +1139,6 @@ Use -device floppy,unit=0,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1219,7 +1196,6 @@ Use -device floppy,unit=0,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1277,7 +1253,6 @@ Use -device floppy,unit=1,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1335,7 +1310,6 @@ Use -device floppy,unit=1,drive=... instead. dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1391,7 +1365,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1473,7 +1446,6 @@ Testing: -device floppy dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1500,7 +1472,6 @@ Testing: -device floppy,drive-type=120 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1527,7 +1498,6 @@ Testing: -device floppy,drive-type=144 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1554,7 +1524,6 @@ Testing: -device floppy,drive-type=288 dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1584,7 +1553,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1624,7 +1592,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1667,7 +1634,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" @@ -1707,7 +1673,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica dma = 2 (0x2) driveA = "" driveB = "" - check_media_rate = true fdtypeA = "auto" fdtypeB = "auto" fallback = "288" |