mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: add missed block_acct_setup with new block device init procedure

Browse Source 
Commit 5f76a7aac1 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 <den@openvz.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
CC: Peter Krempa <pkrempa@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
CC: John Snow <jsnow@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220824095044.166009-3-den@openvz.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Denis V. Lunev 2022-08-24 11:50:44 +02:00 committed by Kevin Wolf
parent b2aaf35477
commit 62a6c300f1
5 changed files with 92 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/accounting.c
View File

@ -38,6 +38,8 @@ void block_acct_init(BlockAcctStats *stats)
if (qtest_enabled()) { if (qtest_enabled()) {
clock_type = QEMU_CLOCK_VIRTUAL; clock_type = QEMU_CLOCK_VIRTUAL;
} }
stats->account_invalid = true;
stats->account_failed = true;
} }
static bool bool_from_onoffauto(OnOffAuto val, bool def) 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_invalid, void block_acct_setup(BlockAcctStats *stats, enum OnOffAuto account_invalid,
enum OnOffAuto account_failed) enum OnOffAuto account_failed)
{ {
stats->account_invalid = bool_from_onoffauto(account_invalid, true); stats->account_invalid = bool_from_onoffauto(account_invalid,
stats->account_failed = bool_from_onoffauto(account_failed, true); stats->account_invalid);
stats->account_failed = bool_from_onoffauto(account_failed,
stats->account_failed);
} }
void block_acct_cleanup(BlockAcctStats *stats) void block_acct_cleanup(BlockAcctStats *stats)

2
hw/block/block.c
View File

@ -205,6 +205,8 @@ bool blkconf_apply_backend_options(BlockConf *conf, bool readonly,
blk_set_enable_write_cache(blk, wce); blk_set_enable_write_cache(blk, wce);
blk_set_on_error(blk, rerror, werror); blk_set_on_error(blk, rerror, werror);
block_acct_setup(blk_get_stats(blk), conf->account_invalid,
conf->account_failed);
return true; return true;
} }

7
include/hw/block/block.h
View File

@ -31,6 +31,7 @@ typedef struct BlockConf {
uint32_t lcyls, lheads, lsecs; uint32_t lcyls, lheads, lsecs;
OnOffAuto wce; OnOffAuto wce;
bool share_rw; bool share_rw;
OnOffAuto account_invalid, account_failed;
BlockdevOnError rerror; BlockdevOnError rerror;
BlockdevOnError werror; BlockdevOnError werror;
} BlockConf; } BlockConf;
@ -61,7 +62,11 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
_conf.discard_granularity, -1), \ _conf.discard_granularity, -1), \
DEFINE_PROP_ON_OFF_AUTO("write-cache", _state, _conf.wce, \ DEFINE_PROP_ON_OFF_AUTO("write-cache", _state, _conf.wce, \
ON_OFF_AUTO_AUTO), \ 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)
#define DEFINE_BLOCK_PROPERTIES(_state, _conf) \ #define DEFINE_BLOCK_PROPERTIES(_state, _conf) \
DEFINE_PROP_DRIVE("drive", _state, _conf.blk), \ DEFINE_PROP_DRIVE("drive", _state, _conf.blk), \

76
tests/qemu-iotests/172.out
View File

@ -28,6 +28,8 @@ Testing:
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
@ -55,6 +57,8 @@ Testing: -fda TEST_DIR/t.qcow2
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -92,6 +96,8 @@ Testing: -fdb TEST_DIR/t.qcow2
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -104,6 +110,8 @@ Testing: -fdb TEST_DIR/t.qcow2
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -145,6 +153,8 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -157,6 +167,8 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -199,6 +211,8 @@ Testing: -fdb
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -211,6 +225,8 @@ Testing: -fdb
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
@ -238,6 +254,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -275,6 +293,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -287,6 +307,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2,index=1
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -328,6 +350,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -340,6 +364,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=floppy,file=TEST_DIR/t
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -385,6 +411,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -422,6 +450,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,unit=1
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -459,6 +489,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -471,6 +503,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qco
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -522,6 +556,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -534,6 +570,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -576,6 +614,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -588,6 +628,8 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -630,6 +672,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 1 (0x1) unit = 1 (0x1)
@ -642,6 +686,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -684,6 +730,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 1 (0x1) unit = 1 (0x1)
@ -696,6 +744,8 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.qcow2.2 -device fl
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -747,6 +797,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -759,6 +811,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -801,6 +855,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
dev: floppy, id "" dev: floppy, id ""
unit = 0 (0x0) unit = 0 (0x0)
@ -813,6 +869,8 @@ Testing: -drive if=floppy,file=TEST_DIR/t.qcow2 -drive if=none,file=TEST_DIR/t.q
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/unattached/device[N] Attached to: /machine/unattached/device[N]
@ -861,6 +919,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -global floppy.drive=none0 -device
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -928,6 +988,8 @@ Testing: -device floppy
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
Testing: -device floppy,drive-type=120 Testing: -device floppy,drive-type=120
@ -952,6 +1014,8 @@ Testing: -device floppy,drive-type=120
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "120" drive-type = "120"
Testing: -device floppy,drive-type=144 Testing: -device floppy,drive-type=144
@ -976,6 +1040,8 @@ Testing: -device floppy,drive-type=144
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
Testing: -device floppy,drive-type=288 Testing: -device floppy,drive-type=288
@ -1000,6 +1066,8 @@ Testing: -device floppy,drive-type=288
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
@ -1027,6 +1095,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "120" drive-type = "120"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -1064,6 +1134,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,drive-t
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "288" drive-type = "288"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -1104,6 +1176,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,logical
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]
@ -1141,6 +1215,8 @@ Testing: -drive if=none,file=TEST_DIR/t.qcow2 -device floppy,drive=none0,physica
discard_granularity = 4294967295 (4 GiB) discard_granularity = 4294967295 (4 GiB)
write-cache = "auto" write-cache = "auto"
share-rw = false share-rw = false
account-invalid = "auto"
account-failed = "auto"
drive-type = "144" drive-type = "144"
none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2) none0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)
Attached to: /machine/peripheral-anon/device[N] Attached to: /machine/peripheral-anon/device[N]

4
tests/qemu-iotests/227.out
View File

@ -188,7 +188,7 @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b
], ],
"failed_unmap_operations": 0, "failed_unmap_operations": 0,
"failed_flush_operations": 0, "failed_flush_operations": 0,
"account_invalid": false, "account_invalid": true,
"rd_total_time_ns": 0, "rd_total_time_ns": 0,
"invalid_unmap_operations": 0, "invalid_unmap_operations": 0,
"flush_operations": 0, "flush_operations": 0,
@ -198,7 +198,7 @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b
"rd_bytes": 0, "rd_bytes": 0,
"unmap_total_time_ns": 0, "unmap_total_time_ns": 0,
"invalid_flush_operations": 0, "invalid_flush_operations": 0,
"account_failed": false, "account_failed": true,
"rd_operations": 0, "rd_operations": 0,
"invalid_wr_operations": 0, "invalid_wr_operations": 0,
"invalid_rd_operations": 0 "invalid_rd_operations": 0