From nobody Mon Feb 9 15:46:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1615924452; cv=none; d=zohomail.com; s=zohoarc; b=CVec9O3rMXW8I3CqqZer6/g8xYewHqdjl+PxkKfw74I3tQ8f2WG1fQ4xnY0zVptIZ1aBPas1SuXuSLCCI5kjXASvtw/lOsEAmZNM8D8XK0XbSAZfhf/1qpNVXHlGciz2gs0bAx4tqjqj36zIYs1n30YsiXvWc4/tq65kGQJJebk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615924452; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=P73mbHZWEKWOJ+udz0i04RWCoN9vx1f1zfg5SMVTcsg=; b=PwsAmg6jJq6TYIUyBJLU9PCX5kY7zdBbmKwZ/lSwHwGb3wrLvHHP2PwW/dEdUSnVNKlQ7KSJxAFH+3U3K90Y5O8KKspgGhNQP58JRGFSx0utF5T19S9XH5BTxmfJ+/qmmzz9Ib07cUzIYxKJ3Bfa4sTwURnsZ3QmejyMXrV7wS4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1615924452214870.4319782884754; Tue, 16 Mar 2021 12:54:12 -0700 (PDT) Received: from localhost ([::1]:57426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMFla-0002R4-SR for importer@patchew.org; Tue, 16 Mar 2021 15:54:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFIN-0000FS-Jy for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:24:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMFII-0002Nh-Pt for qemu-devel@nongnu.org; Tue, 16 Mar 2021 15:23:59 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-223-K-CZwKpXP_eIWD36he6Mng-1; Tue, 16 Mar 2021 15:23:50 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 759571850604; Tue, 16 Mar 2021 19:23:49 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-83.phx2.redhat.com [10.3.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AF00B60CCC; Tue, 16 Mar 2021 19:23:48 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3356E1132C14; Tue, 16 Mar 2021 20:23:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615922633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=P73mbHZWEKWOJ+udz0i04RWCoN9vx1f1zfg5SMVTcsg=; b=dyHY0FfQPut2J8TyjDZYJLr6Va7TPzA7bhyPUdZEN6rkCJZ88/ljI7uRvZQGMQGtvcdikL W0GEh5apnyXSDFYAgx+DENBo76CrNArMptUH0J78vYhi4zspEXuOfbMncmh5HoLvmX4BPR bVL9ZXFY5pDmNCTulqFUIon3QoegtIc= X-MC-Unique: K-CZwKpXP_eIWD36he6Mng-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL v2 2/6] fdc: Drop deprecated floppy configuration Date: Tue, 16 Mar 2021 20:23:43 +0100 Message-Id: <20210316192347.3918857-3-armbru@redhat.com> In-Reply-To: <20210316192347.3918857-1-armbru@redhat.com> References: <20210316192347.3918857-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: John Snow , peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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=C3=A9 Reviewed-by: John Snow Message-id: 20210309161214.1402527-3-armbru@redhat.com Signed-off-by: John Snow --- docs/system/deprecated.rst | 49 --- docs/system/removed-features.rst | 49 +++ hw/block/fdc.c | 54 +-- tests/qemu-iotests/172 | 31 +- tests/qemu-iotests/172.out | 562 +------------------------------ 5 files changed, 53 insertions(+), 692 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index c89d0a207c..8e78ff3dad 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -94,55 +94,6 @@ QEMU 5.1 has three options: to the user to load all the images they need. 3. ``-bios `` - Tells QEMU to load the specified file as the firmwr= ae. =20 -Floppy controllers' drive properties (since 5.1) -'''''''''''''''''''''''''''''''''''''''''''''''' - -Use ``-device floppy,...`` instead. When configuring onboard floppy -controllers -:: - - -global isa-fdc.driveA=3D... - -global sysbus-fdc.driveA=3D... - -global SUNW,fdtwo.drive=3D... - -become -:: - - -device floppy,unit=3D0,drive=3D... - -and -:: - - -global isa-fdc.driveB=3D... - -global sysbus-fdc.driveB=3D... - -become -:: - - -device floppy,unit=3D1,drive=3D... - -When plugging in a floppy controller -:: - - -device isa-fdc,...,driveA=3D... - -becomes -:: - - -device isa-fdc,... - -device floppy,unit=3D0,drive=3D... - -and -:: - - -device isa-fdc,...,driveB=3D... - -becomes -:: - - -device isa-fdc,... - -device floppy,unit=3D1,drive=3D... - ``-drive`` with bogus interface type (since 5.1) '''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/system/removed-features.rst b/docs/system/removed-feature= s.rst index 83148dcfda..1d73567acf 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -38,6 +38,55 @@ or ``-display default,show-cursor=3Don`` instead. QEMU 5.0 introduced an alternative syntax to specify the size of the trans= lation block cache, ``-accel tcg,tb-size=3D``. =20 +Floppy controllers' drive properties (removed in 6.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Use ``-device floppy,...`` instead. When configuring onboard floppy +controllers +:: + + -global isa-fdc.driveA=3D... + -global sysbus-fdc.driveA=3D... + -global SUNW,fdtwo.drive=3D... + +become +:: + + -device floppy,unit=3D0,drive=3D... + +and +:: + + -global isa-fdc.driveB=3D... + -global sysbus-fdc.driveB=3D... + +become +:: + + -device floppy,unit=3D1,drive=3D... + +When plugging in a floppy controller +:: + + -device isa-fdc,...,driveA=3D... + +becomes +:: + + -device isa-fdc,... + -device floppy,unit=3D0,drive=3D... + +and +:: + + -device isa-fdc,...,driveB=3D... + +becomes +:: + + -device isa-fdc,... + -device floppy,unit=3D1,drive=3D... + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 198940e737..f978ddf647 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -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; @@ -2517,56 +2516,12 @@ static void fdctrl_connect_drives(FDCtrl *fdctrl, D= eviceState *fdc_dev, { unsigned int i; FDrive *drive; - DeviceState *dev; - BlockBackend *blk; - bool ok; - const char *fdc_name, *drive_suffix; =20 for (i =3D 0; i < MAX_FD; i++) { drive =3D &fdctrl->drives[i]; drive->fdctrl =3D fdctrl; - - /* If the drive is not present, we skip creating the qdev device, = but - * still have to initialise the controller. */ - blk =3D fdctrl->qdev_for_drives[i].blk; - if (!blk) { - fd_init(drive); - fd_revalidate(drive); - continue; - } - - fdc_name =3D object_get_typename(OBJECT(fdc_dev)); - drive_suffix =3D !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=3D%d,drive=3D... instead.\n"= , i); - - dev =3D qdev_new("floppy"); - qdev_prop_set_uint32(dev, "unit", i); - qdev_prop_set_enum(dev, "drive-type", fdctrl->qdev_for_drives[i].t= ype); - - /* - * 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 =3D NULL; - ok =3D 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; - } + fd_init(drive); + fd_revalidate(drive); } } =20 @@ -2882,8 +2837,6 @@ static Property isa_fdc_properties[] =3D { 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].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), @@ -2941,8 +2894,6 @@ static const VMStateDescription vmstate_sysbus_fdc = =3D{ }; =20 static Property sysbus_fdc_properties[] =3D { - 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].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), @@ -2971,7 +2922,6 @@ static const TypeInfo sysbus_fdc_info =3D { }; =20 static Property sun4m_fdc_properties[] =3D { - DEFINE_PROP_DRIVE("drive", FDCtrlSysBus, state.qdev_for_drives[0].blk), DEFINE_PROP_SIGNED("fdtype", FDCtrlSysBus, state.qdev_for_drives[0].ty= pe, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index 0ac942a6c5..ff269ca7b5 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -123,15 +123,6 @@ check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IM= G" check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG",index=3D1 check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" -drive if=3Dflopp= y,file=3D"$TEST_IMG.2",index=3D1 =20 -echo -echo -echo =3D=3D=3D Using -drive if=3Dnone and -global =3D=3D=3D - -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -global isa-fdc.dri= veA=3Dnone0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -global isa-fdc.dri= veB=3Dnone0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB= =3Dnone1 - echo echo echo =3D=3D=3D Using -drive if=3Dnone and -device =3D=3D=3D @@ -145,13 +136,6 @@ echo echo echo =3D=3D=3D Mixing -fdX and -global =3D=3D=3D =20 -# Working -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveB=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveA=3Dnone0 - -# Conflicting -check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveA=3Dnone0 -check_floppy_qtree -fdb "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global isa-fdc.driveB=3Dnone0 # Conflicting, -fdX wins check_floppy_qtree -fda "$TEST_IMG" -drive if=3Dnone,file=3D"$TEST_IMG.2" = -global floppy.drive=3Dnone0 =20 @@ -186,23 +170,10 @@ echo echo =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 # Working -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D1 - -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D0 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" \ -global floppy.drive=3Dnone0 -device floppy,unit=3D0 =20 # Conflicting -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D0 -check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ - -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dn= one1,unit=3D1 check_floppy_qtree -drive if=3Dnone,file=3D"$TEST_IMG" -drive if=3Dnone,fi= le=3D"$TEST_IMG.2" \ -global floppy.drive=3Dnone0 -device floppy,drive=3Dnon= e1,unit=3D0 =20 @@ -227,7 +198,7 @@ echo =3D=3D=3D Too many floppy drives =3D=3D=3D check_floppy_qtree -drive if=3Dfloppy,file=3D"$TEST_IMG" \ -drive if=3Dnone,file=3D"$TEST_IMG.2" \ -drive if=3Dnone,file=3D"$TEST_IMG.3" \ - -global isa-fdc.driveB=3Dnone0 \ + -device floppy,drive=3Dnone0 \ -device floppy,drive=3Dnone1 =20 echo 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 =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -41,8 +39,6 @@ Testing: -fda TEST_DIR/t.qcow2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -80,8 +76,6 @@ Testing: -fdb TEST_DIR/t.qcow2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -134,8 +128,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -189,8 +181,6 @@ Testing: -fdb iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -229,8 +219,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -268,8 +256,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -322,8 +308,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -372,150 +356,6 @@ sd0: [not inserted] =20 =20 =20 -=3D=3D=3D Using -drive if=3Dnone and -global =3D=3D=3D - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -global isa-fdc.driveA= =3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2 -global isa-fdc.driveB= =3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -global isa-fdc.driveB=3D= none1 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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 - - - =3D=3D=3D Using -drive if=3Dnone and -device =3D=3D=3D =20 Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -device floppy,drive=3Dn= one0 @@ -524,8 +364,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -563,8 +401,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -602,8 +438,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -654,130 +488,6 @@ sd0: [not inserted] =20 =3D=3D=3D Mixing -fdX and -global =3D=3D=3D =20 -Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveB=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "floppy0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveA=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "floppy1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveA=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. -QEMU_PROG: Floppy unit 0 is in use - -Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global isa-fdc.driveB=3Dnone0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. -QEMU_PROG: Floppy unit 1 is in use - Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.2 = -global floppy.drive=3Dnone0 QEMU_PROG: -global floppy.drive=3D... conflicts with drive=3Dfloppy0 =20 @@ -790,8 +500,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -845,8 +553,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -900,8 +606,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -955,8 +659,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1019,8 +721,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -d= rive if=3Dnone,file=3DTEST_DIR/t.q iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1074,8 +774,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -d= rive if=3Dnone,file=3DTEST_DIR/t.q iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1129,242 +827,12 @@ QEMU_PROG: -device floppy,drive=3Dnone0,unit=3D0: F= loppy unit 0 is in use =20 =3D=3D=3D Mixing -global and -device =3D=3D=3D =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D1 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D0 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. - - dev: isa-fdc, id "" - iobase =3D 1008 (0x3f0) - irq =3D 6 (0x6) - dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" - fdtypeA =3D "auto" - fdtypeB =3D "auto" - fallback =3D "288" - isa irq 6 - bus: floppy-bus.0 - type floppy-bus - dev: floppy, id "" - unit =3D 0 (0x0) - drive =3D "none1" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "144" - dev: floppy, id "" - unit =3D 1 (0x1) - drive =3D "none0" - logical_block_size =3D 512 (512 B) - physical_block_size =3D 512 (512 B) - min_io_size =3D 0 (0 B) - opt_io_size =3D 0 (0 B) - discard_granularity =3D 4294967295 (4 GiB) - write-cache =3D "auto" - share-rw =3D false - drive-type =3D "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=3Dnone,file=3DTEST_DIR/t.qcow2 -global floppy.drive=3Dn= one0 -device floppy,unit=3D0 =20 dev: isa-fdc, id "" iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1396,16 +864,6 @@ sd0: [not inserted] (qemu) quit =20 =20 -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveA=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D0 -QEMU_PROG: warning: warning: property isa-fdc.driveA is deprecated -Use -device floppy,unit=3D0,drive=3D... instead. -QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: Floppy unit 0 is in use - -Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global isa-fdc.driveB=3Dnone0 -device floppy,drive=3Dno= ne1,unit=3D1 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. -QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D1: Floppy unit 1 is in use - Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -global floppy.drive=3Dnone0 -device floppy,drive=3Dnone= 1,unit=3D0 QEMU_PROG: -device floppy,drive=3Dnone1,unit=3D0: -global floppy.drive=3D.= .. conflicts with drive=3Dnone1 =20 @@ -1430,9 +888,7 @@ QEMU_PROG: -device floppy,drive=3Dfloppy0: Property 'f= loppy.drive' can't find valu =20 =3D=3D=3D Too many floppy drives =3D=3D=3D =20 -Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.3 -global is= a-fdc.driveB=3Dnone0 -device floppy,drive=3Dnone1 -QEMU_PROG: warning: warning: property isa-fdc.driveB is deprecated -Use -device floppy,unit=3D1,drive=3D... instead. +Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -drive if=3Dnone,file= =3DTEST_DIR/t.qcow2.2 -drive if=3Dnone,file=3DTEST_DIR/t.qcow2.3 -device fl= oppy,drive=3Dnone0 -device floppy,drive=3Dnone1 QEMU_PROG: -device floppy,drive=3Dnone1: Can't create floppy unit 2, bus s= upports only 2 units =20 =20 @@ -1444,8 +900,6 @@ Testing: -device floppy iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1470,8 +924,6 @@ Testing: -device floppy,drive-type=3D120 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1496,8 +948,6 @@ Testing: -device floppy,drive-type=3D144 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1522,8 +972,6 @@ Testing: -device floppy,drive-type=3D288 iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1551,8 +999,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -dev= ice floppy,drive=3Dnone0,drive-t iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1590,8 +1036,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1632,8 +1076,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1671,8 +1113,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica iobase =3D 1008 (0x3f0) irq =3D 6 (0x6) dma =3D 2 (0x2) - driveA =3D "" - driveB =3D "" fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" --=20 2.26.2