The following changes since commit df34fe314b5da628bc9a2664fb1b887bc0a6cc6d:

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190708' into staging (2019-07-08 14:23:32 +0100)

for you to fetch changes up to f7077c9860a438087c2d9a8cc27cb8438c98a748:

qcow2: Allow -o compat=v3 during qemu-img amend (2019-07-08 16:00:31 +0200)

Block layer patches:

- virtio-scsi: Fix request resubmission after I/O error with iothreads

- qcow2: Fix missing v2/v3 subformat aliases for amend

- qcow(1): More specific error message for wrong format version

- MAINTAINERS: update RBD block maintainer

Eric Blake (1):

qcow2: Allow -o compat=v3 during qemu-img amend

Jason Dillaman (1):

MAINTAINERS: update RBD block maintainer

John Snow (1):

block/qcow: Improve error when opening qcow2 files as qcow

Stefan Hajnoczi (3):

vl: add qemu_add_vm_change_state_handler_prio()

qdev: add qdev_add_vm_change_state_handler()

virtio-scsi: restart DMA after iothread

From: Stefan Hajnoczi <stefanha@redhat.com>

Add an API for registering vm change state handlers with a well-defined

ordering. This is necessary when handlers depend on each other.

Small coding style fixes are included to make checkpatch.pl happy.

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

include/sysemu/sysemu.h | 2 ++

vl.c | 59 ++++++++++++++++++++++++++++++++---------

2 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h

--- a/include/sysemu/sysemu.h

+++ b/include/sysemu/sysemu.h

@@ -XXX,XX +XXX,XX @@ typedef void VMChangeStateHandler(void *opaque, int running, RunState state);

VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,

void *opaque);

+VMChangeStateEntry *qemu_add_vm_change_state_handler_prio(

+ VMChangeStateHandler *cb, void *opaque, int priority);

void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);

void vm_state_notify(int running, RunState state);

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

index XXXXXXX..XXXXXXX 100644

--- a/vl.c

+++ b/vl.c

@@ -XXX,XX +XXX,XX @@ static int machine_help_func(QemuOpts *opts, MachineState *machine)

struct vm_change_state_entry {

VMChangeStateHandler *cb;

void *opaque;

- QLIST_ENTRY (vm_change_state_entry) entries;

+ QTAILQ_ENTRY(vm_change_state_entry) entries;

+ int priority;

};

-static QLIST_HEAD(, vm_change_state_entry) vm_change_state_head;

+static QTAILQ_HEAD(, vm_change_state_entry) vm_change_state_head;

-VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,

- void *opaque)

+/**

+ * qemu_add_vm_change_state_handler_prio:

+ * @cb: the callback to invoke

+ * @opaque: user data passed to the callback

+ * @priority: low priorities execute first when the vm runs and the reverse is

+ * true when the vm stops

+ *

+ * Register a callback function that is invoked when the vm starts or stops

+ * running.

+ *

+ * Returns: an entry to be freed using qemu_del_vm_change_state_handler()

+ */

+VMChangeStateEntry *qemu_add_vm_change_state_handler_prio(

+ VMChangeStateHandler *cb, void *opaque, int priority)

{

VMChangeStateEntry *e;

+ VMChangeStateEntry *other;

- e = g_malloc0(sizeof (*e));

-

+ e = g_malloc0(sizeof(*e));

e->cb = cb;

e->opaque = opaque;

- QLIST_INSERT_HEAD(&vm_change_state_head, e, entries);

+ e->priority = priority;

+

+ /* Keep list sorted in ascending priority order */

+ QTAILQ_FOREACH(other, &vm_change_state_head, entries) {

+ if (priority < other->priority) {

+ QTAILQ_INSERT_BEFORE(other, e, entries);

+ return e;

+ }

+ }

+

+ QTAILQ_INSERT_TAIL(&vm_change_state_head, e, entries);

return e;

}

+VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,

+ void *opaque)

+{

+ return qemu_add_vm_change_state_handler_prio(cb, opaque, 0);

+}

+

void qemu_del_vm_change_state_handler(VMChangeStateEntry *e)

{

- QLIST_REMOVE (e, entries);

- g_free (e);

+ QTAILQ_REMOVE(&vm_change_state_head, e, entries);

+ g_free(e);

}

void vm_state_notify(int running, RunState state)

@@ -XXX,XX +XXX,XX @@ void vm_state_notify(int running, RunState state)

trace_vm_state_notify(running, state, RunState_str(state));

- QLIST_FOREACH_SAFE(e, &vm_change_state_head, entries, next) {

- e->cb(e->opaque, running, state);

+ if (running) {

+ QTAILQ_FOREACH_SAFE(e, &vm_change_state_head, entries, next) {

+ e->cb(e->opaque, running, state);

+ }

+ } else {

+ QTAILQ_FOREACH_REVERSE_SAFE(e, &vm_change_state_head, entries, next) {

+ e->cb(e->opaque, running, state);

+ }

@@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp)

exit(1);

- QLIST_INIT (&vm_change_state_head);

+ QTAILQ_INIT(&vm_change_state_head);

os_setup_early_signal_handling();

cpu_option = NULL;

2.20.1

From: Stefan Hajnoczi <stefanha@redhat.com>

When the 'cont' command resumes guest execution the vm change state

handlers are invoked. Unfortunately there is no explicit ordering

between classic qemu_add_vm_change_state_handler() callbacks. When two

layers of code both use vm change state handlers, we don't control which

handler runs first.

virtio-scsi with iothreads hits a deadlock when a failed SCSI command is

restarted and completes before the iothread is re-initialized.

This patch uses the new qdev_add_vm_change_state_handler() API to

guarantee that virtio-scsi's virtio change state handler executes before

the SCSI bus children. This way DMA is restarted after the iothread has

re-initialized.

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

hw/scsi/scsi-bus.c | 4 ++--

hw/virtio/virtio.c | 4 ++--

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

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c

--- a/hw/scsi/scsi-bus.c

+++ b/hw/scsi/scsi-bus.c

@@ -XXX,XX +XXX,XX @@ static void scsi_qdev_realize(DeviceState *qdev, Error **errp)

error_propagate(errp, local_err);

- dev->vmsentry = qemu_add_vm_change_state_handler(scsi_dma_restart_cb,

- dev);

+ dev->vmsentry = qdev_add_vm_change_state_handler(DEVICE(dev),

+ scsi_dma_restart_cb, dev);

static void scsi_qdev_unrealize(DeviceState *qdev, Error **errp)

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/virtio/virtio.c

+++ b/hw/virtio/virtio.c

@@ -XXX,XX +XXX,XX @@ void virtio_init(VirtIODevice *vdev, const char *name,

} else {

vdev->config = NULL;

}

- vdev->vmstate = qemu_add_vm_change_state_handler(virtio_vmstate_change,

- vdev);

+ vdev->vmstate = qdev_add_vm_change_state_handler(DEVICE(vdev),

+ virtio_vmstate_change, vdev);

vdev->device_endian = virtio_default_endian();

vdev->use_guest_notifier_mask = true;

}

2.20.1

From: Eric Blake <eblake@redhat.com>

Commit b76b4f60 allowed '-o compat=v3' as an alias for the

less-appealing '-o compat=1.1' for 'qemu-img create' since we want to

use the QMP form as much as possible, but forgot to do likewise for

qemu-img amend. Also, it doesn't help that '-o help' doesn't list our

new preferred spellings.

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

block/qcow2.c | 6 +++---

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

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

index XXXXXXX..XXXXXXX 100644

--- a/block/qcow2.c

+++ b/block/qcow2.c

@@ -XXX,XX +XXX,XX @@ static int qcow2_amend_options(BlockDriverState *bs, QemuOpts *opts,

compat = qemu_opt_get(opts, BLOCK_OPT_COMPAT_LEVEL);

if (!compat) {

/* preserve default */

- } else if (!strcmp(compat, "0.10")) {

+ } else if (!strcmp(compat, "0.10") || !strcmp(compat, "v2")) {

new_version = 2;

- } else if (!strcmp(compat, "1.1")) {

+ } else if (!strcmp(compat, "1.1") || !strcmp(compat, "v3")) {

new_version = 3;

} else {

error_setg(errp, "Unknown compatibility level %s", compat);

@@ -XXX,XX +XXX,XX @@ static QemuOptsList qcow2_create_opts = {

{

.name = BLOCK_OPT_COMPAT_LEVEL,

.type = QEMU_OPT_STRING,

- .help = "Compatibility level (0.10 or 1.1)"

+ .help = "Compatibility level (v2 [0.10] or v3 [1.1])"

},

{

.name = BLOCK_OPT_BACKING_FILE,

2.20.1

From: John Snow <jsnow@redhat.com>

Reported-by: radmehrsaeed7@gmail.com

Fixes: https://bugs.launchpad.net/bugs/1832914

Signed-off-by: John Snow <jsnow@redhat.com>

Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>

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