Commit a4efdb6b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



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

# gpg: Signature made Mon 08 Jul 2019 15:17:27 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qcow2: Allow -o compat=v3 during qemu-img amend
  MAINTAINERS: update RBD block maintainer
  block/qcow: Improve error when opening qcow2 files as qcow
  virtio-scsi: restart DMA after iothread
  qdev: add qdev_add_vm_change_state_handler()
  vl: add qemu_add_vm_change_state_handler_prio()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents df34fe31 f7077c98

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2385,7 +2385,7 @@ S: Supported 
F: block/vmdk.c



RBD

M: Josh Durgin <jdurgin@redhat.com>

M: Jason Dillaman <dillaman@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: block/rbd.c

block/qcow.c

+6 −1
Original line number Diff line number Diff line
@@ -156,7 +156,12 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
        goto fail;

    }

    if (header.version != QCOW_VERSION) {

        error_setg(errp, "Unsupported qcow version %" PRIu32, header.version);

        error_setg(errp, "qcow (v%d) does not support qcow version %" PRIu32,

                   QCOW_VERSION, header.version);

        if (header.version == 2 || header.version == 3) {

            error_append_hint(errp, "Try the 'qcow2' driver instead.\n");

        }



        ret = -ENOTSUP;

        goto fail;

    }

block/qcow2.c

+3 −3
Original line number Diff line number Diff line
@@ -4823,9 +4823,9 @@ 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);
@@ -5098,7 +5098,7 @@ 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,

hw/core/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ common-obj-$(CONFIG_SOFTMMU) += fw-path-provider.o 
common-obj-y += irq.o

common-obj-y += hotplug.o

common-obj-$(CONFIG_SOFTMMU) += nmi.o

common-obj-$(CONFIG_SOFTMMU) += vm-change-state-handler.o



common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o

common-obj-$(CONFIG_XILINX_AXI) += stream.o

hw/core/vm-change-state-handler.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 *  qdev vm change state handlers

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License,

 *  or (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#include "qemu/osdep.h"

#include "hw/qdev.h"



static int qdev_get_dev_tree_depth(DeviceState *dev)

{

    int depth;



    for (depth = 0; dev; depth++) {

        BusState *bus = dev->parent_bus;



        if (!bus) {

            break;

        }



        dev = bus->parent;

    }



    return depth;

}



/**

 * qdev_add_vm_change_state_handler:

 * @dev: the device that owns this handler

 * @cb: the callback function to be invoked

 * @opaque: user data passed to the callback function

 *

 * This function works like qemu_add_vm_change_state_handler() except callbacks

 * are invoked in qdev tree depth order.  Ordering is desirable when callbacks

 * of children depend on their parent's callback having completed first.

 *

 * For example, when qdev_add_vm_change_state_handler() is used, a host

 * controller's callback is invoked before the children on its bus when the VM

 * starts running.  The order is reversed when the VM stops running.

 *

 * Returns: an entry to be freed with qemu_del_vm_change_state_handler()

 */

VMChangeStateEntry *qdev_add_vm_change_state_handler(DeviceState *dev,

                                                     VMChangeStateHandler *cb,

                                                     void *opaque)

{

    int depth = qdev_get_dev_tree_depth(dev);



    return qemu_add_vm_change_state_handler_prio(cb, opaque, depth);

}