The following changes since commit 9a7beaad3dbba982f7a461d676b55a5c3851d312:

Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20210304' into staging (2021-03-05 10:47:46 +0000)

are available in the Git repository at:

for you to fetch changes up to 67bedc3aed5c455b629c2cb5f523b536c46adff9:

docs: qsd: Explain --export nbd,name=... default (2021-03-05 17:09:46 +0100)

- qemu-storage-daemon: add --pidfile option

- qemu-storage-daemon: CLI error messages include the option name now

- vhost-user-blk export: Misc fixes, added test cases

- docs: Improvements for qemu-storage-daemon documentation

- parallels: load bitmap extension

- backup-top: Don't crash on post-finalize accesses

- iotests improvements

Alberto Garcia (1):

iotests: Drop deprecated 'props' from object-add

Coiby Xu (1):

test: new qTest case to test the vhost-user-blk-server

Eric Blake (1):

iotests: Fix up python style in 300

Kevin Wolf (1):

docs: qsd: Explain --export nbd,name=... default

Max Reitz (3):

backup: Remove nodes from job in .clean()

backup-top: Refuse I/O in inactive state

iotests/283: Check that finalize drops backup-top

Paolo Bonzini (2):

storage-daemon: report unexpected arguments on the fly

storage-daemon: include current command line option in the errors

From: Alberto Garcia <berto@igalia.com>

Signed-off-by: Alberto Garcia <berto@igalia.com>

Message-Id: <20210222115737.2993-1-berto@igalia.com>

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

---

tests/qemu-iotests/087 | 8 ++------

tests/qemu-iotests/184 | 18 ++++++------------

tests/qemu-iotests/218 | 2 +-

tests/qemu-iotests/235 | 2 +-

tests/qemu-iotests/245 | 4 ++--

tests/qemu-iotests/258 | 6 +++---

tests/qemu-iotests/258.out | 4 ++--

tests/qemu-iotests/295 | 2 +-

tests/qemu-iotests/296 | 2 +-

9 files changed, 19 insertions(+), 29 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/087

+++ b/tests/qemu-iotests/087

@@ -XXX,XX +XXX,XX @@ run_qemu <<EOF

"arguments": {

"qom-type": "secret",

"id": "sec0",

- "props": {

- "data": "123456"

- }

+ "data": "123456"

}

}

{ "execute": "blockdev-add",

@@ -XXX,XX +XXX,XX @@ run_qemu <<EOF

"arguments": {

"qom-type": "secret",

"id": "sec0",

- "props": {

- "data": "123456"

- }

+ "data": "123456"

}

}

{ "execute": "blockdev-add",

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/184

+++ b/tests/qemu-iotests/184

@@ -XXX,XX +XXX,XX @@ run_qemu <<EOF

"arguments": {

"qom-type": "throttle-group",

"id": "group0",

- "props": {

- "limits" : {

- "iops-total": 1000

- }

+ "limits" : {

+ "iops-total": 1000

}

}

}

@@ -XXX,XX +XXX,XX @@ run_qemu <<EOF

"arguments": {

"qom-type": "throttle-group",

"id": "group0",

- "props" : {

- "limits": {

- "iops-total": 1000

- }

+ "limits": {

+ "iops-total": 1000

}

}

}

@@ -XXX,XX +XXX,XX @@ run_qemu <<EOF

"arguments": {

"qom-type": "throttle-group",

"id": "group0",

- "props" : {

- "limits": {

- "iops-total": 1000

- }

+ "limits": {

+ "iops-total": 1000

}

}

}

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/218

+++ b/tests/qemu-iotests/218

@@ -XXX,XX +XXX,XX @@ with iotests.VM() as vm, \

vm.launch()

ret = vm.qmp('object-add', qom_type='throttle-group', id='tg',

- props={'x-bps-read': 4096})

+ limits={'bps-read': 4096})

assert ret['return'] == {}

ret = vm.qmp('blockdev-add',

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/235

+++ b/tests/qemu-iotests/235

@@ -XXX,XX +XXX,XX @@ vm.add_args('-drive', 'id=src,file=' + disk)

vm.launch()

log(vm.qmp('object-add', qom_type='throttle-group', id='tg0',

- props={ 'x-bps-total': size }))

+ limits={'bps-total': size}))

log(vm.qmp('blockdev-add',

**{ 'node-name': 'target',

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/245

+++ b/tests/qemu-iotests/245

@@ -XXX,XX +XXX,XX @@ class TestBlockdevReopen(iotests.QMPTestCase):

###### throttle ######

######################

opts = { 'qom-type': 'throttle-group', 'id': 'group0',

- 'props': { 'limits': { 'iops-total': 1000 } } }

+ 'limits': { 'iops-total': 1000 } }

result = self.vm.qmp('object-add', conv_keys = False, **opts)

self.assert_qmp(result, 'return', {})

opts = { 'qom-type': 'throttle-group', 'id': 'group1',

- 'props': { 'limits': { 'iops-total': 2000 } } }

+ 'limits': { 'iops-total': 2000 } }

result = self.vm.qmp('object-add', conv_keys = False, **opts)

self.assert_qmp(result, 'return', {})

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/258

+++ b/tests/qemu-iotests/258

@@ -XXX,XX +XXX,XX @@ def test_concurrent_finish(write_to_stream_node):

vm.qmp_log('object-add',

qom_type='throttle-group',

id='tg',

- props={

- 'x-iops-write': 1,

- 'x-iops-write-max': 1

+ limits={

+ 'iops-write': 1,

+ 'iops-write-max': 1

})

vm.qmp_log('blockdev-add',

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

index XXXXXXX..XXXXXXX 100644

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

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

@@ -XXX,XX +XXX,XX @@ Running tests:

=== Commit and stream finish concurrently (letting stream write) ===

-{"execute": "object-add", "arguments": {"id": "tg", "props": {"x-iops-write": 1, "x-iops-write-max": 1}, "qom-type": "throttle-group"}}

+{"execute": "object-add", "arguments": {"id": "tg", "limits": {"iops-write": 1, "iops-write-max": 1}, "qom-type": "throttle-group"}}

{"return": {}}

{"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing": {"backing": {"driver": "raw", "file": {"driver": "file", "filename": "TEST_DIR/PID-node0.img"}, "node-name": "node0"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node1.img"}, "node-name": "node1"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node2.img"}, "node-name": "node2"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node3.img"}, "node-name": "node3"}, "driver": "IMGFMT", "file": {"driver": "throttle", "file": {"driver": "file", "filename": "TEST_DIR/PID-node4.img"}, "throttle-group": "tg"}, "node-name": "node4"}}

{"return": {}}

@@ -XXX,XX +XXX,XX @@ Running tests:

=== Commit and stream finish concurrently (letting commit write) ===

-{"execute": "object-add", "arguments": {"id": "tg", "props": {"x-iops-write": 1, "x-iops-write-max": 1}, "qom-type": "throttle-group"}}

+{"execute": "object-add", "arguments": {"id": "tg", "limits": {"iops-write": 1, "iops-write-max": 1}, "qom-type": "throttle-group"}}

{"return": {}}

{"execute": "blockdev-add", "arguments": {"backing": {"backing": {"backing": {"backing": {"driver": "raw", "file": {"driver": "throttle", "file": {"driver": "file", "filename": "TEST_DIR/PID-node0.img"}, "throttle-group": "tg"}, "node-name": "node0"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node1.img"}, "node-name": "node1"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node2.img"}, "node-name": "node2"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node3.img"}, "node-name": "node3"}, "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/PID-node4.img"}, "node-name": "node4"}}

{"return": {}}

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/295

+++ b/tests/qemu-iotests/295

@@ -XXX,XX +XXX,XX @@ class Secret:

def to_qmp_object(self):

return { "qom_type" : "secret", "id": self.id(),

- "props": { "data": self.secret() } }

+ "data": self.secret() }

################################################################################

class EncryptionSetupTestCase(iotests.QMPTestCase):

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/296

+++ b/tests/qemu-iotests/296

@@ -XXX,XX +XXX,XX @@ class Secret:

def to_qmp_object(self):

return { "qom_type" : "secret", "id": self.id(),

- "props": { "data": self.secret() } }

+ "data": self.secret() }

################################################################################

--

2.29.2

From: Max Reitz <mreitz@redhat.com>

The block job holds a reference to the backup-top node (because it is

passed as the main job BDS to block_job_create()). Therefore,

bdrv_backup_top_drop() cannot delete the backup-top node (replacing it

by its child does not affect the job parent, because that has

.stay_at_node set). That is a problem, because all of its I/O functions

assume the BlockCopyState (s->bcs) to be valid and that it has a

filtered child; but after bdrv_backup_top_drop(), neither of those

things are true.

It does not make sense to add new parents to backup-top after

backup_clean(), so we should detach it from the job before

bdrv_backup_top_drop(). Because there is no function to do that for a

single node, just detach all of the job's nodes -- the job does not do

anything past backup_clean() anyway.

Signed-off-by: Max Reitz <mreitz@redhat.com>

Message-Id: <20210219153348.41861-2-mreitz@redhat.com>

block/backup.c | 1 +

1 file changed, 1 insertion(+)

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

--- a/block/backup.c

+++ b/block/backup.c

@@ -XXX,XX +XXX,XX @@ static void backup_abort(Job *job)

static void backup_clean(Job *job)

{

BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);

+ block_job_remove_all_bdrv(&s->common);

bdrv_backup_top_drop(s->backup_top);

2.29.2

Break some long lines, and relax our type hints to be more generic to

any JSON, in order to more easily permit the additional JSON depth now

possible in migration parameters. Detected by iotest 297.

Fixes: ca4bfec41d56

(qemu-iotests: 300: Add test case for modifying persistence of bitmap)

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

tests/qemu-iotests/300 | 10 ++++++----

1 file changed, 6 insertions(+), 4 deletions(-)

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

index XXXXXXX..XXXXXXX 100755

--- a/tests/qemu-iotests/300

+++ b/tests/qemu-iotests/300

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

import os

import random

import re

-from typing import Dict, List, Optional, Union

+from typing import Dict, List, Optional

import iotests

@@ -XXX,XX +XXX,XX @@ import iotests

# pylint: disable=wrong-import-order

import qemu

-BlockBitmapMapping = List[Dict[str, Union[str, List[Dict[str, str]]]]]

+BlockBitmapMapping = List[Dict[str, object]]

mig_sock = os.path.join(iotests.sock_dir, 'mig_sock')

@@ -XXX,XX +XXX,XX @@ class TestCrossAliasMigration(TestDirtyBitmapMigration):

class TestAliasTransformMigration(TestDirtyBitmapMigration):

"""

- Tests the 'transform' option which modifies bitmap persistence on migration.

+ Tests the 'transform' option which modifies bitmap persistence on

+ migration.

"""

src_node_name = 'node-a'

@@ -XXX,XX +XXX,XX @@ class TestAliasTransformMigration(TestDirtyBitmapMigration):

bitmaps = self.vm_b.query_bitmaps()

for node in bitmaps:

- bitmaps[node] = sorted(((bmap['name'], bmap['persistent']) for bmap in bitmaps[node]))

+ bitmaps[node] = sorted(((bmap['name'], bmap['persistent'])

+ for bmap in bitmaps[node]))

self.assertEqual(bitmaps,

{'node-a': [('bmap-a', True), ('bmap-b', False)],

2.29.2

From: Stefano Garzarella <sgarzare@redhat.com>

When a block job fails, we report strerror(-job->job.ret) error

message, also if the job set an error object.

Let's report a better error message using error_get_pretty(job->job.err).

If an error object was not set, strerror(-job->ret) is used as fallback,

as explained in include/qemu/job.h:

typedef struct Job {

...

/**

* Error object for a failed job.

* If job->ret is nonzero and an error object was not set, it will be set

* to strerror(-job->ret) during job_completed.

*/

Error *err;

}

In block_job_query() there can be a transient where 'job.err' is not set

by a scheduled bottom half. In that case we use strerror(-job->ret) as it

was before.

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

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

Message-Id: <20210225103633.76746-1-sgarzare@redhat.com>

blockjob.c | 10 +++++++---

1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/blockjob.c b/blockjob.c

--- a/blockjob.c

+++ b/blockjob.c

@@ -XXX,XX +XXX,XX @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)

info->status = job->job.status;

info->auto_finalize = job->job.auto_finalize;

info->auto_dismiss = job->job.auto_dismiss;

- info->has_error = job->job.ret != 0;

- info->error = job->job.ret ? g_strdup(strerror(-job->job.ret)) : NULL;

+ if (job->job.ret) {

+ info->has_error = true;

+ info->error = job->job.err ?

+ g_strdup(error_get_pretty(job->job.err)) :

+ g_strdup(strerror(-job->job.ret));

+ }

return info;

}

@@ -XXX,XX +XXX,XX @@ static void block_job_event_completed(Notifier *n, void *opaque)

if (job->job.ret < 0) {

- msg = strerror(-job->job.ret);

+ msg = error_get_pretty(job->job.err);

qapi_event_send_block_job_completed(job_type(&job->job),

2.29.2

From: Paolo Bonzini <pbonzini@redhat.com>

Use the location management facilities that the emulator uses, so that

the current command line option appears in the error message.

Before:

$ storage-daemon/qemu-storage-daemon --nbd key..=

qemu-storage-daemon: Invalid parameter 'key..'

After:

$ storage-daemon/qemu-storage-daemon --nbd key..=

qemu-storage-daemon: --nbd key..=: Invalid parameter 'key..'

Reviewed-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Message-Id: <20210301152844.291799-3-pbonzini@redhat.com>

storage-daemon/qemu-storage-daemon.c | 19 +++++++++++++++++--

1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c

--- a/storage-daemon/qemu-storage-daemon.c

+++ b/storage-daemon/qemu-storage-daemon.c

@@ -XXX,XX +XXX,XX @@ static void init_qmp_commands(void)

qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);

+static int getopt_set_loc(int argc, char **argv, const char *optstring,

+ const struct option *longopts)

+{

+ int c, save_index;

+

+ optarg = NULL;

+ save_index = optind;

+ c = getopt_long(argc, argv, optstring, longopts, NULL);

+ if (optarg) {

+ loc_set_cmdline(argv, save_index, MAX(1, optind - save_index));

+ }

+ return c;

+}

+

static void process_options(int argc, char *argv[])

int c;

@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])

* they are given on the command lines. This means that things must be

* defined first before they can be referenced in another option.

*/

- while ((c = getopt_long(argc, argv, "-hT:V", long_options, NULL)) != -1) {

+ while ((c = getopt_set_loc(argc, argv, "-hT:V", long_options)) != -1) {

switch (c) {

case '?':

exit(EXIT_FAILURE);

@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])

break;

}

case 1:

- error_report("Unexpected argument: %s", optarg);

+ error_report("Unexpected argument");

exit(EXIT_FAILURE);

default:

g_assert_not_reached();

+ loc_set_none();

}

int main(int argc, char *argv[])

2.29.2

From: Stefan Hajnoczi <stefanha@redhat.com>

Daemons often have a --pidfile option where the pid is written to a file

so that scripts can stop the daemon by sending a signal.

The pid file also acts as a lock to prevent multiple instances of the

daemon from launching for a given pid file.

QEMU, qemu-nbd, qemu-ga, virtiofsd, and qemu-pr-helper all support the

--pidfile option. Add it to qemu-storage-daemon too.

Reported-by: Richard W.M. Jones <rjones@redhat.com>

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

Message-Id: <20210302142746.170535-1-stefanha@redhat.com>

Reviewed-by: Richard W.M. Jones <rjones@redhat.com>

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

storage-daemon/qemu-storage-daemon.c | 36 ++++++++++++++++++++++++++++

2 files changed, 50 insertions(+)

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

--- a/docs/tools/qemu-storage-daemon.rst

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

@@ -XXX,XX +XXX,XX @@ Standard options:

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

manual page for a description of the object properties.

+.. option:: --pidfile PATH

+

+ is the path to a file where the daemon writes its pid. This allows scripts to

+ stop the daemon by sending a signal::

+

+ $ kill -SIGTERM $(<path/to/qsd.pid)

+

+ A file lock is applied to the file so only one instance of the daemon can run

+ with a given pid file path. The daemon unlinks its pid file when terminating.

+

+ The pid file is written after chardevs, exports, and NBD servers have been

+ created but before accepting connections. The daemon has started successfully

+ when the pid file is written and clients may begin connecting.

+

Examples

--------

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

diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c

--- a/storage-daemon/qemu-storage-daemon.c

+++ b/storage-daemon/qemu-storage-daemon.c

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

#include "sysemu/runstate.h"

#include "trace/control.h"

+static const char *pid_file;

static volatile bool exit_requested = false;

void qemu_system_killed(int signal, pid_t pid)

@@ -XXX,XX +XXX,XX @@ static void help(void)

" See the qemu(1) man page for documentation of the\n"

" objects that can be added.\n"

"\n"

+" --pidfile <path> write process ID to a file after startup\n"

+"\n"

QEMU_HELP_BOTTOM "\n",

error_get_progname());

@@ -XXX,XX +XXX,XX @@ enum {

OPTION_MONITOR,

OPTION_NBD_SERVER,

OPTION_OBJECT,

+ OPTION_PIDFILE,

};

extern QemuOptsList qemu_chardev_opts;

@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])

{"monitor", required_argument, NULL, OPTION_MONITOR},

{"nbd-server", required_argument, NULL, OPTION_NBD_SERVER},

{"object", required_argument, NULL, OPTION_OBJECT},

+ {"pidfile", required_argument, NULL, OPTION_PIDFILE},

{"trace", required_argument, NULL, 'T'},

{"version", no_argument, NULL, 'V'},

{0, 0, 0, 0}

@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])

qobject_unref(args);

break;

}

+ case OPTION_PIDFILE:

+ pid_file = optarg;

+ break;

case 1:

error_report("Unexpected argument");

exit(EXIT_FAILURE);

@@ -XXX,XX +XXX,XX @@ static void process_options(int argc, char *argv[])

loc_set_none();