The following changes since commit 75ee62ac606bfc9eb59310b9446df3434bf6e8c2:

Merge remote-tracking branch 'remotes/ehabkost-gl/tags/x86-next-pull-request' into staging (2020-12-17 18:53:36 +0000)

for you to fetch changes up to be7c5ddd0d80e2d6cf8e3ef12c049851d28d9c26:

block/vpc: Use sizeof() instead of HEADER_SIZE for footer size (2020-12-18 12:43:30 +0100)

- Add qemu-storage-daemon documentation

- hw/block/nand: Decommission the NAND museum

- vpc: Clean up some buffer abuse

- nfs: fix int overflow in nfs_client_open_qdict

- Several iotests fixes

Markus Armbruster (9):

block/vpc: Make vpc_open() read the full dynamic header

block/vpc: Don't abuse the footer buffer as BAT sector buffer

block/vpc: Don't abuse the footer buffer for dynamic header

block/vpc: Make vpc_checksum() take void *

block/vpc: Pad VHDDynDiskHeader, replace uint8_t[] buffers

block/vpc: Use sizeof() instead of 1024 for dynamic header size

block/vpc: Pad VHDFooter, replace uint8_t[] buffers

block/vpc: Pass footer buffers as VHDFooter * instead of uint8_t *

block/vpc: Use sizeof() instead of HEADER_SIZE for footer size

Max Reitz (1):

iotests/210: Fix reference output

Peter Lieven (1):

block/nfs: fix int overflow in nfs_client_open_qdict

Philippe Mathieu-Daudé (1):

hw/block/nand: Decommission the NAND museum

Stefan Hajnoczi (3):

docs: generate qemu-storage-daemon-qmp-ref(7) man page

docs: add qemu-storage-daemon(1) man page

MAINTAINERS: add Kevin Wolf as storage daemon maintainer

Vladimir Sementsov-Ogievskiy (2):

iotests: make _filter_qom_path more strict

iotests:172: use _filter_qom_path

docs/interop/conf.py | 2 +

docs/interop/index.rst | 1 +

docs/interop/qemu-storage-daemon-qmp-ref.rst | 13 +++

docs/meson.build | 1 +

docs/tools/conf.py | 2 +

docs/tools/index.rst | 1 +

docs/tools/qemu-storage-daemon.rst | 148 ++++++++++++++++++++++++++

block/nfs.c | 2 +-

block/vpc.c | 146 +++++++++++++------------

hw/block/nand.c | 12 +--

MAINTAINERS | 9 ++

storage-daemon/qapi/qapi-schema.json | 3 +

tests/qemu-iotests/172 | 2 +-

tests/qemu-iotests/172.out | 152 +++++++++++++--------------

tests/qemu-iotests/186.out | 56 +++++-----

tests/qemu-iotests/210.out | 2 +-

tests/qemu-iotests/common.filter | 2 +-

17 files changed, 361 insertions(+), 193 deletions(-)

create mode 100644 docs/interop/qemu-storage-daemon-qmp-ref.rst

create mode 100644 docs/tools/qemu-storage-daemon.rst

Commit 8b1170012b1 has added a global maximum disk length for the block

layer, so the error message when creating an overly large disk has

changed.

Message-Id: <20201214175158.299919-1-mreitz@redhat.com>

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

tests/qemu-iotests/210.out | 2 +-

diff --git a/tests/qemu-iotests/210.out b/tests/qemu-iotests/210.out

--- a/tests/qemu-iotests/210.out

+++ b/tests/qemu-iotests/210.out

@@ -XXX,XX +XXX,XX @@ Job failed: The requested file size is too large

=== Resize image with invalid sizes ===

{"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775296}}

-{"error": {"class": "GenericError", "desc": "The requested file size is too large"}}

+{"error": {"class": "GenericError", "desc": "Required too big image size, it must be not greater than 9223372035781033984"}}

{"execute": "block_resize", "arguments": {"node-name": "node1", "size": 9223372036854775808}}

{"error": {"class": "GenericError", "desc": "Invalid parameter type for 'size', expected: integer"}}

{"execute": "block_resize", "arguments": {"node-name": "node1", "size": 18446744073709551104}}

2.29.2

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

This is the QEMU equivalent of this Linux commit (but 7 years later):

https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=f7025a43a9da2

The MTD subsystem has its own small museum of ancient NANDs

in a form of the CONFIG_MTD_NAND_MUSEUM_IDS configuration option.

The museum contains stone age NANDs with 256 bytes pages, as well

as iron age NANDs with 512 bytes per page and up to 8MiB page size.

It is with great sorrow that I inform you that the museum is being

decommissioned. The MTD subsystem is out of budget for Kconfig

options and already has too many of them, and there is a general

kernel trend to simplify the configuration menu.

We remove the stone age exhibits along with closing the museum,

but some of the iron age ones are transferred to the regular NAND

depot. Namely, only those which have unique device IDs are

transferred, and the ones which have conflicting device IDs are

removed.

The machine using this device are:

- axis-dev88

- tosa (via tc6393xb_init)

- spitz based (akita, borzoi, terrier)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-Id: <20201214002620.342384-1-f4bug@amsat.org>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

hw/block/nand.c | 12 +-----------

1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/hw/block/nand.c b/hw/block/nand.c

--- a/hw/block/nand.c

+++ b/hw/block/nand.c

@@ -XXX,XX +XXX,XX @@ static void mem_and(uint8_t *dest, const uint8_t *src, size_t n)

# define ADDR_SHIFT        16

# include "nand.c"

-/* Information based on Linux drivers/mtd/nand/nand_ids.c */

+/* Information based on Linux drivers/mtd/nand/raw/nand_ids.c */

static const struct {

int size;

int width;

@@ -XXX,XX +XXX,XX @@ static const struct {

} nand_flash_ids[0x100] = {

[0 ... 0xff] = { 0 },

- [0x6e] = { 1,    8,    8, 4, 0 },

- [0x64] = { 2,    8,    8, 4, 0 },

[0x6b] = { 4,    8,    9, 4, 0 },

- [0xe8] = { 1,    8,    8, 4, 0 },

- [0xec] = { 1,    8,    8, 4, 0 },

- [0xea] = { 2,    8,    8, 4, 0 },

- [0xd5] = { 4,    8,    9, 4, 0 },

[0xe3] = { 4,    8,    9, 4, 0 },

[0xe5] = { 4,    8,    9, 4, 0 },

[0xd6] = { 8,    8,    9, 4, 0 },

-

- [0x39] = { 8,    8,    9, 4, 0 },

[0xe6] = { 8,    8,    9, 4, 0 },

- [0x49] = { 8,    16,    9, 4, NAND_BUSWIDTH_16 },

- [0x59] = { 8,    16,    9, 4, NAND_BUSWIDTH_16 },

[0x33] = { 16,    8,    9, 5, 0 },

[0x73] = { 16,    8,    9, 5, 0 },

2.29.2

From: Peter Lieven <pl@kamp.de>

nfs_client_open returns the file size in sectors. This effectively

makes it impossible to open files larger than 1TB.

Fixes: c22a03454544c2a08f1107c5cc8481a5574533d5

Cc: qemu-stable@nongnu.org

Signed-off-by: Peter Lieven <pl@kamp.de>

Message-Id: <20201209121735.16437-1-pl@kamp.de>

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

block/nfs.c | 2 +-

diff --git a/block/nfs.c b/block/nfs.c

--- a/block/nfs.c

+++ b/block/nfs.c

@@ -XXX,XX +XXX,XX @@ static int64_t nfs_client_open_qdict(NFSClient *client, QDict *options,

int flags, int open_flags, Error **errp)

BlockdevOptionsNfs *opts;

- int ret;

+ int64_t ret;

opts = nfs_options_qdict_to_qapi(options, errp);

if (opts == NULL) {

2.29.2

From: Stefan Hajnoczi <stefanha@redhat.com>

Although individual qemu-storage-daemon QMP commands are identical to

QEMU QMP commands, qemu-storage-daemon only supports a subset of QEMU's

QMP commands. Generate a manual page of just the commands supported by

qemu-storage-daemon so that users know exactly what is available in

qemu-storage-daemon.

Add an h1 heading in storage-daemon/qapi/qapi-schema.json so that

block-core.json is at the h2 heading level.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Message-Id: <20201209103802.350848-2-stefanha@redhat.com>

docs/interop/conf.py | 2 ++

docs/interop/index.rst | 1 +

docs/interop/qemu-storage-daemon-qmp-ref.rst | 13 +++++++++++++

docs/meson.build | 1 +

storage-daemon/qapi/qapi-schema.json | 3 +++

5 files changed, 20 insertions(+)

create mode 100644 docs/interop/qemu-storage-daemon-qmp-ref.rst

diff --git a/docs/interop/conf.py b/docs/interop/conf.py

--- a/docs/interop/conf.py

+++ b/docs/interop/conf.py

@@ -XXX,XX +XXX,XX @@ man_pages = [

[], 7),

('qemu-qmp-ref', 'qemu-qmp-ref', 'QEMU QMP Reference Manual',

[], 7),

+ ('qemu-storage-daemon-qmp-ref', 'qemu-storage-daemon-qmp-ref',

+ 'QEMU Storage Daemon QMP Reference Manual', [], 7),

]

diff --git a/docs/interop/index.rst b/docs/interop/index.rst

index XXXXXXX..XXXXXXX 100644

--- a/docs/interop/index.rst

+++ b/docs/interop/index.rst

@@ -XXX,XX +XXX,XX @@ Contents:

qemu-ga

qemu-ga-ref

qemu-qmp-ref

+ qemu-storage-daemon-qmp-ref

vhost-user

vhost-user-gpu

vhost-vdpa

diff --git a/docs/interop/qemu-storage-daemon-qmp-ref.rst b/docs/interop/qemu-storage-daemon-qmp-ref.rst

new file mode 100644

index XXXXXXX..XXXXXXX

--- /dev/null

+++ b/docs/interop/qemu-storage-daemon-qmp-ref.rst

+QEMU Storage Daemon QMP Reference Manual

+========================================

+

+..

+ TODO: the old Texinfo manual used to note that this manual

+ is GPL-v2-or-later. We should make that reader-visible

+ both here and in our Sphinx manuals more generally.

+

+..

+ TODO: display the QEMU version, both here and in our Sphinx manuals

+ more generally.

+

+.. qapi-doc:: storage-daemon/qapi/qapi-schema.json

diff --git a/docs/meson.build b/docs/meson.build

index XXXXXXX..XXXXXXX 100644

--- a/docs/meson.build

+++ b/docs/meson.build

@@ -XXX,XX +XXX,XX @@ if build_docs

'qemu-ga.8': (have_tools ? 'man8' : ''),

'qemu-ga-ref.7': 'man7',

'qemu-qmp-ref.7': 'man7',

+ 'qemu-storage-daemon-qmp-ref.7': (have_tools ? 'man7' : ''),

},

'tools': {

'qemu-img.1': (have_tools ? 'man1' : ''),

diff --git a/storage-daemon/qapi/qapi-schema.json b/storage-daemon/qapi/qapi-schema.json

index XXXXXXX..XXXXXXX 100644

--- a/storage-daemon/qapi/qapi-schema.json

+++ b/storage-daemon/qapi/qapi-schema.json

@@ -XXX,XX +XXX,XX @@

{ 'include': '../../qapi/pragma.json' }

+##

+# = Block devices

+##

{ 'include': '../../qapi/block-core.json' }

{ 'include': '../../qapi/block-export.json' }

{ 'include': '../../qapi/char.json' }

2.29.2

docs/tools/conf.py | 2 +

docs/tools/index.rst | 1 +

docs/tools/qemu-storage-daemon.rst | 148 +++++++++++++++++++++++++++++

3 files changed, 151 insertions(+)

create mode 100644 docs/tools/qemu-storage-daemon.rst

diff --git a/docs/tools/conf.py b/docs/tools/conf.py

index XXXXXXX..XXXXXXX 100644

--- a/docs/tools/conf.py

+++ b/docs/tools/conf.py

@@ -XXX,XX +XXX,XX @@ html_theme_options['description'] = \

man_pages = [

('qemu-img', 'qemu-img', u'QEMU disk image utility',

['Fabrice Bellard'], 1),

+ ('qemu-storage-daemon', 'qemu-storage-daemon', u'QEMU storage daemon',

+ [], 1),

('qemu-nbd', 'qemu-nbd', u'QEMU Disk Network Block Device Server',

['Anthony Liguori <anthony@codemonkey.ws>'], 8),

('qemu-pr-helper', 'qemu-pr-helper', 'QEMU persistent reservation helper',

diff --git a/docs/tools/index.rst b/docs/tools/index.rst

index XXXXXXX..XXXXXXX 100644

--- a/docs/tools/index.rst

+++ b/docs/tools/index.rst

@@ -XXX,XX +XXX,XX @@ Contents:

:maxdepth: 2

qemu-img

+ qemu-storage-daemon

qemu-nbd

qemu-pr-helper

qemu-trace-stap

diff --git a/docs/tools/qemu-storage-daemon.rst b/docs/tools/qemu-storage-daemon.rst

+++ b/docs/tools/qemu-storage-daemon.rst

+QEMU Storage Daemon

+===================

+

+Synopsis

+--------

+

+**qemu-storage-daemon** [options]

+

+Description

+-----------

+

+qemu-storage-daemon provides disk image functionality from QEMU, qemu-img, and

+qemu-nbd in a long-running process controlled via QMP commands without running

+a virtual machine. It can export disk images, run block job operations, and

+perform other disk-related operations. The daemon is controlled via a QMP

+monitor and initial configuration from the command-line.

+

+The daemon offers the following subset of QEMU features:

+

+* Block nodes

+* Block jobs

+* Block exports

+* Throttle groups

+* Character devices

+* Crypto and secrets

+* QMP

+* IOThreads

+

+Commands can be sent over a QEMU Monitor Protocol (QMP) connection. See the

+:manpage:`qemu-storage-daemon-qmp-ref(7)` manual page for a description of the

+commands.

+

+The daemon runs until it is stopped using the ``quit`` QMP command or

+SIGINT/SIGHUP/SIGTERM.

+

+**Warning:** Never modify images in use by a running virtual machine or any

+other process; this may destroy the image. Also, be aware that querying an

+image that is being modified by another process may encounter inconsistent

+state.

+

+Options

+-------

+

+.. program:: qemu-storage-daemon

+

+Standard options:

+

+.. option:: -h, --help

+

+ Display help and exit

+

+.. option:: -V, --version

+

+ Display version information and exit

+

+.. option:: -T, --trace [[enable=]PATTERN][,events=FILE][,file=FILE]

+

+ .. include:: ../qemu-option-trace.rst.inc

+

+.. option:: --blockdev BLOCKDEVDEF

+

+ is a block node definition. See the :manpage:`qemu(1)` manual page for a

+ description of block node properties and the :manpage:`qemu-block-drivers(7)`

+ manual page for a description of driver-specific parameters.

+

+.. option:: --chardev CHARDEVDEF

+

+ is a character device definition. See the :manpage:`qemu(1)` manual page for

+ a description of character device properties. A common character device

+ definition configures a UNIX domain socket::

+

+ --chardev socket,id=char1,path=/tmp/qmp.sock,server,nowait

+

+.. option:: --export [type=]nbd,id=<id>,node-name=<node-name>[,name=<export-name>][,writable=on|off][,bitmap=<name>]

+ --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,addr.type=unix,addr.path=<socket-path>[,writable=on|off][,logical-block-size=<block-size>][,num-queues=<num-queues>]

+ --export [type=]vhost-user-blk,id=<id>,node-name=<node-name>,addr.type=fd,addr.str=<fd>[,writable=on|off][,logical-block-size=<block-size>][,num-queues=<num-queues>]

+

+ is a block export definition. ``node-name`` is the block node that should be

+ exported. ``writable`` determines whether or not the export allows write

+ requests for modifying data (the default is off).

+

+ The ``nbd`` export type requires ``--nbd-server`` (see below). ``name`` is

+ the NBD export name. ``bitmap`` is the name of a dirty bitmap reachable from

+ the block node, so the NBD client can use NBD_OPT_SET_META_CONTEXT with the

+ metadata context name "qemu:dirty-bitmap:BITMAP" to inspect the bitmap.

+

+ The ``vhost-user-blk`` export type takes a vhost-user socket address on which

+ it accept incoming connections. Both

+ ``addr.type=unix,addr.path=<socket-path>`` for UNIX domain sockets and

+ ``addr.type=fd,addr.str=<fd>`` for file descriptor passing are supported.

+ ``logical-block-size`` sets the logical block size in bytes (the default is

+ 512). ``num-queues`` sets the number of virtqueues (the default is 1).

+

+.. option:: --monitor MONITORDEF

+

+ is a QMP monitor definition. See the :manpage:`qemu(1)` manual page for

+ a description of QMP monitor properties. A common QMP monitor definition

+ configures a monitor on character device ``char1``::

+

+ --monitor chardev=char1

+

+.. option:: --nbd-server addr.type=inet,addr.host=<host>,addr.port=<port>[,tls-creds=<id>][,tls-authz=<id>][,max-connections=<n>]

+ --nbd-server addr.type=unix,addr.path=<path>[,tls-creds=<id>][,tls-authz=<id>][,max-connections=<n>]

+

+ is a server for NBD exports. Both TCP and UNIX domain sockets are supported.

+ TLS encryption can be configured using ``--object`` tls-creds-* and authz-*

+ secrets (see below).

+

+ To configure an NBD server on UNIX domain socket path ``/tmp/nbd.sock``::

+

+ --nbd-server addr.type=unix,addr.path=/tmp/nbd.sock

+

+.. option:: --object help

+ --object <type>,help

+ --object <type>[,<property>=<value>...]

+

+ is a QEMU user creatable object definition. List object types with ``help``.

+ List object properties with ``<type>,help``. See the :manpage:`qemu(1)`

+ manual page for a description of the object properties.

+

+Examples

+--------

+Launch the daemon with QMP monitor socket ``qmp.sock`` so clients can execute

+QMP commands::

+

+ $ qemu-storage-daemon \

+ --chardev socket,path=qmp.sock,server,nowait,id=char1 \

+ --monitor chardev=char1

+

+Export raw image file ``disk.img`` over NBD UNIX domain socket ``nbd.sock``::

+

+ $ qemu-storage-daemon \

+ --blockdev driver=file,node-name=disk,filename=disk.img \

+ --nbd-server addr.type=unix,addr.path=nbd.sock \

+ --export type=nbd,id=export,node-name=disk,writable=on

+

+Export a qcow2 image file ``disk.qcow2`` as a vhosts-user-blk device over UNIX

+domain socket ``vhost-user-blk.sock``::

+

+ $ qemu-storage-daemon \

+ --blockdev driver=file,node-name=file,filename=disk.qcow2 \

+ --blockdev driver=qcow2,node-name=qcow2,file=file \

+ --export type=vhost-user-blk,id=export,addr.type=unix,addr.path=vhost-user-blk.sock,node-name=qcow2

+

+See also

+--------

+

+:manpage:`qemu(1)`, :manpage:`qemu-block-drivers(7)`, :manpage:`qemu-storage-daemon-qmp-ref(7)`

2.29.2

From: Stefan Hajnoczi <stefanha@redhat.com>

The MAINTAINERS file was not updated when the storage daemon was merged.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Acked-by: Kevin Wolf <kwolf@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <20201209103802.350848-4-stefanha@redhat.com>

MAINTAINERS | 9 +++++++++

1 file changed, 9 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS

--- a/MAINTAINERS

+++ b/MAINTAINERS

@@ -XXX,XX +XXX,XX @@ F: qobject/block-qdict.c

F: tests/check-block-qdict.c

T: git https://repo.or.cz/qemu/kevin.git block

+Storage daemon

+M: Kevin Wolf <kwolf@redhat.com>

+L: qemu-block@nongnu.org

+S: Supported

+F: storage-daemon/

+F: docs/interop/qemu-storage-daemon-qmp-ref.rst

+F: docs/tools/qemu-storage-daemon.rst

+T: git https://repo.or.cz/qemu/kevin.git block

+

Block I/O path

M: Stefan Hajnoczi <stefanha@redhat.com>

M: Fam Zheng <fam@euphon.net>

2.29.2

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

According to original commit, that added this filter (627f607e3dddb2),

the problematic thing in qom path is device[NUMBER], not the whole

path. Seems that tracking the other parts of the path in iotest output

is not bad. Let's make _filter_qom_path stricter.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-Id: <20201216095205.526235-2-vsementsov@virtuozzo.com>

tests/qemu-iotests/186.out | 56 ++++++++++++++++----------------

tests/qemu-iotests/common.filter | 2 +-

2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/tests/qemu-iotests/186.out b/tests/qemu-iotests/186.out

--- a/tests/qemu-iotests/186.out

+++ b/tests/qemu-iotests/186.out

@@ -XXX,XX +XXX,XX @@ Testing: -device floppy

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

/machine/peripheral-anon/device[1]: [not inserted]

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -device ide-cd

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

/machine/peripheral-anon/device[1]: [not inserted]

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -device scsi-cd

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

/machine/peripheral-anon/device[1]: [not inserted]

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device ide-hd,d

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device scsi-hd,

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]/virtio-backend

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device virtio-b

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral/qdev_id/virtio-backend

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device floppy,d

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device ide-cd,d

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -blockdev driver=null-co,read-zeroes=on,node-name=null -device scsi-cd,

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

null: json:{"read-zeroes": true, "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

Cache mode: writeback

null: json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral/qdev_id/virtio-backend

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device ide

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device scs

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device vir

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]/virtio-backend

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device vir

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral/qdev_id/virtio-backend

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device flo

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device ide

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none,driver=null-co,read-zeroes=on,node-name=null -device scs

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0 (null): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none -device floppy,drive=none0

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0: [not inserted]

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none -device ide-cd,drive=none0

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0: [not inserted]

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=none -device scsi-cd,drive=none0

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

none0: [not inserted]

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

floppy0: [not inserted]

- Attached to: PATH

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=floppy,driver=null-co,read-zeroes=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

floppy0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=ide,driver=null-co,read-zeroes=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

ide0-hd0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/unattached/device[N]

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=ide,media=cdrom

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

ide0-cd0: [not inserted]

- Attached to: PATH

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=ide,driver=null-co,read-zeroes=on,media=cdrom

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

ide0-cd0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (null-co, read-only)

- Attached to: PATH

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=virtio,driver=null-co,read-zeroes=on

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

virtio0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co"} (null-co)

- Attached to: PATH

+ Attached to: /machine/peripheral-anon/device[N]/virtio-backend

Cache mode: writeback

(qemu) quit

@@ -XXX,XX +XXX,XX @@ Testing: -drive if=pflash,driver=null-co,read-zeroes=on,size=1M

QEMU X.Y.Z monitor - type 'help' for more information

(qemu) info block

pflash0 (NODE_NAME): json:{"read-zeroes": "on", "driver": "null-co", "size": "1M"} (null-co)

- Attached to: PATH

+ Attached to: /machine/system.flash0

Cache mode: writeback

(qemu) quit

diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter

--- a/tests/qemu-iotests/common.filter

+++ b/tests/qemu-iotests/common.filter

@@ -XXX,XX +XXX,XX @@ _filter_generated_node_ids()

_filter_qom_path()

{

- $SED -e 's#\(Attached to: *\) /.*#\1 PATH#'

+ $SED -e '/Attached to:/s/\device[[0-9]\+\]/device[N]/g'

# replace occurrences of the actual TEST_DIR value with TEST_DIR

2.29.2

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

device[NUMBER] thing in QOM path is not stable and tracking it during

code modifications is not fun. Let's filter it like it's already done

in iotest 186.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Message-Id: <20201216095205.526235-3-vsementsov@virtuozzo.com>

tests/qemu-iotests/172 | 2 +-

tests/qemu-iotests/172.out | 152 ++++++++++++++++++-------------------

2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/172

+++ b/tests/qemu-iotests/172

@@ -XXX,XX +XXX,XX @@ check_floppy_qtree()

(QEMU_OPTIONS="" do_run_qemu "$@" |

    _filter_testdir |_filter_generated_node_ids | _filter_hmp |

sed -ne '/^ dev: isa-fdc/,/^ dev:/{x;p};/^[a-z][^ ]* (NODE_NAME):* /,/^(qemu)$/{p}') 2>&1 |

- _filter_win32 | _filter_qemu

+ _filter_win32 | _filter_qemu | _filter_qom_path

}

check_cache_mode()

diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out

--- a/tests/qemu-iotests/172.out

+++ b/tests/qemu-iotests/172.out

@@ -XXX,XX +XXX,XX @@ Testing: -fda TEST_DIR/t.qcow2

share-rw = false

drive-type = "144"

floppy0 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)

- Attached to: /machine/unattached/device[15]

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed

Cache mode: writeback

ide1-cd0: [not inserted]

- Attached to: /machine/unattached/device[22]

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed

sd0: [not inserted]

@@ -XXX,XX +XXX,XX @@ Testing: -fdb TEST_DIR/t.qcow2

share-rw = false

drive-type = "288"

floppy1 (NODE_NAME): TEST_DIR/t.qcow2 (qcow2)

- Attached to: /machine/unattached/device[16]

+ Attached to: /machine/unattached/device[N]

Removable device: not locked, tray closed