Commit 4359255a authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- Fix options that work only with -drive or -blockdev, but not with
  both, because of QDict type confusion
- rbd: Add options 'auth-client-required' and 'key-secret'
- Remove deprecated -drive options serial/addr/cyls/heads/secs/trans
- rbd, iscsi: Remove deprecated 'filename' option
- Fix 'qemu-img map' crash with unaligned image size
- Improve QMP documentation for jobs

# gpg: Signature made Fri 15 Jun 2018 15:20:03 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (26 commits)
  block: Remove dead deprecation warning code
  block: Remove deprecated -drive option serial
  block: Remove deprecated -drive option addr
  block: Remove deprecated -drive geometry options
  rbd: New parameter key-secret
  rbd: New parameter auth-client-required
  block: Fix -blockdev / blockdev-add for empty objects and arrays
  check-block-qdict: Cover flattening of empty lists and dictionaries
  check-block-qdict: Rename qdict_flatten()'s variables for clarity
  block-qdict: Simplify qdict_is_list() some
  block-qdict: Clean up qdict_crumple() a bit
  block-qdict: Tweak qdict_flatten_qdict(), qdict_flatten_qlist()
  block-qdict: Simplify qdict_flatten_qdict()
  block: Make remaining uses of qobject input visitor more robust
  block: Factor out qobject_input_visitor_new_flat_confused()
  block: Clean up a misuse of qobject_to() in .bdrv_co_create_opts()
  block: Fix -drive for certain non-string scalars
  block: Fix -blockdev for certain non-string scalars
  qobject: Move block-specific qdict code to block-qdict.c
  block: Add block-specific QDict header
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 81d38647 6266e900

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1369,6 +1369,8 @@ F: qemu-img* 
F: qemu-io*

F: tests/qemu-iotests/

F: util/qemu-progress.c

F: qobject/block-qdict.c

F: test/check-block-qdict.c

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



Block I/O path

block.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "block/block_int.h"

#include "block/blockjob.h"

#include "block/nbd.h"

#include "block/qdict.h"

#include "qemu/error-report.h"

#include "module_block.h"

#include "qemu/module.h"

block/block-backend.c

+0 −1
Original line number Diff line number Diff line
@@ -419,7 +419,6 @@ static void drive_info_del(DriveInfo *dinfo) 
        return;

    }

    qemu_opts_del(dinfo->opts);

    g_free(dinfo->serial);

    g_free(dinfo);

}

block/crypto.c

+9 −3
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ 
#include "qemu/osdep.h"



#include "block/block_int.h"

#include "block/qdict.h"

#include "sysemu/block-backend.h"

#include "crypto/block.h"

#include "qapi/opts-visitor.h"

#include "qapi/qapi-visit-crypto.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qobject-input-visitor.h"

#include "qapi/error.h"

#include "qemu/option.h"
@@ -159,7 +159,10 @@ block_crypto_open_opts_init(QCryptoBlockFormat format, 
    ret = g_new0(QCryptoBlockOpenOptions, 1);

    ret->format = format;



    v = qobject_input_visitor_new_keyval(QOBJECT(opts));

    v = qobject_input_visitor_new_flat_confused(opts, &local_err);

    if (local_err) {

        goto out;

    }



    visit_start_struct(v, NULL, NULL, 0, &local_err);

    if (local_err) {
@@ -210,7 +213,10 @@ block_crypto_create_opts_init(QCryptoBlockFormat format, 
    ret = g_new0(QCryptoBlockCreateOptions, 1);

    ret->format = format;



    v = qobject_input_visitor_new_keyval(QOBJECT(opts));

    v = qobject_input_visitor_new_flat_confused(opts, &local_err);

    if (local_err) {

        goto out;

    }



    visit_start_struct(v, NULL, NULL, 0, &local_err);

    if (local_err) {

block/gluster.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "qemu/osdep.h"

#include <glusterfs/api/glfs.h>

#include "block/block_int.h"

#include "block/qdict.h"

#include "qapi/error.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qerror.h"