From 36585e2b12c25133b88fc8acfc5c603b0b539074 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 9 Mar 2021 17:12:11 +0100 Subject: fdc: Drop deprecated floppy configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the crap deprecated in commit 4a27a638e7 "fdc: Deprecate configuring floppies with -global isa-fdc" (v5.1.0). Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrangé Reviewed-by: John Snow Message-id: 20210309161214.1402527-3-armbru@redhat.com Signed-off-by: John Snow --- tests/qemu-iotests/172.out | 562 +-------------------------------------------- 1 file changed, 1 insertion(+), 561 deletions(-) (limited to 'tests/qemu-iotests/172.out') diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 349ae51d6c..d53f61d0de 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -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" -- cgit v1.2.3