- Devel - libvirt List Archives

[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

[libvirt] [PATCH] storage: Don't get src in each loop since src is not changed
by 李义 12 Nov '19

12 Nov '19

The src of pool is not changed in each loop, so don't VIR_FREE(src) and get when next iteration. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/storage/storage_backend_fs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 02b8248..27c1098 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -258,10 +258,10 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) goto cleanup; } - while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { - if (!(src = virStorageBackendFileSystemGetPoolSource(pool))) - goto cleanup; + if ((src = virStorageBackendFileSystemGetPoolSource(pool)) == NULL) + goto cleanup; + while ((getmntent_r(mtab, &ent, buf, sizeof(buf))) != NULL) { /* compare both mount destinations and sources to be sure the mounted * FS pool is really the one we're looking for */ @@ -273,8 +273,6 @@ virStorageBackendFileSystemIsMounted(virStoragePoolObjPtr pool) ret = 1; goto cleanup; } - - VIR_FREE(src); } ret = 0; -- 2.7.5

2 1

[libvirt] [PATCH 0/4] consolidate cgroup code that is duplicated between
by Mao Zhongyi 12 Nov '19

12 Nov '19

Both QEMU and LXC drivers have some duplicate code when dealing with cgroups, this serials mainly consolidate the same chunk of src/qemu/qemu_cgroup.c and src/lxc/lxc_cgroup.c into src/util/cgroup.c. Mao Zhongyi (4): lxc: remove duplicate header files qemu: remove duplicate header files util: consolidate QEMU and LXC block io related duplicate code util: consolidate QEMU and LXC memory related duplicate code src/libvirt_private.syms | 2 + src/lxc/lxc_cgroup.c | 85 +------------------------------------ src/qemu/qemu_cgroup.c | 62 +-------------------------- src/util/vircgroup.c | 91 ++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 4 ++ 5 files changed, 101 insertions(+), 143 deletions(-) -- 2.17.1

2 7

[libvirt] [dbus PATCH] meson: fix construction of data directories
by Pavel Hrdina 12 Nov '19

12 Nov '19

We need to use prefix for all directories and there is no need to check if the user provided path starts with '/' as that is done automatically by the join_paths() function or '/' operator. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- meson.build | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build index 472e4e2..b293b8c 100644 --- a/meson.build +++ b/meson.build @@ -9,12 +9,30 @@ project( ], ) +prefix = get_option('prefix') +datadir = prefix / get_option('datadir') +sbindir = prefix / get_option('sbindir') + +opt_dirs = [ + 'dbus_interfaces', + 'dbus_services', + 'dbus_system_services', + 'dbus_system_policies', + 'polkit_rules', +] + +foreach opt_dir : opt_dirs + value = get_option(opt_dir) + varname = '@0@_dir'.format(opt_dir) + set_variable(varname, datadir / value) +endforeach + conf = configuration_data() conf.set('MESON_VERSION', '0.49.0') conf.set('PACKAGE', meson.project_name()) conf.set('VERSION', meson.project_version()) conf.set('build_root', meson.build_root()) -conf.set('sbindir', get_option('sbindir')) +conf.set('sbindir', sbindir) conf.set('source_root', meson.source_root()) @@ -40,24 +58,6 @@ git = run_command('test', '-d', '.git').returncode() == 0 conf.set('SYSTEM_USER', get_option('system_user')) -opt_dirs = [ - 'dbus_interfaces', - 'dbus_services', - 'dbus_system_services', - 'dbus_system_policies', - 'polkit_rules', -] - -foreach opt_dir : opt_dirs - value = get_option(opt_dir) - varname = '@0@_dir'.format(opt_dir) - if opt_dir.startswith('/') - set_variable(varname, value) - else - set_variable(varname, join_paths(get_option('datadir'), value)) - endif -endforeach - # Compile flags -- 2.21.0

2 1

[libvirt] [PATCH] qemu: snapshot: split out preparation of a snapshot with blockdev
by Peter Krempa 11 Nov '19

11 Nov '19

Separate the blockdev code since it makes the original function lenghty. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 96 ++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abfb540d80..45363b0d6d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15228,6 +15228,58 @@ qemuDomainSnapshotDiskCleanup(qemuDomainSnapshotDiskDataPtr data, } +static int +qemuDomainSnapshotDiskPrepareOneBlockdev(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainSnapshotDiskDataPtr dd, + virQEMUDriverConfigPtr cfg, + bool reuse, + virHashTablePtr blockNamedNodeData, + qemuDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivatePtr priv = vm->privateData; + g_autoptr(virStorageSource) terminator = NULL; + int rc; + + /* create a terminator for the snapshot disks so that qemu does not try + * to open them at first */ + if (!(terminator = virStorageSourceNew())) + return -1; + + if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, + priv, cfg) < 0) + return -1; + + if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, + terminator, + priv->qemuCaps))) + return -1; + + if (reuse) { + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + return -1; + + rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), + dd->crdata->srcdata[0]); + + if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) + return -1; + } else { + if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, + dd->src, dd->disk->src) < 0) + return -1; + + if (qemuBlockStorageSourceCreate(vm, dd->src, dd->disk->src, + NULL, dd->crdata->srcdata[0], + asyncJob) < 0) + return -1; + } + + dd->blockdevadded = true; + return 0; +} + + static int qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -15240,12 +15292,9 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, bool blockdev, qemuDomainAsyncJob asyncJob) { - qemuDomainObjPrivatePtr priv = vm->privateData; virDomainDiskDefPtr persistdisk; - g_autoptr(virStorageSource) terminator = NULL; bool supportsCreate; bool supportsBacking; - int rc; dd->disk = disk; @@ -15314,43 +15363,10 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver, dd->prepared = true; - if (blockdev) { - /* create a terminator for the snapshot disks so that qemu does not try - * to open them at first */ - if (!(terminator = virStorageSourceNew())) - return -1; - - if (qemuDomainPrepareStorageSourceBlockdev(dd->disk, dd->src, - priv, cfg) < 0) - return -1; - - if (!(dd->crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(dd->src, - terminator, - priv->qemuCaps))) - return -1; - - if (reuse) { - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) - return -1; - - rc = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), - dd->crdata->srcdata[0]); - - if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) - return -1; - } else { - if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData, - dd->src, dd->disk->src) < 0) - return -1; - - if (qemuBlockStorageSourceCreate(vm, dd->src, dd->disk->src, - NULL, dd->crdata->srcdata[0], - asyncJob) < 0) - return -1; - } - - dd->blockdevadded = true; - } + if (blockdev && + qemuDomainSnapshotDiskPrepareOneBlockdev(driver, vm, dd, cfg, reuse, + blockNamedNodeData, asyncJob) < 0) + return -1; return 0; } -- 2.23.0

2 1

[libvirt] [PATCH] qemu: command: Use XML based disk bus convertor in error message
by Peter Krempa 11 Nov '19

11 Nov '19

The qemu driver has an internal implementation for converting disk bus to string for use with qemu. This should not be used in error messages though as we want to report the string based on the XML value. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f37aecda37..3806cbbaf9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1303,7 +1303,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, disk->bus != VIR_DOMAIN_DISK_BUS_SCSI) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk device='lun' is not supported for bus='%s'"), - virDomainDiskQEMUBusTypeToString(disk->bus)); + virDomainDiskBusTypeToString(disk->bus)); return -1; } -- 2.23.0

2 1

[libvirt] [PATCH] util: pci: Remove always-false condition
by Peter Krempa 11 Nov '19

11 Nov '19

Commit d19c21429fd modified the condition so that it checks whether the value is more than 0xFFFFFFFF. Since addr->domain is an unsigned int, it will never be more than that. Remove the whole check src/util/virpci.c:1291:22: error: result of comparison 'unsigned int' > 4294967295 is always false [-Werror,-Wtautological-type-limit-compare] if (addr->domain > 0xFFFFFFFF) { ~~~~~~~~~~~~ ^ ~~~~~~~~~~ Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This was caught by new clang: $ clang -v clang version 9.0.0 (Fedora 9.0.0-1.fc31) This "fix" is the naive approach which assumes the original patch was correct. src/util/virpci.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index f9e39e79d8..cd560d683b 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1288,14 +1288,6 @@ bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, bool report) { - if (addr->domain > 0xFFFFFFFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address domain='0x%x', " - "must be <= 0xFFFF"), - addr->domain); - return false; - } if (addr->bus > 0xFF) { if (report) virReportError(VIR_ERR_XML_ERROR, -- 2.23.0

1 1

[libvirt] [PATCH 0/2] Couple of fixes for exported stuff
by Peter Krempa 11 Nov '19

11 Nov '19

Peter Krempa (2): datatypes: Fix comment for the _virNetwork struct syms: Add 'global:' keyword to LIBVIRT_5.8 section src/datatypes.h | 2 +- src/libvirt_public.syms | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.23.0

2 4

[libvirt] [PATCH 0/8] Coverity related patches
by John Ferlan 11 Nov '19

11 Nov '19

Some related to "new-ish" changes that have caused Coverity to discover new issues and some from older changes from a pile of 50 or so that are not essentially "false positives". John Ferlan (8): vbox: Fix possible NULL deref conf: Remove ATTRIBUTE_NONNULL for virDomainQemuMonitorEventNew tests: Fix memory leak in mymain lxc: Remove unnecessary comment tests: Remove _NULLABLE in virNetDevExists mock qemu: Fix possible NULL deref in qemuDomainSaveImageStartVM tests: Add return value check in checkUserInfo tests: Fix logic to not have possible NULL deref src/conf/domain_event.c | 6 +++++- src/conf/domain_event.h | 2 +- src/lxc/lxc_container.c | 5 ----- src/qemu/qemu_driver.c | 2 +- src/vbox/vbox_common.c | 4 ++-- tests/qemuagenttest.c | 4 +++- tests/qemuhotplugtest.c | 3 +-- tests/qemuxml2argvmock.c | 2 +- tests/virbitmaptest.c | 6 ++++-- 9 files changed, 18 insertions(+), 16 deletions(-) -- 2.20.1

3 10

[libvirt] [PATCH] util: Fix segmentation fault when seclabel fails to allocate memory
by jcfaracco＠gmail.com 11 Nov '19

11 Nov '19

From: Julio Faracco <jcfaracco(a)gmail.com> In function virSecurityDeviceLabelDefNew(), when libvirt fails to allocate seclabel structure it returns a failure. This case is setting seclabel as a NULL pointer and accessing its attribute below. This commit fixes this wrong logic. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virseclabel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virseclabel.c b/src/util/virseclabel.c index a2b5ebf6b7..2141d84210 100644 --- a/src/util/virseclabel.c +++ b/src/util/virseclabel.c @@ -77,7 +77,7 @@ virSecurityDeviceLabelDefNew(const char *model) if (VIR_ALLOC(seclabel) < 0) { virSecurityDeviceLabelDefFree(seclabel); - seclabel = NULL; + return NULL; } seclabel->model = g_strdup(model); -- 2.20.1

2 1

[libvirt] [dockerfiles PATCH 0/3] Refresh after recent changes
by Andrea Bolognani 11 Nov '19

11 Nov '19

Pushed under the Dockerfiles refresh rules. As usual, patches as sent to the list don't apply and are to be considered informational only. Andrea Bolognani (3): Drop Fedora 29 Add Fedora 31 Refresh afted adding python3-docutils for libvirt buildenv-libosinfo-fedora-29.zip | Bin 544 -> 0 bytes buildenv-libosinfo-fedora-31.zip | Bin 0 -> 544 bytes buildenv-libvirt-centos-7.zip | Bin 759 -> 765 bytes buildenv-libvirt-debian-10-cross-aarch64.zip | Bin 1010 -> 1016 bytes buildenv-libvirt-debian-10-cross-armv6l.zip | Bin 1003 -> 1009 bytes buildenv-libvirt-debian-10-cross-armv7l.zip | Bin 1008 -> 1013 bytes buildenv-libvirt-debian-10-cross-i686.zip | Bin 1001 -> 1008 bytes buildenv-libvirt-debian-10-cross-mips.zip | Bin 997 -> 1003 bytes buildenv-libvirt-debian-10-cross-mips64el.zip | Bin 1011 -> 1017 bytes buildenv-libvirt-debian-10-cross-mipsel.zip | Bin 1001 -> 1007 bytes buildenv-libvirt-debian-10-cross-ppc64le.zip | Bin 1012 -> 1019 bytes buildenv-libvirt-debian-10-cross-s390x.zip | Bin 1000 -> 1006 bytes buildenv-libvirt-debian-10.zip | Bin 898 -> 904 bytes buildenv-libvirt-debian-9-cross-aarch64.zip | Bin 1042 -> 1048 bytes buildenv-libvirt-debian-9-cross-armv6l.zip | Bin 1033 -> 1039 bytes buildenv-libvirt-debian-9-cross-armv7l.zip | Bin 1039 -> 1045 bytes buildenv-libvirt-debian-9-cross-mips.zip | Bin 1033 -> 1039 bytes buildenv-libvirt-debian-9-cross-mips64el.zip | Bin 1041 -> 1051 bytes buildenv-libvirt-debian-9-cross-mipsel.zip | Bin 1036 -> 1043 bytes buildenv-libvirt-debian-9-cross-ppc64le.zip | Bin 1045 -> 1053 bytes buildenv-libvirt-debian-9-cross-s390x.zip | Bin 1034 -> 1040 bytes buildenv-libvirt-debian-9.zip | Bin 927 -> 934 bytes buildenv-libvirt-debian-sid-cross-aarch64.zip | Bin 1010 -> 1015 bytes buildenv-libvirt-debian-sid-cross-armv6l.zip | Bin 1003 -> 1009 bytes buildenv-libvirt-debian-sid-cross-armv7l.zip | Bin 1008 -> 1013 bytes buildenv-libvirt-debian-sid-cross-i686.zip | Bin 1001 -> 1008 bytes buildenv-libvirt-debian-sid-cross-mips.zip | Bin 1000 -> 1006 bytes ...denv-libvirt-debian-sid-cross-mips64el.zip | Bin 1014 -> 1017 bytes buildenv-libvirt-debian-sid-cross-mipsel.zip | Bin 1005 -> 1011 bytes buildenv-libvirt-debian-sid-cross-ppc64le.zip | Bin 1012 -> 1018 bytes buildenv-libvirt-debian-sid-cross-s390x.zip | Bin 1000 -> 1006 bytes buildenv-libvirt-debian-sid.zip | Bin 898 -> 904 bytes buildenv-libvirt-fedora-29.zip | Bin 768 -> 0 bytes buildenv-libvirt-fedora-30.zip | Bin 891 -> 897 bytes buildenv-libvirt-fedora-31.zip | Bin 0 -> 776 bytes buildenv-libvirt-fedora-rawhide.zip | Bin 788 -> 796 bytes buildenv-libvirt-ubuntu-16.zip | Bin 933 -> 939 bytes buildenv-libvirt-ubuntu-18.zip | Bin 935 -> 941 bytes 38 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 buildenv-libosinfo-fedora-29.zip create mode 100644 buildenv-libosinfo-fedora-31.zip delete mode 100644 buildenv-libvirt-fedora-29.zip create mode 100644 buildenv-libvirt-fedora-31.zip -- 2.21.0

1 3

[libvirt] [PATCH] spec: fix rpm build with VPATH
by Pavel Hrdina 11 Nov '19

11 Nov '19

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- libvirt.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 723ced3535..eb8b2df055 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1532,7 +1532,7 @@ exit 0 %files docs %doc AUTHORS ChangeLog NEWS README README.md -%doc libvirt-docs/* +%doc %{_vpath_builddir}/libvirt-docs/* %files daemon @@ -1892,7 +1892,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests %attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh -%files libs -f %{name}.lang +%files libs -f %{_vpath_builddir}/%{name}.lang %license COPYING COPYING.LESSER %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf -- 2.23.0

2 1

[libvirt] [PATCH] src: lxc: Fix typo in a Makefile variable
by Michal Privoznik 11 Nov '19

11 Nov '19

In commit 0985a9597bb0348d46c0d18dc548a676bf0ad8e2 we stopped distributing generated source file. This is done by prepending binary_SOURCES variable with "nodist_". However, there is a typo - the prefix is "nodst_" instead of "nodist_". Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/lxc/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am index d3a7cbf93b..6aaec09fb4 100644 --- a/src/lxc/Makefile.inc.am +++ b/src/lxc/Makefile.inc.am @@ -127,7 +127,7 @@ augeastest_DATA += lxc/test_virtlxcd.aug CLEANFILES += lxc/virtlxcd.aug virtlxcd_SOURCES = $(REMOTE_DAEMON_SOURCES) -nodst_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED) +nodist_virtlxcd_SOURCES = $(REMOTE_DAEMON_GENERATED) virtlxcd_CFLAGS = \ $(REMOTE_DAEMON_CFLAGS) \ -DDAEMON_NAME="\"virtlxcd\"" \ -- 2.23.0

1 0

[libvirt] [PATCH 0/5] Update news for versions from 5.7 to 5.8
by Han Han 11 Nov '19

11 Nov '19

Han Han (5): news: Support for kvm dedicated performance hint in 5.7 news: Support unmanaged macvtap devices in 5.8 news: Support to run SLIRP networking in a separate process in 5.8 news: Support vhost-user-gpu in 5.8 news: Introduce virConnectSetIdentity API in 5.8 docs/news.xml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) -- 2.24.0.rc1

4 10

[libvirt] [PATCH] src: add missing include access path for bhyve and vz drivers
by Pavel Hrdina 08 Nov '19

08 Nov '19

Commit <b98f90cf913965243c6e2c49a52aa170a48093ef> forgot to update bhyve and vz Makefile files as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/bhyve/Makefile.inc.am | 1 + src/vz/Makefile.inc.am | 1 + 2 files changed, 2 insertions(+) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am index de9fbe9239..1fc100d5ab 100644 --- a/src/bhyve/Makefile.inc.am +++ b/src/bhyve/Makefile.inc.am @@ -42,6 +42,7 @@ libvirt_driver_bhyve_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_bhyve_impl_la_CFLAGS = \ -I$(srcdir)/access \ + -I$(builddir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) \ $(NULL) diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index 1757c8ba10..acada11148 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -29,6 +29,7 @@ libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) libvirt_driver_vz_impl_la_CFLAGS = \ -I$(srcdir)/conf \ -I$(srcdir)/access \ + -I$(builddir)/access \ $(AM_CFLAGS) \ $(PARALLELS_SDK_CFLAGS) \ $(LIBNL_CFLAGS) \ -- 2.23.0

1 0

[libvirt] [jenkins-ci PATCH v2] Add python3-docutils package for libvirt
by Daniel P. Berrangé 08 Nov '19

08 Nov '19

This is needed to acquire the rst2html command line tool Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index ba0f1cf..81d0916 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -795,6 +795,11 @@ mappings: default: polkit deb: policykit-1 + python3-docutils: + default: python3-docutils + CentOS7: python36-docutils + FreeBSD: py36-docutils + python2: default: python Fedora: python2 diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 8fcb286..780a5aa 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -46,6 +46,7 @@ packages: - openwsman - parted - polkit + - python3-docutils - qemu-img - radvd - readline -- 2.23.0

2 2