- Devel - libvirt List Archives

[libvirt] [PATCH] mingw: remove obsolete Group tag in RPM spec
by Daniel P. Berrangé 03 Apr '19

03 Apr '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- mingw-libvirt.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index bea822fd73..9983a5013f 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -39,7 +39,6 @@ Release: 1%{?dist} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ -Group: Development/Libraries URL: https://libvirt.org/ %if %(echo %{version} | grep -q "\.0$"; echo $?) == 1 -- 2.20.1

2 1

[libvirt] [PATCH v3 0/6] Facilitate running libvirt builds via docker containers
by Daniel P. Berrangé 03 Apr '19

03 Apr '19

For a while QEMU has provided simple make rules for building QEMU inside standard docker container environments. This provides an equivalent mechanism for libvirt inspired by QEMU's. QEMU actually builds the container images on developer's machines locally. Libvirt already hosts pre-built images on quay.io, so that is used directly as it is quicker to download them than to build them locally. This also ensures the container contents match what the live CI system is using, as opposed to building an image with newer packages. NB, there is a currently a test failure with this change to travis that we don't currently see. Current travis runs a privileged docker container, but with this change we now run unprivileged containers. This shows that the "virsh-snapshot" test is trying to create a file under $HOME, and docker blocks this. Obviously needs fixing before pushing. Changed in v3: - Lots of new variables & variable renames - Rename to top level Makefile.ci - Rename make targets to have @ separator for the image - Refactor macOS travis config Changed in v2: - Drop cross-compilation patches temporarily. The cross-compiler images are not yet built on quay.io and rather than creating and bulding many more images manually, I'm working on script to automate setup of quay.io images - Many changes to the make rules to make it possible to use them from Travis CI to match its currently testing setup - Modify Travis CI config to use the new make rules for consistency Daniel P. Berrangé (6): tests: don't abort in fopen(/proc/mounts) tests: add targets for building libvirt inside docker containers travis: convert ubuntu, centos & mingw builds to use new make rules travis: use declarative syntax for homebrew packages travis: remove display of test-suite.log from macOS travis: put macOS script inline in the macOS matrix entry .gitignore | 1 + .travis.yml | 78 +++++----------- Makefile.am | 2 + Makefile.ci | 206 ++++++++++++++++++++++++++++++++++++++++++ tests/vircgroupmock.c | 6 +- 5 files changed, 235 insertions(+), 58 deletions(-) create mode 100644 Makefile.ci -- 2.20.1

3 20

[libvirt] [PATCH] virjson: drop compatibility macros
by Ján Tomko 03 Apr '19

03 Apr '19

Since commit 66460e3 dropped support for YAJL 1, we no longer need these. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/util/virjson.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index bb4052ba81..1dceb746b9 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -34,8 +34,6 @@ # include <yajl/yajl_gen.h> # include <yajl/yajl_parse.h> -# define yajl_size_t size_t -# define VIR_YAJL_STATUS_OK(status) ((status) == yajl_status_ok) #endif /* XXX fixme */ @@ -1615,7 +1613,7 @@ virJSONParserHandleBoolean(void *ctx, static int virJSONParserHandleNumber(void *ctx, const char *s, - yajl_size_t l) + size_t l) { virJSONParserPtr parser = ctx; char *str; @@ -1643,7 +1641,7 @@ virJSONParserHandleNumber(void *ctx, static int virJSONParserHandleString(void *ctx, const unsigned char *stringVal, - yajl_size_t stringLen) + size_t stringLen) { virJSONParserPtr parser = ctx; virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, @@ -1666,7 +1664,7 @@ virJSONParserHandleString(void *ctx, static int virJSONParserHandleMapKey(void *ctx, const unsigned char *stringVal, - yajl_size_t stringLen) + size_t stringLen) { virJSONParserPtr parser = ctx; virJSONParserStatePtr state; @@ -1824,7 +1822,7 @@ virJSONValueFromString(const char *jsonstring) /* Yajl 2 is nice enough to default to rejecting trailing garbage. */ rc = yajl_parse(hand, (const unsigned char *)jsonstring, len); - if (!VIR_YAJL_STATUS_OK(rc) || + if (rc != yajl_status_ok || yajl_complete_parse(hand) != yajl_status_ok) { unsigned char *errstr = yajl_get_error(hand, 1, (const unsigned char*)jsonstring, @@ -1935,7 +1933,7 @@ virJSONValueToBuffer(virJSONValuePtr object, { yajl_gen g; const unsigned char *str; - yajl_size_t len; + size_t len; int ret = -1; VIR_DEBUG("object=%p", object); -- 2.19.2

3 2

[libvirt] [PATCH] rbd: fix build with LIBRBD_VERSION_CODE <= 265
by Ján Tomko 03 Apr '19

03 Apr '19

Add ATTRIBUTE_UNUSED to the volStorageBackendRBDGetFlags stub. Fixes: 21deeaf02fdf216b08210fc899579736973ca81d Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as a build breaker fix src/storage/storage_backend_rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 29f6a5de60..f8c968e682 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -501,8 +501,8 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol, #else static int -volStorageBackendRBDGetFlags(rbd_image_t image, - const char *volname, +volStorageBackendRBDGetFlags(rbd_image_t image ATTRIBUTE_UNUSED, + const char *volname ATTRIBUTE_UNUSED, uint64_t *flags) { *flags = 0; -- 2.19.2

1 0

[libvirt] [PATCHv2 00/14] virjsontest: separate some tests into files
by Ján Tomko 03 Apr '19

03 Apr '19

v1: cover.1549987014.git.jtomko(a)redhat.com v2: prettify output, use VIR_AUTO and better-looking commit messages Ján Tomko (14): virjsontest: switch AddAndRemove tests to work with files testJSONFromString: regroup if blocks virjsontest: reword error messages in testJSONFromString virjsontest: use VIR_AUTOPTR for virJSONValues virjsontest: use VIR_AUTOFREE for strings virjsontest: remove unnecessary cleanup labels virjsontest: introduce DO_TEST_PARSE_FILE virjsontest: switch DO_TEST_PARSE_FILE to use output files virjsontest: reformat add-remove test input data vvv--- squash into: json_reformat add-remove output data virjsontest: prettify AddRemove test virjsondata: json_reformat input data vvv SQUASH HERE: reformat parseFile output data virjsontest: prettify JSONFromFile test tests/virjsondata/add-remove-failure-in.json | 3 + tests/virjsondata/add-remove-success-in.json | 4 + tests/virjsondata/add-remove-success-out.json | 4 + tests/virjsondata/parse-Harder-in.json | 13 + tests/virjsondata/parse-Harder-out.json | 13 + tests/virjsondata/parse-NotSoSimple-in.json | 15 + tests/virjsondata/parse-NotSoSimple-out.json | 15 + tests/virjsondata/parse-Simple-in.json | 6 + tests/virjsondata/parse-Simple-out.json | 6 + tests/virjsondata/parse-VeryHard-in.json | 143 +++++++ tests/virjsondata/parse-VeryHard-out.json | 143 +++++++ tests/virjsontest.c | 370 ++++++++---------- 12 files changed, 531 insertions(+), 204 deletions(-) create mode 100644 tests/virjsondata/add-remove-failure-in.json create mode 100644 tests/virjsondata/add-remove-success-in.json create mode 100644 tests/virjsondata/add-remove-success-out.json create mode 100644 tests/virjsondata/parse-Harder-in.json create mode 100644 tests/virjsondata/parse-Harder-out.json create mode 100644 tests/virjsondata/parse-NotSoSimple-in.json create mode 100644 tests/virjsondata/parse-NotSoSimple-out.json create mode 100644 tests/virjsondata/parse-Simple-in.json create mode 100644 tests/virjsondata/parse-Simple-out.json create mode 100644 tests/virjsondata/parse-VeryHard-in.json create mode 100644 tests/virjsondata/parse-VeryHard-out.json -- 2.19.2

2 22

[libvirt] [PATCH 00/14] virsh: introduce a password completer
by Ján Tomko 03 Apr '19

03 Apr '19

Ján Tomko (14): virsh: fix indentation of info_managed_save_edit virsh-completer: fix typo virsh-completer: reword documentation virsh-completer: switch to using tmp instead of ret virsh-completer: add a cleanup label everywhere virsh-completer: unify cleanup of items in name completers virsh-completer: virStringListFree where possible virsh-completer: use VIR_AUTOSTRINGLIST for tmp use VIR_AUTOFREE for xmlNodePtr* variables virsh-completer: use VIR_AUTOPTR for xml* variables virsh-completer: use VIR_AUTOFREE for char* variables virsh-completer: remove excessive labels virsh-completer: introduce virshPagesizeNodeToString virsh-completer: introduce virshPasswordCompleter tools/virsh-completer.c | 611 +++++++++++++++++++--------------------- tools/virsh-completer.h | 4 + tools/virsh-domain.c | 15 +- 3 files changed, 295 insertions(+), 335 deletions(-) -- 2.20.1

5 30

[libvirt] [PATCH 0/7] qemu: Improve JSON handling in monitor interactions
by Peter Krempa 03 Apr '19

03 Apr '19

Remove a few unnecessary copies of the JSON string as well as duplicate and unneeded debug logs. Peter Krempa (7): util: buffer: Remove struct member munging util: buffer: Use 'size_t' for buffer size variables util: json: Use virBuffer in JSON->string conversion util: json: Don't bother logging output string in virJSONValueToString util: json: Export virJSONValueToBuffer qemu: monitor: Remove few debug statements qemu: monitor: Avoid unnecessary copies of command string src/libvirt_private.syms | 1 + src/qemu/qemu_monitor_json.c | 19 ++++++++----------- src/util/virbuffer.c | 14 +------------- src/util/virbuffer.h | 18 +++++++----------- src/util/virjson.c | 33 ++++++++++++++++++++++++--------- src/util/virjson.h | 5 +++++ tests/virbuftest.c | 4 +++- 7 files changed, 49 insertions(+), 45 deletions(-) -- 2.20.1

2 18

[libvirt] [PATCH v6 00/33] BaselineHypervisorCPU using QEMU QMP exchanges
by Chris Venteicher 02 Apr '19

02 Apr '19

Some architectures (S390) depend on QEMU to compute baseline CPU model and expand a models feature set. Interacting with QEMU requires starting the QEMU process and completing one or more query-cpu-model-baseline QMP exchanges with QEMU in addition to a query-cpu-model-expansion QMP exchange to expand all features in the model. See "s390x CPU models: exposing features" patch set on Qemu-devel for discussion of QEMU aspects. This is part of resolution of: https://bugzilla.redhat.com/show_bug.cgi?id=1511999 ----- v6 addresses these issues from v5: qemu_process: Move process code from qemu_capabilities to qemu_process [x] Remove exception statement from commit message qemu_process: Use qemuProcessQmp prefix [x] s/ProcessQmp/ProcessQMP/ in this and all subsequent patches qemu_process: Refer to proc not cmd in process code [x] Back port indentation fix in qemuProcessQMPRun qemu_capabilities: Stop QEMU process before freeing [x] Back port !proc check in qemuProcessQmpStop qemu_process: Use qemuProcessQmp struct for a single process [x] Remove extra empty lines qemu_process: All ProcessQMP errors are fatal [x] Split into multiple patches qemu_process: Introduce qemuProcessQmpStart [x] Log function parameters separately in the first function debug message [x] Removed NULLSTR check on proc-binary (would fail previously on proc activate) [x] Back port referring to stderr rather than qmperr in comment [ ] Combine qemuProcessQmpStop and qemuProcessQmpFree (See reply to v5 email) emu_process: Collect monitor code in single function [x] Back port qemuMonitorOpen indent fix to earlier patch qemu_process: Don't open monitor if process failed [x] Drop patch qemu_process: Cleanup qemuProcessQmp alloc function [x] s/Qemu/QEMU/ in comments for qemuProcessQMPNew [x] Remove unneeded use of NULLSTR and NULL check before calling qemuProcessQmpFree qemu_process: Cleanup qemuProcessQmpStop function [x] Remove lines from from commit message [x] Remove capitalization from comment [x] Fix func def to match coding style [x] Back port !proc check to earlier patch qemu_process: Catch process free before process stop [x] Remove capitalization from comment [x] Don't do proc NULL check in VIR_DEBUG [ ] Combine qemuProcessQmpStop and qemuProcessQmpFree (See reply to v5 email) qemu_monitor: Make monitor callbacks optional [x] Drop patch qemu_process: Enter QMP command mode when starting QEMU Process [ ] Don't call qemuMonitorSetCapabilities in qemuProcessQMPConnectMonitor (See reply to v5 email) qemu_process: Use unique directories for QMP processes [x] s/qemu./qmp-/ for QMP process directory name prefix [x] Catch mkdtemp returns NULL qemu_process: Stop locking QMP process monitor immediately [x] Drop patch qemu_monitor: Introduce qemuMonitorCPUModelInfoNew [x] Use qemuMonitorCPUModelInfoNew to set model name [x] Drop variable initialization [x] Use qemuMonitorCPUModelInfoNew in qemuMonitorJSONGetCPUModelExpansion (Pull forward) [ ] Remove orig NULL check (Unit tests fail if I do this) qemu_monitor: Introduce qemuMonitorCPUModelInfo / JSON conversion [x] Make variable initialization easier to read in PropAdd [x] Require at least one "prop" (don't allow zero in this commit) qemu_capabilities: Introduce virQEMuCapsMigratablePropsDiff [x] Remove template txt in commit message [x] Change function name [x] Distinguish nmProp from mProp [x] Don't set cpuData->info to NULL [ ] Don't use tmp (defer to next patch set... out of time) qemu_monitor: qemuMonitorGetCPUModelExpansion inputs and outputs CPUModelInfo [x] Remove extra line from commit message [x] Change parameter order [x] Don't use VIR_STEAL_PTR qemu_capabilities: Introduce CPUModelInfo to virCPUDef function [x] Change comment [x] Change parameter order [x] Separate lines [x] Move debug message before alloc [x] Back port function spacing fix from next patch qemu_capabilities: Introduce virCPUDef to CPUModelInfo function [x] Change comment [x] Move debug message before alloc [x] Remove NULL check on feature->name [x] Document prop value semantics Reviewed in v5 but no changes required: qemu_process: Limit qemuProcessQmpNew to const input strings qemu_process: Use consistent name for stop process function qemu_process: Persist stderr in qemuProcessQmp struct qemu_process: Store libDir in qemuProcessQmp struct qemu_process: Setup paths within qemuProcessQmpInit qemu_process: Stop retaining Monitor config in qemuProcessQmp Not reviewed in v5: qemu_monitor: Support query-cpu-model-baseline QMP command qemu_driver: Consolidate code to baseline using libvirt qemu_driver: Decouple code for baseline using libvirt qemu_driver: Identify using libvirt as a distinct way to compute baseline qemu_driver: Support baseline calculation using QEMU qemu_driver: Support feature expansion via QEMU when baselining cpu qemu_driver: Remove unsupported props in expanded hypervisor baseline output qemu_monitor: Default props to migratable when expanding cpu model ----- v5: Fixes all process issues identified here: https://www.redhat.com/archives/libvir-list/2018-November/msg00349.html - Make the process code generic (not capabilities specific) for use by BaselineHypervisorCPU - Many of the process patches are simple code moves with implementation changes in other distinct patches - A thread safe library function creates a unique directory under libDir for each QEMU process (for QMP messaging) to decouple processes in terms of sockets and file system footprint. The remaining (non-process) patches in v4 address all issues in v1-v4 of 'BaselineHypervisorCPU using QEMU QMP exchanges' Thanks, Chris *** BLURB HERE *** Chris Venteicher (33): qEmu_process: Move process code from qemu_capabilities to qemu_process qemu_process: Use qemuProcessQMP prefix qemu_process: Limit qemuProcessQMPNew to const input strings qemu_process: Refer to proc not cmd in process code qemu_process: Use consistent name for stop process function qemu_capabilities: Stop QEMU process before freeing qemu_process: Use qemuProcessQMP struct for a single process qemu_process: All ProcessQMP errors are fatal qemu_process: Expose process exit status code qemu_process: Persist stderr in qemuProcessQMP struct qemu_process: Introduce qemuProcessQMPStart qemu_process: Collect monitor code in single function qemu_process: Store libDir in qemuProcessQMP struct qemu_process: Setup paths within qemuProcessQMPInit qemu_process: Stop retaining Monitor config in qemuProcessQMP qemu_process: Cleanup qemuProcessQMP alloc function qemu_process: Cleanup qemuProcessQMPStop function qemu_process: Catch process free before process stop qemu_process: Enter QMP command mode when starting QEMU Process qemu_process: Use unique directories for QMP processes qemu_monitor: Introduce qemuMonitorCPUModelInfoNew qemu_monitor: Introduce qemuMonitorCPUModelInfo / JSON conversion qemu_capabilities: Introduce virQEMuCapsMigratablePropsCalc qemu_monitor: qemuMonitorGetCPUModelExpansion inputs and outputs CPUModelInfo qemu_capabilities: Introduce CPUModelInfo to virCPUDef function qemu_capabilities: Introduce virCPUDef to CPUModelInfo function qemu_monitor: Support query-cpu-model-baseline QMP command qemu_driver: Consolidate code to baseline using libvirt qemu_driver: Decouple code for baseline using libvirt qemu_driver: Identify using libvirt as a distinct way to compute baseline qemu_driver: Support baseline calculation using QEMU qemu_driver: Support feature expansion via QEMU when baselining cpu qemu_monitor: Default props to migratable when expanding cpu model src/qemu/qemu_capabilities.c | 631 ++++++++---------- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_driver.c | 216 +++++- src/qemu/qemu_monitor.c | 165 ++++- src/qemu/qemu_monitor.h | 29 +- src/qemu/qemu_monitor_json.c | 223 +++++-- src/qemu/qemu_monitor_json.h | 10 +- src/qemu/qemu_process.c | 345 ++++++++++ src/qemu/qemu_process.h | 32 + tests/cputest.c | 11 +- .../caps_2.10.0.s390x.xml | 60 +- .../caps_2.11.0.s390x.xml | 58 +- .../caps_2.12.0.s390x.xml | 56 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 32 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 34 +- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 64 +- tests/qemucapabilitiestest.c | 7 + 17 files changed, 1375 insertions(+), 602 deletions(-) -- 2.17.1

2 34

[libvirt] [PATCH 0/5] qemu: caps: Always assume most of block job capabilities
by Peter Krempa 02 Apr '19

02 Apr '19

Peter Krempa (5): qemu: capabilities: Always assume QEMU_CAPS_BLOCKJOB_ASYNC qemu: domain: drop qemuDomainSupportsBlockJobs qemu: capabilities: Always assume QEMU_CAPS_BLOCK_COMMIT qemu: capabilities: Always assume QEMU_CAPS_DRIVE_MIRROR qemu: capabilities: Always assume disk snapshot caps src/qemu/qemu_capabilities.c | 13 +---- src/qemu/qemu_capabilities.h | 10 ++-- src/qemu/qemu_domain.c | 23 -------- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_driver.c | 34 ------------ src/qemu/qemu_migration.c | 53 ++++++++----------- .../caps_1.5.3.x86_64.xml | 5 -- .../caps_1.6.0.x86_64.xml | 5 -- .../caps_1.7.0.x86_64.xml | 5 -- .../caps_2.1.1.x86_64.xml | 5 -- .../caps_2.10.0.aarch64.xml | 5 -- .../caps_2.10.0.ppc64.xml | 5 -- .../caps_2.10.0.s390x.xml | 5 -- .../caps_2.10.0.x86_64.xml | 5 -- .../caps_2.11.0.s390x.xml | 5 -- .../caps_2.11.0.x86_64.xml | 5 -- .../caps_2.12.0.aarch64.xml | 5 -- .../caps_2.12.0.ppc64.xml | 5 -- .../caps_2.12.0.s390x.xml | 5 -- .../caps_2.12.0.x86_64.xml | 5 -- .../caps_2.4.0.x86_64.xml | 5 -- .../caps_2.5.0.x86_64.xml | 5 -- .../caps_2.6.0.aarch64.xml | 5 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 5 -- .../caps_2.6.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 5 -- .../caps_2.7.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 5 -- .../caps_2.8.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 5 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 5 -- .../caps_2.9.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 5 -- .../caps_3.0.0.riscv32.xml | 5 -- .../caps_3.0.0.riscv64.xml | 5 -- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml | 5 -- .../caps_3.0.0.x86_64.xml | 5 -- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 5 -- .../caps_3.1.0.x86_64.xml | 5 -- .../caps_4.0.0.riscv32.xml | 5 -- .../caps_4.0.0.riscv64.xml | 5 -- .../caps_4.0.0.x86_64.xml | 5 -- 42 files changed, 27 insertions(+), 288 deletions(-) -- 2.20.1

2 6

[libvirt] [PATCH 0/4] Fix various test portability problems
by Daniel P. Berrangé 02 Apr '19

02 Apr '19

This includes a slight tweak to the stat/lstat patch wrt logging and fixes use of the dirent d_type field. Daniel P. Berrangé (4): tests: fix mocking of stat() / lstat() functions qemu: don't rely on the non-portable d_type field in dirent security: avoid use of dirent d_type field cfg.mk: block use of d_type from dirent by default build-aux/mock-noinline.pl | 3 + cfg.mk | 20 +- src/qemu/qemu_firmware.c | 12 +- src/security/security_selinux.c | 6 +- tests/Makefile.am | 1 + tests/qemusecuritymock.c | 131 ++++--------- tests/vircgroupmock.c | 146 ++------------ tests/virfilewrapper.c | 85 ++------- tests/virmock.h | 11 -- tests/virmockstathelpers.c | 326 ++++++++++++++++++++++++++++++++ tests/virpcimock.c | 93 +-------- tests/virtestmock.c | 140 +------------- 12 files changed, 440 insertions(+), 534 deletions(-) create mode 100644 tests/virmockstathelpers.c -- 2.20.1

2 8

[libvirt] [PATCH 00/10] Improve handling of secrets in memory
by Peter Krempa 02 Apr '19

02 Apr '19

Peter Krempa (10): qemu: conf: Clear spice/vnc passwords from memory when freeing conf object util: alloc: Add automatic cleanup/disposal of strings Use VIR_AUTODISPOSE_STR instead of VIR_DISPOSE_STRING where possible util: buffer: Remove struct member munging util: alloc: Clean also stack'd data with VIR_AUTOCLEAN util: alloc: Introduce VIR_TMP qemu: Use VIR_TMP to stop leaking pointer to VNC password pointer to stack util: Introduce 'virpin' module for dealing with PIN numbers util: json: Make sure that Jano's pin is not leaked to the heap util: json: Nuke strings when freeing JSON objects cfg.mk | 2 +- src/Makefile.am | 3 + src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 3 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_hotplug.c | 2 +- src/rpc/virnetlibsshsession.c | 10 +- src/storage/storage_backend_rbd.c | 3 +- src/util/Makefile.inc.am | 2 + src/util/viralloc.c | 23 + src/util/viralloc.h | 32 +- src/util/virbuffer.c | 12 - src/util/virbuffer.h | 16 +- src/util/virjson.c | 8 +- src/util/virpin.c | 1053 +++++++++++++++++++++++++++++ src/util/virpin.h | 30 + tests/utiltest.c | 30 + tests/virbuftest.c | 2 +- tools/virsh-secret.c | 3 +- 20 files changed, 1200 insertions(+), 47 deletions(-) create mode 100644 src/util/virpin.c create mode 100644 src/util/virpin.h -- 2.20.1

2 14

[libvirt] [PATCH 0/5] qemu: Fix memfd with default hugetlbfs mount
by Michal Privoznik 02 Apr '19

02 Apr '19

Michal Prívozník (5): qemuxml2argvdata: Drop useless spaces at the beginning of lines qemuxml2xmltest: Move virObjectUnref() call qemuxml2xmltest: Add memfd tests virfile: Introduce and use virFileGetDefaultHugepage qemuBuildMemoryBackendProps: Get pagesize early src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 14 ++++ src/qemu/qemu_conf.c | 12 +-- src/util/virfile.c | 25 ++++++ src/util/virfile.h | 3 + .../fd-memory-no-numa-topology.xml | 14 +++- .../fd-memory-numa-topology.xml | 12 ++- .../fd-memory-numa-topology2.xml | 70 +++++++++------- .../fd-memory-numa-topology3.xml | 72 +++++++++-------- ...memory-default-hugepage.x86_64-latest.args | 37 +++++++++ .../memfd-memory-default-hugepage.xml | 42 ++++++++++ .../memfd-memory-numa.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 80 ++++++++++--------- tests/qemuxml2argvtest.c | 1 + .../fd-memory-no-numa-topology.xml | 1 + .../fd-memory-numa-topology.xml | 1 + .../fd-memory-numa-topology2.xml | 1 + .../fd-memory-numa-topology3.xml | 1 + .../memfd-memory-default-hugepage.xml | 1 + .../qemuxml2xmloutdata/memfd-memory-numa.xml | 1 + tests/qemuxml2xmltest.c | 18 ++++- 21 files changed, 295 insertions(+), 114 deletions(-) create mode 100644 tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml create mode 120000 tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml create mode 120000 tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml create mode 120000 tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml create mode 120000 tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml create mode 120000 tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml create mode 120000 tests/qemuxml2xmloutdata/memfd-memory-numa.xml -- 2.21.0

2 11

[libvirt] [PATCH 0/3] maint: Drop ChangeLog*
by Andrea Bolognani 02 Apr '19

02 Apr '19

Rationale in the respective commit messages. Patch 2/3 has been snipped quite extensively so that it would make it to the mailing list: the unabridged version of this series can be fetched from https://github.com/andreabolognani/libvirt/tree/changelog Andrea Bolognani (3): maint: Stop generating ChangeLog from git maint: Drop ChangeLog-old maint: Update references to ChangeLog* .gitignore | 1 - ChangeLog | 15 + ChangeLog-old | 16699 ------------------------------------------ Makefile.am | 15 +- bootstrap.conf | 4 +- cfg.mk | 2 +- docs/news-ascii.xsl | 3 +- 7 files changed, 21 insertions(+), 16718 deletions(-) create mode 100644 ChangeLog delete mode 100644 ChangeLog-old -- 2.20.1

4 12

[libvirt] [PATCH] virDirRead: Fix d_type if needed
by Michal Privoznik 02 Apr '19

02 Apr '19

Some of our code iterates over a directory and does some decisions based on entry type (e.g. if it's not a regular file continue with next iteration). This is done by looking at ent->d_type struct member. However, in some cases (e.g. for some filesystems) the d_type can be set to DT_UNKNOWN which effectively defeats the aforementioned checks. For instance, some XFS' (depending on how they were created) might not bother filling the member. Fix this by running stat() and filling in the member ourselves. If needed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- With Dan's patch that fixes stat() mocking, I'm passing tests successfully everywhere I tried (32bit fedora and gentoo on RPi, RHEL-7, amd64 gentoo, fedora rawhide on x86_64) src/util/virfile.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index ec8d85929c..7d7c27a7d2 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2893,6 +2893,39 @@ virDirOpenQuiet(DIR **dirp, const char *name) return virDirOpenInternal(dirp, name, false, true); } +static int +virDirReadFixDType(DIR *dirp, struct dirent *ent) +{ + /* DO NOT CLOSE THIS FD */ + const int fd = dirfd(dirp); + struct stat sb; + + if (fd < 0) + return -1; + + if (fstatat(fd, ent->d_name, &sb, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW) < 0) + return -1; + + if (S_ISDIR(sb.st_mode)) + ent->d_type = DT_DIR; + else if (S_ISCHR(sb.st_mode)) + ent->d_type = DT_CHR; + else if (S_ISBLK(sb.st_mode)) + ent->d_type = DT_BLK; + else if (S_ISREG(sb.st_mode)) + ent->d_type = DT_REG; + else if (S_ISFIFO(sb.st_mode)) + ent->d_type = DT_FIFO; + else if (S_ISLNK(sb.st_mode)) + ent->d_type = DT_LNK; + else if (S_ISSOCK(sb.st_mode)) + ent->d_type = DT_SOCK; + else + return -1; + + return 0; +} + /** * virDirRead: * @dirp: directory to read @@ -2926,6 +2959,17 @@ int virDirRead(DIR *dirp, struct dirent **ent, const char *name) } } while (*ent && (STREQ((*ent)->d_name, ".") || STREQ((*ent)->d_name, ".."))); + + if (*ent && + (*ent)->d_type == DT_UNKNOWN && + virDirReadFixDType(dirp, *ent) < 0) { + if (name) + virReportSystemError(errno, + _("Unable to fix d_type of '%s/%s'"), + name, (*ent)->d_name); + return -1; + } + return !!*ent; } -- 2.21.0

2 1

[libvirt] [PATCH v2] examples: fix 64-bit integer formatting on Windows
by Daniel P. Berrangé 02 Apr '19

02 Apr '19

The Windows printf functions don't support %llu/%lld for printing 64-bit integers. For most of libvirt this doesn't matter as we rely on gnulib which provides a replacement printf that is sane. The example code is designed to compile against the normal OS headers, with no use of gnulib and thus has to use the platform specific printf. To deal with this we must use the macros PRI* macros from inttypes.h to get the platform specific format string. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/admin/client_info.c | 7 ++++--- examples/admin/list_clients.c | 3 ++- examples/domtop/domtop.c | 8 ++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) Changed in v2: - Now actually commit the int64 casts diff --git a/examples/admin/client_info.c b/examples/admin/client_info.c index f3f62a656b..7fc6c72bbd 100644 --- a/examples/admin/client_info.c +++ b/examples/admin/client_info.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <time.h> #include <string.h> +#include <inttypes.h> #include <libvirt/libvirt-admin.h> static const char * @@ -66,11 +67,11 @@ exampleGetTypedParamValue(virTypedParameterPtr item) break; case VIR_TYPED_PARAM_LLONG: - ret = asprintf(&str, "%lld", item->value.l); + ret = asprintf(&str, "%" PRId64, (int64_t)item->value.l); break; case VIR_TYPED_PARAM_ULLONG: - ret = asprintf(&str, "%llu", item->value.ul); + ret = asprintf(&str, "%" PRIu64, (uint64_t)item->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: @@ -143,7 +144,7 @@ int main(int argc, char **argv) if (!(timestr = exampleGetTimeStr(virAdmClientGetTimestamp(clnt)))) goto cleanup; - printf("%-15s: %llu\n", "id", virAdmClientGetID(clnt)); + printf("%-15s: %" PRIu64 "\n", "id", (uint64_t)virAdmClientGetID(clnt)); printf("%-15s: %s\n", "connection_time", timestr); printf("%-15s: %s\n", "transport", exampleTransportToString(virAdmClientGetTransport(clnt))); diff --git a/examples/admin/list_clients.c b/examples/admin/list_clients.c index 5cf8e4c2a6..2876637d42 100644 --- a/examples/admin/list_clients.c +++ b/examples/admin/list_clients.c @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> +#include <inttypes.h> #include <libvirt/libvirt-admin.h> static const char * @@ -96,7 +97,7 @@ int main(int argc, char **argv) exampleGetTimeStr(virAdmClientGetTimestamp(client)))) goto cleanup; - printf(" %-5llu %-15s %-15s\n", id, + printf(" %-5" PRIu64 " %-15s %-15s\n", (uint64_t)id, exampleTransportToString(transport), timestr); free(timestr); } diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 008065c651..e1e7fbff8b 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -29,6 +29,7 @@ #include <string.h> #include <sys/time.h> #include <unistd.h> +#include <inttypes.h> static bool debug; static bool run_top; @@ -226,8 +227,11 @@ print_cpu_usage(const char *dom_name, return; } - DEBUG("now_params=%llu then_params=%llu now=%llu then=%llu", - now_params[pos].value.ul, then_params[pos].value.ul, now, then); + DEBUG("now_params=%" PRIu64 " then_params=%" PRIu64 + " now=%" PRIu64 " then=%" PRIu64, + (uint64_t)now_params[pos].value.ul, + (uint64_t)then_params[pos].value.ul, + (uint64_t)now, (uint64_t)then); /* @now_params and @then_params are in nanoseconds, @now and @then are * in microseconds. In ideal world, we would translate them both into -- 2.20.1

2 1

[libvirt] [PATCH 0/2] qemu: caps: Few more cleanups
by Peter Krempa 02 Apr '19

02 Apr '19

These were prompted by the review on the original series. Both will be pushed as trivial once the release is out. Peter Krempa (2): qemu: Remove ATTRIBUTE_UNUSED from 'qemuCaps' of virQEMUCapsInitQMPMonitorTCG qemu: Remove cleanup section of virQEMUCapsInitQMPMonitorTCG src/qemu/qemu_capabilities.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- 2.20.1

1 2

[libvirt] [PATCH 0/5] qemu: hotplug: Media change improvements (blockdev-add saga)
by Peter Krempa 02 Apr '19

02 Apr '19

First patch is not entirely relevant in this series. Peter Krempa (5): qemu: domain: Use VIR_AUTOFREE in qemuDomainObjPrivateXMLParseBlockjobs qemu: hotplug: Remove unused copies of virQEMUDriverConfigPtr qemu: hotplug: Use VIR_AUTOUNREF for virQEMUDriverConfigPtr qemu: hotplug: Disallow media change while blockjob is active qemu: domain: Forbid copy_on_read option also for floppies src/qemu/qemu_domain.c | 23 +++++++++++++------ src/qemu/qemu_hotplug.c | 51 ++++++++++++++++------------------------- 2 files changed, 36 insertions(+), 38 deletions(-) -- 2.20.1

2 10

[libvirt] [PATCH] examples: fix 64-bit integer formatting on Windows
by Daniel P. Berrangé 02 Apr '19

02 Apr '19

The Windows printf functions don't support %llu/%lld for printing 64-bit integers. For most of libvirt this doesn't matter as we rely on gnulib which provides a replacement printf that is sane. The example code is designed to compile against the normal OS headers, with no use of gnulib and thus has to use the platform specific printf. To deal with this we must use the macros PRI* macros from inttypes.h to get the platform specific format string. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/admin/client_info.c | 7 ++++--- examples/admin/list_clients.c | 3 ++- examples/domtop/domtop.c | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/examples/admin/client_info.c b/examples/admin/client_info.c index f3f62a656b..d60512624d 100644 --- a/examples/admin/client_info.c +++ b/examples/admin/client_info.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <time.h> #include <string.h> +#include <inttypes.h> #include <libvirt/libvirt-admin.h> static const char * @@ -66,11 +67,11 @@ exampleGetTypedParamValue(virTypedParameterPtr item) break; case VIR_TYPED_PARAM_LLONG: - ret = asprintf(&str, "%lld", item->value.l); + ret = asprintf(&str, "%" PRId64, item->value.l); break; case VIR_TYPED_PARAM_ULLONG: - ret = asprintf(&str, "%llu", item->value.ul); + ret = asprintf(&str, "%" PRIu64, item->value.ul); break; case VIR_TYPED_PARAM_DOUBLE: @@ -143,7 +144,7 @@ int main(int argc, char **argv) if (!(timestr = exampleGetTimeStr(virAdmClientGetTimestamp(clnt)))) goto cleanup; - printf("%-15s: %llu\n", "id", virAdmClientGetID(clnt)); + printf("%-15s: %" PRIu64 "\n", "id", virAdmClientGetID(clnt)); printf("%-15s: %s\n", "connection_time", timestr); printf("%-15s: %s\n", "transport", exampleTransportToString(virAdmClientGetTransport(clnt))); diff --git a/examples/admin/list_clients.c b/examples/admin/list_clients.c index 5cf8e4c2a6..545b9cbd01 100644 --- a/examples/admin/list_clients.c +++ b/examples/admin/list_clients.c @@ -1,6 +1,7 @@ #include <stdio.h> #include <stdlib.h> #include <time.h> +#include <inttypes.h> #include <libvirt/libvirt-admin.h> static const char * @@ -96,7 +97,7 @@ int main(int argc, char **argv) exampleGetTimeStr(virAdmClientGetTimestamp(client)))) goto cleanup; - printf(" %-5llu %-15s %-15s\n", id, + printf(" %-5" PRIu64 " %-15s %-15s\n", id, exampleTransportToString(transport), timestr); free(timestr); } diff --git a/examples/domtop/domtop.c b/examples/domtop/domtop.c index 008065c651..33d97c74fe 100644 --- a/examples/domtop/domtop.c +++ b/examples/domtop/domtop.c @@ -29,6 +29,7 @@ #include <string.h> #include <sys/time.h> #include <unistd.h> +#include <inttypes.h> static bool debug; static bool run_top; @@ -226,7 +227,8 @@ print_cpu_usage(const char *dom_name, return; } - DEBUG("now_params=%llu then_params=%llu now=%llu then=%llu", + DEBUG("now_params=%" PRIu64 " then_params=%" PRIu64 + " now=%" PRIu64 " then=%" PRIu64, now_params[pos].value.ul, then_params[pos].value.ul, now, then); /* @now_params and @then_params are in nanoseconds, @now and @then are -- 2.20.1

1 0

[libvirt] [PATCH 0/3] introducing QEMU_CAPS_QUERY_CURRENT_MACHINE and QEMU_CAPS_WAKEUP_SUSPEND_SUPPORT
by Daniel Henrique Barboza 02 Apr '19

02 Apr '19

Hi, In this series, I present the Libvirt support for a QEMU API that will be introduced in QEMU 4.0, called 'query-current-machine'. More background info about the API and its purpose can be found in the commit msg of patch 1. Patch 1 contains the caps declarations (a short patch, perhaps squashable with patch 2). Patch 2 enable the QEMU_CAPS_WAKEUP_SUSPEND_SUPPORT cap by querying 'query-current-machine', if the QEMU binary supports it. Patch 3 uses the caps inside qemuDomainPMSuspendForDuration to avoid suspending a domain that can't wake up from suspend. Daniel Henrique Barboza (3): adding QEMU_CAPS_QUERY_CURRENT_MACHINE and QEMU_CAPS_WAKEUP_SUSPEND_SUPPORT setting QEMU_CAPS_WAKEUP_SUSPEND_SUPPORT qemu capability qemuDomainPMSuspendForDuration: check for QEMU_CAPS_WAKEUP_SUSPEND_SUPPORT src/qemu/qemu_capabilities.c | 5 +++++ src/qemu/qemu_capabilities.h | 4 ++++ src/qemu/qemu_driver.c | 24 +++++++++++++++++++++++ src/qemu/qemu_monitor.c | 8 ++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 4 ++++ src/qemu/qemu_process.c | 38 ++++++++++++++++++++++++++++++++++++ 8 files changed, 121 insertions(+) -- 2.20.1

2 6

[libvirt] Can jobs suck like qemu-pr-helper does be transfered to libvirtd?
by Zhangbo (Oscar) 02 Apr '19

02 Apr '19

Hi all: qemu-pr-helper exits to help qemu do the high-privileged scsi related jobs. LIBVIRTD is responsible to launch qemu-pr-helper and qemu, and set selinux/DAC labels for them and their socket. # # # # # ___________ # ___________|libvirtd |__________ # | |___________| | # | | | # | | | # _________|________ _____|______ ___|____ # | qemu-pr-helper |__| vm1.sock |_____| qemu1 | # |__________________| |____________| |________| There may be other jobs quite like qemu-pr-helper, shall we make them as "complex" as the qemu-pr-helper scheme? Will it be OK to just let qemu send an EVENT to libvirtd, and let libvirtd do the SCSI/other jobs? Will it be OK if we remove qemu-pr-helper and similar processes? What's the disadvantage if we let libvirtd do there high privileged jobs instead qemu-pr-helper-like processes? Thanks!

2 6

[libvirt] [PATCH] virsh: cmdConsole: make --domain optional
by Ján Tomko 01 Apr '19

01 Apr '19

In the absence of a domain parameter, console the user instead. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tools/virsh-domain.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index afcd0a5f8d..de41f6312d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -49,6 +49,7 @@ #include "virsh-console.h" #include "virsh-domain-monitor.h" #include "virerror.h" +#include "virrandom.h" #include "virtime.h" #include "virtypedparam.h" #include "virxml.h" @@ -2972,7 +2973,7 @@ static const vshCmdInfo info_console[] = { }; static const vshCmdOptDef opts_console[] = { - VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE), + VIRSH_COMMON_OPT_DOMAIN_OT_STRING_FULL(0, VIR_CONNECT_LIST_DOMAINS_ACTIVE), {.name = "devname", /* sc_prohibit_devname */ .type = VSH_OT_STRING, .help = N_("character device name") @@ -3023,6 +3024,23 @@ cmdRunConsole(vshControl *ctl, virDomainPtr dom, return ret; } +static const char * +constellation_phrases[] = { + "Everything is going to be all right.", + "Things are going to work out in the end.", + "Imagine pleasant nonsense", /* https://www.instagram.com/p/BuRfmkrBigI/ */ + "Ursa Major", + "There, there.", +}; + +static void +cmdConsoleUser(vshControl *ctl) +{ + uint32_t die = virRandomInt(ARRAY_CARDINALITY(constellation_phrases)); + + vshPrintExtra(ctl, "%s", constellation_phrases[die]); +} + static bool cmdConsole(vshControl *ctl, const vshCmd *cmd) { @@ -3033,6 +3051,11 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) unsigned int flags = 0; const char *name = NULL; + if (!vshCommandOptBool(cmd, "domain")) { + cmdConsoleUser(ctl); + return true; + } + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return false; -- 2.20.1

2 1

[libvirt] vcpupin reports bogus vcpu affinities
by Allen, John 01 Apr '19

01 Apr '19

Sent this out to the list a few days ago, but never saw it appear on the archives. Resending--hopefully this makes it to the list. --- For pinned vcpus, vcpupin will report inaccurate affinity values on machines with high core counts (256 cores in my case). The problem is produced as follows: $ virsh vcpupin myguest 0 4 $ virsh vcpupin myguest 0 VCPU CPU Affinity --------------------------- 0 4,192,194,196-197 Running taskset on the qemu threads shows the correct affinity, so this seems to be a reporting problem. Strangely, the value "192" is significant. If I pin a cpu greater than 192, the problem no longer appears. I believe the cause of the problem in my case is that in this case in src/conf/domain_conf.c:virDomainDefGetVcpuPinInfoHelper: ... if (vcpu && vcpu->cpumask) bitmap = vcpu->cpumask; ... vcpu->cpumask is "shortened" in that it is only long enough to contain the last set bit in the mask. However, when we go to copy the mask to the buffer that is returned, we use the masklen passed to the function which is the "full" masklen with a bit for each cpu. So it seems virBitmapToDataBuf copies some extra data past the end of the bitmask. Why the "192" value is always set and I typically see similar bogus bits set is still unknown. What is the function meant to assume in this case? Is it sane to assume that the bitmask is the full length of the buffer here and it's the responsibility of the setter of vcpu->cpumask to provide the length of the bitmap we're expecting? Or should we assume that we may receive a shortened bitmask here and expand the bitmask before copying to the buffer? -John

2 1

[libvirt] [PATCH] virerror: Make error reporting prettier
by Michal Privoznik 01 Apr '19

01 Apr '19

So far, if something goes wrong we print an error message, e.g. like this: virsh # start fedora error: Failed to start domain fedora error: internal error: process exited while connecting to monitor: 2019-04-01T08:08:49.753850Z qemu-system-x86_64: -object memory-backend-memfd,id=ram-node0,hugetlb=yes,hugetlbsize=0,size=8589934592,host-nodes=0,policy=bind: Property 'memory-backend-memfd.hugetlbsize' doesn't take value '0' This is very boring and usually too low level for users to know what is going on or how to fix the problem. Let's reimplement our error reporting then. After this patch the previous error turns into (my favourite): virsh # start fedora error: Failed to start domain fedora error: operation failed: the printer thinks its a router. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 4 +++ src/util/Makefile.inc.am | 2 ++ src/util/virerror.c | 76 ++++++++++++++++++++++++++++++++++------ 3 files changed, 72 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index a73f43c483..387f57f288 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -734,6 +734,7 @@ libvirt_setuid_rpc_client_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(LIBXML_LIBS) \ $(SECDRIVER_LIBS) \ + $(CURL_LIBS) \ $(NULL) libvirt_setuid_rpc_client_la_CFLAGS = \ -DLIBVIRT_SETUID_RPC_CLIENT \ @@ -741,6 +742,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ -I$(srcdir)/rpc \ $(AM_CFLAGS) \ $(SECDRIVER_CFLAGS) \ + $(CURL_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) endif WITH_SETUID_RPC_CLIENT @@ -924,6 +926,7 @@ libvirt_nss_la_CFLAGS = \ -DLIBVIRT_NSS \ $(AM_CFLAGS) \ $(YAJL_CFLAGS) \ + $(CURL_CFLAGS) \ $(NULL) libvirt_nss_la_LDFLAGS = \ $(AM_LDFLAGS) \ @@ -931,6 +934,7 @@ libvirt_nss_la_LDFLAGS = \ libvirt_nss_la_LIBADD = \ $(YAJL_LIBS) \ + $(CURL_LIBS) \ $(NULL) endif WITH_NSS diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index aa5c6cbe03..6852d0105d 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -271,6 +271,7 @@ libvirt_util_la_CFLAGS = \ $(NUMACTL_CFLAGS) \ $(GNUTLS_CFLAGS) \ $(ACL_CFLAGS) \ + $(CURL_CFLAGS) \ $(NULL) libvirt_util_la_LIBADD = \ $(CAPNG_LIBS) \ @@ -287,6 +288,7 @@ libvirt_util_la_LIBADD = \ $(NUMACTL_LIBS) \ $(ACL_LIBS) \ $(GNUTLS_LIBS) \ + $(CURL_LIBS) \ $(NULL) diff --git a/src/util/virerror.c b/src/util/virerror.c index 05e535d859..2687869049 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -21,6 +21,7 @@ #include <config.h> #include <stdarg.h> +#include <curl/curl.h> #include "virerror.h" #include "datatypes.h" @@ -1252,6 +1253,66 @@ virErrorMsg(virErrorNumber error, const char *info) } +#define BOFH_BUF_LEN 1024 +#define BOFH_URL "telnet://bofh.jeffballard.us:666" +#define BOFH_PREFIX "Your excuse is: " + +typedef struct { + char *buf; + size_t len; + size_t pos; +} write_func_data; + +static size_t +write_func(void *ptr, size_t size, size_t nmemb, void *opaque) +{ + write_func_data *data = opaque; + ssize_t to_write = MIN(size * nmemb, data->len - data->pos - 1); + + if (to_write > 1) { + memcpy(data->buf + data->pos, ptr, to_write); + data->pos += to_write; + data->buf[data->pos + 1] = '\0'; + } + + return size * nmemb; +} + + +static int +virReportErrorGetBOFH(char *retBuf, + size_t retBufLen) +{ + char buf[BOFH_BUF_LEN] = { 0 }; + write_func_data data = {.buf = buf, .len = sizeof(buf), .pos = 0 }; + const char *tmp; + CURL *curl; + CURLcode result; + + if (!(curl = curl_easy_init())) + return -1; + + curl_easy_setopt(curl, CURLOPT_URL, BOFH_URL); +#ifdef CURLOPT_MUTE + curl_easy_setopt(curl, CURLOPT_MUTE, 1); +#endif + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_func); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &data); + + result = curl_easy_perform(curl); + curl_easy_cleanup(curl); + if (result != CURLE_OK) + return -1; + + if (!(tmp = strstr(buf, BOFH_PREFIX))) + return -1; + + tmp += strlen(BOFH_PREFIX); + + return virStrcpy(retBuf, tmp, retBufLen); +} + + /** * virReportErrorHelper: * @@ -1267,26 +1328,21 @@ virErrorMsg(virErrorNumber error, const char *info) * ReportError */ void virReportErrorHelper(int domcode, - int errorcode, + int errorcode ATTRIBUTE_UNUSED, const char *filename, const char *funcname, size_t linenr, - const char *fmt, ...) + const char *fmt ATTRIBUTE_UNUSED, + ...) { int save_errno = errno; - va_list args; char errorMessage[VIR_ERROR_MAX_LENGTH]; const char *virerr; - if (fmt) { - va_start(args, fmt); - vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args); - va_end(args); - } else { + if (virReportErrorGetBOFH(errorMessage, sizeof(errorMessage)) < 0) errorMessage[0] = '\0'; - } - virerr = virErrorMsg(errorcode, (errorMessage[0] ? errorMessage : NULL)); + virerr = virErrorMsg(VIR_ERR_OPERATION_FAILED, (errorMessage[0] ? errorMessage : NULL)); virRaiseErrorFull(filename, funcname, linenr, domcode, errorcode, VIR_ERR_ERROR, virerr, errorMessage, NULL, -- 2.19.2

3 3

[libvirt] [PATCH v2] qemu: fix domain unlock/unref in qemuMigrationSrcPerform
by Nikolay Shirokovskiy 01 Apr '19

01 Apr '19

qemuMigrationSrcPerform callers expect it to call virDomainObjEndAPI in any case so on error paths we miss the virDomainObjEndAPI call. To fix this let's make qemuMigrationSrcPerform callers responsible for the virDomainObjEndAPI call. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- diff to v1 [1]: - move virDomainObjEndAPI call to qemuMigrationSrcPerform callers [1] https://www.redhat.com/archives/libvir-list/2019-April/msg00032.html src/qemu/qemu_driver.c | 21 +++++++++------------ src/qemu/qemu_migration.c | 2 -- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 62d8d97..37baa5c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12550,7 +12550,7 @@ qemuDomainMigratePerform(virDomainPtr dom, unsigned long resource) { virQEMUDriverPtr driver = dom->conn->privateData; - virDomainObjPtr vm; + virDomainObjPtr vm = NULL; int ret = -1; const char *dconnuri = NULL; qemuMigrationParamsPtr migParams = NULL; @@ -12571,10 +12571,8 @@ qemuDomainMigratePerform(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - if (virDomainMigratePerformEnsureACL(dom->conn, vm->def) < 0) { - virDomainObjEndAPI(&vm); + if (virDomainMigratePerformEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - } if (flags & VIR_MIGRATE_PEER2PEER) VIR_STEAL_PTR(dconnuri, uri); @@ -12592,6 +12590,7 @@ qemuDomainMigratePerform(virDomainPtr dom, flags, dname, resource, false); cleanup: + virDomainObjEndAPI(&vm); qemuMigrationParamsFree(migParams); return ret; } @@ -12988,7 +12987,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, unsigned long resource) { virQEMUDriverPtr driver = dom->conn->privateData; - virDomainObjPtr vm; + virDomainObjPtr vm = NULL; qemuMigrationParamsPtr migParams = NULL; int ret = -1; @@ -13001,10 +13000,8 @@ qemuDomainMigratePerform3(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - if (virDomainMigratePerform3EnsureACL(dom->conn, vm->def) < 0) { - virDomainObjEndAPI(&vm); + if (virDomainMigratePerform3EnsureACL(dom->conn, vm->def) < 0) goto cleanup; - } ret = qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, @@ -13014,6 +13011,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, flags, dname, resource, true); cleanup: + virDomainObjEndAPI(&vm); qemuMigrationParamsFree(migParams); return ret; } @@ -13030,7 +13028,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, unsigned int flags) { virQEMUDriverPtr driver = dom->conn->privateData; - virDomainObjPtr vm; + virDomainObjPtr vm = NULL; const char *dom_xml = NULL; const char *persist_xml = NULL; const char *dname = NULL; @@ -13088,10 +13086,8 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; - if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) { - virDomainObjEndAPI(&vm); + if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; - } ret = qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persist_xml, dconnuri, uri, graphicsuri, listenAddress, @@ -13100,6 +13096,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, cookiein, cookieinlen, cookieout, cookieoutlen, flags, dname, bandwidth, true); cleanup: + virDomainObjEndAPI(&vm); qemuMigrationParamsFree(migParams); VIR_FREE(migrate_disks); return ret; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 419a729..bb43aff 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4686,7 +4686,6 @@ qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, } cleanup: - virDomainObjEndAPI(&vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); return ret; @@ -4757,7 +4756,6 @@ qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, qemuDomainRemoveInactiveJob(driver, vm); cleanup: - virDomainObjEndAPI(&vm); return ret; } -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/7] extend virsh domstate to show additional information
by Bjoern Walk 01 Apr '19

01 Apr '19

This patch series introduces the ability to save additional information for the domain state and exposes this information in virsh domstate. For example in the case of QEMU guest panic events, we can provide additional information like the crash reason or register state of the domain. This information usually gets logged in the domain log but for debugging it is useful to have it accessible from the client. Therefore, let's introduce a new public API function, virDomainGetStateParams, an extensible version of virDomainGetState, which returns the complete state of the domain, including newly introduced additional information. Let's also extend virsh domstate and introduce a new parameter --info to show the domain state, reason and additional information when available. virsh domstate --info guest1 crashed (panicked: s390: core='1' psw-mask='0x1234000000000000' \ psw-addr='0x0000000000001234' reason='disabled-wait') Previous version is here: https://www.redhat.com/archives/libvir-list/2018-July/msg00686.html v1 -> v2: * refactored the public API according to discussions to provide a more machine-parsable interface Bjoern Walk (7): qemu: monitor: move event data structure to domain qemu: domain: store and update panic info lib: introduce virDomainGetStateParams function remote: implement remoteDomainGetStateParams qemu: implement qemuDomainGetStateParams virsh: domstate: report detailed state if available news: add entry for virDomainGetStateParams docs/news.xml | 11 +++ include/libvirt/libvirt-domain.h | 76 +++++++++++++++++ src/driver-hypervisor.h | 9 ++ src/libvirt-domain.c | 64 ++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_domain.c | 89 +++++++++++++++++++- src/qemu/qemu_domain.h | 47 +++++++++++ src/qemu/qemu_driver.c | 126 +++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 53 +----------- src/qemu/qemu_monitor.h | 48 ++--------- src/qemu/qemu_monitor_json.c | 20 ++--- src/qemu/qemu_process.c | 2 +- src/remote/remote_daemon_dispatch.c | 50 +++++++++++ src/remote/remote_driver.c | 44 ++++++++++ src/remote/remote_protocol.x | 22 ++++- src/remote_protocol-structs | 12 +++ tools/virsh-domain-monitor.c | 102 +++++++++++++++++++--- tools/virsh.pod | 5 +- 18 files changed, 658 insertions(+), 123 deletions(-) -- 2.17.0

2 21