August 2018 - Devel - libvirt List Archives

[libvirt] [PATCH] util: avoid symbol clash between json libraries
by Daniel P. Berrangé 01 Aug '18

01 Aug '18

The jansson and json-glib libraries both export symbols with a json_ name prefix and json_object_iter_next() clashes between them. Unfortunately json_glib is linked in by GTK, so any app using GTK and libvirt will get a clash, resulting in SEGV. This also affects the NSS module provided by libvirt Instead of directly linking to jansson, use dlopen() with the RTLD_LOCAL flag which allows us to hide the symbols from the application that loads libvirt or the NSS module. Some preprocessor black magic and wrapper functions are used to redirect calls into the dlopen resolved symbols. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 + src/Makefile.am | 3 + src/util/Makefile.inc.am | 3 +- src/util/virjson.c | 9 +- src/util/virjsoncompat.c | 253 +++++++++++++++++++++++++++++++++++++++ src/util/virjsoncompat.h | 86 +++++++++++++ 6 files changed, 354 insertions(+), 2 deletions(-) create mode 100644 src/util/virjsoncompat.c create mode 100644 src/util/virjsoncompat.h diff --git a/libvirt.spec.in b/libvirt.spec.in index 4113579e47..cfe7ab8a09 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -898,6 +898,8 @@ Requires: ncurses Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +# We dlopen() it so need an explicit dep +Requires: libjansson.so.4()(64bit) %if %{with_bash_completion} Requires: %{name}-bash-completion = %{version}-%{release} %endif diff --git a/src/Makefile.am b/src/Makefile.am index 83263e69e5..59ae7a2e79 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -690,6 +690,7 @@ libvirt_setuid_rpc_client_la_SOURCES = \ util/virhashcode.c \ util/virhostcpu.c \ util/virjson.c \ + util/virjsoncompat.c \ util/virlog.c \ util/virobject.c \ util/virpidfile.c \ @@ -961,6 +962,8 @@ libvirt_nss_la_SOURCES = \ util/virhashcode.h \ util/virjson.c \ util/virjson.h \ + util/virjsoncompat.c \ + util/virjsoncompat.h \ util/virkmod.c \ util/virkmod.h \ util/virlease.c \ diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 71b2b93c2d..8ef9ee1dfa 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -86,6 +86,8 @@ UTIL_SOURCES = \ util/viriscsi.h \ util/virjson.c \ util/virjson.h \ + util/virjsoncompat.c \ + util/virjsoncompat.h \ util/virkeycode.c \ util/virkeycode.h \ util/virkeyfile.c \ @@ -264,7 +266,6 @@ libvirt_util_la_CFLAGS = \ $(NULL) libvirt_util_la_LIBADD = \ $(CAPNG_LIBS) \ - $(JANSSON_LIBS) \ $(LIBNL_LIBS) \ $(THREAD_LIBS) \ $(AUDIT_LIBS) \ diff --git a/src/util/virjson.c b/src/util/virjson.c index 01a387b2f7..5bab662cd3 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1437,7 +1437,8 @@ virJSONValueCopy(const virJSONValue *in) #if WITH_JANSSON -# include <jansson.h> + +# include "virjsoncompat.h" static virJSONValuePtr virJSONValueFromJansson(json_t *json) @@ -1524,6 +1525,9 @@ virJSONValueFromString(const char *jsonstring) size_t flags = JSON_REJECT_DUPLICATES | JSON_DECODE_ANY; + if (virJSONInitialize() < 0) + return NULL; + if (!(json = json_loads(jsonstring, flags, &error))) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to parse JSON %d:%d: %s"), @@ -1630,6 +1634,9 @@ virJSONValueToString(virJSONValuePtr object, json_t *json; char *str = NULL; + if (virJSONInitialize() < 0) + return NULL; + if (pretty) flags |= JSON_INDENT(2); else diff --git a/src/util/virjsoncompat.c b/src/util/virjsoncompat.c new file mode 100644 index 0000000000..c317e50c32 --- /dev/null +++ b/src/util/virjsoncompat.c @@ -0,0 +1,253 @@ +/* + * virjsoncompat.c: JSON object parsing/formatting + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include "virthread.h" +#include "virerror.h" +#define VIR_JSON_COMPAT_IMPL +#include "virjsoncompat.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +#if WITH_JANSSON + +#include <dlfcn.h> + +json_t *(*json_array_ptr)(void); +int (*json_array_append_new_ptr)(json_t *array, json_t *value); +json_t *(*json_array_get_ptr)(const json_t *array, size_t index); +size_t (*json_array_size_ptr)(const json_t *array); +void (*json_delete_ptr)(json_t *json); +char *(*json_dumps_ptr)(const json_t *json, size_t flags); +json_t *(*json_false_ptr)(void); +json_t *(*json_integer_ptr)(json_int_t value); +json_int_t (*json_integer_value_ptr)(const json_t *integer); +json_t *(*json_loads_ptr)(const char *input, size_t flags, json_error_t *error); +json_t *(*json_null_ptr)(void); +json_t *(*json_object_ptr)(void); +void *(*json_object_iter_ptr)(json_t *object); +const char *(*json_object_iter_key_ptr)(void *iter); +void *(*json_object_iter_next_ptr)(json_t *object, void *iter); +json_t *(*json_object_iter_value_ptr)(void *iter); +void *(*json_object_key_to_iter_ptr)(const char *key); +int (*json_object_set_new_ptr)(json_t *object, const char *key, json_t *value); +json_t *(*json_real_ptr)(double value); +double (*json_real_value_ptr)(const json_t *real); +json_t *(*json_string_ptr)(const char *value); +const char *(*json_string_value_ptr)(const json_t *string); +json_t *(*json_true_ptr)(void); + + +static int virJSONJanssonOnceInit(void) +{ + void *handle = dlopen("libjansson.so.4", RTLD_LAZY|RTLD_LOCAL|RTLD_DEEPBIND|RTLD_NODELETE); + if (!handle) { + virReportError(VIR_ERR_NO_SUPPORT, + _("libjansson.so.4 JSON library not available: %s"), dlerror()); + return -1; + } + +#define LOAD(name) \ + do { \ + if (!(name ## _ptr = dlsym(handle, #name))) { \ + virReportError(VIR_ERR_NO_SUPPORT, \ + _("missing symbol '%s' in libjansson.so.4: %s"), #name, dlerror()); \ + goto error; \ + } \ + fprintf(stderr, "Resolve %s to %p\n", #name, name ## _ptr); \ + } while (0) + + LOAD(json_array); + LOAD(json_array_append_new); + LOAD(json_array_get); + LOAD(json_array_size); + LOAD(json_delete); + LOAD(json_dumps); + LOAD(json_false); + LOAD(json_integer); + LOAD(json_integer_value); + LOAD(json_loads); + LOAD(json_null); + LOAD(json_object); + LOAD(json_object_iter); + LOAD(json_object_iter_key); + LOAD(json_object_iter_next); + LOAD(json_object_iter_value); + LOAD(json_object_key_to_iter); + LOAD(json_object_set_new); + LOAD(json_real); + LOAD(json_real_value); + LOAD(json_string); + LOAD(json_string_value); + LOAD(json_true); + + return 0; + + error: + return -1; +} + +VIR_ONCE_GLOBAL_INIT(virJSONJansson); + +int virJSONInitialize(void) { + return virJSONJanssonInitialize(); +} + +json_t *json_array_impl(void) +{ + return json_array_ptr(); +} + + +int json_array_append_new_impl(json_t *array, json_t *value) +{ + return json_array_append_new_ptr(array, value); +} + + +json_t *json_array_get_impl(const json_t *array, size_t index) +{ + return json_array_get_ptr(array, index); +} + + +size_t json_array_size_impl(const json_t *array) +{ + return json_array_size_ptr(array); +} + + +void json_delete_impl(json_t *json) +{ + return json_delete_ptr(json); +} + + +char *json_dumps_impl(const json_t *json, size_t flags) +{ + return json_dumps_ptr(json, flags); +} + + +json_t *json_false_impl(void) +{ + return json_false_ptr(); +} + + +json_t *json_integer_impl(json_int_t value) +{ + return json_integer_ptr(value); +} + + +json_int_t json_integer_value_impl(const json_t *integer) +{ + return json_integer_value_ptr(integer); +} + + +json_t *json_loads_impl(const char *input, size_t flags, json_error_t *error) +{ + return json_loads_ptr(input, flags, error); +} + + +json_t *json_null_impl(void) +{ + return json_null_ptr(); +} + + +json_t *json_object_impl(void) +{ + return json_object_ptr(); +} + + +void *json_object_iter_impl(json_t *object) +{ + return json_object_iter_ptr(object); +} + + +const char *json_object_iter_key_impl(void *iter) +{ + return json_object_iter_key_ptr(iter); +} + + +void *json_object_iter_next_impl(json_t *object, void *iter) +{ + return json_object_iter_next_ptr(object, iter); +} + + +json_t *json_object_iter_value_impl(void *iter) +{ + return json_object_iter_value_ptr(iter); +} + + +void *json_object_key_to_iter_impl(const char *key) +{ + return json_object_key_to_iter_ptr(key); +} + + +int json_object_set_new_impl(json_t *object, const char *key, json_t *value) +{ + return json_object_set_new_ptr(object, key, value); +} + + +json_t *json_real_impl(double value) +{ + return json_real_ptr(value); +} + + +double json_real_value_impl(const json_t *real) +{ + return json_real_value_ptr(real); +} + + +json_t *json_string_impl(const char *value) +{ + return json_string_ptr(value); +} + + +const char *json_string_value_impl(const json_t *string) +{ + return json_string_value_ptr(string); +} + + +json_t *json_true_impl(void) +{ + return json_true_ptr(); +} + +#endif + diff --git a/src/util/virjsoncompat.h b/src/util/virjsoncompat.h new file mode 100644 index 0000000000..c3963a5259 --- /dev/null +++ b/src/util/virjsoncompat.h @@ -0,0 +1,86 @@ +/* + * virjson.h: JSON object parsing/formatting + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + + +#ifndef __VIR_JSON_COMPAT_H_ +# define __VIR_JSON_COMPAT_H_ + +#ifndef VIR_JSON_COMPAT_IMPL + +#define json_array json_array_impl +#define json_array_append_new json_array_append_new_impl +#define json_array_get json_array_get_impl +#define json_array_size json_array_size_impl +#define json_delete json_delete_impl +#define json_dumps json_dumps_impl +#define json_false json_false_impl +#define json_integer json_integer_impl +#define json_integer_value json_integer_value_impl +#define json_loads json_loads_impl +#define json_null json_null_impl +#define json_object json_object_impl +#define json_object_iter json_object_iter_impl +#define json_object_iter_key json_object_iter_key_impl +#define json_object_iter_next json_object_iter_next_impl +#define json_object_iter_value json_object_iter_value_impl +#define json_object_key_to_iter json_object_key_to_iter_impl +#define json_object_set_new json_object_set_new_impl +#define json_real json_real_impl +#define json_real_value json_real_value_impl +#define json_string json_string_impl +#define json_string_value json_string_value_impl +#define json_true json_true_impl + +#include <jansson.h> + +#else + +#include <jansson.h> + +json_t *json_array_impl(void); +int json_array_append_new_impl(json_t *array, json_t *value); +json_t *json_array_get_impl(const json_t *array, size_t index); +size_t json_array_size_impl(const json_t *array); +void json_delete_impl(json_t *json); +char *json_dumps_impl(const json_t *json, size_t flags); +json_t *json_false_impl(void); +json_t *json_integer_impl(json_int_t value); +json_int_t json_integer_value_impl(const json_t *integer); +json_t *json_loads_impl(const char *input, size_t flags, json_error_t *error); +json_t *json_null_impl(void); +json_t *json_object_impl(void); +void *json_object_iter_impl(json_t *object); +const char *json_object_iter_key_impl(void *iter); +void *json_object_iter_next_impl(json_t *object, void *iter); +json_t *json_object_iter_value_impl(void *iter); +void *json_object_key_to_iter_impl(const char *key); +int json_object_set_new_impl(json_t *object, const char *key, json_t *value); +json_t *json_real_impl(double value); +double json_real_value_impl(const json_t *real); +json_t *json_string_impl(const char *value); +const char *json_string_value_impl(const json_t *string); +json_t *json_true_impl(void); + +#endif + +int virJSONInitialize(void); + +#endif -- 2.17.1

6 9

[libvirt] [PATCH v2 RESEND 00/12] PCI passthrough support on s390
by Yi Min Zhao 01 Aug '18

01 Aug '18

Abstract ======== The PCI representation in QEMU has recently been extended for S390 allowing configuration of zPCI attributes like uid (user-defined identifier) and fid (PCI function identifier). The details can be found here: https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg07262.html To support the new zPCI feature of the S390 platform, two new XML attributes, @uid and @fid, are introduced for device addresses of type 'pci', i.e.: <hostdev mode='subsystem' type='pci'> <driver name='vfio'/> <source> <address domain='0x0001' bus='0x00' slot='0x00' function='0x0'/> </source> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' uid='0x0003' fid='0x00000027'/> </hostdev> uid and fid are optional attributes. If they are defined by the user, unique values within the guest domain must be used. If they are not specified and the architecture requires them, they are automatically generated with non-conflicting values. Current implementation is the most seamless one for the user as it unites the address specific data of a PCI device on one XML element. It could accommodate both specifying our special parameters (uid and fid) and re-using standard statements (domain, bus, slot and function) for PCI devices. User can still specify bus/slot/function for the virtualized PCI devices in the XML. Thus uid/fid act as an extension to the PCI address and are stored in a new structure 'virZPCIDeviceAddress' which is a member of common PCI Address structure. Additionally, two hashtables are used for assignment and reservation of uid/fid. In support of extending the PCI address, a new PCI address extension flag is introduced. This extension flag allows is not only dedicated for the S390 platform but also other architectures needing certain extensions to PCI address space. Code Base ========= commit in master: 767f9e1449b1a36111532847f0c62dc758263c42 qemu: validate: Enforce compile time switch type checking for videos Change Log ========== v1->v2: 1. Separate test commit and merge testcases into corresponding commits that introduce the functionalities firstly. 2. Spare some checks for zpci device. 3. Add vsock and controller support. 4. Add uin32 type schema. 5. Rename zpciuid and zpcifid to zpci_uid and zpci_fid. 6. Always return multibus support on S390. Yi Min Zhao (12): conf: Add definitions for 'uid' and 'fid' PCI address attributes qemu: Introduce zPCI capability conf: Introduce a new PCI address extension flag qemu: Enable PCI multi bus for S390 guests qemu: Auto add pci-root for s390/s390x guests conf: Introduce address caching for PCI extensions conf: Introduce parser, formatter for uid and fid conf: Allocate/release 'uid' and 'fid' in PCI address qemu: Generate and use zPCI device in QEMU command line qemu: Add hotpluging support for PCI devices on S390 guests docs: Add 'uid' and 'fid' information news: Update news for PCI address extension attributes docs/formatdomain.html.in | 9 +- docs/news.xml | 11 + docs/schemas/basictypes.rng | 31 ++ docs/schemas/domaincommon.rng | 1 + src/conf/device_conf.c | 73 +++++ src/conf/device_conf.h | 1 + src/conf/domain_addr.c | 346 +++++++++++++++++++++ src/conf/domain_addr.h | 29 ++ src/conf/domain_conf.c | 6 + src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 6 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 115 +++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 181 ++++++++++- src/qemu/qemu_hotplug.c | 182 ++++++++++- src/util/virpci.h | 13 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 27 ++ tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml | 17 + .../hostdev-vfio-zpci-autogenerate.args | 26 ++ .../hostdev-vfio-zpci-autogenerate.xml | 18 ++ .../hostdev-vfio-zpci-boundaries.args | 30 ++ .../hostdev-vfio-zpci-boundaries.xml | 26 ++ .../hostdev-vfio-zpci-multidomain-many.args | 40 +++ .../hostdev-vfio-zpci-multidomain-many.xml | 67 ++++ tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 26 ++ tests/qemuxml2argvdata/hostdev-vfio-zpci.xml | 19 ++ tests/qemuxml2argvtest.c | 14 + tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml | 29 ++ tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml | 30 ++ tests/qemuxml2xmltest.c | 3 + 38 files changed, 1377 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.xml create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.args create mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml -- Yi Min

7 52

[libvirt] [PATCH] qemu: monitor: Fix incrementing of 'nstats' in qemuMonitorJSONBlockStatsCollectData
by Peter Krempa 01 Aug '18

01 Aug '18

commit 8d9ca6cdb3a5 refactored qemuMonitorJSONBlockStatsCollectData so that the number of stats is passed back via a pointer. The commit failed to fix the macro which increments the number of stats to increment the actual pointee. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 9acf62e0bb..2921f110a9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2299,7 +2299,7 @@ qemuMonitorJSONBlockStatsCollectData(virJSONValuePtr dev, #define QEMU_MONITOR_BLOCK_STAT_GET(NAME, VAR, MANDATORY) \ if (MANDATORY || virJSONValueObjectHasKey(stats, NAME)) { \ - nstats++; \ + (*nstats)++; \ if (virJSONValueObjectGetNumberLong(stats, NAME, &VAR) < 0) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ _("cannot read %s statistic"), NAME); \ -- 2.16.2

2 1