- Devel - libvirt List Archives

[libvirt] [PATCH 0/5] esx: implement virConnectListAllStoragePools
by Pino Toscano 15 Nov '19

15 Nov '19

Make the virConnectListAllStoragePools API work for esx storage pools by implementing the internal connectListAllStoragePools storage API. Pino Toscano (5): esx: split datastoreToStoragePoolPtr helper esx: split datastorePoolType helper esx: split targetToStoragePool helper esx: implement connectListAllStoragePools docs: document virConnectListAllStoragePools in esx docs/news.xml | 9 ++ src/esx/esx_storage_backend_iscsi.c | 104 +++++++++++++-- src/esx/esx_storage_backend_vmfs.c | 192 +++++++++++++++++++++++----- src/esx/esx_storage_driver.c | 68 ++++++++++ 4 files changed, 332 insertions(+), 41 deletions(-) -- 2.21.0

1 6

[libvirt] [PATCH] tests: Mock access to /dev/kvm
by Michal Privoznik 15 Nov '19

15 Nov '19

Some of our tests try to validate domain XMLs they are working with (not intentionally, simply because they call top level domain XML parse function). Anyway, this implies that we build domain capabilities also - see virQEMUDriverGetDomainCapabilities(). And since some domain XMLs are type of 'kvm' the control gets through virQEMUCapsFillDomainCaps() and virHostCPUGetKVMMaxVCPUs() to opening /dev/kvm which may be missing on the machine we're running 'make check'. Previously, we did not see this issue, because it was masked. If building domain capabilities failed for whatever reason, we ignored the failure. Only v5.9.0-207-gc69e6edea3 uncovered the problem (it changed reval from 0 to -1 if virQEMUDriverGetDomainCapabilities() fails). Since the referenced commit is correct, we need to mock access to /dev/kvm in our tests. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under broken build rule. tests/qemuhotplugtest.c | 1 + tests/qemumemlocktest.c | 4 +++- tests/qemusecuritytest.c | 3 ++- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + tests/securityselinuxlabeltest.c | 4 +++- 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index a914a8a8b5..7d70113b6e 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -878,5 +878,6 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virprocess"), VIR_TEST_MOCK("qemuhotplug")); diff --git a/tests/qemumemlocktest.c b/tests/qemumemlocktest.c index 52cd9f9f26..ef3bfa0345 100644 --- a/tests/qemumemlocktest.c +++ b/tests/qemumemlocktest.c @@ -151,7 +151,9 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci")) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virpci"), + VIR_TEST_MOCK("domaincaps")) #else diff --git a/tests/qemusecuritytest.c b/tests/qemusecuritytest.c index 685ac4dca2..8c0a48bb65 100644 --- a/tests/qemusecuritytest.c +++ b/tests/qemusecuritytest.c @@ -217,4 +217,5 @@ mymain(void) return ret; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("domaincaps")) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9bb186ed95..3d42cabdb8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3033,6 +3033,7 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("qemuxml2argv"), + VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virrandom"), VIR_TEST_MOCK("qemucpu"), VIR_TEST_MOCK("virpci")) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 757e0a33e1..1dfa834f6b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1355,6 +1355,7 @@ mymain(void) VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virpci"), VIR_TEST_MOCK("virrandom"), + VIR_TEST_MOCK("domaincaps"), VIR_TEST_MOCK("virdeterministichash")) #else diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c index 741c39d4d1..cbc7018e27 100644 --- a/tests/securityselinuxlabeltest.c +++ b/tests/securityselinuxlabeltest.c @@ -371,4 +371,6 @@ mymain(void) return (ret == 0) ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/libsecurityselinuxhelper.so") +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("domaincaps"), + abs_builddir "/.libs/libsecurityselinuxhelper.so") -- 2.23.0

1 0

[libvirt] [PATCH] virsh: Fix typo in the man page
by Jiri Denemark 15 Nov '19

15 Nov '19

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as trivial. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index c261d403d8..2dce4493cb 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1827,7 +1827,7 @@ agent commands block forever waiting for a response. B<value> must be a positive value (wait for given amount of seconds) or one of the following values: - -2 - block forever waiting for a resuly, + -2 - block forever waiting for a result, -1 - reset timeout to the default value, 0 - do not wait at all, -- 2.24.0

1 0

[libvirt] [PATCH v3 0/9] Enable ramfb parameter for mediated devices
by Jonathon Jongsma 14 Nov '19

14 Nov '19

This is the third version of a patch series that adds support for a boot display for mediated vgpu devices using the 'ramfb' parameter. This version fixes a bunch of test failures that I had inadvertently introduced in the last series. It also splits the 4th patch up into several separate patches as suggested by Cole to make things more readable. Jonathon Jongsma (9): qemu: fix domain device validation qemu: use g_autoptr in qemuDomainDeviceDefValidate() qemu: Set capabilities properly for tests qemu: set domain capability for ramfb device qemu: set domain capability for video type "none" qemu: validate vhost-user video backend in qemu_domain.c qemu: move validation of video accel to qemu_domain.c qemu: use domain caps to validate video device model qemu: add 'ramfb' attribute for mediated devices docs/formatdomain.html.in | 8 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_capabilities.c | 17 +++- src/conf/domain_conf.c | 11 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_command.c | 17 +++- src/qemu/qemu_domain.c | 61 ++++++------- src/qemu/qemu_process.c | 61 ------------- .../qemu_1.7.0.x86_64.xml | 1 + .../qemu_2.12.0-virt.aarch64.xml | 1 + .../qemu_2.12.0.ppc64.xml | 1 + .../qemu_2.12.0.s390x.xml | 1 + .../qemu_2.12.0.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + .../qemu_2.6.0.aarch64.xml | 1 + .../domaincapsschemadata/qemu_2.6.0.ppc64.xml | 1 + .../qemu_2.6.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.7.0.s390x.xml | 1 + .../qemu_2.8.0-tcg.x86_64.xml | 1 + .../domaincapsschemadata/qemu_2.8.0.s390x.xml | 1 + .../qemu_2.8.0.x86_64.xml | 1 + .../qemu_2.9.0-q35.x86_64.xml | 1 + .../qemu_2.9.0-tcg.x86_64.xml | 1 + .../qemu_2.9.0.x86_64.xml | 1 + .../domaincapsschemadata/qemu_3.0.0.s390x.xml | 2 + .../qemu_3.1.0.x86_64.xml | 2 + .../domaincapsschemadata/qemu_4.0.0.s390x.xml | 1 + .../qemu_4.0.0.x86_64.xml | 2 + .../qemu_4.1.0.x86_64.xml | 2 + .../qemu_4.2.0.aarch64.xml | 2 + .../domaincapsschemadata/qemu_4.2.0.ppc64.xml | 1 + .../qemu_4.2.0.x86_64.xml | 2 + tests/qemuhotplugtest.c | 3 + ...tdev-mdev-display-ramfb.x86_64-latest.args | 37 ++++++++ .../hostdev-mdev-display-ramfb.xml | 33 +++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 89 +++++++++++-------- tests/securityselinuxlabeltest.c | 9 ++ 39 files changed, 254 insertions(+), 133 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.xml -- 2.21.0

2 11

[libvirt] [PATCH v3] Add API to change qemu agent response timeout
by Jonathon Jongsma 14 Nov '19

14 Nov '19

Some layered products such as oVirt have requested a way to avoid being blocked by guest agent commands when querying a loaded vm. For example, many guest agent commands are polled periodically to monitor changes, and rather than blocking the calling process, they'd prefer to simply time out when an agent query is taking too long. This patch adds a way for the user to specify a custom agent timeout that is applied to all agent commands. One special case to note here is the 'guest-sync' command. 'guest-sync' is issued internally prior to calling any other command. (For example, when libvirt wants to call 'guest-get-fsinfo', we first call 'guest-sync' and then call 'guest-get-fsinfo'). Previously, the 'guest-sync' command used a 5-second timeout (VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT), whereas the actual command that followed always blocked indefinitely (VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK). As part of this patch, if a custom timeout is specified that is shorter than 5 seconds, this new timeout is also used for 'guest-sync'. If there is no custom timeout or if the custom timeout is longer than 5 seconds, we will continue to use the 5-second timeout. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- Changes in v3: - Changed enum names per Daniel's suggestion - incorporated Michal's review and fixup patches - As discussed on the mailing list, this patch does not acquire any jobs, but simply uses mutex locking for data integrity - libvirt release versions updated - format and parse private agentTimeout data in status xml include/libvirt/libvirt-domain.h | 10 +++ include/libvirt/libvirt-qemu.h | 8 +-- src/driver-hypervisor.h | 6 ++ src/libvirt-domain.c | 49 +++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 70 ++++++++++--------- src/qemu/qemu_agent.h | 3 + src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 47 +++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 ++++- src/remote_protocol-structs | 9 +++ .../blockjob-blockdev-in.xml | 1 + .../blockjob-mirror-in.xml | 1 + .../disk-secinfo-upgrade-out.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + tools/virsh-domain.c | 52 ++++++++++++++ 23 files changed, 257 insertions(+), 37 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 22277b0a84..a2f007568c 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4916,4 +4916,14 @@ int virDomainGetGuestInfo(virDomainPtr domain, int *nparams, unsigned int flags); +typedef enum { + VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK = -2, + VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_DEFAULT = -1, + VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_NOWAIT = 0, +} virDomainAgentResponseTimeoutValues; + +int virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags); + #endif /* LIBVIRT_DOMAIN_H */ diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 891617443f..0cc2872821 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -43,10 +43,10 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int flags); typedef enum { - VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = -1, - VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0, + VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_DEFAULT, + VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_NOWAIT, VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN = 60, } virDomainQemuAgentCommandTimeoutValues; diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 015b2cd01c..4afd8f6ec5 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1372,6 +1372,11 @@ typedef int int *nparams, unsigned int flags); +typedef int +(*virDrvDomainAgentSetResponseTimeout)(virDomainPtr domain, + int timeout, + unsigned int flags); + typedef struct _virHypervisorDriver virHypervisorDriver; typedef virHypervisorDriver *virHypervisorDriverPtr; @@ -1632,4 +1637,5 @@ struct _virHypervisorDriver { virDrvDomainCheckpointGetParent domainCheckpointGetParent; virDrvDomainCheckpointDelete domainCheckpointDelete; virDrvDomainGetGuestInfo domainGetGuestInfo; + virDrvDomainAgentSetResponseTimeout domainAgentSetResponseTimeout; }; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index dcab179e6e..02622cb2ca 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12497,3 +12497,52 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + + +/** + * virDomainAgentSetResponseTimeout: + * @domain: a domain object + * @timeout: timeout in seconds + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Set how long to wait for a response from guest agent commands. By default, + * agent commands block forever waiting for a response. + * + * @timeout must be a value from virDomainAgentCommandTimeoutValues or + * positive: + * + * VIR_DOMAIN_AGENT_COMMAND_TIMEOUT_BLOCK(-2): meaning to block forever + * waiting for a result. + * VIR_DOMAIN_AGENT_COMMAND_TIMEOUT_DEFAULT(-1): use default timeout value. + * VIR_DOMAIN_AGENT_COMMAND_TIMEOUT_NOWAIT(0): does not wait. + * positive value: wait for @timeout seconds + * + * Returns 0 on success, -1 on failure + */ +int +virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(domain, "timeout=%i, flags=0x%x", + timeout, flags); + + virResetLastError(); + + virCheckDomainReturn(domain, -1); + conn = domain->conn; + + if (conn->driver->domainAgentSetResponseTimeout) { + if (conn->driver->domainAgentSetResponseTimeout(domain, timeout, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + + error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index f88a77892f..c92f083758 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -862,4 +862,9 @@ LIBVIRT_5.8.0 { virConnectSetIdentity; } LIBVIRT_5.7.0; +LIBVIRT_5.10.0 { + global: + virDomainAgentSetResponseTimeout; +} LIBVIRT_5.8.0; + # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5a50f7f3be..7905a74f90 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -30,6 +30,7 @@ #include <sys/time.h> #include "qemu_agent.h" +#include "qemu_domain.h" #include "viralloc.h" #include "virlog.h" #include "virerror.h" @@ -127,6 +128,7 @@ struct _qemuAgent { * but fire up an event on qemu monitor instead. * Take that as indication of successful completion */ qemuAgentEvent await_event; + int timeout; }; static virClassPtr qemuAgentClass; @@ -695,6 +697,7 @@ qemuAgentOpen(virDomainObjPtr vm, if (!(mon = virObjectLockableNew(qemuAgentClass))) return NULL; + mon->timeout = QEMU_DOMAIN_PRIVATE(vm)->agentTimeout; mon->fd = -1; if (virCondInit(&mon->notify) < 0) { virReportSystemError(errno, "%s", @@ -907,6 +910,12 @@ qemuAgentGuestSync(qemuAgentPtr mon) int send_ret; unsigned long long id; qemuAgentMessage sync_msg; + int timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; + + /* if user specified a custom agent timeout that is lower than the + * default timeout, use the shorter timeout instead */ + if ((mon->timeout >= 0) && (mon->timeout < timeout)) + timeout = mon->timeout; memset(&sync_msg, 0, sizeof(sync_msg)); /* set only on first sync */ @@ -925,8 +934,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) VIR_DEBUG("Sending guest-sync command with ID: %llu", id); - send_ret = qemuAgentSend(mon, &sync_msg, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT); + send_ret = qemuAgentSend(mon, &sync_msg, timeout); VIR_DEBUG("qemuAgentSend returned: %d", send_ret); @@ -1301,8 +1309,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon, const char **mountpoints, if (!cmd) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1339,8 +1346,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1377,8 +1383,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1434,8 +1439,7 @@ qemuAgentFSTrim(qemuAgentPtr mon, if (!cmd) return ret; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1456,8 +1460,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { @@ -1572,8 +1575,7 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; /* All negative values are invalid. Return of 0 is bogus since we wouldn't @@ -1728,8 +1730,7 @@ qemuAgentGetHostname(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -1773,8 +1774,7 @@ qemuAgentGetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberUlong(reply, "return", &json_time) < 0) { @@ -1839,8 +1839,7 @@ qemuAgentSetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2043,8 +2042,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -2333,8 +2331,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(ret_array = virJSONValueObjectGet(reply, "return"))) { @@ -2511,8 +2508,7 @@ qemuAgentSetUserPassword(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2543,8 +2539,7 @@ qemuAgentGetUsers(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-users", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2633,8 +2628,7 @@ qemuAgentGetOSInfo(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-osinfo", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2689,8 +2683,7 @@ qemuAgentGetTimezone(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-timezone", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2719,3 +2712,16 @@ qemuAgentGetTimezone(qemuAgentPtr mon, return 0; } + +/* qemuAgentSetResponseTimeout: + * mon: agent monitor + * timeout: number of seconds to wait for agent response + * + * The agent object must be locked prior to calling this function. + */ +void +qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout) +{ + mon->timeout = timeout; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 78e648992a..85e436cf68 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -140,3 +140,6 @@ int qemuAgentGetTimezone(qemuAgentPtr mon, virTypedParameterPtr *params, int *nparams, int *maxparams); + +void qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 54dde34f15..86358341d5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2093,6 +2093,8 @@ qemuDomainObjPrivateAlloc(void *opaque) if (!(priv->dbusVMStates = virHashCreate(5, dbusVMStateHashFree))) goto error; + /* agent commands block by default, user can choose different behavior */ + priv->agentTimeout = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK; priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX; priv->driver = opaque; @@ -2875,6 +2877,8 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf, if (qemuDomainObjPrivateXMLFormatSlirp(buf, vm) < 0) return -1; + virBufferAsprintf(buf, "<agentTimeout>%i</agentTimeout>\n", priv->agentTimeout); + return 0; } @@ -3672,6 +3676,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, priv->memPrealloc = virXPathBoolean("boolean(./memPrealloc)", ctxt) == 1; + virXPathInt("string(./agentTimeout)", ctxt, &priv->agentTimeout); + return 0; error: diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index ab00b25789..98a9540275 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -293,6 +293,7 @@ struct _qemuDomainObjPrivate { virDomainChrSourceDefPtr monConfig; bool monError; unsigned long long monStart; + int agentTimeout; qemuAgentPtr agent; bool agentError; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c969a3d463..77a26ccf2e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -22666,6 +22666,52 @@ qemuDomainGetGuestInfo(virDomainPtr dom, return ret; } + +static int +qemuDomainAgentSetResponseTimeout(virDomainPtr dom, + int timeout, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) { + virReportError(VIR_ERR_INVALID_ARG, + _("guest agent timeout '%d' is " + "less than the minimum '%d'"), + timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN); + return -1; + } + + if (!(vm = qemuDomainObjFromDomain(dom))) + return -1; + + if (virDomainAgentSetResponseTimeoutEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + /* If domain has an agent, change its timeout. Otherwise just save the + * request so that we can set the timeout when the agent appears */ + if (qemuDomainAgentAvailable(vm, false)) { + /* We don't need to acquire a job since we're not interacting with the + * agent or the qemu monitor. We're only setting a struct member, so + * just acquire the mutex lock. Worst case, any in-process agent + * commands will use the newly-set agent timeout. */ + virObjectLock(QEMU_DOMAIN_PRIVATE(vm)->agent); + qemuAgentSetResponseTimeout(QEMU_DOMAIN_PRIVATE(vm)->agent, timeout); + virObjectUnlock(QEMU_DOMAIN_PRIVATE(vm)->agent); + } + + QEMU_DOMAIN_PRIVATE(vm)->agentTimeout = timeout; + ret = 0; + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static virHypervisorDriver qemuHypervisorDriver = { .name = QEMU_DRIVER_NAME, .connectURIProbe = qemuConnectURIProbe, @@ -22902,6 +22948,7 @@ static virHypervisorDriver qemuHypervisorDriver = { .domainCheckpointGetParent = qemuDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = qemuDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = qemuDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = qemuDomainAgentSetResponseTimeout, /* 5.10.0 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 503f49a902..a1384fc655 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8701,6 +8701,7 @@ static virHypervisorDriver hypervisor_driver = { .domainCheckpointGetParent = remoteDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = remoteDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = remoteDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = remoteDomainAgentSetResponseTimeout, /* 5.10.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f4e3392212..23e42d17b1 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3744,6 +3744,16 @@ struct remote_connect_set_identity_args { unsigned int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + unsigned int flags; +}; + +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -6617,5 +6627,11 @@ enum remote_procedure { * @generate: client * @acl: connect:write */ - REMOTE_PROC_CONNECT_SET_IDENTITY = 419 + REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + + /** + * @generate: both + * @acl: domain:write + */ + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 51606e7473..9ad7a857e0 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -3114,6 +3114,14 @@ struct remote_connect_set_identity_args { } params; u_int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + u_int flags; +}; +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3534,4 +3542,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE = 417, REMOTE_PROC_DOMAIN_GET_GUEST_INFO = 418, REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420, }; diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml index e9031b7087..4f6930001e 100644 --- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml @@ -338,6 +338,7 @@ </chains> </blockjob> </blockjobs> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='4'> <name>copy</name> <uuid>0439a4a8-db56-4933-9183-d8681d7b0746</uuid> diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml index 0fba3b69e7..abd9f62965 100644 --- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml +++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml @@ -23,6 +23,7 @@ <channelTargetDir path='/tmp/channel'/> <allowReboot value='yes'/> <blockjobs active='yes'/> + <agentTimeout>-2</agentTimeout> <domain type='qemu' id='1'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> diff --git a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml index 3d5e8f1438..5d3287606f 100644 --- a/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml +++ b/tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml @@ -258,6 +258,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='1'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index 80cc4b4666..fdc2d39173 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -257,6 +257,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='1'> <name>nest</name> <uuid>994cee0d-2a70-4937-9693-0431e39d20f7</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml index 455c30be85..304fb1b77f 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -260,6 +260,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='4'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml index 409e97a918..d69796e029 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml @@ -289,6 +289,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='3'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index 4a660281d2..1956eac120 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -271,6 +271,7 @@ <chardevStdioLogd/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='7'> <name>nest</name> <uuid>994cee0d-2a70-4937-9693-0431e39d20f7</uuid> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index 2125b899f4..8a2718293f 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -261,6 +261,7 @@ <allowReboot value='yes'/> <nodename index='123'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm' id='1'> <name>upstream</name> <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid> diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml index b8ec650714..11ec74ecf8 100644 --- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml +++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml @@ -309,6 +309,7 @@ <channelTargetDir path='/tmp/channel'/> <allowReboot value='yes'/> <blockjobs active='no'/> + <agentTimeout>-2</agentTimeout> <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0feb21ef17..def4107d27 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9832,6 +9832,52 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) return ret; } +/* + * "guest-agent-timeout" command + */ +static const vshCmdInfo info_guest_agent_timeout[] = { + {.name = "help", + .data = N_("Set the guest agent timeout") + }, + {.name = "desc", + .data = N_("Set the number of seconds to wait for a response from the guest agent.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_guest_agent_timeout[] = { + VIRSH_COMMON_OPT_DOMAIN_FULL(0), + {.name = "timeout", + .type = VSH_OT_INT, + .flags = VSH_OFLAG_REQ_OPT, + .help = N_("timeout seconds.") + }, + {.name = NULL} +}; + +static bool +cmdGuestAgentTimeout(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + int timeout; + const unsigned int flags = 0; + bool ret = false; + + dom = virshCommandOptDomain(ctl, cmd, NULL); + if (dom == NULL) + goto cleanup; + + if (vshCommandOptInt(ctl, cmd, "timeout", &timeout) < 0) + goto cleanup; + + if (virDomainAgentSetResponseTimeout(dom, timeout, flags) < 0) + goto cleanup; + + ret = true; + cleanup: + virshDomainFree(dom); + return ret; +} /* * "lxc-enter-namespace" namespace @@ -14492,6 +14538,12 @@ const vshCmdDef domManagementCmds[] = { .info = info_qemu_agent_command, .flags = 0 }, + {.name = "guest-agent-timeout", + .handler = cmdGuestAgentTimeout, + .opts = opts_guest_agent_timeout, + .info = info_guest_agent_timeout, + .flags = 0 + }, {.name = "reboot", .handler = cmdReboot, .opts = opts_reboot, -- 2.21.0

2 1

[libvirt] [PATCH 0/3] Prefer g_mkstemp_full and g_mkdtemp (glib chronicles)
by Ján Tomko 14 Nov '19

14 Nov '19

Remove the dependency on three more gnulib modules: mkdtemp mkostemp mkostemps Note: this series is not affiliated with the kill-a-gnulib-module-a-day initiative Ján Tomko (3): Use g_mkstemp_full instead of mkostemp(s) Use g_mkdtemp instead of mkdtemp syntax-check: prefer g_mkstemp_full and g_mkdtemp build-aux/syntax-check.mk | 13 ++++++++++--- src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_process.c | 2 +- src/storage/storage_driver.c | 2 +- src/storage/storage_util.c | 2 +- src/util/virlog.c | 8 +------- src/vbox/vbox_common.c | 4 ++-- tests/fdstreamtest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemuxml2argvtest.c | 2 +- tests/qemuxml2xmltest.c | 2 +- tests/scsihosttest.c | 2 +- tests/testutilsqemu.c | 4 ++-- tests/vircgrouptest.c | 2 +- tests/virfiletest.c | 2 +- tests/virhostdevtest.c | 2 +- tests/virnetsockettest.c | 4 ++-- tests/virpcitest.c | 2 +- tests/virscsitest.c | 2 +- tools/vsh.c | 4 ++-- 22 files changed, 38 insertions(+), 37 deletions(-) -- 2.21.0

2 7

[libvirt] [PATCH v2 0/4] replace snprintf by g_snprintf (kill-a-gnulib-module-a-day initiative)
by Pavel Hrdina 14 Nov '19

14 Nov '19

3 8

[libvirt] [PATCH 00/12] Use GRegex instead of regcomp (glib chronicles)
by Ján Tomko 14 Nov '19

14 Nov '19

This removes the need to use gnulib's regex module. Ján Tomko (12): libxl: do not use G_REGEX_EXTENDED remove unused regex.h includes libxl: use GRegex in libxlGetAutoballoonConf libxl: use g_autofree in xenParseSxprVifRate libxl: use GRegex in xenParseSxprVifRate libxl: remove 'ret' from xenParseSxprVifRate storage: use GRegex virStorageBackendLogicalParseVolExtents util: use GRegex in virCommandRunRegex util: use GRegex for virLogRegex util: use GRegex in virStringSearch util: use GRegex in virStringMatch tests: use GRegex in vboxsnapshotxmltest src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_conf.c | 20 ++++------ src/libxl/libxl_driver.c | 1 - src/libxl/xen_common.c | 33 ++++++----------- src/storage/storage_backend_logical.c | 49 +++++++------------------ src/storage/storage_util.c | 1 - src/util/vircommand.c | 37 +++++++------------ src/util/viriscsi.c | 2 - src/util/virlog.c | 15 +++----- src/util/virnetdevtap.c | 1 - src/util/virstring.c | 53 +++++++++++---------------- tests/testutils.c | 1 - tests/vboxsnapshotxmltest.c | 20 ++++------ 13 files changed, 80 insertions(+), 155 deletions(-) -- 2.21.0

2 26

[libvirt] [tck PATCH 0/3] A couple of fixes for daemon hooks tests assuming system V only
by Erik Skultety 14 Nov '19

14 Nov '19

Erik Skultety (3): hooks: Add systemd detection hooks: Refresh the service status after performing an action hooks: Use internal variable holding the state of the libvirtd service lib/Sys/Virt/TCK/Hooks.pm | 26 +++++++++++++++++++++++--- scripts/hooks/051-daemon-hook.t | 8 ++++---- 2 files changed, 27 insertions(+), 7 deletions(-) -- 2.23.0

2 6

[libvirt] [PATCH v2 0/2] a few cleanups in qemu_hotplug.c
by Daniel Henrique Barboza 14 Nov '19

14 Nov '19

There is not much to do regarding cleanup and g_auto* in this file. Here's a couple of simple fixes I've found. changes from v1: - added a new patch to remove unused cleanup labels v1: https://www.redhat.com/archives/libvir-list/2019-September/msg01463.html Daniel Henrique Barboza (2): qemu_hotplug.c: use g_autoptr() with virConnectPtr qemu_process: remove unused cleanup labels src/qemu/qemu_hotplug.c | 72 +++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 43 deletions(-) -- 2.21.0

2 3

[libvirt] [PATCH v3 0/6] Fix virConnectRegisterCloseCallback and get rid of global variables
by Marc Hartmayer 14 Nov '19

14 Nov '19

After discussions with Peter and Pavel at the KVM forum, I am now sending a v3 of this series after more than a year... sorry for that long delay! The second patch of this patch series fixes the behavior of virConnectRegisterCloseCallback. The subsequent patches remove the need to have the global variables 'qemuProgram' and 'remoteProgram' in libvirtd.[ch]. They only work in combination with the fixed behavior of virConnectRegisterCloseCallback. Changelog: + v2->v3: - Rebased to current master - Added Johns r-b to the first patch, all other r-b's I have dropped as there were to many changes in the meantime - Removed accepted patches - Dropped patches 8 and 9 + v1->v2: - Removed accepted patches - Removed NACKed patches - Added r-b to patch 5 - Worked in comments - Rebased - Added patches 7-9 Marc Hartmayer (6): rpc: use the return value of virObjectRef directly virConnectRegisterCloseCallback: Cleanup 'opaque' if there is no connectRegisterCloseCallback remote: Save reference to program in daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote/rpc: Use virNetServerGetProgram() to determine the program src/libvirt-host.c | 12 +- src/libvirt_remote.syms | 1 + src/remote/remote_daemon.c | 4 +- src/remote/remote_daemon.h | 2 - src/remote/remote_daemon_dispatch.c | 227 +++++++++++++++++++--------- src/rpc/gendispatch.pl | 6 + src/rpc/virnetserver.c | 53 +++++-- src/rpc/virnetserver.h | 2 + 8 files changed, 217 insertions(+), 90 deletions(-) -- 2.21.0

2 16

[libvirt] [PATCH] virhostuptime: Wrap virHostGetBootTimeProcfs() call in an ifdef
by Michal Privoznik 14 Nov '19

14 Nov '19

The virHostGetBootTimeProcfs() function is defined only for Linux and therefore it's only call should also be done if we're on Linux. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/virhostuptime.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 056b5c591a..8c49c3d40e 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -99,8 +99,10 @@ virHostGetBootTimeOnceInit(void) endutxent(); # endif /* HAVE_GETUTXID */ +# ifdef __linux__ if (bootTimeErrno != 0 || bootTime == 0) bootTimeErrno = -virHostGetBootTimeProcfs(&bootTime); +# endif /* __linux__ */ } #else /* !defined(HAVE_GETUTXID) && !defined(__linux__) */ -- 2.23.0

1 0

[libvirt] [PATCH] qemu: Warn verbosely if using old loader:nvram pairs
by Michal Privoznik 14 Nov '19

14 Nov '19

There are two ways for specifying loader:nvram pairs: 1) --with-loader-nvram configure option 2) nvram variable in qemu.conf Since we have FW descriptors, using this old style is discouraged, but not as strong as one would expect. Produce more warnings: 1) produce a warning if somebody tries the configure option 2) produce a warning if somebody sets nvram variable and at least on FW descriptor was found The reason for producing warning in case 1) is that package maintainers, who set the configure option in the first place should start moving towards FW descriptors and abandon the configure option. After all, the warning is printed into config output only in this case. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1763477 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- m4/virt-loader-nvram.m4 | 10 +++++++++- src/qemu/qemu.conf | 3 +++ src/qemu/qemu_conf.c | 19 +++++++++++++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/m4/virt-loader-nvram.m4 b/m4/virt-loader-nvram.m4 index d7e0c8ca18..ed2ae0cf27 100644 --- a/m4/virt-loader-nvram.m4 +++ b/m4/virt-loader-nvram.m4 @@ -30,6 +30,8 @@ AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ l=$(echo $with_loader_nvram | tr ':' '\n' | wc -l) if test $(expr $l % 2) -ne 0 ; then AC_MSG_ERROR([Malformed --with-loader-nvram argument]) + elif test $l -gt 0 ; then + AC_MSG_WARN([Note that --with-loader-nvram is obsolete and will be removed soon]) fi AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$with_loader_nvram"], [List of loader:nvram pairs]) @@ -37,5 +39,11 @@ AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ ]) AC_DEFUN([LIBVIRT_RESULT_LOADER_NVRAM], [ - LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram]) + if test "x$with_loader_nvram" != "xno" && \ + test "x$with_loader_nvram" != "x" ; then + LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram], + [!!! Using this configure option is strongly discouraged !!!]) + else + LIBVIRT_RESULT([Loader/NVRAM], [$with_loader_nvram]) + fi ]) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index b3a3428e4c..7a056b037e 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -761,6 +761,9 @@ # source tree. These metadata files are distributed alongside any # firmware images intended for use with QEMU. # +# NOTE: if ANY firmware metadata files are detected, this setting +# will be COMPLETELY IGNORED. +# # ------------------------------------------ # # When a domain is configured to use UEFI instead of standard diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index fae697a2ef..293f2635cc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -32,6 +32,7 @@ #include "qemu_conf.h" #include "qemu_capabilities.h" #include "qemu_domain.h" +#include "qemu_firmware.h" #include "qemu_security.h" #include "viruuid.h" #include "virbuffer.h" @@ -799,7 +800,8 @@ virQEMUDriverConfigLoadLogEntry(virQEMUDriverConfigPtr cfg, static int virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg, - virConfPtr conf) + virConfPtr conf, + bool privileged) { VIR_AUTOSTRINGLIST nvram = NULL; size_t i; @@ -807,8 +809,21 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg, if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0) return -1; if (nvram) { + VIR_AUTOSTRINGLIST fwList = NULL; + virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares); + if (qemuFirmwareFetchConfigs(&fwList, privileged) < 0) + return -1; + + if (fwList) { + VIR_WARN("Obsolete nvram variable is set while firmware metadata " + "files found. Note that the nvram config file variable is " + "going to be ignored."); + cfg->nfirmwares = 0; + return 0; + } + cfg->nfirmwares = virStringListLength((const char *const *)nvram); if (nvram[0] && VIR_ALLOC_N(cfg->firmwares, cfg->nfirmwares) < 0) return -1; @@ -1041,7 +1056,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virQEMUDriverConfigLoadLogEntry(cfg, conf) < 0) return -1; - if (virQEMUDriverConfigLoadNVRAMEntry(cfg, conf) < 0) + if (virQEMUDriverConfigLoadNVRAMEntry(cfg, conf, privileged) < 0) return -1; if (virQEMUDriverConfigLoadGlusterDebugEntry(cfg, conf) < 0) -- 2.23.0

3 7

[libvirt] [PATCH] docs: mention lifted vCPUs restriction for esx
by Pino Toscano 14 Nov '19

14 Nov '19

It was lifted with c92b6023e8eb670e01571e299a85e9da9bd4844c. Signed-off-by: Pino Toscano <ptoscano(a)redhat.com> --- docs/drvesx.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index 901d65958a..ac7bc645d1 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -337,7 +337,9 @@ error: invalid argument in libvirt was built without the 'esx' driver Memory size has to be a multiple of 4096 </li> <li> - Number of virtual CPU has to be 1 or a multiple of 2 + Number of virtual CPU has to be 1 or a multiple of 2. + <span class="since">Since 4.10.0</span> any number of vCPUs is + supported. </li> <li> Valid MAC address prefixes are <code>00:0c:29</code> and -- 2.21.0

2 1

[libvirt] [PATCH 0/5] PATCH 0/8] Remove use of 'strsep' gnulib module (kill-a-gnulib-module-a-day initiative)
by Peter Krempa 14 Nov '19

14 Nov '19

Peter Krempa (5): rpc: use virStringSplit instead of strsep util: file: Use g_autofree in virFindFileInPath util: file: Simplify logic of shortuct cases in virFindFileInPath util: file: Replace use of 'strsep' with virStringSplit gnulib: Remove use of 'strsep' module bootstrap.conf | 1 - src/rpc/virnetsocket.c | 28 ++++++++++++---------------- src/util/virfile.c | 38 ++++++++++++++++---------------------- 3 files changed, 28 insertions(+), 39 deletions(-) -- 2.23.0

3 18

[libvirt] [PATCH] libxl: Fix lock manager lock ordering
by Jim Fehlig 14 Nov '19

14 Nov '19

The ordering of lock manager locks in the libxl driver has a flaw that was uncovered by a migration error path. In the perform phase of migration, the source host calls virDomainLockProcessPause to release the lock before sending the VM to the destination host. If the send fails an attempt is made to reacquire the lock with virDomainLockProcessResume, but that too can fail if the destination host has not finished cleaning up the failed VM and releasing the lock it acquired when starting to receive the VM. This change delays calling virDomainLockProcessResume in libxlDomainStart until the VM is successfully created, but before it is unpaused. A similar approach is used by the qemu driver, avoiding the need to release the lock if VM creation fails. In the migration perform phase, releasing the lock with virDomainLockProcessPause is delayed until the VM is successfully sent to the destination, which avoids reacquiring the lock if the send fails. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 14 +++++++------- src/libxl/libxl_migration.c | 14 +++++--------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 4073bf8d46..a830a19b99 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1364,13 +1364,6 @@ libxlDomainStart(libxlDriverPrivatePtr driver, NULL) < 0) goto cleanup; - if (virDomainLockProcessResume(driver->lockManager, - "xen:///system", - vm, - priv->lockState) < 0) - goto cleanup; - VIR_FREE(priv->lockState); - if (libxlNetworkPrepareDevices(vm->def) < 0) goto cleanup_dom; @@ -1453,6 +1446,13 @@ libxlDomainStart(libxlDriverPrivatePtr driver, libxlLoggerOpenFile(cfg->logger, domid, vm->def->name, config_json); + if (virDomainLockProcessResume(driver->lockManager, + "xen:///system", + vm, + priv->lockState) < 0) + goto destroy_dom; + VIR_FREE(priv->lockState); + /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) goto destroy_dom; diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index a1021d499b..8e64dc5d04 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1253,20 +1253,16 @@ libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, sockfd = virNetSocketDupFD(sock, true); virObjectUnref(sock); - if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) - VIR_WARN("Unable to release lease on %s", vm->def->name); - VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); - /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd); virObjectLock(vm); - if (ret < 0) { - virDomainLockProcessResume(driver->lockManager, - "xen:///system", - vm, - priv->lockState); + if (ret == 0) { + if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) + VIR_WARN("Unable to release lease on %s", vm->def->name); + VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + } else { /* * Confirm phase will not be executed if perform fails. End the * job started in begin phase. -- 2.23.0

2 2

[libvirt] [PATCH v2 0/3] use virStringParseYesNo helper
by Mao Zhongyi 14 Nov '19

14 Nov '19

A function virStringParseYesNo was added to convert string 'yes' to true and 'no' to false, so use this helper to replace 'STREQ(.*, \"yes\")' and 'STREQ(.*, \"no\")' as it allows us to drop several repetitive if-then-else string->bool conversion blocks. v2->v1 p1: - ignore the return value of virStringParseYesNo. - update the commit message. [Michal Privoznik] p2: - add the Acked-by tag. p3: - pass return value of helper to rc directly. [Michal Privoznik] Mao Zhongyi (3): conf/domain_conf: use virStringParseYesNo helper conf/network_conf: use virStringParseYesNo helper qemu/qemu_migration_params: use virStringParseYesNo helper src/conf/domain_conf.c | 35 ++++++++++++-------------------- src/conf/network_conf.c | 4 +--- src/qemu/qemu_migration_params.c | 7 +------ 3 files changed, 15 insertions(+), 31 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH v2 0/5] Fix up some issues from x and y resolution patches
by Jonathon Jongsma 14 Nov '19

14 Nov '19

This is a follow-up series responding to some comments from Jan Tomko. Most importantly, the fact that the errors are not propagated up to the caller, they're only logged. To fix this, the function signatures were changed to return a error status. The patch series was also re-ordered slightly to improve readability (I hope). Jonathon Jongsma (5): qemu: fix documentation for video resolution conf: remove unnecessary NULL checks conf: use glib allocation when parsing video props conf: report errors when parsing video resolution conf: report errors when parsing video acceleration docs/formatdomain.html.in | 12 +++-- src/conf/domain_conf.c | 108 ++++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 49 deletions(-) -- 2.21.0

2 9

[libvirt] [PATCH 0/8] Remove use of 'areadlink' gnulib module (kill-a-gnulib-module-a-day initiative)
by Peter Krempa 14 Nov '19

14 Nov '19

This removes use of 'areadlink' by using 'g_file_read_link' and fixes a few insane uses. Note that I'll post the actual module deletion from bootstrap.conf separately as touching that file results in lengthy rebuilds. Peter Krempa (8): qemu: domain: Use g_file_read_link instead of virFileReadLink util: file: Remove virFileReadLink qemu: tpm: Use g_autofree in qemuTPMEmulatorGetPid qemu: tpm: Sanitize error values in qemuTPMEmulatorGetPid qemu: gpu: Sanitize error values in qemuVhostUserGPUGetPid util: pidfile: Sanitize return values of virPidFileReadIfAlive util: pidfile: Sanitize return values of virPidFileReadPathIfAlive util: pidfile: Replace 'areadlink' by 'g_file_read_link' src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 18 +++++----- src/qemu/qemu_tpm.c | 16 ++++----- src/qemu/qemu_vhost_user_gpu.c | 12 ++++--- src/util/virfile.c | 13 ------- src/util/virfile.h | 3 -- src/util/virpidfile.c | 64 +++++++++++++++++----------------- 7 files changed, 56 insertions(+), 71 deletions(-) -- 2.23.0

2 10

[libvirt] [PATCH 0/2] qemu: block: Fix two bugs related to usage of blockdev (blockdev-add saga)
by Peter Krempa 14 Nov '19

14 Nov '19

Peter Krempa (2): qemu: blockjob: Transfer 'readonly' state of images after active layer block commit qemu: snapshot: Fix inactive external snapshots when backing chain is present src/qemu/qemu_blockjob.c | 2 ++ src/qemu/qemu_driver.c | 25 +++++++++++++++++++------ 2 files changed, 21 insertions(+), 6 deletions(-) -- 2.23.0

2 3

[libvirt] [PATCH Rust 0/4] Map more functions in stream module
by Zixing Liu 14 Nov '19

14 Nov '19

This set of patches will add more functions to the Rust bindings. Newly mapped functions from C library: virStreamNew virStreamEventUpdateCallback virStreamEventRemoveCallback virStreamEventAddCallback. virStreamEventAddCallback can accept normal fn functions or closures (can capture variables outside) The changes are not very thoroughly tested since event module is not implemented at all so the virStreamEventAddCallback will always return "unsupported by the connection driver". Also the changes have run though the rustfmt to ensure the format conforms to Rust officially recommended code style. Zixing Liu (4): libvirt-rust: stream: add more functions in stream libvirt-rust: stream: add more functions in stream libvirt-rust: stream: automated lint libvirt-rust: use reference instead of moving src/domain.rs | 2 +- src/stream.rs | 128 ++++++++++++++++++++++++++++++++++++++++++------ tests/stream.rs | 40 +++++++++++++++ 3 files changed, 153 insertions(+), 17 deletions(-) create mode 100644 tests/stream.rs -- 2.24.0

2 7

[libvirt] [RFC] default video device type
by Pavel Mores 14 Nov '19

14 Nov '19

Hi, I'm looking into fixing https://bugzilla.redhat.com/show_bug.cgi?id=1668141 (as a short summary, if a graphics device is added to XML that has no video device, libvirt automatically adds a video device which is always of type 'cirrus' - even if the underlying qemu doesn't support cirrus). I'm able to affect the behaviour in question by using qemu capabilities in qemuDomainDeviceVideoDefPostParse(), see proof-of-concept change in [1]. I have a couple of questions though: 1) is this a proper place and approach to fix the bug? 2) what would be the full specification of expected behaviour? The bug report only states that the video type shouldn't be cirrus but doesn't say what it should be. [2] gives some information about the order of preference of video device types but I was wondering if there are any opinions about this on this list? Cheers, pvl [1] diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b4175a846e..0de491b79f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7821,7 +7821,8 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, static int qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCapsPtr qemuCaps) { if (video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { if (ARCH_IS_PPC64(def->os.arch)) @@ -7830,8 +7831,16 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, qemuDomainIsRISCVVirt(def) || ARCH_IS_S390(def->os.arch)) video->type = VIR_DOMAIN_VIDEO_TYPE_VIRTIO; - else - video->type = VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + else { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE) + && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL)) { + video->type = VIR_DOMAIN_VIDEO_TYPE_QXL; + video->vgamem = QEMU_QXL_VGAMEM_DEFAULT; + } else { + video->type = VIR_DOMAIN_VIDEO_TYPE_VGA; + } + } } if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL && @@ -7926,7 +7935,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, break; case VIR_DOMAIN_DEVICE_VIDEO: - ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def); + ret = qemuDomainDeviceVideoDefPostParse(dev->data.video, def, qemuCaps); break; case VIR_DOMAIN_DEVICE_PANIC: [2] https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/

3 3

[libvirt] [PATCH] virhostuptime: Add linux stub for musl
by Michal Privoznik 14 Nov '19

14 Nov '19

When we want to know the boot timestamp of the host, we can call virHostGetBootTime(). Under the hood, it uses getutxid() which is defined by POSIX and properly check for in configure. However, musl took a path where it declares the function but instead of providing any useful implementation it returns NULL meaning "no record found". If that's the case, use our second best option - /proc/uptime and a bit of maths. https://bugzilla.redhat.com/show_bug.cgi?id=1760885 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virhostuptime.c | 64 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/src/util/virhostuptime.c b/src/util/virhostuptime.c index 62b781acd5..3189074d3d 100644 --- a/src/util/virhostuptime.c +++ b/src/util/virhostuptime.c @@ -25,16 +25,68 @@ #endif #include "virhostuptime.h" +#include "viralloc.h" +#include "virfile.h" +#include "virlog.h" +#include "virstring.h" +#include "virtime.h" #include "virthread.h" +#define VIR_FROM_THIS VIR_FROM_NONE + +VIR_LOG_INIT("util.virhostuptime"); + static unsigned long long bootTime; static int bootTimeErrno; static virOnceControl virHostGetBootTimeOnce = VIR_ONCE_CONTROL_INITIALIZER; -#ifdef HAVE_GETUTXID +#if defined(__linux__) +# define UPTIME_FILE "/proc/uptime" +static int +virHostGetBootTimeProcfs(unsigned long long *btime) +{ + unsigned long long now; + double up; + g_autofree char *buf = NULL; + char *tmp; + + if (virTimeMillisNow(&now) < 0) + return -errno; + + /* 1KiB limit is more than enough. */ + if (virFileReadAll(UPTIME_FILE, 1024, &buf) < 0) + return -errno; + + /* buf contains two doubles now: + * $uptime $idle_time + * We're interested only in the first one */ + if (!(tmp = strchr(buf, ' '))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("uptime file has unexpected format '%s'"), + buf); + return -EINVAL; + } + + *tmp = '\0'; + + if (virStrToDouble(buf, NULL, &up) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse sched info value '%s'"), + buf); + return -EINVAL; + } + + *btime = now / 1000 - up + 0.5; + + return 0; +} +#endif /* defined(__linux__) */ + +#if defined(HAVE_GETUTXID) || defined(__linux__) static void virHostGetBootTimeOnceInit(void) { +# ifdef HAVE_GETUTXID struct utmpx id = {.ut_type = BOOT_TIME}; struct utmpx *res = NULL; @@ -45,16 +97,22 @@ virHostGetBootTimeOnceInit(void) } endutxent(); +# endif /* HAVE_GETUTXID */ + + if (bootTimeErrno == ENODATA || + (bootTime == 0 && bootTimeErrno == 0)) { + bootTimeErrno = -virHostGetBootTimeProcfs(&bootTime); + } } -#else /* !HAVE_GETUTXID */ +#else /* !defined(HAVE_GETUTXID) && !defined(__linux__) */ static void virHostGetBootTimeOnceInit(void) { bootTimeErrno = ENOSYS; } -#endif /* HAVE_GETUTXID */ +#endif /* !defined(HAVE_GETUTXID) && !defined(__linux__) */ /** * virHostGetBootTime: -- 2.21.0

2 1

[libvirt] [PATCH v2 0/2] qemu: fix type of default video device
by Pavel Mores 13 Nov '19

13 Nov '19

This new version mostly integrates Cole's comments about the first version. Pavel Mores (2): qemu: fix type of default video device qemu: add tests of the default video type selection algorithm src/qemu/qemu_domain.c | 39 +++++++++++------ .../default-video-type-aarch64.xml | 16 +++++++ .../default-video-type-ppc64.xml | 16 +++++++ .../default-video-type-riscv64.xml | 16 +++++++ .../default-video-type-s390x.xml | 16 +++++++ .../default-video-type-x86_64-caps-test-0.xml | 17 ++++++++ .../default-video-type-x86_64-caps-test-1.xml | 17 ++++++++ tests/qemuxml2argvtest.c | 1 + ...ault-video-type-aarch64.aarch64-latest.xml | 42 +++++++++++++++++++ .../default-video-type-ppc64.ppc64-latest.xml | 31 ++++++++++++++ ...ault-video-type-riscv64.riscv64-latest.xml | 39 +++++++++++++++++ .../default-video-type-s390x.s390x-latest.xml | 32 ++++++++++++++ .../default-video-type-x86_64-caps-test-0.xml | 31 ++++++++++++++ .../default-video-type-x86_64-caps-test-1.xml | 31 ++++++++++++++ tests/qemuxml2xmltest.c | 10 ++++- 15 files changed, 341 insertions(+), 13 deletions(-) create mode 100644 tests/qemuxml2argvdata/default-video-type-aarch64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-ppc64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-riscv64.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-s390x.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml create mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml -- 2.21.0

2 4

[libvirt] [PATCH v3 0/3] unplug timeout changes for PPC64
by Daniel Henrique Barboza 13 Nov '19

13 Nov '19

changes in v3: - redesigned patch 1 based on Cole Robinson feedback v2: https://www.redhat.com/archives/libvir-list/2019-September/msg00447.html v1: https://www.redhat.com/archives/libvir-list/2019-August/msg00698.html Daniel Henrique Barboza (3): qemu_hotplug.c: adding qemuDomainGetUnplugTimeout qemu: Remove qemu_hotplugpriv.h and qemuDomainRemoveDeviceWaitTime qemu_hotplug.c: user-friendlier setvcpus timeout error message src/qemu/Makefile.inc.am | 1 - src/qemu/qemu_hotplug.c | 28 ++++++++++++++----- src/qemu/qemu_hotplug.h | 2 ++ tests/Makefile.am | 13 ++++++++- .../qemuhotplugmock.c | 27 +++++++++--------- tests/qemuhotplugtest.c | 7 ++--- 6 files changed, 51 insertions(+), 27 deletions(-) rename src/qemu/qemu_hotplugpriv.h => tests/qemuhotplugmock.c (61%) -- 2.21.0

2 4

[libvirt] [PATCH 0/2] Eliminate two more gnulib modules (glib chronicles)
by Ján Tomko 13 Nov '19

13 Nov '19

Remove the need to use: byteswap vsnprintf by using the GLib counterparts Ján Tomko (2): util: use g_vsnprintf qemu: use GUINT32_SWAP_LE_BE src/qemu/qemu_driver.c | 10 +++++----- src/util/virerror.c | 4 ++-- src/util/virtypedparam.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.21.0

3 8

[libvirt] [PATCH 0/2] replace snprintf by g_snprintf (kill-a-gnulib-module-a-day initiative)
by Pavel Hrdina 13 Nov '19

13 Nov '19

2 4

[libvirt] [PATCH 0/6] docs: some refactoring and new docs about RPM deployment
by Daniel P. Berrangé 13 Nov '19

13 Nov '19

This refactors existing docs related to the remote driver/daemon and URIs. It then also adds a kbase page about RPM package options. This introduces the use of RST for docs as a replacement for HTML. The intent is that all new docs should use RST from this point. Existing HTML docs are candidates for conversion to RST by anyone interested. Daniel P. Berrangé (6): docs: split TLS certificate setup into its own file docs: move docs about remote driver URIs into URI docs build: introduce rst2html as a mandatory build tool docs: adapt filling of <head> section for rst2html output docs: add a kbase page about RPM packaging options docs: add page describing the libvirt daemons .gitignore | 1 + docs/Makefile.am | 21 +- docs/daemons.rst | 209 +++++++++++ docs/docs.html.in | 6 + docs/kbase.html.in | 4 + docs/kbase/rpm-deployment.rst | 410 ++++++++++++++++++++ docs/page.xsl | 4 +- docs/remote.html.in | 684 +--------------------------------- docs/tlscerts.html.in | 413 ++++++++++++++++++++ docs/uri.html.in | 263 +++++++++++-- libvirt.spec.in | 2 + m4/virt-external-programs.m4 | 5 + mingw-libvirt.spec.in | 1 + 13 files changed, 1309 insertions(+), 714 deletions(-) create mode 100644 docs/daemons.rst create mode 100644 docs/kbase/rpm-deployment.rst create mode 100644 docs/tlscerts.html.in -- 2.23.0

4 16

[libvirt] [PATCH 0/9] Remove remaining usage of VIR_STR(N)DUP (glib chronicles)
by Ján Tomko 13 Nov '19

13 Nov '19

Almost. Patch 8/9 depends on Jirka removing VIR_STRNDUP in [PATCH v3 04/52] conf: Drop nameLen parameter from virDomainCapsCPUModelsAdd https://www.redhat.com/archives/libvir-list/2019-November/msg00068.html Ján Tomko (9): Remove VIR_STRDUP usage that snuck in Remove VIR_STRNDUP usage that passes -1 Remove VIR_STRNDUP usage that subtracts from a non-NULL pointer Remove VIR_STRNDUP usage with checked pointers Remove VIR_STRNDUP usage with subtraction Remove the rest of VIR_STRNDUP tests: delete tests for VIR_STR(N)DUP util: remove VIR_STRDUP and VIR_STRNDUP docs: hacking: document removal of VIR_STR(N)DUP docs/hacking.html.in | 10 +- src/bhyve/bhyve_parse_command.c | 44 +++-- src/conf/nwfilter_conf.c | 4 +- src/conf/nwfilter_params.c | 6 +- src/interface/interface_backend_udev.c | 8 +- src/libvirt_private.syms | 2 - src/libxl/xen_common.c | 44 +++-- src/libxl/xen_xl.c | 6 +- src/libxl/xen_xm.c | 9 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_domain.c | 9 +- src/qemu/qemu_driver.c | 3 +- src/qemu/qemu_monitor_json.c | 11 +- src/remote/remote_driver.c | 6 +- src/rpc/virnetlibsshsession.c | 7 +- src/storage/storage_backend_logical.c | 7 +- src/util/vircgroupv1.c | 5 +- src/util/vircommand.c | 5 +- src/util/virconf.c | 24 +-- src/util/viriscsi.c | 3 +- src/util/virjson.c | 11 +- src/util/virkeyfile.c | 9 +- src/util/virsocketaddr.c | 5 +- src/util/virstoragefile.c | 6 +- src/util/virstring.c | 56 +----- src/util/virstring.h | 69 ------- src/util/virsysinfo.c | 244 ++++++++++++------------- src/vmware/vmware_conf.c | 6 +- tests/virstringtest.c | 136 -------------- tools/vsh.c | 5 +- 30 files changed, 218 insertions(+), 545 deletions(-) -- 2.21.0

2 18

[libvirt] [rust PATCH] api_tests.py: Fix all issues reported by flake8
by Andrea Bolognani 13 Nov '19

13 Nov '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tools/api_tests.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index 9e66c92..7f0e3cb 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -6,36 +6,39 @@ import xml.etree.ElementTree import sys -LIBVIRT_API_FILE="/usr/share/libvirt/api/libvirt-api.xml" +LIBVIRT_API_FILE = "/usr/share/libvirt/api/libvirt-api.xml" MY_PATH = os.path.dirname(os.path.realpath(__file__)) SRC_PATH = MY_PATH + "/../src" + def get_api_symbols(doc): funcs = doc.iter('function') macros = doc.iter('macro') enums = doc.iter('enum') return funcs, macros, enums + def get_sources(): return glob.glob(SRC_PATH + "/*.rs") + def match(el, content): return content.find(el) >= 0 + def main(): filter_by = "" if len(sys.argv) > 1: filter_by = sys.argv[1] - + doc = xml.etree.ElementTree.parse(LIBVIRT_API_FILE).getroot() implemented = set([]) missing = set([]) for el in doc.iter('function'): - - if el.get('name').startswith(filter_by): # What i'm looking for? - + if el.get('name').startswith(filter_by): # What I'm looking for + status = False for source in get_sources(): f = open(source) @@ -51,13 +54,10 @@ def main(): print("missing:") for x in missing: print(x.attrib) - #print "implemented:" - #for x in implemented: - # print x.attrib - + # print "implemented:" + # for x in implemented: + # print x.attrib + if __name__ == '__main__': main() - - - -- 2.23.0

2 1

[libvirt] [rust PATCH] gitpublish: Fix subject prefix
by Andrea Bolognani 13 Nov '19

13 Nov '19

All libvirt-related projects, including language bindings, follow a certain convention for subject prefix, and there's no reason libvirt-rust should be any different. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitpublish b/.gitpublish index b42ee56..35191be 100644 --- a/.gitpublish +++ b/.gitpublish @@ -2,4 +2,4 @@ base = master to = libvir-list(a)redhat.com cc = sahid.ferdjaoui(a)canonical.com -prefix = PATCH Rust +prefix = rust PATCH diff --git a/README.md b/README.md index 93cd461..76acef5 100644 --- a/README.md +++ b/README.md @@ -78,14 +78,14 @@ send a single patch ``` git send-email --to libvir-list(a)redhat.com --cc sahid.ferdjaoui(a)canonical.com \ - --subject-prefix "PATCH Rust" --smtp-server=$HOSTNAME -1 + --subject-prefix "rust PATCH" --smtp-server=$HOSTNAME -1 ``` Or to send all patches on the current branch, against master ``` git send-email --to libvir-list(a)redhat.com --cc sahid.ferdjaoui(a)canonical.com \ - --subject-prefix "PATCH Rust" --smtp-server=$HOSTNAME --no-chain-reply-to \ + --subject-prefix "rust PATCH" --smtp-server=$HOSTNAME --no-chain-reply-to \ --cover-letter --annotate master.. ``` -- 2.23.0

2 1

[libvirt] [PATCH Rust v2] api_tests.py: update to use Python 3
by Zixing Liu 13 Nov '19

13 Nov '19

Signed-off-by: Zixing Liu <liushuyu(a)aosc.io> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.24.0

2 1

[libvirt] [PATCH] locking: fix build with older sanlock
by Ján Tomko 13 Nov '19

13 Nov '19

../../src/locking/lock_driver_sanlock.c:106:17: error: incompatible pointer types assigning to 'char **' from 'char *' [-Werror,-Wincompatible-pointer-types] message = g_strdup_printf(_("sanlock error %d"), err); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: b1d58418aa5051c7aafa4519b332007e7c73c261 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as a build breaker fix. diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 87ba0fbfbb..c8936c301c 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -103,7 +103,7 @@ virLockManagerSanlockError(int err, #if HAVE_SANLOCK_STRERROR *message = g_strdup(sanlock_strerror(err)); #else - message = g_strdup_printf(_("sanlock error %d"), err); + *message = g_strdup_printf(_("sanlock error %d"), err); #endif return true; } else { -- 2.21.0

1 0

[libvirt] [PATCH 0/3] Update rebootTimeout range to 0..0xffff
by Han Han 13 Nov '19

13 Nov '19

Since qemu v4.0.0(commit ee5d0f89de3), reboot-timeout valid range was set 0~0xffff. Update libvirt codes, docs, tests for that change. I am not sure if po files should be updated. If so, please point it out. Han Han (3): conf: Set rebootTimeout valid range to 0..0xffff tests: Remove test reboot-timeout-disabled docs: Update docs on rebootTimeout valid value range docs/formatdomain.html.in | 5 ++-- src/conf/domain_conf.c | 6 ++-- .../reboot-timeout-disabled.args | 28 ------------------- .../reboot-timeout-disabled.xml | 24 ---------------- .../reboot-timeout-disabled.xml | 26 ----------------- 5 files changed, 6 insertions(+), 83 deletions(-) delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-disabled.args delete mode 100644 tests/qemuxml2argvdata/reboot-timeout-disabled.xml delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml -- 2.20.1

3 11

[libvirt] [PATCH Rust v2] api_tests.py: update to use Python 3
by liushuyu 12 Nov '19

12 Nov '19

From: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Zixing Liu <liushuyu011(a)gmail.com> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.24.0

1 0

[libvirt] [PATCH Rust] api_tests.py: update to use Python 3
by liushuyu 12 Nov '19

12 Nov '19

From: liushuyu <liushuyu011(a)gmail.com> --- tools/api_tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/api_tests.py b/tools/api_tests.py index b26ec34..9e66c92 100644 --- a/tools/api_tests.py +++ b/tools/api_tests.py @@ -47,10 +47,10 @@ def main(): else: missing.add(el) - print "missing: %s, implemented: %s" % (len(missing), len(implemented)) - print "missing:" + print("missing: %s, implemented: %s" % (len(missing), len(implemented))) + print("missing:") for x in missing: - print x.attrib + print(x.attrib) #print "implemented:" #for x in implemented: # print x.attrib -- 2.23.0

3 3

[libvirt] [PATCH] qemu: hotplug: ensure address generation for vfio-ccw
by Bjoern Walk 12 Nov '19

12 Nov '19

When attaching a mediated host device of model vfio-ccw without specifying a guest-address, none is generated by libvirt. Let's fix this and make sure to generate a device address during live-hotplug. Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.ibm.com> --- src/qemu/qemu_hotplug.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fd4bafef..7b775159 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2790,6 +2790,8 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, { int ret = -1; g_autofree char *devstr = NULL; + char *devName = NULL; + bool releaseaddr = false; bool added = false; bool teardowncgroup = false; bool teardownlabel = false; @@ -2805,6 +2807,10 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver, return -1; break; case VIR_MDEV_MODEL_TYPE_VFIO_CCW: + devName = hostdev->source.subsys.u.mdev.uuidstr; + if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, devName) < 0) + return -1; + break; case VIR_MDEV_MODEL_TYPE_LAST: break; } -- 2.21.0

3 7

[libvirt] NOTE: building libvirt requires srcdir != builddir now
by Daniel P. Berrangé 12 Nov '19

12 Nov '19

A quick heads up to people who are pulling latest libvirt this morning. Late on friday we pushed the series from Pavel which mandates that libvirt does a VPATH build. ie you can't build directly in the source tree, you must have a separate build directory. IOW, instead of doing ./autogen.sh make You must change to mkdir build cd build ../autogen.sh make "build" can be any directory you like, and doesn't have to be a subdir of the src checkout. Most built files now live outside the srcdir - we only have autotools related artifacts in srcdir now, and so the gitignore file is much simpler. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 1

[libvirt] [PATCH v1 00/21] remove 'cleanup: return' labels
by Daniel Henrique Barboza 12 Nov '19

12 Nov '19

Hi, This series is focused on removing most of the unused 'cleanup' labels that we have in the code so far (as of master commit 2cff65e4c6). I say 'most' because there's a handful of instances left that are being used by macros and other machinery that I judged it wasn't worth to deal with in the scope of this work. The motivations for this change are (1) less code to deal with and (2) a bit more clarity, since the presence of a 'cleanup' label should indicate a cleanup procedure (virObjectUnref and so on). The vast majority of the cases being handled here are variations of the following pattern: ----- (function header) int ret = -1; ( nothing is done with 'ret' in the function body, 'cleanup' calls are made on error conditions) ret = 0; cleanup: return ret; (end of function) ----- This pattern can be replaced by removing 'cleanup:' and 'ret', replacing it with 'return -1' on error conditions and 'return 0' on success. Other patterns were handled as well, but this is the most frequent one. I made an effort to *not* change or refactor the function logic in the attempt of removing labels. Patches were split by directory. If only one file in a dir got changed, the file is mentioned in the commit instead. There were not preparatory patches for these changes because they are intended to be somewhat simple. The one exception is patch 09. I chose to handle that case in a separated patch to not clutter the review of patch 10, but I expect it to be merged with the 'qemu' patch once it is reviewed. All these changes are available in [1]. [1] https://github.com/danielhb/libvirt/tree/clean_trivial_labels Daniel Henrique Barboza (21): conf: remove unneeded cleanup labels storage: remove unneeded cleanup labels nwfilter: remove unneeded cleanup labels remote: remove unneeded cleanup labels lxc: remove unneeded cleanup labels node_device: remove unneeded cleanup labels secret_driver.c: remove unneeded cleanup label openvz_conf.c: remove unneeded cleanup label qemu_monitor_json.c: remove unneeded cleanup label qemu: remove unneeded cleanup labels rpc: remove unneeded cleanup labels vz_sdk.c: remove unneeded cleanup label vbox: remove unneeded cleanup labels util: remove unneeded cleanup labels libvirt.c: remove unneeded cleanup label libxl_driver.c: remove unneeded cleanup label bridge_driver.c: remove unneeded cleanup labels suspend.c: remove unneeded cleanup label tools: remove unneeded cleanup labels tests: remove unneeded cleanup labels bhyve_device.c: remove unneeded cleanup labels examples/c/domain/suspend.c | 9 +- src/bhyve/bhyve_device.c | 18 +- src/conf/domain_addr.c | 23 +- src/conf/domain_capabilities.c | 21 +- src/conf/domain_conf.c | 334 ++++++++-------------- src/conf/netdev_bandwidth_conf.c | 17 +- src/conf/network_conf.c | 25 +- src/conf/node_device_conf.c | 28 +- src/conf/numa_conf.c | 25 +- src/conf/nwfilter_conf.c | 4 +- src/conf/storage_conf.c | 7 +- src/conf/virnetworkobj.c | 14 +- src/conf/virsecretobj.c | 5 +- src/libvirt.c | 7 +- src/libxl/libxl_driver.c | 16 +- src/lxc/lxc_cgroup.c | 70 ++--- src/lxc/lxc_container.c | 17 +- src/lxc/lxc_controller.c | 44 ++- src/lxc/lxc_driver.c | 39 +-- src/lxc/lxc_process.c | 34 +-- src/network/bridge_driver.c | 172 +++++------ src/node_device/node_device_driver.c | 11 +- src/node_device/node_device_udev.c | 8 +- src/nwfilter/nwfilter_ebiptables_driver.c | 132 ++++----- src/openvz/openvz_conf.c | 3 +- src/qemu/qemu_cgroup.c | 15 +- src/qemu/qemu_domain.c | 92 +++--- src/qemu/qemu_domain_address.c | 31 +- src/qemu/qemu_driver.c | 140 ++++----- src/qemu/qemu_hotplug.c | 45 ++- src/qemu/qemu_interface.c | 26 +- src/qemu/qemu_migration.c | 38 +-- src/qemu/qemu_monitor_json.c | 15 +- src/qemu/qemu_process.c | 77 ++--- src/qemu/qemu_tpm.c | 20 +- src/remote/remote_daemon.c | 38 ++- src/remote/remote_driver.c | 15 +- src/rpc/virnetserver.c | 15 +- src/rpc/virnetserverprogram.c | 13 +- src/rpc/virnetsocket.c | 9 +- src/rpc/virnettlscontext.c | 20 +- src/secret/secret_driver.c | 11 +- src/storage/storage_backend_fs.c | 13 +- src/storage/storage_backend_rbd.c | 58 ++-- src/storage/storage_backend_zfs.c | 21 +- src/storage/storage_driver.c | 38 +-- src/storage/storage_util.c | 18 +- src/util/vircgroupv1.c | 18 +- src/util/vircommand.c | 11 +- src/util/virdbus.c | 30 +- src/util/virfile.c | 19 +- src/util/virhash.c | 6 +- src/util/virhostcpu.c | 20 +- src/util/virhostdev.c | 7 +- src/util/virhostmem.c | 55 ++-- src/util/virjson.c | 30 +- src/util/virmacmap.c | 10 +- src/util/virnetdevbridge.c | 21 +- src/util/virnuma.c | 27 +- src/util/virpci.c | 7 +- src/util/virprocess.c | 19 +- src/util/virresctrl.c | 7 +- src/util/virstoragefile.c | 46 +-- src/util/virutil.c | 19 +- src/vbox/vbox_common.c | 12 +- src/vbox/vbox_snapshot_conf.c | 75 ++--- src/vz/vz_sdk.c | 8 +- tests/commandtest.c | 17 +- tests/domainconftest.c | 5 +- tests/networkxml2firewalltest.c | 13 +- tests/nsstest.c | 27 +- tests/nwfilterebiptablestest.c | 4 +- tests/nwfilterxml2firewalltest.c | 16 +- tests/qemuhotplugtest.c | 19 +- tests/qemuxml2argvtest.c | 11 +- tests/storagebackendsheepdogtest.c | 5 +- tests/virauthconfigtest.c | 11 +- tests/vircgroupmock.c | 11 +- tests/virendiantest.c | 58 ++-- tests/virkeycodetest.c | 14 +- tests/virmacmaptest.c | 5 +- tests/virnetdevtest.c | 11 +- tests/virpcimock.c | 31 +- tests/virpcitest.c | 3 +- tests/virpolkittest.c | 65 ++--- tests/virstringtest.c | 18 +- tools/virsh-completer-network.c | 8 +- tools/virsh-domain.c | 41 +-- tools/vsh.c | 14 +- 89 files changed, 983 insertions(+), 1722 deletions(-) -- 2.21.0

2 44

[libvirt] [PATCH 0/7] util: buffer: Simplify child buffer init
by Peter Krempa 12 Nov '19

12 Nov '19

This applies on top of https://www.redhat.com/archives/libvir-list/2019-November/msg00397.html Peter Krempa (7): util: buffer: Add init macro for automatically setting child XML indent qemu: domain: Convert child buffers to use VIR_BUFFER_INIT_CHILD util: sysinfo: Convert child buffers to use VIR_BUFFER_INIT_CHILD conf: caps: sysinfo: Convert child buffers to use VIR_BUFFER_INIT_CHILD conf: cpu: Convert child buffers to use VIR_BUFFER_INIT_CHILD conf: domain: Convert child buffers to use VIR_BUFFER_INIT_CHILD util: buffer: remove virBufferSetChildIndent src/conf/capabilities.c | 13 ++---- src/conf/cpu_conf.c | 3 +- src/conf/domain_conf.c | 101 +++++++++++----------------------------- src/qemu/qemu_domain.c | 35 ++++---------- src/util/virbuffer.h | 18 +++---- src/util/virsysinfo.c | 4 +- 6 files changed, 52 insertions(+), 122 deletions(-) -- 2.23.0

2 8

[libvirt] [PATCH 0/3] capabilities: Sanitize handling of 'features'
by Peter Krempa 12 Nov '19

12 Nov '19

Peter Krempa (3): schema: capabilities: Add 'hap' feature flag conf: Refactor storage of guest capabilities conf: capabilities: Refactor API for setting guest capability features docs/schemas/capability.rng | 6 + src/conf/capabilities.c | 149 +++++++++++++-------- src/conf/capabilities.h | 35 +++-- src/libvirt_private.syms | 1 + src/libxl/libxl_capabilities.c | 46 ++----- src/qemu/qemu_capabilities.c | 34 ++--- src/test/test_driver.c | 6 +- tests/qemucaps2xmloutdata/caps.aarch64.xml | 2 +- tests/qemucaps2xmloutdata/caps.x86_64.xml | 4 +- tests/testutilsqemu.c | 6 +- 10 files changed, 156 insertions(+), 133 deletions(-) -- 2.23.0

2 5

[libvirt] [PATCH v2] Add API to change qemu agent response timeout
by Jonathon Jongsma 12 Nov '19

12 Nov '19

Some layered products such as oVirt have requested a way to avoid being blocked by guest agent commands when querying a loaded vm. For example, many guest agent commands are polled periodically to monitor changes, and rather than blocking the calling process, they'd prefer to simply time out when an agent query is taking too long. This patch adds a way for the user to specify a custom agent timeout that is applied to all agent commands. One special case to note here is the 'guest-sync' command. 'guest-sync' is issued internally prior to calling any other command. (For example, when libvirt wants to call 'guest-get-fsinfo', we first call 'guest-sync' and then call 'guest-get-fsinfo'). Previously, the 'guest-sync' command used a 5-second timeout (VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT), whereas the actual command that followed always blocked indefinitely (VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK). As part of this patch, if a custom timeout is specified that is shorter than 5 seconds, this new timeout is also used for 'guest-sync'. If there is no custom timeout or if the custom timeout is longer than 5 seconds, we will continue to use the 5-second timeout. See https://bugzilla.redhat.com/show_bug.cgi?id=1705426 for additional details. Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- I've addressed most of the previous review comments from Peter, Daniel, and Michal but I'm unsure yet whether there's concensus on this feature. Here's a v2 for your consideration. I admit that the proposed API is not perfect. It would probably be more elegant if each agent command instead had its own 'timeout' argument so that the caller could specify the timeout for each invocation. But that is not the case, and introducing duplicate API for each agent command (with an additional timeout argument) would clutter the public API. In addition, we still have the issue Michal mentioned elsewhere in the thread where some commands like shutdown may or may not use the agent, so a timeout argument could be confusing. So: is this a viable approach, or should I rethink it? Changes in v2: - Make this an official public API rather than putting it in libvirt-qemu. - Don't use the qemuDomainObjEnterAgent()/ExitAgent() API, which expects you to acquire an agent job. Instead, introduce qemuDomainObjSetAgentResponseTimeout() which simply locks the agent while setting the variable. - rename the function slightly for better descriptiveness: virDomainQemuAgentSetTimeout() -> virDomainAgentSetResponseTimeout() - added 'flags' argument for future-proofing. include/libvirt/libvirt-domain.h | 9 ++++ include/libvirt/libvirt-qemu.h | 8 +-- src/driver-hypervisor.h | 6 +++ src/libvirt-domain.c | 45 +++++++++++++++++ src/libvirt_public.syms | 1 + src/qemu/qemu_agent.c | 84 ++++++++++++++++++++------------ src/qemu/qemu_agent.h | 4 ++ src/qemu/qemu_domain.c | 15 ++++++ src/qemu/qemu_domain.h | 5 ++ src/qemu/qemu_driver.c | 22 +++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 ++++++- src/remote_protocol-structs | 9 ++++ 13 files changed, 190 insertions(+), 37 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 22277b0a84..83f6c1b835 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4916,4 +4916,13 @@ int virDomainGetGuestInfo(virDomainPtr domain, int *nparams, unsigned int flags); +typedef enum { + VIR_DOMAIN_AGENT_COMMAND_BLOCK = -2, + VIR_DOMAIN_AGENT_COMMAND_DEFAULT = -1, + VIR_DOMAIN_AGENT_COMMAND_NOWAIT = 0, +} virDomainAgentCommandTimeoutValues; +int virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags); + #endif /* LIBVIRT_DOMAIN_H */ diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 891617443f..4a541167ad 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -43,10 +43,10 @@ virDomainPtr virDomainQemuAttach(virConnectPtr domain, unsigned int flags); typedef enum { - VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = -2, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = -1, - VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = 0, + VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN = VIR_DOMAIN_AGENT_COMMAND_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK = VIR_DOMAIN_AGENT_COMMAND_BLOCK, + VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT = VIR_DOMAIN_AGENT_COMMAND_DEFAULT, + VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT = VIR_DOMAIN_AGENT_COMMAND_NOWAIT, VIR_DOMAIN_QEMU_AGENT_COMMAND_SHUTDOWN = 60, } virDomainQemuAgentCommandTimeoutValues; diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 015b2cd01c..4afd8f6ec5 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -1372,6 +1372,11 @@ typedef int int *nparams, unsigned int flags); +typedef int +(*virDrvDomainAgentSetResponseTimeout)(virDomainPtr domain, + int timeout, + unsigned int flags); + typedef struct _virHypervisorDriver virHypervisorDriver; typedef virHypervisorDriver *virHypervisorDriverPtr; @@ -1632,4 +1637,5 @@ struct _virHypervisorDriver { virDrvDomainCheckpointGetParent domainCheckpointGetParent; virDrvDomainCheckpointDelete domainCheckpointDelete; virDrvDomainGetGuestInfo domainGetGuestInfo; + virDrvDomainAgentSetResponseTimeout domainAgentSetResponseTimeout; }; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index dcab179e6e..b4e1b18164 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12497,3 +12497,48 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + +/** + * virDomainAgentSetResponseTimeout: + * @domain: a domain object + * @timeout: timeout in seconds + * @flags: extra flags; not used yet, so callers should always pass 0 + * + * Set how long to wait for a response from qemu agent commands. By default, + * agent commands block forever waiting for a response. + * + * @timeout must be -2, -1, 0 or positive. + * VIR_DOMAIN_AGENT_COMMAND_BLOCK(-2): meaning to block forever waiting for a + * result. + * VIR_DOMAIN_AGENT_COMMAND_DEFAULT(-1): use default timeout value. + * VIR_DOMAIN_AGENT_COMMAND_NOWAIT(0): does not wait. + * positive value: wait for @timeout seconds + * + * Returns 0 on success, -1 on failure + */ +int +virDomainAgentSetResponseTimeout(virDomainPtr domain, + int timeout, + unsigned int flags) +{ + virConnectPtr conn; + VIR_DOMAIN_DEBUG(domain, "timeout=%i, flags=0x%x", + timeout, flags); + + virResetLastError(); + + virCheckDomainReturn(domain, -1); + conn = domain->conn; + + if (conn->driver->domainAgentSetResponseTimeout) { + if (conn->driver->domainAgentSetResponseTimeout(domain, timeout, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + + error: + virDispatchError(conn); + return -1; +} diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 40655fbbf5..74d5e0b4b9 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -859,6 +859,7 @@ LIBVIRT_5.7.0 { LIBVIRT_5.8.0 { virConnectSetIdentity; + virDomainAgentSetResponseTimeout; } LIBVIRT_5.7.0; # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 4b914e6d3b..c2f9a025ba 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -127,6 +127,7 @@ struct _qemuAgent { * but fire up an event on qemu monitor instead. * Take that as indication of successful completion */ qemuAgentEvent await_event; + int timeout; }; static virClassPtr qemuAgentClass; @@ -695,6 +696,8 @@ qemuAgentOpen(virDomainObjPtr vm, if (!(mon = virObjectLockableNew(qemuAgentClass))) return NULL; + /* agent commands block by default, user can choose different behavior */ + mon->timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK; mon->fd = -1; if (virCondInit(&mon->notify) < 0) { virReportSystemError(errno, "%s", @@ -907,6 +910,12 @@ qemuAgentGuestSync(qemuAgentPtr mon) int send_ret; unsigned long long id; qemuAgentMessage sync_msg; + int timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; + + /* if user specified a custom agent timeout that is lower than the + * default timeout, use the shorter timeout instead */ + if ((mon->timeout >= 0) && (mon->timeout < timeout)) + timeout = mon->timeout; memset(&sync_msg, 0, sizeof(sync_msg)); /* set only on first sync */ @@ -927,8 +936,7 @@ qemuAgentGuestSync(qemuAgentPtr mon) VIR_DEBUG("Sending guest-sync command with ID: %llu", id); - send_ret = qemuAgentSend(mon, &sync_msg, - VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT); + send_ret = qemuAgentSend(mon, &sync_msg, timeout); VIR_DEBUG("qemuAgentSend returned: %d", send_ret); @@ -1304,8 +1312,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon, const char **mountpoints, if (!cmd) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1342,8 +1349,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1380,8 +1386,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1437,8 +1442,7 @@ qemuAgentFSTrim(qemuAgentPtr mon, if (!cmd) return ret; - ret = qemuAgentCommand(mon, cmd, &reply, false, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); + ret = qemuAgentCommand(mon, cmd, &reply, false, mon->timeout); virJSONValueFree(cmd); virJSONValueFree(reply); @@ -1459,8 +1463,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { @@ -1575,8 +1578,7 @@ qemuAgentSetVCPUsCommand(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; /* All negative values are invalid. Return of 0 is bogus since we wouldn't @@ -1731,8 +1733,7 @@ qemuAgentGetHostname(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -1776,8 +1777,7 @@ qemuAgentGetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (virJSONValueObjectGetNumberUlong(reply, "return", &json_time) < 0) { @@ -1842,8 +1842,7 @@ qemuAgentSetTime(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2046,8 +2045,7 @@ qemuAgentGetFSInfoInternal(qemuAgentPtr mon, if (!cmd) return ret; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) ret = -2; goto cleanup; @@ -2336,8 +2334,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; if (!(ret_array = virJSONValueObjectGet(reply, "return"))) { @@ -2514,8 +2511,7 @@ qemuAgentSetUserPassword(qemuAgentPtr mon, NULL))) goto cleanup; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) goto cleanup; ret = 0; @@ -2546,8 +2542,7 @@ qemuAgentGetUsers(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-users", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2636,8 +2631,7 @@ qemuAgentGetOSInfo(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-osinfo", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2692,8 +2686,7 @@ qemuAgentGetTimezone(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-timezone", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, true, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) { + if (qemuAgentCommand(mon, cmd, &reply, true, mon->timeout) < 0) { if (qemuAgentErrorCommandUnsupported(reply)) return -2; return -1; @@ -2722,3 +2715,30 @@ qemuAgentGetTimezone(qemuAgentPtr mon, return 0; } + +/* qemuAgentSetResponseTimeout: + * mon: agent monitor + * timeout: number of seconds to wait for agent response + * flags: currently unused. Must pass 0 + * + * the agent object must be locked prior to calling this function + * + * Returns: 0 on success + * -1 otherwise + */ +int +qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout, + unsigned int flags G_GNUC_UNUSED) +{ + if (timeout < VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN) { + virReportError(VIR_ERR_INVALID_ARG, + _("guest agent timeout '%d' is " + "less than the minimum '%d'"), + timeout, VIR_DOMAIN_QEMU_AGENT_COMMAND_MIN); + return -1; + } + + mon->timeout = timeout; + return 0; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 78e648992a..88ead4762a 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -140,3 +140,7 @@ int qemuAgentGetTimezone(qemuAgentPtr mon, virTypedParameterPtr *params, int *nparams, int *maxparams); + +int qemuAgentSetResponseTimeout(qemuAgentPtr mon, + int timeout, + unsigned int flags); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 667cc89072..40d0401e79 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -15564,3 +15564,18 @@ qemuDomainSupportsCheckpointsBlockjobs(virDomainObjPtr vm) return 0; } + +int qemuDomainObjSetAgentResponseTimeout(virDomainObjPtr vm, + int timeout, + unsigned int flags) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + qemuAgentPtr agent = priv->agent; + int ret; + + virObjectLock(agent); + ret = qemuAgentSetResponseTimeout(agent, timeout, flags); + virObjectUnlock(agent); + + return ret; +} diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b23912ee98..34af55ef45 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -1225,3 +1225,8 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net, int qemuDomainSupportsCheckpointsBlockjobs(virDomainObjPtr vm) G_GNUC_WARN_UNUSED_RESULT; + +int +qemuDomainObjSetAgentResponseTimeout(virDomainObjPtr vm, + int seconds, + unsigned int flags); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d17c18705b..68f7b65d81 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -22654,6 +22654,27 @@ qemuDomainGetGuestInfo(virDomainPtr dom, return ret; } +static int +qemuDomainAgentSetResponseTimeout(virDomainPtr dom, + int timeout, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + if (!(vm = qemuDomainObjFromDomain(dom))) + goto cleanup; + + if (virDomainAgentSetResponseTimeoutEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + ret = qemuDomainObjSetAgentResponseTimeout(vm, timeout, flags); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + static virHypervisorDriver qemuHypervisorDriver = { .name = QEMU_DRIVER_NAME, .connectURIProbe = qemuConnectURIProbe, @@ -22890,6 +22911,7 @@ static virHypervisorDriver qemuHypervisorDriver = { .domainCheckpointGetParent = qemuDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = qemuDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = qemuDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = qemuDomainAgentSetResponseTimeout, /* 5.8.0 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83477243fc..77edf0b4c4 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -8710,6 +8710,7 @@ static virHypervisorDriver hypervisor_driver = { .domainCheckpointGetParent = remoteDomainCheckpointGetParent, /* 5.6.0 */ .domainCheckpointDelete = remoteDomainCheckpointDelete, /* 5.6.0 */ .domainGetGuestInfo = remoteDomainGetGuestInfo, /* 5.7.0 */ + .domainAgentSetResponseTimeout = remoteDomainAgentSetResponseTimeout, /* 5.8.0 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index f4e3392212..23e42d17b1 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3744,6 +3744,16 @@ struct remote_connect_set_identity_args { unsigned int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + unsigned int flags; +}; + +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -6617,5 +6627,11 @@ enum remote_procedure { * @generate: client * @acl: connect:write */ - REMOTE_PROC_CONNECT_SET_IDENTITY = 419 + REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + + /** + * @generate: both + * @acl: domain:write + */ + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 51606e7473..9ad7a857e0 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -3114,6 +3114,14 @@ struct remote_connect_set_identity_args { } params; u_int flags; }; +struct remote_domain_agent_set_response_timeout_args { + remote_nonnull_domain dom; + int timeout; + u_int flags; +}; +struct remote_domain_agent_set_response_timeout_ret { + int result; +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3534,4 +3542,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_CHECKPOINT_DELETE = 417, REMOTE_PROC_DOMAIN_GET_GUEST_INFO = 418, REMOTE_PROC_CONNECT_SET_IDENTITY = 419, + REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420, }; -- 2.21.0

3 5

[libvirt] [PATCH] docs: hacking: add missing code element
by Ján Tomko 12 Nov '19

12 Nov '19

Wrap the 'g_renew()' call for VIR_SHRINK_N in <code>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. docs/hacking.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 5d13e4f71d..06deab9e90 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -1056,7 +1056,7 @@ BAD: <td>the newly added memory is not zeroed</td></tr> <tr><td><code>VIR_EXPAND_N</code></td><td><code>g_renew(var_t, ptr, n)</code></td> <td>zero the new memory manually or use an array type</td></tr> - <tr><td><code>VIR_SHRINK_N</code></td><td>g_renew(var_t, ptr, n)</td> + <tr><td><code>VIR_SHRINK_N</code></td><td><code>g_renew(var_t, ptr, n)</code></td> <td></td></tr> <tr><td><code>VIR_APPEND_ELEMENT</code></td><td><code>g_array_append_val</code></td> <td><code>g_ptr_array_add</code> or <code>g_byte_array_append</code></td></tr> -- 2.21.0

1 0

Re: [libvirt] [PATCH 00/75] Drop virAsprintf() in favor of g_strdup_printf()
by Michal Privoznik 12 Nov '19

12 Nov '19

On 11/11/19 12:00 AM, Daniel Henrique Barboza wrote: > Hey, > > On 10/22/19 10:57 AM, Michal Privoznik wrote: >> You can find these also on my github: >> >> https://github.com/zippy2/libvirt/tree/virasprintf_void >> >> Good luck. > > > What's the status on this? I am waiting this big boy to land upstream so > I can rebase and re-sent some stuff. > Sorry for the delay. We've been to KVM Forum and then I had to go through backlog. Anyway, this is not pushed. Thanks for all reviews. Michal

1 0

[libvirt] [PATCH] qemu: driver: Remove unused 'driver' from qemuDomainSnapshotFSFreeze/Thaw
by Peter Krempa 12 Nov '19

12 Nov '19

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 45363b0d6d..982a7d61cf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14496,8 +14496,7 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, * is sent but failed, and number of frozen filesystems on success. If -2 is * returned, FSThaw should be called revert the quiesced status. */ static int -qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver G_GNUC_UNUSED, - virDomainObjPtr vm, +qemuDomainSnapshotFSFreeze(virDomainObjPtr vm, const char **mountpoints, unsigned int nmountpoints) { @@ -14516,8 +14515,7 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver G_GNUC_UNUSED, /* Return -1 on error, otherwise number of thawed filesystems. */ static int -qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver G_GNUC_UNUSED, - virDomainObjPtr vm, +qemuDomainSnapshotFSThaw(virDomainObjPtr vm, bool report) { qemuAgentPtr agent; @@ -15617,7 +15615,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, goto cleanup; } - freeze = qemuDomainSnapshotFSFreeze(driver, vm, NULL, 0); + freeze = qemuDomainSnapshotFSFreeze(vm, NULL, 0); qemuDomainObjEndAgentJob(vm); if (freeze < 0) { @@ -15746,7 +15744,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, if (thaw != 0 && qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) >= 0 && virDomainObjIsActive(vm)) { - if (qemuDomainSnapshotFSThaw(driver, vm, ret == 0 && thaw > 0) < 0) { + if (qemuDomainSnapshotFSThaw(vm, ret == 0 && thaw > 0) < 0) { /* helper reported the error, if it was needed */ if (thaw > 0) ret = -1; @@ -20297,7 +20295,7 @@ qemuDomainFSFreeze(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - ret = qemuDomainSnapshotFSFreeze(driver, vm, mountpoints, nmountpoints); + ret = qemuDomainSnapshotFSFreeze(vm, mountpoints, nmountpoints); endjob: qemuDomainObjEndAgentJob(vm); @@ -20338,7 +20336,7 @@ qemuDomainFSThaw(virDomainPtr dom, if (virDomainObjCheckActive(vm) < 0) goto endjob; - ret = qemuDomainSnapshotFSThaw(driver, vm, true); + ret = qemuDomainSnapshotFSThaw(vm, true); endjob: qemuDomainObjEndAgentJob(vm); -- 2.23.0

2 1

[libvirt] [PATCH] src: Wrap long lines in Makefiles
by Michal Privoznik 12 Nov '19

12 Nov '19

In my previous commit of v5.9.0-83-g4ae7181376 I've fixed check-aclrules but whilst doing so, I forgot to wrap long lines that I've added. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/interface/Makefile.inc.am | 3 ++- src/network/Makefile.inc.am | 4 +++- src/nwfilter/Makefile.inc.am | 4 +++- src/secret/Makefile.inc.am | 4 +++- src/storage/Makefile.inc.am | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/interface/Makefile.inc.am b/src/interface/Makefile.inc.am index 7353bc4c82..34acdb7566 100644 --- a/src/interface/Makefile.inc.am +++ b/src/interface/Makefile.inc.am @@ -9,7 +9,8 @@ INTERFACE_DRIVER_NETCF_SOURCES = interface/interface_backend_netcf.c INTERFACE_DRIVER_UDEV_SOURCES = interface/interface_backend_udev.c DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(INTERFACE_DRIVER_SOURCES)) EXTRA_DIST += \ $(INTERFACE_DRIVER_SOURCES) \ diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 354c130f35..1cef1c7bce 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -17,7 +17,9 @@ NETWORK_LEASES_HELPER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES)) + EXTRA_DIST += \ $(NETWORK_DRIVER_SOURCES) \ $(NETWORK_DRIVER_PLATFORM_INC) \ diff --git a/src/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am index 7b57df3813..b51c8a5cda 100644 --- a/src/nwfilter/Makefile.inc.am +++ b/src/nwfilter/Makefile.inc.am @@ -19,7 +19,9 @@ NWFILTER_DRIVER_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(NWFILTER_DRIVER_SOURCES)) + EXTRA_DIST += $(NWFILTER_DRIVER_SOURCES) if WITH_NWFILTER diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am index 1ecea1ed4a..959d21099d 100644 --- a/src/secret/Makefile.inc.am +++ b/src/secret/Makefile.inc.am @@ -12,7 +12,9 @@ SECRET_UTIL_SOURCES = \ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES)) + EXTRA_DIST += \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 588df60652..3d453029a7 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -89,7 +89,9 @@ STORAGE_HELPER_DISK_SOURCES = \ $(NULL) DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) -STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) +STATEFUL_DRIVER_SOURCE_FILES += \ + $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES)) + EXTRA_DIST += \ $(STORAGE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_FS_SOURCES) \ -- 2.23.0

1 0

[libvirt] [PATCH] spec: fix vpath build on RHEL 7
by Pavel Hrdina 12 Nov '19

12 Nov '19

Macro _vpath_builddir is not defined so we have to define it ourselves. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index eb8b2df055..2374668722 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -36,6 +36,11 @@ %define qemu_kvm_arches x86_64 %{power64} aarch64 s390x %endif +# On RHEL 7 and older macro _vpath_builddir is not defined. +%if 0%{?rhel} <= 7 + %define _vpath_builddir %{_target_platform} +%endif + %ifarch %{qemu_kvm_arches} %define with_qemu_kvm %{with_qemu} %else -- 2.23.0

2 1

[libvirt] [PATCH 00/10] conf/caps: Modernize and clean up handling of domain caps
by Peter Krempa 12 Nov '19

12 Nov '19

Peter Krempa (10): qemu: caps: Rework memory allocation in virQEMUCapsFillDomainFeatureSEVCaps qemu: caps: Make capability filler functions void conf: domaincaps: Fix broken attempt at being const-correct conf: storagecaps: Fix broken attempt at being const-correct conf: Rename virDomainCapsFeature to virDomainProcessCapsFeature conf: caps: Automaticaly free 'cpus_str' conf: domain: Split up formatting of <memtune> and <memoryBacking> conf: turn virDomainMemtuneFormat void conf: caps: Modernize virCapabilitiesFormatCaches conf: capabilities: Modernize virCapabilitiesFormatMemoryBandwidth src/conf/capabilities.c | 36 +++++---------- src/conf/domain_capabilities.c | 32 ++++++------- src/conf/domain_capabilities.h | 4 +- src/conf/domain_conf.c | 30 ++++++------ src/conf/domain_conf.h | 82 ++++++++++++++++----------------- src/conf/storage_capabilities.c | 4 +- src/conf/storage_capabilities.h | 2 +- src/libvirt_private.syms | 2 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_container.c | 20 ++++---- src/lxc/lxc_native.c | 4 +- src/qemu/qemu_capabilities.c | 81 +++++++++++--------------------- 12 files changed, 132 insertions(+), 167 deletions(-) -- 2.23.0

3 17

[libvirt] [PATCH 0/6] qemu: Fix "Property '.pconfig' not found" error
by Jiri Denemark 12 Nov '19

12 Nov '19

The pconfig feature was enabled in QEMU by accident in 3.1.0. All other newer versions do not support it and it was removed from the Icelake-Server CPU model in QEMU. We don't normally change our CPU models even when QEMU does so to avoid breaking migrations between different versions of libvirt. But we can safely do so in this specific case. QEMU never supported enabling pconfig so any domain which was able to start has pconfig disabled. With a small compatibility hack which explicitly disables pconfig when CPU model equals Icelake-Server in migratable domain definition, only one migration scenario stays broken (and there's nothing we can do about it): from any host to a host with libvirt < 5.10.0 and QEMU > 3.1.0. https://bugzilla.redhat.com/show_bug.cgi?id=1749672 Jiri Denemark (6): cpu_conf: Pass policy to CPU feature filtering callbacks qemuxml2*test: Add tests for Icelake-Server,-pconfig qemu: Drop disabled CPU features unknown to QEMU cpu_map: Drop comments about ospke cputest: Add data for Ice Lake Server CPU cpu_map: Drop pconfig from Icelake-Server CPU model src/conf/cpu_conf.c | 6 +- src/conf/cpu_conf.h | 1 + src/cpu/cpu_x86.c | 13 +- src/cpu/cpu_x86.h | 2 + src/cpu_map/x86_Cascadelake-Server.xml | 2 - src/cpu_map/x86_Icelake-Client.xml | 2 - src/cpu_map/x86_Icelake-Server.xml | 3 - src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 23 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_migration_cookie.c | 3 + src/qemu/qemu_process.c | 32 + tests/cputest.c | 1 + .../x86_64-cpuid-Ice-Lake-Server-disabled.xml | 7 + .../x86_64-cpuid-Ice-Lake-Server-enabled.xml | 10 + .../x86_64-cpuid-Ice-Lake-Server-guest.xml | 35 + .../x86_64-cpuid-Ice-Lake-Server-host.xml | 36 + .../x86_64-cpuid-Ice-Lake-Server-json.xml | 16 + .../x86_64-cpuid-Ice-Lake-Server.json | 1142 +++++++++++++++++ .../x86_64-cpuid-Ice-Lake-Server.sig | 4 + .../x86_64-cpuid-Ice-Lake-Server.xml | 65 + ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 34 + ...-Icelake-Server-pconfig.x86_64-latest.args | 34 + .../cpu-Icelake-Server-pconfig.xml | 22 + tests/qemuxml2argvtest.c | 3 + ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 31 + ...u-Icelake-Server-pconfig.x86_64-latest.xml | 31 + tests/qemuxml2xmltest.c | 3 + 29 files changed, 1555 insertions(+), 11 deletions(-) create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.json create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.sig create mode 100644 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server.xml create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml create mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml -- 2.24.0

2 8

[libvirt] [PATCH 0/2] First round of out-of-tree build fixes
by Michal Privoznik 12 Nov '19

12 Nov '19

Some low hanging fruit here. There are more serious issues that I yet have to figure out: 1) docs/ is broken. Just open any site from your build directory. Our main.js lives in the source dir but we are trying to load it relative to build dir 2) Generation of acl.html is broken - it assumes aclperms.htmlinc file lives under $srcdir which is not true anymore => page that's generated is useless 3) I've tried to update Gentoo live ebuild, but it failed to compile: Making all in src make[2]: Entering directory '/var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999_build/src' ... /usr/bin/perl /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/genpolkit.pl < /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/access/viraccessperm.h > access/org.libvirt.api.policy || rm -f access/org.libvirt.api.policy /usr/bin/perl -w /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/rpc/gendispatch.pl --mode=aclheader \ remote REMOTE /var/tmp/portage/app-emulation/libvirt-9999/work/libvirt-9999/src/remote/remote_protocol.x \ > access/viraccessapicheck.h /bin/sh: access/org.libvirt.api.policy: No such file or directory The libvirt-9999_build/src/access dir doesn't exist (I'm surprised it wasn't created automatically by autotools since src/ was). I'll have to investigate further. Michal Prívozník (2): src: Make check-aclrules work again make check-driverimpls work again src/Makefile.am | 7 ++----- src/bhyve/Makefile.inc.am | 4 ++-- src/esx/Makefile.inc.am | 2 +- src/hyperv/Makefile.inc.am | 2 +- src/interface/Makefile.inc.am | 4 ++-- src/libxl/Makefile.inc.am | 4 ++-- src/lxc/Makefile.inc.am | 4 ++-- src/network/Makefile.inc.am | 4 ++-- src/node_device/Makefile.inc.am | 8 ++++---- src/nwfilter/Makefile.inc.am | 4 ++-- src/openvz/Makefile.inc.am | 2 +- src/phyp/Makefile.inc.am | 2 +- src/qemu/Makefile.inc.am | 4 ++-- src/remote/Makefile.inc.am | 2 +- src/secret/Makefile.inc.am | 4 ++-- src/storage/Makefile.inc.am | 4 ++-- src/test/Makefile.inc.am | 2 +- src/vbox/Makefile.inc.am | 4 ++-- src/vmware/Makefile.inc.am | 2 +- src/vz/Makefile.inc.am | 4 ++-- 20 files changed, 35 insertions(+), 38 deletions(-) -- 2.23.0

2 7