From nobody Sun May 12 03:29:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=openvz.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661342287517339.8974453007297; Wed, 24 Aug 2022 04:58:07 -0700 (PDT) Received: from localhost ([::1]:33904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQp1J-0000TK-Pe for importer@patchew.org; Wed, 24 Aug 2022 07:58:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQn2N-0003RT-2t; Wed, 24 Aug 2022 05:51:12 -0400 Received: from relay.virtuozzo.com ([130.117.225.111]:55176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQn2K-0003Gy-6D; Wed, 24 Aug 2022 05:51:02 -0400 Received: from [192.168.16.197] (helo=iris.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1oQn0Z-00HV9w-9x; Wed, 24 Aug 2022 11:50:34 +0200 From: "Denis V. Lunev" To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: "Denis V. Lunev" , Vladimir Sementsov-Ogievskiy , Peter Krempa , Markus Armbruster , John Snow , Kevin Wolf , Hanna Reitz Subject: [PATCH 1/2] block: pass OnOffAuto instead of bool to block_acct_setup() Date: Wed, 24 Aug 2022 11:50:43 +0200 Message-Id: <20220824095044.166009-2-den@openvz.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220824095044.166009-1-den@openvz.org> References: <20220824095044.166009-1-den@openvz.org> MIME-Version: 1.0 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=130.117.225.111; envelope-from=den@openvz.org; helo=relay.virtuozzo.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1661342293781100001 Content-Type: text/plain; charset="utf-8" We would have one more place for block_acct_setup() calling, which should not corrupt original value. Signed-off-by: Denis V. Lunev Reviewed-by: Vladimir Sementsov-Ogievskiy CC: Peter Krempa CC: Markus Armbruster CC: John Snow CC: Kevin Wolf CC: Hanna Reitz --- block/accounting.c | 22 ++++++++++++++++++---- blockdev.c | 17 ++++++++++++++--- include/block/accounting.h | 6 +++--- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/block/accounting.c b/block/accounting.c index 2030851d79..6b300c5129 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -40,11 +40,25 @@ void block_acct_init(BlockAcctStats *stats) } } =20 -void block_acct_setup(BlockAcctStats *stats, bool account_invalid, - bool account_failed) +static bool bool_from_onoffauto(OnOffAuto val, bool def) { - stats->account_invalid =3D account_invalid; - stats->account_failed =3D account_failed; + switch (val) { + case ON_OFF_AUTO_AUTO: + return def; + case ON_OFF_AUTO_ON: + return true; + case ON_OFF_AUTO_OFF: + return false; + default: + abort(); + } +} + +void block_acct_setup(BlockAcctStats *stats, enum OnOffAuto account_invali= d, + enum OnOffAuto account_failed) +{ + stats->account_invalid =3D bool_from_onoffauto(account_invalid, true); + stats->account_failed =3D bool_from_onoffauto(account_failed, true); } =20 void block_acct_cleanup(BlockAcctStats *stats) diff --git a/blockdev.c b/blockdev.c index 9230888e34..392d9476e6 100644 --- a/blockdev.c +++ b/blockdev.c @@ -455,6 +455,17 @@ static void extract_common_blockdev_options(QemuOpts *= opts, int *bdrv_flags, } } =20 +static OnOffAuto account_get_opt(QemuOpts *opts, const char *name) +{ + if (!qemu_opt_find(opts, name)) { + return ON_OFF_AUTO_AUTO; + } + if (qemu_opt_get_bool(opts, name, true)) { + return ON_OFF_AUTO_ON; + } + return ON_OFF_AUTO_OFF; +} + /* Takes the ownership of bs_opts */ static BlockBackend *blockdev_init(const char *file, QDict *bs_opts, Error **errp) @@ -462,7 +473,7 @@ static BlockBackend *blockdev_init(const char *file, QD= ict *bs_opts, const char *buf; int bdrv_flags =3D 0; int on_read_error, on_write_error; - bool account_invalid, account_failed; + OnOffAuto account_invalid, account_failed; bool writethrough, read_only; BlockBackend *blk; BlockDriverState *bs; @@ -496,8 +507,8 @@ static BlockBackend *blockdev_init(const char *file, QD= ict *bs_opts, /* extract parameters */ snapshot =3D qemu_opt_get_bool(opts, "snapshot", 0); =20 - account_invalid =3D qemu_opt_get_bool(opts, "stats-account-invalid", t= rue); - account_failed =3D qemu_opt_get_bool(opts, "stats-account-failed", tru= e); + account_invalid =3D account_get_opt(opts, "stats-account-invalid"); + account_failed =3D account_get_opt(opts, "stats-account-failed"); =20 writethrough =3D !qemu_opt_get_bool(opts, BDRV_OPT_CACHE_WB, true); =20 diff --git a/include/block/accounting.h b/include/block/accounting.h index 878b4c3581..b9caad60d5 100644 --- a/include/block/accounting.h +++ b/include/block/accounting.h @@ -27,7 +27,7 @@ =20 #include "qemu/timed-average.h" #include "qemu/thread.h" -#include "qapi/qapi-builtin-types.h" +#include "qapi/qapi-types-common.h" =20 typedef struct BlockAcctTimedStats BlockAcctTimedStats; typedef struct BlockAcctStats BlockAcctStats; @@ -100,8 +100,8 @@ typedef struct BlockAcctCookie { } BlockAcctCookie; =20 void block_acct_init(BlockAcctStats *stats); -void block_acct_setup(BlockAcctStats *stats, bool account_invalid, - bool account_failed); +void block_acct_setup(BlockAcctStats *stats, enum OnOffAuto account_invali= d, + enum OnOffAuto account_failed); void block_acct_cleanup(BlockAcctStats *stats); void block_acct_add_interval(BlockAcctStats *stats, unsigned interval_leng= th); BlockAcctTimedStats *block_acct_interval_next(BlockAcctStats *stats, --=20 2.32.0 From nobody Sun May 12 03:29:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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=openvz.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661339279428691.3627629995624; Wed, 24 Aug 2022 04:07:59 -0700 (PDT) Received: from localhost ([::1]:51600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQoEo-0008N2-12 for importer@patchew.org; Wed, 24 Aug 2022 07:07:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQn2U-0003SM-KR; Wed, 24 Aug 2022 05:51:12 -0400 Received: from relay.virtuozzo.com ([130.117.225.111]:55178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQn2K-0003Gz-4b; Wed, 24 Aug 2022 05:51:09 -0400 Received: from [192.168.16.197] (helo=iris.sw.ru) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1oQn0Z-00HV9w-K7; Wed, 24 Aug 2022 11:50:34 +0200 From: "Denis V. Lunev" To: qemu-block@nongnu.org, qemu-devel@nongnu.org Cc: "Denis V. Lunev" , Vladimir Sementsov-Ogievskiy , Peter Krempa , Markus Armbruster , John Snow , Kevin Wolf , Hanna Reitz Subject: [PATCH 2/2] block: add missed block_acct_setup with new block device init procedure Date: Wed, 24 Aug 2022 11:50:44 +0200 Message-Id: <20220824095044.166009-3-den@openvz.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220824095044.166009-1-den@openvz.org> References: <20220824095044.166009-1-den@openvz.org> MIME-Version: 1.0 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=130.117.225.111; envelope-from=den@openvz.org; helo=relay.virtuozzo.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1661339280717100001 Content-Type: text/plain; charset="utf-8" Commit 5f76a7aac156ca75680dad5df4a385fd0b58f6b1 is looking harmless from the first glance, but it has changed things a lot. 'libvirt' uses it to detect that it should follow new initialization way and this changes things considerably. With this procedure followed, blockdev_init() is not called anymore and thus block_acct_setup() helper is not called. This means in particular that defaults for block accounting statistics are changed and account_invalid/account_failed are actually initialized as false instead of true originally. This commit changes things to match original world. There are the following constraints: * new default value in block_acct_init() is set to true * block_acct_setup() inside blockdev_init() is called before blkconf_apply_backend_options() * thus newly created option in block device properties has precedence if specified Signed-off-by: Denis V. Lunev Reviewed-by: Vladimir Sementsov-Ogievskiy CC: Peter Krempa CC: Markus Armbruster CC: John Snow CC: Kevin Wolf CC: Hanna Reitz --- block/accounting.c | 8 +++- hw/block/block.c | 2 + include/hw/block/block.h | 7 +++- tests/qemu-iotests/172.out | 76 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 3 deletions(-) diff --git a/block/accounting.c b/block/accounting.c index 6b300c5129..2829745377 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -38,6 +38,8 @@ void block_acct_init(BlockAcctStats *stats) if (qtest_enabled()) { clock_type =3D QEMU_CLOCK_VIRTUAL; } + stats->account_invalid =3D true; + stats->account_failed =3D true; } =20 static bool bool_from_onoffauto(OnOffAuto val, bool def) @@ -57,8 +59,10 @@ static bool bool_from_onoffauto(OnOffAuto val, bool def) void block_acct_setup(BlockAcctStats *stats, enum OnOffAuto account_invali= d, enum OnOffAuto account_failed) { - stats->account_invalid =3D bool_from_onoffauto(account_invalid, true); - stats->account_failed =3D bool_from_onoffauto(account_failed, true); + stats->account_invalid =3D bool_from_onoffauto(account_invalid, + stats->account_invalid); + stats->account_failed =3D bool_from_onoffauto(account_failed, + stats->account_failed); } =20 void block_acct_cleanup(BlockAcctStats *stats) diff --git a/hw/block/block.c b/hw/block/block.c index 04279166ee..f9c4fe6767 100644 --- a/hw/block/block.c +++ b/hw/block/block.c @@ -205,6 +205,8 @@ bool blkconf_apply_backend_options(BlockConf *conf, boo= l readonly, blk_set_enable_write_cache(blk, wce); blk_set_on_error(blk, rerror, werror); =20 + block_acct_setup(blk_get_stats(blk), conf->account_invalid, + conf->account_failed); return true; } =20 diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 5902c0440a..15fff66435 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -31,6 +31,7 @@ typedef struct BlockConf { uint32_t lcyls, lheads, lsecs; OnOffAuto wce; bool share_rw; + OnOffAuto account_invalid, account_failed; BlockdevOnError rerror; BlockdevOnError werror; } BlockConf; @@ -61,7 +62,11 @@ static inline unsigned int get_physical_block_exp(BlockC= onf *conf) _conf.discard_granularity, -1), \ DEFINE_PROP_ON_OFF_AUTO("write-cache", _state, _conf.wce, \ ON_OFF_AUTO_AUTO), \ - DEFINE_PROP_BOOL("share-rw", _state, _conf.share_rw, false) + DEFINE_PROP_BOOL("share-rw", _state, _conf.share_rw, false), \ + DEFINE_PROP_ON_OFF_AUTO("account-invalid", _state, \ + _conf.account_invalid, ON_OFF_AUTO_AUTO), \ + DEFINE_PROP_ON_OFF_AUTO("account-failed", _state, \ + _conf.account_failed, ON_OFF_AUTO_AUTO) =20 #define DEFINE_BLOCK_PROPERTIES(_state, _conf) \ DEFINE_PROP_DRIVE("drive", _state, _conf.blk), \ diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 9479b92185..07eebf3583 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -28,6 +28,8 @@ Formatting 'TEST_DIR/t.IMGFMT.3', fmt=3DIMGFMT size=3D737= 280 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" =20 =20 @@ -55,6 +57,8 @@ Testing: -fda TEST_DIR/t.qcow2 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -92,6 +96,8 @@ Testing: -fdb TEST_DIR/t.qcow2 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -104,6 +110,8 @@ Testing: -fdb TEST_DIR/t.qcow2 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -145,6 +153,8 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -157,6 +167,8 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -199,6 +211,8 @@ Testing: -fdb discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" dev: floppy, id "" unit =3D 0 (0x0) @@ -211,6 +225,8 @@ Testing: -fdb discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" =20 =20 @@ -238,6 +254,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -275,6 +293,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -287,6 +307,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -328,6 +350,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -340,6 +364,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -385,6 +411,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -422,6 +450,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -459,6 +489,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -471,6 +503,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -522,6 +556,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -534,6 +570,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -576,6 +614,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -588,6 +628,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -630,6 +672,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 1 (0x1) @@ -642,6 +686,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -684,6 +730,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 1 (0x1) @@ -696,6 +744,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -747,6 +797,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -759,6 +811,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -801,6 +855,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" dev: floppy, id "" unit =3D 0 (0x0) @@ -813,6 +869,8 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dnone,file=3DTEST_DIR/t.q discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/unattached/device[N] @@ -861,6 +919,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -glob= al floppy.drive=3Dnone0 -device discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -928,6 +988,8 @@ Testing: -device floppy discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" =20 Testing: -device floppy,drive-type=3D120 @@ -952,6 +1014,8 @@ Testing: -device floppy,drive-type=3D120 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "120" =20 Testing: -device floppy,drive-type=3D144 @@ -976,6 +1040,8 @@ Testing: -device floppy,drive-type=3D144 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" =20 Testing: -device floppy,drive-type=3D288 @@ -1000,6 +1066,8 @@ Testing: -device floppy,drive-type=3D288 discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" =20 =20 @@ -1027,6 +1095,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "120" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -1064,6 +1134,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "288" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -1104,6 +1176,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] @@ -1141,6 +1215,8 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica discard_granularity =3D 4294967295 (4 GiB) write-cache =3D "auto" share-rw =3D false + account-invalid =3D "auto" + account-failed =3D "auto" drive-type =3D "144" none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) Attached to: /machine/peripheral-anon/device[N] --=20 2.32.0