mirror of https://gitee.com/openkylin/qemu.git
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 -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJbI8sTAAoJEH8JsnLIjy/WeIsP/Ak8ealnjx8GRUfWwi69DX5z LPzGXjlFJ1DqVb1SCuc7mptlgQwvHSoeYk6i+2xzJy9WmaAJsT2Mxz+EkviGzlcU Xna6t/a9dgMxvHQMKbN1j4Rm3tDJzm2x6ZnBLYlwFhecmkEz4i3TEsceFL7BrN4F C21jm+yC2wKPyggKXRRLRP4a1UfuM7OH8OEE3aWCZwEz1+6ucZGs3xsmWJfXxlCK adigVec3gNWgQK+gWFlYKXRJKalK50BnZ7+2LlQIcC1kLAx22Wr2t2zmlROa351w JEBIQlLkEN8hpB44Xk3Wla3YmwumW8EANIdxkeAXDgYgn8KEpN1nwWyxGUsfoOqz WhZ+pT0yerg/kSovKgTyxsF9YoeptJEUmmR0nZX4+xpnctbU6EHuspymMb1Xl95h /7lirJbBVb8o9rzcCNOzTc0f9lot9pDglLjxcWq3RqvpJ2iQmxxY2UUidYl9BmRg SpkkA9E613bZ9zuK+17FDbnGq/N9h77HSBSVbLgEoajFLXYUtkuc0egi/ZVLWo0W wo/XvXTZqy7n9/M/j4yVS+Xv7WotNuyHajk6N73KdL0NodXE776CPxvMlUEHEHB9 Pizo/fuxmgatjDFf1WU3Qt5pZlU1Pao4Aakcq3z/Ag7ucMK03QQIMBcrJC24+DD2 pjT5HPIeS3vklkg9Jqdi =LxgF -----END PGP SIGNATURE----- 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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
4359255ad3
|
|
@ -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
|
||||
|
|
|
|||
1
block.c
1
block.c
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -419,7 +419,6 @@ static void drive_info_del(DriveInfo *dinfo)
|
|||
return;
|
||||
}
|
||||
qemu_opts_del(dinfo->opts);
|
||||
g_free(dinfo->serial);
|
||||
g_free(dinfo);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@
|
|||
#include "qemu/bitops.h"
|
||||
#include "qemu/bitmap.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "scsi/constants.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -1713,10 +1714,6 @@ static QemuOptsList runtime_opts = {
|
|||
.name = "timeout",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
},
|
||||
{
|
||||
.name = "filename",
|
||||
.type = QEMU_OPT_STRING,
|
||||
},
|
||||
{ /* end of list */ }
|
||||
},
|
||||
};
|
||||
|
|
@ -1756,27 +1753,12 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags,
|
|||
char *initiator_name = NULL;
|
||||
QemuOpts *opts;
|
||||
Error *local_err = NULL;
|
||||
const char *transport_name, *portal, *target, *filename;
|
||||
const char *transport_name, *portal, *target;
|
||||
#if LIBISCSI_API_VERSION >= (20160603)
|
||||
enum iscsi_transport_type transport;
|
||||
#endif
|
||||
int i, ret = 0, timeout = 0, lun;
|
||||
|
||||
/* If we are given a filename, parse the filename, with precedence given to
|
||||
* filename encoded options */
|
||||
filename = qdict_get_try_str(options, "filename");
|
||||
if (filename) {
|
||||
warn_report("'filename' option specified. "
|
||||
"This is an unsupported option, and may be deprecated "
|
||||
"in the future");
|
||||
iscsi_parse_filename(filename, options, &local_err);
|
||||
if (local_err) {
|
||||
ret = -EINVAL;
|
||||
error_propagate(errp, local_err);
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
|
||||
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
|
||||
qemu_opts_absorb_qdict(opts, options, &local_err);
|
||||
if (local_err) {
|
||||
|
|
@ -2006,7 +1988,7 @@ out:
|
|||
}
|
||||
memset(iscsilun, 0, sizeof(IscsiLun));
|
||||
}
|
||||
exit:
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
16
block/nbd.c
16
block/nbd.c
|
|
@ -28,6 +28,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "nbd-client.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/uri.h"
|
||||
#include "block/block_int.h"
|
||||
|
|
@ -262,7 +263,6 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options,
|
|||
{
|
||||
SocketAddress *saddr = NULL;
|
||||
QDict *addr = NULL;
|
||||
QObject *crumpled_addr = NULL;
|
||||
Visitor *iv = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
||||
|
|
@ -272,20 +272,11 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options,
|
|||
goto done;
|
||||
}
|
||||
|
||||
crumpled_addr = qdict_crumple(addr, errp);
|
||||
if (!crumpled_addr) {
|
||||
iv = qobject_input_visitor_new_flat_confused(addr, errp);
|
||||
if (!iv) {
|
||||
goto done;
|
||||
}
|
||||
|
||||
/*
|
||||
* FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive
|
||||
* server.type=inet. .to doesn't matter, it's ignored anyway.
|
||||
* That's because when @options come from -blockdev or
|
||||
* blockdev_add, members are typed according to the QAPI schema,
|
||||
* but when they come from -drive, they're all QString. The
|
||||
* visitor expects the former.
|
||||
*/
|
||||
iv = qobject_input_visitor_new(crumpled_addr);
|
||||
visit_type_SocketAddress(iv, NULL, &saddr, &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
@ -294,7 +285,6 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options,
|
|||
|
||||
done:
|
||||
qobject_unref(addr);
|
||||
qobject_unref(crumpled_addr);
|
||||
visit_free(iv);
|
||||
return saddr;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "qapi/error.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "trace.h"
|
||||
#include "qemu/iov.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -555,20 +556,17 @@ static BlockdevOptionsNfs *nfs_options_qdict_to_qapi(QDict *options,
|
|||
Error **errp)
|
||||
{
|
||||
BlockdevOptionsNfs *opts = NULL;
|
||||
QObject *crumpled = NULL;
|
||||
Visitor *v;
|
||||
const QDictEntry *e;
|
||||
Error *local_err = NULL;
|
||||
|
||||
crumpled = qdict_crumple(options, errp);
|
||||
if (crumpled == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(options, errp);
|
||||
if (!v) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(crumpled);
|
||||
visit_type_BlockdevOptionsNfs(v, NULL, &opts, &local_err);
|
||||
visit_free(v);
|
||||
qobject_unref(crumpled);
|
||||
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -615,8 +616,7 @@ static int coroutine_fn parallels_co_create_opts(const char *filename,
|
|||
BlockdevCreateOptions *create_options = NULL;
|
||||
Error *local_err = NULL;
|
||||
BlockDriverState *bs = NULL;
|
||||
QDict *qdict = NULL;
|
||||
QObject *qobj;
|
||||
QDict *qdict;
|
||||
Visitor *v;
|
||||
int ret;
|
||||
|
||||
|
|
@ -652,15 +652,12 @@ static int coroutine_fn parallels_co_create_opts(const char *filename,
|
|||
qdict_put_str(qdict, "driver", "parallels");
|
||||
qdict_put_str(qdict, "file", bs->node_name);
|
||||
|
||||
qobj = qdict_crumple(qdict, errp);
|
||||
qobject_unref(qdict);
|
||||
qdict = qobject_to(QDict, qobj);
|
||||
if (qdict == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto done;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
11
block/qcow.c
11
block/qcow.c
|
|
@ -26,6 +26,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -945,8 +946,7 @@ static int coroutine_fn qcow_co_create_opts(const char *filename,
|
|||
{
|
||||
BlockdevCreateOptions *create_options = NULL;
|
||||
BlockDriverState *bs = NULL;
|
||||
QDict *qdict = NULL;
|
||||
QObject *qobj;
|
||||
QDict *qdict;
|
||||
Visitor *v;
|
||||
const char *val;
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -996,15 +996,12 @@ static int coroutine_fn qcow_co_create_opts(const char *filename,
|
|||
qdict_put_str(qdict, "driver", "qcow");
|
||||
qdict_put_str(qdict, "file", bs->node_name);
|
||||
|
||||
qobj = qdict_crumple(qdict, errp);
|
||||
qobject_unref(qdict);
|
||||
qdict = qobject_to(QDict, qobj);
|
||||
if (qdict == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/module.h"
|
||||
#include <zlib.h>
|
||||
|
|
@ -3079,8 +3080,7 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt
|
|||
Error **errp)
|
||||
{
|
||||
BlockdevCreateOptions *create_options = NULL;
|
||||
QDict *qdict = NULL;
|
||||
QObject *qobj;
|
||||
QDict *qdict;
|
||||
Visitor *v;
|
||||
BlockDriverState *bs = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -3151,15 +3151,12 @@ static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpts *opt
|
|||
qdict_put_str(qdict, "file", bs->node_name);
|
||||
|
||||
/* Now get the QAPI type BlockdevCreateOptions */
|
||||
qobj = qdict_crumple(qdict, errp);
|
||||
qobject_unref(qdict);
|
||||
qdict = qobject_to(QDict, qobj);
|
||||
if (qdict == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
11
block/qed.c
11
block/qed.c
|
|
@ -13,6 +13,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "qemu/bswap.h"
|
||||
|
|
@ -721,8 +722,7 @@ static int coroutine_fn bdrv_qed_co_create_opts(const char *filename,
|
|||
Error **errp)
|
||||
{
|
||||
BlockdevCreateOptions *create_options = NULL;
|
||||
QDict *qdict = NULL;
|
||||
QObject *qobj;
|
||||
QDict *qdict;
|
||||
Visitor *v;
|
||||
BlockDriverState *bs = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -762,15 +762,12 @@ static int coroutine_fn bdrv_qed_co_create_opts(const char *filename,
|
|||
qdict_put_str(qdict, "driver", "qed");
|
||||
qdict_put_str(qdict, "file", bs->node_name);
|
||||
|
||||
qobj = qdict_crumple(qdict, errp);
|
||||
qobject_unref(qdict);
|
||||
qdict = qobject_to(QDict, qobj);
|
||||
if (qdict == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
#include "qemu/cutils.h"
|
||||
#include "qemu/option.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-events-block.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
|
|
|
|||
85
block/rbd.c
85
block/rbd.c
|
|
@ -18,6 +18,7 @@
|
|||
#include "qemu/error-report.h"
|
||||
#include "qemu/option.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "crypto/secret.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
|
|
@ -238,22 +239,45 @@ static void qemu_rbd_refresh_limits(BlockDriverState *bs, Error **errp)
|
|||
}
|
||||
|
||||
|
||||
static int qemu_rbd_set_auth(rados_t cluster, const char *secretid,
|
||||
static int qemu_rbd_set_auth(rados_t cluster, BlockdevOptionsRbd *opts,
|
||||
Error **errp)
|
||||
{
|
||||
if (secretid == 0) {
|
||||
return 0;
|
||||
char *key, *acr;
|
||||
int r;
|
||||
GString *accu;
|
||||
RbdAuthModeList *auth;
|
||||
|
||||
if (opts->key_secret) {
|
||||
key = qcrypto_secret_lookup_as_base64(opts->key_secret, errp);
|
||||
if (!key) {
|
||||
return -EIO;
|
||||
}
|
||||
r = rados_conf_set(cluster, "key", key);
|
||||
g_free(key);
|
||||
if (r < 0) {
|
||||
error_setg_errno(errp, -r, "Could not set 'key'");
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
gchar *secret = qcrypto_secret_lookup_as_base64(secretid,
|
||||
errp);
|
||||
if (!secret) {
|
||||
return -1;
|
||||
if (opts->has_auth_client_required) {
|
||||
accu = g_string_new("");
|
||||
for (auth = opts->auth_client_required; auth; auth = auth->next) {
|
||||
if (accu->str[0]) {
|
||||
g_string_append_c(accu, ';');
|
||||
}
|
||||
g_string_append(accu, RbdAuthMode_str(auth->value));
|
||||
}
|
||||
acr = g_string_free(accu, FALSE);
|
||||
r = rados_conf_set(cluster, "auth_client_required", acr);
|
||||
g_free(acr);
|
||||
if (r < 0) {
|
||||
error_setg_errno(errp, -r,
|
||||
"Could not set 'auth_client_required'");
|
||||
return r;
|
||||
}
|
||||
}
|
||||
|
||||
rados_conf_set(cluster, "key", secret);
|
||||
g_free(secret);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -344,9 +368,7 @@ static QemuOptsList runtime_opts = {
|
|||
},
|
||||
};
|
||||
|
||||
/* FIXME Deprecate and remove keypairs or make it available in QMP.
|
||||
* password_secret should eventually be configurable in opts->location. Support
|
||||
* for it in .bdrv_open will make it work here as well. */
|
||||
/* FIXME Deprecate and remove keypairs or make it available in QMP. */
|
||||
static int qemu_rbd_do_create(BlockdevCreateOptions *options,
|
||||
const char *keypairs, const char *password_secret,
|
||||
Error **errp)
|
||||
|
|
@ -552,6 +574,16 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
|||
Error *local_err = NULL;
|
||||
int r;
|
||||
|
||||
if (secretid) {
|
||||
if (opts->key_secret) {
|
||||
error_setg(errp,
|
||||
"Legacy 'password-secret' clashes with 'key-secret'");
|
||||
return -EINVAL;
|
||||
}
|
||||
opts->key_secret = g_strdup(secretid);
|
||||
opts->has_key_secret = true;
|
||||
}
|
||||
|
||||
mon_host = qemu_rbd_mon_host(opts, &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
@ -584,8 +616,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
|
|||
}
|
||||
}
|
||||
|
||||
if (qemu_rbd_set_auth(*cluster, secretid, errp) < 0) {
|
||||
r = -EIO;
|
||||
r = qemu_rbd_set_auth(*cluster, opts, errp);
|
||||
if (r < 0) {
|
||||
goto failed_shutdown;
|
||||
}
|
||||
|
||||
|
|
@ -629,28 +661,11 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
|
|||
BDRVRBDState *s = bs->opaque;
|
||||
BlockdevOptionsRbd *opts = NULL;
|
||||
Visitor *v;
|
||||
QObject *crumpled = NULL;
|
||||
const QDictEntry *e;
|
||||
Error *local_err = NULL;
|
||||
const char *filename;
|
||||
char *keypairs, *secretid;
|
||||
int r;
|
||||
|
||||
/* If we are given a filename, parse the filename, with precedence given to
|
||||
* filename encoded options */
|
||||
filename = qdict_get_try_str(options, "filename");
|
||||
if (filename) {
|
||||
warn_report("'filename' option specified. "
|
||||
"This is an unsupported option, and may be deprecated "
|
||||
"in the future");
|
||||
qemu_rbd_parse_filename(filename, options, &local_err);
|
||||
qdict_del(options, "filename");
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
keypairs = g_strdup(qdict_get_try_str(options, "=keyvalue-pairs"));
|
||||
if (keypairs) {
|
||||
qdict_del(options, "=keyvalue-pairs");
|
||||
|
|
@ -662,16 +677,14 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
|
|||
}
|
||||
|
||||
/* Convert the remaining options into a QAPI object */
|
||||
crumpled = qdict_crumple(options, errp);
|
||||
if (crumpled == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(options, errp);
|
||||
if (!v) {
|
||||
r = -EINVAL;
|
||||
goto out;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(crumpled);
|
||||
visit_type_BlockdevOptionsRbd(v, NULL, &opts, &local_err);
|
||||
visit_free(v);
|
||||
qobject_unref(crumpled);
|
||||
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#include "qemu/option.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/bitops.h"
|
||||
#include "qemu/cutils.h"
|
||||
|
|
@ -538,27 +539,17 @@ static void sd_aio_setup(SheepdogAIOCB *acb, BDRVSheepdogState *s,
|
|||
static SocketAddress *sd_server_config(QDict *options, Error **errp)
|
||||
{
|
||||
QDict *server = NULL;
|
||||
QObject *crumpled_server = NULL;
|
||||
Visitor *iv = NULL;
|
||||
SocketAddress *saddr = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
||||
qdict_extract_subqdict(options, &server, "server.");
|
||||
|
||||
crumpled_server = qdict_crumple(server, errp);
|
||||
if (!crumpled_server) {
|
||||
iv = qobject_input_visitor_new_flat_confused(server, errp);
|
||||
if (!iv) {
|
||||
goto done;
|
||||
}
|
||||
|
||||
/*
|
||||
* FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive
|
||||
* server.type=inet. .to doesn't matter, it's ignored anyway.
|
||||
* That's because when @options come from -blockdev or
|
||||
* blockdev_add, members are typed according to the QAPI schema,
|
||||
* but when they come from -drive, they're all QString. The
|
||||
* visitor expects the former.
|
||||
*/
|
||||
iv = qobject_input_visitor_new(crumpled_server);
|
||||
visit_type_SocketAddress(iv, NULL, &saddr, &local_err);
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
@ -567,7 +558,6 @@ static SocketAddress *sd_server_config(QDict *options, Error **errp)
|
|||
|
||||
done:
|
||||
visit_free(iv);
|
||||
qobject_unref(crumpled_server);
|
||||
qobject_unref(server);
|
||||
return saddr;
|
||||
}
|
||||
|
|
@ -2180,7 +2170,6 @@ static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts,
|
|||
{
|
||||
BlockdevCreateOptions *create_options = NULL;
|
||||
QDict *qdict, *location_qdict;
|
||||
QObject *crumpled;
|
||||
Visitor *v;
|
||||
char *redundancy;
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -2216,16 +2205,14 @@ static int coroutine_fn sd_co_create_opts(const char *filename, QemuOpts *opts,
|
|||
}
|
||||
|
||||
/* Get the QAPI object */
|
||||
crumpled = qdict_crumple(qdict, errp);
|
||||
if (crumpled == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(crumpled);
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
qobject_unref(crumpled);
|
||||
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "block/snapshot.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
|
|
|
|||
16
block/ssh.c
16
block/ssh.c
|
|
@ -28,6 +28,7 @@
|
|||
#include <libssh2_sftp.h>
|
||||
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -605,7 +606,6 @@ static BlockdevOptionsSsh *ssh_parse_options(QDict *options, Error **errp)
|
|||
BlockdevOptionsSsh *result = NULL;
|
||||
QemuOpts *opts = NULL;
|
||||
Error *local_err = NULL;
|
||||
QObject *crumpled;
|
||||
const QDictEntry *e;
|
||||
Visitor *v;
|
||||
|
||||
|
|
@ -622,23 +622,13 @@ static BlockdevOptionsSsh *ssh_parse_options(QDict *options, Error **errp)
|
|||
}
|
||||
|
||||
/* Create the QAPI object */
|
||||
crumpled = qdict_crumple(options, errp);
|
||||
if (crumpled == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(options, errp);
|
||||
if (!v) {
|
||||
goto fail;
|
||||
}
|
||||
|
||||
/*
|
||||
* FIXME .numeric, .to, .ipv4 or .ipv6 don't work with -drive.
|
||||
* .to doesn't matter, it's ignored anyway.
|
||||
* That's because when @options come from -blockdev or
|
||||
* blockdev_add, members are typed according to the QAPI schema,
|
||||
* but when they come from -drive, they're all QString. The
|
||||
* visitor expects the former.
|
||||
*/
|
||||
v = qobject_input_visitor_new(crumpled);
|
||||
visit_type_BlockdevOptionsSsh(v, NULL, &result, &local_err);
|
||||
visit_free(v);
|
||||
qobject_unref(crumpled);
|
||||
|
||||
if (local_err) {
|
||||
error_propagate(errp, local_err);
|
||||
|
|
|
|||
|
|
@ -51,10 +51,10 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qobject-input-visitor.h"
|
||||
#include "qapi/qapi-visit-block-core.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -934,7 +934,11 @@ static int coroutine_fn vdi_co_create_opts(const char *filename, QemuOpts *opts,
|
|||
}
|
||||
|
||||
/* Get the QAPI object */
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto done;
|
||||
}
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
11
block/vhdx.c
11
block/vhdx.c
|
|
@ -18,6 +18,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -1964,8 +1965,7 @@ static int coroutine_fn vhdx_co_create_opts(const char *filename,
|
|||
Error **errp)
|
||||
{
|
||||
BlockdevCreateOptions *create_options = NULL;
|
||||
QDict *qdict = NULL;
|
||||
QObject *qobj;
|
||||
QDict *qdict;
|
||||
Visitor *v;
|
||||
BlockDriverState *bs = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -2004,15 +2004,12 @@ static int coroutine_fn vhdx_co_create_opts(const char *filename,
|
|||
qdict_put_str(qdict, "driver", "vhdx");
|
||||
qdict_put_str(qdict, "file", bs->node_name);
|
||||
|
||||
qobj = qdict_crumple(qdict, errp);
|
||||
qobject_unref(qdict);
|
||||
qdict = qobject_to(QDict, qobj);
|
||||
if (qdict == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
11
block/vpc.c
11
block/vpc.c
|
|
@ -26,6 +26,7 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qapi/error.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
|
|
@ -1080,8 +1081,7 @@ static int coroutine_fn vpc_co_create_opts(const char *filename,
|
|||
QemuOpts *opts, Error **errp)
|
||||
{
|
||||
BlockdevCreateOptions *create_options = NULL;
|
||||
QDict *qdict = NULL;
|
||||
QObject *qobj;
|
||||
QDict *qdict;
|
||||
Visitor *v;
|
||||
BlockDriverState *bs = NULL;
|
||||
Error *local_err = NULL;
|
||||
|
|
@ -1118,15 +1118,12 @@ static int coroutine_fn vpc_co_create_opts(const char *filename,
|
|||
qdict_put_str(qdict, "driver", "vpc");
|
||||
qdict_put_str(qdict, "file", bs->node_name);
|
||||
|
||||
qobj = qdict_crumple(qdict, errp);
|
||||
qobject_unref(qdict);
|
||||
qdict = qobject_to(QDict, qobj);
|
||||
if (qdict == NULL) {
|
||||
v = qobject_input_visitor_new_flat_confused(qdict, errp);
|
||||
if (!v) {
|
||||
ret = -EINVAL;
|
||||
goto fail;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
|
||||
visit_type_BlockdevCreateOptions(v, NULL, &create_options, &local_err);
|
||||
visit_free(v);
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include <dirent.h>
|
||||
#include "qapi/error.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qemu/module.h"
|
||||
#include "qemu/option.h"
|
||||
#include "qemu/bswap.h"
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
#include <qnio/qnio_api.h>
|
||||
#include <sys/param.h>
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/qmp/qerror.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
|
|
|
|||
111
blockdev.c
111
blockdev.c
|
|
@ -35,6 +35,7 @@
|
|||
#include "sysemu/blockdev.h"
|
||||
#include "hw/block/block.h"
|
||||
#include "block/blockjob.h"
|
||||
#include "block/qdict.h"
|
||||
#include "block/throttle-groups.h"
|
||||
#include "monitor/monitor.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
|
@ -729,30 +730,6 @@ QemuOptsList qemu_legacy_drive_opts = {
|
|||
.name = "if",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "interface (ide, scsi, sd, mtd, floppy, pflash, virtio)",
|
||||
},{
|
||||
.name = "cyls",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "number of cylinders (ide disk geometry)",
|
||||
},{
|
||||
.name = "heads",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "number of heads (ide disk geometry)",
|
||||
},{
|
||||
.name = "secs",
|
||||
.type = QEMU_OPT_NUMBER,
|
||||
.help = "number of sectors (ide disk geometry)",
|
||||
},{
|
||||
.name = "trans",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "chs translation (auto, lba, none)",
|
||||
},{
|
||||
.name = "addr",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "pci address (virtio only)",
|
||||
},{
|
||||
.name = "serial",
|
||||
.type = QEMU_OPT_STRING,
|
||||
.help = "disk serial number",
|
||||
},{
|
||||
.name = "file",
|
||||
.type = QEMU_OPT_STRING,
|
||||
|
|
@ -791,19 +768,13 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
QemuOpts *legacy_opts;
|
||||
DriveMediaType media = MEDIA_DISK;
|
||||
BlockInterfaceType type;
|
||||
int cyls, heads, secs, translation;
|
||||
int max_devs, bus_id, unit_id, index;
|
||||
const char *devaddr;
|
||||
const char *werror, *rerror;
|
||||
bool read_only = false;
|
||||
bool copy_on_read;
|
||||
const char *serial;
|
||||
const char *filename;
|
||||
Error *local_err = NULL;
|
||||
int i;
|
||||
const char *deprecated[] = {
|
||||
"serial", "trans", "secs", "heads", "cyls", "addr"
|
||||
};
|
||||
|
||||
/* Change legacy command line options into QMP ones */
|
||||
static const struct {
|
||||
|
|
@ -880,16 +851,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
/* Other deprecated options */
|
||||
if (!qtest_enabled()) {
|
||||
for (i = 0; i < ARRAY_SIZE(deprecated); i++) {
|
||||
if (qemu_opt_get(legacy_opts, deprecated[i]) != NULL) {
|
||||
error_report("'%s' is deprecated, please use the corresponding "
|
||||
"option of '-device' instead", deprecated[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Media type */
|
||||
value = qemu_opt_get(legacy_opts, "media");
|
||||
if (value) {
|
||||
|
|
@ -931,57 +892,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
type = block_default_type;
|
||||
}
|
||||
|
||||
/* Geometry */
|
||||
cyls = qemu_opt_get_number(legacy_opts, "cyls", 0);
|
||||
heads = qemu_opt_get_number(legacy_opts, "heads", 0);
|
||||
secs = qemu_opt_get_number(legacy_opts, "secs", 0);
|
||||
|
||||
if (cyls || heads || secs) {
|
||||
if (cyls < 1) {
|
||||
error_report("invalid physical cyls number");
|
||||
goto fail;
|
||||
}
|
||||
if (heads < 1) {
|
||||
error_report("invalid physical heads number");
|
||||
goto fail;
|
||||
}
|
||||
if (secs < 1) {
|
||||
error_report("invalid physical secs number");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
translation = BIOS_ATA_TRANSLATION_AUTO;
|
||||
value = qemu_opt_get(legacy_opts, "trans");
|
||||
if (value != NULL) {
|
||||
if (!cyls) {
|
||||
error_report("'%s' trans must be used with cyls, heads and secs",
|
||||
value);
|
||||
goto fail;
|
||||
}
|
||||
if (!strcmp(value, "none")) {
|
||||
translation = BIOS_ATA_TRANSLATION_NONE;
|
||||
} else if (!strcmp(value, "lba")) {
|
||||
translation = BIOS_ATA_TRANSLATION_LBA;
|
||||
} else if (!strcmp(value, "large")) {
|
||||
translation = BIOS_ATA_TRANSLATION_LARGE;
|
||||
} else if (!strcmp(value, "rechs")) {
|
||||
translation = BIOS_ATA_TRANSLATION_RECHS;
|
||||
} else if (!strcmp(value, "auto")) {
|
||||
translation = BIOS_ATA_TRANSLATION_AUTO;
|
||||
} else {
|
||||
error_report("'%s' invalid translation type", value);
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
if (media == MEDIA_CDROM) {
|
||||
if (cyls || secs || heads) {
|
||||
error_report("CHS can't be set with media=cdrom");
|
||||
goto fail;
|
||||
}
|
||||
}
|
||||
|
||||
/* Device address specified by bus/unit or index.
|
||||
* If none was specified, try to find the first free one. */
|
||||
bus_id = qemu_opt_get_number(legacy_opts, "bus", 0);
|
||||
|
|
@ -1021,9 +931,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
goto fail;
|
||||
}
|
||||
|
||||
/* Serial number */
|
||||
serial = qemu_opt_get(legacy_opts, "serial");
|
||||
|
||||
/* no id supplied -> create one */
|
||||
if (qemu_opts_id(all_opts) == NULL) {
|
||||
char *new_id;
|
||||
|
|
@ -1043,12 +950,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
}
|
||||
|
||||
/* Add virtio block device */
|
||||
devaddr = qemu_opt_get(legacy_opts, "addr");
|
||||
if (devaddr && type != IF_VIRTIO) {
|
||||
error_report("addr is not supported by this bus type");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (type == IF_VIRTIO) {
|
||||
QemuOpts *devopts;
|
||||
devopts = qemu_opts_create(qemu_find_opts("device"), NULL, 0,
|
||||
|
|
@ -1060,9 +961,6 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
}
|
||||
qemu_opt_set(devopts, "drive", qdict_get_str(bs_opts, "id"),
|
||||
&error_abort);
|
||||
if (devaddr) {
|
||||
qemu_opt_set(devopts, "addr", devaddr, &error_abort);
|
||||
}
|
||||
}
|
||||
|
||||
filename = qemu_opt_get(legacy_opts, "file");
|
||||
|
|
@ -1104,16 +1002,9 @@ DriveInfo *drive_new(QemuOpts *all_opts, BlockInterfaceType block_default_type)
|
|||
dinfo = g_malloc0(sizeof(*dinfo));
|
||||
dinfo->opts = all_opts;
|
||||
|
||||
dinfo->cyls = cyls;
|
||||
dinfo->heads = heads;
|
||||
dinfo->secs = secs;
|
||||
dinfo->trans = translation;
|
||||
|
||||
dinfo->type = type;
|
||||
dinfo->bus = bus_id;
|
||||
dinfo->unit = unit_id;
|
||||
dinfo->devaddr = devaddr;
|
||||
dinfo->serial = g_strdup(serial);
|
||||
|
||||
blk_set_legacy_dinfo(blk, dinfo);
|
||||
|
||||
|
|
|
|||
|
|
@ -69,10 +69,6 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict)
|
|||
if (!dinfo) {
|
||||
goto err;
|
||||
}
|
||||
if (dinfo->devaddr) {
|
||||
monitor_printf(mon, "Parameter addr not supported\n");
|
||||
goto err;
|
||||
}
|
||||
|
||||
switch (dinfo->type) {
|
||||
case IF_NONE:
|
||||
|
|
|
|||
|
|
@ -1283,7 +1283,6 @@ ETEXI
|
|||
.params = "[-n] [[<domain>:]<bus>:]<slot>\n"
|
||||
"[file=file][,if=type][,bus=n]\n"
|
||||
"[,unit=m][,media=d][,index=i]\n"
|
||||
"[,cyls=c,heads=h,secs=s[,trans=t]]\n"
|
||||
"[,snapshot=on|off][,cache=on|off]\n"
|
||||
"[,readonly=on|off][,copy-on-read=on|off]",
|
||||
.help = "add drive to PCI storage controller",
|
||||
|
|
|
|||
|
|
@ -15,19 +15,6 @@
|
|||
#include "qapi/qapi-types-block.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
void blkconf_serial(BlockConf *conf, char **serial)
|
||||
{
|
||||
DriveInfo *dinfo;
|
||||
|
||||
if (!*serial) {
|
||||
/* try to fall back to value set with legacy -drive serial=... */
|
||||
dinfo = blk_legacy_dinfo(conf->blk);
|
||||
if (dinfo) {
|
||||
*serial = g_strdup(dinfo->serial);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void blkconf_blocksizes(BlockConf *conf)
|
||||
{
|
||||
BlockBackend *blk = conf->blk;
|
||||
|
|
@ -108,20 +95,6 @@ bool blkconf_geometry(BlockConf *conf, int *ptrans,
|
|||
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
|
||||
Error **errp)
|
||||
{
|
||||
DriveInfo *dinfo;
|
||||
|
||||
if (!conf->cyls && !conf->heads && !conf->secs) {
|
||||
/* try to fall back to value set with legacy -drive cyls=... */
|
||||
dinfo = blk_legacy_dinfo(conf->blk);
|
||||
if (dinfo) {
|
||||
conf->cyls = dinfo->cyls;
|
||||
conf->heads = dinfo->heads;
|
||||
conf->secs = dinfo->secs;
|
||||
if (ptrans) {
|
||||
*ptrans = dinfo->trans;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!conf->cyls && !conf->heads && !conf->secs) {
|
||||
hd_geometry_guess(conf->blk,
|
||||
&conf->cyls, &conf->heads, &conf->secs,
|
||||
|
|
|
|||
|
|
@ -1215,7 +1215,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
blkconf_serial(&n->conf, &n->serial);
|
||||
if (!n->serial) {
|
||||
error_setg(errp, "serial property not set");
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -935,7 +935,6 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
blkconf_serial(&conf->conf, &conf->serial);
|
||||
if (!blkconf_apply_backend_options(&conf->conf,
|
||||
blk_is_read_only(conf->conf.blk), true,
|
||||
errp)) {
|
||||
|
|
|
|||
|
|
@ -188,7 +188,6 @@ static void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
blkconf_serial(&dev->conf, &dev->serial);
|
||||
if (kind != IDE_CD) {
|
||||
if (!blkconf_geometry(&dev->conf, &dev->chs_trans, 65535, 16, 255,
|
||||
errp)) {
|
||||
|
|
|
|||
|
|
@ -2368,7 +2368,6 @@ static void scsi_realize(SCSIDevice *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
blkconf_serial(&s->qdev.conf, &s->serial);
|
||||
blkconf_blocksizes(&s->qdev.conf);
|
||||
|
||||
if (s->qdev.conf.logical_block_size >
|
||||
|
|
|
|||
|
|
@ -606,7 +606,6 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp)
|
|||
return;
|
||||
}
|
||||
|
||||
blkconf_serial(&s->conf, &dev->serial);
|
||||
blkconf_blocksizes(&s->conf);
|
||||
if (!blkconf_apply_backend_options(&s->conf, blk_is_read_only(blk), true,
|
||||
errp)) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
/*
|
||||
* Special QDict functions used by the block layer
|
||||
*
|
||||
* Copyright (c) 2013-2018 Red Hat, Inc.
|
||||
*
|
||||
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
||||
* See the COPYING.LIB file in the top-level directory.
|
||||
*/
|
||||
|
||||
#ifndef BLOCK_QDICT_H
|
||||
#define BLOCK_QDICT_H
|
||||
|
||||
#include "qapi/qmp/qdict.h"
|
||||
|
||||
void qdict_copy_default(QDict *dst, QDict *src, const char *key);
|
||||
void qdict_set_default_str(QDict *dst, const char *key, const char *val);
|
||||
|
||||
void qdict_join(QDict *dest, QDict *src, bool overwrite);
|
||||
|
||||
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
|
||||
void qdict_array_split(QDict *src, QList **dst);
|
||||
int qdict_array_entries(QDict *src, const char *subqdict);
|
||||
QObject *qdict_crumple(const QDict *src, Error **errp);
|
||||
void qdict_flatten(QDict *qdict);
|
||||
|
||||
typedef struct QDictRenames {
|
||||
const char *from;
|
||||
const char *to;
|
||||
} QDictRenames;
|
||||
bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp);
|
||||
|
||||
Visitor *qobject_input_visitor_new_flat_confused(QDict *qdict,
|
||||
Error **errp);
|
||||
#endif
|
||||
|
|
@ -72,7 +72,6 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
|
|||
|
||||
/* Configuration helpers */
|
||||
|
||||
void blkconf_serial(BlockConf *conf, char **serial);
|
||||
bool blkconf_geometry(BlockConf *conf, int *trans,
|
||||
unsigned cyls_max, unsigned heads_max, unsigned secs_max,
|
||||
Error **errp);
|
||||
|
|
|
|||
|
|
@ -67,23 +67,6 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key,
|
|||
bool qdict_get_try_bool(const QDict *qdict, const char *key, bool def_value);
|
||||
const char *qdict_get_try_str(const QDict *qdict, const char *key);
|
||||
|
||||
void qdict_copy_default(QDict *dst, QDict *src, const char *key);
|
||||
void qdict_set_default_str(QDict *dst, const char *key, const char *val);
|
||||
|
||||
QDict *qdict_clone_shallow(const QDict *src);
|
||||
void qdict_flatten(QDict *qdict);
|
||||
|
||||
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
|
||||
void qdict_array_split(QDict *src, QList **dst);
|
||||
int qdict_array_entries(QDict *src, const char *subqdict);
|
||||
QObject *qdict_crumple(const QDict *src, Error **errp);
|
||||
|
||||
void qdict_join(QDict *dest, QDict *src, bool overwrite);
|
||||
|
||||
typedef struct QDictRenames {
|
||||
const char *from;
|
||||
const char *to;
|
||||
} QDictRenames;
|
||||
bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp);
|
||||
|
||||
#endif /* QDICT_H */
|
||||
|
|
|
|||
|
|
@ -28,16 +28,13 @@ typedef enum {
|
|||
} BlockInterfaceType;
|
||||
|
||||
struct DriveInfo {
|
||||
const char *devaddr;
|
||||
BlockInterfaceType type;
|
||||
int bus;
|
||||
int unit;
|
||||
int auto_del; /* see blockdev_mark_auto_del() */
|
||||
bool is_default; /* Added by default_drive() ? */
|
||||
int media_cd;
|
||||
int cyls, heads, secs, trans;
|
||||
QemuOpts *opts;
|
||||
char *serial;
|
||||
QTAILQ_ENTRY(DriveInfo) next;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -3177,6 +3177,14 @@
|
|||
'*timeout': 'int' } }
|
||||
|
||||
|
||||
##
|
||||
# @RbdAuthMode:
|
||||
#
|
||||
# Since: 3.0
|
||||
##
|
||||
{ 'enum': 'RbdAuthMode',
|
||||
'data': [ 'cephx', 'none' ] }
|
||||
|
||||
##
|
||||
# @BlockdevOptionsRbd:
|
||||
#
|
||||
|
|
@ -3192,6 +3200,15 @@
|
|||
#
|
||||
# @user: Ceph id name.
|
||||
#
|
||||
# @auth-client-required: Acceptable authentication modes.
|
||||
# This maps to Ceph configuration option
|
||||
# "auth_client_required". (Since 3.0)
|
||||
#
|
||||
# @key-secret: ID of a QCryptoSecret object providing a key
|
||||
# for cephx authentication.
|
||||
# This maps to Ceph configuration option
|
||||
# "key". (Since 3.0)
|
||||
#
|
||||
# @server: Monitor host address and port. This maps
|
||||
# to the "mon_host" Ceph option.
|
||||
#
|
||||
|
|
@ -3203,6 +3220,8 @@
|
|||
'*conf': 'str',
|
||||
'*snapshot': 'str',
|
||||
'*user': 'str',
|
||||
'*auth-client-required': ['RbdAuthMode'],
|
||||
'*key-secret': 'str',
|
||||
'*server': ['InetSocketAddressBase'] } }
|
||||
|
||||
##
|
||||
|
|
|
|||
|
|
@ -50,16 +50,17 @@
|
|||
# the last job in a transaction.
|
||||
#
|
||||
# @pending: The job has finished its work, but has finalization steps that it
|
||||
# needs to make prior to completing. These changes may require
|
||||
# manual intervention by the management process if manual was set
|
||||
# to true. These changes may still fail.
|
||||
# needs to make prior to completing. These changes will require
|
||||
# manual intervention via @job-finalize if auto-finalize was set to
|
||||
# false. These pending changes may still fail.
|
||||
#
|
||||
# @aborting: The job is in the process of being aborted, and will finish with
|
||||
# an error. The job will afterwards report that it is @concluded.
|
||||
# This status may not be visible to the management process.
|
||||
#
|
||||
# @concluded: The job has finished all work. If manual was set to true, the job
|
||||
# will remain in the query list until it is dismissed.
|
||||
# @concluded: The job has finished all work. If auto-dismiss was set to false,
|
||||
# the job will remain in the query list until it is dismissed via
|
||||
# @job-dismiss.
|
||||
#
|
||||
# @null: The job is in the process of being dismantled. This state should not
|
||||
# ever be visible externally.
|
||||
|
|
@ -75,19 +76,19 @@
|
|||
#
|
||||
# Represents command verbs that can be applied to a job.
|
||||
#
|
||||
# @cancel: see @block-job-cancel
|
||||
# @cancel: see @job-cancel
|
||||
#
|
||||
# @pause: see @block-job-pause
|
||||
# @pause: see @job-pause
|
||||
#
|
||||
# @resume: see @block-job-resume
|
||||
# @resume: see @job-resume
|
||||
#
|
||||
# @set-speed: see @block-job-set-speed
|
||||
#
|
||||
# @complete: see @block-job-complete
|
||||
# @complete: see @job-complete
|
||||
#
|
||||
# @dismiss: see @block-job-dismiss
|
||||
# @dismiss: see @job-dismiss
|
||||
#
|
||||
# @finalize: see @block-job-finalize
|
||||
# @finalize: see @job-finalize
|
||||
#
|
||||
# Since: 2.12
|
||||
##
|
||||
|
|
|
|||
|
|
@ -2850,21 +2850,6 @@ with ``-device ...,netdev=x''), or ``-nic user,smb=/some/dir''
|
|||
(for embedded NICs). The new syntax allows different settings to be
|
||||
provided per NIC.
|
||||
|
||||
@subsection -drive cyls=...,heads=...,secs=...,trans=... (since 2.10.0)
|
||||
|
||||
The drive geometry arguments are replaced by the the geometry arguments
|
||||
that can be specified with the ``-device'' parameter.
|
||||
|
||||
@subsection -drive serial=... (since 2.10.0)
|
||||
|
||||
The drive serial argument is replaced by the the serial argument
|
||||
that can be specified with the ``-device'' parameter.
|
||||
|
||||
@subsection -drive addr=... (since 2.10.0)
|
||||
|
||||
The drive addr argument is replaced by the the addr argument
|
||||
that can be specified with the ``-device'' parameter.
|
||||
|
||||
@subsection -usbdevice (since 2.10.0)
|
||||
|
||||
The ``-usbdevice DEV'' argument is now a synonym for setting
|
||||
|
|
|
|||
|
|
@ -2906,7 +2906,7 @@ static int img_map(int argc, char **argv)
|
|||
int64_t n;
|
||||
|
||||
/* Probe up to 1 GiB at a time. */
|
||||
n = QEMU_ALIGN_DOWN(MIN(1 << 30, length - offset), BDRV_SECTOR_SIZE);
|
||||
n = MIN(1 << 30, length - offset);
|
||||
ret = get_block_status(bs, offset, n, &next);
|
||||
|
||||
if (ret < 0) {
|
||||
|
|
|
|||
|
|
@ -804,9 +804,8 @@ ETEXI
|
|||
|
||||
DEF("drive", HAS_ARG, QEMU_OPTION_drive,
|
||||
"-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i]\n"
|
||||
" [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off]\n"
|
||||
" [,cache=writethrough|writeback|none|directsync|unsafe][,format=f]\n"
|
||||
" [,serial=s][,addr=A][,rerror=ignore|stop|report]\n"
|
||||
" [,snapshot=on|off][,rerror=ignore|stop|report]\n"
|
||||
" [,werror=ignore|stop|report|enospc][,id=name][,aio=threads|native]\n"
|
||||
" [,readonly=on|off][,copy-on-read=on|off]\n"
|
||||
" [,discard=ignore|unmap][,detect-zeroes=on|off|unmap]\n"
|
||||
|
|
@ -847,10 +846,6 @@ This option defines where is connected the drive by using an index in the list
|
|||
of available connectors of a given interface type.
|
||||
@item media=@var{media}
|
||||
This option defines the type of the media: disk or cdrom.
|
||||
@item cyls=@var{c},heads=@var{h},secs=@var{s}[,trans=@var{t}]
|
||||
Force disk physical geometry and the optional BIOS translation (trans=none or
|
||||
lba). These parameters are deprecated, use the corresponding parameters
|
||||
of @code{-device} instead.
|
||||
@item snapshot=@var{snapshot}
|
||||
@var{snapshot} is "on" or "off" and controls snapshot mode for the given drive
|
||||
(see @option{-snapshot}).
|
||||
|
|
@ -884,13 +879,6 @@ The default mode is @option{cache=writeback}.
|
|||
Specify which disk @var{format} will be used rather than detecting
|
||||
the format. Can be used to specify format=raw to avoid interpreting
|
||||
an untrusted format header.
|
||||
@item serial=@var{serial}
|
||||
This option specifies the serial number to assign to the device. This
|
||||
parameter is deprecated, use the corresponding parameter of @code{-device}
|
||||
instead.
|
||||
@item addr=@var{addr}
|
||||
Specify the controller's PCI address (if=virtio only). This parameter is
|
||||
deprecated, use the corresponding parameter of @code{-device} instead.
|
||||
@item werror=@var{action},rerror=@var{action}
|
||||
Specify which @var{action} to take on write and read errors. Valid actions are:
|
||||
"ignore" (ignore the error and try to continue), "stop" (pause QEMU),
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
util-obj-y = qnull.o qnum.o qstring.o qdict.o qlist.o qbool.o qlit.o
|
||||
util-obj-y += qjson.o qobject.o json-lexer.o json-streamer.o json-parser.o
|
||||
util-obj-y += block-qdict.o
|
||||
|
|
|
|||
|
|
@ -0,0 +1,722 @@
|
|||
/*
|
||||
* Special QDict functions used by the block layer
|
||||
*
|
||||
* Copyright (c) 2013-2018 Red Hat, Inc.
|
||||
*
|
||||
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
||||
* See the COPYING.LIB file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/qmp/qbool.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
#include "qapi/qmp/qnum.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qapi/qobject-input-visitor.h"
|
||||
#include "qemu/cutils.h"
|
||||
#include "qapi/error.h"
|
||||
|
||||
/**
|
||||
* qdict_copy_default(): If no entry mapped by 'key' exists in 'dst' yet, the
|
||||
* value of 'key' in 'src' is copied there (and the refcount increased
|
||||
* accordingly).
|
||||
*/
|
||||
void qdict_copy_default(QDict *dst, QDict *src, const char *key)
|
||||
{
|
||||
QObject *val;
|
||||
|
||||
if (qdict_haskey(dst, key)) {
|
||||
return;
|
||||
}
|
||||
|
||||
val = qdict_get(src, key);
|
||||
if (val) {
|
||||
qdict_put_obj(dst, key, qobject_ref(val));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_set_default_str(): If no entry mapped by 'key' exists in 'dst' yet, a
|
||||
* new QString initialised by 'val' is put there.
|
||||
*/
|
||||
void qdict_set_default_str(QDict *dst, const char *key, const char *val)
|
||||
{
|
||||
if (qdict_haskey(dst, key)) {
|
||||
return;
|
||||
}
|
||||
|
||||
qdict_put_str(dst, key, val);
|
||||
}
|
||||
|
||||
static void qdict_flatten_qdict(QDict *qdict, QDict *target,
|
||||
const char *prefix);
|
||||
|
||||
static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix)
|
||||
{
|
||||
QObject *value;
|
||||
const QListEntry *entry;
|
||||
QDict *dict_val;
|
||||
QList *list_val;
|
||||
char *new_key;
|
||||
int i;
|
||||
|
||||
/* This function is never called with prefix == NULL, i.e., it is always
|
||||
* called from within qdict_flatten_q(list|dict)(). Therefore, it does not
|
||||
* need to remove list entries during the iteration (the whole list will be
|
||||
* deleted eventually anyway from qdict_flatten_qdict()). */
|
||||
assert(prefix);
|
||||
|
||||
entry = qlist_first(qlist);
|
||||
|
||||
for (i = 0; entry; entry = qlist_next(entry), i++) {
|
||||
value = qlist_entry_obj(entry);
|
||||
dict_val = qobject_to(QDict, value);
|
||||
list_val = qobject_to(QList, value);
|
||||
new_key = g_strdup_printf("%s.%i", prefix, i);
|
||||
|
||||
/*
|
||||
* Flatten non-empty QDict and QList recursively into @target,
|
||||
* copy other objects to @target
|
||||
*/
|
||||
if (dict_val && qdict_size(dict_val)) {
|
||||
qdict_flatten_qdict(dict_val, target, new_key);
|
||||
} else if (list_val && !qlist_empty(list_val)) {
|
||||
qdict_flatten_qlist(list_val, target, new_key);
|
||||
} else {
|
||||
qdict_put_obj(target, new_key, qobject_ref(value));
|
||||
}
|
||||
|
||||
g_free(new_key);
|
||||
}
|
||||
}
|
||||
|
||||
static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
|
||||
{
|
||||
QObject *value;
|
||||
const QDictEntry *entry, *next;
|
||||
QDict *dict_val;
|
||||
QList *list_val;
|
||||
char *new_key;
|
||||
|
||||
entry = qdict_first(qdict);
|
||||
|
||||
while (entry != NULL) {
|
||||
next = qdict_next(qdict, entry);
|
||||
value = qdict_entry_value(entry);
|
||||
dict_val = qobject_to(QDict, value);
|
||||
list_val = qobject_to(QList, value);
|
||||
new_key = NULL;
|
||||
|
||||
if (prefix) {
|
||||
new_key = g_strdup_printf("%s.%s", prefix, entry->key);
|
||||
}
|
||||
|
||||
/*
|
||||
* Flatten non-empty QDict and QList recursively into @target,
|
||||
* copy other objects to @target
|
||||
*/
|
||||
if (dict_val && qdict_size(dict_val)) {
|
||||
qdict_flatten_qdict(dict_val, target,
|
||||
new_key ? new_key : entry->key);
|
||||
qdict_del(qdict, entry->key);
|
||||
} else if (list_val && !qlist_empty(list_val)) {
|
||||
qdict_flatten_qlist(list_val, target,
|
||||
new_key ? new_key : entry->key);
|
||||
qdict_del(qdict, entry->key);
|
||||
} else if (target != qdict) {
|
||||
qdict_put_obj(target, new_key, qobject_ref(value));
|
||||
qdict_del(qdict, entry->key);
|
||||
}
|
||||
|
||||
g_free(new_key);
|
||||
entry = next;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_flatten(): For each nested non-empty QDict with key x, all
|
||||
* fields with key y are moved to this QDict and their key is renamed
|
||||
* to "x.y". For each nested non-empty QList with key x, the field at
|
||||
* index y is moved to this QDict with the key "x.y" (i.e., the
|
||||
* reverse of what qdict_array_split() does).
|
||||
* This operation is applied recursively for nested QDicts and QLists.
|
||||
*/
|
||||
void qdict_flatten(QDict *qdict)
|
||||
{
|
||||
qdict_flatten_qdict(qdict, qdict, NULL);
|
||||
}
|
||||
|
||||
/* extract all the src QDict entries starting by start into dst */
|
||||
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)
|
||||
|
||||
{
|
||||
const QDictEntry *entry, *next;
|
||||
const char *p;
|
||||
|
||||
*dst = qdict_new();
|
||||
entry = qdict_first(src);
|
||||
|
||||
while (entry != NULL) {
|
||||
next = qdict_next(src, entry);
|
||||
if (strstart(entry->key, start, &p)) {
|
||||
qdict_put_obj(*dst, p, qobject_ref(entry->value));
|
||||
qdict_del(src, entry->key);
|
||||
}
|
||||
entry = next;
|
||||
}
|
||||
}
|
||||
|
||||
static int qdict_count_prefixed_entries(const QDict *src, const char *start)
|
||||
{
|
||||
const QDictEntry *entry;
|
||||
int count = 0;
|
||||
|
||||
for (entry = qdict_first(src); entry; entry = qdict_next(src, entry)) {
|
||||
if (strstart(entry->key, start, NULL)) {
|
||||
if (count == INT_MAX) {
|
||||
return -ERANGE;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_array_split(): This function moves array-like elements of a QDict into
|
||||
* a new QList. Every entry in the original QDict with a key "%u" or one
|
||||
* prefixed "%u.", where %u designates an unsigned integer starting at 0 and
|
||||
* incrementally counting up, will be moved to a new QDict at index %u in the
|
||||
* output QList with the key prefix removed, if that prefix is "%u.". If the
|
||||
* whole key is just "%u", the whole QObject will be moved unchanged without
|
||||
* creating a new QDict. The function terminates when there is no entry in the
|
||||
* QDict with a prefix directly (incrementally) following the last one; it also
|
||||
* returns if there are both entries with "%u" and "%u." for the same index %u.
|
||||
* Example: {"0.a": 42, "0.b": 23, "1.x": 0, "4.y": 1, "o.o": 7, "2": 66}
|
||||
* (or {"1.x": 0, "4.y": 1, "0.a": 42, "o.o": 7, "0.b": 23, "2": 66})
|
||||
* => [{"a": 42, "b": 23}, {"x": 0}, 66]
|
||||
* and {"4.y": 1, "o.o": 7} (remainder of the old QDict)
|
||||
*/
|
||||
void qdict_array_split(QDict *src, QList **dst)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
*dst = qlist_new();
|
||||
|
||||
for (i = 0; i < UINT_MAX; i++) {
|
||||
QObject *subqobj;
|
||||
bool is_subqdict;
|
||||
QDict *subqdict;
|
||||
char indexstr[32], prefix[32];
|
||||
size_t snprintf_ret;
|
||||
|
||||
snprintf_ret = snprintf(indexstr, 32, "%u", i);
|
||||
assert(snprintf_ret < 32);
|
||||
|
||||
subqobj = qdict_get(src, indexstr);
|
||||
|
||||
snprintf_ret = snprintf(prefix, 32, "%u.", i);
|
||||
assert(snprintf_ret < 32);
|
||||
|
||||
/* Overflow is the same as positive non-zero results */
|
||||
is_subqdict = qdict_count_prefixed_entries(src, prefix);
|
||||
|
||||
/*
|
||||
* There may be either a single subordinate object (named
|
||||
* "%u") or multiple objects (each with a key prefixed "%u."),
|
||||
* but not both.
|
||||
*/
|
||||
if (!subqobj == !is_subqdict) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (is_subqdict) {
|
||||
qdict_extract_subqdict(src, &subqdict, prefix);
|
||||
assert(qdict_size(subqdict) > 0);
|
||||
} else {
|
||||
qobject_ref(subqobj);
|
||||
qdict_del(src, indexstr);
|
||||
}
|
||||
|
||||
qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_split_flat_key:
|
||||
* @key: the key string to split
|
||||
* @prefix: non-NULL pointer to hold extracted prefix
|
||||
* @suffix: non-NULL pointer to remaining suffix
|
||||
*
|
||||
* Given a flattened key such as 'foo.0.bar', split it into two parts
|
||||
* at the first '.' separator. Allows double dot ('..') to escape the
|
||||
* normal separator.
|
||||
*
|
||||
* e.g.
|
||||
* 'foo.0.bar' -> prefix='foo' and suffix='0.bar'
|
||||
* 'foo..0.bar' -> prefix='foo.0' and suffix='bar'
|
||||
*
|
||||
* The '..' sequence will be unescaped in the returned 'prefix'
|
||||
* string. The 'suffix' string will be left in escaped format, so it
|
||||
* can be fed back into the qdict_split_flat_key() key as the input
|
||||
* later.
|
||||
*
|
||||
* The caller is responsible for freeing the string returned in @prefix
|
||||
* using g_free().
|
||||
*/
|
||||
static void qdict_split_flat_key(const char *key, char **prefix,
|
||||
const char **suffix)
|
||||
{
|
||||
const char *separator;
|
||||
size_t i, j;
|
||||
|
||||
/* Find first '.' separator, but if there is a pair '..'
|
||||
* that acts as an escape, so skip over '..' */
|
||||
separator = NULL;
|
||||
do {
|
||||
if (separator) {
|
||||
separator += 2;
|
||||
} else {
|
||||
separator = key;
|
||||
}
|
||||
separator = strchr(separator, '.');
|
||||
} while (separator && separator[1] == '.');
|
||||
|
||||
if (separator) {
|
||||
*prefix = g_strndup(key, separator - key);
|
||||
*suffix = separator + 1;
|
||||
} else {
|
||||
*prefix = g_strdup(key);
|
||||
*suffix = NULL;
|
||||
}
|
||||
|
||||
/* Unescape the '..' sequence into '.' */
|
||||
for (i = 0, j = 0; (*prefix)[i] != '\0'; i++, j++) {
|
||||
if ((*prefix)[i] == '.') {
|
||||
assert((*prefix)[i + 1] == '.');
|
||||
i++;
|
||||
}
|
||||
(*prefix)[j] = (*prefix)[i];
|
||||
}
|
||||
(*prefix)[j] = '\0';
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_is_list:
|
||||
* @maybe_list: dict to check if keys represent list elements.
|
||||
*
|
||||
* Determine whether all keys in @maybe_list are valid list elements.
|
||||
* If @maybe_list is non-zero in length and all the keys look like
|
||||
* valid list indexes, this will return 1. If @maybe_list is zero
|
||||
* length or all keys are non-numeric then it will return 0 to indicate
|
||||
* it is a normal qdict. If there is a mix of numeric and non-numeric
|
||||
* keys, or the list indexes are non-contiguous, an error is reported.
|
||||
*
|
||||
* Returns: 1 if a valid list, 0 if a dict, -1 on error
|
||||
*/
|
||||
static int qdict_is_list(QDict *maybe_list, Error **errp)
|
||||
{
|
||||
const QDictEntry *ent;
|
||||
ssize_t len = 0;
|
||||
ssize_t max = -1;
|
||||
int is_list = -1;
|
||||
int64_t val;
|
||||
|
||||
for (ent = qdict_first(maybe_list); ent != NULL;
|
||||
ent = qdict_next(maybe_list, ent)) {
|
||||
int is_index = !qemu_strtoi64(ent->key, NULL, 10, &val);
|
||||
|
||||
if (is_list == -1) {
|
||||
is_list = is_index;
|
||||
}
|
||||
|
||||
if (is_index != is_list) {
|
||||
error_setg(errp, "Cannot mix list and non-list keys");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (is_index) {
|
||||
len++;
|
||||
if (val > max) {
|
||||
max = val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (is_list == -1) {
|
||||
assert(!qdict_size(maybe_list));
|
||||
is_list = 0;
|
||||
}
|
||||
|
||||
/* NB this isn't a perfect check - e.g. it won't catch
|
||||
* a list containing '1', '+1', '01', '3', but that
|
||||
* does not matter - we've still proved that the
|
||||
* input is a list. It is up the caller to do a
|
||||
* stricter check if desired */
|
||||
if (len != (max + 1)) {
|
||||
error_setg(errp, "List indices are not contiguous, "
|
||||
"saw %zd elements but %zd largest index",
|
||||
len, max);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return is_list;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_crumple:
|
||||
* @src: the original flat dictionary (only scalar values) to crumple
|
||||
*
|
||||
* Takes a flat dictionary whose keys use '.' separator to indicate
|
||||
* nesting, and values are scalars, empty dictionaries or empty lists,
|
||||
* and crumples it into a nested structure.
|
||||
*
|
||||
* To include a literal '.' in a key name, it must be escaped as '..'
|
||||
*
|
||||
* For example, an input of:
|
||||
*
|
||||
* { 'foo.0.bar': 'one', 'foo.0.wizz': '1',
|
||||
* 'foo.1.bar': 'two', 'foo.1.wizz': '2' }
|
||||
*
|
||||
* will result in an output of:
|
||||
*
|
||||
* {
|
||||
* 'foo': [
|
||||
* { 'bar': 'one', 'wizz': '1' },
|
||||
* { 'bar': 'two', 'wizz': '2' }
|
||||
* ],
|
||||
* }
|
||||
*
|
||||
* The following scenarios in the input dict will result in an
|
||||
* error being returned:
|
||||
*
|
||||
* - Any values in @src are non-scalar types
|
||||
* - If keys in @src imply that a particular level is both a
|
||||
* list and a dict. e.g., "foo.0.bar" and "foo.eek.bar".
|
||||
* - If keys in @src imply that a particular level is a list,
|
||||
* but the indices are non-contiguous. e.g. "foo.0.bar" and
|
||||
* "foo.2.bar" without any "foo.1.bar" present.
|
||||
* - If keys in @src represent list indexes, but are not in
|
||||
* the "%zu" format. e.g. "foo.+0.bar"
|
||||
*
|
||||
* Returns: either a QDict or QList for the nested data structure, or NULL
|
||||
* on error
|
||||
*/
|
||||
QObject *qdict_crumple(const QDict *src, Error **errp)
|
||||
{
|
||||
const QDictEntry *ent;
|
||||
QDict *two_level, *multi_level = NULL, *child_dict;
|
||||
QDict *dict_val;
|
||||
QList *list_val;
|
||||
QObject *dst = NULL, *child;
|
||||
size_t i;
|
||||
char *prefix = NULL;
|
||||
const char *suffix = NULL;
|
||||
int is_list;
|
||||
|
||||
two_level = qdict_new();
|
||||
|
||||
/* Step 1: split our totally flat dict into a two level dict */
|
||||
for (ent = qdict_first(src); ent != NULL; ent = qdict_next(src, ent)) {
|
||||
dict_val = qobject_to(QDict, ent->value);
|
||||
list_val = qobject_to(QList, ent->value);
|
||||
if ((dict_val && qdict_size(dict_val))
|
||||
|| (list_val && !qlist_empty(list_val))) {
|
||||
error_setg(errp, "Value %s is not flat", ent->key);
|
||||
goto error;
|
||||
}
|
||||
|
||||
qdict_split_flat_key(ent->key, &prefix, &suffix);
|
||||
child = qdict_get(two_level, prefix);
|
||||
child_dict = qobject_to(QDict, child);
|
||||
|
||||
if (child) {
|
||||
/*
|
||||
* If @child_dict, then all previous keys with this prefix
|
||||
* had a suffix. If @suffix, this one has one as well,
|
||||
* and we're good, else there's a clash.
|
||||
*/
|
||||
if (!child_dict || !suffix) {
|
||||
error_setg(errp, "Cannot mix scalar and non-scalar keys");
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
if (suffix) {
|
||||
if (!child_dict) {
|
||||
child_dict = qdict_new();
|
||||
qdict_put(two_level, prefix, child_dict);
|
||||
}
|
||||
qdict_put_obj(child_dict, suffix, qobject_ref(ent->value));
|
||||
} else {
|
||||
qdict_put_obj(two_level, prefix, qobject_ref(ent->value));
|
||||
}
|
||||
|
||||
g_free(prefix);
|
||||
prefix = NULL;
|
||||
}
|
||||
|
||||
/* Step 2: optionally process the two level dict recursively
|
||||
* into a multi-level dict */
|
||||
multi_level = qdict_new();
|
||||
for (ent = qdict_first(two_level); ent != NULL;
|
||||
ent = qdict_next(two_level, ent)) {
|
||||
dict_val = qobject_to(QDict, ent->value);
|
||||
if (dict_val && qdict_size(dict_val)) {
|
||||
child = qdict_crumple(dict_val, errp);
|
||||
if (!child) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
qdict_put_obj(multi_level, ent->key, child);
|
||||
} else {
|
||||
qdict_put_obj(multi_level, ent->key, qobject_ref(ent->value));
|
||||
}
|
||||
}
|
||||
qobject_unref(two_level);
|
||||
two_level = NULL;
|
||||
|
||||
/* Step 3: detect if we need to turn our dict into list */
|
||||
is_list = qdict_is_list(multi_level, errp);
|
||||
if (is_list < 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (is_list) {
|
||||
dst = QOBJECT(qlist_new());
|
||||
|
||||
for (i = 0; i < qdict_size(multi_level); i++) {
|
||||
char *key = g_strdup_printf("%zu", i);
|
||||
|
||||
child = qdict_get(multi_level, key);
|
||||
g_free(key);
|
||||
|
||||
if (!child) {
|
||||
error_setg(errp, "Missing list index %zu", i);
|
||||
goto error;
|
||||
}
|
||||
|
||||
qlist_append_obj(qobject_to(QList, dst), qobject_ref(child));
|
||||
}
|
||||
qobject_unref(multi_level);
|
||||
multi_level = NULL;
|
||||
} else {
|
||||
dst = QOBJECT(multi_level);
|
||||
}
|
||||
|
||||
return dst;
|
||||
|
||||
error:
|
||||
g_free(prefix);
|
||||
qobject_unref(multi_level);
|
||||
qobject_unref(two_level);
|
||||
qobject_unref(dst);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_crumple_for_keyval_qiv:
|
||||
* @src: the flat dictionary (only scalar values) to crumple
|
||||
* @errp: location to store error
|
||||
*
|
||||
* Like qdict_crumple(), but additionally transforms scalar values so
|
||||
* the result can be passed to qobject_input_visitor_new_keyval().
|
||||
*
|
||||
* The block subsystem uses this function to prepare its flat QDict
|
||||
* with possibly confused scalar types for a visit. It should not be
|
||||
* used for anything else, and it should go away once the block
|
||||
* subsystem has been cleaned up.
|
||||
*/
|
||||
static QObject *qdict_crumple_for_keyval_qiv(QDict *src, Error **errp)
|
||||
{
|
||||
QDict *tmp = NULL;
|
||||
char *buf;
|
||||
const char *s;
|
||||
const QDictEntry *ent;
|
||||
QObject *dst;
|
||||
|
||||
for (ent = qdict_first(src); ent; ent = qdict_next(src, ent)) {
|
||||
buf = NULL;
|
||||
switch (qobject_type(ent->value)) {
|
||||
case QTYPE_QNULL:
|
||||
case QTYPE_QSTRING:
|
||||
continue;
|
||||
case QTYPE_QNUM:
|
||||
s = buf = qnum_to_string(qobject_to(QNum, ent->value));
|
||||
break;
|
||||
case QTYPE_QDICT:
|
||||
case QTYPE_QLIST:
|
||||
/* @src isn't flat; qdict_crumple() will fail */
|
||||
continue;
|
||||
case QTYPE_QBOOL:
|
||||
s = qbool_get_bool(qobject_to(QBool, ent->value))
|
||||
? "on" : "off";
|
||||
break;
|
||||
default:
|
||||
abort();
|
||||
}
|
||||
|
||||
if (!tmp) {
|
||||
tmp = qdict_clone_shallow(src);
|
||||
}
|
||||
qdict_put(tmp, ent->key, qstring_from_str(s));
|
||||
g_free(buf);
|
||||
}
|
||||
|
||||
dst = qdict_crumple(tmp ?: src, errp);
|
||||
qobject_unref(tmp);
|
||||
return dst;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_array_entries(): Returns the number of direct array entries if the
|
||||
* sub-QDict of src specified by the prefix in subqdict (or src itself for
|
||||
* prefix == "") is valid as an array, i.e. the length of the created list if
|
||||
* the sub-QDict would become empty after calling qdict_array_split() on it. If
|
||||
* the array is not valid, -EINVAL is returned.
|
||||
*/
|
||||
int qdict_array_entries(QDict *src, const char *subqdict)
|
||||
{
|
||||
const QDictEntry *entry;
|
||||
unsigned i;
|
||||
unsigned entries = 0;
|
||||
size_t subqdict_len = strlen(subqdict);
|
||||
|
||||
assert(!subqdict_len || subqdict[subqdict_len - 1] == '.');
|
||||
|
||||
/* qdict_array_split() loops until UINT_MAX, but as we want to return
|
||||
* negative errors, we only have a signed return value here. Any additional
|
||||
* entries will lead to -EINVAL. */
|
||||
for (i = 0; i < INT_MAX; i++) {
|
||||
QObject *subqobj;
|
||||
int subqdict_entries;
|
||||
char *prefix = g_strdup_printf("%s%u.", subqdict, i);
|
||||
|
||||
subqdict_entries = qdict_count_prefixed_entries(src, prefix);
|
||||
|
||||
/* Remove ending "." */
|
||||
prefix[strlen(prefix) - 1] = 0;
|
||||
subqobj = qdict_get(src, prefix);
|
||||
|
||||
g_free(prefix);
|
||||
|
||||
if (subqdict_entries < 0) {
|
||||
return subqdict_entries;
|
||||
}
|
||||
|
||||
/* There may be either a single subordinate object (named "%u") or
|
||||
* multiple objects (each with a key prefixed "%u."), but not both. */
|
||||
if (subqobj && subqdict_entries) {
|
||||
return -EINVAL;
|
||||
} else if (!subqobj && !subqdict_entries) {
|
||||
break;
|
||||
}
|
||||
|
||||
entries += subqdict_entries ? subqdict_entries : 1;
|
||||
}
|
||||
|
||||
/* Consider everything handled that isn't part of the given sub-QDict */
|
||||
for (entry = qdict_first(src); entry; entry = qdict_next(src, entry)) {
|
||||
if (!strstart(qdict_entry_key(entry), subqdict, NULL)) {
|
||||
entries++;
|
||||
}
|
||||
}
|
||||
|
||||
/* Anything left in the sub-QDict that wasn't handled? */
|
||||
if (qdict_size(src) != entries) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_join(): Absorb the src QDict into the dest QDict, that is, move all
|
||||
* elements from src to dest.
|
||||
*
|
||||
* If an element from src has a key already present in dest, it will not be
|
||||
* moved unless overwrite is true.
|
||||
*
|
||||
* If overwrite is true, the conflicting values in dest will be discarded and
|
||||
* replaced by the corresponding values from src.
|
||||
*
|
||||
* Therefore, with overwrite being true, the src QDict will always be empty when
|
||||
* this function returns. If overwrite is false, the src QDict will be empty
|
||||
* iff there were no conflicts.
|
||||
*/
|
||||
void qdict_join(QDict *dest, QDict *src, bool overwrite)
|
||||
{
|
||||
const QDictEntry *entry, *next;
|
||||
|
||||
entry = qdict_first(src);
|
||||
while (entry) {
|
||||
next = qdict_next(src, entry);
|
||||
|
||||
if (overwrite || !qdict_haskey(dest, entry->key)) {
|
||||
qdict_put_obj(dest, entry->key, qobject_ref(entry->value));
|
||||
qdict_del(src, entry->key);
|
||||
}
|
||||
|
||||
entry = next;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_rename_keys(): Rename keys in qdict according to the replacements
|
||||
* specified in the array renames. The array must be terminated by an entry
|
||||
* with from = NULL.
|
||||
*
|
||||
* The renames are performed individually in the order of the array, so entries
|
||||
* may be renamed multiple times and may or may not conflict depending on the
|
||||
* order of the renames array.
|
||||
*
|
||||
* Returns true for success, false in error cases.
|
||||
*/
|
||||
bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp)
|
||||
{
|
||||
QObject *qobj;
|
||||
|
||||
while (renames->from) {
|
||||
if (qdict_haskey(qdict, renames->from)) {
|
||||
if (qdict_haskey(qdict, renames->to)) {
|
||||
error_setg(errp, "'%s' and its alias '%s' can't be used at the "
|
||||
"same time", renames->to, renames->from);
|
||||
return false;
|
||||
}
|
||||
|
||||
qobj = qdict_get(qdict, renames->from);
|
||||
qdict_put_obj(qdict, renames->to, qobject_ref(qobj));
|
||||
qdict_del(qdict, renames->from);
|
||||
}
|
||||
|
||||
renames++;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/*
|
||||
* Create a QObject input visitor for flat @qdict with possibly
|
||||
* confused scalar types.
|
||||
*
|
||||
* The block subsystem uses this function to visit its flat QDict with
|
||||
* possibly confused scalar types. It should not be used for anything
|
||||
* else, and it should go away once the block subsystem has been
|
||||
* cleaned up.
|
||||
*/
|
||||
Visitor *qobject_input_visitor_new_flat_confused(QDict *qdict,
|
||||
Error **errp)
|
||||
{
|
||||
QObject *crumpled;
|
||||
Visitor *v;
|
||||
|
||||
crumpled = qdict_crumple_for_keyval_qiv(qdict, errp);
|
||||
if (!crumpled) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
v = qobject_input_visitor_new_keyval(crumpled);
|
||||
qobject_unref(crumpled);
|
||||
return v;
|
||||
}
|
||||
628
qobject/qdict.c
628
qobject/qdict.c
|
|
@ -14,13 +14,8 @@
|
|||
#include "qapi/qmp/qnum.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qbool.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
#include "qapi/qmp/qnull.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/queue.h"
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/cutils.h"
|
||||
|
||||
/**
|
||||
* qdict_new(): Create a new QDict
|
||||
|
|
@ -463,626 +458,3 @@ void qdict_destroy_obj(QObject *obj)
|
|||
|
||||
g_free(qdict);
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_copy_default(): If no entry mapped by 'key' exists in 'dst' yet, the
|
||||
* value of 'key' in 'src' is copied there (and the refcount increased
|
||||
* accordingly).
|
||||
*/
|
||||
void qdict_copy_default(QDict *dst, QDict *src, const char *key)
|
||||
{
|
||||
QObject *val;
|
||||
|
||||
if (qdict_haskey(dst, key)) {
|
||||
return;
|
||||
}
|
||||
|
||||
val = qdict_get(src, key);
|
||||
if (val) {
|
||||
qdict_put_obj(dst, key, qobject_ref(val));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_set_default_str(): If no entry mapped by 'key' exists in 'dst' yet, a
|
||||
* new QString initialised by 'val' is put there.
|
||||
*/
|
||||
void qdict_set_default_str(QDict *dst, const char *key, const char *val)
|
||||
{
|
||||
if (qdict_haskey(dst, key)) {
|
||||
return;
|
||||
}
|
||||
|
||||
qdict_put_str(dst, key, val);
|
||||
}
|
||||
|
||||
static void qdict_flatten_qdict(QDict *qdict, QDict *target,
|
||||
const char *prefix);
|
||||
|
||||
static void qdict_flatten_qlist(QList *qlist, QDict *target, const char *prefix)
|
||||
{
|
||||
QObject *value;
|
||||
const QListEntry *entry;
|
||||
char *new_key;
|
||||
int i;
|
||||
|
||||
/* This function is never called with prefix == NULL, i.e., it is always
|
||||
* called from within qdict_flatten_q(list|dict)(). Therefore, it does not
|
||||
* need to remove list entries during the iteration (the whole list will be
|
||||
* deleted eventually anyway from qdict_flatten_qdict()). */
|
||||
assert(prefix);
|
||||
|
||||
entry = qlist_first(qlist);
|
||||
|
||||
for (i = 0; entry; entry = qlist_next(entry), i++) {
|
||||
value = qlist_entry_obj(entry);
|
||||
new_key = g_strdup_printf("%s.%i", prefix, i);
|
||||
|
||||
if (qobject_type(value) == QTYPE_QDICT) {
|
||||
qdict_flatten_qdict(qobject_to(QDict, value), target, new_key);
|
||||
} else if (qobject_type(value) == QTYPE_QLIST) {
|
||||
qdict_flatten_qlist(qobject_to(QList, value), target, new_key);
|
||||
} else {
|
||||
/* All other types are moved to the target unchanged. */
|
||||
qdict_put_obj(target, new_key, qobject_ref(value));
|
||||
}
|
||||
|
||||
g_free(new_key);
|
||||
}
|
||||
}
|
||||
|
||||
static void qdict_flatten_qdict(QDict *qdict, QDict *target, const char *prefix)
|
||||
{
|
||||
QObject *value;
|
||||
const QDictEntry *entry, *next;
|
||||
char *new_key;
|
||||
bool delete;
|
||||
|
||||
entry = qdict_first(qdict);
|
||||
|
||||
while (entry != NULL) {
|
||||
|
||||
next = qdict_next(qdict, entry);
|
||||
value = qdict_entry_value(entry);
|
||||
new_key = NULL;
|
||||
delete = false;
|
||||
|
||||
if (prefix) {
|
||||
new_key = g_strdup_printf("%s.%s", prefix, entry->key);
|
||||
}
|
||||
|
||||
if (qobject_type(value) == QTYPE_QDICT) {
|
||||
/* Entries of QDicts are processed recursively, the QDict object
|
||||
* itself disappears. */
|
||||
qdict_flatten_qdict(qobject_to(QDict, value), target,
|
||||
new_key ? new_key : entry->key);
|
||||
delete = true;
|
||||
} else if (qobject_type(value) == QTYPE_QLIST) {
|
||||
qdict_flatten_qlist(qobject_to(QList, value), target,
|
||||
new_key ? new_key : entry->key);
|
||||
delete = true;
|
||||
} else if (prefix) {
|
||||
/* All other objects are moved to the target unchanged. */
|
||||
qdict_put_obj(target, new_key, qobject_ref(value));
|
||||
delete = true;
|
||||
}
|
||||
|
||||
g_free(new_key);
|
||||
|
||||
if (delete) {
|
||||
qdict_del(qdict, entry->key);
|
||||
|
||||
/* Restart loop after modifying the iterated QDict */
|
||||
entry = qdict_first(qdict);
|
||||
continue;
|
||||
}
|
||||
|
||||
entry = next;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_flatten(): For each nested QDict with key x, all fields with key y
|
||||
* are moved to this QDict and their key is renamed to "x.y". For each nested
|
||||
* QList with key x, the field at index y is moved to this QDict with the key
|
||||
* "x.y" (i.e., the reverse of what qdict_array_split() does).
|
||||
* This operation is applied recursively for nested QDicts and QLists.
|
||||
*/
|
||||
void qdict_flatten(QDict *qdict)
|
||||
{
|
||||
qdict_flatten_qdict(qdict, qdict, NULL);
|
||||
}
|
||||
|
||||
/* extract all the src QDict entries starting by start into dst */
|
||||
void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start)
|
||||
|
||||
{
|
||||
const QDictEntry *entry, *next;
|
||||
const char *p;
|
||||
|
||||
*dst = qdict_new();
|
||||
entry = qdict_first(src);
|
||||
|
||||
while (entry != NULL) {
|
||||
next = qdict_next(src, entry);
|
||||
if (strstart(entry->key, start, &p)) {
|
||||
qdict_put_obj(*dst, p, qobject_ref(entry->value));
|
||||
qdict_del(src, entry->key);
|
||||
}
|
||||
entry = next;
|
||||
}
|
||||
}
|
||||
|
||||
static int qdict_count_prefixed_entries(const QDict *src, const char *start)
|
||||
{
|
||||
const QDictEntry *entry;
|
||||
int count = 0;
|
||||
|
||||
for (entry = qdict_first(src); entry; entry = qdict_next(src, entry)) {
|
||||
if (strstart(entry->key, start, NULL)) {
|
||||
if (count == INT_MAX) {
|
||||
return -ERANGE;
|
||||
}
|
||||
count++;
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_array_split(): This function moves array-like elements of a QDict into
|
||||
* a new QList. Every entry in the original QDict with a key "%u" or one
|
||||
* prefixed "%u.", where %u designates an unsigned integer starting at 0 and
|
||||
* incrementally counting up, will be moved to a new QDict at index %u in the
|
||||
* output QList with the key prefix removed, if that prefix is "%u.". If the
|
||||
* whole key is just "%u", the whole QObject will be moved unchanged without
|
||||
* creating a new QDict. The function terminates when there is no entry in the
|
||||
* QDict with a prefix directly (incrementally) following the last one; it also
|
||||
* returns if there are both entries with "%u" and "%u." for the same index %u.
|
||||
* Example: {"0.a": 42, "0.b": 23, "1.x": 0, "4.y": 1, "o.o": 7, "2": 66}
|
||||
* (or {"1.x": 0, "4.y": 1, "0.a": 42, "o.o": 7, "0.b": 23, "2": 66})
|
||||
* => [{"a": 42, "b": 23}, {"x": 0}, 66]
|
||||
* and {"4.y": 1, "o.o": 7} (remainder of the old QDict)
|
||||
*/
|
||||
void qdict_array_split(QDict *src, QList **dst)
|
||||
{
|
||||
unsigned i;
|
||||
|
||||
*dst = qlist_new();
|
||||
|
||||
for (i = 0; i < UINT_MAX; i++) {
|
||||
QObject *subqobj;
|
||||
bool is_subqdict;
|
||||
QDict *subqdict;
|
||||
char indexstr[32], prefix[32];
|
||||
size_t snprintf_ret;
|
||||
|
||||
snprintf_ret = snprintf(indexstr, 32, "%u", i);
|
||||
assert(snprintf_ret < 32);
|
||||
|
||||
subqobj = qdict_get(src, indexstr);
|
||||
|
||||
snprintf_ret = snprintf(prefix, 32, "%u.", i);
|
||||
assert(snprintf_ret < 32);
|
||||
|
||||
/* Overflow is the same as positive non-zero results */
|
||||
is_subqdict = qdict_count_prefixed_entries(src, prefix);
|
||||
|
||||
// There may be either a single subordinate object (named "%u") or
|
||||
// multiple objects (each with a key prefixed "%u."), but not both.
|
||||
if (!subqobj == !is_subqdict) {
|
||||
break;
|
||||
}
|
||||
|
||||
if (is_subqdict) {
|
||||
qdict_extract_subqdict(src, &subqdict, prefix);
|
||||
assert(qdict_size(subqdict) > 0);
|
||||
} else {
|
||||
qobject_ref(subqobj);
|
||||
qdict_del(src, indexstr);
|
||||
}
|
||||
|
||||
qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_split_flat_key:
|
||||
* @key: the key string to split
|
||||
* @prefix: non-NULL pointer to hold extracted prefix
|
||||
* @suffix: non-NULL pointer to remaining suffix
|
||||
*
|
||||
* Given a flattened key such as 'foo.0.bar', split it into two parts
|
||||
* at the first '.' separator. Allows double dot ('..') to escape the
|
||||
* normal separator.
|
||||
*
|
||||
* e.g.
|
||||
* 'foo.0.bar' -> prefix='foo' and suffix='0.bar'
|
||||
* 'foo..0.bar' -> prefix='foo.0' and suffix='bar'
|
||||
*
|
||||
* The '..' sequence will be unescaped in the returned 'prefix'
|
||||
* string. The 'suffix' string will be left in escaped format, so it
|
||||
* can be fed back into the qdict_split_flat_key() key as the input
|
||||
* later.
|
||||
*
|
||||
* The caller is responsible for freeing the string returned in @prefix
|
||||
* using g_free().
|
||||
*/
|
||||
static void qdict_split_flat_key(const char *key, char **prefix,
|
||||
const char **suffix)
|
||||
{
|
||||
const char *separator;
|
||||
size_t i, j;
|
||||
|
||||
/* Find first '.' separator, but if there is a pair '..'
|
||||
* that acts as an escape, so skip over '..' */
|
||||
separator = NULL;
|
||||
do {
|
||||
if (separator) {
|
||||
separator += 2;
|
||||
} else {
|
||||
separator = key;
|
||||
}
|
||||
separator = strchr(separator, '.');
|
||||
} while (separator && separator[1] == '.');
|
||||
|
||||
if (separator) {
|
||||
*prefix = g_strndup(key, separator - key);
|
||||
*suffix = separator + 1;
|
||||
} else {
|
||||
*prefix = g_strdup(key);
|
||||
*suffix = NULL;
|
||||
}
|
||||
|
||||
/* Unescape the '..' sequence into '.' */
|
||||
for (i = 0, j = 0; (*prefix)[i] != '\0'; i++, j++) {
|
||||
if ((*prefix)[i] == '.') {
|
||||
assert((*prefix)[i + 1] == '.');
|
||||
i++;
|
||||
}
|
||||
(*prefix)[j] = (*prefix)[i];
|
||||
}
|
||||
(*prefix)[j] = '\0';
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_is_list:
|
||||
* @maybe_list: dict to check if keys represent list elements.
|
||||
*
|
||||
* Determine whether all keys in @maybe_list are valid list elements.
|
||||
* If @maybe_list is non-zero in length and all the keys look like
|
||||
* valid list indexes, this will return 1. If @maybe_list is zero
|
||||
* length or all keys are non-numeric then it will return 0 to indicate
|
||||
* it is a normal qdict. If there is a mix of numeric and non-numeric
|
||||
* keys, or the list indexes are non-contiguous, an error is reported.
|
||||
*
|
||||
* Returns: 1 if a valid list, 0 if a dict, -1 on error
|
||||
*/
|
||||
static int qdict_is_list(QDict *maybe_list, Error **errp)
|
||||
{
|
||||
const QDictEntry *ent;
|
||||
ssize_t len = 0;
|
||||
ssize_t max = -1;
|
||||
int is_list = -1;
|
||||
int64_t val;
|
||||
|
||||
for (ent = qdict_first(maybe_list); ent != NULL;
|
||||
ent = qdict_next(maybe_list, ent)) {
|
||||
|
||||
if (qemu_strtoi64(ent->key, NULL, 10, &val) == 0) {
|
||||
if (is_list == -1) {
|
||||
is_list = 1;
|
||||
} else if (!is_list) {
|
||||
error_setg(errp,
|
||||
"Cannot mix list and non-list keys");
|
||||
return -1;
|
||||
}
|
||||
len++;
|
||||
if (val > max) {
|
||||
max = val;
|
||||
}
|
||||
} else {
|
||||
if (is_list == -1) {
|
||||
is_list = 0;
|
||||
} else if (is_list) {
|
||||
error_setg(errp,
|
||||
"Cannot mix list and non-list keys");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (is_list == -1) {
|
||||
assert(!qdict_size(maybe_list));
|
||||
is_list = 0;
|
||||
}
|
||||
|
||||
/* NB this isn't a perfect check - e.g. it won't catch
|
||||
* a list containing '1', '+1', '01', '3', but that
|
||||
* does not matter - we've still proved that the
|
||||
* input is a list. It is up the caller to do a
|
||||
* stricter check if desired */
|
||||
if (len != (max + 1)) {
|
||||
error_setg(errp, "List indices are not contiguous, "
|
||||
"saw %zd elements but %zd largest index",
|
||||
len, max);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return is_list;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_crumple:
|
||||
* @src: the original flat dictionary (only scalar values) to crumple
|
||||
*
|
||||
* Takes a flat dictionary whose keys use '.' separator to indicate
|
||||
* nesting, and values are scalars, and crumples it into a nested
|
||||
* structure.
|
||||
*
|
||||
* To include a literal '.' in a key name, it must be escaped as '..'
|
||||
*
|
||||
* For example, an input of:
|
||||
*
|
||||
* { 'foo.0.bar': 'one', 'foo.0.wizz': '1',
|
||||
* 'foo.1.bar': 'two', 'foo.1.wizz': '2' }
|
||||
*
|
||||
* will result in an output of:
|
||||
*
|
||||
* {
|
||||
* 'foo': [
|
||||
* { 'bar': 'one', 'wizz': '1' },
|
||||
* { 'bar': 'two', 'wizz': '2' }
|
||||
* ],
|
||||
* }
|
||||
*
|
||||
* The following scenarios in the input dict will result in an
|
||||
* error being returned:
|
||||
*
|
||||
* - Any values in @src are non-scalar types
|
||||
* - If keys in @src imply that a particular level is both a
|
||||
* list and a dict. e.g., "foo.0.bar" and "foo.eek.bar".
|
||||
* - If keys in @src imply that a particular level is a list,
|
||||
* but the indices are non-contiguous. e.g. "foo.0.bar" and
|
||||
* "foo.2.bar" without any "foo.1.bar" present.
|
||||
* - If keys in @src represent list indexes, but are not in
|
||||
* the "%zu" format. e.g. "foo.+0.bar"
|
||||
*
|
||||
* Returns: either a QDict or QList for the nested data structure, or NULL
|
||||
* on error
|
||||
*/
|
||||
QObject *qdict_crumple(const QDict *src, Error **errp)
|
||||
{
|
||||
const QDictEntry *ent;
|
||||
QDict *two_level, *multi_level = NULL;
|
||||
QObject *dst = NULL, *child;
|
||||
size_t i;
|
||||
char *prefix = NULL;
|
||||
const char *suffix = NULL;
|
||||
int is_list;
|
||||
|
||||
two_level = qdict_new();
|
||||
|
||||
/* Step 1: split our totally flat dict into a two level dict */
|
||||
for (ent = qdict_first(src); ent != NULL; ent = qdict_next(src, ent)) {
|
||||
if (qobject_type(ent->value) == QTYPE_QDICT ||
|
||||
qobject_type(ent->value) == QTYPE_QLIST) {
|
||||
error_setg(errp, "Value %s is not a scalar",
|
||||
ent->key);
|
||||
goto error;
|
||||
}
|
||||
|
||||
qdict_split_flat_key(ent->key, &prefix, &suffix);
|
||||
|
||||
child = qdict_get(two_level, prefix);
|
||||
if (suffix) {
|
||||
QDict *child_dict = qobject_to(QDict, child);
|
||||
if (!child_dict) {
|
||||
if (child) {
|
||||
error_setg(errp, "Key %s prefix is already set as a scalar",
|
||||
prefix);
|
||||
goto error;
|
||||
}
|
||||
|
||||
child_dict = qdict_new();
|
||||
qdict_put_obj(two_level, prefix, QOBJECT(child_dict));
|
||||
}
|
||||
|
||||
qdict_put_obj(child_dict, suffix, qobject_ref(ent->value));
|
||||
} else {
|
||||
if (child) {
|
||||
error_setg(errp, "Key %s prefix is already set as a dict",
|
||||
prefix);
|
||||
goto error;
|
||||
}
|
||||
qdict_put_obj(two_level, prefix, qobject_ref(ent->value));
|
||||
}
|
||||
|
||||
g_free(prefix);
|
||||
prefix = NULL;
|
||||
}
|
||||
|
||||
/* Step 2: optionally process the two level dict recursively
|
||||
* into a multi-level dict */
|
||||
multi_level = qdict_new();
|
||||
for (ent = qdict_first(two_level); ent != NULL;
|
||||
ent = qdict_next(two_level, ent)) {
|
||||
QDict *dict = qobject_to(QDict, ent->value);
|
||||
if (dict) {
|
||||
child = qdict_crumple(dict, errp);
|
||||
if (!child) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
qdict_put_obj(multi_level, ent->key, child);
|
||||
} else {
|
||||
qdict_put_obj(multi_level, ent->key, qobject_ref(ent->value));
|
||||
}
|
||||
}
|
||||
qobject_unref(two_level);
|
||||
two_level = NULL;
|
||||
|
||||
/* Step 3: detect if we need to turn our dict into list */
|
||||
is_list = qdict_is_list(multi_level, errp);
|
||||
if (is_list < 0) {
|
||||
goto error;
|
||||
}
|
||||
|
||||
if (is_list) {
|
||||
dst = QOBJECT(qlist_new());
|
||||
|
||||
for (i = 0; i < qdict_size(multi_level); i++) {
|
||||
char *key = g_strdup_printf("%zu", i);
|
||||
|
||||
child = qdict_get(multi_level, key);
|
||||
g_free(key);
|
||||
|
||||
if (!child) {
|
||||
error_setg(errp, "Missing list index %zu", i);
|
||||
goto error;
|
||||
}
|
||||
|
||||
qlist_append_obj(qobject_to(QList, dst), qobject_ref(child));
|
||||
}
|
||||
qobject_unref(multi_level);
|
||||
multi_level = NULL;
|
||||
} else {
|
||||
dst = QOBJECT(multi_level);
|
||||
}
|
||||
|
||||
return dst;
|
||||
|
||||
error:
|
||||
g_free(prefix);
|
||||
qobject_unref(multi_level);
|
||||
qobject_unref(two_level);
|
||||
qobject_unref(dst);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_array_entries(): Returns the number of direct array entries if the
|
||||
* sub-QDict of src specified by the prefix in subqdict (or src itself for
|
||||
* prefix == "") is valid as an array, i.e. the length of the created list if
|
||||
* the sub-QDict would become empty after calling qdict_array_split() on it. If
|
||||
* the array is not valid, -EINVAL is returned.
|
||||
*/
|
||||
int qdict_array_entries(QDict *src, const char *subqdict)
|
||||
{
|
||||
const QDictEntry *entry;
|
||||
unsigned i;
|
||||
unsigned entries = 0;
|
||||
size_t subqdict_len = strlen(subqdict);
|
||||
|
||||
assert(!subqdict_len || subqdict[subqdict_len - 1] == '.');
|
||||
|
||||
/* qdict_array_split() loops until UINT_MAX, but as we want to return
|
||||
* negative errors, we only have a signed return value here. Any additional
|
||||
* entries will lead to -EINVAL. */
|
||||
for (i = 0; i < INT_MAX; i++) {
|
||||
QObject *subqobj;
|
||||
int subqdict_entries;
|
||||
char *prefix = g_strdup_printf("%s%u.", subqdict, i);
|
||||
|
||||
subqdict_entries = qdict_count_prefixed_entries(src, prefix);
|
||||
|
||||
/* Remove ending "." */
|
||||
prefix[strlen(prefix) - 1] = 0;
|
||||
subqobj = qdict_get(src, prefix);
|
||||
|
||||
g_free(prefix);
|
||||
|
||||
if (subqdict_entries < 0) {
|
||||
return subqdict_entries;
|
||||
}
|
||||
|
||||
/* There may be either a single subordinate object (named "%u") or
|
||||
* multiple objects (each with a key prefixed "%u."), but not both. */
|
||||
if (subqobj && subqdict_entries) {
|
||||
return -EINVAL;
|
||||
} else if (!subqobj && !subqdict_entries) {
|
||||
break;
|
||||
}
|
||||
|
||||
entries += subqdict_entries ? subqdict_entries : 1;
|
||||
}
|
||||
|
||||
/* Consider everything handled that isn't part of the given sub-QDict */
|
||||
for (entry = qdict_first(src); entry; entry = qdict_next(src, entry)) {
|
||||
if (!strstart(qdict_entry_key(entry), subqdict, NULL)) {
|
||||
entries++;
|
||||
}
|
||||
}
|
||||
|
||||
/* Anything left in the sub-QDict that wasn't handled? */
|
||||
if (qdict_size(src) != entries) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return i;
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_join(): Absorb the src QDict into the dest QDict, that is, move all
|
||||
* elements from src to dest.
|
||||
*
|
||||
* If an element from src has a key already present in dest, it will not be
|
||||
* moved unless overwrite is true.
|
||||
*
|
||||
* If overwrite is true, the conflicting values in dest will be discarded and
|
||||
* replaced by the corresponding values from src.
|
||||
*
|
||||
* Therefore, with overwrite being true, the src QDict will always be empty when
|
||||
* this function returns. If overwrite is false, the src QDict will be empty
|
||||
* iff there were no conflicts.
|
||||
*/
|
||||
void qdict_join(QDict *dest, QDict *src, bool overwrite)
|
||||
{
|
||||
const QDictEntry *entry, *next;
|
||||
|
||||
entry = qdict_first(src);
|
||||
while (entry) {
|
||||
next = qdict_next(src, entry);
|
||||
|
||||
if (overwrite || !qdict_haskey(dest, entry->key)) {
|
||||
qdict_put_obj(dest, entry->key, qobject_ref(entry->value));
|
||||
qdict_del(src, entry->key);
|
||||
}
|
||||
|
||||
entry = next;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* qdict_rename_keys(): Rename keys in qdict according to the replacements
|
||||
* specified in the array renames. The array must be terminated by an entry
|
||||
* with from = NULL.
|
||||
*
|
||||
* The renames are performed individually in the order of the array, so entries
|
||||
* may be renamed multiple times and may or may not conflict depending on the
|
||||
* order of the renames array.
|
||||
*
|
||||
* Returns true for success, false in error cases.
|
||||
*/
|
||||
bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp)
|
||||
{
|
||||
QObject *qobj;
|
||||
|
||||
while (renames->from) {
|
||||
if (qdict_haskey(qdict, renames->from)) {
|
||||
if (qdict_haskey(qdict, renames->to)) {
|
||||
error_setg(errp, "'%s' and its alias '%s' can't be used at the "
|
||||
"same time", renames->to, renames->from);
|
||||
return false;
|
||||
}
|
||||
|
||||
qobj = qdict_get(qdict, renames->from);
|
||||
qdict_put_obj(qdict, renames->to, qobject_ref(qobj));
|
||||
qdict_del(qdict, renames->from);
|
||||
}
|
||||
|
||||
renames++;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
|
|||
|
||||
check-unit-y = tests/check-qdict$(EXESUF)
|
||||
gcov-files-check-qdict-y = qobject/qdict.c
|
||||
check-unit-y = tests/check-block-qdict$(EXESUF)
|
||||
gcov-files-check-block-qdict-y = qobject/block-qdict.c
|
||||
check-unit-y += tests/test-char$(EXESUF)
|
||||
gcov-files-check-qdict-y = chardev/char.c
|
||||
check-unit-y += tests/check-qnum$(EXESUF)
|
||||
|
|
@ -584,6 +586,7 @@ GENERATED_FILES += tests/test-qapi-types.h tests/test-qapi-visit.h \
|
|||
test-obj-y = tests/check-qnum.o tests/check-qstring.o tests/check-qdict.o \
|
||||
tests/check-qlist.o tests/check-qnull.o tests/check-qobject.o \
|
||||
tests/check-qjson.o tests/check-qlit.o \
|
||||
tests/check-block-qtest.o \
|
||||
tests/test-coroutine.o tests/test-string-output-visitor.o \
|
||||
tests/test-string-input-visitor.o tests/test-qobject-output-visitor.o \
|
||||
tests/test-clone-visitor.o \
|
||||
|
|
@ -614,6 +617,7 @@ test-block-obj-y = $(block-obj-y) $(test-io-obj-y) tests/iothread.o
|
|||
tests/check-qnum$(EXESUF): tests/check-qnum.o $(test-util-obj-y)
|
||||
tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y)
|
||||
tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y)
|
||||
tests/check-block-qdict$(EXESUF): tests/check-block-qdict.o $(test-util-obj-y)
|
||||
tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y)
|
||||
tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y)
|
||||
tests/check-qobject$(EXESUF): tests/check-qobject.o $(test-util-obj-y)
|
||||
|
|
|
|||
|
|
@ -180,12 +180,12 @@ static AHCIQState *ahci_boot(const char *cli, ...)
|
|||
s = ahci_vboot(cli, ap);
|
||||
va_end(ap);
|
||||
} else {
|
||||
cli = "-drive if=none,id=drive0,file=%s,cache=writeback,serial=%s"
|
||||
",format=%s"
|
||||
cli = "-drive if=none,id=drive0,file=%s,cache=writeback,format=%s"
|
||||
" -M q35 "
|
||||
"-device ide-hd,drive=drive0 "
|
||||
"-global ide-hd.serial=%s "
|
||||
"-global ide-hd.ver=%s";
|
||||
s = ahci_boot(cli, tmp_path, "testdisk", imgfmt, "version");
|
||||
s = ahci_boot(cli, tmp_path, imgfmt, "testdisk", "version");
|
||||
}
|
||||
|
||||
return s;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,690 @@
|
|||
/*
|
||||
* Unit-tests for Block layer QDict extras
|
||||
*
|
||||
* Copyright (c) 2013-2018 Red Hat, Inc.
|
||||
*
|
||||
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
||||
* See the COPYING.LIB file in the top-level directory.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
#include "qapi/qmp/qnum.h"
|
||||
#include "qapi/error.h"
|
||||
|
||||
static void qdict_defaults_test(void)
|
||||
{
|
||||
QDict *dict, *copy;
|
||||
|
||||
dict = qdict_new();
|
||||
copy = qdict_new();
|
||||
|
||||
qdict_set_default_str(dict, "foo", "abc");
|
||||
qdict_set_default_str(dict, "foo", "def");
|
||||
g_assert_cmpstr(qdict_get_str(dict, "foo"), ==, "abc");
|
||||
qdict_set_default_str(dict, "bar", "ghi");
|
||||
|
||||
qdict_copy_default(copy, dict, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "foo"), ==, "abc");
|
||||
qdict_set_default_str(copy, "bar", "xyz");
|
||||
qdict_copy_default(copy, dict, "bar");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "bar"), ==, "xyz");
|
||||
|
||||
qobject_unref(copy);
|
||||
qobject_unref(dict);
|
||||
}
|
||||
|
||||
static void qdict_flatten_test(void)
|
||||
{
|
||||
QList *e_1 = qlist_new();
|
||||
QList *e = qlist_new();
|
||||
QDict *e_1_2 = qdict_new();
|
||||
QDict *f = qdict_new();
|
||||
QList *y = qlist_new();
|
||||
QDict *z = qdict_new();
|
||||
QDict *root = qdict_new();
|
||||
|
||||
/*
|
||||
* Test the flattening of
|
||||
*
|
||||
* {
|
||||
* "e": [
|
||||
* 42,
|
||||
* [
|
||||
* 23,
|
||||
* 66,
|
||||
* {
|
||||
* "a": 0,
|
||||
* "b": 1
|
||||
* }
|
||||
* ]
|
||||
* ],
|
||||
* "f": {
|
||||
* "c": 2,
|
||||
* "d": 3,
|
||||
* },
|
||||
* "g": 4,
|
||||
* "y": [{}],
|
||||
* "z": {"a": []}
|
||||
* }
|
||||
*
|
||||
* to
|
||||
*
|
||||
* {
|
||||
* "e.0": 42,
|
||||
* "e.1.0": 23,
|
||||
* "e.1.1": 66,
|
||||
* "e.1.2.a": 0,
|
||||
* "e.1.2.b": 1,
|
||||
* "f.c": 2,
|
||||
* "f.d": 3,
|
||||
* "g": 4,
|
||||
* "y.0": {},
|
||||
* "z.a": []
|
||||
* }
|
||||
*/
|
||||
|
||||
qdict_put_int(e_1_2, "a", 0);
|
||||
qdict_put_int(e_1_2, "b", 1);
|
||||
|
||||
qlist_append_int(e_1, 23);
|
||||
qlist_append_int(e_1, 66);
|
||||
qlist_append(e_1, e_1_2);
|
||||
qlist_append_int(e, 42);
|
||||
qlist_append(e, e_1);
|
||||
|
||||
qdict_put_int(f, "c", 2);
|
||||
qdict_put_int(f, "d", 3);
|
||||
|
||||
qlist_append(y, qdict_new());
|
||||
|
||||
qdict_put(z, "a", qlist_new());
|
||||
|
||||
qdict_put(root, "e", e);
|
||||
qdict_put(root, "f", f);
|
||||
qdict_put_int(root, "g", 4);
|
||||
qdict_put(root, "y", y);
|
||||
qdict_put(root, "z", z);
|
||||
|
||||
qdict_flatten(root);
|
||||
|
||||
g_assert(qdict_get_int(root, "e.0") == 42);
|
||||
g_assert(qdict_get_int(root, "e.1.0") == 23);
|
||||
g_assert(qdict_get_int(root, "e.1.1") == 66);
|
||||
g_assert(qdict_get_int(root, "e.1.2.a") == 0);
|
||||
g_assert(qdict_get_int(root, "e.1.2.b") == 1);
|
||||
g_assert(qdict_get_int(root, "f.c") == 2);
|
||||
g_assert(qdict_get_int(root, "f.d") == 3);
|
||||
g_assert(qdict_get_int(root, "g") == 4);
|
||||
g_assert(!qdict_size(qdict_get_qdict(root, "y.0")));
|
||||
g_assert(qlist_empty(qdict_get_qlist(root, "z.a")));
|
||||
|
||||
g_assert(qdict_size(root) == 10);
|
||||
|
||||
qobject_unref(root);
|
||||
}
|
||||
|
||||
static void qdict_array_split_test(void)
|
||||
{
|
||||
QDict *test_dict = qdict_new();
|
||||
QDict *dict1, *dict2;
|
||||
QNum *int1;
|
||||
QList *test_list;
|
||||
|
||||
/*
|
||||
* Test the split of
|
||||
*
|
||||
* {
|
||||
* "1.x": 0,
|
||||
* "4.y": 1,
|
||||
* "0.a": 42,
|
||||
* "o.o": 7,
|
||||
* "0.b": 23,
|
||||
* "2": 66
|
||||
* }
|
||||
*
|
||||
* to
|
||||
*
|
||||
* [
|
||||
* {
|
||||
* "a": 42,
|
||||
* "b": 23
|
||||
* },
|
||||
* {
|
||||
* "x": 0
|
||||
* },
|
||||
* 66
|
||||
* ]
|
||||
*
|
||||
* and
|
||||
*
|
||||
* {
|
||||
* "4.y": 1,
|
||||
* "o.o": 7
|
||||
* }
|
||||
*
|
||||
* (remaining in the old QDict)
|
||||
*
|
||||
* This example is given in the comment of qdict_array_split().
|
||||
*/
|
||||
|
||||
qdict_put_int(test_dict, "1.x", 0);
|
||||
qdict_put_int(test_dict, "4.y", 1);
|
||||
qdict_put_int(test_dict, "0.a", 42);
|
||||
qdict_put_int(test_dict, "o.o", 7);
|
||||
qdict_put_int(test_dict, "0.b", 23);
|
||||
qdict_put_int(test_dict, "2", 66);
|
||||
|
||||
qdict_array_split(test_dict, &test_list);
|
||||
|
||||
dict1 = qobject_to(QDict, qlist_pop(test_list));
|
||||
dict2 = qobject_to(QDict, qlist_pop(test_list));
|
||||
int1 = qobject_to(QNum, qlist_pop(test_list));
|
||||
|
||||
g_assert(dict1);
|
||||
g_assert(dict2);
|
||||
g_assert(int1);
|
||||
g_assert(qlist_empty(test_list));
|
||||
|
||||
qobject_unref(test_list);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "a") == 42);
|
||||
g_assert(qdict_get_int(dict1, "b") == 23);
|
||||
|
||||
g_assert(qdict_size(dict1) == 2);
|
||||
|
||||
qobject_unref(dict1);
|
||||
|
||||
g_assert(qdict_get_int(dict2, "x") == 0);
|
||||
|
||||
g_assert(qdict_size(dict2) == 1);
|
||||
|
||||
qobject_unref(dict2);
|
||||
|
||||
g_assert_cmpint(qnum_get_int(int1), ==, 66);
|
||||
|
||||
qobject_unref(int1);
|
||||
|
||||
g_assert(qdict_get_int(test_dict, "4.y") == 1);
|
||||
g_assert(qdict_get_int(test_dict, "o.o") == 7);
|
||||
|
||||
g_assert(qdict_size(test_dict) == 2);
|
||||
|
||||
qobject_unref(test_dict);
|
||||
|
||||
/*
|
||||
* Test the split of
|
||||
*
|
||||
* {
|
||||
* "0": 42,
|
||||
* "1": 23,
|
||||
* "1.x": 84
|
||||
* }
|
||||
*
|
||||
* to
|
||||
*
|
||||
* [
|
||||
* 42
|
||||
* ]
|
||||
*
|
||||
* and
|
||||
*
|
||||
* {
|
||||
* "1": 23,
|
||||
* "1.x": 84
|
||||
* }
|
||||
*
|
||||
* That is, test whether splitting stops if there is both an entry with key
|
||||
* of "%u" and other entries with keys prefixed "%u." for the same index.
|
||||
*/
|
||||
|
||||
test_dict = qdict_new();
|
||||
|
||||
qdict_put_int(test_dict, "0", 42);
|
||||
qdict_put_int(test_dict, "1", 23);
|
||||
qdict_put_int(test_dict, "1.x", 84);
|
||||
|
||||
qdict_array_split(test_dict, &test_list);
|
||||
|
||||
int1 = qobject_to(QNum, qlist_pop(test_list));
|
||||
|
||||
g_assert(int1);
|
||||
g_assert(qlist_empty(test_list));
|
||||
|
||||
qobject_unref(test_list);
|
||||
|
||||
g_assert_cmpint(qnum_get_int(int1), ==, 42);
|
||||
|
||||
qobject_unref(int1);
|
||||
|
||||
g_assert(qdict_get_int(test_dict, "1") == 23);
|
||||
g_assert(qdict_get_int(test_dict, "1.x") == 84);
|
||||
|
||||
g_assert(qdict_size(test_dict) == 2);
|
||||
|
||||
qobject_unref(test_dict);
|
||||
}
|
||||
|
||||
static void qdict_array_entries_test(void)
|
||||
{
|
||||
QDict *dict = qdict_new();
|
||||
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 0);
|
||||
|
||||
qdict_put_int(dict, "bar", 0);
|
||||
qdict_put_int(dict, "baz.0", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 0);
|
||||
|
||||
qdict_put_int(dict, "foo.1", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, -EINVAL);
|
||||
qdict_put_int(dict, "foo.0", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 2);
|
||||
qdict_put_int(dict, "foo.bar", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, -EINVAL);
|
||||
qdict_del(dict, "foo.bar");
|
||||
|
||||
qdict_put_int(dict, "foo.2.a", 0);
|
||||
qdict_put_int(dict, "foo.2.b", 0);
|
||||
qdict_put_int(dict, "foo.2.c", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 3);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
||||
|
||||
qobject_unref(dict);
|
||||
|
||||
dict = qdict_new();
|
||||
qdict_put_int(dict, "1", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
||||
qdict_put_int(dict, "0", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, 2);
|
||||
qdict_put_int(dict, "bar", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
||||
qdict_del(dict, "bar");
|
||||
|
||||
qdict_put_int(dict, "2.a", 0);
|
||||
qdict_put_int(dict, "2.b", 0);
|
||||
qdict_put_int(dict, "2.c", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, 3);
|
||||
|
||||
qobject_unref(dict);
|
||||
}
|
||||
|
||||
static void qdict_join_test(void)
|
||||
{
|
||||
QDict *dict1, *dict2;
|
||||
bool overwrite = false;
|
||||
int i;
|
||||
|
||||
dict1 = qdict_new();
|
||||
dict2 = qdict_new();
|
||||
|
||||
/* Test everything once without overwrite and once with */
|
||||
do {
|
||||
/* Test empty dicts */
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 0);
|
||||
g_assert(qdict_size(dict2) == 0);
|
||||
|
||||
/* First iteration: Test movement */
|
||||
/* Second iteration: Test empty source and non-empty destination */
|
||||
qdict_put_int(dict2, "foo", 42);
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 1);
|
||||
g_assert(qdict_size(dict2) == 0);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "foo") == 42);
|
||||
}
|
||||
|
||||
/* Test non-empty source and destination without conflict */
|
||||
qdict_put_int(dict2, "bar", 23);
|
||||
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 2);
|
||||
g_assert(qdict_size(dict2) == 0);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "foo") == 42);
|
||||
g_assert(qdict_get_int(dict1, "bar") == 23);
|
||||
|
||||
/* Test conflict */
|
||||
qdict_put_int(dict2, "foo", 84);
|
||||
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 2);
|
||||
g_assert(qdict_size(dict2) == !overwrite);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "foo") == (overwrite ? 84 : 42));
|
||||
g_assert(qdict_get_int(dict1, "bar") == 23);
|
||||
|
||||
if (!overwrite) {
|
||||
g_assert(qdict_get_int(dict2, "foo") == 84);
|
||||
}
|
||||
|
||||
/* Check the references */
|
||||
g_assert(qdict_get(dict1, "foo")->base.refcnt == 1);
|
||||
g_assert(qdict_get(dict1, "bar")->base.refcnt == 1);
|
||||
|
||||
if (!overwrite) {
|
||||
g_assert(qdict_get(dict2, "foo")->base.refcnt == 1);
|
||||
}
|
||||
|
||||
/* Clean up */
|
||||
qdict_del(dict1, "foo");
|
||||
qdict_del(dict1, "bar");
|
||||
|
||||
if (!overwrite) {
|
||||
qdict_del(dict2, "foo");
|
||||
}
|
||||
} while (overwrite ^= true);
|
||||
|
||||
qobject_unref(dict1);
|
||||
qobject_unref(dict2);
|
||||
}
|
||||
|
||||
static void qdict_crumple_test_recursive(void)
|
||||
{
|
||||
QDict *src, *dst, *rule, *vnc, *acl, *listen;
|
||||
QDict *empty, *empty_dict, *empty_list_0;
|
||||
QList *rules, *empty_list, *empty_dict_a;
|
||||
|
||||
src = qdict_new();
|
||||
qdict_put_str(src, "vnc.listen.addr", "127.0.0.1");
|
||||
qdict_put_str(src, "vnc.listen.port", "5901");
|
||||
qdict_put_str(src, "vnc.acl.rules.0.match", "fred");
|
||||
qdict_put_str(src, "vnc.acl.rules.0.policy", "allow");
|
||||
qdict_put_str(src, "vnc.acl.rules.1.match", "bob");
|
||||
qdict_put_str(src, "vnc.acl.rules.1.policy", "deny");
|
||||
qdict_put_str(src, "vnc.acl.default", "deny");
|
||||
qdict_put_str(src, "vnc.acl..name", "acl0");
|
||||
qdict_put_str(src, "vnc.acl.rule..name", "acl0");
|
||||
qdict_put(src, "empty.dict.a", qlist_new());
|
||||
qdict_put(src, "empty.list.0", qdict_new());
|
||||
|
||||
dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
|
||||
g_assert(dst);
|
||||
g_assert_cmpint(qdict_size(dst), ==, 2);
|
||||
|
||||
vnc = qdict_get_qdict(dst, "vnc");
|
||||
g_assert(vnc);
|
||||
g_assert_cmpint(qdict_size(vnc), ==, 3);
|
||||
|
||||
listen = qdict_get_qdict(vnc, "listen");
|
||||
g_assert(listen);
|
||||
g_assert_cmpint(qdict_size(listen), ==, 2);
|
||||
g_assert_cmpstr("127.0.0.1", ==, qdict_get_str(listen, "addr"));
|
||||
g_assert_cmpstr("5901", ==, qdict_get_str(listen, "port"));
|
||||
|
||||
acl = qdict_get_qdict(vnc, "acl");
|
||||
g_assert(acl);
|
||||
g_assert_cmpint(qdict_size(acl), ==, 3);
|
||||
|
||||
rules = qdict_get_qlist(acl, "rules");
|
||||
g_assert(rules);
|
||||
g_assert_cmpint(qlist_size(rules), ==, 2);
|
||||
|
||||
rule = qobject_to(QDict, qlist_pop(rules));
|
||||
g_assert(rule);
|
||||
g_assert_cmpint(qdict_size(rule), ==, 2);
|
||||
g_assert_cmpstr("fred", ==, qdict_get_str(rule, "match"));
|
||||
g_assert_cmpstr("allow", ==, qdict_get_str(rule, "policy"));
|
||||
qobject_unref(rule);
|
||||
|
||||
rule = qobject_to(QDict, qlist_pop(rules));
|
||||
g_assert(rule);
|
||||
g_assert_cmpint(qdict_size(rule), ==, 2);
|
||||
g_assert_cmpstr("bob", ==, qdict_get_str(rule, "match"));
|
||||
g_assert_cmpstr("deny", ==, qdict_get_str(rule, "policy"));
|
||||
qobject_unref(rule);
|
||||
|
||||
/* With recursive crumpling, we should see all names unescaped */
|
||||
g_assert_cmpstr("acl0", ==, qdict_get_str(vnc, "acl.name"));
|
||||
g_assert_cmpstr("acl0", ==, qdict_get_str(acl, "rule.name"));
|
||||
|
||||
empty = qdict_get_qdict(dst, "empty");
|
||||
g_assert(empty);
|
||||
g_assert_cmpint(qdict_size(empty), ==, 2);
|
||||
empty_dict = qdict_get_qdict(empty, "dict");
|
||||
g_assert(empty_dict);
|
||||
g_assert_cmpint(qdict_size(empty_dict), ==, 1);
|
||||
empty_dict_a = qdict_get_qlist(empty_dict, "a");
|
||||
g_assert(empty_dict_a && qlist_empty(empty_dict_a));
|
||||
empty_list = qdict_get_qlist(empty, "list");
|
||||
g_assert(empty_list);
|
||||
g_assert_cmpint(qlist_size(empty_list), ==, 1);
|
||||
empty_list_0 = qobject_to(QDict, qlist_pop(empty_list));
|
||||
g_assert(empty_list_0);
|
||||
g_assert_cmpint(qdict_size(empty_list_0), ==, 0);
|
||||
|
||||
qobject_unref(src);
|
||||
qobject_unref(dst);
|
||||
}
|
||||
|
||||
static void qdict_crumple_test_empty(void)
|
||||
{
|
||||
QDict *src, *dst;
|
||||
|
||||
src = qdict_new();
|
||||
|
||||
dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
|
||||
|
||||
g_assert_cmpint(qdict_size(dst), ==, 0);
|
||||
|
||||
qobject_unref(src);
|
||||
qobject_unref(dst);
|
||||
}
|
||||
|
||||
static int qdict_count_entries(QDict *dict)
|
||||
{
|
||||
const QDictEntry *e;
|
||||
int count = 0;
|
||||
|
||||
for (e = qdict_first(dict); e; e = qdict_next(dict, e)) {
|
||||
count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static void qdict_rename_keys_test(void)
|
||||
{
|
||||
QDict *dict = qdict_new();
|
||||
QDict *copy;
|
||||
QDictRenames *renames;
|
||||
Error *local_err = NULL;
|
||||
|
||||
qdict_put_str(dict, "abc", "foo");
|
||||
qdict_put_str(dict, "abcdef", "bar");
|
||||
qdict_put_int(dict, "number", 42);
|
||||
qdict_put_bool(dict, "flag", true);
|
||||
qdict_put_null(dict, "nothing");
|
||||
|
||||
/* Empty rename list */
|
||||
renames = (QDictRenames[]) {
|
||||
{ NULL, "this can be anything" }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &error_abort);
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abcdef"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "number"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "flag"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "nothing")) == QTYPE_QNULL);
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Simple rename of all entries */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abc", "str1" },
|
||||
{ "abcdef", "str2" },
|
||||
{ "number", "int" },
|
||||
{ "flag", "bool" },
|
||||
{ "nothing", "null" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &error_abort);
|
||||
|
||||
g_assert(!qdict_haskey(copy, "abc"));
|
||||
g_assert(!qdict_haskey(copy, "abcdef"));
|
||||
g_assert(!qdict_haskey(copy, "number"));
|
||||
g_assert(!qdict_haskey(copy, "flag"));
|
||||
g_assert(!qdict_haskey(copy, "nothing"));
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "str1"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "str2"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "int"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "bool"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "null")) == QTYPE_QNULL);
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Renames are processed top to bottom */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abc", "tmp" },
|
||||
{ "abcdef", "abc" },
|
||||
{ "number", "abcdef" },
|
||||
{ "flag", "number" },
|
||||
{ "nothing", "flag" },
|
||||
{ "tmp", "nothing" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &error_abort);
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "nothing"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "abcdef"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "number"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "flag")) == QTYPE_QNULL);
|
||||
g_assert(!qdict_haskey(copy, "tmp"));
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Conflicting rename */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abcdef", "abc" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &local_err);
|
||||
|
||||
g_assert(local_err != NULL);
|
||||
error_free(local_err);
|
||||
local_err = NULL;
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abcdef"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "number"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "flag"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "nothing")) == QTYPE_QNULL);
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Renames in an empty dict */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abcdef", "abc" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
|
||||
qobject_unref(dict);
|
||||
dict = qdict_new();
|
||||
|
||||
qdict_rename_keys(dict, renames, &error_abort);
|
||||
g_assert(qdict_first(dict) == NULL);
|
||||
|
||||
qobject_unref(dict);
|
||||
}
|
||||
|
||||
static void qdict_crumple_test_bad_inputs(void)
|
||||
{
|
||||
QDict *src, *nested;
|
||||
Error *error = NULL;
|
||||
|
||||
src = qdict_new();
|
||||
/* rule.0 can't be both a string and a dict */
|
||||
qdict_put_str(src, "rule.0", "fred");
|
||||
qdict_put_str(src, "rule.0.policy", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* rule can't be both a list and a dict */
|
||||
qdict_put_str(src, "rule.0", "fred");
|
||||
qdict_put_str(src, "rule.a", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* The input should be flat, ie no dicts or lists */
|
||||
nested = qdict_new();
|
||||
qdict_put(nested, "x", qdict_new());
|
||||
qdict_put(src, "rule.a", nested);
|
||||
qdict_put_str(src, "rule.b", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* List indexes must not have gaps */
|
||||
qdict_put_str(src, "rule.0", "deny");
|
||||
qdict_put_str(src, "rule.3", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* List indexes must be in %zu format */
|
||||
qdict_put_str(src, "rule.0", "deny");
|
||||
qdict_put_str(src, "rule.+1", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
g_test_init(&argc, &argv, NULL);
|
||||
|
||||
g_test_add_func("/public/defaults", qdict_defaults_test);
|
||||
g_test_add_func("/public/flatten", qdict_flatten_test);
|
||||
g_test_add_func("/public/array_split", qdict_array_split_test);
|
||||
g_test_add_func("/public/array_entries", qdict_array_entries_test);
|
||||
g_test_add_func("/public/join", qdict_join_test);
|
||||
g_test_add_func("/public/crumple/recursive",
|
||||
qdict_crumple_test_recursive);
|
||||
g_test_add_func("/public/crumple/empty",
|
||||
qdict_crumple_test_empty);
|
||||
g_test_add_func("/public/crumple/bad_inputs",
|
||||
qdict_crumple_test_bad_inputs);
|
||||
|
||||
g_test_add_func("/public/rename_keys", qdict_rename_keys_test);
|
||||
|
||||
return g_test_run();
|
||||
}
|
||||
|
|
@ -12,11 +12,6 @@
|
|||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
#include "qapi/qmp/qnum.h"
|
||||
#include "qapi/qmp/qstring.h"
|
||||
#include "qapi/error.h"
|
||||
#include "qemu-common.h"
|
||||
|
||||
/*
|
||||
* Public Interface test-cases
|
||||
|
|
@ -156,28 +151,6 @@ static void qdict_get_try_str_test(void)
|
|||
qobject_unref(tests_dict);
|
||||
}
|
||||
|
||||
static void qdict_defaults_test(void)
|
||||
{
|
||||
QDict *dict, *copy;
|
||||
|
||||
dict = qdict_new();
|
||||
copy = qdict_new();
|
||||
|
||||
qdict_set_default_str(dict, "foo", "abc");
|
||||
qdict_set_default_str(dict, "foo", "def");
|
||||
g_assert_cmpstr(qdict_get_str(dict, "foo"), ==, "abc");
|
||||
qdict_set_default_str(dict, "bar", "ghi");
|
||||
|
||||
qdict_copy_default(copy, dict, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "foo"), ==, "abc");
|
||||
qdict_set_default_str(copy, "bar", "xyz");
|
||||
qdict_copy_default(copy, dict, "bar");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "bar"), ==, "xyz");
|
||||
|
||||
qobject_unref(copy);
|
||||
qobject_unref(dict);
|
||||
}
|
||||
|
||||
static void qdict_haskey_not_test(void)
|
||||
{
|
||||
QDict *tests_dict = qdict_new();
|
||||
|
|
@ -253,606 +226,6 @@ static void qdict_iterapi_test(void)
|
|||
qobject_unref(tests_dict);
|
||||
}
|
||||
|
||||
static void qdict_flatten_test(void)
|
||||
{
|
||||
QList *list1 = qlist_new();
|
||||
QList *list2 = qlist_new();
|
||||
QDict *dict1 = qdict_new();
|
||||
QDict *dict2 = qdict_new();
|
||||
QDict *dict3 = qdict_new();
|
||||
|
||||
/*
|
||||
* Test the flattening of
|
||||
*
|
||||
* {
|
||||
* "e": [
|
||||
* 42,
|
||||
* [
|
||||
* 23,
|
||||
* 66,
|
||||
* {
|
||||
* "a": 0,
|
||||
* "b": 1
|
||||
* }
|
||||
* ]
|
||||
* ],
|
||||
* "f": {
|
||||
* "c": 2,
|
||||
* "d": 3,
|
||||
* },
|
||||
* "g": 4
|
||||
* }
|
||||
*
|
||||
* to
|
||||
*
|
||||
* {
|
||||
* "e.0": 42,
|
||||
* "e.1.0": 23,
|
||||
* "e.1.1": 66,
|
||||
* "e.1.2.a": 0,
|
||||
* "e.1.2.b": 1,
|
||||
* "f.c": 2,
|
||||
* "f.d": 3,
|
||||
* "g": 4
|
||||
* }
|
||||
*/
|
||||
|
||||
qdict_put_int(dict1, "a", 0);
|
||||
qdict_put_int(dict1, "b", 1);
|
||||
|
||||
qlist_append_int(list1, 23);
|
||||
qlist_append_int(list1, 66);
|
||||
qlist_append(list1, dict1);
|
||||
qlist_append_int(list2, 42);
|
||||
qlist_append(list2, list1);
|
||||
|
||||
qdict_put_int(dict2, "c", 2);
|
||||
qdict_put_int(dict2, "d", 3);
|
||||
qdict_put(dict3, "e", list2);
|
||||
qdict_put(dict3, "f", dict2);
|
||||
qdict_put_int(dict3, "g", 4);
|
||||
|
||||
qdict_flatten(dict3);
|
||||
|
||||
g_assert(qdict_get_int(dict3, "e.0") == 42);
|
||||
g_assert(qdict_get_int(dict3, "e.1.0") == 23);
|
||||
g_assert(qdict_get_int(dict3, "e.1.1") == 66);
|
||||
g_assert(qdict_get_int(dict3, "e.1.2.a") == 0);
|
||||
g_assert(qdict_get_int(dict3, "e.1.2.b") == 1);
|
||||
g_assert(qdict_get_int(dict3, "f.c") == 2);
|
||||
g_assert(qdict_get_int(dict3, "f.d") == 3);
|
||||
g_assert(qdict_get_int(dict3, "g") == 4);
|
||||
|
||||
g_assert(qdict_size(dict3) == 8);
|
||||
|
||||
qobject_unref(dict3);
|
||||
}
|
||||
|
||||
static void qdict_array_split_test(void)
|
||||
{
|
||||
QDict *test_dict = qdict_new();
|
||||
QDict *dict1, *dict2;
|
||||
QNum *int1;
|
||||
QList *test_list;
|
||||
|
||||
/*
|
||||
* Test the split of
|
||||
*
|
||||
* {
|
||||
* "1.x": 0,
|
||||
* "4.y": 1,
|
||||
* "0.a": 42,
|
||||
* "o.o": 7,
|
||||
* "0.b": 23,
|
||||
* "2": 66
|
||||
* }
|
||||
*
|
||||
* to
|
||||
*
|
||||
* [
|
||||
* {
|
||||
* "a": 42,
|
||||
* "b": 23
|
||||
* },
|
||||
* {
|
||||
* "x": 0
|
||||
* },
|
||||
* 66
|
||||
* ]
|
||||
*
|
||||
* and
|
||||
*
|
||||
* {
|
||||
* "4.y": 1,
|
||||
* "o.o": 7
|
||||
* }
|
||||
*
|
||||
* (remaining in the old QDict)
|
||||
*
|
||||
* This example is given in the comment of qdict_array_split().
|
||||
*/
|
||||
|
||||
qdict_put_int(test_dict, "1.x", 0);
|
||||
qdict_put_int(test_dict, "4.y", 1);
|
||||
qdict_put_int(test_dict, "0.a", 42);
|
||||
qdict_put_int(test_dict, "o.o", 7);
|
||||
qdict_put_int(test_dict, "0.b", 23);
|
||||
qdict_put_int(test_dict, "2", 66);
|
||||
|
||||
qdict_array_split(test_dict, &test_list);
|
||||
|
||||
dict1 = qobject_to(QDict, qlist_pop(test_list));
|
||||
dict2 = qobject_to(QDict, qlist_pop(test_list));
|
||||
int1 = qobject_to(QNum, qlist_pop(test_list));
|
||||
|
||||
g_assert(dict1);
|
||||
g_assert(dict2);
|
||||
g_assert(int1);
|
||||
g_assert(qlist_empty(test_list));
|
||||
|
||||
qobject_unref(test_list);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "a") == 42);
|
||||
g_assert(qdict_get_int(dict1, "b") == 23);
|
||||
|
||||
g_assert(qdict_size(dict1) == 2);
|
||||
|
||||
qobject_unref(dict1);
|
||||
|
||||
g_assert(qdict_get_int(dict2, "x") == 0);
|
||||
|
||||
g_assert(qdict_size(dict2) == 1);
|
||||
|
||||
qobject_unref(dict2);
|
||||
|
||||
g_assert_cmpint(qnum_get_int(int1), ==, 66);
|
||||
|
||||
qobject_unref(int1);
|
||||
|
||||
g_assert(qdict_get_int(test_dict, "4.y") == 1);
|
||||
g_assert(qdict_get_int(test_dict, "o.o") == 7);
|
||||
|
||||
g_assert(qdict_size(test_dict) == 2);
|
||||
|
||||
qobject_unref(test_dict);
|
||||
|
||||
/*
|
||||
* Test the split of
|
||||
*
|
||||
* {
|
||||
* "0": 42,
|
||||
* "1": 23,
|
||||
* "1.x": 84
|
||||
* }
|
||||
*
|
||||
* to
|
||||
*
|
||||
* [
|
||||
* 42
|
||||
* ]
|
||||
*
|
||||
* and
|
||||
*
|
||||
* {
|
||||
* "1": 23,
|
||||
* "1.x": 84
|
||||
* }
|
||||
*
|
||||
* That is, test whether splitting stops if there is both an entry with key
|
||||
* of "%u" and other entries with keys prefixed "%u." for the same index.
|
||||
*/
|
||||
|
||||
test_dict = qdict_new();
|
||||
|
||||
qdict_put_int(test_dict, "0", 42);
|
||||
qdict_put_int(test_dict, "1", 23);
|
||||
qdict_put_int(test_dict, "1.x", 84);
|
||||
|
||||
qdict_array_split(test_dict, &test_list);
|
||||
|
||||
int1 = qobject_to(QNum, qlist_pop(test_list));
|
||||
|
||||
g_assert(int1);
|
||||
g_assert(qlist_empty(test_list));
|
||||
|
||||
qobject_unref(test_list);
|
||||
|
||||
g_assert_cmpint(qnum_get_int(int1), ==, 42);
|
||||
|
||||
qobject_unref(int1);
|
||||
|
||||
g_assert(qdict_get_int(test_dict, "1") == 23);
|
||||
g_assert(qdict_get_int(test_dict, "1.x") == 84);
|
||||
|
||||
g_assert(qdict_size(test_dict) == 2);
|
||||
|
||||
qobject_unref(test_dict);
|
||||
}
|
||||
|
||||
static void qdict_array_entries_test(void)
|
||||
{
|
||||
QDict *dict = qdict_new();
|
||||
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 0);
|
||||
|
||||
qdict_put_int(dict, "bar", 0);
|
||||
qdict_put_int(dict, "baz.0", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 0);
|
||||
|
||||
qdict_put_int(dict, "foo.1", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, -EINVAL);
|
||||
qdict_put_int(dict, "foo.0", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 2);
|
||||
qdict_put_int(dict, "foo.bar", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, -EINVAL);
|
||||
qdict_del(dict, "foo.bar");
|
||||
|
||||
qdict_put_int(dict, "foo.2.a", 0);
|
||||
qdict_put_int(dict, "foo.2.b", 0);
|
||||
qdict_put_int(dict, "foo.2.c", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, "foo."), ==, 3);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
||||
|
||||
qobject_unref(dict);
|
||||
|
||||
dict = qdict_new();
|
||||
qdict_put_int(dict, "1", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
||||
qdict_put_int(dict, "0", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, 2);
|
||||
qdict_put_int(dict, "bar", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, -EINVAL);
|
||||
qdict_del(dict, "bar");
|
||||
|
||||
qdict_put_int(dict, "2.a", 0);
|
||||
qdict_put_int(dict, "2.b", 0);
|
||||
qdict_put_int(dict, "2.c", 0);
|
||||
g_assert_cmpint(qdict_array_entries(dict, ""), ==, 3);
|
||||
|
||||
qobject_unref(dict);
|
||||
}
|
||||
|
||||
static void qdict_join_test(void)
|
||||
{
|
||||
QDict *dict1, *dict2;
|
||||
bool overwrite = false;
|
||||
int i;
|
||||
|
||||
dict1 = qdict_new();
|
||||
dict2 = qdict_new();
|
||||
|
||||
/* Test everything once without overwrite and once with */
|
||||
do
|
||||
{
|
||||
/* Test empty dicts */
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 0);
|
||||
g_assert(qdict_size(dict2) == 0);
|
||||
|
||||
/* First iteration: Test movement */
|
||||
/* Second iteration: Test empty source and non-empty destination */
|
||||
qdict_put_int(dict2, "foo", 42);
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 1);
|
||||
g_assert(qdict_size(dict2) == 0);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "foo") == 42);
|
||||
}
|
||||
|
||||
/* Test non-empty source and destination without conflict */
|
||||
qdict_put_int(dict2, "bar", 23);
|
||||
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 2);
|
||||
g_assert(qdict_size(dict2) == 0);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "foo") == 42);
|
||||
g_assert(qdict_get_int(dict1, "bar") == 23);
|
||||
|
||||
/* Test conflict */
|
||||
qdict_put_int(dict2, "foo", 84);
|
||||
|
||||
qdict_join(dict1, dict2, overwrite);
|
||||
|
||||
g_assert(qdict_size(dict1) == 2);
|
||||
g_assert(qdict_size(dict2) == !overwrite);
|
||||
|
||||
g_assert(qdict_get_int(dict1, "foo") == (overwrite ? 84 : 42));
|
||||
g_assert(qdict_get_int(dict1, "bar") == 23);
|
||||
|
||||
if (!overwrite) {
|
||||
g_assert(qdict_get_int(dict2, "foo") == 84);
|
||||
}
|
||||
|
||||
/* Check the references */
|
||||
g_assert(qdict_get(dict1, "foo")->base.refcnt == 1);
|
||||
g_assert(qdict_get(dict1, "bar")->base.refcnt == 1);
|
||||
|
||||
if (!overwrite) {
|
||||
g_assert(qdict_get(dict2, "foo")->base.refcnt == 1);
|
||||
}
|
||||
|
||||
/* Clean up */
|
||||
qdict_del(dict1, "foo");
|
||||
qdict_del(dict1, "bar");
|
||||
|
||||
if (!overwrite) {
|
||||
qdict_del(dict2, "foo");
|
||||
}
|
||||
}
|
||||
while (overwrite ^= true);
|
||||
|
||||
qobject_unref(dict1);
|
||||
qobject_unref(dict2);
|
||||
}
|
||||
|
||||
static void qdict_crumple_test_recursive(void)
|
||||
{
|
||||
QDict *src, *dst, *rule, *vnc, *acl, *listen;
|
||||
QList *rules;
|
||||
|
||||
src = qdict_new();
|
||||
qdict_put_str(src, "vnc.listen.addr", "127.0.0.1");
|
||||
qdict_put_str(src, "vnc.listen.port", "5901");
|
||||
qdict_put_str(src, "vnc.acl.rules.0.match", "fred");
|
||||
qdict_put_str(src, "vnc.acl.rules.0.policy", "allow");
|
||||
qdict_put_str(src, "vnc.acl.rules.1.match", "bob");
|
||||
qdict_put_str(src, "vnc.acl.rules.1.policy", "deny");
|
||||
qdict_put_str(src, "vnc.acl.default", "deny");
|
||||
qdict_put_str(src, "vnc.acl..name", "acl0");
|
||||
qdict_put_str(src, "vnc.acl.rule..name", "acl0");
|
||||
|
||||
dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
|
||||
g_assert(dst);
|
||||
g_assert_cmpint(qdict_size(dst), ==, 1);
|
||||
|
||||
vnc = qdict_get_qdict(dst, "vnc");
|
||||
g_assert(vnc);
|
||||
g_assert_cmpint(qdict_size(vnc), ==, 3);
|
||||
|
||||
listen = qdict_get_qdict(vnc, "listen");
|
||||
g_assert(listen);
|
||||
g_assert_cmpint(qdict_size(listen), ==, 2);
|
||||
g_assert_cmpstr("127.0.0.1", ==, qdict_get_str(listen, "addr"));
|
||||
g_assert_cmpstr("5901", ==, qdict_get_str(listen, "port"));
|
||||
|
||||
acl = qdict_get_qdict(vnc, "acl");
|
||||
g_assert(acl);
|
||||
g_assert_cmpint(qdict_size(acl), ==, 3);
|
||||
|
||||
rules = qdict_get_qlist(acl, "rules");
|
||||
g_assert(rules);
|
||||
g_assert_cmpint(qlist_size(rules), ==, 2);
|
||||
|
||||
rule = qobject_to(QDict, qlist_pop(rules));
|
||||
g_assert(rule);
|
||||
g_assert_cmpint(qdict_size(rule), ==, 2);
|
||||
g_assert_cmpstr("fred", ==, qdict_get_str(rule, "match"));
|
||||
g_assert_cmpstr("allow", ==, qdict_get_str(rule, "policy"));
|
||||
qobject_unref(rule);
|
||||
|
||||
rule = qobject_to(QDict, qlist_pop(rules));
|
||||
g_assert(rule);
|
||||
g_assert_cmpint(qdict_size(rule), ==, 2);
|
||||
g_assert_cmpstr("bob", ==, qdict_get_str(rule, "match"));
|
||||
g_assert_cmpstr("deny", ==, qdict_get_str(rule, "policy"));
|
||||
qobject_unref(rule);
|
||||
|
||||
/* With recursive crumpling, we should see all names unescaped */
|
||||
g_assert_cmpstr("acl0", ==, qdict_get_str(vnc, "acl.name"));
|
||||
g_assert_cmpstr("acl0", ==, qdict_get_str(acl, "rule.name"));
|
||||
|
||||
qobject_unref(src);
|
||||
qobject_unref(dst);
|
||||
}
|
||||
|
||||
static void qdict_crumple_test_empty(void)
|
||||
{
|
||||
QDict *src, *dst;
|
||||
|
||||
src = qdict_new();
|
||||
|
||||
dst = qobject_to(QDict, qdict_crumple(src, &error_abort));
|
||||
|
||||
g_assert_cmpint(qdict_size(dst), ==, 0);
|
||||
|
||||
qobject_unref(src);
|
||||
qobject_unref(dst);
|
||||
}
|
||||
|
||||
static int qdict_count_entries(QDict *dict)
|
||||
{
|
||||
const QDictEntry *e;
|
||||
int count = 0;
|
||||
|
||||
for (e = qdict_first(dict); e; e = qdict_next(dict, e)) {
|
||||
count++;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
static void qdict_rename_keys_test(void)
|
||||
{
|
||||
QDict *dict = qdict_new();
|
||||
QDict *copy;
|
||||
QDictRenames *renames;
|
||||
Error *local_err = NULL;
|
||||
|
||||
qdict_put_str(dict, "abc", "foo");
|
||||
qdict_put_str(dict, "abcdef", "bar");
|
||||
qdict_put_int(dict, "number", 42);
|
||||
qdict_put_bool(dict, "flag", true);
|
||||
qdict_put_null(dict, "nothing");
|
||||
|
||||
/* Empty rename list */
|
||||
renames = (QDictRenames[]) {
|
||||
{ NULL, "this can be anything" }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &error_abort);
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abcdef"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "number"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "flag"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "nothing")) == QTYPE_QNULL);
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Simple rename of all entries */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abc", "str1" },
|
||||
{ "abcdef", "str2" },
|
||||
{ "number", "int" },
|
||||
{ "flag", "bool" },
|
||||
{ "nothing", "null" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &error_abort);
|
||||
|
||||
g_assert(!qdict_haskey(copy, "abc"));
|
||||
g_assert(!qdict_haskey(copy, "abcdef"));
|
||||
g_assert(!qdict_haskey(copy, "number"));
|
||||
g_assert(!qdict_haskey(copy, "flag"));
|
||||
g_assert(!qdict_haskey(copy, "nothing"));
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "str1"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "str2"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "int"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "bool"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "null")) == QTYPE_QNULL);
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Renames are processed top to bottom */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abc", "tmp" },
|
||||
{ "abcdef", "abc" },
|
||||
{ "number", "abcdef" },
|
||||
{ "flag", "number" },
|
||||
{ "nothing", "flag" },
|
||||
{ "tmp", "nothing" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &error_abort);
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "nothing"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "abcdef"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "number"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "flag")) == QTYPE_QNULL);
|
||||
g_assert(!qdict_haskey(copy, "tmp"));
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Conflicting rename */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abcdef", "abc" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
copy = qdict_clone_shallow(dict);
|
||||
qdict_rename_keys(copy, renames, &local_err);
|
||||
|
||||
g_assert(local_err != NULL);
|
||||
error_free(local_err);
|
||||
local_err = NULL;
|
||||
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abc"), ==, "foo");
|
||||
g_assert_cmpstr(qdict_get_str(copy, "abcdef"), ==, "bar");
|
||||
g_assert_cmpint(qdict_get_int(copy, "number"), ==, 42);
|
||||
g_assert_cmpint(qdict_get_bool(copy, "flag"), ==, true);
|
||||
g_assert(qobject_type(qdict_get(copy, "nothing")) == QTYPE_QNULL);
|
||||
g_assert_cmpint(qdict_count_entries(copy), ==, 5);
|
||||
|
||||
qobject_unref(copy);
|
||||
|
||||
/* Renames in an empty dict */
|
||||
renames = (QDictRenames[]) {
|
||||
{ "abcdef", "abc" },
|
||||
{ NULL , NULL }
|
||||
};
|
||||
|
||||
qobject_unref(dict);
|
||||
dict = qdict_new();
|
||||
|
||||
qdict_rename_keys(dict, renames, &error_abort);
|
||||
g_assert(qdict_first(dict) == NULL);
|
||||
|
||||
qobject_unref(dict);
|
||||
}
|
||||
|
||||
static void qdict_crumple_test_bad_inputs(void)
|
||||
{
|
||||
QDict *src;
|
||||
Error *error = NULL;
|
||||
|
||||
src = qdict_new();
|
||||
/* rule.0 can't be both a string and a dict */
|
||||
qdict_put_str(src, "rule.0", "fred");
|
||||
qdict_put_str(src, "rule.0.policy", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* rule can't be both a list and a dict */
|
||||
qdict_put_str(src, "rule.0", "fred");
|
||||
qdict_put_str(src, "rule.a", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* The input should be flat, ie no dicts or lists */
|
||||
qdict_put(src, "rule.a", qdict_new());
|
||||
qdict_put_str(src, "rule.b", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* List indexes must not have gaps */
|
||||
qdict_put_str(src, "rule.0", "deny");
|
||||
qdict_put_str(src, "rule.3", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
|
||||
src = qdict_new();
|
||||
/* List indexes must be in %zu format */
|
||||
qdict_put_str(src, "rule.0", "deny");
|
||||
qdict_put_str(src, "rule.+1", "allow");
|
||||
|
||||
g_assert(qdict_crumple(src, &error) == NULL);
|
||||
g_assert(error != NULL);
|
||||
error_free(error);
|
||||
error = NULL;
|
||||
qobject_unref(src);
|
||||
}
|
||||
|
||||
/*
|
||||
* Errors test-cases
|
||||
*/
|
||||
|
|
@ -986,29 +359,15 @@ int main(int argc, char **argv)
|
|||
g_test_add_func("/public/get_try_int", qdict_get_try_int_test);
|
||||
g_test_add_func("/public/get_str", qdict_get_str_test);
|
||||
g_test_add_func("/public/get_try_str", qdict_get_try_str_test);
|
||||
g_test_add_func("/public/defaults", qdict_defaults_test);
|
||||
g_test_add_func("/public/haskey_not", qdict_haskey_not_test);
|
||||
g_test_add_func("/public/haskey", qdict_haskey_test);
|
||||
g_test_add_func("/public/del", qdict_del_test);
|
||||
g_test_add_func("/public/to_qdict", qobject_to_qdict_test);
|
||||
g_test_add_func("/public/iterapi", qdict_iterapi_test);
|
||||
g_test_add_func("/public/flatten", qdict_flatten_test);
|
||||
g_test_add_func("/public/array_split", qdict_array_split_test);
|
||||
g_test_add_func("/public/array_entries", qdict_array_entries_test);
|
||||
g_test_add_func("/public/join", qdict_join_test);
|
||||
|
||||
g_test_add_func("/errors/put_exists", qdict_put_exists_test);
|
||||
g_test_add_func("/errors/get_not_exists", qdict_get_not_exists_test);
|
||||
|
||||
g_test_add_func("/public/crumple/recursive",
|
||||
qdict_crumple_test_recursive);
|
||||
g_test_add_func("/public/crumple/empty",
|
||||
qdict_crumple_test_empty);
|
||||
g_test_add_func("/public/crumple/bad_inputs",
|
||||
qdict_crumple_test_bad_inputs);
|
||||
|
||||
g_test_add_func("/public/rename_keys", qdict_rename_keys_test);
|
||||
|
||||
/* The Big one */
|
||||
if (g_test_slow()) {
|
||||
g_test_add_func("/stress/test", qdict_stress_test);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "block/qdict.h"
|
||||
#include "qapi/qmp/qbool.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/qmp/qlist.h"
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ static void setup_mbr(int img_idx, MBRcontents mbr)
|
|||
|
||||
static int setup_ide(int argc, char *argv[], int argv_sz,
|
||||
int ide_idx, const char *dev, int img_idx,
|
||||
MBRcontents mbr, const char *opts)
|
||||
MBRcontents mbr)
|
||||
{
|
||||
char *s1, *s2, *s3;
|
||||
|
||||
|
|
@ -216,7 +216,7 @@ static int setup_ide(int argc, char *argv[], int argv_sz,
|
|||
s3 = g_strdup(",media=cdrom");
|
||||
}
|
||||
argc = append_arg(argc, argv, argv_sz,
|
||||
g_strdup_printf("%s%s%s%s", s1, s2, s3, opts));
|
||||
g_strdup_printf("%s%s%s", s1, s2, s3));
|
||||
g_free(s1);
|
||||
g_free(s2);
|
||||
g_free(s3);
|
||||
|
|
@ -260,7 +260,7 @@ static void test_ide_mbr(bool use_device, MBRcontents mbr)
|
|||
for (i = 0; i < backend_last; i++) {
|
||||
cur_ide[i] = &hd_chst[i][mbr];
|
||||
dev = use_device ? (is_hd(cur_ide[i]) ? "ide-hd" : "ide-cd") : NULL;
|
||||
argc = setup_ide(argc, argv, ARGV_SIZE, i, dev, i, mbr, "");
|
||||
argc = setup_ide(argc, argv, ARGV_SIZE, i, dev, i, mbr);
|
||||
}
|
||||
args = g_strjoinv(" ", argv);
|
||||
qtest_start(args);
|
||||
|
|
@ -327,16 +327,12 @@ static void test_ide_drive_user(const char *dev, bool trans)
|
|||
const CHST expected_chst = { secs / (4 * 32) , 4, 32, trans };
|
||||
|
||||
argc = setup_common(argv, ARGV_SIZE);
|
||||
opts = g_strdup_printf("%s,%s%scyls=%d,heads=%d,secs=%d",
|
||||
dev ?: "",
|
||||
trans && dev ? "bios-chs-" : "",
|
||||
trans ? "trans=lba," : "",
|
||||
opts = g_strdup_printf("%s,%scyls=%d,heads=%d,secs=%d",
|
||||
dev, trans ? "bios-chs-trans=lba," : "",
|
||||
expected_chst.cyls, expected_chst.heads,
|
||||
expected_chst.secs);
|
||||
cur_ide[0] = &expected_chst;
|
||||
argc = setup_ide(argc, argv, ARGV_SIZE,
|
||||
0, dev ? opts : NULL, backend_small, mbr_chs,
|
||||
dev ? "" : opts);
|
||||
argc = setup_ide(argc, argv, ARGV_SIZE, 0, opts, backend_small, mbr_chs);
|
||||
g_free(opts);
|
||||
args = g_strjoinv(" ", argv);
|
||||
qtest_start(args);
|
||||
|
|
@ -346,22 +342,6 @@ static void test_ide_drive_user(const char *dev, bool trans)
|
|||
qtest_end();
|
||||
}
|
||||
|
||||
/*
|
||||
* Test case: IDE device (if=ide) with explicit CHS
|
||||
*/
|
||||
static void test_ide_drive_user_chs(void)
|
||||
{
|
||||
test_ide_drive_user(NULL, false);
|
||||
}
|
||||
|
||||
/*
|
||||
* Test case: IDE device (if=ide) with explicit CHS and translation
|
||||
*/
|
||||
static void test_ide_drive_user_chst(void)
|
||||
{
|
||||
test_ide_drive_user(NULL, true);
|
||||
}
|
||||
|
||||
/*
|
||||
* Test case: IDE device (if=none) with explicit CHS
|
||||
*/
|
||||
|
|
@ -392,8 +372,7 @@ static void test_ide_drive_cd_0(void)
|
|||
for (i = 0; i <= backend_empty; i++) {
|
||||
ide_idx = backend_empty - i;
|
||||
cur_ide[ide_idx] = &hd_chst[i][mbr_blank];
|
||||
argc = setup_ide(argc, argv, ARGV_SIZE,
|
||||
ide_idx, NULL, i, mbr_blank, "");
|
||||
argc = setup_ide(argc, argv, ARGV_SIZE, ide_idx, NULL, i, mbr_blank);
|
||||
}
|
||||
args = g_strjoinv(" ", argv);
|
||||
qtest_start(args);
|
||||
|
|
@ -422,8 +401,6 @@ int main(int argc, char **argv)
|
|||
qtest_add_func("hd-geo/ide/drive/mbr/blank", test_ide_drive_mbr_blank);
|
||||
qtest_add_func("hd-geo/ide/drive/mbr/lba", test_ide_drive_mbr_lba);
|
||||
qtest_add_func("hd-geo/ide/drive/mbr/chs", test_ide_drive_mbr_chs);
|
||||
qtest_add_func("hd-geo/ide/drive/user/chs", test_ide_drive_user_chs);
|
||||
qtest_add_func("hd-geo/ide/drive/user/chst", test_ide_drive_user_chst);
|
||||
qtest_add_func("hd-geo/ide/drive/cd_0", test_ide_drive_cd_0);
|
||||
qtest_add_func("hd-geo/ide/device/mbr/blank", test_ide_device_mbr_blank);
|
||||
qtest_add_func("hd-geo/ide/device/mbr/lba", test_ide_device_mbr_lba);
|
||||
|
|
|
|||
|
|
@ -529,8 +529,8 @@ static void test_bmdma_no_busmaster(void)
|
|||
static void test_bmdma_setup(void)
|
||||
{
|
||||
ide_test_start(
|
||||
"-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw "
|
||||
"-global ide-hd.ver=%s",
|
||||
"-drive file=%s,if=ide,cache=writeback,format=raw "
|
||||
"-global ide-hd.serial=%s -global ide-hd.ver=%s",
|
||||
tmp_path, "testdisk", "version");
|
||||
qtest_irq_intercept_in(global_qtest, "ioapic");
|
||||
}
|
||||
|
|
@ -561,8 +561,8 @@ static void test_identify(void)
|
|||
int ret;
|
||||
|
||||
ide_test_start(
|
||||
"-drive file=%s,if=ide,serial=%s,cache=writeback,format=raw "
|
||||
"-global ide-hd.ver=%s",
|
||||
"-drive file=%s,if=ide,cache=writeback,format=raw "
|
||||
"-global ide-hd.serial=%s -global ide-hd.ver=%s",
|
||||
tmp_path, "testdisk", "version");
|
||||
|
||||
dev = get_pci_device(&bmdma_bar, &ide_bar);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,60 @@
|
|||
#!/bin/bash
|
||||
#
|
||||
# Test qemu-img vs. unaligned images
|
||||
#
|
||||
# Copyright (C) 2018 Red Hat, Inc.
|
||||
#
|
||||
# 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/>.
|
||||
#
|
||||
|
||||
seq="$(basename $0)"
|
||||
echo "QA output created by $seq"
|
||||
|
||||
here="$PWD"
|
||||
status=1 # failure is the default!
|
||||
|
||||
_cleanup()
|
||||
{
|
||||
_cleanup_test_img
|
||||
}
|
||||
trap "_cleanup; exit \$status" 0 1 2 3 15
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common.rc
|
||||
. ./common.filter
|
||||
|
||||
_supported_fmt raw
|
||||
_supported_proto file
|
||||
_supported_os Linux
|
||||
|
||||
echo
|
||||
echo "=== Check mapping of unaligned raw image ==="
|
||||
echo
|
||||
|
||||
_make_test_img 43009 # qemu-img create rounds size up
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
|
||||
truncate --size=43009 "$TEST_IMG" # so we resize it and check again
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
|
||||
$QEMU_IO -c 'w 43008 1' "$TEST_IMG" | _filter_qemu_io # writing also rounds up
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
|
||||
truncate --size=43009 "$TEST_IMG" # so we resize it and check again
|
||||
$QEMU_IMG map --output=json "$TEST_IMG" | _filter_qemu_img_map
|
||||
|
||||
# success, all done
|
||||
echo '*** done'
|
||||
rm -f $seq.full
|
||||
status=0
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
QA output created by 221
|
||||
|
||||
=== Check mapping of unaligned raw image ===
|
||||
|
||||
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=43009
|
||||
[{ "start": 0, "length": 43520, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
|
||||
[{ "start": 0, "length": 43520, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
|
||||
wrote 1/1 bytes at offset 43008
|
||||
1 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
[{ "start": 0, "length": 40960, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
|
||||
{ "start": 40960, "length": 2049, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
|
||||
{ "start": 43009, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
|
||||
[{ "start": 0, "length": 40960, "depth": 0, "zero": true, "data": false, "offset": OFFSET},
|
||||
{ "start": 40960, "length": 2049, "depth": 0, "zero": false, "data": true, "offset": OFFSET},
|
||||
{ "start": 43009, "length": 511, "depth": 0, "zero": true, "data": false, "offset": OFFSET}]
|
||||
*** done
|
||||
|
|
@ -218,3 +218,4 @@
|
|||
217 rw auto quick
|
||||
218 rw auto quick
|
||||
219 rw auto
|
||||
221 rw auto quick
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
#include "qemu/option.h"
|
||||
#include "replication.h"
|
||||
#include "block/block_int.h"
|
||||
#include "block/qdict.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
|
||||
#define IMG_SIZE (64 * 1024 * 1024)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "block/qdict.h" /* for qdict_extract_subqdict() */
|
||||
#include "qapi/error.h"
|
||||
#include "qapi/qapi-commands-misc.h"
|
||||
#include "qapi/qmp/qdict.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue