- Devel - libvirt List Archives

[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

[libvirt] [RFC PATCH 0/8] Introduce the virDomainDefineJSONFlags() public API
by Andrea Bolognani 01 Apr '19

01 Apr '19

Back in 2005, when the libvirt project was started, XML was pretty much the only sensible, widely used format one could use to store structured data. A lot has changed since then, and these days you'd be hard pressed to find any API that does not use JSON for encoding information; in fact, we already use JSON heavily inside libvirt, for example to communicate with QEMU processes through QMP or store configuration data for use by the libvirt NSS plugin. The reasons for JSON's success over XML are plain to see: you get the same nicely structured data, but none of the ugly angle brackets or annoying repetition caused by having to both open *and* close elements explicitly; additionally, you get support for extremely useful and common data structures such as lists and dictionary out of the box, and even properly typed strings and numbers. It's just an overall much better data representation language. This RFC series provides the initial, very basic (yet fully functional) implementation of a JSON-based alternative to the existing virDomainDefineXML(); over time, we would introduce similar APIs for defining libvirt objects other than domains, such as for example networks. Once enough time has passed, we might even consider removing the XML-based APIs altogether and drop the XML parsing code along with our libxml2 dependency, making libvirt much leaner in the process. Andrea Bolognani (8): conf: Introduce virDomainDefParseJSONString() tests: Add qemujson2argvtest rpc: Add JSON to the list of fixups in gendispatch Introduce the virDomainDefineJSONFlags() public API remote: Implement virDomainDefineJSONFlags() support qemu: Add virDomainDefineJSONFlags() support virsh: Add JSON support to the 'define' subcommand news: Update for virDomainDefineJSONFlags() docs/news.xml | 11 + include/libvirt/libvirt-domain.h | 3 + include/libvirt/virterror.h | 1 + src/conf/domain_conf.c | 241 ++++ src/conf/domain_conf.h | 5 + src/driver-hypervisor.h | 6 + src/libvirt-domain.c | 45 + src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 84 ++ src/remote/remote_driver.c | 3 +- src/remote/remote_protocol.x | 19 +- src/remote_protocol-structs | 8 + src/rpc/gendispatch.pl | 1 + src/util/virerror.c | 3 + tests/Makefile.am | 15 + tests/qemujson2argvdata/tiny.json | 29 + .../qemujson2argvdata/tiny.x86_64-latest.args | 33 + tests/qemujson2argvtest.c | 1001 +++++++++++++++++ tools/virsh-domain.c | 36 +- 20 files changed, 1540 insertions(+), 6 deletions(-) create mode 100644 tests/qemujson2argvdata/tiny.json create mode 100644 tests/qemujson2argvdata/tiny.x86_64-latest.args create mode 100644 tests/qemujson2argvtest.c -- 2.20.1

1 8

[libvirt] [PATCH] 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. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/qemu/qemu_migration.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 419a729..ce4c443 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4799,6 +4799,7 @@ qemuMigrationSrcPerform(virQEMUDriverPtr driver, if (cookieinlen) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("received unexpected cookie with P2P migration")); + virDomainObjEndAPI(&vm); return -1; } @@ -4813,6 +4814,7 @@ qemuMigrationSrcPerform(virQEMUDriverPtr driver, if (dconnuri) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected dconnuri parameter with non-peer2peer migration")); + virDomainObjEndAPI(&vm); return -1; } -- 1.8.3.1

3 2

[libvirt] [PATCH] apparmor: support QEMU hppa, nios2, or1k, riscv32 and riscv64
by intrigeri+libvirt＠boum.org 01 Apr '19

01 Apr '19

From: intrigeri <intrigeri+libvirt(a)boum.org> Fixes: https://bugs.debian.org/914940 --- src/security/apparmor/libvirt-qemu | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/security/apparmor/libvirt-qemu b/src/security/apparmor/libvirt-qemu index 474aaefdf8..165558fe83 100644 --- a/src/security/apparmor/libvirt-qemu +++ b/src/security/apparmor/libvirt-qemu @@ -103,6 +103,7 @@ /usr/bin/qemu-system-alpha rmix, /usr/bin/qemu-system-arm rmix, /usr/bin/qemu-system-cris rmix, + /usr/bin/qemu-system-hppa rmix, /usr/bin/qemu-system-i386 rmix, /usr/bin/qemu-system-lm32 rmix, /usr/bin/qemu-system-m68k rmix, @@ -113,10 +114,14 @@ /usr/bin/qemu-system-mips64el rmix, /usr/bin/qemu-system-mipsel rmix, /usr/bin/qemu-system-moxie rmix, + /usr/bin/qemu-system-nios2 rmix, + /usr/bin/qemu-system-or1k rmix, /usr/bin/qemu-system-or32 rmix, /usr/bin/qemu-system-ppc rmix, /usr/bin/qemu-system-ppc64 rmix, /usr/bin/qemu-system-ppcemb rmix, + /usr/bin/qemu-system-riscv32 rmix, + /usr/bin/qemu-system-riscv64 rmix, /usr/bin/qemu-system-s390x rmix, /usr/bin/qemu-system-sh4 rmix, /usr/bin/qemu-system-sh4eb rmix, -- 2.20.1

3 7

[libvirt] [PATCH v2 0/4] apps: update the listed libvirt apps
by Daniel P. Berrangé 31 Mar '19

31 Mar '19

Purge apps that are dead and fix broken links Daniel P. Berrangé (4): apps: remove dead archipel project apps: update link for buildbot apps: drop link for zenoss software apps: remove VM Manager android app docs/apps.html.in | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) -- 2.20.1

2 5

[libvirt] Entering freeze for libvirt-5.2.0
by Daniel Veillard 31 Mar '19

31 Mar '19

I'm a bit late but the Candidate Release 1 is tagged in git and I have pushed the signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ This seems to be working in my limited testing, the CI is mostly green https://ci.centos.org/view/libvirt/ except for a few side things, so with a bit of luck that will work well. I may push the RC2 saturday morning, and then if everything looks good we can have the release on Tuesday. In the meantime, give it a try, especially on different platforms or OSes, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] [PATCH] news: Update for 5.2.0 release
by Andrea Bolognani 30 Mar '19

30 Mar '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/news.xml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 2067830848..fcf8520132 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -148,8 +148,45 @@ tables are not required. </description> </change> + <change> + <summary> + Don't default to building the QEMU driver + </summary> + <description> + Historically, the QEMU driver has been special in that it was + enabled by default, with the option to explicitly opt-out of it; + starting now, we're enabling it opportunistically if we detect that + all requirements are available, just like we do with other drivers. + </description> + </change> </section> <section title="Bug fixes"> + <change> + <summary> + virt-host-validate: Fix IOMMU check on s390x + </summary> + </change> + <change> + <summary> + qemu: Allow creating pSeries guests with graphics and no USB mouse + </summary> + <description> + It's now possible to prevent libvirt from automatically adding a + USB mouse to pSeries guests by including a USB tablet in the input + XML: doing so is desiderable as using a tablet results in a much + better user experience when working with GUIs. + </description> + </change> + <change> + <summary> + qemu: Set $HOME and XGD variables for qemu:///system guests + </summary> + <description> + This avoids files being accidentally created under <code>/</code> or + the guests not being able to start because they lack the necessary + permissions to write to that location. + </description> + </change> </section> </release> <release version="v5.1.0" date="2019-03-04"> -- 2.20.1

2 1

[libvirt] [PATCH 0/4] apps: update the listed libvirt apps
by Daniel P. Berrangé 29 Mar '19

29 Mar '19

Purge apps that are dead and fix broken links Daniel P. Berrangé (4): apps: remove dead archipel project apps: update link for buildbot apps: update link for zenoss software apps: remove VM Manager android app docs/apps.html.in | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) -- 2.20.1

2 10