QOM and fdc patches patches for 2021-03-16
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmBUsscSHGFybWJydUBy ZWRoYXQuY29tAAoJEDhwtADrkYZTYmwP/i5EbWro0zKsLNX/ezKTg3kNy4mAbYaz +HtzqS9DoSEbFEEglgoNvVzgiy+uvxbCtmr07ONEopR62MRqqANO9/kkI+vxKAIO RQx9VKA/P3iFhh5A4BmaNuLJOx5bznRVSfG8D0T10ELrJQ39EBnS/YqRpfblRpMo Ja33HMvGTWC2cx/tt5vKwlR8JYPr/lN8bQnxqY/rQIPCuAS6palYaj0k6+lGuNA/ VOcBmJxix7bur+SfSkusYUBd44vbzvxwUTFLnckRUspy+cd9sjw34dFAf2cZx5FT 0hwRtzzHxEiDHt23UCreyugRfETX9K2D87pBE9qLp9JfMjrgd9ycwUz3wQDlhl6h u88pV1CGjpMqeD7yLMgMGHoxmoPmkCtZLR/RHLZAKc/QaZb7ZDQWqtst+l9phrVH xRFBWWbJqKvND+XPvML9jHuS2BkqFmtq0dygw+u0L66SboiKEhuvWyfoKVpTPsmo 7LuuAVphHzPA429hifM4/IgzfYsedsckYztANhWB5iqa3mVBLCIhHAZj1wdMnOhT xbO7/AOTeOF+n7TIazk8FBcVc1LVy9Gu0VcoVuvb34F6AuGP/cuepPERYP5PIAEx k9ijDfEXPXdklIRopotSzObpeBinhwnR2t9Qq0+0v4ZI/qz4hyw+lB8PViPMXFty /dpt07RvxH5U =6zPB -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/armbru/tags/pull-qom-fdc-2021-03-16-v5' into staging QOM and fdc patches patches for 2021-03-16 # gpg: Signature made Fri 19 Mar 2021 14:18:47 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "armbru@redhat.com" # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full] # gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * remotes/armbru/tags/pull-qom-fdc-2021-03-16-v5: memory: Drop "qemu:" prefix from QOM memory region type names hw: Replace anti-social QOM type names blockdev: Drop deprecated bogus -drive interface type fdc: Inline fdctrl_connect_drives() into fdctrl_realize_common() fdc: Drop deprecated floppy configuration docs/system/deprecated: Fix note on fdc drive properties fuzz: Avoid deprecated misuse of -drive if=sd Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
8631a430e6
37
blockdev.c
37
blockdev.c
@ -239,19 +239,10 @@ DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void drive_mark_claimed_by_board(void)
|
||||
{
|
||||
BlockBackend *blk;
|
||||
DriveInfo *dinfo;
|
||||
|
||||
for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
|
||||
dinfo = blk_legacy_dinfo(blk);
|
||||
if (dinfo && blk_get_attached_dev(blk)) {
|
||||
dinfo->claimed_by_board = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Check board claimed all -drive that are meant to be claimed.
|
||||
* Fatal error if any remain unclaimed.
|
||||
*/
|
||||
void drive_check_orphaned(void)
|
||||
{
|
||||
BlockBackend *blk;
|
||||
@ -261,7 +252,17 @@ void drive_check_orphaned(void)
|
||||
|
||||
for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
|
||||
dinfo = blk_legacy_dinfo(blk);
|
||||
if (dinfo->is_default || dinfo->type == IF_NONE) {
|
||||
/*
|
||||
* Ignore default drives, because we create certain default
|
||||
* drives unconditionally, then leave them unclaimed. Not the
|
||||
* users fault.
|
||||
* Ignore IF_VIRTIO, because it gets desugared into -device,
|
||||
* so we can leave failing to -device.
|
||||
* Ignore IF_NONE, because leaving unclaimed IF_NONE remains
|
||||
* available for device_add is a feature.
|
||||
*/
|
||||
if (dinfo->is_default || dinfo->type == IF_VIRTIO
|
||||
|| dinfo->type == IF_NONE) {
|
||||
continue;
|
||||
}
|
||||
if (!blk_get_attached_dev(blk)) {
|
||||
@ -272,14 +273,6 @@ void drive_check_orphaned(void)
|
||||
if_name[dinfo->type], dinfo->bus, dinfo->unit);
|
||||
loc_pop(&loc);
|
||||
orphans = true;
|
||||
continue;
|
||||
}
|
||||
if (!dinfo->claimed_by_board && dinfo->type != IF_VIRTIO) {
|
||||
loc_push_none(&loc);
|
||||
qemu_opts_loc_restore(dinfo->opts);
|
||||
warn_report("bogus if=%s is deprecated, use if=none",
|
||||
if_name[dinfo->type]);
|
||||
loc_pop(&loc);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -71,39 +71,6 @@ QEMU 5.1 has three options:
|
||||
to the user to load all the images they need.
|
||||
3. ``-bios <file>`` - Tells QEMU to load the specified file as the firmwrae.
|
||||
|
||||
``Configuring floppies with ``-global``
|
||||
'''''''''''''''''''''''''''''''''''''''
|
||||
|
||||
Use ``-device floppy,...`` instead:
|
||||
::
|
||||
|
||||
-global isa-fdc.driveA=...
|
||||
-global sysbus-fdc.driveA=...
|
||||
-global SUNW,fdtwo.drive=...
|
||||
|
||||
become
|
||||
::
|
||||
|
||||
-device floppy,unit=0,drive=...
|
||||
|
||||
and
|
||||
::
|
||||
|
||||
-global isa-fdc.driveB=...
|
||||
-global sysbus-fdc.driveB=...
|
||||
|
||||
become
|
||||
::
|
||||
|
||||
-device floppy,unit=1,drive=...
|
||||
|
||||
``-drive`` with bogus interface type
|
||||
''''''''''''''''''''''''''''''''''''
|
||||
|
||||
Drives with interface types other than ``if=none`` are for onboard
|
||||
devices. It is possible to use drives the board doesn't pick up with
|
||||
-device. This usage is now deprecated. Use ``if=none`` instead.
|
||||
|
||||
Short-form boolean options (since 6.0)
|
||||
''''''''''''''''''''''''''''''''''''''
|
||||
|
||||
|
@ -64,6 +64,63 @@ The 'file' driver for drives is no longer appropriate for character or host
|
||||
devices and will only accept regular files (S_IFREG). The correct driver
|
||||
for these file types is 'host_cdrom' or 'host_device' as appropriate.
|
||||
|
||||
Floppy controllers' drive properties (removed in 6.0)
|
||||
'''''''''''''''''''''''''''''''''''''''''''''''''''''
|
||||
|
||||
Use ``-device floppy,...`` instead. When configuring onboard floppy
|
||||
controllers
|
||||
::
|
||||
|
||||
-global isa-fdc.driveA=...
|
||||
-global sysbus-fdc.driveA=...
|
||||
-global SUNW,fdtwo.drive=...
|
||||
|
||||
become
|
||||
::
|
||||
|
||||
-device floppy,unit=0,drive=...
|
||||
|
||||
and
|
||||
::
|
||||
|
||||
-global isa-fdc.driveB=...
|
||||
-global sysbus-fdc.driveB=...
|
||||
|
||||
become
|
||||
::
|
||||
|
||||
-device floppy,unit=1,drive=...
|
||||
|
||||
When plugging in a floppy controller
|
||||
::
|
||||
|
||||
-device isa-fdc,...,driveA=...
|
||||
|
||||
becomes
|
||||
::
|
||||
|
||||
-device isa-fdc,...
|
||||
-device floppy,unit=0,drive=...
|
||||
|
||||
and
|
||||
::
|
||||
|
||||
-device isa-fdc,...,driveB=...
|
||||
|
||||
becomes
|
||||
::
|
||||
|
||||
-device isa-fdc,...
|
||||
-device floppy,unit=1,drive=...
|
||||
|
||||
``-drive`` with bogus interface type (removed in 6.0)
|
||||
'''''''''''''''''''''''''''''''''''''''''''''''''''''
|
||||
|
||||
Drives with interface types other than ``if=none`` are for onboard
|
||||
devices. Drives the board doesn't pick up can no longer be used with
|
||||
-device. Use ``if=none`` instead.
|
||||
|
||||
|
||||
QEMU Machine Protocol (QMP) commands
|
||||
------------------------------------
|
||||
|
||||
|
@ -231,7 +231,7 @@ static void zynq_init(MachineState *machine)
|
||||
clock_set_hz(zynq_machine->ps_clk, PS_CLK_FREQUENCY);
|
||||
|
||||
/* Create slcr, keep a pointer to connect clocks */
|
||||
slcr = qdev_new("xilinx,zynq_slcr");
|
||||
slcr = qdev_new("xilinx-zynq_slcr");
|
||||
qdev_connect_clock_in(slcr, "ps_clk", zynq_machine->ps_clk);
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(slcr), &error_fatal);
|
||||
sysbus_mmio_map(SYS_BUS_DEVICE(slcr), 0, 0xF8000000);
|
||||
|
@ -37,7 +37,7 @@
|
||||
#define CS_DREGS 32
|
||||
#define CS_MAXDREG (CS_DREGS - 1)
|
||||
|
||||
#define TYPE_CS4231 "SUNW,CS4231"
|
||||
#define TYPE_CS4231 "sun-CS4231"
|
||||
typedef struct CSState CSState;
|
||||
DECLARE_INSTANCE_CHECKER(CSState, CS4231,
|
||||
TYPE_CS4231)
|
||||
|
@ -870,7 +870,6 @@ struct FDCtrl {
|
||||
uint8_t num_floppies;
|
||||
FDrive drives[MAX_FD];
|
||||
struct {
|
||||
BlockBackend *blk;
|
||||
FloppyDriveType type;
|
||||
} qdev_for_drives[MAX_FD];
|
||||
int reset_sensei;
|
||||
@ -2512,64 +2511,6 @@ void isa_fdc_init_drives(ISADevice *fdc, DriveInfo **fds)
|
||||
fdctrl_init_drives(&ISA_FDC(fdc)->state.bus, fds);
|
||||
}
|
||||
|
||||
static void fdctrl_connect_drives(FDCtrl *fdctrl, DeviceState *fdc_dev,
|
||||
Error **errp)
|
||||
{
|
||||
unsigned int i;
|
||||
FDrive *drive;
|
||||
DeviceState *dev;
|
||||
BlockBackend *blk;
|
||||
bool ok;
|
||||
const char *fdc_name, *drive_suffix;
|
||||
|
||||
for (i = 0; i < MAX_FD; i++) {
|
||||
drive = &fdctrl->drives[i];
|
||||
drive->fdctrl = fdctrl;
|
||||
|
||||
/* If the drive is not present, we skip creating the qdev device, but
|
||||
* still have to initialise the controller. */
|
||||
blk = fdctrl->qdev_for_drives[i].blk;
|
||||
if (!blk) {
|
||||
fd_init(drive);
|
||||
fd_revalidate(drive);
|
||||
continue;
|
||||
}
|
||||
|
||||
fdc_name = object_get_typename(OBJECT(fdc_dev));
|
||||
drive_suffix = !strcmp(fdc_name, "SUNW,fdtwo") ? "" : i ? "B" : "A";
|
||||
warn_report("warning: property %s.drive%s is deprecated",
|
||||
fdc_name, drive_suffix);
|
||||
error_printf("Use -device floppy,unit=%d,drive=... instead.\n", i);
|
||||
|
||||
dev = qdev_new("floppy");
|
||||
qdev_prop_set_uint32(dev, "unit", i);
|
||||
qdev_prop_set_enum(dev, "drive-type", fdctrl->qdev_for_drives[i].type);
|
||||
|
||||
/*
|
||||
* Hack alert: we move the backend from the floppy controller
|
||||
* device to the floppy device. We first need to detach the
|
||||
* controller, or else floppy_create()'s qdev_prop_set_drive()
|
||||
* will die when it attaches floppy device. We also need to
|
||||
* take another reference so that blk_detach_dev() doesn't
|
||||
* free blk while we still need it.
|
||||
*
|
||||
* The hack is probably a bad idea.
|
||||
*/
|
||||
blk_ref(blk);
|
||||
blk_detach_dev(blk, fdc_dev);
|
||||
fdctrl->qdev_for_drives[i].blk = NULL;
|
||||
ok = qdev_prop_set_drive_err(dev, "drive", blk, errp);
|
||||
blk_unref(blk);
|
||||
if (!ok) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!qdev_realize_and_unref(dev, &fdctrl->bus.bus, errp)) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
|
||||
hwaddr mmio_base, DriveInfo **fds)
|
||||
{
|
||||
@ -2596,7 +2537,7 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
|
||||
DeviceState *dev;
|
||||
FDCtrlSysBus *sys;
|
||||
|
||||
dev = qdev_new("SUNW,fdtwo");
|
||||
dev = qdev_new("sun-fdtwo");
|
||||
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
||||
sys = SYSBUS_FDC(dev);
|
||||
sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq);
|
||||
@ -2610,6 +2551,7 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl,
|
||||
Error **errp)
|
||||
{
|
||||
int i, j;
|
||||
FDrive *drive;
|
||||
static int command_tables_inited = 0;
|
||||
|
||||
if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) {
|
||||
@ -2649,7 +2591,13 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl,
|
||||
}
|
||||
|
||||
floppy_bus_create(fdctrl, &fdctrl->bus, dev);
|
||||
fdctrl_connect_drives(fdctrl, dev, errp);
|
||||
|
||||
for (i = 0; i < MAX_FD; i++) {
|
||||
drive = &fdctrl->drives[i];
|
||||
drive->fdctrl = fdctrl;
|
||||
fd_init(drive);
|
||||
fd_revalidate(drive);
|
||||
}
|
||||
}
|
||||
|
||||
static const MemoryRegionPortio fdc_portio_list[] = {
|
||||
@ -2882,8 +2830,6 @@ static Property isa_fdc_properties[] = {
|
||||
DEFINE_PROP_UINT32("iobase", FDCtrlISABus, iobase, 0x3f0),
|
||||
DEFINE_PROP_UINT32("irq", FDCtrlISABus, irq, 6),
|
||||
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_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].type,
|
||||
FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type,
|
||||
FloppyDriveType),
|
||||
@ -2941,8 +2887,6 @@ static const VMStateDescription vmstate_sysbus_fdc ={
|
||||
};
|
||||
|
||||
static Property sysbus_fdc_properties[] = {
|
||||
DEFINE_PROP_DRIVE("driveA", FDCtrlSysBus, state.qdev_for_drives[0].blk),
|
||||
DEFINE_PROP_DRIVE("driveB", FDCtrlSysBus, state.qdev_for_drives[1].blk),
|
||||
DEFINE_PROP_SIGNED("fdtypeA", FDCtrlSysBus, state.qdev_for_drives[0].type,
|
||||
FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type,
|
||||
FloppyDriveType),
|
||||
@ -2971,7 +2915,6 @@ static const TypeInfo sysbus_fdc_info = {
|
||||
};
|
||||
|
||||
static Property sun4m_fdc_properties[] = {
|
||||
DEFINE_PROP_DRIVE("drive", FDCtrlSysBus, state.qdev_for_drives[0].blk),
|
||||
DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].type,
|
||||
FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type,
|
||||
FloppyDriveType),
|
||||
@ -2990,7 +2933,7 @@ static void sun4m_fdc_class_init(ObjectClass *klass, void *data)
|
||||
}
|
||||
|
||||
static const TypeInfo sun4m_fdc_info = {
|
||||
.name = "SUNW,fdtwo",
|
||||
.name = "sun-fdtwo",
|
||||
.parent = TYPE_SYSBUS_FDC,
|
||||
.instance_init = sun4m_fdc_initfn,
|
||||
.class_init = sun4m_fdc_class_init,
|
||||
|
@ -50,7 +50,7 @@
|
||||
#define STAT_TR_IDLE 22
|
||||
#define STAT_TR_RDY 24
|
||||
|
||||
#define TYPE_ETRAX_FS_SERIAL "etraxfs,serial"
|
||||
#define TYPE_ETRAX_FS_SERIAL "etraxfs-serial"
|
||||
typedef struct ETRAXSerial ETRAXSerial;
|
||||
DECLARE_INSTANCE_CHECKER(ETRAXSerial, ETRAX_SERIAL,
|
||||
TYPE_ETRAX_FS_SERIAL)
|
||||
|
@ -289,7 +289,7 @@ void axisdev88_init(MachineState *machine)
|
||||
&gpio_state.iomem);
|
||||
|
||||
|
||||
dev = qdev_new("etraxfs,pic");
|
||||
dev = qdev_new("etraxfs-pic");
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
sysbus_realize_and_unref(s, &error_fatal);
|
||||
sysbus_mmio_map(s, 0, 0x3001c000);
|
||||
@ -323,8 +323,8 @@ void axisdev88_init(MachineState *machine)
|
||||
}
|
||||
|
||||
/* 2 timers. */
|
||||
sysbus_create_varargs("etraxfs,timer", 0x3001e000, irq[0x1b], nmi[1], NULL);
|
||||
sysbus_create_varargs("etraxfs,timer", 0x3005e000, irq[0x1b], nmi[1], NULL);
|
||||
sysbus_create_varargs("etraxfs-timer", 0x3001e000, irq[0x1b], nmi[1], NULL);
|
||||
sysbus_create_varargs("etraxfs-timer", 0x3005e000, irq[0x1b], nmi[1], NULL);
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
etraxfs_ser_create(0x30026000 + i * 0x2000, irq[0x14 + i], serial_hd(i));
|
||||
|
@ -56,7 +56,7 @@
|
||||
#define TCX_THC_CURSMASK 0x900
|
||||
#define TCX_THC_CURSBITS 0x980
|
||||
|
||||
#define TYPE_TCX "SUNW,tcx"
|
||||
#define TYPE_TCX "sun-tcx"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(TCXState, TCX)
|
||||
|
||||
struct TCXState {
|
||||
|
@ -38,7 +38,7 @@
|
||||
#define R_R_GURU 4
|
||||
#define R_MAX 5
|
||||
|
||||
#define TYPE_ETRAX_FS_PIC "etraxfs,pic"
|
||||
#define TYPE_ETRAX_FS_PIC "etraxfs-pic"
|
||||
DECLARE_INSTANCE_CHECKER(struct etrax_pic, ETRAX_FS_PIC,
|
||||
TYPE_ETRAX_FS_PIC)
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
|
||||
/* Define the PMU device */
|
||||
|
||||
#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx,zynqmp-pmu-soc"
|
||||
#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx-zynqmp-pmu-soc"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPPMUSoCState, XLNX_ZYNQMP_PMU_SOC)
|
||||
|
||||
#define XLNX_ZYNQMP_PMU_ROM_SIZE 0x8000
|
||||
|
@ -182,7 +182,7 @@ REG32(DDRIOB, 0xb40)
|
||||
#define ZYNQ_SLCR_MMIO_SIZE 0x1000
|
||||
#define ZYNQ_SLCR_NUM_REGS (ZYNQ_SLCR_MMIO_SIZE / 4)
|
||||
|
||||
#define TYPE_ZYNQ_SLCR "xilinx,zynq_slcr"
|
||||
#define TYPE_ZYNQ_SLCR "xilinx-zynq_slcr"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(ZynqSLCRState, ZYNQ_SLCR)
|
||||
|
||||
struct ZynqSLCRState {
|
||||
|
@ -496,7 +496,7 @@ static void tcx_init(hwaddr addr, qemu_irq irq, int vram_size, int width,
|
||||
DeviceState *dev;
|
||||
SysBusDevice *s;
|
||||
|
||||
dev = qdev_new("SUNW,tcx");
|
||||
dev = qdev_new("sun-tcx");
|
||||
qdev_prop_set_uint32(dev, "vram_size", vram_size);
|
||||
qdev_prop_set_uint16(dev, "width", width);
|
||||
qdev_prop_set_uint16(dev, "height", height);
|
||||
@ -970,7 +970,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
|
||||
}
|
||||
|
||||
if (hwdef->sx_base) {
|
||||
create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000);
|
||||
create_unimplemented_device("sun-sx", hwdef->sx_base, 0x2000);
|
||||
}
|
||||
|
||||
dev = qdev_new("sysbus-m48t08");
|
||||
@ -1045,23 +1045,23 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef,
|
||||
slavio_irq[30], fdc_tc);
|
||||
|
||||
if (hwdef->cs_base) {
|
||||
sysbus_create_simple("SUNW,CS4231", hwdef->cs_base,
|
||||
sysbus_create_simple("sun-CS4231", hwdef->cs_base,
|
||||
slavio_irq[5]);
|
||||
}
|
||||
|
||||
if (hwdef->dbri_base) {
|
||||
/* ISDN chip with attached CS4215 audio codec */
|
||||
/* prom space */
|
||||
create_unimplemented_device("SUNW,DBRI.prom",
|
||||
create_unimplemented_device("sun-DBRI.prom",
|
||||
hwdef->dbri_base + 0x1000, 0x30);
|
||||
/* reg space */
|
||||
create_unimplemented_device("SUNW,DBRI",
|
||||
create_unimplemented_device("sun-DBRI",
|
||||
hwdef->dbri_base + 0x10000, 0x100);
|
||||
}
|
||||
|
||||
if (hwdef->bpp_base) {
|
||||
/* parallel port */
|
||||
create_unimplemented_device("SUNW,bpp", hwdef->bpp_base, 0x20);
|
||||
create_unimplemented_device("sun-bpp", hwdef->bpp_base, 0x20);
|
||||
}
|
||||
|
||||
initrd_size = 0;
|
||||
|
@ -48,7 +48,7 @@
|
||||
#define R_INTR 0x50
|
||||
#define R_MASKED_INTR 0x54
|
||||
|
||||
#define TYPE_ETRAX_FS_TIMER "etraxfs,timer"
|
||||
#define TYPE_ETRAX_FS_TIMER "etraxfs-timer"
|
||||
typedef struct ETRAXTimerState ETRAXTimerState;
|
||||
DECLARE_INSTANCE_CHECKER(ETRAXTimerState, ETRAX_TIMER,
|
||||
TYPE_ETRAX_FS_TIMER)
|
||||
|
@ -33,11 +33,11 @@
|
||||
#define MAX_PHYS_ADDR_SPACE_BITS 62
|
||||
#define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)
|
||||
|
||||
#define TYPE_MEMORY_REGION "qemu:memory-region"
|
||||
#define TYPE_MEMORY_REGION "memory-region"
|
||||
DECLARE_INSTANCE_CHECKER(MemoryRegion, MEMORY_REGION,
|
||||
TYPE_MEMORY_REGION)
|
||||
|
||||
#define TYPE_IOMMU_MEMORY_REGION "qemu:iommu-memory-region"
|
||||
#define TYPE_IOMMU_MEMORY_REGION "iommu-memory-region"
|
||||
typedef struct IOMMUMemoryRegionClass IOMMUMemoryRegionClass;
|
||||
DECLARE_OBJ_CHECKERS(IOMMUMemoryRegion, IOMMUMemoryRegionClass,
|
||||
IOMMU_MEMORY_REGION, TYPE_IOMMU_MEMORY_REGION)
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include "target/arm/idau.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_BITBAND "ARM,bitband-memory"
|
||||
#define TYPE_BITBAND "ARM-bitband-memory"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(BitBandState, BITBAND)
|
||||
|
||||
struct BitBandState {
|
||||
|
@ -34,7 +34,7 @@
|
||||
#include "target/arm/cpu.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_FSL_IMX25 "fsl,imx25"
|
||||
#define TYPE_FSL_IMX25 "fsl-imx25"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(FslIMX25State, FSL_IMX25)
|
||||
|
||||
#define FSL_IMX25_NUM_UARTS 5
|
||||
|
@ -30,7 +30,7 @@
|
||||
#include "target/arm/cpu.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_FSL_IMX31 "fsl,imx31"
|
||||
#define TYPE_FSL_IMX31 "fsl-imx31"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(FslIMX31State, FSL_IMX31)
|
||||
|
||||
#define FSL_IMX31_NUM_UARTS 2
|
||||
|
@ -36,7 +36,7 @@
|
||||
#include "cpu.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_FSL_IMX6 "fsl,imx6"
|
||||
#define TYPE_FSL_IMX6 "fsl-imx6"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(FslIMX6State, FSL_IMX6)
|
||||
|
||||
#define FSL_IMX6_NUM_CPUS 4
|
||||
|
@ -40,7 +40,7 @@
|
||||
#include "cpu.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_FSL_IMX6UL "fsl,imx6ul"
|
||||
#define TYPE_FSL_IMX6UL "fsl-imx6ul"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(FslIMX6ULState, FSL_IMX6UL)
|
||||
|
||||
enum FslIMX6ULConfiguration {
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "cpu.h"
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_FSL_IMX7 "fsl,imx7"
|
||||
#define TYPE_FSL_IMX7 "fsl-imx7"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(FslIMX7State, FSL_IMX7)
|
||||
|
||||
enum FslIMX7Configuration {
|
||||
|
@ -37,7 +37,7 @@
|
||||
#include "net/can_emu.h"
|
||||
#include "hw/dma/xlnx_csu_dma.h"
|
||||
|
||||
#define TYPE_XLNX_ZYNQMP "xlnx,zynqmp"
|
||||
#define TYPE_XLNX_ZYNQMP "xlnx-zynqmp"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(XlnxZynqMPState, XLNX_ZYNQMP)
|
||||
|
||||
#define XLNX_ZYNQMP_NUM_APU_CPUS 4
|
||||
|
@ -41,7 +41,7 @@ static inline DeviceState *etraxfs_ser_create(hwaddr addr,
|
||||
DeviceState *dev;
|
||||
SysBusDevice *s;
|
||||
|
||||
dev = qdev_new("etraxfs,serial");
|
||||
dev = qdev_new("etraxfs-serial");
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
qdev_prop_set_chr(dev, "chardev", chr);
|
||||
sysbus_realize_and_unref(s, &error_fatal);
|
||||
|
@ -216,7 +216,7 @@ struct ICH9LPCState {
|
||||
|
||||
|
||||
/* D31:F3 SMBus controller */
|
||||
#define TYPE_ICH9_SMB_DEVICE "ICH9 SMB"
|
||||
#define TYPE_ICH9_SMB_DEVICE "ICH9-SMB"
|
||||
|
||||
#define ICH9_A2_SMB_REVISION 0x02
|
||||
#define ICH9_SMB_PI 0x00
|
||||
|
@ -25,10 +25,10 @@
|
||||
#define GRLIB_AHB_APB_PNP_H
|
||||
#include "qom/object.h"
|
||||
|
||||
#define TYPE_GRLIB_AHB_PNP "grlib,ahbpnp"
|
||||
#define TYPE_GRLIB_AHB_PNP "grlib-ahbpnp"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(AHBPnp, GRLIB_AHB_PNP)
|
||||
|
||||
#define TYPE_GRLIB_APB_PNP "grlib,apbpnp"
|
||||
#define TYPE_GRLIB_APB_PNP "grlib-apbpnp"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(APBPnp, GRLIB_APB_PNP)
|
||||
|
||||
void grlib_ahb_pnp_add_entry(AHBPnp *dev, uint32_t address, uint32_t mask,
|
||||
|
@ -23,7 +23,7 @@
|
||||
#define ZYNQ_XADC_NUM_ADC_REGS 128
|
||||
#define ZYNQ_XADC_FIFO_DEPTH 15
|
||||
|
||||
#define TYPE_ZYNQ_XADC "xlnx,zynq-xadc"
|
||||
#define TYPE_ZYNQ_XADC "xlnx-zynq-xadc"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(ZynqXADCState, ZYNQ_XADC)
|
||||
|
||||
struct ZynqXADCState {
|
||||
|
@ -87,7 +87,7 @@ struct RegisterInfo {
|
||||
void *opaque;
|
||||
};
|
||||
|
||||
#define TYPE_REGISTER "qemu,register"
|
||||
#define TYPE_REGISTER "qemu-register"
|
||||
DECLARE_INSTANCE_CHECKER(RegisterInfo, REGISTER,
|
||||
TYPE_REGISTER)
|
||||
|
||||
|
@ -32,14 +32,14 @@
|
||||
*/
|
||||
|
||||
/* IRQMP */
|
||||
#define TYPE_GRLIB_IRQMP "grlib,irqmp"
|
||||
#define TYPE_GRLIB_IRQMP "grlib-irqmp"
|
||||
|
||||
void grlib_irqmp_ack(DeviceState *dev, int intno);
|
||||
|
||||
/* GPTimer */
|
||||
#define TYPE_GRLIB_GPTIMER "grlib,gptimer"
|
||||
#define TYPE_GRLIB_GPTIMER "grlib-gptimer"
|
||||
|
||||
/* APB UART */
|
||||
#define TYPE_GRLIB_APB_UART "grlib,apbuart"
|
||||
#define TYPE_GRLIB_APB_UART "grlib-apbuart"
|
||||
|
||||
#endif /* GRLIB_H */
|
||||
|
@ -35,7 +35,6 @@ struct DriveInfo {
|
||||
bool is_default; /* Added by default_drive() ? */
|
||||
int media_cd;
|
||||
QemuOpts *opts;
|
||||
bool claimed_by_board;
|
||||
QTAILQ_ENTRY(DriveInfo) next;
|
||||
};
|
||||
|
||||
|
10
softmmu/vl.c
10
softmmu/vl.c
@ -925,7 +925,7 @@ static const VGAInterfaceInfo vga_interfaces[VGA_TYPE_MAX] = {
|
||||
[VGA_TCX] = {
|
||||
.opt_name = "tcx",
|
||||
.name = "TCX framebuffer",
|
||||
.class_names = { "SUNW,tcx" },
|
||||
.class_names = { "sun-tcx" },
|
||||
},
|
||||
[VGA_CG3] = {
|
||||
.opt_name = "cg3",
|
||||
@ -2511,13 +2511,7 @@ static void qemu_init_board(void)
|
||||
/* From here on we enter MACHINE_PHASE_INITIALIZED. */
|
||||
machine_run_board_init(current_machine);
|
||||
|
||||
/*
|
||||
* TODO To drop support for deprecated bogus if=..., move
|
||||
* drive_check_orphaned() here, replacing this call. Also drop
|
||||
* its deprecation warning, along with DriveInfo member
|
||||
* @claimed_by_board.
|
||||
*/
|
||||
drive_mark_claimed_by_board();
|
||||
drive_check_orphaned();
|
||||
|
||||
realtime_init();
|
||||
|
||||
|
@ -123,15 +123,6 @@ check_floppy_qtree -drive if=floppy,file="$TEST_IMG"
|
||||
check_floppy_qtree -drive if=floppy,file="$TEST_IMG",index=1
|
||||
check_floppy_qtree -drive if=floppy,file="$TEST_IMG" -drive if=floppy,file="$TEST_IMG.2",index=1
|
||||
|
||||
echo
|
||||
echo
|
||||
echo === Using -drive if=none and -global ===
|
||||
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -global isa-fdc.driveA=none0
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -global isa-fdc.driveB=none0
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveA=none0 -global isa-fdc.driveB=none1
|
||||
|
||||
echo
|
||||
echo
|
||||
echo === Using -drive if=none and -device ===
|
||||
@ -145,13 +136,6 @@ echo
|
||||
echo
|
||||
echo === Mixing -fdX and -global ===
|
||||
|
||||
# Working
|
||||
check_floppy_qtree -fda "$TEST_IMG" -drive if=none,file="$TEST_IMG.2" -global isa-fdc.driveB=none0
|
||||
check_floppy_qtree -fdb "$TEST_IMG" -drive if=none,file="$TEST_IMG.2" -global isa-fdc.driveA=none0
|
||||
|
||||
# Conflicting
|
||||
check_floppy_qtree -fda "$TEST_IMG" -drive if=none,file="$TEST_IMG.2" -global isa-fdc.driveA=none0
|
||||
check_floppy_qtree -fdb "$TEST_IMG" -drive if=none,file="$TEST_IMG.2" -global isa-fdc.driveB=none0
|
||||
# Conflicting, -fdX wins
|
||||
check_floppy_qtree -fda "$TEST_IMG" -drive if=none,file="$TEST_IMG.2" -global floppy.drive=none0
|
||||
|
||||
@ -186,23 +170,10 @@ echo
|
||||
echo === Mixing -global and -device ===
|
||||
|
||||
# Working
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveA=none0 -device floppy,drive=none1
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveA=none0 -device floppy,drive=none1,unit=1
|
||||
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveB=none0 -device floppy,drive=none1
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveB=none0 -device floppy,drive=none1,unit=0
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" \
|
||||
-global floppy.drive=none0 -device floppy,unit=0
|
||||
|
||||
# Conflicting
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveA=none0 -device floppy,drive=none1,unit=0
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global isa-fdc.driveB=none0 -device floppy,drive=none1,unit=1
|
||||
check_floppy_qtree -drive if=none,file="$TEST_IMG" -drive if=none,file="$TEST_IMG.2" \
|
||||
-global floppy.drive=none0 -device floppy,drive=none1,unit=0
|
||||
|
||||
@ -227,7 +198,7 @@ echo === Too many floppy drives ===
|
||||
check_floppy_qtree -drive if=floppy,file="$TEST_IMG" \
|
||||
-drive if=none,file="$TEST_IMG.2" \
|
||||
-drive if=none,file="$TEST_IMG.3" \
|
||||
-global isa-fdc.driveB=none0 \
|
||||
-device floppy,drive=none0 \
|
||||
-device floppy,drive=none1
|
||||
|
||||
echo
|
||||
|
@ -12,8 +12,6 @@ Testing:
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -41,8 +39,6 @@ Testing: -fda TEST_DIR/t.qcow2
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -80,8 +76,6 @@ Testing: -fdb TEST_DIR/t.qcow2
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -134,8 +128,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -189,8 +181,6 @@ Testing: -fdb
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -229,8 +219,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -268,8 +256,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -322,8 +308,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -372,150 +356,6 @@ sd0: [not inserted]
|
||||
|
||||
|
||||
|
||||
=== Using -drive if=none and -global ===
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global isa-fdc.driveA=none0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global isa-fdc.driveB=none0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=none0 -global isa-fdc.driveB=none1
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none1"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
|
||||
=== Using -drive if=none and -device ===
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
|
||||
@ -524,8 +364,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -563,8 +401,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -602,8 +438,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -654,130 +488,6 @@ sd0: [not inserted]
|
||||
|
||||
=== Mixing -fdX and -global ===
|
||||
|
||||
Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=none0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "floppy0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=none0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "floppy1"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=none0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
QEMU_PROG: Floppy unit 0 is in use
|
||||
|
||||
Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=none0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
QEMU_PROG: Floppy unit 1 is in use
|
||||
|
||||
Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global floppy.drive=none0
|
||||
QEMU_PROG: -global floppy.drive=... conflicts with drive=floppy0
|
||||
|
||||
@ -790,8 +500,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -845,8 +553,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -900,8 +606,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -955,8 +659,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1019,8 +721,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1074,8 +774,6 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1129,242 +827,12 @@ QEMU_PROG: -device floppy,drive=none0,unit=0: Floppy unit 0 is in use
|
||||
|
||||
=== Mixing -global and -device ===
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=none0 -device floppy,drive=none1
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none1"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/peripheral-anon/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=none0 -device floppy,drive=none1,unit=1
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none1"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/peripheral-anon/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=none0 -device floppy,drive=none1
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none1"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/peripheral-anon/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=none0 -device floppy,drive=none1,unit=0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
isa irq 6
|
||||
bus: floppy-bus.0
|
||||
type floppy-bus
|
||||
dev: floppy, id ""
|
||||
unit = 0 (0x0)
|
||||
drive = "none1"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
dev: floppy, id ""
|
||||
unit = 1 (0x1)
|
||||
drive = "none0"
|
||||
logical_block_size = 512 (512 B)
|
||||
physical_block_size = 512 (512 B)
|
||||
min_io_size = 0 (0 B)
|
||||
opt_io_size = 0 (0 B)
|
||||
discard_granularity = 4294967295 (4 GiB)
|
||||
write-cache = "auto"
|
||||
share-rw = false
|
||||
drive-type = "144"
|
||||
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
none1 (NODE_NAME): TEST_DIR/t.qcow2.2 (qcow2)
|
||||
Attached to: /machine/peripheral-anon/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
Cache mode: writeback
|
||||
|
||||
ide1-cd0: [not inserted]
|
||||
Attached to: /machine/unattached/device[N]
|
||||
Removable device: not locked, tray closed
|
||||
|
||||
sd0: [not inserted]
|
||||
Removable device: not locked, tray closed
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device floppy,unit=0
|
||||
|
||||
dev: isa-fdc, id ""
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1396,16 +864,6 @@ sd0: [not inserted]
|
||||
(qemu) quit
|
||||
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=none0 -device floppy,drive=none1,unit=0
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated
|
||||
Use -device floppy,unit=0,drive=... instead.
|
||||
QEMU_PROG: -device floppy,drive=none1,unit=0: Floppy unit 0 is in use
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=none0 -device floppy,drive=none1,unit=1
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
QEMU_PROG: -device floppy,drive=none1,unit=1: Floppy unit 1 is in use
|
||||
|
||||
Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -global floppy.drive=none0 -device floppy,drive=none1,unit=0
|
||||
QEMU_PROG: -device floppy,drive=none1,unit=0: -global floppy.drive=... conflicts with drive=none1
|
||||
|
||||
@ -1430,9 +888,7 @@ QEMU_PROG: -device floppy,drive=floppy0: Property 'floppy.drive' can't find valu
|
||||
|
||||
=== Too many floppy drives ===
|
||||
|
||||
Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -drive if=none,file=TEST_DIR/t.qcow2.3 -global isa-fdc.driveB=none0 -device floppy,drive=none1
|
||||
QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated
|
||||
Use -device floppy,unit=1,drive=... instead.
|
||||
Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -drive if=none,file=TEST_DIR/t.qcow2.3 -device floppy,drive=none0 -device floppy,drive=none1
|
||||
QEMU_PROG: -device floppy,drive=none1: Can't create floppy unit 2, bus supports only 2 units
|
||||
|
||||
|
||||
@ -1444,8 +900,6 @@ Testing: -device floppy
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1470,8 +924,6 @@ Testing: -device floppy,drive-type=120
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1496,8 +948,6 @@ Testing: -device floppy,drive-type=144
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1522,8 +972,6 @@ Testing: -device floppy,drive-type=288
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1551,8 +999,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1590,8 +1036,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1632,8 +1076,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
@ -1671,8 +1113,6 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
|
||||
iobase = 1008 (0x3f0)
|
||||
irq = 6 (0x6)
|
||||
dma = 2 (0x2)
|
||||
driveA = ""
|
||||
driveB = ""
|
||||
fdtypeA = "auto"
|
||||
fdtypeB = "auto"
|
||||
fallback = "288"
|
||||
|
@ -182,7 +182,7 @@ const generic_fuzz_config predefined_configs[] = {
|
||||
.name = "sdhci-v3",
|
||||
.args = "-nodefaults -device sdhci-pci,sd-spec-version=3 "
|
||||
"-device sd-card,drive=mydrive "
|
||||
"-drive if=sd,index=0,file=null-co://,format=raw,id=mydrive -nographic",
|
||||
"-drive if=none,index=0,file=null-co://,format=raw,id=mydrive -nographic",
|
||||
.objects = "sd*"
|
||||
},{
|
||||
.name = "ehci",
|
||||
|
@ -823,8 +823,8 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"SUNW,fdtwo": {
|
||||
"Name": "SUNW,fdtwo",
|
||||
"sun-fdtwo": {
|
||||
"Name": "sun-fdtwo",
|
||||
"version_id": 2,
|
||||
"minimum_version_id": 2,
|
||||
"Description": {
|
||||
|
@ -628,8 +628,8 @@
|
||||
]
|
||||
}
|
||||
},
|
||||
"SUNW,fdtwo": {
|
||||
"Name": "SUNW,fdtwo",
|
||||
"sun-fdtwo": {
|
||||
"Name": "sun-fdtwo",
|
||||
"version_id": 2,
|
||||
"minimum_version_id": 2,
|
||||
"Description": {
|
||||
|
Loading…
Reference in New Issue
Block a user