[libvirt] [PATCH v2 00/15] qemu: Add QMP introspection and gluster debug support

newer
[libvirt] [PATCH 0/4] qemu: Assign...

Peter Krempa

2 Nov 2016 2 Nov '16

12:13 p.m.

Now that the release is out, I fixed the few things pointed out. Andrea Bolognani (5): tests: qemucaps: Update ppc64 replies for qemu 2.6.0 release tests: qemucaps: Update aarch64 gicv2 replies for qemu 2.6.0 release tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on ppc64le tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv2 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv3 Pavel Hrdina (3): tests: qemucaps: Add QMP introspection data for qemu 2.5.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.7.0 on x86 Peter Krempa (4): util: json: add helper to iterate and steal members of json array qemu: monitor: Add code to retrieve and store QMP schema data tests: qemucaps: Temporarily remove 'query-qmp-schema' from test data qemu: capabilities: Add support for QMP schema introspection Prasanna Kumar Kalever (3): qemu: capabilities: Detect support for gluster debug setting qemu: conf: add option for tuning debug logging level qemu: command: Add debug option for gluster volumes src/libvirt_private.syms | 1 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 20 + src/qemu/qemu_capabilities.c | 193 + src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_command.c | 19 +- src/qemu/qemu_command.h | 1 + src/qemu/qemu_conf.c | 3 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 67 + src/qemu/qemu_monitor_json.h | 3 + src/util/virjson.c | 54 + src/util/virjson.h | 6 + .../qemuargv2xml-disk-drive-network-gluster.args | 7 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 7545 ++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.replies | 8036 ++++++++++++++++++- .../caps_2.6.0-gicv2.aarch64.xml | 3 +- .../caps_2.6.0-gicv3.aarch64.replies | 8007 ++++++++++++++++++- .../caps_2.6.0-gicv3.aarch64.xml | 1 + .../caps_2.6.0.ppc64le.replies | 8026 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 5 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 8005 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 8356 ++++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 + .../qemuxml2argv-disk-drive-network-gluster.args | 12 +- tests/qemuxml2argvtest.c | 3 +- 31 files changed, 48356 insertions(+), 48 deletions(-) -- 2.10.2

Show replies by date

Peter Krempa

2 Nov 2 Nov

12:13 p.m.

New subject: [libvirt] [PATCH v2 01/15] util: json: add helper to iterate and steal members of json array

Simplifies cases where JSON array members need to be transferred to a different structure. --- Notes: v2: - iterate from beginning - add option to keep array member in the array without breaking iteration - documented callback return codes src/libvirt_private.syms | 1 + src/util/virjson.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virjson.h | 6 ++++++ 3 files changed, 61 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 162fda5..4c08508 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1764,6 +1764,7 @@ virISCSIScanTargets; # util/virjson.h virJSONValueArrayAppend; +virJSONValueArrayForeachSteal; virJSONValueArrayGet; virJSONValueArraySize; virJSONValueArraySteal; diff --git a/src/util/virjson.c b/src/util/virjson.c index 1d8e6d5..d55600a 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -949,6 +949,60 @@ virJSONValueArraySteal(virJSONValuePtr array, } +/** + * virJSONValueArrayForeachSteal: + * @array: array to iterate + * @cb: callback called on every member of the array + * @opaque: custom data for the callback + * + * Iterates members of the array and calls the callback on every single member. + * The return codes of the callback are interpreted as follows: + * 0: callback claims ownership of the array element and is responsible for + * freeing it + * 1: callback does not claim the ownership, but the iteration continues + * -1: callback doesn't claim ownership and iteration does not continue + * + * Returns 0 if all members were iterated and/or stolen by the callback; -1 + * on callback failure or if the JSON value object is not an array. + * The rest of the members stay in possession of the array and it's condensed. + */ +int +virJSONValueArrayForeachSteal(virJSONValuePtr array, + virJSONArrayIteratorFunc cb, + void *opaque) +{ + size_t i; + size_t j = 0; + int ret = 0; + int rc; + + if (array->type != VIR_JSON_TYPE_ARRAY) + return -1; + + for (i = 0; i < array->data.array.nvalues; i++) { + if ((rc = cb(i, array->data.array.values[i], opaque)) < 0) { + ret = -1; + break; + } + + if (rc == 0) + array->data.array.values[i] = NULL; + } + + /* condense the remaining entries at the beginning */ + for (i = 0; i < array->data.array.nvalues; i++) { + if (!array->data.array.values[i]) + continue; + + array->data.array.values[j++] = array->data.array.values[i]; + } + + array->data.array.nvalues = j; + + return ret; +} + + const char * virJSONValueGetString(virJSONValuePtr string) { diff --git a/src/util/virjson.h b/src/util/virjson.h index 8b62d65..5b4f172 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -117,6 +117,12 @@ bool virJSONValueIsArray(virJSONValuePtr array); ssize_t virJSONValueArraySize(const virJSONValue *array); virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element); virJSONValuePtr virJSONValueArraySteal(virJSONValuePtr object, unsigned int element); +typedef int (*virJSONArrayIteratorFunc)(size_t pos, + virJSONValuePtr item, + void *opaque); +int virJSONValueArrayForeachSteal(virJSONValuePtr array, + virJSONArrayIteratorFunc cb, + void *opaque); int virJSONValueObjectKeysNumber(virJSONValuePtr object); const char *virJSONValueObjectGetKey(virJSONValuePtr object, unsigned int n); -- 2.10.2

Pavel Hrdina

9 Nov 9 Nov

9:22 a.m.

New subject: [libvirt] [PATCH v2 01/15] util: json: add helper to iterate and steal members of json array

On Wed, Nov 02, 2016 at 05:13:33PM +0100, Peter Krempa wrote:

...

Simplifies cases where JSON array members need to be transferred to a different structure. ---

Notes: v2: - iterate from beginning - add option to keep array member in the array without breaking iteration - documented callback return codes

src/libvirt_private.syms | 1 + src/util/virjson.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virjson.h | 6 ++++++ 3 files changed, 61 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 162fda5..4c08508 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1764,6 +1764,7 @@ virISCSIScanTargets;

# util/virjson.h virJSONValueArrayAppend; +virJSONValueArrayForeachSteal; virJSONValueArrayGet; virJSONValueArraySize; virJSONValueArraySteal; diff --git a/src/util/virjson.c b/src/util/virjson.c index 1d8e6d5..d55600a 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -949,6 +949,60 @@ virJSONValueArraySteal(virJSONValuePtr array, }

+/** + * virJSONValueArrayForeachSteal: + * @array: array to iterate + * @cb: callback called on every member of the array + * @opaque: custom data for the callback + * + * Iterates members of the array and calls the callback on every single member. + * The return codes of the callback are interpreted as follows: + * 0: callback claims ownership of the array element and is responsible for + * freeing it

Maybe mention that the iteration continues in this case too.

...

+ * 1: callback does not claim the ownership, but the iteration continues + * -1: callback doesn't claim ownership and iteration does not continue

Just my OCD kicking in, use "does not" or "doesn't" in both cases :)

...

+ * + * Returns 0 if all members were iterated and/or stolen by the callback; -1 + * on callback failure or if the JSON value object is not an array. + * The rest of the members stay in possession of the array and it's condensed. + */ +int +virJSONValueArrayForeachSteal(virJSONValuePtr array, + virJSONArrayIteratorFunc cb, + void *opaque)

ACK

Peter Krempa

2 Nov 2 Nov

...

Allow detecting capabilities according to the qemu QMP schema. This is necessary as sometimes the availability of certain options depends on the presence of a field in the schema.

This patch adds support for loading the QMP schema when detecting qemu capabilities and adds a very simple query language to allow traversing the schema and selecting a certain element from it.

The infrastructure in this patch uses a query path to set a specific capability flag according to the availability of the given element in the schema. ---

Notes: v2: - fixed typos - added docs for one of the helper functions and changed param order - added hint for query string format docs

src/qemu/qemu_capabilities.c | 191 ++++++++++++++++++++++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 + 6 files changed, 196 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7a8202a..56c9deb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -347,6 +347,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "machine-iommu", "virtio-vga", "drive-iotune-max-length", + "query-qmp-schema", );

@@ -1488,6 +1489,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION }, { "migrate-incoming", QEMU_CAPS_INCOMING_DEFER }, { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, + { "query-qmp-schema", QEMU_CAPS_QUERY_QMP_SCHEMA } };

struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { @@ -1692,6 +1694,11 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUSBNECXHCI[] = { { "p3", QEMU_CAPS_NEC_USB_XHCI_PORTS }, };

+/* see documentation for virQEMUCapsQMPSchemaGetByPath for the query format */ +static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = { + { "bogus/path/to/satisfy/compiler", 0 }, +}; + struct virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; @@ -3696,6 +3703,187 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, return ret; }

+ +/** + * virQEMUCapsQMPSchemaObjectGetType: + * @field: name of the object containing the requested type + * @name: name of the requested type + * @namefield: name of the object property holding @name + * + * Helper that selects the type of a QMP schema object or it's variant. Returns

s/schema object or it's variant/schema object member or it's variant member/

...

+ * the type string on success or NULL on error.

s/the type/the type/ ACK

Peter Krempa

2 Nov 2 Nov

Now that the release is out, I fixed the few things pointed out.

Andrea Bolognani (5): tests: qemucaps: Update ppc64 replies for qemu 2.6.0 release tests: qemucaps: Update aarch64 gicv2 replies for qemu 2.6.0 release tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on ppc64le tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv2 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv3

Pavel Hrdina (3): tests: qemucaps: Add QMP introspection data for qemu 2.5.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.7.0 on x86

Peter Krempa (4): util: json: add helper to iterate and steal members of json array qemu: monitor: Add code to retrieve and store QMP schema data tests: qemucaps: Temporarily remove 'query-qmp-schema' from test data qemu: capabilities: Add support for QMP schema introspection

Prasanna Kumar Kalever (3): qemu: capabilities: Detect support for gluster debug setting qemu: conf: add option for tuning debug logging level qemu: command: Add debug option for gluster volumes

Explicit ACK to the whole series even though almost all patches were already ACKed by Eric. Pavel

Andrea Bolognani

18 Nov 18 Nov

10:55 a.m.

On Wed, 2016-11-02 at 17:13 +0100, Peter Krempa wrote:

...

Now that the release is out, I fixed the few things pointed out. Andrea Bolognani (5): tests: qemucaps: Update ppc64 replies for qemu 2.6.0 release tests: qemucaps: Update aarch64 gicv2 replies for qemu 2.6.0 release tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on ppc64le tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv2 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on aarch64 gicv3 Pavel Hrdina (3): tests: qemucaps: Add QMP introspection data for qemu 2.5.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.6.0 on x86 tests: qemucaps: Add QMP introspection data for qemu 2.7.0 on x86 Peter Krempa (4): util: json: add helper to iterate and steal members of json array qemu: monitor: Add code to retrieve and store QMP schema data tests: qemucaps: Temporarily remove 'query-qmp-schema' from test data qemu: capabilities: Add support for QMP schema introspection Prasanna Kumar Kalever (3): qemu: capabilities: Detect support for gluster debug setting qemu: conf: add option for tuning debug logging level qemu: command: Add debug option for gluster volumes

The introspection part is an implementation detail, but I think the gluster debugging support would be worthy of being mentioned in the NEWS file. Would you mind drafting an entry for that? :) -- Andrea Bolognani / Red Hat / Virtualization

3213

Age (days ago)

3229

Last active (days ago)

List overview

Download

19 comments

3 participants

participants (3)

Andrea Bolognani
Pavel Hrdina
Peter Krempa

[libvirt] [PATCH v2 00/15] qemu: Add QMP introspection and gluster debug support

tags

participants (3)