- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] cfg.mk: Prohibit backspace alignment attempts
by Andrea Bolognani 31 Oct '17

31 Oct '17

2 3

[libvirt] [PATCH RFC 0/2] virsh: Introduce basic autocompletion
by Michal Privoznik 31 Oct '17

31 Oct '17

This is supposed to go on the top of: https://www.redhat.com/archives/libvir-list/2017-October/msg01367.html Before digging any deeper to this hole I want to make sure that this approach is acceptable. So how does this work. The idea is to have handful of generic functions that fetch names (so called completers). Basically, one completer per each libvirt object. The returned names are then matched against (partial) user input and only matching strings are then offered to the user. Moreover, among having .completer each option has .completer_flags which can refine the completer's behaviour. For instance, in 2/2 I'm introducing virshDomainNameCompleter() which does nothing more than virConnectListAllDomains(). However, since it doesn't make much sense to start already running domain, for the 'start' command .completer_flags is set to VIR_CONNECT_LIST_DOMAINS_INACTIVE so that only inactive domains are returned in the list. What is missing? What is implemented here are vshCmdOptDef completers. The general vshCmdDef completers are still missing. Therefore: virsh # start --domain<TAB><TAB> works and lists inactive domains, but: virsh # start<TAB><TAB> doesn't (well, apart from offering options for the 'start' command). While that would be certainly nice feature to have, it'd require more work, because some arguments are "implicit" based on position. For instance: virsh # attach-interface fedora network default which is equivalent to: virsh # attach-interface --domain fedora --type network --source default Also, bash autocompletion is missing. The idea there is to have an unlisted virsh command that the bash script can call in order to fetch list of options. But again, no movement in that area yet. Michal Privoznik (2): vsh: Call vshCmdOptDef.completer properly virsh: Introduce virshDomainNameCompleter tools/virsh-domain-monitor.c | 30 +++---- tools/virsh-domain.c | 182 ++++++++++++++++++++++--------------------- tools/virsh-snapshot.c | 24 +++--- tools/virsh.c | 43 ++++++++++ tools/virsh.h | 8 +- tools/vsh.c | 45 ++++++----- 6 files changed, 194 insertions(+), 138 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH RFC] lib: provide error message in new blockjob event
by Nikolay Shirokovskiy 31 Oct '17

31 Oct '17

If block job is completed with error qemu additionally provides error message. This patch introduces new event VIR_DOMAIN_EVENT_ID_BLOCK_JOB_3 to pass error message to client. --- The patch is applied on top of [1] patch series (not yet pushed though). Looks like this patch consists of too much boilerplate code only to pass extra string parameter for blockjob event but looks like there is no other way now. Especially ugly looking is adding event3 in src/qemu/qemu_blockjob.c. Actually there is old RFC for providing error message for blockjob event [2]. Hope this one gain more attention. [1] https://www.redhat.com/archives/libvir-list/2017-October/msg01292.html [2] https://www.redhat.com/archives/libvir-list/2016-December/msg00093.html daemon/remote.c | 47 ++++++++++++++++++++++++++++++++ examples/object-events/event-test.c | 21 +++++++++++++++ include/libvirt/libvirt-domain.h | 23 ++++++++++++++++ src/conf/domain_event.c | 54 ++++++++++++++++++++++++++++++++----- src/conf/domain_event.h | 13 +++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_blockjob.c | 9 +++++-- src/qemu/qemu_blockjob.h | 3 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 10 ++++--- src/qemu/qemu_process.c | 12 ++++++--- src/remote/remote_driver.c | 34 +++++++++++++++++++++++ src/remote/remote_protocol.x | 17 +++++++++++- src/remote_protocol-structs | 9 +++++++ tools/virsh-domain.c | 25 +++++++++++++++++ 15 files changed, 264 insertions(+), 16 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 3f7d2d3..a5b87e6 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1342,6 +1342,52 @@ remoteRelayDomainEventBlockThreshold(virConnectPtr conn, } +static int +remoteRelayDomainEventBlockJob3(virConnectPtr conn, + virDomainPtr dom, + const char *dst, + int type, + int status, + const char *error, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_domain_event_block_job_3_msg data; + + if (callback->callbackID < 0 || + !remoteRelayDomainEventCheckACL(callback->client, conn, dom)) + return -1; + + VIR_DEBUG("Relaying domain block job 3 event %s %d %s %i, %i, %s, callback %d", + dom->name, dom->id, dst, type, status, NULLSTR(error), + callback->callbackID); + + /* build return data */ + memset(&data, 0, sizeof(data)); + data.callbackID = callback->callbackID; + if (VIR_STRDUP(data.dst, dst) < 0) + return -1; + if (error) { + if (VIR_ALLOC(data.error) < 0 || + VIR_STRDUP(*(data.error), error) < 0) + goto error; + } + data.type = type; + data.status = status; + make_nonnull_domain(&data.dom, dom); + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_3, + (xdrproc_t)xdr_remote_domain_event_block_job_3_msg, &data); + return 0; + + error: + VIR_FREE(data.dst); + VIR_FREE(data.error); + + return -1; +} + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventReboot), @@ -1368,6 +1414,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemovalFailed), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMetadataChange), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockThreshold), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockJob3), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index a144638..623dbd6 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -936,6 +936,26 @@ myDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED, static int +myDomainEventBlockJob3Callback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *disk, + int type, + int status, + void *opaque, + const char *error) +{ + const char *eventName = opaque; + + printf("%s EVENT: Domain %s(%d) block job callback '%s' disk '%s', " + "type '%s' status '%s' error '%s'", + __func__, virDomainGetName(dom), virDomainGetID(dom), eventName, + disk, blockJobTypeToStr(type), blockJobStatusToStr(status), + NULLSTR(error)); + return 0; +} + + +static int myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, const char *dev, @@ -1082,6 +1102,7 @@ struct domainEventData domainEvents[] = { DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, myDomainEventMetadataChangeCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD, myDomainEventBlockThresholdCallback), + DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_3, myDomainEventBlockJob3Callback), }; struct storagePoolEventData { diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf..4f942da 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4363,6 +4363,28 @@ typedef void (*virConnectDomainEventBlockThresholdCallback)(virConnectPtr conn, unsigned long long excess, void *opaque); + +/** + * virConnectDomainEventBlockJob3Callback: + * @conn: connection object + * @dom: domain on which the event occurred + * @disk: name associated with the affected disk (filename or target + * device, depending on how the callback was registered) + * @type: type of block job (virDomainBlockJobType) + * @status: status of the operation (virConnectDomainEventBlockJobStatus) + * @error: error string + * @opaque: application specified data + * + */ + + +typedef void (*virConnectDomainEventBlockJob3Callback)(virConnectPtr conn, + virDomainPtr dom, + const char *disk, + int type, + int status, + const char *error, + void *opaque); /** * VIR_DOMAIN_EVENT_CALLBACK: * @@ -4405,6 +4427,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /* virConnectDomainEventDeviceRemovalFailedCallback */ VIR_DOMAIN_EVENT_ID_METADATA_CHANGE = 23, /* virConnectDomainEventMetadataChangeCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD = 24, /* virConnectDomainEventBlockThresholdCallback */ + VIR_DOMAIN_EVENT_ID_BLOCK_JOB_3 = 25, /* virConnectDomainEventBlockJob3Callback */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 7baccd5..2ea170d 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -145,6 +145,7 @@ struct _virDomainEventBlockJob { virDomainEvent parent; char *disk; /* path or dst, depending on event id */ + char *error; int type; int status; }; @@ -501,6 +502,7 @@ virDomainEventBlockJobDispose(void *obj) VIR_DEBUG("obj=%p", event); VIR_FREE(event->disk); + VIR_FREE(event->error); } static void @@ -995,7 +997,8 @@ virDomainEventBlockJobNew(int event, unsigned char *uuid, const char *disk, int type, - int status) + int status, + const char *error) { virDomainEventBlockJobPtr ev; @@ -1007,7 +1010,8 @@ virDomainEventBlockJobNew(int event, id, name, uuid))) return NULL; - if (VIR_STRDUP(ev->disk, disk) < 0) { + if (VIR_STRDUP(ev->disk, disk) < 0 || + VIR_STRDUP(ev->error, error) < 0) { virObjectUnref(ev); return NULL; } @@ -1025,7 +1029,7 @@ virDomainEventBlockJobNewFromObj(virDomainObjPtr obj, { return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB, obj->def->id, obj->def->name, - obj->def->uuid, path, type, status); + obj->def->uuid, path, type, status, NULL); } virObjectEventPtr @@ -1036,7 +1040,7 @@ virDomainEventBlockJobNewFromDom(virDomainPtr dom, { return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB, dom->id, dom->name, dom->uuid, - path, type, status); + path, type, status, NULL); } virObjectEventPtr @@ -1047,7 +1051,7 @@ virDomainEventBlockJob2NewFromObj(virDomainObjPtr obj, { return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, obj->def->id, obj->def->name, - obj->def->uuid, dst, type, status); + obj->def->uuid, dst, type, status, NULL); } virObjectEventPtr @@ -1058,7 +1062,31 @@ virDomainEventBlockJob2NewFromDom(virDomainPtr dom, { return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, dom->id, dom->name, dom->uuid, - dst, type, status); + dst, type, status, NULL); +} + +virObjectEventPtr +virDomainEventBlockJob3NewFromObj(virDomainObjPtr obj, + const char *dst, + int type, + int status, + const char *error) +{ + return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_3, + obj->def->id, obj->def->name, + obj->def->uuid, dst, type, status, error); +} + +virObjectEventPtr +virDomainEventBlockJob3NewFromDom(virDomainPtr dom, + const char *dst, + int type, + int status, + const char *error) +{ + return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_3, + dom->id, dom->name, dom->uuid, + dst, type, status, error); } virObjectEventPtr @@ -1871,6 +1899,20 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; } + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB_3: + { + virDomainEventBlockJobPtr blockJobEvent; + + blockJobEvent = (virDomainEventBlockJobPtr)event; + ((virConnectDomainEventBlockJob3Callback)cb)(conn, dom, + blockJobEvent->disk, + blockJobEvent->type, + blockJobEvent->status, + blockJobEvent->error, + cbopaque); + goto cleanup; + } + case VIR_DOMAIN_EVENT_ID_DISK_CHANGE: { virDomainEventDiskChangePtr diskChangeEvent; diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 3992a29..1a0f16b 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -138,6 +138,19 @@ virDomainEventBlockJob2NewFromDom(virDomainPtr dom, int status); virObjectEventPtr +virDomainEventBlockJob3NewFromObj(virDomainObjPtr obj, + const char *dst, + int type, + int status, + const char *error); +virObjectEventPtr +virDomainEventBlockJob3NewFromDom(virDomainPtr dom, + const char *dst, + int type, + int status, + const char *error); + +virObjectEventPtr virDomainEventDiskChangeNewFromObj(virDomainObjPtr obj, const char *oldSrcPath, const char *newSrcPath, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 448d962..5f0a212 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -562,6 +562,8 @@ virDomainEventBalloonChangeNewFromDom; virDomainEventBalloonChangeNewFromObj; virDomainEventBlockJob2NewFromDom; virDomainEventBlockJob2NewFromObj; +virDomainEventBlockJob3NewFromDom; +virDomainEventBlockJob3NewFromObj; virDomainEventBlockJobNewFromDom; virDomainEventBlockJobNewFromObj; virDomainEventBlockThresholdNewFromDom; diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 0b1616a..5266823 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -70,7 +70,8 @@ qemuBlockJobUpdate(virQEMUDriverPtr driver, if (status != -1) { qemuBlockJobEventProcess(driver, vm, disk, asyncJob, diskPriv->blockJobType, - diskPriv->blockJobStatus); + diskPriv->blockJobStatus, + diskPriv->blockJobError); diskPriv->blockJobStatus = -1; if (error) VIR_STEAL_PTR(*error, diskPriv->blockJobError); @@ -100,10 +101,12 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, virDomainDiskDefPtr disk, qemuDomainAsyncJob asyncJob, int type, - int status) + int status, + const char *error) { virObjectEventPtr event = NULL; virObjectEventPtr event2 = NULL; + virObjectEventPtr event3 = NULL; const char *path; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virDomainDiskDefPtr persistDisk = NULL; @@ -123,6 +126,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, path = virDomainDiskGetSource(disk); event = virDomainEventBlockJobNewFromObj(vm, path, type, status); event2 = virDomainEventBlockJob2NewFromObj(vm, disk->dst, type, status); + event3 = virDomainEventBlockJob3NewFromObj(vm, disk->dst, type, status, error); /* If we completed a block pull or commit, then update the XML * to match. */ @@ -212,6 +216,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event2); + qemuDomainEventQueue(driver, event3); virObjectUnref(cfg); } diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index e71d691..18bcaaa 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -36,7 +36,8 @@ void qemuBlockJobEventProcess(virQEMUDriverPtr driver, virDomainDiskDefPtr disk, qemuDomainAsyncJob asyncJob, int type, - int status); + int status, + const char *error); void qemuBlockJobSyncBegin(virDomainDiskDefPtr disk); void qemuBlockJobSyncEnd(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 735e810..99a71b3 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -457,6 +457,7 @@ struct qemuProcessEvent { int action; int status; void *data; + char *error; }; typedef struct _qemuDomainLogContext qemuDomainLogContext; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 725b46a..c6626bb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4715,7 +4715,8 @@ processBlockJobEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, char *diskAlias, int type, - int status) + int status, + char *error) { virDomainDiskDefPtr disk; @@ -4728,12 +4729,14 @@ processBlockJobEvent(virQEMUDriverPtr driver, } if ((disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias))) - qemuBlockJobEventProcess(driver, vm, disk, QEMU_ASYNC_JOB_NONE, type, status); + qemuBlockJobEventProcess(driver, vm, disk, QEMU_ASYNC_JOB_NONE, + type, status, error); endjob: qemuDomainObjEndJob(driver, vm); cleanup: VIR_FREE(diskAlias); + VIR_FREE(error); } @@ -4815,7 +4818,8 @@ static void qemuProcessEventHandler(void *data, void *opaque) processBlockJobEvent(driver, vm, processEvent->data, processEvent->action, - processEvent->status); + processEvent->status, + processEvent->error); break; case QEMU_PROCESS_EVENT_MONITOR_EOF: processMonitorEOFEvent(driver, vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4bfad5d..6a3d9bc 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1008,6 +1008,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk; qemuDomainDiskPrivatePtr diskPriv; char *data = NULL; + char *errorCopy = NULL; virObjectLock(vm); @@ -1018,13 +1019,14 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, goto error; diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); + ignore_value(VIR_STRDUP_QUIET(errorCopy, error)); + if (diskPriv->blockJobSync) { /* We have a SYNC API waiting for this event, dispatch it back */ diskPriv->blockJobType = type; diskPriv->blockJobStatus = status; VIR_FREE(diskPriv->blockJobError); - if (error && VIR_STRDUP_QUIET(diskPriv->blockJobError, error) < 0) - VIR_WARN("Can not pass error message further: %s", error); + VIR_STEAL_PTR(diskPriv->blockJobError, errorCopy); virDomainObjBroadcast(vm); } else { /* there is no waiting SYNC API, dispatch the update to a thread */ @@ -1038,6 +1040,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, processEvent->vm = vm; processEvent->action = type; processEvent->status = status; + VIR_STEAL_PTR(processEvent->error, errorCopy); virObjectRef(vm); if (virThreadPoolSendJob(driver->workerPool, 0, processEvent) < 0) { @@ -1047,11 +1050,14 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, } cleanup: + VIR_FREE(errorCopy); virObjectUnlock(vm); return 0; error: - if (processEvent) + if (processEvent) { VIR_FREE(processEvent->data); + VIR_FREE(processEvent->error); + } VIR_FREE(processEvent); goto cleanup; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 06719bb..c73461d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -405,6 +405,11 @@ remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRIBUTE_U virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque); +static void +remoteDomainBuildEventBlockJob3(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + static virNetClientProgramEvent remoteEvents[] = { { REMOTE_PROC_DOMAIN_EVENT_LIFECYCLE, remoteDomainBuildEventLifecycle, @@ -611,6 +616,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteDomainBuildEventBlockThreshold, sizeof(remote_domain_event_block_threshold_msg), (xdrproc_t)xdr_remote_domain_event_block_threshold_msg }, + { REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_3, + remoteDomainBuildEventBlockJob3, + sizeof(remote_domain_event_block_job_3_msg), + (xdrproc_t)xdr_remote_domain_event_block_job_3_msg }, }; static void @@ -5610,6 +5619,31 @@ remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog ATTRIBUTE_UNUSE } +static void +remoteDomainBuildEventBlockJob3(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + remote_domain_event_block_job_3_msg *msg = evdata; + struct private_data *priv = conn->privateData; + virDomainPtr dom; + virObjectEventPtr event = NULL; + + dom = get_nonnull_domain(conn, msg->dom); + if (!dom) + return; + + event = virDomainEventBlockJob3NewFromDom(dom, msg->dst, msg->type, + msg->status, + msg->error ? *msg->error : NULL); + + virObjectUnref(dom); + + remoteEventQueue(priv, event, msg->callbackID); +} + + static int remoteStreamSend(virStreamPtr st, const char *data, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 0aed252..371b640 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3095,6 +3095,15 @@ struct remote_domain_event_block_job_2_msg { int status; }; +struct remote_domain_event_block_job_3_msg { + int callbackID; + remote_nonnull_domain dom; + remote_nonnull_string dst; + remote_string error; + int type; + int status; +}; + struct remote_domain_event_block_threshold_msg { int callbackID; remote_nonnull_domain dom; @@ -6120,5 +6129,11 @@ enum remote_procedure { * @generate: both * @acl: domain:write */ - REMOTE_PROC_DOMAIN_SET_LIFECYCLE_ACTION = 390 + REMOTE_PROC_DOMAIN_SET_LIFECYCLE_ACTION = 390, + + /** + * @generate: none + * @acl: none + */ + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_3 = 391 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 59b0ace..b8f4065 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2535,6 +2535,14 @@ struct remote_domain_event_block_job_2_msg { int type; int status; }; +struct remote_domain_event_block_job_3_msg { + int callbackID; + remote_nonnull_domain dom; + remote_nonnull_string dst; + remote_string error; + int type; + int status; +}; struct remote_domain_event_block_threshold_msg { int callbackID; remote_nonnull_domain dom; @@ -3262,4 +3270,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_MANAGED_SAVE_GET_XML_DESC = 388, REMOTE_PROC_DOMAIN_MANAGED_SAVE_DEFINE_XML = 389, REMOTE_PROC_DOMAIN_SET_LIFECYCLE_ACTION = 390, + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_3 = 391, }; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1e33e82..6377c91 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -13253,6 +13253,29 @@ virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, } +static void +virshEventBlockJob3Print(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *disk, + int type, + int status, + const char *error, + void *opaque) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAsprintf(&buf, _("event '%s' for domain %s: %s for %s %s, " + "error: %s\n"), + ((virshDomEventData *) opaque)->cb->name, + virDomainGetName(dom), + virshDomainBlockJobToString(type), + disk, + virshDomainBlockJobStatusToString(status), + NULLSTR(error)); + virshEventPrint(opaque, &buf); +} + + static vshEventCallback vshEventCallbacks[] = { { "lifecycle", VIR_DOMAIN_EVENT_CALLBACK(virshEventLifecyclePrint), }, @@ -13302,6 +13325,8 @@ static vshEventCallback vshEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), }, { "block-threshold", VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockThresholdPrint), }, + { "block-job-3", + VIR_DOMAIN_EVENT_CALLBACK(virshEventBlockJob3Print), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 1.8.3.1

2 4

[libvirt] [PATCH] virsh: Define multi line macros properly
by Michal Privoznik 31 Oct '17

31 Oct '17

In some cases there's dangling backward slash at the end of multi line macros. While technically the code works, it will stop if some empty lines are removed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 20 ++++++++++---------- tools/virsh-interface.c | 2 +- tools/virsh-network.c | 2 +- tools/virsh-pool.c | 10 +++++----- tools/virsh-snapshot.c | 2 +- tools/virsh-volume.c | 8 ++++---- tools/virsh.h | 12 ++++++------ tools/virt-host-validate-bhyve.c | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 35d04b22a..e09508248 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -41,7 +41,7 @@ #include "virstring.h" #define VIRSH_COMMON_OPT_DOMAIN_FULL \ - VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) \ + VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) VIR_ENUM_DECL(virshDomainIOError) VIR_ENUM_IMPL(virshDomainIOError, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1e33e8295..53ce5b82f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -66,22 +66,22 @@ #endif #define VIRSH_COMMON_OPT_DOMAIN_FULL \ - VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) \ + VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \ {.name = "persistent", \ .type = VSH_OT_BOOL, \ .help = N_("make live change persistent") \ - } \ + } #define VIRSH_COMMON_OPT_DOMAIN_CONFIG \ - VIRSH_COMMON_OPT_CONFIG(N_("affect next boot")) \ + VIRSH_COMMON_OPT_CONFIG(N_("affect next boot")) #define VIRSH_COMMON_OPT_DOMAIN_LIVE \ - VIRSH_COMMON_OPT_LIVE(N_("affect running domain")) \ + VIRSH_COMMON_OPT_LIVE(N_("affect running domain")) #define VIRSH_COMMON_OPT_DOMAIN_CURRENT \ - VIRSH_COMMON_OPT_CURRENT(N_("affect current domain")) \ + VIRSH_COMMON_OPT_CURRENT(N_("affect current domain")) static virDomainPtr @@ -781,7 +781,7 @@ static const vshCmdOptDef opts_attach_interface[] = { * 'average,peak,burst,floor', in which peak and burst are optional, * thus 'average,,burst' and 'average,peak' are also legal. */ -#define VIRSH_PARSE_RATE_FIELD(index, name) \ +#define VIRSH_PARSE_RATE_FIELD(index, name) \ do { \ if (index < ntok && \ *tok[index] != '\0' && \ @@ -1302,7 +1302,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) VIR_DOMAIN_BLOCK_IOTUNE_##CONST, \ value) < 0) \ goto save_error; \ - } \ + } VSH_ADD_IOTUNE_SCALED(total-bytes-sec, TOTAL_BYTES_SEC); VSH_ADD_IOTUNE_SCALED(read-bytes-sec, READ_BYTES_SEC); @@ -1320,7 +1320,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) VIR_DOMAIN_BLOCK_IOTUNE_##CONST, \ value) < 0) \ goto save_error; \ - } \ + } VSH_ADD_IOTUNE(total-iops-sec, TOTAL_IOPS_SEC); VSH_ADD_IOTUNE(read-iops-sec, READ_IOPS_SEC); @@ -9096,7 +9096,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) return false; #define PARSE_MEMTUNE_PARAM(NAME, FIELD) \ - if ((rc = virshMemtuneGetSize(ctl, cmd, NAME, &tmpVal)) < 0) { \ + if ((rc = virshMemtuneGetSize(ctl, cmd, NAME, &tmpVal)) < 0) { \ vshError(ctl, _("Unable to parse integer parameter %s"), NAME); \ goto cleanup; \ } \ @@ -9104,7 +9104,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) if (virTypedParamsAddULLong(&params, &nparams, &maxparams, \ FIELD, tmpVal) < 0) \ goto save_error; \ - } \ + } PARSE_MEMTUNE_PARAM("hard-limit", VIR_DOMAIN_MEMORY_HARD_LIMIT); diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 25e21710f..5ca7393d1 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -28,7 +28,7 @@ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ .help = N_("interface name or MAC address") \ - } \ + } #include <config.h> #include "virsh-interface.h" diff --git a/tools/virsh-network.c b/tools/virsh-network.c index eacc2771b..14f7e7f77 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -39,7 +39,7 @@ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ .help = N_("network name or uuid") \ - } \ + } virNetworkPtr virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 96a623284..58a336de8 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -35,28 +35,28 @@ #include "virtime.h" #define VIRSH_COMMON_OPT_POOL_FULL \ - VIRSH_COMMON_OPT_POOL(N_("pool name or uuid")) \ + VIRSH_COMMON_OPT_POOL(N_("pool name or uuid")) #define VIRSH_COMMON_OPT_POOL_BUILD \ {.name = "build", \ .type = VSH_OT_BOOL, \ .flags = 0, \ .help = N_("build the pool as normal") \ - } \ + } #define VIRSH_COMMON_OPT_POOL_NO_OVERWRITE \ {.name = "no-overwrite", \ .type = VSH_OT_BOOL, \ .flags = 0, \ .help = N_("do not overwrite any existing data") \ - } \ + } #define VIRSH_COMMON_OPT_POOL_OVERWRITE \ {.name = "overwrite", \ .type = VSH_OT_BOOL, \ .flags = 0, \ .help = N_("overwrite any existing data") \ - } \ + } #define VIRSH_COMMON_OPT_POOL_X_AS \ {.name = "name", \ @@ -128,7 +128,7 @@ {.name = "adapter-parent", \ .type = VSH_OT_STRING, \ .help = N_("adapter parent to be used for underlying storage") \ - } \ + } virStoragePoolPtr virshCommandOptPoolBy(vshControl *ctl, const vshCmd *cmd, const char *optname, diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 24cd4abd9..8789ee7b0 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -43,7 +43,7 @@ #include "conf/snapshot_conf.h" #define VIRSH_COMMON_OPT_DOMAIN_FULL \ - VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) \ + VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) /* Helper for snapshot-create and snapshot-create-as */ static bool diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 0736bdcdb..007657002 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -44,23 +44,23 @@ #include "virstring.h" #define VIRSH_COMMON_OPT_POOL_FULL \ - VIRSH_COMMON_OPT_POOL(N_("pool name or uuid")) \ + VIRSH_COMMON_OPT_POOL(N_("pool name or uuid")) #define VIRSH_COMMON_OPT_POOL_NAME \ - VIRSH_COMMON_OPT_POOL(N_("pool name")) \ + VIRSH_COMMON_OPT_POOL(N_("pool name")) #define VIRSH_COMMON_OPT_POOL_OPTIONAL \ {.name = "pool", \ .type = VSH_OT_STRING, \ .help = N_("pool name or uuid") \ - } \ + } #define VIRSH_COMMON_OPT_VOLUME_VOL \ {.name = "vol", \ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ .help = N_("vol name, key or path") \ - } \ + } virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, diff --git a/tools/virsh.h b/tools/virsh.h index 9e42ef9bb..9bcf467d4 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -68,39 +68,39 @@ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr \ - } \ + } # define VIRSH_COMMON_OPT_DOMAIN(_helpstr) \ {.name = "domain", \ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr \ - } \ + } # define VIRSH_COMMON_OPT_CONFIG(_helpstr) \ {.name = "config", \ .type = VSH_OT_BOOL, \ .help = _helpstr \ - } \ + } # define VIRSH_COMMON_OPT_LIVE(_helpstr) \ {.name = "live", \ .type = VSH_OT_BOOL, \ .help = _helpstr \ - } \ + } # define VIRSH_COMMON_OPT_CURRENT(_helpstr) \ {.name = "current", \ .type = VSH_OT_BOOL, \ .help = _helpstr \ - } \ + } # define VIRSH_COMMON_OPT_FILE(_helpstr) \ {.name = "file", \ .type = VSH_OT_DATA, \ .flags = VSH_OFLAG_REQ, \ .help = _helpstr \ - } \ + } typedef struct _virshControl virshControl; typedef virshControl *virshControlPtr; diff --git a/tools/virt-host-validate-bhyve.c b/tools/virt-host-validate-bhyve.c index c7bf96f05..bd85f8ab0 100644 --- a/tools/virt-host-validate-bhyve.c +++ b/tools/virt-host-validate-bhyve.c @@ -37,7 +37,7 @@ _("%s module is not loaded, " err_msg), \ #mod); \ ret = -1; \ - } \ + } #define MODULE_STATUS_FAIL(mod, err_msg) \ MODULE_STATUS(mod, err_msg, VIR_HOST_VALIDATE_FAIL) -- 2.13.6

3 3

[libvirt] [libvirt-glib] [PATCH v2] spec: Enable unit tests during build
by mkasik＠redhat.com 30 Oct '17

30 Oct '17

From: Marek Kasik <mkasik(a)redhat.com> Enable unit tests so that we can catch some problems soon enough before the package gets to the users. Show test suite log if a test fail. --- libvirt-glib.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt-glib.spec.in b/libvirt-glib.spec.in index a1ca11f..2b9296e 100644 --- a/libvirt-glib.spec.in +++ b/libvirt-glib.spec.in @@ -116,6 +116,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-gobject-1.0.la %find_lang %{name} +%check +if ! make %{?_smp_mflags} check; then + cat tests/test-suite.log + exit 1 +fi + %clean rm -rf $RPM_BUILD_ROOT -- 2.14.2

3 2

[libvirt] [PATCH 0/2] qemu: Fix QoS for vhostuser
by Michal Privoznik 30 Oct '17

30 Oct '17

Setting QoS on the fly does work for vhostuser. However, it doesn't when starting a domain. So when looking into this, I realized that we should be more explicit about types of interface that do support QoS. Michal Privoznik (2): qemuDomainSetInterfaceParameters: Explicitly reject unsupported net types virNetDevSupportBandwidth: Enable QoS for vhostuser src/conf/netdev_bandwidth_conf.h | 2 +- src/qemu/qemu_driver.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) -- 2.13.6

2 5

[libvirt] [libvirt-glib] [PATCH] spec: Enable unit tests during build
by mkasik＠redhat.com 30 Oct '17

30 Oct '17

Hi, libvirt-glib has unit tests which can be evaluated as a part of build of RPM. It is generally recommended to run these tests so that some problems can be cought soon enough before the package gets to the users. Please, enable these tests for libvirt-glib. I've done scratch-build of this in koji and the build passes as well as the tests.

3 3

[libvirt] [PATCH] qemu: snapshot: Keep non-persistent changes alive in snapshot
by Kothapally Madhu Pavan 30 Oct '17

30 Oct '17

Restoring to a snapshot should not overwrite the persistent configuration xml of a snapshot as a side effect. This patch fixes the same. Currently, virDomainSnapshotDef only saves active domain definition of the guest. And on restore the active domain definition is used as both active and inactive domain definitions. Thiswill make the non-persistent changes persistent in snapshot image. This patch allows to save inactive domain definition as well and on snapshot-revert non-persistent configuration is restored as is. Currently, snapshot-revert is making non-presistent changes as persistent. Here are the steps to reproduce. Step1: virsh define $dom Step2: virsh attach-device $dom $memory-device.xml --live Step3: virsh snapshot-create $dom Step4: virsh destroy $dom Step5: virsh snapshot-revert $dom $snapshot-name Step6: virsh destroy $dom Step7: virsh start $dom Here we still have $memory-device attached in Step2. This patch is attempting to solve this issue. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/conf/snapshot_conf.c | 1 + src/conf/snapshot_conf.h | 1 + src/qemu/qemu_driver.c | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index f0e852c..e32fb4d 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -102,6 +102,7 @@ void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def) virDomainSnapshotDiskDefClear(&def->disks[i]); VIR_FREE(def->disks); virDomainDefFree(def->dom); + virDomainDefFree(def->newDom); virObjectUnref(def->cookie); VIR_FREE(def); } diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index 1d663c7..0bc915f 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -75,6 +75,7 @@ struct _virDomainSnapshotDef { virDomainSnapshotDiskDef *disks; virDomainDefPtr dom; + virDomainDefPtr newDom; virObjectPtr cookie; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 74fdfdb..c7cdb43 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15035,6 +15035,15 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) goto endjob; + if (vm->newDef) { + if (!(xml = qemuDomainDefFormatLive(driver, vm->newDef, priv->origCPU, + true, true)) || + !(def->newDom = virDomainDefParseString(xml, caps, driver->xmlopt, NULL, + VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE))) + goto endjob; + } + if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_DISK_ONLY) { align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_EXTERNAL; align_match = false; @@ -15567,6 +15576,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, qemuDomainObjPrivatePtr priv; int rc; virDomainDefPtr config = NULL; + virDomainDefPtr newConfig = NULL; virQEMUDriverConfigPtr cfg = NULL; virCapsPtr caps = NULL; bool was_running = false; @@ -15678,6 +15688,13 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, goto endjob; } + if (snap->def->newDom) { + newConfig = virDomainDefCopy(snap->def->newDom, caps, + driver->xmlopt, NULL, true); + if (!newConfig) + goto endjob; + } + cookie = (qemuDomainSaveCookiePtr) snap->def->cookie; switch ((virDomainState) snap->def->state) { @@ -15775,12 +15792,16 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, virCPUDefFree(priv->origCPU); VIR_STEAL_PTR(priv->origCPU, origCPU); } + if (newConfig) + vm->newDef = newConfig; } else { /* Transitions 2, 3 */ load: was_stopped = true; if (config) virDomainObjAssignDef(vm, config, false, NULL); + if (newConfig) + vm->newDef = newConfig; /* No cookie means libvirt which saved the domain was too old to * mess up the CPU definitions. @@ -15874,6 +15895,8 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, } if (config) virDomainObjAssignDef(vm, config, false, NULL); + if (newConfig) + vm->newDef = newConfig; if (flags & (VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING | VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED)) { -- 1.8.3.1

3 4

[libvirt] Using XML returned from domain hook script
by Jim Fehlig 30 Oct '17

30 Oct '17

Hi All, It may be a foolish en devour, but I'm trying to make a qemu hook script that provides the semantics of an old, custom xen block script. The script parses <disk> info, does some setup based on that, and then rewrites part of the config based on results of the setup. As an example, here is an XML snippet of a <disk> device on input to the hook script <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='some-dev-config'/> <target dev='vdb' bus='virtio'/> </disk> and XML returned by the script <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/foo'/> <target dev='vdb' bus='virtio'/> </disk> The hook script performs the setup and substitution in the "prepare" phase, but I noticed the results are never used when subsequently starting the domain. Indeed qemuProcessStartHook passes a NULL buffer to virHookCall, so the output XML of the hook is never collected. Does anyone have objections to using the XML returned from the "prepare" and "release" hook script phases, similar to how it is used in the "restore" and "migrate" phases? WRT the "release" phase, for my hack to work I'd need the original value of the dev attribute ('some-dev-config' in the above example). ISTR some patches on the list to add a metadata element for <devices>. Perhaps those patches would come in handy as a place to store the original dev attribute value. Thanks for your comments! Regards, Jim

2 1

[libvirt] [PATCH v4 0/2] daemon: fix termination/reload issues
by John Ferlan 28 Oct '17

28 Oct '17

This is a repost/fixup of Nikolay's v3: https://www.redhat.com/archives/libvir-list/2017-October/msg01089.html The primary difference here is a reorder of the patches to perform the proper refcnt operations before reordering the shutdown path in order to clean up servers out of the hash table sooner than later. In particular, the lock_manager sequencing in order to make sure that the virObjectUnref is done "orderly". Nikolay - if you're fine with these changes let me know and I can then push them (unless of course someone else ACK's before that). Hopefully the change to lock_daemon makes sense. Theoretically spaking the virHashFree in virNetDaemonDispose is probably now superfluous since patch 2/2 will remove all the servers much sooner, but let's keep it there just to be safe! Nikolay Shirokovskiy (2): rpc: When adding srv to dmn servers, need to add ref libvirtd: fix crash on termination src/locking/lock_daemon.c | 19 ++++++++++++++----- src/rpc/virnetdaemon.c | 4 ++++ 2 files changed, 18 insertions(+), 5 deletions(-) -- 2.13.6

2 11

[libvirt] [PATCH] fix libvirtd memory leak when client was killed by user at eventRegister sense
by xinhua.Cao 28 Oct '17

28 Oct '17

【DTS/AR】:DTS2017102200357 【description】:当客户端注册libvirt事件后，将客户端进程Kill，libvirtd服务端会有内存泄露。 Change-Id: I7eeffb4f1ba46038cd41fd26e6725ad2943229a8 --- daemon/remote.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index f67370f..4b8de85 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1727,25 +1727,14 @@ void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED, int r VIR_WARN("unexpected %s event deregister failure", name); \ } \ VIR_FREE(eventCallbacks); \ + neventCallbacks = 0; \ } while (0); -/* - * You must hold lock for at least the client - * We don't free stuff here, merely disconnect the client's - * network socket & resources. - * We keep the libvirt connection open until any async - * jobs have finished, then clean it up elsewhere - */ -void remoteClientFreeFunc(void *data) +static void +remoteFreePrivCallbacks(void *data) { struct daemonClientPrivate *priv = data; - - /* Deregister event delivery callback */ - if (priv->conn) { - virIdentityPtr sysident = virIdentityGetSystem(); - - virIdentitySetCurrent(sysident); - + if (priv && priv->conn) { DEREG_CB(priv->conn, priv->domainEventCallbacks, priv->ndomainEventCallbacks, virConnectDomainEventDeregisterAny, "domain"); @@ -1764,6 +1753,27 @@ void remoteClientFreeFunc(void *data) DEREG_CB(priv->conn, priv->qemuEventCallbacks, priv->nqemuEventCallbacks, virConnectDomainQemuMonitorEventDeregister, "qemu monitor"); + } +} +#undef DEREG_CB + +/* + * You must hold lock for at least the client + * We don't free stuff here, merely disconnect the client's + * network socket & resources. + * We keep the libvirt connection open until any async + * jobs have finished, then clean it up elsewhere + */ +void remoteClientFreeFunc(void *data) +{ + struct daemonClientPrivate *priv = data; + + /* Deregister event delivery callback */ + if (priv) { + virIdentityPtr sysident = virIdentityGetSystem(); + + virIdentitySetCurrent(sysident); + remoteFreePrivCallbacks(priv); if (priv->closeRegistered) { if (virConnectUnregisterCloseCallback(priv->conn, @@ -1775,19 +1785,21 @@ void remoteClientFreeFunc(void *data) virIdentitySetCurrent(NULL); virObjectUnref(sysident); - } - VIR_FREE(priv->hmacSalt); - VIR_FREE(priv); + VIR_FREE(priv->hmacSalt); + VIR_FREE(priv); + } } -#undef DEREG_CB static void remoteClientCloseFunc(virNetServerClientPtr client) { struct daemonClientPrivate *priv = virNetServerClientGetPrivateData(client); - daemonRemoveAllClientStreams(priv->streams); + if (priv) { + daemonRemoveAllClientStreams(priv->streams); + remoteFreePrivCallbacks(priv); + } } -- 2.8.3

2 1

[libvirt] [PATCH dbus] Run system instance as an unprivileged user account
by Daniel P. Berrange 27 Oct '17

27 Oct '17

There is no reason for the libvirt-dbus daemon to require root privileges. All it actually needs is ability to connect to libvirtd, which can be achieved by dropping in a polkit configuration file Now a libvirt connection to the system bus gives you privileges equivalent to root, so this doesn't really improve security on its own. It relies on there being a dbus policy that prevents users from issuing elevated APIs. For example, a DBus policy could allow non-root users to list VMs on the system bus and get their status (aka virsh list equiv). In this case, the security isolation does give some benefit. Security can be further improved if the admin uses the libvirt polkit file to restrict what libvirt-dbus is permitted to do. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 5 +++++ data/Makefile.am | 33 +++++++++++++++++++++++++++------ data/system/libvirt-dbus.rules.in | 8 ++++++++ data/system/org.libvirt.conf | 2 +- data/system/org.libvirt.conf.in | 15 +++++++++++++++ data/system/org.libvirt.service.in | 2 +- libvirt-dbus.spec.in | 9 +++++++++ src/main.c | 8 ++++++++ 8 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 data/system/libvirt-dbus.rules.in create mode 100644 data/system/org.libvirt.conf.in diff --git a/configure.ac b/configure.ac index 228ea11..aef3d37 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,11 @@ else fi AC_SUBST(DBUS_SYSTEM_POLICIES_DIR) +LIBVIRT_ARG_WITH([SYSTEM_USER], [username to run system instance as], + ['libvirtdbus']) +SYSTEM_USER=$with_system_user +AC_SUBST([SYSTEM_USER]) + AC_OUTPUT(Makefile data/Makefile src/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 58e855f..3f27b02 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,18 +9,28 @@ system_servicedir = $(DBUS_SYSTEM_SERVICES_DIR) system_service_DATA = $(system_service_in_files:.service.in=.service) system_policy_files = \ - system/org.libvirt.conf + system/org.libvirt.conf.in system_policydir = $(DBUS_SYSTEM_POLICIES_DIR) -system_policy_DATA = $(system_policy_files) +system_policy_DATA = $(system_policy_files:.conf.in=.conf) + +polkit_files = \ + system/libvirt-dbus.rules.in +polkit_policydir = $(sysconfdir)/polkit-1/rules.d +polkit_policy_DATA = $(polkit_files:.rules.in=.rules) EXTRA_DIST = \ $(service_in_files) \ $(system_service_in_files) \ - $(system_policy_files) + $(system_policy_files) \ + $(polkit_files) \ + $(NULL) CLEANFILES = \ $(service_DATA) \ - $(system_service_DATA) + $(system_service_DATA) \ + $(system_policy_DATA) \ + $(polkit_DATA) \ + $(NULL) session/org.libvirt.service: session/org.libvirt.service.in $(AM_V_GEN)$(MKDIR_P) session && \ @@ -29,5 +39,16 @@ session/org.libvirt.service: session/org.libvirt.service.in system/org.libvirt.service: system/org.libvirt.service.in $(AM_V_GEN)$(MKDIR_P) system && \ - sed -e 's|[@]bindir[@]|$(bindir)|g' < $< > $@-t && \ - mv $@-t $@ + sed -e 's|[@]bindir[@]|$(bindir)|g' \ + -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ + < $< > $@-t && mv $@-t $@ + +system/org.libvirt.conf: system/org.libvirt.conf.in + $(AM_V_GEN)$(MKDIR_P) system && \ + sed -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ + < $< > $@-t && mv $@-t $@ + +system/libvirt-dbus.rules: system/libvirt-dbus.rules.in + $(AM_V_GEN)$(MKDIR_P) system && \ + sed -e 's|[@]SYSTEM_USER[@]|$(SYSTEM_USER)|' \ + < $< > $@-t && mv $@-t $@ diff --git a/data/system/libvirt-dbus.rules.in b/data/system/libvirt-dbus.rules.in new file mode 100644 index 0000000..4eb4ee1 --- /dev/null +++ b/data/system/libvirt-dbus.rules.in @@ -0,0 +1,8 @@ +// Allow libvirt-dbus running in dedicated account to use libvirt + +polkit.addRule(function(action, subject) { + if (action.id == "org.libvirt.unix.manage" && + subject.user == "@SYSTEM_USER@") { + return polkit.Result.YES; + } +}); diff --git a/data/system/org.libvirt.conf b/data/system/org.libvirt.conf index 5cbc732..2b11717 100644 --- a/data/system/org.libvirt.conf +++ b/data/system/org.libvirt.conf @@ -4,7 +4,7 @@ <busconfig> - <policy user="root"> + <policy user="libvirtdbus"> <allow own="org.libvirt"/> <allow send_destination="org.libvirt"/> </policy> diff --git a/data/system/org.libvirt.conf.in b/data/system/org.libvirt.conf.in new file mode 100644 index 0000000..fe61b70 --- /dev/null +++ b/data/system/org.libvirt.conf.in @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + +<busconfig> + + <policy user="@SYSTEM_USER@"> + <allow own="org.libvirt"/> + </policy> + + <policy user="root"> + <allow send_destination="org.libvirt"/> + </policy> + +</busconfig> diff --git a/data/system/org.libvirt.service.in b/data/system/org.libvirt.service.in index 08d32a2..0d3abdd 100644 --- a/data/system/org.libvirt.service.in +++ b/data/system/org.libvirt.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.libvirt Exec=@bindir@/libvirt-dbus --system -User=root +User=@SYSTEM_USER@ diff --git a/libvirt-dbus.spec.in b/libvirt-dbus.spec.in index 5be4c22..572300f 100644 --- a/libvirt-dbus.spec.in +++ b/libvirt-dbus.spec.in @@ -19,6 +19,7 @@ BuildRequires: systemd-devel >= %{systemd_version} Requires: libvirt-libs >= %{libvirt_version} Requires: systemd-libs >= %{systemd_version} +Requires(pre): shadow-utils %description This package provides integration between libvirt and the DBus @@ -37,9 +38,17 @@ rm -rf $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT +%pre +getent group libvirtdbus >/dev/null || groupadd -r libvirtdbus +getent passwd libvirtdbus >/dev/null || \ + useradd -r -g libvirtdbus -d / -s /sbin/nologin \ + -c "Libvirt DBus bridge" libvirtdbus +exit 0 + %files %defattr(-,root,root,-) %doc README COPYING AUTHORS NEWS +%{_sysconfdir}/polkit-1/rules.d/libvirt-dbus.rules %{_bindir}/libvirt-dbus %{_datadir}/dbus-1/services/org.libvirt.service %{_datadir}/dbus-1/system-services/org.libvirt.service diff --git a/src/main.c b/src/main.c index a6a0212..225fb46 100644 --- a/src/main.c +++ b/src/main.c @@ -143,6 +143,14 @@ main(int argc, char *argv[]) } } + if (uri == NULL) { + if (system_bus) { + uri = "qemu:///system"; + } else { + uri = "qemu:///session"; + } + } + sigemptyset(&mask); sigaddset(&mask, SIGTERM); sigaddset(&mask, SIGINT); -- 2.13.6

2 2

[libvirt] [PATCH/QEMU] s390x/kvm: use cpu_model_available for guarded storage on compat machines
by Christian Borntraeger 27 Oct '17

27 Oct '17

Starting a guest with <os> <type arch='s390x' machine='s390-ccw-virtio-2.9'>hvm</type> </os> <cpu mode='host-model'/> on an IBM z14 results in "qemu-system-s390x: Some features requested in the CPU model are not available in the configuration: gs" This is because guarded storage is fenced for compat machines that did not have guarded storage support, but libvirt expands the cpu model according to the latest available machine. While this prevents future migration abort (by not starting the guest at all), not being able to start a "host-model" guest is very much unexpected. As it turns out, even if we would modify libvirt to not expand the cpu model to contain "gs" for compat machines, it cannot guarantee that a migration will succeed. For example if the kernel changes its features (or the user has nested=1 on one host but not on the other) the migration will fail nevertheless. So instead of fencing "gs" for machines <= 2.9 lets allow it for all machine types that support the CPU model. This will make "host-model" runnable all the time, while relying on the CPU model to reject invalid migration attempts. Suggested-by: David Hildenbrand <david(a)redhat.com> Signed-off-by: Christian Borntraeger <borntraeger(a)de.ibm.com> --- hw/s390x/s390-virtio-ccw.c | 8 -------- include/hw/s390x/s390-virtio-ccw.h | 3 --- target/s390x/kvm.c | 2 +- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index fabe4a6..ae5b01a 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -414,7 +414,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) s390mc->ri_allowed = true; s390mc->cpu_model_allowed = true; s390mc->css_migration_enabled = true; - s390mc->gs_allowed = true; mc->init = ccw_init; mc->reset = s390_machine_reset; mc->hot_add_cpu = s390_hot_add_cpu; @@ -495,12 +494,6 @@ bool cpu_model_allowed(void) return get_machine_class()->cpu_model_allowed; } -bool gs_allowed(void) -{ - /* for "none" machine this results in true */ - return get_machine_class()->gs_allowed; -} - static char *machine_get_loadparm(Object *obj, Error **errp) { S390CcwMachineState *ms = S390_CCW_MACHINE(obj); @@ -740,7 +733,6 @@ static void ccw_machine_2_9_class_options(MachineClass *mc) { S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); - s390mc->gs_allowed = false; ccw_machine_2_10_class_options(mc); SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_9); s390mc->css_migration_enabled = false; diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index a9a90c2..ac896e3 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -40,15 +40,12 @@ typedef struct S390CcwMachineClass { bool ri_allowed; bool cpu_model_allowed; bool css_migration_enabled; - bool gs_allowed; } S390CcwMachineClass; /* runtime-instrumentation allowed by the machine */ bool ri_allowed(void); /* cpu model allowed by the machine */ bool cpu_model_allowed(void); -/* guarded-storage allowed by the machine */ -bool gs_allowed(void); /** * Returns true if (vmstate based) migration of the channel subsystem diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 4c85ed8..020a7ea 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -363,7 +363,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) cap_ri = 1; } } - if (gs_allowed()) { + if (cpu_model_allowed()) { if (kvm_vm_enable_cap(s, KVM_CAP_S390_GS, 0) == 0) { cap_gs = 1; } -- 2.9.4

8 25

[libvirt] [PATCH dbus 0/5] Harden the build process
by Daniel P. Berrange 27 Oct '17

27 Oct '17

This hardens the build process by turning on all possible compiler flags and enabling features like relro and PIE. Daniel P. Berrange (5): util: don't inline virtDBusUtilVirDomainListFreep src: annotate parameters that are unused in functions build: turn on all practical compiler warning flags Enable full RELRO mode Build all binaries with PIE .gitignore | 1 + Makefile.am | 2 + configure.ac | 5 + m4/manywarnings.m4 | 276 ++++++++++++++++++++++++++++++++++++++++++++ m4/virt-arg.m4 | 154 ++++++++++++++++++++++++ m4/virt-compile-pie.m4 | 35 ++++++ m4/virt-compile-warnings.m4 | 225 ++++++++++++++++++++++++++++++++++++ m4/virt-linker-relro.m4 | 35 ++++++ m4/warnings.m4 | 79 +++++++++++++ src/Makefile.am | 10 +- src/domain.c | 78 ++++++------- src/events.c | 12 +- src/main.c | 12 +- src/manager.c | 4 +- src/util.c | 14 +++ src/util.h | 17 +-- 16 files changed, 891 insertions(+), 68 deletions(-) create mode 100644 m4/manywarnings.m4 create mode 100644 m4/virt-arg.m4 create mode 100644 m4/virt-compile-pie.m4 create mode 100644 m4/virt-compile-warnings.m4 create mode 100644 m4/virt-linker-relro.m4 create mode 100644 m4/warnings.m4 -- 2.13.6

2 6

[libvirt] [jenkins-ci PATCH v2 0/4] Expand test matrix, plus cleanups
by Andrea Bolognani 27 Oct '17

27 Oct '17

Changes from [v1]: * don't move project-specific environment variables to the default check_env. [v1] https://www.redhat.com/archives/libvir-list/2017-October/msg01256.html Andrea Bolognani (4): README: Update, expand and convert to Markdown jobs: Move check_env defaults projects: Set $OSINFO_SYSTEM_DIR in check_env projects: Expand test matrix README | 34 ------------------------------ README.markdown | 48 +++++++++++++++++++++++++++++++++++++++++++ jobs/autotools.yaml | 1 - jobs/defaults.yaml | 1 + jobs/go.yaml | 1 - projects/libosinfo.yaml | 11 +++++----- projects/libvirt-glib.yaml | 4 ++++ projects/libvirt-go-xml.yaml | 4 ++++ projects/libvirt-go.yaml | 4 ++++ projects/libvirt-perl.yaml | 5 +++++ projects/libvirt-python.yaml | 4 ++++ projects/libvirt-sandbox.yaml | 2 ++ projects/libvirt-tck.yaml | 4 ++++ projects/libvirt.yaml | 16 +++++++-------- projects/osinfo-db-tools.yaml | 4 ++++ projects/osinfo-db.yaml | 3 +++ projects/virt-manager.yaml | 4 ++++ projects/virt-viewer.yaml | 4 ++++ 18 files changed, 104 insertions(+), 50 deletions(-) delete mode 100644 README create mode 100644 README.markdown -- 2.13.6

2 5

[libvirt] [PATCH] qemuhotplugtest: Test user supplied alias
by Michal Privoznik 27 Oct '17

27 Oct '17

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemuhotplugtest.c | 6 +++ .../qemuhotplug-watchdog-user-alias-full.xml | 4 ++ .../qemuhotplug-watchdog-user-alias.xml | 3 ++ .../qemuhotplug-base-live+watchdog-user-alias.xml | 56 ++++++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 8d77c0056..bdde7e45f 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -828,6 +828,12 @@ mymain(void) DO_TEST_DETACH("base-live", "watchdog-full", false, false, "device_del", QMP_OK); + DO_TEST_ATTACH("base-live", "watchdog-user-alias", false, true, + "watchdog-set-action", QMP_OK, + "device_add", QMP_OK); + DO_TEST_DETACH("base-live", "watchdog-user-alias-full", false, false, + "device_del", QMP_OK); + #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \ do { \ cpudata.test = prefix; \ diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml new file mode 100644 index 000000000..d34f24554 --- /dev/null +++ b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias-full.xml @@ -0,0 +1,4 @@ +<watchdog model='i6300esb' action='poweroff'> + <alias name='ua-UserWatchdog'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> +</watchdog> diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml new file mode 100644 index 000000000..0caff99e4 --- /dev/null +++ b/tests/qemuhotplugtestdevices/qemuhotplug-watchdog-user-alias.xml @@ -0,0 +1,3 @@ +<watchdog model='i6300esb' action='poweroff'> + <alias name="ua-UserWatchdog"/> +</watchdog> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml new file mode 100644 index 000000000..27aff2b6f --- /dev/null +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml @@ -0,0 +1,56 @@ +<domain type='kvm' id='7'> + <name>hotplug</name> + <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'> + <alias name='usb'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='ide' index='0'> + <alias name='ide'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='scsi' index='0' model='virtio-scsi'> + <alias name='scsi0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <controller type='pci' index='0' model='pci-root'> + <alias name='pci'/> + </controller> + <controller type='virtio-serial' index='0'> + <alias name='virtio-serial0'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </controller> + <input type='mouse' bus='ps2'> + <alias name='input0'/> + </input> + <input type='keyboard' bus='ps2'> + <alias name='input1'/> + </input> + <watchdog model='i6300esb' action='poweroff'> + <alias name='ua-UserWatchdog'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> + </watchdog> + <memballoon model='none'> + <alias name='balloon0'/> + </memballoon> + </devices> + <seclabel type='none' model='none'/> +</domain> -- 2.13.6

1 1

[libvirt] [PATCH v3 RESEND] vhost-user: add support reconnect for vhost-user ports
by ZhiPeng Lu 27 Oct '17

27 Oct '17

For vhost-user ports, Open vSwitch acts as the server and QEMU the client. When OVS crashes or restarts, the QEMU process should be reconnected to OVS. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- docs/schemas/domaincommon.rng | 26 ++++++++------ src/conf/domain_conf.c | 40 ++++++++++++++++++---- src/conf/domain_conf.h | 10 +++--- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- .../qemuxml2argv-net-vhostuser-multiq.args | 4 +-- .../qemuxml2argv-net-vhostuser-multiq.xml | 8 +++-- 8 files changed, 65 insertions(+), 29 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 76852ab..3f4ed82 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2327,6 +2327,18 @@ </attribute> </optional> </define> + <define name="reconnect"> + <element name="reconnect"> + <attribute name="enabled"> + <ref name="virYesNo"/> + </attribute> + <optional> + <attribute name="timeout"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </element> + </define> <!-- An interface description can either be of type bridge in which case @@ -2388,6 +2400,9 @@ <value>client</value> </choice> </attribute> + <optional> + <ref name="reconnect"/> + </optional> <empty/> </element> <ref name="interface-options"/> @@ -3636,16 +3651,7 @@ </attribute> </optional> <optional> - <element name="reconnect"> - <attribute name="enabled"> - <ref name="virYesNo"/> - </attribute> - <optional> - <attribute name="timeout"> - <ref name="unsignedInt"/> - </attribute> - </optional> - </element> + <ref name="reconnect"/> </optional> <zeroOrMore> <ref name='devSeclabel'/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cc5e79b..b7fc3a5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -83,6 +83,13 @@ struct _virDomainXMLOption { /* Private data for save image stored in snapshot XML */ virSaveCookieCallbacks saveCookie; }; +static int +virDomainDeviceSourceReconnectDefParseXML(virDomainDeviceSourceReconnectDefPtr def, + xmlNodePtr node, + xmlXPathContextPtr ctxt); +static void +virDomainDeviceSourceReconnectDefFormat(virBufferPtr buf, + virDomainDeviceSourceReconnectDefPtr def); #define VIR_DOMAIN_DEF_FORMAT_COMMON_FLAGS \ (VIR_DOMAIN_DEF_FORMAT_SECURE | \ @@ -10245,6 +10252,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, virNWFilterHashTablePtr filterparams = NULL; virDomainActualNetDefPtr actual = NULL; xmlNodePtr oldnode = ctxt->node; + virDomainDeviceSourceReconnectDef reconnect = {0}; int rv, val; if (VIR_ALLOC(def) < 0) @@ -10331,6 +10339,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, vhostuser_type = virXMLPropString(cur, "type"); vhostuser_path = virXMLPropString(cur, "path"); vhostuser_mode = virXMLPropString(cur, "mode"); + if (virDomainDeviceSourceReconnectDefParseXML(&reconnect, cur, ctxt) < 0) + goto error; } else if (!def->virtPortProfile && virXMLNodeNameEqual(cur, "virtualport")) { if (def->type == VIR_DOMAIN_NET_TYPE_NETWORK) { @@ -10552,8 +10562,17 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, if (STREQ(vhostuser_mode, "server")) { def->data.vhostuser->data.nix.listen = true; + if (reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("'reconnect' attribute unsupported " + "'server' mode for <interface type='vhostuser'>")); + goto error; + } } else if (STREQ(vhostuser_mode, "client")) { def->data.vhostuser->data.nix.listen = false; + def->data.vhostuser->data.nix.reconnect.enabled = reconnect.enabled; + def->data.vhostuser->data.nix.reconnect.timeout = reconnect.timeout; + reconnect.enabled = VIR_TRISTATE_BOOL_ABSENT; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Wrong <source> 'mode' attribute " @@ -11216,7 +11235,7 @@ virDomainChrDefParseTargetXML(virDomainChrDefPtr def, } static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def, +virDomainDeviceSourceReconnectDefParseXML(virDomainDeviceSourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { @@ -11338,7 +11357,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDefPtr def, VIR_FREE(tmp); } - if (virDomainChrSourceReconnectDefParseXML(&def->data.tcp.reconnect, + if (virDomainDeviceSourceReconnectDefParseXML(&def->data.tcp.reconnect, source, ctxt) < 0) { goto error; @@ -11389,7 +11408,7 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDefPtr def, def->data.nix.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND; def->data.nix.path = virXMLPropString(source, "path"); - if (virDomainChrSourceReconnectDefParseXML(&def->data.nix.reconnect, + if (virDomainDeviceSourceReconnectDefParseXML(&def->data.nix.reconnect, source, ctxt) < 0) { return -1; @@ -22984,6 +23003,13 @@ virDomainNetDefFormat(virBufferPtr buf, def->data.vhostuser->data.nix.listen ? "server" : "client"); sourceLines++; + if (def->data.vhostuser->data.nix.reconnect.enabled != VIR_TRISTATE_BOOL_ABSENT) { + virBufferAddLit(buf, ">\n"); + sourceLines++; + virBufferAdjustIndent(buf, 2); + virDomainDeviceSourceReconnectDefFormat(buf, &def->data.vhostuser->data.nix.reconnect); + virBufferAdjustIndent(buf, -2); + } } break; @@ -23218,8 +23244,8 @@ virDomainChrAttrsDefFormat(virBufferPtr buf, static void -virDomainChrSourceReconnectDefFormat(virBufferPtr buf, - virDomainChrSourceReconnectDefPtr def) +virDomainDeviceSourceReconnectDefFormat(virBufferPtr buf, + virDomainDeviceSourceReconnectDefPtr def) { if (def->enabled == VIR_TRISTATE_BOOL_ABSENT) return; @@ -23314,7 +23340,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virBufferAsprintf(&attrBuf, " tlsFromConfig='%d'", def->data.tcp.tlsFromConfig); - virDomainChrSourceReconnectDefFormat(&childBuf, + virDomainDeviceSourceReconnectDefFormat(&childBuf, &def->data.tcp.reconnect); if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) @@ -23333,7 +23359,7 @@ virDomainChrSourceDefFormat(virBufferPtr buf, virDomainSourceDefFormatSeclabel(&childBuf, def->nseclabels, def->seclabels, flags); - virDomainChrSourceReconnectDefFormat(&childBuf, + virDomainDeviceSourceReconnectDefFormat(&childBuf, &def->data.nix.reconnect); if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bb3b6f0..909f60d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1138,12 +1138,12 @@ typedef enum { } virDomainChrSpicevmcName; -struct _virDomainChrSourceReconnectDef { +struct _virDomainDeviceSourceReconnectDef { virTristateBool enabled; unsigned int timeout; }; -typedef struct _virDomainChrSourceReconnectDef virDomainChrSourceReconnectDef; -typedef virDomainChrSourceReconnectDef *virDomainChrSourceReconnectDefPtr; +typedef struct _virDomainDeviceSourceReconnectDef virDomainDeviceSourceReconnectDef; +typedef virDomainDeviceSourceReconnectDef *virDomainDeviceSourceReconnectDefPtr; /* The host side information for a character device. */ @@ -1168,7 +1168,7 @@ struct _virDomainChrSourceDef { bool tlscreds; int haveTLS; /* enum virTristateBool */ bool tlsFromConfig; - virDomainChrSourceReconnectDef reconnect; + virDomainDeviceSourceReconnectDef reconnect; } tcp; struct { char *bindHost; @@ -1179,7 +1179,7 @@ struct _virDomainChrSourceDef { struct { char *path; bool listen; - virDomainChrSourceReconnectDef reconnect; + virDomainDeviceSourceReconnectDef reconnect; } nix; int spicevmc; struct { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9b3e3fc..4640ce8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5094,7 +5094,7 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, static void qemuBuildChrChardevReconnectStr(virBufferPtr buf, - const virDomainChrSourceReconnectDef *def) + const virDomainDeviceSourceReconnectDef *def) { if (def->enabled == VIR_TRISTATE_BOOL_YES) { virBufferAsprintf(buf, ",reconnect=%u", def->timeout); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 50b536e..4ea0727 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3244,7 +3244,7 @@ qemuDomainNetSupportsCoalesce(virDomainNetType type) static int -qemuDomainChrSourceReconnectDefValidate(const virDomainChrSourceReconnectDef *def) +qemuDomainChrSourceReconnectDefValidate(const virDomainDeviceSourceReconnectDef *def) { if (def->enabled == VIR_TRISTATE_BOOL_YES && def->timeout == 0) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 63b8559..b3d572e 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6443,7 +6443,7 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon, static int qemuMonitorJSONBuildChrChardevReconnect(virJSONValuePtr object, - const virDomainChrSourceReconnectDef *def) + const virDomainDeviceSourceReconnectDef *def) { if (def->enabled != VIR_TRISTATE_BOOL_YES) return 0; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args index b69ebd8..0b08f44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args @@ -25,14 +25,14 @@ server,nowait \ -netdev vhost-user,chardev=charnet0,id=hostnet0 \ -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,\ addr=0x3 \ --chardev socket,id=charnet1,path=/tmp/vhost1.sock \ +-chardev socket,id=charnet1,path=/tmp/vhost1.sock,reconnect=10 \ -netdev vhost-user,chardev=charnet1,id=hostnet1 \ -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,\ addr=0x4 \ -netdev socket,listen=:2015,id=hostnet2 \ -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,\ addr=0x5 \ --chardev socket,id=charnet3,path=/tmp/vhost2.sock \ +-chardev socket,id=charnet3,path=/tmp/vhost2.sock,reconnect=0 \ -netdev vhost-user,chardev=charnet3,queues=4,id=hostnet3 \ -device virtio-net-pci,mq=on,vectors=10,netdev=hostnet3,id=net3,\ mac=52:54:00:ee:96:6d,bus=pci.0,addr=0x6 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml index d5c42fe..2fadb1c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.xml @@ -30,7 +30,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6c'/> - <source type='unix' path='/tmp/vhost1.sock' mode='client'/> + <source type='unix' path='/tmp/vhost1.sock' mode='client'> + <reconnect enabled='yes' timeout='10'/> + </source> <model type='virtio'/> </interface> <interface type='server'> @@ -40,7 +42,9 @@ </interface> <interface type='vhostuser'> <mac address='52:54:00:ee:96:6d'/> - <source type='unix' path='/tmp/vhost2.sock' mode='client'/> + <source type='unix' path='/tmp/vhost2.sock' mode='client'> + <reconnect enabled='no'/> + </source> <model type='virtio'/> <driver queues='4'/> </interface> -- 1.8.3.1

2 1

[libvirt] [PATCH v3 0/2] daemon: fix termination/reload issues
by Nikolay Shirokovskiy 27 Oct '17

27 Oct '17

v1: https://www.redhat.com/archives/libvir-list/2017-September/msg01006.html Changes from v2: Fix syntax check issues. Changes from v1: 1. Patches that fixes qemu driver termination are moved out of this series 2. New version of [1] now fixes issue in a way that suggested by reviewer 3. [2] fixes another issue that was discovered in the process of review Nikolay Shirokovskiy (2): libvirtd: fix crash on termination [1] virtlogd: add missing netserver refcount increment on reload [2] src/locking/lock_daemon.c | 1 + src/rpc/virnetdaemon.c | 3 +++ 2 files changed, 4 insertions(+) -- 1.8.3.1

3 10

[libvirt] [jenkins-ci PATCH 0/5] Expand test matrix, plus cleanups
by Andrea Bolognani 27 Oct '17

27 Oct '17

Andrea Bolognani (5): README: Update, expand and convert to Markdown jobs: Move check_env defaults jobs: Define $VIR_TEST_{DEBUG,EXPENSIVE} in default check_env jobs: Define $OSINFO_SYSTEM_DIR in default make_env projects: Expand test matrix README | 34 ------------------------------ README.markdown | 48 +++++++++++++++++++++++++++++++++++++++++++ jobs/autotools.yaml | 1 - jobs/defaults.yaml | 4 ++++ jobs/go.yaml | 1 - projects/libosinfo.yaml | 11 ++++------ projects/libvirt-glib.yaml | 4 ++++ projects/libvirt-go-xml.yaml | 4 ++++ projects/libvirt-go.yaml | 4 ++++ projects/libvirt-perl.yaml | 5 +++++ projects/libvirt-python.yaml | 4 ++++ projects/libvirt-sandbox.yaml | 2 ++ projects/libvirt-tck.yaml | 4 ++++ projects/libvirt.yaml | 15 ++++++-------- projects/osinfo-db-tools.yaml | 4 ++++ projects/osinfo-db.yaml | 3 +++ projects/virt-manager.yaml | 4 ++++ projects/virt-viewer.yaml | 4 ++++ 18 files changed, 104 insertions(+), 52 deletions(-) delete mode 100644 README create mode 100644 README.markdown -- 2.13.6

2 8

[libvirt] [PATCH v3 REBASE 0/2] qemu: report block job errors from qemu to the user
by Nikolay Shirokovskiy 27 Oct '17

27 Oct '17

So that you can see nice report on migration: "error: operation failed: migration of disk sda failed: No space left on device" diff from v2: ============ 1. split into 2 patches 2. change formal documentation where it is present accordingly 3. add variable initialization for safety Nikolay Shirokovskiy (2): qemu: prepare blockjob complete event error usage qemu: report drive mirror errors on migration src/qemu/qemu_blockjob.c | 14 +++++++++-- src/qemu/qemu_blockjob.h | 3 ++- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 55 +++++++++++++++++++++++++++++++------------- src/qemu/qemu_monitor.c | 5 ++-- src/qemu/qemu_monitor.h | 4 +++- src/qemu/qemu_monitor_json.c | 4 +++- src/qemu/qemu_process.c | 4 ++++ 10 files changed, 70 insertions(+), 25 deletions(-) -- 1.8.3.1

2 5

[libvirt] [PATCH] qemu.conf: Clarify the various _tls_x509_cert_dir descriptions
by John Ferlan 27 Oct '17

27 Oct '17

https://bugzilla.redhat.com/show_bug.cgi?id=1458630 Apparantly commit id 'dc4c2f75a' wasn't specific enough, so here's a few more clarifications. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu.conf | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 2e8370a5a8..6ec893ac1f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -13,8 +13,9 @@ # # dh-params.pem - the DH params configuration file # -# If the directory does not exist or contain the necessary files, QEMU -# domains will fail to start if they are configured to use TLS. +# If the directory does not exist, libvirtd will fail to start. If the +# directory doesn't contain the necessary files, QEMU domains will fail +# to start if they are configured to use TLS. # # In order to overwrite the default path alter the following. This path # definition will be used as the default path for other *_tls_x509_cert_dir @@ -87,8 +88,9 @@ # In order to override the default TLS certificate location for # vnc certificates, supply a valid path to the certificate directory. -# If the provided path does not exist then the default_tls_x509_cert_dir -# path will be used. +# If the provided path does not exist, libvirtd will fail to start. +# If the path is not provided, but vnc_tls = 1, then the +# default_tls_x509_cert_dir path will be used. # #vnc_tls_x509_cert_dir = "/etc/pki/libvirt-vnc" @@ -172,8 +174,9 @@ # In order to override the default TLS certificate location for # spice certificates, supply a valid path to the certificate directory. -# If the provided path does not exist then the default_tls_x509_cert_dir -# path will be used. +# If the provided path does not exist, libvirtd will fail to start. +# If the path is not provided, but spice_tls = 1, then the +# default_tls_x509_cert_dir path will be used. # #spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice" @@ -224,8 +227,9 @@ # In order to override the default TLS certificate location for character # device TCP certificates, supply a valid path to the certificate directory. -# If the provided path does not exist then the default_tls_x509_cert_dir -# path will be used. +# If the provided path does not exist, libvirtd will fail to start. +# If the path is not provided, but chardev_tls = 1, then the +# default_tls_x509_cert_dir path will be used. # #chardev_tls_x509_cert_dir = "/etc/pki/libvirt-chardev" @@ -276,8 +280,9 @@ # This is used to authenticate the VxHS block device clients to the VxHS # server. # -# If the provided path does not exist then the default_tls_x509_cert_dir -# path will be used. +# If the provided path does not exist, libvirtd will fail to start. +# If the path is not provided, but vxhs_tls = 1, then the +# default_tls_x509_cert_dir path will be used. # # VxHS block device clients expect the client certificate and key to be # present in the certificate directory along with the CA master certificate. @@ -294,7 +299,8 @@ # In order to override the default TLS certificate location for migration # certificates, supply a valid path to the certificate directory. If the -# provided path does not exist then the default_tls_x509_cert_dir path +# provided path does not exist, libvirtd will fail to start. If the path is +# not provided, but migrate_tls = 1, then the default_tls_x509_cert_dir path # will be used. Once/if a default certificate is enabled/defined, migration # will then be able to use the certificate via migration API flags. # -- 2.13.6

2 1

[libvirt] [PATCH v2] qemu: change monitor.sock from /var/lib/libvirt/qemu/domain-*** to /var/run/libvirt/qemu/domain-***
by xinhua.Cao 27 Oct '17

27 Oct '17

directory /var/lib alway is Persistence directory, but in redhat system, /var/run is memory directory. our running domain xml is saved at /var/run/libvirt/qemu. so if we cold reset system, the /var/run/libvirt/qemu directory is clear, but /var/lib/libvirt/qemu/domain-*** is saved. so there have same /var/lib/libvirt/qemu/domain-*** directory will be left over at system cold reset. --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ed27a91..3e6fe9b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1674,7 +1674,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, goto cleanup; if (!priv->libDir && - virAsprintf(&priv->libDir, "%s/domain-%s", cfg->libDir, domname) < 0) + virAsprintf(&priv->libDir, "%s/domain-%s", cfg->stateDir, domname) < 0) goto cleanup; if (!priv->channelTargetDir && -- 2.8.3

4 5

[libvirt] [REPOST PATCH 0/4] Add the ability to LUKS encrypt during LV creation
by John Ferlan 27 Oct '17

27 Oct '17

Repost to address merge conflict from commit id '0a294a8e2' which used if (virStorageSourceHasBacking(&vol->target)) instead of if (vol->target.backingStore). Original series: https://www.redhat.com/archives/libvir-list/2017-October/msg00340.html John Ferlan (4): storage: Extract out the LVCREATE storage: Introduce virStorageBackendCreateVolUsingQemuImg storage: Allow creation of a LUKS using logical volume docs: Add news article docs/news.xml | 13 ++++++ src/storage/storage_backend_logical.c | 75 ++++++++++++++++++++--------------- src/storage/storage_util.c | 42 ++++++++++++++++++++ src/storage/storage_util.h | 8 ++++ 4 files changed, 105 insertions(+), 33 deletions(-) -- 2.13.6

2 6

[libvirt] [PATCH 0/5] Properly resize a local LUKS encrypted volume
by John Ferlan 27 Oct '17

27 Oct '17

The patches hopefully speak for themselves. John Ferlan (5): storage: Alter args to storageBackendResizeQemuImg storage: Add error path for virStorageBackendCreateQemuImgCmdFromVol storage: Alter storageBackendCreateQemuImgSecretObject args storage: Properly resize a local volume using LUKS docs: Add news article for bug fix docs/news.xml | 8 +++ src/storage/storage_util.c | 133 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 115 insertions(+), 26 deletions(-) -- 2.13.6

2 11

[libvirt] [PATCH 0/2] virt-aa-helper cleanups
by Christian Ehrhardt 27 Oct '17

27 Oct '17

As follow up to [1] some smaller extensions and fixups to virt-aa-helper and its tests. [1]: https://www.redhat.com/archives/libvir-list/2017-October/msg01161.html Christian Ehrhardt (2): virt-aa-helper: apparmor wildcards to forbidden chars virt-aa-helper-test: only fails go to stdout by default src/security/virt-aa-helper.c | 2 +- tests/virt-aa-helper-test | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) -- 2.7.4

3 5

[libvirt] [PATCH] qemu: Fix memory leak in virQEMUCapsLoadCPUModels
by Marc Hartmayer 27 Oct '17

27 Oct '17

Don't leak @blockNodes in the loop. ==226576== 7,120 bytes in 60 blocks are definitely lost in loss record 122 of 125 ==226576== at 0x4835214: calloc (vg_replace_malloc.c:711) ==226576== by 0x4950D7B: virAllocN (viralloc.c:191) ==226576== by 0x49EB5BB: virXPathNodeSet (virxml.c:676) ==226576== by 0x104DB67: virQEMUCapsLoadCPUModels (qemu_capabilities.c:3738) ==226576== by 0x105510D: virQEMUCapsLoadCache (qemu_capabilities.c:3929) ==226576== by 0x104459F: qemuTestParseCapabilities (testutilsqemu.c:498) ==226576== by 0x1040DC9: testQemuCapsCopy (qemucapabilitiestest.c:105) ==226576== by 0x1041F07: virTestRun (testutils.c:180) ==226576== by 0x1040B45: mymain (qemucapabilitiestest.c:181) ==226576== by 0x104320F: virTestMain (testutils.c:1119) ==226576== by 0x1041149: main (qemucapabilitiestest.c:193) Signed-off-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6cea1ccfa50b..7cb091056b48 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3758,6 +3758,7 @@ virQEMUCapsLoadCPUModels(virQEMUCapsPtr qemuCaps, goto cleanup; } } + VIR_FREE(blockerNodes); } if (virDomainCapsCPUModelsAddSteal(cpus, &str, usable, &blockers) < 0) -- 2.5.5

2 1

[libvirt] [PATCH v2 00/22] Fix host-model if the chosen CPU model has more features in QEMU compared to our cpu_map.xml
by Jiri Denemark 27 Oct '17

27 Oct '17

When decoding CPUID data to virCPUDef we need to be careful about using a CPU model which cannot be directly used on the current host. Normally, libvirt would notice the features which prevent the model from being usable and it would disable them in the computed virCPUDef, but this won't work in case the definition of the CPU model in QEMU contains more features than what we have in cpu_map.xml. We need to count with the usability blockers we got from QEMU and explicitly disable all of them to make the computed virCPUDef usable. https://bugzilla.redhat.com/show_bug.cgi?id=1464832 See individual patches for diff from version 1. However, most patches were acked in v1 and were not changed. Jiri Denemark (22): util: Introduce virStringListCopy conf: Add usability blockers to virDomainCapsCPUModel qemu: Store CPU usability blockers in caps cache qemu: Parse unavailable features for CPU models cpu: Use virDomainCapsCPUModelsPtr in cpu driver APIs cpu: Drop unused parameter from cpuDecode conf: Introduce virDomainCapsCPUModelsGet cpu_x86: Move x86FeatureFind* to avoid forward prototypes cpu_x86: Disable blockers from unusable CPU models cputest: Replace bool with cpuTestCPUIDJson enum cputest: Avoid calling json_reformat in cpu-parse.sh cputest: Print correct feature in virCPUUpdateLive test cputest: Test CPU usability blockers cputest: Separate QEMUCaps creation from cpuTestCPUIDJson cputest: Use CPU models from QEMU when available cputest: Add query-cpu-definitions reply for Core-i5-2540M cputest: Add CPUID data for Intel(R) Xeon(R) CPU E7-4830 cputest: Add query-cpu-definitions reply for Xeon-E7-4830 cputest: Update Xeon-E3-1245 data cputest: Add query-cpu-definitions reply for Xeon-E3-1245 cputest: Update Core-i7-2600 data cputest: Make a crippled version of Core-i7-2600 src/conf/domain_capabilities.c | 48 +- src/conf/domain_capabilities.h | 11 +- src/cpu/cpu.c | 89 +- src/cpu/cpu.h | 30 +- src/cpu/cpu_arm.c | 3 +- src/cpu/cpu_ppc64.c | 14 +- src/cpu/cpu_x86.c | 109 +- src/libvirt_private.syms | 1 + src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/qemu/qemu_capabilities.c | 123 +-- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_capspriv.h | 5 + src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_monitor.c | 2 + src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 28 +- src/qemu/qemu_process.c | 9 +- src/test/test_driver.c | 2 +- src/util/virstring.c | 37 + src/util/virstring.h | 3 + tests/cputest.c | 325 ++++-- tests/cputestdata/cpu-cpuid.py | 26 +- tests/cputestdata/cpu-gather.sh | 1 + tests/cputestdata/cpu-parse.sh | 2 +- tests/cputestdata/cpu-reformat.py | 9 + tests/cputestdata/x86_64-cpuid-Core-i5-2540M.json | 362 +++++++ .../x86_64-cpuid-Core-i7-2600-disabled.xml | 1 - .../x86_64-cpuid-Core-i7-2600-enabled.xml | 1 + .../cputestdata/x86_64-cpuid-Core-i7-2600-json.xml | 1 + ...x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml | 6 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml | 8 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml | 25 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml | 25 + .../x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml | 11 + .../x86_64-cpuid-Core-i7-2600-xsaveopt.json | 615 +++++++++++ .../x86_64-cpuid-Core-i7-2600-xsaveopt.xml | 33 + tests/cputestdata/x86_64-cpuid-Core-i7-2600.json | 496 ++++++++- tests/cputestdata/x86_64-cpuid-Core-i7-2600.xml | 6 +- .../x86_64-cpuid-Xeon-E3-1245-disabled.xml | 1 - .../x86_64-cpuid-Xeon-E3-1245-enabled.xml | 2 +- .../cputestdata/x86_64-cpuid-Xeon-E3-1245-json.xml | 1 + tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.json | 712 +++++++++---- tests/cputestdata/x86_64-cpuid-Xeon-E3-1245.xml | 7 +- .../x86_64-cpuid-Xeon-E7-4830-disabled.xml | 5 + .../x86_64-cpuid-Xeon-E7-4830-enabled.xml | 8 + .../x86_64-cpuid-Xeon-E7-4830-guest.xml | 28 + .../cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml | 29 + .../cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml | 14 + tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json | 657 ++++++++++++ tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml | 30 + tests/domaincapstest.c | 6 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1102 ++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 236 ++++- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 154 ++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 154 ++- 56 files changed, 4938 insertions(+), 688 deletions(-) create mode 100755 tests/cputestdata/cpu-reformat.py create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.json create mode 100644 tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-disabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-enabled.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.json create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-E7-4830.xml -- 2.14.2

3 31

[libvirt] [jenkins-ci PATCH] guests: disable glusterfs on FreeBSD
by Pavel Hrdina 27 Oct '17

27 Oct '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- guests/vars/mappings.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index cae9d23..828690e 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -118,7 +118,6 @@ mappings: glusterfs: deb: glusterfs-client - pkg: glusterfs rpm: glusterfs-api-devel gnome-common: -- 2.13.6

2 2

[libvirt] [PATCH go-xml] Add address support for memory device
by zhenwei.pi 27 Oct '17

27 Oct '17

Add Base element for DomainAddress. Add address element for DomainMemorydev. Add test code for new DomainMemorydev. Signed-off-by: zhenwei.pi <zhenwei.pi(a)youruncloud.com> --- domain.go | 2 ++ domain_test.go | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/domain.go b/domain.go index bacab11..3d9404f 100644 --- a/domain.go +++ b/domain.go @@ -297,6 +297,7 @@ type DomainAddress struct { Function *HexUint `xml:"function,attr"` Target *uint `xml:"target,attr"` Unit *uint `xml:"unit,attr"` + Base *HexUint `xml:"base,attr"` } type DomainConsole struct { @@ -450,6 +451,7 @@ type DomainMemorydev struct { Model string `xml:"model,attr"` Access string `xml:"access,attr"` Target *DomainMemorydevTarget `xml:"target"` + Address *DomainAddress `xml:"address"` } type DomainDeviceList struct { diff --git a/domain_test.go b/domain_test.go index dbebe42..cbc5d7f 100644 --- a/domain_test.go +++ b/domain_test.go @@ -66,6 +66,9 @@ var vcpuId0 uint = 0 var vcpuOrder0 uint = 1 var vcpuId1 uint = 1 +var memorydevAddressSlot HexUint = 0 +var memorydevAddressBase HexUint = 4294967296 + var domainTestData = []struct { Object Document Expected []string @@ -385,6 +388,11 @@ var domainTestData = []struct { Value: 0, }, }, + Address: &DomainAddress{ + Type: "dimm", + Slot: &memorydevAddressSlot, + Base: &memorydevAddressBase, + }, }, }, }, @@ -434,6 +442,7 @@ var domainTestData = []struct { ` <size unit="GiB">1</size>`, ` <node>0</node>`, ` </target>`, + ` <address type="dimm" slot="0" base="4294967296"></address>`, ` </memory>`, ` </devices>`, `</domain>`, -- 2.7.4

1 0

[libvirt] [PATCH] qemu: logrotate: drop minsize directive
by Jim Fehlig 26 Oct '17

26 Oct '17

On a cloud host it is possible to create 100's of unique instances per day, each leaving behind a /var/log/libvirt/qemu/instance-name.log file that is < 100k. With the current 'minsize 100k' directive, these files are never rotated and hence never removed. Over months of time, tens of thousands of these files can accumulate on the host. Dropping 'minsize 100k' allows rotating small files, which will increase the number of log files, but 'rotate 4' ensures they will be removed after a month. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- daemon/libvirtd.qemu.logrotate.in | 1 - 1 file changed, 1 deletion(-) diff --git a/daemon/libvirtd.qemu.logrotate.in b/daemon/libvirtd.qemu.logrotate.in index 15cf019b2..cdb399ef2 100644 --- a/daemon/libvirtd.qemu.logrotate.in +++ b/daemon/libvirtd.qemu.logrotate.in @@ -5,5 +5,4 @@ compress delaycompress copytruncate - minsize 100k } -- 2.14.2

2 4

[libvirt] RFC: how to help to detect backing chain when no backing format info in images
by Nikolay Shirokovskiy 26 Oct '17

26 Oct '17

I create transient domain with disk based on qcow2 image with 2 backing images. I specify qcow2 format explicitly for the top image and omit the backing chain in xml for create becase libvirt does not utilize this data anyway. Top image and its backing file don't have backing file format information and format autodetection is off by default thus I get wrong backing chain for the disk. Second image have format raw and there is no third backing image obviously. How can I get correct backing chain in domain xml in this case? I don't want to set backing file format on this images because they are backup images and I don't want to touch them in any way. Can we add option to create API not to drop backing chain info that I can specify on start? (Drop is forced on start in qemuDomainDetermineDiskChain)

2 2

[libvirt] [PATCH] qemu: treat iso images as raw
by Nikolay Shirokovskiy 26 Oct '17

26 Oct '17

if image format probing is on and image format of iso file is not specified qemu fail to start a domain or change disk media giving errors like [1]. The problem is format is being detected as 'iso' and qemu expect format to be raw for iso images. It makes sense to me because iso refers to filesystem format in image not image format itself. Thus let's just convert iso to raw in case of qemu. There is a similar patch for storage pools - 0e5db762. [1] Unknown driver 'iso' --- ISO as image format was added right at the beginning by e266ded2f without any further comments. Maybe we just can drop ISO from image formats entirely as it is not image format or some hypervisors treat it in a special way? src/qemu/qemu_domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c7c9e94..3da9271 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6023,8 +6023,13 @@ qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, if (virStorageFileGetMetadata(disk->src, uid, gid, cfg->allowDiskFormatProbing, - report_broken) < 0) + report_broken) < 0) { ret = -1; + goto cleanup; + } + + if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_ISO) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); cleanup: virObjectUnref(cfg); -- 1.8.3.1

3 4

[libvirt] [PATCH 0/4] misc virt-aa-helper fixes
by Christian Ehrhardt 26 Oct '17

26 Oct '17

Hi, this was mostly created by clearing old libvirt bugs in Ubuntu. USB passthrough so far often used workarounds but can be fixed in virt-aa-helper. I have some more changes planned but these seem to become longer term activities so I didn't want to postpone those easier ones due to that and submit them today. Christian Ehrhardt (4): virt-aa-helper: fix paths for usb hostdevs virt-aa-helper: fix libusb access to udev usb data virt-aa-helper: allow spaces in vm names virt-aa-helper: put static rules in quotes examples/apparmor/libvirt-qemu | 3 +++ src/security/virt-aa-helper.c | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) -- 2.7.4

3 12

[libvirt] [PATCH] virt-aa-helper: grant locking permission on -f
by Christian Ehrhardt 26 Oct '17

26 Oct '17

Hot-adding disks does not parse the full XML to generate apparmor rules. Instead it uses -f <PATH> to append a generic rule for that file path. 580cdaa7: "virt-aa-helper: locking disk files for qemu 2.10" implemented the qemu 2.10 requirement to allow locking on disks images that are part of the domain xml. But on attach-device a user will still trigger an apparmor deny by going through virt-aa-helper -f, to fix that add the lock "k" permission to the append file case of virt-aa-helper. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index ef1bf01..ee3913d 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1157,7 +1157,7 @@ get_files(vahControl * ctl) } if (ctl->newfile) - if (vah_add_file(&buf, ctl->newfile, "rw") != 0) + if (vah_add_file(&buf, ctl->newfile, "rwk") != 0) goto cleanup; if (virBufferError(&buf)) { @@ -1341,7 +1341,7 @@ main(int argc, char **argv) vah_error(ctl, 1, _("profile exists")); if (ctl->append && ctl->newfile) { - if (vah_add_file(&buf, ctl->newfile, "rw") != 0) + if (vah_add_file(&buf, ctl->newfile, "rwk") != 0) goto cleanup; } else { if (ctl->def->virtType == VIR_DOMAIN_VIRT_QEMU || -- 2.7.4

3 2

[libvirt] [PATCH] virt-aa-helper: fix libusb access to udev usb descriptions
by Christian Ehrhardt 26 Oct '17

26 Oct '17

In bf3a4140 "virt-aa-helper: fix libusb access to udev usb data" the libusb access to properly detect the device/bus ids was fixed. The path /run/udev/data/+usb* contains a subset of that information we already allow to be read and are currently not needed for the function qemu needs libusb for. But on the init of libusb all those files are still read so a lot of apparmor denials can be seen when using usb host devices, like: apparmor="DENIED" operation="open" name="/run/udev/data/+usb:2-1.2:1.0" comm="qemu-system-x86" requested_mask="r" denied_mask="r" Today we could silence the warnings with a deny rule without breaking current use cases. But since the data in there is only a subset of those it can read already it is no additional information exposure. And on the other hand a future udev/libusb/qemu combination might need it so allow the access in the default apparmor profile. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/libvirt-qemu | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index b341e31..97dd2d4 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -32,6 +32,7 @@ # libusb needs udev data about usb devices (~equal to content of lsusb -v) /run/udev/data/c16[6,7]* r, /run/udev/data/c18[0,8,9]* r, + /run/udev/data/+usb* r, # WARNING: this gives the guest direct access to host hardware and specific # portions of shared memory. This is required for sound using ALSA with kvm, -- 2.7.4

3 2

[libvirt] Libvirt xl to xml converter only picks up first occurrence of an option
by Wei Liu 26 Oct '17

26 Oct '17

Hi Jim I discovered that libvirt's native config file to xml converter for libxl only pick up the first occurrence of an option. For example in a xl cfg file: extra = "abc" ... extra = "def" xl will pick up "def" because that shows up later and takes precedence, while the converter picks up "abc". I think this is a bug in the converter and should be fixed. Thanks Wei.

2 2

[libvirt] [PATCH] conf: Avoid leaking blockers from virDomainCapsCPUModel
by Jiri Denemark 26 Oct '17

26 Oct '17

When adding CPU usability blockers I forgot to properly free them when in virDomainCapsCPUModelsDispose. Reported-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_capabilities.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index 729d905e2..7f96ff386 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -94,8 +94,10 @@ virDomainCapsCPUModelsDispose(void *obj) virDomainCapsCPUModelsPtr cpuModels = obj; size_t i; - for (i = 0; i < cpuModels->nmodels; i++) + for (i = 0; i < cpuModels->nmodels; i++) { VIR_FREE(cpuModels->models[i].name); + virStringListFree(cpuModels->models[i].blockers); + } VIR_FREE(cpuModels->models); } -- 2.14.3

2 1

[libvirt] [PATCH 0/2] Further Increase default file handle limits
by Christian Ehrhardt 26 Oct '17

26 Oct '17

In 27cd7635 new default limits were set: Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Wed Mar 15 16:51:51 2017 +0000 Increase default file handle limits for daemons But I faced some constraints with these values and think it is time to reconsider the defaults to only have to be tweaked in really uncommon cases. Christian Ehrhardt (2): Increase default file handle limits for virtlogd Increase default file handle limits for virtlockd src/locking/virtlockd.service.in | 4 ++-- src/logging/virtlogd.service.in | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) -- 2.7.4

2 3

[libvirt] [PATCH] docs: Drop mention that WWN for disks must be unique
by Peter Krempa 26 Oct '17

26 Oct '17

For multipath disks it might be useful to have the same WWN for multiple disks. It's the users choice to do so. Since we dropped the check that disallows using duplicate WWNs drop the docs as well. https://bugzilla.redhat.com/show_bug.cgi?id=1464975 --- Pushed as trivial. docs/formatdomain.html.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 4609e2ec2..4f28dce35 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3184,8 +3184,7 @@ <dt><code>wwn</code></dt> <dd>If present, this element specifies the WWN (World Wide Name) of a virtual hard disk or CD-ROM drive. It must be composed - of 16 hexadecimal digits and must be unique (at least among - disks of a single domain) + of 16 hexadecimal digits. <span class='since'>Since 0.10.1</span> </dd> <dt><code>vendor</code></dt> -- 2.13.6

1 0

[libvirt] Plans for next release
by Daniel Veillard 26 Oct '17

26 Oct '17

Hi all, we are getting close to the end of the month, and I think we should enter freeze over the week-end. Then I can try to push an RC2 on Tuesday and make the GA release on the 2nd Nov (I'm travelling ATM and Nov 1st is closed, not sure I could do this that day). Hope this works for everyone, thanks, Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH v2 0/3] Update VRDE server port handling.
by Dawid Zamirski 26 Oct '17

26 Oct '17

v1: https://www.redhat.com/archives/libvir-list/2017-October/msg00421.html Changes since v1: * separate out the patch that drops VBOX_SESSION_OPEN/CLOSE macros. * reverse logic to check for rdp.autoport instead of rdp.port to avoid handling port = -1 * do not set rdp.port = -1 if vboxGetActiveRdpPort returns -1 and add more verbose code comments to clarify the logic Dawid Zamirski (3): vbox: Remove old unflexible macros vbox: Make autoport set RDP port range. vbox: Read runtime RDP port and handle autoport src/vbox/vbox_common.c | 3 +- src/vbox/vbox_tmpl.c | 159 ++++++++++++++++++++++++++++++------------ src/vbox/vbox_uniformed_api.h | 2 +- 3 files changed, 118 insertions(+), 46 deletions(-) -- 2.14.2

2 8

[libvirt] [PATCH go-xml] Add bootp option to NetworkDHCP
by Michal Rostecki 24 Oct '17

24 Oct '17

From: Michal Rostecki <michal.rostecki(a)gmail.com> Support specyfing concrete file and TFTP server for PXE boot. Signed-off-by: Michal Rostecki <michal.rostecki(a)gmail.com> --- network.go | 6 ++++++ network_test.go | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/network.go b/network.go index 32f125a..10c4dfc 100644 --- a/network.go +++ b/network.go @@ -78,9 +78,15 @@ type NetworkDHCPHost struct { IP string `xml:"ip,attr,omitempty"` } +type NetworkBootp struct { + File string `xml:"file,attr,omitempty"` + Server string `xml:"server,attr,omitempty"` +} + type NetworkDHCP struct { Ranges []NetworkDHCPRange `xml:"range"` Hosts []NetworkDHCPHost `xml:"host"` + Bootp []NetworkBootp `xml:"bootp"` } type NetworkIP struct { diff --git a/network_test.go b/network_test.go index b1bd168..3efb278 100644 --- a/network_test.go +++ b/network_test.go @@ -100,6 +100,12 @@ var networkTestData = []struct { IP: "192.168.122.10", }, }, + Bootp: []NetworkBootp{ + NetworkBootp{ + File: "pxelinux.0", + Server: "192.168.122.1", + }, + }, }, }, NetworkIP{ @@ -179,6 +185,7 @@ var networkTestData = []struct { ` <dhcp>`, ` <range start="192.168.122.2" end="192.168.122.254"></range>`, ` <host mac="00:16:3e:77:e2:ed" name="foo.example.com" ip="192.168.122.10"></host>`, + ` <bootp file="pxelinux.0" server="192.168.122.1"></bootp>`, ` </dhcp>`, ` </ip>`, ` <ip address="2001:db8:ca2:2::1" family="ipv6" prefix="64">`, -- 2.13.6

1 0

[libvirt] [PATCH v2 0/2] daemon: fix termination/reload issues
by Nikolay Shirokovskiy 24 Oct '17

24 Oct '17

v1: https://www.redhat.com/archives/libvir-list/2017-September/msg01006.html Changes from v1: 1. Patches that fixes qemu driver termination are moved out of this series 2. New version of [1] now fixes issue in a way that suggested by reviewer 3. [2] fixes another issue that was discovered in the process of review Nikolay Shirokovskiy (2): libvirtd: fix crash on termination [1] virtlogd: add missing netserver refcount increment on reload [2] src/locking/lock_daemon.c | 1 + src/rpc/virnetdaemon.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) -- 1.8.3.1

1 3

[libvirt] [PATCH] spec: Restart libvirtd in posttrans
by Jiri Denemark 24 Oct '17

24 Oct '17

When upgrading libvirt packages, there's no strict ordering for the installation or removal of the individual libvirt sub packages. Thus libvirt-daemon may be upgraded (and its %postun scriptlet) started before all sub packages with driver libraries are upgraded. When libvirt-daemon's %postun scriptlet restarts the daemon old drivers may still be laying around and the daemon may crash when it tries to use them. Let's restart the daemon in %posttrans to make sure libvirtd is restarted only after all sub packages are at the same version. https://bugzilla.redhat.com/show_bug.cgi?id=1464300 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0123d0655..73e647cb5 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1554,13 +1554,11 @@ fi if [ $1 -ge 1 ] ; then /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || : /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || : - /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : fi %else if [ $1 -ge 1 ]; then /sbin/service virtlockd reload > /dev/null 2>&1 || : /sbin/service virtlogd reload > /dev/null 2>&1 || : - /sbin/service libvirtd condrestart > /dev/null 2>&1 fi %endif @@ -1570,10 +1568,16 @@ fi if [ "$1" -ge "1" ]; then /sbin/service virtlockd reload > /dev/null 2>&1 || : /sbin/service virtlogd reload > /dev/null 2>&1 || : - /sbin/service libvirtd condrestart > /dev/null 2>&1 fi %endif +%posttrans daemon +%if %{with_systemd} +/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : +%else +/sbin/service libvirtd condrestart > /dev/null 2>&1 || : +%endif + # In upgrade scenario we must explicitly enable virtlockd/virtlogd # sockets, if libvirtd is already enabled and start them if # libvirtd is running, otherwise you'll get failures to start @@ -1642,11 +1646,13 @@ fi %post daemon-config-nwfilter cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/ + +%posttrans daemon-config-nwfilter # Make sure libvirt picks up the new nwfilter defininitons %if %{with_systemd} - /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||: +/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : %else - /sbin/service libvirtd condrestart > /dev/null 2>&1 || : +/sbin/service libvirtd condrestart > /dev/null 2>&1 || : %endif -- 2.14.2

2 2

[libvirt] [PATCH] virsh: domain: Fix option handling in domxml-to-native
by Peter Krempa 24 Oct '17

24 Oct '17

Commit fdeac7a05fdf85458d72e89efcfa0f444525aaad tried to fix the output of 'virsh --help domxml-to-native' by switching types around. One of the changes broke the option parser. VSH_OT_ARGV should be used only for variable argument count, not to make the help generator look pretty. The correct option type in this case is VSH_OT_STRING as it's not mandatory now since it can be substituted by using --domain. This makes --help for this command look incorrect, but the parser works as it should. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1494400 --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e1a312a6a..1e33e8295 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10152,7 +10152,7 @@ static const vshCmdOptDef opts_domxmltonative[] = { .help = N_("domain name, id or uuid") }, {.name = "xml", - .type = VSH_OT_ARGV, + .type = VSH_OT_STRING, .help = N_("xml data file to export from") }, {.name = NULL} -- 2.13.6

2 1

[libvirt] [PATCH] qemu: Reset hasManagedSave after removing a corrupted image
by Jiri Denemark 24 Oct '17

24 Oct '17

When starting a domain with managed save image, we try to restore it first. If the image is corrupted, we silently unlink it and just normally start the domain. At this point the domain has no managed save image, yet we did not reset the hasManagedSave flag. https://bugzilla.redhat.com/show_bug.cgi?id=1460962 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 32a416f9e..74fdfdb0f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7256,6 +7256,7 @@ qemuDomainObjStart(virConnectPtr conn, } else { VIR_WARN("Ignoring incomplete managed state %s", managed_save); priv->job.current->operation = op; + vm->hasManagedSave = false; } } } -- 2.14.2

2 1

[libvirt] [PATCH] iohelper: use saferead if later write with O_DIRECT
by Nikolay Shirokovskiy 24 Oct '17

24 Oct '17

One of the usecases of iohelper is to read from pipe and write to file with O_DIRECT. As we read from pipe we can have partial read and then we fail to write this data because output file is open with O_DIRECT and buffer size is not aligned. --- src/util/iohelper.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 5416d45..bb8a8dd 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -109,9 +109,21 @@ runIO(const char *path, int fd, int oflags) while (1) { ssize_t got; - if ((got = read(fdin, buf, buflen)) < 0) { - if (errno == EINTR) + /* If we read with O_DIRECT from file we can't use saferead as + * it can lead to unaligned read after reading last bytes. + * If we write with O_DIRECT use should use saferead so that + * writes will be aligned. + * In other cases using saferead reduces number of syscalls. + */ + if (fdin == fd && direct) { + if ((got = read(fdin, buf, buflen)) < 0 && + errno == EINTR) continue; + } else { + got = saferead(fdin, buf, buflen); + } + + if (got < 0) { virReportSystemError(errno, _("Unable to read %s"), fdinname); goto cleanup; } -- 1.8.3.1

2 2

[libvirt] [PATCH v1 0/5] Predictable file names for memory-backend-file
by Michal Privoznik 24 Oct '17

24 Oct '17

As discussed here [1], for some types of environment it's important to allocate memory upfront. In such cases libvirt needs to reuse the paths. However, since we don't want to expose the paths anywhere, reversed approach is implemented. If enabled in config file, libvirt builds predictable paths for memory-backend-file. 1: https://www.redhat.com/archives/libvir-list/2017-October/msg01036.html As usual, you can also find all the patches on my github: https://github.com/zippy2/libvirt/tree/aliases_from_user_v2 (Why v2? Don't ask.) Michal Privoznik (5): conf: s/virDomainObjGetShortName/virDomainDefGetShortName/ qemu: Move memPath generation from memoryBackingDir to a separate function qemu.conf: Introduce memory_predictable_file_names qemuxml2argvtest: Test memory_predictable_file_names news: Document memory_predictable_file_names docs/news.xml | 10 ++ src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 + src/qemu/qemu_command.c | 9 +- src/qemu/qemu_conf.c | 92 +++++++++++++- src/qemu/qemu_conf.h | 11 ++ src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_driver.c | 21 ++- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 141 +++++++++++++++------ src/qemu/qemu_process.h | 8 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + .../qemuxml2argv-cpu-numa-memshared.args | 6 +- .../qemuxml2argv-fd-memory-numa-topology.args | 3 +- .../qemuxml2argv-fd-memory-numa-topology2.args | 6 +- .../qemuxml2argv-fd-memory-numa-topology3.args | 9 +- .../qemuxml2argv-hugepages-memaccess2.args | 9 +- tests/qemuxml2argvtest.c | 1 + 21 files changed, 279 insertions(+), 68 deletions(-) -- 2.13.6

2 8

[libvirt] libvirt not wanting to read back its own interface XML
by Marc Haber 24 Oct '17

24 Oct '17

Hi, I'm trying to give libvirt knowlegde of a VLAN interface that is configured by a different means and not by libvirt. To figure out the syntax, I created a VLAN interface through virt-manager and dumped out the XML: <interface type='vlan' name='ens3.180'> <protocol family='ipv6'> <ip address='2a01:4f8:150:436c::55:100' prefix='64'/> <ip address='fe80::5054:ff:fe30:e0d1' prefix='64'/> </protocol> <link speed='4294967295' state='up'/> <vlan tag='180'> <interface name='ens3'/> </vlan> </interface> I then removed the Interface in virt-manager and tried to have libvirt read back its own XML. [12/784]mh@testsid85:~ $ virsh iface-dumpxml ens3.180 > ens3.180.xml [13/785]mh@testsid85:~ $ virsh iface-define ens3.180.xml error: Failed to define interface from ens3.180.xml error: XML error: could not get interface XML description: XML invalid - Expecting an element start, got nothing What is going on here? How do I define a VLAN interface via XML? Greetings Marc -- ----------------------------------------------------------------------------- Marc Haber | "I don't trust Computers. They | Mailadresse im Header Leimen, Germany | lose things." Winona Ryder | Fon: *49 6224 1600402 Nordisch by Nature | How to make an American Quilt | Fax: *49 6224 1600421

4 9

[libvirt] [jenkins-ci PATCH v2 0/5] guests: Fixes for development releases
by Andrea Bolognani 23 Oct '17

23 Oct '17

Changes from [v1]: * rebase on top of current master; * perform pure code motions in a separate patch; * clean up non-CI guests. [v1] https://www.redhat.com/archives/libvir-list/2017-October/msg01045.html Andrea Bolognani (5): guests: Shuffle base steps around guests: Use non-debug kernel on Fedora Rawhide guests: Clean up non-CI guests ansible: Use ansible_distribution_release on FreeBSD guests: Add Debian sid and FreeBSD -CURRENT guests/files/fedora-rawhide-kernel-nodebug.repo | 8 ++ guests/host_vars/libvirt-debian-sid/install.yml | 3 + .../main.yml | 2 +- .../main.yml | 11 ++- guests/host_vars/libvirt-ubuntu-12/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/tasks/base.yml | 61 +++++++++----- guests/vars/mappings.yml | 3 +- guests/vars/vault.yml | 98 ++++++++++------------ 10 files changed, 107 insertions(+), 82 deletions(-) create mode 100644 guests/files/fedora-rawhide-kernel-nodebug.repo create mode 100644 guests/host_vars/libvirt-debian-sid/install.yml copy guests/host_vars/{libvirt-ubuntu-16 => libvirt-debian-sid}/main.yml (94%) copy guests/host_vars/{libvirt-ubuntu-16 => libvirt-freebsd-current}/main.yml (51%) -- 2.13.6

2 6

[libvirt] [jenkins-ci PATCH] guests: disable sendmail on FreeBSD to speedup booting
by Pavel Hrdina 23 Oct '17

23 Oct '17

You can notice it by looking for this message while booting: "Oct 23 08:31:19 libvirt-freebsd-10 sm-mta[667]: My unqualified host name (libvirt-freebsd-10) unknown; sleeping for retry" Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- guests/tasks/base.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index a71e66d..48455dd 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -118,6 +118,19 @@ hostname: name: '{{ inventory_hostname }}' +# On FreeBSD sendmail is enabled by default and it expects fully qualified +# hostname. By disabling sendmail we will avoid sendmail to trying to resolve +# the hostname while booting which takes several seconds. +- name: Disable sendmail + lineinfile: + path: /etc/rc.conf + create: yes + backup: yes + regexp: '^sendmail_enable.*' + line: 'sendmail_enable="NONE"' + when: + - os_name == 'FreeBSD' + - name: Configure ssh access for the root user authorized_key: user: root -- 2.13.6

2 3

[libvirt] Build fails on Debian unstable: libssh's ssh_get_publickey() is deprecated
by Andrea Bolognani 23 Oct '17

23 Oct '17

I ran into a failure trying to compile libvirt on Debian unstable today: rpc/virnetlibsshsession.c: In function 'virLibsshServerKeyAsString': rpc/virnetlibsshsession.c:220:5: error: 'ssh_get_publickey' is deprecated [-Werror=deprecated-declarations] if (ssh_get_publickey(sess->session, &key) != SSH_OK) { ^~ In file included from rpc/virnetlibsshsession.c:24:0: /usr/include/libssh/libssh.h:489:31: note: declared here SSH_DEPRECATED LIBSSH_API int ssh_get_publickey(ssh_session session, ssh_key *key); ^~~~~~~~~~~~~~~~~ CC libvirt_lxc_la-libvirt-lxc.lo cc1: all warnings being treated as errors Makefile:8092: recipe for target 'rpc/libvirt_net_rpc_la-virnetlibsshsession.lo' failed Looks like Debian decided to start shipping a development snapshot instead of the latest stable release: $ dpkg -l | grep libssh- ii libssh-gcrypt-4:amd64 0.8.0~20170825.94fa1e38-1 ii libssh-gcrypt-dev 0.8.0~20170825.94fa1e38-1 That means we're not in a hurry; still, it probably makes sense to try and figure out a way to keep it compiling (and working!) sooner rather than later :) -- Andrea Bolognani / Red Hat / Virtualization

2 1

[libvirt] [libvirt-jenkins-ci PATCH 0/6] Implement developer flavor
by Andrea Bolognani 23 Oct '17

23 Oct '17

Make lcitool useful outside of the libvirt CI context, even though doing so openly contradicts its name. We're just savage like that. Andrea Bolognani (6): guests: Open vault on demand guests: Move configuration handling to load_config() guests: Implement flavors guests: Implement developer flavor guests: Hand root password location over to Ansible guests: Update documentation guests/README.markdown | 45 ++++++------ guests/group_vars/all/main.yml | 4 +- guests/host_vars/libvirt-centos-6/main.yml | 2 - guests/host_vars/libvirt-centos-6/vault.yml | 10 --- guests/host_vars/libvirt-centos-7/main.yml | 2 - guests/host_vars/libvirt-centos-7/vault.yml | 10 --- guests/host_vars/libvirt-debian-8/main.yml | 2 - guests/host_vars/libvirt-debian-8/vault.yml | 10 --- guests/host_vars/libvirt-debian-9/main.yml | 2 - guests/host_vars/libvirt-debian-9/vault.yml | 10 --- guests/host_vars/libvirt-fedora-25/main.yml | 2 - guests/host_vars/libvirt-fedora-25/vault.yml | 10 --- guests/host_vars/libvirt-fedora-26/main.yml | 2 - guests/host_vars/libvirt-fedora-26/vault.yml | 10 --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 - guests/host_vars/libvirt-fedora-rawhide/vault.yml | 10 --- guests/host_vars/libvirt-freebsd-10/main.yml | 3 +- guests/host_vars/libvirt-freebsd-10/vault.yml | 10 --- guests/host_vars/libvirt-freebsd-11/main.yml | 3 +- guests/host_vars/libvirt-freebsd-11/vault.yml | 10 --- guests/host_vars/libvirt-ubuntu-12/main.yml | 2 - guests/host_vars/libvirt-ubuntu-12/vault.yml | 8 -- guests/host_vars/libvirt-ubuntu-14/main.yml | 2 - guests/host_vars/libvirt-ubuntu-14/vault.yml | 8 -- guests/host_vars/libvirt-ubuntu-16/main.yml | 2 - guests/host_vars/libvirt-ubuntu-16/vault.yml | 8 -- guests/lcitool | 90 +++++++++++++++++------ guests/site.yml | 6 ++ guests/tasks/base.yml | 2 +- guests/tasks/developer.yml | 21 ++++++ guests/tasks/jenkins.yml | 8 ++ guests/vars/vault.yml | 54 ++++++++++++++ 32 files changed, 186 insertions(+), 184 deletions(-) delete mode 100644 guests/host_vars/libvirt-centos-6/vault.yml delete mode 100644 guests/host_vars/libvirt-centos-7/vault.yml delete mode 100644 guests/host_vars/libvirt-debian-8/vault.yml delete mode 100644 guests/host_vars/libvirt-debian-9/vault.yml delete mode 100644 guests/host_vars/libvirt-fedora-25/vault.yml delete mode 100644 guests/host_vars/libvirt-fedora-26/vault.yml delete mode 100644 guests/host_vars/libvirt-fedora-rawhide/vault.yml delete mode 100644 guests/host_vars/libvirt-freebsd-10/vault.yml delete mode 100644 guests/host_vars/libvirt-freebsd-11/vault.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-12/vault.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-14/vault.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-16/vault.yml create mode 100644 guests/tasks/developer.yml create mode 100644 guests/vars/vault.yml -- 2.13.6

2 12

[libvirt] [jenkins-ci PATCH 0/3] guests: Fixes for development releases
by Andrea Bolognani 23 Oct '17

23 Oct '17

Andrea Bolognani (3): guests: Use non-debug kernel on Fedora Rawhide ansible: Use ansible_distribution_release on FreeBSD guests: Add Debian sid and FreeBSD -CURRENT guests/files/fedora-rawhide-kernel-nodebug.repo | 8 +++ guests/host_vars/libvirt-debian-sid/install.yml | 3 ++ guests/host_vars/libvirt-debian-sid/main.yml | 19 +++++++ guests/host_vars/libvirt-debian-sid/vault.yml | 8 +++ guests/host_vars/libvirt-freebsd-current/main.yml | 25 +++++++++ guests/host_vars/libvirt-freebsd-current/vault.yml | 8 +++ guests/tasks/base.yml | 61 ++++++++++++++-------- 7 files changed, 111 insertions(+), 21 deletions(-) create mode 100644 guests/files/fedora-rawhide-kernel-nodebug.repo create mode 100644 guests/host_vars/libvirt-debian-sid/install.yml create mode 100644 guests/host_vars/libvirt-debian-sid/main.yml create mode 100644 guests/host_vars/libvirt-debian-sid/vault.yml create mode 100644 guests/host_vars/libvirt-freebsd-current/main.yml create mode 100644 guests/host_vars/libvirt-freebsd-current/vault.yml -- 2.13.6

2 4

Re: [libvirt] [Qemu-devel] [RFC 0/6] enable numa configuration before machine_init() from HMP/QMP
by Eduardo Habkost 23 Oct '17

23 Oct '17

On Thu, Oct 19, 2017 at 04:28:59PM +0100, Daniel P. Berrange wrote: > On Thu, Oct 19, 2017 at 11:21:22AM -0400, Igor Mammedov wrote: > > ----- Original Message ----- > > > From: "Daniel P. Berrange" <berrange(a)redhat.com> > > > To: "Igor Mammedov" <imammedo(a)redhat.com> > > > Cc: "peter maydell" <peter.maydell(a)linaro.org>, pkrempa(a)redhat.com, ehabkost(a)redhat.com, cohuck(a)redhat.com, > > > qemu-devel(a)nongnu.org, armbru(a)redhat.com, pbonzini(a)redhat.com, david(a)gibson.dropbear.id.au > > > Sent: Wednesday, October 18, 2017 5:30:10 PM > > > Subject: Re: [Qemu-devel] [RFC 0/6] enable numa configuration before machine_init() from HMP/QMP > > > > > > On Tue, Oct 17, 2017 at 06:06:35PM +0200, Igor Mammedov wrote: > > > > On Tue, 17 Oct 2017 16:07:59 +0100 > > > > "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > > > > > > > > > On Tue, Oct 17, 2017 at 09:27:02AM +0200, Igor Mammedov wrote: > > > > > > On Mon, 16 Oct 2017 17:36:36 +0100 > > > > > > "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > > > > > > > > > > > > > On Mon, Oct 16, 2017 at 06:22:50PM +0200, Igor Mammedov wrote: > > > > > > > > Series allows to configure NUMA mapping at runtime using QMP/HMP > > > > > > > > interface. For that to happen it introduces a new '-paused' CLI > > > > > > > > option > > > > > > > > which allows to pause QEMU before machine_init() is run and > > > > > > > > adds new set-numa-node HMP/QMP commands which in conjuction with > > > > > > > > info hotpluggable-cpus/query-hotpluggable-cpus allow to configure > > > > > > > > NUMA mapping for cpus. > > > > > > > > > > > > > > What's the problem we're seeking solve here compared to what we > > > > > > > currently > > > > > > > do for NUMA configuration ? > > > > > > From RHBZ1382425 > > > > > > " > > > > > > Current -numa CLI interface is quite limited in terms that allow map > > > > > > CPUs to NUMA nodes as it requires to provide cpu_index values which > > > > > > are non obvious and depend on machine/arch. As result libvirt has to > > > > > > assume/re-implement cpu_index allocation logic to provide valid > > > > > > values for -numa cpus=... QEMU CLI option. > > > > > > > > > > In broad terms, this problem applies to every device / object libvirt > > > > > asks QEMU to create. For everything else libvirt is able to assign a > > > > > "id" string, which is can then use to identify the thing later. The > > > > > CPU stuff is different because libvirt isn't able to provide 'id' > > > > > strings for each CPU - QEMU generates a psuedo-id internally which > > > > > libvirt has to infer. The latter is the same problem we had with > > > > > devices before '-device' was introduced allowing 'id' naming. > > > > > > > > > > IMHO we should take the same approach with CPUs and start modelling > > > > > the individual CPUs as something we can explicitly create with -object > > > > > or -device. That way libvirt can assign names and does not have to > > > > > care about CPU index values, and it all works just the same way as > > > > > any other devices / object we create > > > > > > > > > > ie instead of: > > > > > > > > > > -smp 8,sockets=4,cores=2,threads=1 > > > > > -numa node,nodeid=0,cpus=0-3 > > > > > -numa node,nodeid=1,cpus=4-7 > > > > > > > > > > we could do: > > > > > > > > > > -object numa-node,id=numa0 > > > > > -object numa-node,id=numa1 > > > > > -object cpu,id=cpu0,node=numa0,socket=0,core=0,thread=0 > > > > > -object cpu,id=cpu1,node=numa0,socket=0,core=1,thread=0 > > > > > -object cpu,id=cpu2,node=numa0,socket=1,core=0,thread=0 > > > > > -object cpu,id=cpu3,node=numa0,socket=1,core=1,thread=0 > > > > > -object cpu,id=cpu4,node=numa1,socket=2,core=0,thread=0 > > > > > -object cpu,id=cpu5,node=numa1,socket=2,core=1,thread=0 > > > > > -object cpu,id=cpu6,node=numa1,socket=3,core=0,thread=0 > > > > > -object cpu,id=cpu7,node=numa1,socket=3,core=1,thread=0 > > > > the follow up question would be where do "socket=3,core=1,thread=0" > > > > come from, currently these options are the function of > > > > (-M foo -smp ...) and can be queried vi query-hotpluggble-cpus at > > > > runtime after qemu parses -M and -smp options. > > > > > > NB, I realize my example was open to mis-interpretation. The values I'm > > > illustrating here for socket=3,core=1,thread=0 and *not* ID values, they > > > are a plain enumeration of values. ie this is saying the 4th socket, the > > > 2nd core and the 1st thread. Internally QEMU might have the 2nd core > > > with a core-id of 8, or 7038 or whatever architecture specific numbering > > > scheme makes sense, but that's not what the mgmt app gives at the CLI > > > level > > Even though fixed properties/values simplicity is tempting and it might even > > work for what we have implemented in qemu currently (well, SPAPR will need > > refactoring (if possible) to meet requirements + compat stuff for current > > machines with sparse IDs). > > But I have to disagree here and try to oppose it. > > > > QEMU models concrete platforms/hw with certain non abstract properties > > and it's libvirt's domain to translate platform specific devices into > > 'spherical' devices with abstract properties. > > > > Now back to cpus and suggestion to fix the set of 'address' properties > > and their values into continuous enumeration range [0..N). That would > > 1. put a burden of hiding platform/device details on QEMU > > (which is already bad as QEMU's job is to emulate it) > > 2. with abstract 'address' properties and values, user won't have > > a clue as to where device is being attached (as qemu would magically > > remap that to fit specific machine needs) > > 2.1. if abstract 'address' properties and values we can do away with > > socket/core/thread/whatnot since they won't mean the same when considered > > from platform point of view, so we can just drop all these nonsense > > and go back to cpu-index that has all the properties you've suggested > > /abstract, [0..N]/. > > 3. we currently stopped with socket|core|thread-id properties as they are > > applicable to machines that support -device cpu, but it's up to machine > > to pick witch of these to use (x86: uses all, spar: uses core-id only), > > but current property set is open for extension if need arises without > > need to redefine interface. So fixed list of properties [even ignoring > > values impact] doesn't scale. > > Note from the libvirt POV, we don't expose socket-id/core-id/thread-id in our > guest XML, we just provide an overall count of sockets/cores/threads which is > portable. The only arch specific thing we would have todo is express constraints > about ratios of these - eg indicate in some way that ppc doesn't allow mutliple > threads per core for example. > > > We even have cpu-add command which takes cpu-index as argument and > > -numa node,cpus=0..X CLI option, good luck with figuring out which cpu goes > > where and if it makes any sense from platform point of view. > > > > That's why when designing hot plug for 'device_add cpu' interface, we ended up > > with new query-hotpluggble-cpus QMP command, which is currently used by libvirt > > for hot-plug: > > > > Approach allows > > 1: machine to publish properties/values that make sense from emulated > > platform point of view but still understandable by user of given hw. > > 2: user may use them as opaque mandatory properties to create cpu device if > > he/she doesn't care about where it's plugged. > > 3: if user cares about which cpu goes where, properties defined by machine > > provide that info from emulated hw point of view including platform specific > > details. > > 4: it's easy to extend set of properties/values if need arises without > > breaking users (provided user will put them all in -device/device_add > > options as it's supposed to) > > > > But current approach has drawback, to call query-hotpluggble-cpus, machine has to > > be started first, which is fine for hot plug but not for specifying CLI options. > > > > Currently that could be solved by starting qemu twice when 'defining domain', > > where on the first run mgmt queries board layout and caches it for all the next > > times the defined machine is started (change in machine/version/-smp/-cpu will > > invalidate, cache). > > > > This series allows to avoid this 1st time restart, when creating domain for > > the first time, mgmt can query layout and then specify numa mapping without > > restarting, it can cache defined mapping as commands exactly match corresponding > > CLI options and reuse cached options on the next domain starts. > > > > This approach could be extended further with "device_add cpu" command > > so it would be possible to start qemu with -smp 0,... and allow mgmt to > > create cpus with explicit IDs controlled by mgmt, and again mgmt may cache > > these commands and reuse them on CLI next time machine is started > > > > I think Eduardo's work on query-slots is superset of query-hotpluggble-cpus, > > but working to the same goal to allow mgmt discover which hw is provided by > > specific machine and where/which hw could be plugged (like which slot supports > > which kind of device and which 'address' should be used to attach device > > (socket|core... - for cpus, bus/function - for pic, ...) > > As mentioned elsewhere in the thread, the approach of defining the VM config > incrementally via the monitor has significant downsides, by making the config > invisible in any logs of the ARGV, and has likely performance impact when > starting up QEMU, particularly if it is used for more things going forward. To > me these downsides are enough to make the suggested approach for CPUs impractical > for libvirt to use. Those downsides do exist, but we should weight them against the downsides of not allowing any information at all to flow from QEMU to libvirt when starting a VM. I believe the code in libvirt/src/qemu/qemu_domain_address.c is a good illustration of those downsides. -- Eduardo

3 5

[libvirt] [RFC] Question regarding the validity of QEMU capabilities
by Marc Hartmayer 23 Oct '17

23 Oct '17

Hi all, the actual capabilities of QEMU are depending on the host. This includes dependencies like which kernel modules are loaded or which kernel parameters are used (e.g. kvm.nested). Therefore, after a restart we cannot be sure that the QEMU capabilities remain the same. How can we solve this problem? I have come up with two ways: - reprobe the capabilities with every host reboot - check for every possible change in virQEMUCapsIsValid... (this is already done for KVM). In my opinion this is not the way to go. Thanks. Marc

4 5

[libvirt] [PATCH 0/3] qemu: Fix race condition between block jobs and the end of migration
by Jiri Denemark 23 Oct '17

23 Oct '17

When migrating both memory and storage, we need to make sure block jobs are finished after the virtual CPUs get paused at the end of migration but before QEMU completes the migration otherwise QEMU may die with _co_do_pwritev: Assertion `!(bs->open_flags & 0x0800)' failed This is a libvirt side of the QEMU fix from Dr. David Alan Gilbert: http://lists.nongnu.org/archive/html/qemu-devel/2017-10/msg04895.html Applicable on top of my "Preparation for new QEMU migration states" series I sent yesterday. Jiri Denemark (3): qemu: Add support for migrate-continue QMP command qemu: Add pause-before-switchover migration capability qemu: Enabled pause-before-switchover migration capability src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_migration.c | 75 +++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 18 +++++++++-- src/qemu/qemu_monitor.h | 6 ++++ src/qemu/qemu_monitor_json.c | 29 +++++++++++++++++ src/qemu/qemu_monitor_json.h | 4 +++ 7 files changed, 131 insertions(+), 3 deletions(-) -- 2.14.2

2 4

[libvirt] Exposing mem-path in domain XML
by Michal Privoznik 23 Oct '17

23 Oct '17

Dear list, there is the following bug [1] which I'm not quite sure how to grasp. So there is this application/infrastructure called Kove [2] that allows you to have memory for your application stored on a distant host in network and basically fetch needed region on pagefault. Now imagine that somebody wants to use it for backing up domain memory. However, the way that the tool works is it has some kernel module and then some userland binary that is fed with the path of the mmaped file. I don't know all the details, but the point is, in order to let users use this we need to expose the paths for mem-path for the guest memory. I know we did not want to do this in the past, but now it looks like we don't have a way around it, do we? Michal 1: https://bugzilla.redhat.com/show_bug.cgi?id=1461214 2: http://kove.net

3 15

[libvirt] Question about the host-model CPU mode
by Marc Hartmayer 23 Oct '17

23 Oct '17

Let's assume we've a z13 system with a QEMU 2.9 and we define a domain using the default s390-virtio-ccw machine together with the host-model CPU mode. The definition will have the machine expanded to s390-virtio-ccw-2.9 but retain the host-model CPU mode. In a next step we upgrade to QEMU 2.10 (first version to recognize z14). Everything is still fine, even though the machine runs in 2.9 compatibility mode. Finally we upgrade to a z14. As a consequence it is not possible to start the domain anymore as the machine type doesn't support our CPU host model (which is expanded at start time of the domain). Is this behavior expected? There are some ways to avoid this problem: - CPU model expansion is performed at domain definition time - host-model is related to the machine type of a domain Thank you in advance. Beste Grüße / Kind regards Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

5 19

[libvirt] [PATCH v2 00/11] Never ending story of user supplied aliases
by Michal Privoznik 23 Oct '17

23 Oct '17

v2 of: https://www.redhat.com/archives/libvir-list/2017-October/msg00790.html diff to v1: - new patch 1/11 to address Pavel's findings - reworked parsing so that the alias is set iff it follows the rules - added some tests - added news.xml entry Michal Privoznik (11): qemu_alias: Be more tolerant if alias don't follow our format conf: Parse user supplied aliases conf: Validate user supplied aliases qemuDomainABIStabilityCheck: Check for memory aliases too qemuxml2argvdata: Drop device aliases qemuhotplugtest: Load active XML conf: Format alias even for inactive XMLs docs: Document user aliases qemu: Parse alias from inactive XMLs tests: Test user set aliases for qemu news: Document user aliases docs/formatdomain.html.in | 23 +++ docs/news.xml | 9 ++ src/conf/domain_conf.c | 171 ++++++++++++++++++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 22 +-- src/qemu/qemu_domain.c | 18 ++- src/qemu/qemu_driver.c | 3 + tests/qemuhotplugtest.c | 3 +- .../qemuxml2argv-disk-cdrom-network-ftp.xml | 1 - .../qemuxml2argv-disk-cdrom-network-ftps.xml | 1 - .../qemuxml2argv-disk-cdrom-network-http.xml | 1 - .../qemuxml2argv-disk-cdrom-network-https.xml | 1 - .../qemuxml2argv-disk-cdrom-network-tftp.xml | 1 - .../qemuxml2argv-usb-redir-filter.xml | 1 - .../qemuxml2argv-user-aliases.args | 71 +++++++++ .../qemuxml2argvdata/qemuxml2argv-user-aliases.xml | 140 +++++++++++++++++ tests/qemuxml2argvtest.c | 5 + .../qemuxml2xmlout-user-aliases.xml | 1 + tests/qemuxml2xmltest.c | 2 + 20 files changed, 449 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-user-aliases.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-user-aliases.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-user-aliases.xml -- 2.13.6

2 14

[libvirt] [jenkins-ci PATCH] guests: Reduce boot delay for FreeBSD
by Andrea Bolognani 23 Oct '17

23 Oct '17

Set it to 1 second instead of the default 10 seconds. This brings it in line with Linux guests and makes boot faster. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/base.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index a25420a..a71e66d 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -181,9 +181,12 @@ - name: Configure the FreeBSD bootloader lineinfile: path: /boot/loader.conf - regexp: '^console=.*$' - line: 'console="comconsole"' + regexp: '^{{ item.key }}=.*$' + line: '{{ item.key }}="{{ item.value }}"' create: yes backup: yes + with_items: + - { key: 'console', value: 'comconsole' } + - { key: 'autoboot_delay', value: '1' } when: - os_name == 'FreeBSD' -- 2.13.6

2 1

[libvirt] [PATCH] qemu_domain: Error out eariler when adding an IDE controller to a q35-based vm
by Lin Ma 23 Oct '17

23 Oct '17

Signed-off-by: Lin Ma <lma(a)suse.com> --- src/qemu/qemu_domain.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ece8ee7..120d31c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3975,10 +3975,18 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, } break; + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + if (qemuDomainIsQ35(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("IDE controllers are unsupported for q35 " + "machine type")); + return -1; + } + break; + case VIR_DOMAIN_CONTROLLER_TYPE_SATA: case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: - case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; -- 2.9.2

2 1

[libvirt] [jenkins-ci PATCH] guests: Use OpenJDK 8 on Debian 8 too
by Andrea Bolognani 23 Oct '17

23 Oct '17

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/files/jessie-backports.preferences | 3 +++ guests/files/jessie-backports.sources | 1 + guests/tasks/base.yml | 20 ++++++++++++++++++++ guests/vars/mappings.yml | 1 - 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 guests/files/jessie-backports.preferences create mode 100644 guests/files/jessie-backports.sources diff --git a/guests/files/jessie-backports.preferences b/guests/files/jessie-backports.preferences new file mode 100644 index 0000000..5e657f6 --- /dev/null +++ b/guests/files/jessie-backports.preferences @@ -0,0 +1,3 @@ +Package: openjdk-8-jre-headless java-common ca-certificates-java +Pin: release a=jessie-backports +Pin-Priority: 900 diff --git a/guests/files/jessie-backports.sources b/guests/files/jessie-backports.sources new file mode 100644 index 0000000..6e6d261 --- /dev/null +++ b/guests/files/jessie-backports.sources @@ -0,0 +1 @@ +deb http://deb.debian.org/debian/ jessie-backports main diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 6acd967..a25420a 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -33,6 +33,26 @@ - ( os_name == 'CentOS' or os_name == 'Fedora' ) +- name: Enable jessie-backports repository + copy: + src: files/jessie-backports.sources + dest: /etc/apt/sources.list.d/jessie-backports.list + owner: root + group: root + when: + - os_name == 'Debian' + - os_version == '8' + +- name: Configure APT pinning for jessie-backports + copy: + src: files/jessie-backports.preferences + dest: /etc/apt/preferences.d/jessie-backports + owner: root + group: root + when: + - os_name == 'Debian' + - os_version == '8' + - name: Bootstrap the package module command: apt-get install -y python-apt args: diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index cae9d23..d620b5d 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -175,7 +175,6 @@ mappings: deb: openjdk-8-jre-headless pkg: openjdk8-jre rpm: java-1.8.0-openjdk-headless - Debian8: openjdk-7-jre-headless Ubuntu12: openjdk-7-jre-headless Ubuntu14: openjdk-7-jre-headless -- 2.13.6

2 1

[libvirt] [PATCH] Add output of local time when adding the option of "--pretty" for virsh domtime
by ZhiPeng Lu 23 Oct '17

23 Oct '17

Add more human-friendly output of domain's system time. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> Reviewed-by: Jiyun Fan <fan.jiyun(a)zte.com.cn> --- tools/virsh-domain-monitor.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 35d04b2..d9520ff 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1384,17 +1384,22 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (pretty) { - char timestr[100]; + char timestr[100], localtimestr[100]; time_t cur_time = seconds; - struct tm time_info; + struct tm time_info, local_time_info; if (!gmtime_r(&cur_time, &time_info)) { vshError(ctl, _("Unable to format time")); goto cleanup; } + if (!localtime_r(&cur_time, &local_time_info)) { + vshError(ctl, _("Unable to format local time")); + goto cleanup; + } strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", &time_info); + strftime(localtimestr, sizeof(localtimestr), "%Y-%m-%d %H:%M:%S", &local_time_info); - vshPrint(ctl, _("Time: %s"), timestr); + vshPrint(ctl, _("Time: %s\n Local time: %s"), timestr, localtimestr); } else { vshPrint(ctl, _("Time: %lld"), seconds); } -- 1.8.3.1

1 0

[libvirt] [PATCH v6 0/8] Use secret objects to pass iSCSI passwords
by John Ferlan 21 Oct '17

21 Oct '17

v5: https://www.redhat.com/archives/libvir-list/2017-October/msg00228.html FWIW: AFAICT this series does not need/require changes that Peter has posted for continuing blocked-add saga related to user-specified backing chains: https://www.redhat.com/archives/libvir-list/2017-October/msg00956.html Changes since v5: * Some patches pushed as part of Peter Krempa's work and the two patches to perform the parsing of auth and encryption data in virStorageSource were pushed separately * Removed patches dealing with qemuDomainStorageSourceCopy and virDomainDiskStorageSourceNew Patches 9->16 reworked Patch1: (previous patch 10) - Rework logic to remove the need to pass around the @xmlopt for virStorageSourcePtr allocation and instead VIR_ALLOC(iscsisrc->src) directly as other consumers do. Patch2: (previous patch 11) - Use the qemuDomainStorageSourcePrivatePtr and friend macro QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE to manage the iscsisrc->src data making sure to ensure that srcPriv (e.g. privateData) exists. Patch3: (previous patch 12) - Only minor merge related changes. Patch4: (previous patch 13) - Merge related plus additional check to ensure srcPriv exists before dereference secinfo Patch5: (previous patch 14) - No change Patch 6: (previous patch 15) - Merge related changes, plus checks for srcPriv before deref secinfo NB: Testing note - I did ensure at this point if the password secret capability check fails that the code will still do the right thing. Patch7: (previous patch 9) - No change... Presented since it wasn't ACK'd before Patch8: (previous patch16) - No change John Ferlan (8): conf,qemu: Replace iscsisrc fields with virStorageSourcePtr qemu: Use private storage source for iscsi instead of private hostdev qemu: Remove private hostdev qemu: Refactor qemuBuildSCSIiSCSIHostdevDrvStr slightly qemu: Get capabilities to use iscsi password-secret argument qemu: Use secret objects to pass iSCSI passwords docs: Add news article regarding auth/encryption placement docs: Add news article to describe iSCSI usage of secret object docs/news.xml | 23 ++++++ src/conf/domain_conf.c | 58 ++++++++-------- src/conf/domain_conf.h | 9 +-- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_block.c | 65 ++++++++++++++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 75 +++++++++++++++----- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 81 +++++++--------------- src/qemu/qemu_domain.h | 14 ---- src/qemu/qemu_hotplug.c | 52 +++++++++++++- src/qemu/qemu_parse_command.c | 4 +- src/vbox/vbox_common.c | 2 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...xml2argv-disk-drive-network-iscsi-auth-AES.args | 41 +++++++++++ ...uxml2argv-disk-drive-network-iscsi-auth-AES.xml | 43 ++++++++++++ ...ml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args | 45 ++++++++++++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml | 48 +++++++++++++ tests/qemuxml2argvtest.c | 10 +++ tests/virhostdevtest.c | 2 +- 28 files changed, 451 insertions(+), 140 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml -- 2.13.6

1 8

[libvirt] [jenkins-ci PATCH] guests: use su instead of sudo in rc.local to start Jenkins agent
by Pavel Hrdina 20 Oct '17

20 Oct '17

On FreeBSD the sudo command cleans the new environment too much and Jenkins is not able to run properly. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- guests/group_vars/all/main.yml | 2 +- guests/host_vars/libvirt-freebsd-10/main.yml | 2 +- guests/host_vars/libvirt-freebsd-11/main.yml | 2 +- guests/tasks/jenkins.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guests/group_vars/all/main.yml b/guests/group_vars/all/main.yml index d24af59..9bf5d05 100644 --- a/guests/group_vars/all/main.yml +++ b/guests/group_vars/all/main.yml @@ -12,4 +12,4 @@ jenkins_url: https://ci.centos.org/computer/{{ inventory_hostname }}/slave-agent bash: /bin/bash java: /usr/bin/java make: /usr/bin/make -sudo: /usr/bin/sudo +su: /bin/su diff --git a/guests/host_vars/libvirt-freebsd-10/main.yml b/guests/host_vars/libvirt-freebsd-10/main.yml index 1547802..2931fe3 100644 --- a/guests/host_vars/libvirt-freebsd-10/main.yml +++ b/guests/host_vars/libvirt-freebsd-10/main.yml @@ -4,7 +4,7 @@ ansible_python_interpreter: /usr/local/bin/python2 bash: /usr/local/bin/bash java: /usr/local/bin/java make: /usr/local/bin/gmake -sudo: /usr/local/bin/sudo +su: /usr/bin/su projects: - base diff --git a/guests/host_vars/libvirt-freebsd-11/main.yml b/guests/host_vars/libvirt-freebsd-11/main.yml index 1547802..2931fe3 100644 --- a/guests/host_vars/libvirt-freebsd-11/main.yml +++ b/guests/host_vars/libvirt-freebsd-11/main.yml @@ -4,7 +4,7 @@ ansible_python_interpreter: /usr/local/bin/python2 bash: /usr/local/bin/bash java: /usr/local/bin/java make: /usr/local/bin/gmake -sudo: /usr/local/bin/sudo +su: /usr/bin/su projects: - base diff --git a/guests/tasks/jenkins.yml b/guests/tasks/jenkins.yml index a1b8f46..87ebafa 100644 --- a/guests/tasks/jenkins.yml +++ b/guests/tasks/jenkins.yml @@ -19,7 +19,7 @@ create: yes backup: yes regexp: '^nohup.*jenkins.*java.*slave\.jar.*&$' - line: "nohup {{ sudo }} -u jenkins {{ bash }} -l -c '{{ java }} -jar /home/jenkins/slave.jar -jnlpUrl \"{{ jenkins_url }}\" -secret \"{{ jenkins_secret }}\"' >/var/log/jenkins.log 2>&1 &" + line: "nohup {{ su }} - jenkins -c '{{ java }} -jar /home/jenkins/slave.jar -jnlpUrl \"{{ jenkins_url }}\" -secret \"{{ jenkins_secret }}\"' >/var/log/jenkins.log 2>&1 &" insertbefore: '^exit .*$' when: - ansible_service_mgr != 'systemd' -- 2.13.6

2 1

[libvirt] [PATCH] conf: Rename [n]macs and maxmacs to [n]names and maxnames
by John Ferlan 20 Oct '17

20 Oct '17

To avoid further confusion - rename the array elements to what they are. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing as trivial as noted by: https://www.redhat.com/archives/libvir-list/2017-October/msg00981.html src/conf/virinterfaceobj.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index 21d76e7507..f90c0bd9c4 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -160,9 +160,9 @@ virInterfaceObjListNew(void) struct _virInterfaceObjFindMACData { const char *matchStr; bool error; - int nmacs; - int maxmacs; - char **const macs; + int nnames; + int maxnames; + char **const names; }; static int @@ -176,17 +176,17 @@ virInterfaceObjListFindByMACStringCb(void *payload, if (data->error) return 0; - if (data->nmacs == data->maxmacs) + if (data->nnames == data->maxnames) return 0; virObjectLock(obj); if (STRCASEEQ(obj->def->mac, data->matchStr)) { - if (VIR_STRDUP(data->macs[data->nmacs], obj->def->name) < 0) { + if (VIR_STRDUP(data->names[data->nnames], obj->def->name) < 0) { data->error = true; goto cleanup; } - data->nmacs++; + data->nnames++; } cleanup: @@ -203,9 +203,9 @@ virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces, { struct _virInterfaceObjFindMACData data = { .matchStr = mac, .error = false, - .nmacs = 0, - .maxmacs = maxmatches, - .macs = matches }; + .nnames = 0, + .maxnames = maxmatches, + .names = matches }; virObjectRWLockRead(interfaces); virHashForEach(interfaces->objsName, virInterfaceObjListFindByMACStringCb, @@ -215,11 +215,11 @@ virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces, if (data.error) goto error; - return data.nmacs; + return data.nnames; error: - while (--data.nmacs >= 0) - VIR_FREE(data.macs[data.nmacs]); + while (--data.nnames >= 0) + VIR_FREE(data.names[data.nnames]); return -1; } -- 2.13.6

1 0

[libvirt] [jenkins-ci PATCH] projects: build on new debian-9 and freebsd-11 guests
by Pavel Hrdina 20 Oct '17

20 Oct '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- projects/libvirt.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index a70a58c..1b31c1b 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -16,16 +16,19 @@ - libvirt-centos-6 - libvirt-centos-7 - libvirt-debian-8 + - libvirt-debian-9 - libvirt-fedora-25 - libvirt-fedora-26 - libvirt-fedora-rawhide - libvirt-freebsd-10 + - libvirt-freebsd-11 - autotools-syntax-check-job: parent_jobs: 'libvirt-master-build' machines: - libvirt-centos-6 - libvirt-centos-7 - libvirt-debian-8 + - libvirt-debian-9 - libvirt-fedora-25 - libvirt-fedora-26 - libvirt-fedora-rawhide -- 2.13.6

2 1

[libvirt] [PATCH] conf: duplicate interface name instead of MAC provided to lookup the interface
by Pavel Hrdina 20 Oct '17

20 Oct '17

Introduced by 6094d6ec7fc9ea3e28c18c880b76858f06a8b129. Found by running libvirt-perl tests. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/virinterfaceobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index a6814a6aee..21d76e7507 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -182,7 +182,7 @@ virInterfaceObjListFindByMACStringCb(void *payload, virObjectLock(obj); if (STRCASEEQ(obj->def->mac, data->matchStr)) { - if (VIR_STRDUP(data->macs[data->nmacs], data->matchStr) < 0) { + if (VIR_STRDUP(data->macs[data->nmacs], obj->def->name) < 0) { data->error = true; goto cleanup; } -- 2.13.6

3 3

[libvirt] libvirt/QEMU/SEV interaction
by Brijesh Singh 20 Oct '17

20 Oct '17

Hi All, (sorry for the long message) CPUs from AMD EPYC family supports Secure Encrypted Virtualization (SEV) feature - the feature allows running encrypted VMs. To enable the feature, I have been submitting patches to Linux kernel [1], Qemu [2] and OVMF [3]. We have been making some good progress in getting patches accepted upstream in Linux and OVMF trees. SEV builds upon SME (Secure Memory Encryption) feature -- SME support just got pulled into 4.14 merge window. The base SEV patches are accepted in OVMF tree -- now we have SEV aware guest BIOS. I am getting ready to take off "RFC" tag from remaining patches to get them reviewed and accepted. The boot flow for launching an SEV guest is a bit different from a typical guest launch. In order to launch SEV guest from virt-manager or other high-level VM management tools, we need to design and implement new interface between libvirt and qemu, and probably add new APIs in libvirt to be used by VM management tools. I am new to the libvirt and need some expert advice while designing this interface. A pictorial representation for a SEV guest launch flow is available in SEV Spec Appendix A [4]. A typical flow looks like this: 1. Guest owner (GO) asks the cloud provider to launch SEV guest. 2. VM tool asks libvirt to provide its Platform Diffie-Hellman (PDH) key. 3. libvirt opens /dev/sev device to get its PDH and return the blob to the caller. 4. VM tool gives its PDH to GO. 5. GO provides its DH key, session-info and guest policy. 6. VM tool somehow communicates the GO provided information to libvirt. 7. libvirt adds "sev-guest" object in its xml file with all the information obtained from #5 (currently my xml file looks like this) <qemu:arg value='-object'> <qemu:arg value='sev-guest,id=sev0,policy=<GO_policy>,dh-key-file=<filename>,session-file=<filename>/> <qemu:arg value='-machine'/> <qemu:arg value='memory-encryption=sev0'/> 8. libvirt launches the guest with "-S" 9. While creating the SEV guest qemu does the following i) create encryption context using GO's DH, session-info and guest policy (LAUNCH_START) ii) encrypts the guest bios (LAUNCH_UPDATE_DATA) iii) calls LAUNCH_MEASUREMENT to get the encrypted bios measurement 10. By some interface we must propagate the measurement all the way to GO before libvirt starts the guest. 11. GO verifies the measurement and if measurement matches then it may give a secret blob -- which must be injected into the guest before libvirt starts the VM. If verification failed, GO will request cloud provider to destroy the VM. 12. After secret blob is injected into guest, we call LAUNCH_FINISH to destory the encryption context. 13. libvirt issues "continue" command to resume the guest boot. Please note that the measurement value is protected with transport encryption key (TIK) and it changes on each run. Similarly the secret blob provided by GO does not need to be protected using libvirt/qemu APIs. The secret is protected by TIK. From qemu and libvirt point of view these are blobs and must be passed as-is to the SEV FW. Questions: a) Do we need to add a new set of APIs in libvirt to return the PDH from libvirt and VM tool ? Or can we use some pre-existing APIs to pass the opaque blobs ? (this is mainly for step 3 and 6) b) do we need to define a new xml tag to for memory-encryption ? or just use the qemu:args tag ? (step 6) c) what existing communicate interface can be used between libvirt and qemu to get the measurement ? can we add a new qemu monitor command 'get_sev_measurement' to get the measurement ? (step 10) d) how to pass the secret blob from libvirt to qemu ? should we consider adding a new object (sev-guest-secret) -- libvirt can add the object through qemu monitor. [1] https://marc.info/?l=kvm&m=150092661105069&w=2 [2] https://marc.info/?l=qemu-devel&m=148901186615642&w=2 [3] https://lists.01.org/pipermail/edk2-devel/2017-July/012220.html [4] http://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf Thanks Brijesh

8 35

[libvirt] [perl PATCH 0/2] Add missing bindings
by Pavel Hrdina 20 Oct '17

20 Oct '17

Pavel Hrdina (2): Add VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE constant Add set_lifecycle_action Changes | 3 ++- Virt.xs | 24 ++++++++++++++++++++ lib/Sys/Virt/Domain.pm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 1 deletion(-) -- 2.13.6

2 3

[libvirt] [PATCH] util: Missing 'removeTimeoutImpl' check variable inside virEventRegisterImpl() function.
by Julio Faracco 20 Oct '17

20 Oct '17

The function virEventRegisterImpl() checks the attempt to replace the registered events. But there is a duplicate variable inside the IF statement. The variable 'removeHandleImpl' was wrongly repeated. One of them needs to be replaced by 'removeTimeoutImpl'. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virevent.c b/src/util/virevent.c index 51d8714..87069e3 100644 --- a/src/util/virevent.c +++ b/src/util/virevent.c @@ -241,7 +241,7 @@ void virEventRegisterImpl(virEventAddHandleFunc addHandle, addTimeout, updateTimeout, removeTimeout); if (addHandleImpl || updateHandleImpl || removeHandleImpl || - addTimeoutImpl || updateTimeoutImpl || removeHandleImpl) { + addTimeoutImpl || updateTimeoutImpl || removeTimeoutImpl) { VIR_WARN("Ignoring attempt to replace registered event loop"); return; } -- 2.7.4

3 2

[libvirt] [PATCH 0/7] Preparation for new QEMU migration states
by Jiri Denemark 20 Oct '17

20 Oct '17

Mostly refactoring of the horrible mess in qemuMigrationRun. Jiri Denemark (7): qemu: Use switch in qemuMigrationCompleted qemu: Refactor qemuMigrationRun a bit qemu: Split cleanup and error code in qemuMigrationRun qemu: Unite error handling in qemuMigrationRun qemu: Don't misuse "ret" in qemuMigrationRun qemu: Consistently use exit_monitor in qemuMigrationRun qemu: Set correct job status when qemuMigrationRun fails src/qemu/qemu_migration.c | 196 +++++++++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 91 deletions(-) -- 2.14.2

3 12

[libvirt] [jenkins-ci PATCH 0/2] guests: Minor fixes and tweaks
by Andrea Bolognani 20 Oct '17

20 Oct '17

1/2 is a bug fix, 2/2 a small improvement. Andrea Bolognani (2): guests: Reorder configuration steps for root authentication guests: Don't warn when bootstrapping package manager guests/tasks/base.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.13.6

2 3

[libvirt] [go PATCH 0/2] Add missing bindings
by Pavel Hrdina 20 Oct '17

20 Oct '17

Pavel Hrdina (2): Add VIR_DOMAIN_JOB_MEMORY_PAGE_SIZE constant Add virDomainSetLifecycleAction API support domain.go | 39 +++++++++++++++++++++++++++++++++++++++ domain_compat.go | 12 ++++++++++++ domain_compat.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) -- 2.13.6

2 3

[libvirt] [PATCH v1 00/14] Never ending story of user supplied aliases
by Michal Privoznik 20 Oct '17

20 Oct '17

As discussed earlier [1], we should allow users to set device aliases at the define time. While the discussed approach calls for generating missing aliases too, I'm saving that for another patch set. There are couple of reasons for that: a) I don't think it's really necessary (if users are interested in a device they can just set the alias). b) This patch set is already big enough as is. c) Generating aliases is going to have its own problems. Therefore, for now I'm only proposing parsing user supplied aliases. The idea is that it's not enabled by default for all drivers. Any driver that want to/can provide this feature has to set VIR_DOMAIN_DEF_FEATURE_USER_ALIAS. Note that we have some drivers that don't have notion of device aliases. But the code is generic enough so that it should be easy to use in the drivers that do know what aliases are. 1: https://www.redhat.com/archives/libvir-list/2017-October/msg00201.html Michal Privoznik (14): conf: Fix virDomainDeviceGetInfo const correctness virDomainObjGetOneDefState: Fix error message qemuAssignDeviceAliases: Use qemuAssignDeviceRNGAlias for assigning RNG aliases qemu: Move device alias assignment to separate functions qemu: Be tolerant to preexisting aliases conf: Pass xmlopt down to virDomainDeviceInfoParseXML conf: Parse user supplied aliases conf: Validate user supplied aliases virDomainDeviceInfoCheckABIStability: Check for alias too qemuxml2argvdata: Drop device aliases qemuhotplugtest: Load active XML conf: Format alias even for inactive XMLs docs: Document user aliases qemu: Parse alias from inactive XMLs docs/formatdomain.html.in | 23 ++ src/conf/domain_conf.c | 353 ++++++++++++++++----- src/conf/domain_conf.h | 8 +- src/libvirt_private.syms | 1 + src/qemu/qemu_alias.c | 139 +++++++- src/qemu/qemu_domain.c | 3 +- src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hotplug.c | 6 +- tests/qemuhotplugtest.c | 3 +- .../qemuxml2argv-disk-cdrom-network-ftp.xml | 1 - .../qemuxml2argv-disk-cdrom-network-ftps.xml | 1 - .../qemuxml2argv-disk-cdrom-network-http.xml | 1 - .../qemuxml2argv-disk-cdrom-network-https.xml | 1 - .../qemuxml2argv-disk-cdrom-network-tftp.xml | 1 - .../qemuxml2argv-usb-redir-filter.xml | 1 - 15 files changed, 444 insertions(+), 101 deletions(-) -- 2.13.6

4 26

[libvirt] [PATCH 0/5] qemu: Improve the way we handle migration capabilities
by Jiri Denemark 20 Oct '17

20 Oct '17

Jiri Denemark (5): qemu: Create a wrapper around qemuMonitorSetCapabilities qemu: Store supported migration capabilities in a bitmap qemu: Use bitmap with migration capabilities qemu: Drop qemuMonitorGetMigrationCapability qemu: Enhance debug message in qemuMonitorSetMigrationCapability src/qemu/qemu_domain.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 9 ++++++ src/qemu/qemu_driver.c | 32 ++++++++----------- src/qemu/qemu_migration.c | 45 +++++++++++++++----------- src/qemu/qemu_migration.h | 4 +++ src/qemu/qemu_monitor.c | 22 ++----------- src/qemu/qemu_monitor.h | 2 -- src/qemu/qemu_monitor_json.c | 18 ----------- src/qemu/qemu_monitor_json.h | 2 -- src/qemu/qemu_process.c | 43 ++++++++++++++----------- tests/qemumonitorjsontest.c | 16 ++++++---- 11 files changed, 163 insertions(+), 105 deletions(-) -- 2.14.2

2 13

[libvirt] [PATCH 0/6] vbox: Improve handling of storage devices.
by Dawid Zamirski 19 Oct '17

19 Oct '17

Hello, This patch series reworks the VirtualBox storage device handling code, brief summary: * Extend libvirt schema to specify IDE controller model as VBox supports changing IDE model to PIIX3, PIIX4 or ICH6 and there are known cases of legacy guest OSes being very sensitive to that. * Make the driver recognize <controller> element at define time which allows to specify controller model. Previously the driver was completely ignoring that element. * Allow to create vbox SAS controllers via <controller type="scsi" model="lsisas1068" /> * Handle removable devices - define and dump devices without media. * Make sure media is closed when undefining VMs. Leaving media unclosed may cause errors when defining VMs pointing at the same local path. Dawid Zamirski (6): vbox: Close media when undefining domains. domain: Allow 'model' attribute for ide controller. docs: Add info about ide model attribute. vbox: Add more IStorageController API mappings. vbox: Process controller definitions from xml. vbox: Update XML dump of storage devices. docs/formatdomain.html.in | 3 + docs/schemas/domaincommon.rng | 18 +- src/conf/domain_conf.c | 9 + src/conf/domain_conf.h | 9 + src/libvirt_private.syms | 2 + src/vbox/vbox_common.c | 1212 +++++++++++++++++++++++------------------ src/vbox/vbox_common.h | 21 + src/vbox/vbox_tmpl.c | 87 +-- src/vbox/vbox_uniformed_api.h | 3 + 9 files changed, 790 insertions(+), 574 deletions(-) -- 2.14.2

3 18

[libvirt] [PATCH v5 00/16] Use secret objects to pass iSCSI passwords
by John Ferlan 19 Oct '17

19 Oct '17

v4: https://www.redhat.com/archives/libvir-list/2017-September/msg00944.html Changes since v4 are minor - mostly to change from 3.8.0 to 3.9.0... Update the news.xml once <auth> is allowed for <source>. Add a news.xml to describe the bug fix. Beyond that - merge changes up to git commit '5d7659027'. I ran the changes through my Coverity checker too. Repeated from the cover of v4: v3: https://www.redhat.com/archives/libvir-list/2017-September/msg00881.html Difference with v3: Add patch 3 to perform virStorageSourceCopy for qemu and storage source private data. Adjust the move encinfo from private disk to private disk src to handle the Copy for the @encinfo too Repeated from cover of v3 (although perhaps just too much information for the eyes to consume): v2: https://www.redhat.com/archives/libvir-list/2017-September/msg00466.html Changes since v2: * Former Patch 1 & 2 were pushed * New Patch 1 is former Patches 3 and parts of 4 combined appropriately -> Allow <auth> under <disk> or <source> - keep track of where it was found so that format prints in the right place -> Cleaned up the tests and new xml/args files * Patch 2 is part of the former patch 6 - just the new _virStorageSource * Patch 3 is new - to introduced an allocator for domain_conf to create a _virStorageSource * Patch 4 is new - as stated found that the @diskPriv->encinfo wasn't cleaned up properly * Patch 5 is the rest of the former patch 6 * Patch 6 is the former patch 7 with some minor adjustments to allow <encryption> to follow <auth> and be both child of <disk> and <source> * Patch 7 is the former patch 10 with minor change to perform free of encinfo properly (e.g. from patch 4) * Patch 8 is former patch 5 and 9 combined * Patch 9 is new - to use the virStorageSource for iscsisrc instead of just three fields we wanted * Patch 10 is new to alter the existing hostdevPriv to use diskSrcPriv * Patch 11 is new to remove the hostdevPriv as it's no longer necesary * Patch 12 is new to split up a change in qemuBuildSCSIiSCSIHostdevDrvStr from the last patch * Patch 13 is the former patch 13 * Patch 14 is altered to accomodate the hostdev usage if virStorageSource for iscsisrc->src instead of that hack that was there before. John Ferlan (16): conf: Add/Allow parsing the auth in the disk source qemu: Introduce privateData for _virStorageSource qemu: Introduce qemuDomainStorageSourceCopy conf: Introduce virDomainDiskStorageSourceNew qemu: Add missing encinfo cleanup qemu: Relocate qemuDomainSecretInfoPtr from disk private conf: Add/Allow parsing the encryption in the disk source qemu: Move encinfo from private disk to private disk src docs: Add news article regarding auth/encryption placement conf,qemu: Replace iscsisrc fields with virStorageSourcePtr qemu: Use private disksrc for iscsi instead of private hostdev qemu: Remove private hostdev qemu: Refactor qemuBuildSCSIiSCSIHostdevDrvStr slightly qemu: Get capabilities to use iscsi password-secret argument qemu: Use secret objects to pass iSCSI passwords docs: Add news article to describe iSCSI usage of secret object docs/formatdomain.html.in | 82 ++++--- docs/news.xml | 23 ++ docs/schemas/domaincommon.rng | 48 +++- src/conf/domain_conf.c | 255 ++++++++++++++++----- src/conf/domain_conf.h | 10 +- src/lxc/lxc_native.c | 2 +- src/qemu/qemu_block.c | 64 +++++- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 84 +++++-- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.c | 162 +++++++++---- src/qemu/qemu_domain.h | 37 ++- src/qemu/qemu_driver.c | 8 +- src/qemu/qemu_hotplug.c | 71 +++++- src/qemu/qemu_parse_command.c | 4 +- src/util/virstoragefile.c | 2 + src/util/virstoragefile.h | 5 + src/vbox/vbox_common.c | 2 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- src/xenconfig/xen_xl.c | 2 +- .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 6 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + ...xml2argv-disk-drive-network-iscsi-auth-AES.args | 41 ++++ ...uxml2argv-disk-drive-network-iscsi-auth-AES.xml | 43 ++++ ...ml2argv-disk-drive-network-source-auth-both.xml | 51 +++++ ...emuxml2argv-disk-drive-network-source-auth.args | 32 +++ ...qemuxml2argv-disk-drive-network-source-auth.xml | 45 ++++ ...ml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args | 45 ++++ ...xml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml | 48 ++++ .../qemuxml2argv-luks-disks-source-both.xml | 40 ++++ .../qemuxml2argv-luks-disks-source.args | 62 +++++ .../qemuxml2argv-luks-disks-source.xml | 81 +++++++ tests/qemuxml2argvtest.c | 14 ++ ...muxml2xmlout-disk-drive-network-source-auth.xml | 49 ++++ .../qemuxml2xmlout-luks-disks-source.xml | 84 +++++++ .../qemuxml2xmlout-luks-disks.xml | 46 +++- tests/qemuxml2xmltest.c | 2 + tests/virhostdevtest.c | 2 +- tests/virstoragetest.c | 6 + 46 files changed, 1356 insertions(+), 219 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-source-auth.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth-AES.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-source-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml mode change 120000 => 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml -- 2.13.6

2 19

[libvirt] [jenkins-ci PATCH] guests: update libvirt-freebsd-10 jenkins secret
by Pavel Hrdina 19 Oct '17

19 Oct '17

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule and no chance to review it. guests/host_vars/libvirt-freebsd-10/vault.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/guests/host_vars/libvirt-freebsd-10/vault.yml b/guests/host_vars/libvirt-freebsd-10/vault.yml index ac437ba..37def4c 100644 --- a/guests/host_vars/libvirt-freebsd-10/vault.yml +++ b/guests/host_vars/libvirt-freebsd-10/vault.yml @@ -1,10 +1,10 @@ $ANSIBLE_VAULT;1.1;AES256 -62633664623566363031366662633336313239303035616162353739663063666663366536326162 -6466333764383932646530323730386561656530353430330a636433373638613064643165643536 -32376334653030336334643865396162363061383066326362633165346164303831616464636337 -3861613765393666340a313931663337633762313538316230613536303939343862306532666564 -61313939666564626632363835363238653830633666383337323263326363323766633933633862 -32363166643231613864626263303035303631616665336531633761656335646166656232303936 -66643261356665356363343931653436663666313533656239376535643264653932633335333135 -62323366363834636263386230356238333133623735373730356539323761306237623266363032 -3436 +38393830396537393731353365316464333361306138616330366331336138646664376465346364 +3866656165393039613636306533303539383036623736310a333838363230363166326333343835 +31383362386133626662303038373731633264653462316234373834323130626633383664613965 +6332643165363932300a393662343061646539336532356434326230313135623162623730313539 +37393036633937393864663735326138313538356366616435616237303663336662313262393832 +63653666313436356663336364386365393132663332613162366666663731656534336261633836 +35643732306662373064623234633366343764613336633232663365316436346535626233633661 +63336437643161356364643764336365373430363238326261626565666232383432373438373037 +6437 -- 2.13.6

1 0

[libvirt] [jenkins-ci PATCH] projects: rename libvirt-freebsd into libvirt-freebsd-10
by Pavel Hrdina 19 Oct '17

19 Oct '17

We will have freebsd-11 as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. projects/libvirt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index e5946e2..a70a58c 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -19,7 +19,7 @@ - libvirt-fedora-25 - libvirt-fedora-26 - libvirt-fedora-rawhide - - libvirt-freebsd + - libvirt-freebsd-10 - autotools-syntax-check-job: parent_jobs: 'libvirt-master-build' machines: -- 2.13.6

1 0

[libvirt] [PATCH v3] interfaces: Convert virInterfaceObjList to virObjectRWLockable
by John Ferlan 19 Oct '17

19 Oct '17

Rather than a forward linked list, let's use the ObjectRWLockable object in order to manage the data. Requires numerous changes from List to Object management similar to many other drivers/vir*obj.c modules Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- This is the real one - I need more coffee. src/conf/virinterfaceobj.c | 365 +++++++++++++++++++++++++++++++-------------- src/libvirt_private.syms | 1 - src/test/test_driver.c | 6 +- 3 files changed, 253 insertions(+), 119 deletions(-) diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index e993b929d7..cf3626def4 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -25,6 +25,7 @@ #include "viralloc.h" #include "virerror.h" #include "virinterfaceobj.h" +#include "virhash.h" #include "virlog.h" #include "virstring.h" @@ -40,14 +41,19 @@ struct _virInterfaceObj { }; struct _virInterfaceObjList { - size_t count; - virInterfaceObjPtr *objs; + virObjectRWLockable parent; + + /* name string -> virInterfaceObj mapping + * for O(1), lockless lookup-by-name */ + virHashTable *objsName; }; /* virInterfaceObj manipulation */ static virClassPtr virInterfaceObjClass; +static virClassPtr virInterfaceObjListClass; static void virInterfaceObjDispose(void *obj); +static void virInterfaceObjListDispose(void *obj); static int virInterfaceObjOnceInit(void) @@ -58,6 +64,12 @@ virInterfaceObjOnceInit(void) virInterfaceObjDispose))) return -1; + if (!(virInterfaceObjListClass = virClassNew(virClassForObjectRWLockable(), + "virInterfaceObjList", + sizeof(virInterfaceObjList), + virInterfaceObjListDispose))) + return -1; + return 0; } @@ -130,119 +142,188 @@ virInterfaceObjListNew(void) { virInterfaceObjListPtr interfaces; - if (VIR_ALLOC(interfaces) < 0) + if (virInterfaceObjInitialize() < 0) + return NULL; + + if (!(interfaces = virObjectRWLockableNew(virInterfaceObjListClass))) + return NULL; + + if (!(interfaces->objsName = virHashCreate(10, virObjectFreeHashData))) { + virObjectUnref(interfaces); return NULL; + } + return interfaces; } +struct _virInterfaceObjFindMACData { + const char *matchStr; + bool error; + int nmacs; + int maxmacs; + char **const macs; +}; + +static int +virInterfaceObjListFindByMACStringCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjFindMACData *data = opaque; + + if (data->error) + return 0; + + if (data->nmacs == data->maxmacs) + return 0; + + virObjectLock(obj); + + if (STRCASEEQ(obj->def->mac, data->matchStr)) { + if (VIR_STRDUP(data->macs[data->nmacs], data->matchStr) < 0) { + data->error = true; + goto cleanup; + } + data->nmacs++; + } + + cleanup: + virObjectUnlock(obj); + return 0; +} + + int virInterfaceObjListFindByMACString(virInterfaceObjListPtr interfaces, const char *mac, char **const matches, int maxmatches) { - size_t i; - int matchct = 0; + struct _virInterfaceObjFindMACData data = { .matchStr = mac, + .error = false, + .nmacs = 0, + .maxmacs = maxmatches, + .macs = matches }; - for (i = 0; i < interfaces->count; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListFindByMACStringCb, + &data); + virObjectRWUnlock(interfaces); - virObjectLock(obj); - def = obj->def; - if (STRCASEEQ(def->mac, mac)) { - if (matchct < maxmatches) { - if (VIR_STRDUP(matches[matchct], def->name) < 0) { - virObjectUnlock(obj); - goto error; - } - matchct++; - } - } - virObjectUnlock(obj); - } - return matchct; + if (data.error) + goto error; + + return data.nmacs; error: - while (--matchct >= 0) - VIR_FREE(matches[matchct]); + while (--data.nmacs >= 0) + VIR_FREE(data.macs[data.nmacs]); return -1; } +static virInterfaceObjPtr +virInterfaceObjListFindByNameLocked(virInterfaceObjListPtr interfaces, + const char *name) +{ + return virObjectRef(virHashLookup(interfaces->objsName, name)); +} + + virInterfaceObjPtr virInterfaceObjListFindByName(virInterfaceObjListPtr interfaces, const char *name) { - size_t i; - - for (i = 0; i < interfaces->count; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; - + virInterfaceObjPtr obj; + virObjectRWLockRead(interfaces); + obj = virInterfaceObjListFindByNameLocked(interfaces, name); + virObjectRWUnlock(interfaces); + if (obj) virObjectLock(obj); - def = obj->def; - if (STREQ(def->name, name)) - return virObjectRef(obj); - virObjectUnlock(obj); - } - return NULL; + return obj; } void -virInterfaceObjListFree(virInterfaceObjListPtr interfaces) +virInterfaceObjListDispose(void *obj) { - size_t i; + virInterfaceObjListPtr interfaces = obj; + + virHashFree(interfaces->objsName); +} + + +struct _virInterfaceObjListCloneData { + bool error; + virInterfaceObjListPtr dest; +}; + +static int +virInterfaceObjListCloneCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr srcObj = payload; + struct _virInterfaceObjListCloneData *data = opaque; + char *xml = NULL; + virInterfaceDefPtr backup = NULL; + virInterfaceObjPtr obj; + + if (data->error) + return 0; + + virObjectLock(srcObj); + + if (!(xml = virInterfaceDefFormat(srcObj->def))) + goto error; + + if (!(backup = virInterfaceDefParseString(xml))) + goto error; + VIR_FREE(xml); - for (i = 0; i < interfaces->count; i++) - virObjectUnref(interfaces->objs[i]); - VIR_FREE(interfaces->objs); - VIR_FREE(interfaces); + if (!(obj = virInterfaceObjListAssignDef(data->dest, backup))) + goto error; + virInterfaceObjEndAPI(&obj); + + virObjectUnlock(srcObj); + return 0; + + error: + data->error = true; + VIR_FREE(xml); + virInterfaceDefFree(backup); + virObjectUnlock(srcObj); + return 0; } virInterfaceObjListPtr virInterfaceObjListClone(virInterfaceObjListPtr interfaces) { - size_t i; - unsigned int cnt; - virInterfaceObjListPtr dest; + struct _virInterfaceObjListCloneData data = { .error = false, + .dest = NULL }; if (!interfaces) return NULL; - if (!(dest = virInterfaceObjListNew())) + if (!(data.dest = virInterfaceObjListNew())) return NULL; - cnt = interfaces->count; - for (i = 0; i < cnt; i++) { - virInterfaceObjPtr srcobj = interfaces->objs[i]; - virInterfaceDefPtr backup; - virInterfaceObjPtr obj; - char *xml = virInterfaceDefFormat(srcobj->def); - - if (!xml) - goto error; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListCloneCb, &data); + virObjectRWUnlock(interfaces); - if (!(backup = virInterfaceDefParseString(xml))) { - VIR_FREE(xml); - goto error; - } - - VIR_FREE(xml); - if (!(obj = virInterfaceObjListAssignDef(dest, backup))) - goto error; - virInterfaceObjEndAPI(&obj); - } + if (data.error) + goto error; - return dest; + return data.dest; error: - virInterfaceObjListFree(dest); + virObjectUnref(data.dest); return NULL; } @@ -253,9 +334,11 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces, { virInterfaceObjPtr obj; - if ((obj = virInterfaceObjListFindByName(interfaces, def->name))) { + virObjectRWLockWrite(interfaces); + if ((obj = virInterfaceObjListFindByNameLocked(interfaces, def->name))) { virInterfaceDefFree(obj->def); obj->def = def; + virObjectRWUnlock(interfaces); return obj; } @@ -263,13 +346,19 @@ virInterfaceObjListAssignDef(virInterfaceObjListPtr interfaces, if (!(obj = virInterfaceObjNew())) return NULL; - if (VIR_APPEND_ELEMENT_COPY(interfaces->objs, - interfaces->count, obj) < 0) { - virInterfaceObjEndAPI(&obj); - return NULL; - } + if (virHashAddEntry(interfaces->objsName, def->name, obj) < 0) + goto error; + virObjectRef(obj); + obj->def = def; - return virObjectRef(obj); + virObjectRWUnlock(interfaces); + + return obj; + + error: + virInterfaceObjEndAPI(&obj); + virObjectRWUnlock(interfaces); + return NULL; } @@ -277,20 +366,37 @@ void virInterfaceObjListRemove(virInterfaceObjListPtr interfaces, virInterfaceObjPtr obj) { - size_t i; + virObjectRef(obj); + virObjectUnlock(obj); + virObjectRWLockWrite(interfaces); + virObjectLock(obj); + virHashRemoveEntry(interfaces->objsName, obj->def->name); + virObjectUnlock(obj); + virObjectUnref(obj); + virObjectRWUnlock(interfaces); +} + + +struct _virInterfaceObjNumOfInterfacesData { + bool wantActive; + int count; +}; + +static int +virInterfaceObjListNumOfInterfacesCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjNumOfInterfacesData *data = opaque; + + virObjectLock(obj); + + if (data->wantActive == virInterfaceObjIsActive(obj)) + data->count++; virObjectUnlock(obj); - for (i = 0; i < interfaces->count; i++) { - virObjectLock(interfaces->objs[i]); - if (interfaces->objs[i] == obj) { - virObjectUnlock(interfaces->objs[i]); - virObjectUnref(interfaces->objs[i]); - - VIR_DELETE_ELEMENT(interfaces->objs, i, interfaces->count); - break; - } - virObjectUnlock(interfaces->objs[i]); - } + return 0; } @@ -298,18 +404,55 @@ int virInterfaceObjListNumOfInterfaces(virInterfaceObjListPtr interfaces, bool wantActive) { - size_t i; - int ninterfaces = 0; + struct _virInterfaceObjNumOfInterfacesData data = { + .wantActive = wantActive, .count = 0 }; - for (i = 0; (i < interfaces->count); i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virObjectLock(obj); - if (wantActive == virInterfaceObjIsActive(obj)) - ninterfaces++; - virObjectUnlock(obj); + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListNumOfInterfacesCb, + &data); + virObjectRWUnlock(interfaces); + + return data.count; +} + + +struct _virInterfaceObjGetNamesData { + bool wantActive; + bool error; + int nnames; + int maxnames; + char **const names; +}; + +static int +virInterfaceObjListGetNamesCb(void *payload, + const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + virInterfaceObjPtr obj = payload; + struct _virInterfaceObjGetNamesData *data = opaque; + + if (data->error) + return 0; + + if (data->maxnames >= 0 && data->nnames == data->maxnames) + return 0; + + virObjectLock(obj); + + if (data->wantActive != virInterfaceObjIsActive(obj)) + goto cleanup; + + if (VIR_STRDUP(data->names[data->nnames], obj->def->name) < 0) { + data->error = true; + goto cleanup; } - return ninterfaces; + data->nnames++; + + cleanup: + virObjectUnlock(obj); + return 0; } @@ -319,30 +462,22 @@ virInterfaceObjListGetNames(virInterfaceObjListPtr interfaces, char **const names, int maxnames) { - int nnames = 0; - size_t i; + struct _virInterfaceObjGetNamesData data = { + .wantActive = wantActive, .error = false, .nnames = 0, + .maxnames = maxnames, .names = names }; - for (i = 0; i < interfaces->count && nnames < maxnames; i++) { - virInterfaceObjPtr obj = interfaces->objs[i]; - virInterfaceDefPtr def; + virObjectRWLockRead(interfaces); + virHashForEach(interfaces->objsName, virInterfaceObjListGetNamesCb, &data); + virObjectRWUnlock(interfaces); - virObjectLock(obj); - def = obj->def; - if (wantActive == virInterfaceObjIsActive(obj)) { - if (VIR_STRDUP(names[nnames], def->name) < 0) { - virObjectUnlock(obj); - goto failure; - } - nnames++; - } - virObjectUnlock(obj); - } + if (data.error) + goto error; - return nnames; + return data.nnames; - failure: - while (--nnames >= 0) - VIR_FREE(names[nnames]); + error: + while (--data.nnames >= 0) + VIR_FREE(data.names[data.nnames]); return -1; } diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 26c5ddb405..9133199895 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -932,7 +932,6 @@ virInterfaceObjListAssignDef; virInterfaceObjListClone; virInterfaceObjListFindByMACString; virInterfaceObjListFindByName; -virInterfaceObjListFree; virInterfaceObjListGetNames; virInterfaceObjListNew; virInterfaceObjListNumOfInterfaces; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1c48347994..14bba7494c 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -154,7 +154,7 @@ testDriverFree(testDriverPtr driver) virObjectUnref(driver->domains); virNodeDeviceObjListFree(driver->devs); virObjectUnref(driver->networks); - virInterfaceObjListFree(driver->ifaces); + virObjectUnref(driver->ifaces); virStoragePoolObjListFree(&driver->pools); virObjectUnref(driver->eventState); virMutexUnlock(&driver->lock); @@ -3880,7 +3880,7 @@ testInterfaceChangeCommit(virConnectPtr conn, goto cleanup; } - virInterfaceObjListFree(privconn->backupIfaces); + virObjectUnref(privconn->backupIfaces); privconn->transaction_running = false; ret = 0; @@ -3910,7 +3910,7 @@ testInterfaceChangeRollback(virConnectPtr conn, goto cleanup; } - virInterfaceObjListFree(privconn->ifaces); + virObjectUnref(privconn->ifaces); privconn->ifaces = privconn->backupIfaces; privconn->backupIfaces = NULL; -- 2.13.6

2 4

[libvirt] [PATCH 0/5] qemu: Refactor placement of per-storage-source data (blockdev-add saga)
by Peter Krempa 19 Oct '17

19 Oct '17

These patches are part of John's original series located here: https://www.redhat.com/archives/libvir-list/2017-October/msg00228.html The patches are reordered and fixed to make more sense. Patch 1/5 is originally 5/16, without any modification. Patches 2/5 and 3/5 are split from patch 2/16 from original series. Patches 3/16 and 4/16 were dropped. Allocating the private data via xmlopt does not make sense since the storage-driver originating virStorageSources would not have them allocated anyways. We will allocate them when necessary in the qemu driver. The copy function was dropped, since the private data should not really be copied. It can be added later if necessary. The rest of the series will be posted later. I'm interrested in parsing of auth/encryption for backing chain members (1/16, 7/16) and the JSON generator from 15/16. I'll extract those parts in my upcoming blockdev-add saga postings and post the rest later. John Ferlan (5): qemu: Add missing encinfo cleanup util: storage: Introduce privateData for _virStorageSource qemu: Introduce privateData object for virStorageSource qemu: Relocate qemuDomainSecretInfoPtr to qemuDomainStorageSourcePrivate qemu: Move encinfo from private disk to private disk src src/qemu/qemu_command.c | 12 +++++----- src/qemu/qemu_domain.c | 60 ++++++++++++++++++++++++++++++++++++++--------- src/qemu/qemu_domain.h | 26 +++++++++++++------- src/qemu/qemu_hotplug.c | 11 +++++---- src/util/virstoragefile.c | 1 + src/util/virstoragefile.h | 3 +++ 6 files changed, 82 insertions(+), 31 deletions(-) -- 2.14.1

2 6

[libvirt] [PATCH v3] [libvirt-jenkins-ci] Build on supported Fedora releases (25-26)
by Andrea Bolognani 19 Oct '17

19 Oct '17

Fedora 23 has been out of support for quite a while now, with Fedora 24 recently joining it with the release of Fedora 26 which, on the other hand, is fully supported and a prime candidate for building libvirt. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Yash first attempted this last December[1], without much luck. Fedora 26 has been released in the meantime, which means we can get rid of two builders instead of one! Someone will have to prepare the 'libvirt-fedora-26' builder, though, because it doesn't exist at the moment :) [1] https://www.redhat.com/archives/libvir-list/2016-December/msg00676.html projects/libosinfo.yaml | 3 +-- projects/libvirt-cim.yaml | 3 +-- projects/libvirt-glib.yaml | 3 +-- projects/libvirt-go-xml.yaml | 3 +-- projects/libvirt-go.yaml | 3 +-- projects/libvirt-perl.yaml | 3 +-- projects/libvirt-python.yaml | 3 +-- projects/libvirt-sandbox.yaml | 3 +-- projects/libvirt-tck.yaml | 3 +-- projects/libvirt.yaml | 9 +++------ projects/osinfo-db-tools.yaml | 3 +-- projects/osinfo-db.yaml | 3 +-- projects/virt-manager.yaml | 3 +-- projects/virt-viewer.yaml | 3 +-- 14 files changed, 16 insertions(+), 32 deletions(-) diff --git a/projects/libosinfo.yaml b/projects/libosinfo.yaml index f9a8ceb..77c0414 100644 --- a/projects/libosinfo.yaml +++ b/projects/libosinfo.yaml @@ -3,9 +3,8 @@ name: libosinfo machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: libosinfo make_env: | diff --git a/projects/libvirt-cim.yaml b/projects/libvirt-cim.yaml index 82a8127..b3476e7 100644 --- a/projects/libvirt-cim.yaml +++ b/projects/libvirt-cim.yaml @@ -4,9 +4,8 @@ machines: - libvirt-centos-6 - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: libvirt CIM jobs: diff --git a/projects/libvirt-glib.yaml b/projects/libvirt-glib.yaml index 7d897ab..eba4646 100644 --- a/projects/libvirt-glib.yaml +++ b/projects/libvirt-glib.yaml @@ -3,9 +3,8 @@ name: libvirt-glib machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt GLib jobs: diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml index 9f45694..ebe06fb 100644 --- a/projects/libvirt-go-xml.yaml +++ b/projects/libvirt-go-xml.yaml @@ -3,9 +3,8 @@ name: libvirt-go-xml machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt Go XML jobs: diff --git a/projects/libvirt-go.yaml b/projects/libvirt-go.yaml index b0ebc73..9ffdd0a 100644 --- a/projects/libvirt-go.yaml +++ b/projects/libvirt-go.yaml @@ -3,9 +3,8 @@ name: libvirt-go machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt Go jobs: diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index a9f4740..7646e27 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -3,9 +3,8 @@ name: libvirt-perl machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt Perl jobs: diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index c1192d0..cae8ca7 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -4,9 +4,8 @@ machines: - libvirt-centos-6 - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt Python jobs: diff --git a/projects/libvirt-sandbox.yaml b/projects/libvirt-sandbox.yaml index ebbc5be..2920084 100644 --- a/projects/libvirt-sandbox.yaml +++ b/projects/libvirt-sandbox.yaml @@ -2,9 +2,8 @@ - project: name: libvirt-sandbox machines: - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt Sandbox jobs: diff --git a/projects/libvirt-tck.yaml b/projects/libvirt-tck.yaml index a7c0233..ca72f6c 100644 --- a/projects/libvirt-tck.yaml +++ b/projects/libvirt-tck.yaml @@ -2,9 +2,8 @@ - project: name: libvirt-tck machines: - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt TCK jobs: diff --git a/projects/libvirt.yaml b/projects/libvirt.yaml index 5125c16..0efe770 100644 --- a/projects/libvirt.yaml +++ b/projects/libvirt.yaml @@ -4,9 +4,8 @@ machines: - libvirt-centos-6 - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Libvirt archive_format: xz @@ -17,9 +16,8 @@ - libvirt-centos-6 - libvirt-centos-7 - libvirt-debian-8 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide - libvirt-freebsd - autotools-syntax-check-job: @@ -28,9 +26,8 @@ - libvirt-centos-6 - libvirt-centos-7 - libvirt-debian-8 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide check_env: | export VIR_TEST_EXPENSIVE=1 diff --git a/projects/osinfo-db-tools.yaml b/projects/osinfo-db-tools.yaml index 5f275ab..93931af 100644 --- a/projects/osinfo-db-tools.yaml +++ b/projects/osinfo-db-tools.yaml @@ -3,9 +3,8 @@ name: osinfo-db-tools machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: osinfo database tools jobs: diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 9539724..83eb92f 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -3,9 +3,8 @@ name: osinfo-db machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: osinfo database jobs: diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 4485d5f..a50e0ab 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -3,9 +3,8 @@ name: virt-manager machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Virtual Machine Manager jobs: diff --git a/projects/virt-viewer.yaml b/projects/virt-viewer.yaml index 06c372b..e3ef04a 100644 --- a/projects/virt-viewer.yaml +++ b/projects/virt-viewer.yaml @@ -3,9 +3,8 @@ name: virt-viewer machines: - libvirt-centos-7 - - libvirt-fedora-23 - - libvirt-fedora-24 - libvirt-fedora-25 + - libvirt-fedora-26 - libvirt-fedora-rawhide title: Virt Viewer jobs: -- 2.13.5

3 4

[libvirt] [libvirt-jenkins-ci PATCH 0/4] guests: Fixes and improvements
by Andrea Bolognani 19 Oct '17

19 Oct '17

First of probably several batches :) Andrea Bolognani (4): guests: preseed: Fix root partition size guests: lcitool: Don't disable USB controller guests: libvirt: Install dwarves guests: jenkins: Always download freshest agent guests/lcitool | 1 - guests/preseed.cfg | 2 +- guests/tasks/jenkins.yml | 1 + guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt.yml | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) -- 2.13.6

2 5

[libvirt] [PATCH] qemu-ns: Detect /dev/* mount point duplicates better
by Michal Privoznik 19 Oct '17

19 Oct '17

https://bugzilla.redhat.com/show_bug.cgi?id=1495511 When creating new /dev for domain ran in namespace we try to preserve all sub-mounts of /dev. Well, not quite all. For instance if /dev/foo/bar and /dev/foo are both mount points, only /dev/foo needs preserving. /dev/foo/bar is preserved with it too. Now, to identify such cases like this one STRPREFIX() is used. That is not good enough. While it works for [/dev/foo/bar; /dev/foo] case, it fails for [/dev/prefix; /dev/prefix2] where the strings share the same prefix but are in fact two different paths. The solution is to use STRSKIP(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 05e8b96aa..8aa66c69c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8182,7 +8182,9 @@ qemuDomainGetPreservedMounts(virQEMUDriverConfigPtr cfg, for (i = 1; i < nmounts; i++) { j = i + 1; while (j < nmounts) { - if (STRPREFIX(mounts[j], mounts[i])) { + char *c = STRSKIP(mounts[j], mounts[i]); + + if (c && *c == '/') { VIR_DEBUG("Dropping path %s because of %s", mounts[j], mounts[i]); VIR_DELETE_ELEMENT(mounts, j, nmounts); } else { -- 2.13.6

2 1

[libvirt] [libvirt-jenkins-ci PATCH v2 0/6] Unattended guest installation and more
by Andrea Bolognani 19 Oct '17

19 Oct '17

Changes from [v1]: * guest changes - set root password to a user-provided value - only allow key-based SSH login for root - configure serial console for emergency access - disable audio, video and USB - allocate 256 MiB for swap instead of 2 GiB - allocate 15 GiB for storage instead of 10 GiB - use host-passthrough CPU mode - set timezone to UTC * tool changes - rename to lcitool - implement basic configuration support - refuse to run from outside the source directory - provide better error messages * others - improve documentation, mainly the host setup part [v1] https://www.redhat.com/archives/libvir-list/2017-October/msg00651.html Andrea Bolognani (6): guests: Rename from 'ansible' guests: Introduce lcitool guests: Remove bootstrap phase guests: Add unattended installation support guests: Configure bootloaders guests: Update documentation ansible/Makefile | 12 -- ansible/README.markdown | 60 ------- ansible/bootstrap.yml | 15 -- {ansible => guests}/.gitignore | 0 guests/README.markdown | 97 +++++++++++ {ansible => guests}/ansible.cfg | 1 - guests/group_vars/all/install.yml | 11 ++ {ansible => guests}/group_vars/all/main.yml | 5 + guests/host_vars/libvirt-centos-6/install.yml | 3 + .../host_vars/libvirt-centos-6/main.yml | 0 .../host_vars/libvirt-centos-6/vault.yml | 0 guests/host_vars/libvirt-centos-7/install.yml | 3 + .../host_vars/libvirt-centos-7/main.yml | 0 .../host_vars/libvirt-centos-7/vault.yml | 0 guests/host_vars/libvirt-debian-8/install.yml | 3 + .../host_vars/libvirt-debian-8/main.yml | 0 .../host_vars/libvirt-debian-8/vault.yml | 0 guests/host_vars/libvirt-debian-9/install.yml | 3 + .../host_vars/libvirt-debian-9/main.yml | 0 .../host_vars/libvirt-debian-9/vault.yml | 0 guests/host_vars/libvirt-fedora-25/install.yml | 3 + .../host_vars/libvirt-fedora-25/main.yml | 0 .../host_vars/libvirt-fedora-25/vault.yml | 0 guests/host_vars/libvirt-fedora-26/install.yml | 3 + .../host_vars/libvirt-fedora-26/main.yml | 0 .../host_vars/libvirt-fedora-26/vault.yml | 0 .../host_vars/libvirt-fedora-rawhide/install.yml | 3 + .../host_vars/libvirt-fedora-rawhide/main.yml | 0 .../host_vars/libvirt-fedora-rawhide/vault.yml | 0 .../host_vars/libvirt-freebsd-10/main.yml | 0 .../host_vars/libvirt-freebsd-10/vault.yml | 0 .../host_vars/libvirt-freebsd-11/main.yml | 0 .../host_vars/libvirt-freebsd-11/vault.yml | 0 guests/host_vars/libvirt-ubuntu-12/install.yml | 3 + .../host_vars/libvirt-ubuntu-12/main.yml | 0 .../host_vars/libvirt-ubuntu-12/vault.yml | 0 guests/host_vars/libvirt-ubuntu-14/install.yml | 3 + .../host_vars/libvirt-ubuntu-14/main.yml | 0 .../host_vars/libvirt-ubuntu-14/vault.yml | 0 guests/host_vars/libvirt-ubuntu-16/install.yml | 3 + .../host_vars/libvirt-ubuntu-16/main.yml | 0 .../host_vars/libvirt-ubuntu-16/vault.yml | 0 {ansible => guests}/inventory | 0 guests/kickstart.cfg | 60 +++++++ guests/lcitool | 183 +++++++++++++++++++++ guests/preseed.cfg | 85 ++++++++++ {ansible => guests}/site.yml | 8 + {ansible => guests}/tasks/base.yml | 61 ++++++- {ansible => guests}/tasks/bootstrap.yml | 0 {ansible => guests}/tasks/compat.yml | 0 {ansible => guests}/tasks/jenkins.yml | 0 {ansible => guests}/tasks/packages.yml | 0 {ansible => guests}/templates/jenkins.service.j2 | 0 {ansible => guests}/vars/mappings.yml | 0 {ansible => guests}/vars/projects/base.yml | 0 {ansible => guests}/vars/projects/jenkins.yml | 0 {ansible => guests}/vars/projects/libosinfo.yml | 0 {ansible => guests}/vars/projects/libvirt-cim.yml | 0 {ansible => guests}/vars/projects/libvirt-glib.yml | 0 .../vars/projects/libvirt-go-xml.yml | 0 {ansible => guests}/vars/projects/libvirt-go.yml | 0 {ansible => guests}/vars/projects/libvirt-perl.yml | 0 .../vars/projects/libvirt-python.yml | 0 .../vars/projects/libvirt-sandbox.yml | 0 {ansible => guests}/vars/projects/libvirt-tck.yml | 0 {ansible => guests}/vars/projects/libvirt.yml | 0 .../vars/projects/osinfo-db-tools.yml | 0 {ansible => guests}/vars/projects/osinfo-db.yml | 0 {ansible => guests}/vars/projects/virt-manager.yml | 0 {ansible => guests}/vars/projects/virt-viewer.yml | 0 70 files changed, 539 insertions(+), 89 deletions(-) delete mode 100644 ansible/Makefile delete mode 100644 ansible/README.markdown delete mode 100644 ansible/bootstrap.yml rename {ansible => guests}/.gitignore (100%) create mode 100644 guests/README.markdown rename {ansible => guests}/ansible.cfg (71%) create mode 100644 guests/group_vars/all/install.yml rename {ansible => guests}/group_vars/all/main.yml (51%) create mode 100644 guests/host_vars/libvirt-centos-6/install.yml rename {ansible => guests}/host_vars/libvirt-centos-6/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-centos-6/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-centos-7/install.yml rename {ansible => guests}/host_vars/libvirt-centos-7/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-centos-7/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-debian-8/install.yml rename {ansible => guests}/host_vars/libvirt-debian-8/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-debian-8/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-debian-9/install.yml rename {ansible => guests}/host_vars/libvirt-debian-9/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-debian-9/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-fedora-25/install.yml rename {ansible => guests}/host_vars/libvirt-fedora-25/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-fedora-25/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-fedora-26/install.yml rename {ansible => guests}/host_vars/libvirt-fedora-26/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-fedora-26/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-fedora-rawhide/install.yml rename {ansible => guests}/host_vars/libvirt-fedora-rawhide/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-fedora-rawhide/vault.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-10/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-10/vault.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-11/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-freebsd-11/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-ubuntu-12/install.yml rename {ansible => guests}/host_vars/libvirt-ubuntu-12/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-ubuntu-12/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-ubuntu-14/install.yml rename {ansible => guests}/host_vars/libvirt-ubuntu-14/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-ubuntu-14/vault.yml (100%) create mode 100644 guests/host_vars/libvirt-ubuntu-16/install.yml rename {ansible => guests}/host_vars/libvirt-ubuntu-16/main.yml (100%) rename {ansible => guests}/host_vars/libvirt-ubuntu-16/vault.yml (100%) rename {ansible => guests}/inventory (100%) create mode 100644 guests/kickstart.cfg create mode 100755 guests/lcitool create mode 100644 guests/preseed.cfg rename {ansible => guests}/site.yml (83%) rename {ansible => guests}/tasks/base.yml (58%) rename {ansible => guests}/tasks/bootstrap.yml (100%) rename {ansible => guests}/tasks/compat.yml (100%) rename {ansible => guests}/tasks/jenkins.yml (100%) rename {ansible => guests}/tasks/packages.yml (100%) rename {ansible => guests}/templates/jenkins.service.j2 (100%) rename {ansible => guests}/vars/mappings.yml (100%) rename {ansible => guests}/vars/projects/base.yml (100%) rename {ansible => guests}/vars/projects/jenkins.yml (100%) rename {ansible => guests}/vars/projects/libosinfo.yml (100%) rename {ansible => guests}/vars/projects/libvirt-cim.yml (100%) rename {ansible => guests}/vars/projects/libvirt-glib.yml (100%) rename {ansible => guests}/vars/projects/libvirt-go-xml.yml (100%) rename {ansible => guests}/vars/projects/libvirt-go.yml (100%) rename {ansible => guests}/vars/projects/libvirt-perl.yml (100%) rename {ansible => guests}/vars/projects/libvirt-python.yml (100%) rename {ansible => guests}/vars/projects/libvirt-sandbox.yml (100%) rename {ansible => guests}/vars/projects/libvirt-tck.yml (100%) rename {ansible => guests}/vars/projects/libvirt.yml (100%) rename {ansible => guests}/vars/projects/osinfo-db-tools.yml (100%) rename {ansible => guests}/vars/projects/osinfo-db.yml (100%) rename {ansible => guests}/vars/projects/virt-manager.yml (100%) rename {ansible => guests}/vars/projects/virt-viewer.yml (100%) -- 2.13.6

4 17

[libvirt] [PATCH 0/6] qemu: hotplug: Kill duplicated code in disk hotplug (blockdev-add saga)
by Peter Krempa 19 Oct '17

19 Oct '17

A lot of code was copypasted into the three disk attaching functions which are (almost) identical (one was forgotten), without refactoring it first. Let's reduce two copies of the ugly code. BTW this adds support for disk encryption and storage source authentication for USB disks. Peter Krempa (6): qemu: address: Remove dead code when un-reserving PCI address qemu: hotplug: Remove wrong check for empty disks qemu: hotplug: Use disk target in debug/warning messages where appropriate qemu: hotplug: extract disk hotplug worker code qemu: hotplug: Reuse qemuDomainAttachDiskGeneric in qemuDomainAttachSCSIDisk qemu: hotplug: Reuse qemuDomainAttachDiskGeneric in qemuDomainAttachUSBMassStorageDevice src/conf/domain_addr.c | 3 +- src/conf/domain_addr.h | 4 +- src/qemu/qemu_domain_address.c | 7 +- src/qemu/qemu_hotplug.c | 273 ++++++++--------------------------------- 4 files changed, 53 insertions(+), 234 deletions(-) -- 2.14.1

2 7

[libvirt] [PATCH 00/12] qemu: input device hotplug
by Ján Tomko 19 Oct '17

19 Oct '17

https://bugzilla.redhat.com/show_bug.cgi?id=1379603 Ján Tomko (12): conf: audit passthrough input devices at domain startup qemuDomainAttachControllerDevice: remove dead code qemuDomainAttachRNGDevice: do not access source.file randomly Move qemuCheckCCWS390AddressSupport to qemu_domain Split out qemuDomainEnsureVirtioAddress Use qemuDomainEnsureVirtioAddress where possible qemu: allow coldplugging input devices qemu: allow cold unplugging of input devices split out qemuAssignDeviceInputAlias Introduce qemuBuildInputDevStr qemu: implement input device hotplug qemu: implement input device hotunplug src/conf/domain_audit.c | 44 ++++++++ src/conf/domain_audit.h | 5 + src/conf/domain_conf.c | 37 +++++++ src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 3 + src/qemu/qemu_alias.c | 24 ++++- src/qemu/qemu_alias.h | 3 + src/qemu/qemu_command.c | 82 +++++--------- src/qemu/qemu_command.h | 12 ++- src/qemu/qemu_domain.c | 40 +++++++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_domain_address.c | 45 ++++++++ src/qemu/qemu_domain_address.h | 4 + src/qemu/qemu_driver.c | 25 ++++- src/qemu/qemu_hotplug.c | 239 +++++++++++++++++++++++++++-------------- src/qemu/qemu_hotplug.h | 8 ++ 16 files changed, 436 insertions(+), 143 deletions(-) -- 2.13.0

2 20

[libvirt] [PATCH] fix error message spacing in qemuDomainDetachNetDevice
by Ján Tomko 19 Oct '17

19 Oct '17

Move the space after the colon. --- Pushed as trivial, suggested by John in review: https://www.redhat.com/archives/libvir-list/2017-October/msg00833.html src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 57240ce67..1a0844701 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5219,7 +5219,7 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, if (qemuIsMultiFunctionDevice(vm->def, &detach->info)) { virReportError(VIR_ERR_OPERATION_FAILED, - _("cannot hot unplug multifunction PCI device :%s"), + _("cannot hot unplug multifunction PCI device: %s"), dev->data.disk->dst); goto cleanup; } -- 2.13.0

1 0

[libvirt] How can I tell if I'm using qemu-kvm or qemu-kvm-ev from libvirt Python binding?
by Yaniv Kaul 19 Oct '17

19 Oct '17

I'm trying to (optionally) use iothreads, which only exist on qemu-kvm-ev. I was hoping to see it in the domcapabilities, but I don't see it there. How do I know if it's supported or not? TIA, Y.

3 3

[libvirt] [PATCH 0/2] More hotplug cleanups
by Ján Tomko 19 Oct '17

19 Oct '17

Remove some dead code. Ján Tomko (2): qemuIsMultiFunctionDevice: return early for non-PCI addresses qemu: remove pointless address validation on hot unplug src/qemu/qemu_hotplug.c | 56 ++++++++----------------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) -- 2.13.0

2 4

[libvirt] [PATCH v6 0/9] Work around the kernel mdev uevent race in nodedev
by Erik Skultety 19 Oct '17

19 Oct '17

v5 here: https://www.redhat.com/archives/libvir-list/2017-October/msg00440.html Since v5: - fixed minor nitpicks - added 3 more patches as per reviewer's suggestion to split some of the changes even more - patches {2,6,7,8,9}/9 are without any change Erik Skultety (9): nodedev: Move privileged flag from udev private data to driver's state (NEW) nodedev: udev: Introduce udevEventMonitorSanityCheck helper function (ACKed) nodedev: udev: Convert udev private data to a lockable object (ACKed with fixes) nodedev: udev: Remove driver locks from stateInitialize and (NEW) stateCleanup nodedev: udev: Unlock the private data before setting up 'system' node (NEW) nodedev: udev: Split udevEventHandleCallback in two functions (ACKed) nodedev: udev: Convert udevEventHandleThread to an actual thread (ACKed) routine util: Introduce virFileWaitForExists (ACKed) nodedev: udev: Hook up virFileWaitForAccess to work around uevent race (ACKed) src/conf/virnodedeviceobj.h | 1 + src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 283 +++++++++++++++++++++++++++---------- src/node_device/node_device_udev.h | 3 - src/util/virfile.c | 31 ++++ src/util/virfile.h | 2 + 6 files changed, 245 insertions(+), 76 deletions(-) -- 2.13.6

2 14

[libvirt] [PATCH 00/14] introduce virDomainSetLifecycleAction() API
by Pavel Hrdina 19 Oct '17

19 Oct '17

Pavel Hrdina (14): conf: rename lifecycle enum values to correspond with typedef keyword conf: rename virDomainLifecycleAction enum functions conf: introduce virDomainLifecycle enum to list all lifecycle types conf: merge virDomainLifecycleCrashAction with virDomainLifecycleAction qemu: pass virDomainObjPtr to qemuBuildCommandLine qemu: pass priv data to qemuBuildMonitorCommandLine qemu: pass priv data to qemuBuildPMCommandLine qemu: pass priv data to qemuBuildMasterKeyCommandLine qemu: pass priv data instead of qemuCaps and autoNodeset lib: introduce virDomainSetLifecycleAction() API virsh: introduce set-lifecycle-action command qemu: move detection whether to use -no-reboot to qemu_domain qemu: send allowReboot in migration cookie qemu: implement virDomainSetLifecycleAction() API docs/formatdomain.html.in | 6 +++ include/libvirt/libvirt-domain.h | 28 ++++++++++ src/conf/domain_conf.c | 84 ++++++++++++++++++++++++----- src/conf/domain_conf.h | 26 ++------- src/driver-hypervisor.h | 7 +++ src/libvirt-domain.c | 60 +++++++++++++++++++++ src/libvirt_private.syms | 7 ++- src/libvirt_public.syms | 5 ++ src/libxl/libxl_conf.c | 43 ++++----------- src/libxl/libxl_domain.c | 40 +++++++------- src/lxc/lxc_native.c | 6 +-- src/qemu/qemu_command.c | 93 +++++++++++++------------------- src/qemu/qemu_command.h | 11 +--- src/qemu/qemu_domain.c | 40 ++++++++++++++ src/qemu/qemu_domain.h | 9 ++++ src/qemu/qemu_driver.c | 112 +++++++++++++++++++++++++++++++++++---- src/qemu/qemu_migration.c | 7 ++- src/qemu/qemu_migration_cookie.c | 25 ++++++++- src/qemu/qemu_migration_cookie.h | 5 ++ src/qemu/qemu_parse_command.c | 8 +-- src/qemu/qemu_process.c | 53 ++++++++++++------ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 14 ++++- src/test/test_driver.c | 8 +-- src/vmx/vmx.c | 6 +-- src/vz/vz_sdk.c | 12 ++--- src/xenapi/xenapi_utils.c | 40 +++++++------- src/xenapi/xenapi_utils.h | 4 +- src/xenconfig/xen_common.c | 12 ++--- src/xenconfig/xen_sxpr.c | 18 +++---- tests/qemuxml2xmltest.c | 3 +- tools/virsh-domain.c | 102 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 7 +++ 33 files changed, 658 insertions(+), 244 deletions(-) -- 2.13.6

2 22

[libvirt] [PATCH] bhyve: Fix build
by Jiri Denemark 19 Oct '17

19 Oct '17

Commit v3.8.0-95-gfd885a06a dropped nmodels parameter from several APIs in src/cpu/cpu.h, but failed to update all callers. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed under the build-breaker rule. src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index c096b5562..5c432b25e 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1433,7 +1433,7 @@ bhyveConnectBaselineCPU(virConnectPtr conn, if (!(cpus = virCPUDefListParse(xmlCPUs, ncpus, VIR_CPU_TYPE_HOST))) goto cleanup; - if (!(cpu = cpuBaseline(cpus, ncpus, NULL, 0, + if (!(cpu = cpuBaseline(cpus, ncpus, NULL, !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE)))) goto cleanup; -- 2.14.2

1 0

[libvirt] [CFP] Virt & IaaS Devroom at FOSDEM18
by Stefan Hajnoczi 18 Oct '17

18 Oct '17

I am excited to announce that the call for proposals is now open for the Virtualization & IaaS devroom at the upcoming FOSDEM 2018, to be hosted on February 3 and 4, 2018. This year will mark FOSDEM’s 18th anniversary as one of the longest-running free and open source software developer events, attracting thousands of developers and users from all over the world. FOSDEM will be held once again in Brussels, Belgium, on February 3 & 4, 2018. This devroom is a collaborative effort, and is organized by dedicated folks from projects such as OpenStack, Xen Project, oVirt, QEMU, KVM, libvirt, and Foreman. We would like to invite all those who are involved in these fields to submit your proposals by December 1st, 2017. About the Devroom The Virtualization & IaaS devroom will feature session topics such as open source hypervisors and virtual machine managers such as Xen Project, KVM, bhyve, and VirtualBox, and Infrastructure-as-a-Service projects such as Apache CloudStack, OpenStack, oVirt, QEMU, OpenNebula, and Ganeti. This devroom will host presentations that focus on topics of shared interest, such as KVM; libvirt; shared storage; virtualized networking; cloud security; clustering and high availability; interfacing with multiple hypervisors; hyperconverged deployments; and scaling across hundreds or thousands of servers. Presentations in this devroom will be aimed at developers working on these platforms who are looking to collaborate and improve shared infrastructure or solve common problems. We seek topics that encourage dialog between projects and continued work post-FOSDEM. Important Dates Submission deadline: 01 December 2017 Acceptance notifications: 14 December 2017 Final schedule announcement: 21 December 2017 Devroom: 03 and 04 February 2018 (two days- different rooms) Submit Your Proposal All submissions must be made via the Pentabarf event planning site[1]. If you have not used Pentabarf before, you will need to create an account. If you submitted proposals for FOSDEM in previous years, you can use your existing account. After creating the account, select Create Event to start the submission process. Make sure to select Virtualization and IaaS devroom from the Track list. Please fill out all the required fields, and provide a meaningful abstract and description of your proposed session. Submission Guidelines We expect more proposals than we can possibly accept, so it is vitally important that you submit your proposal on or before the deadline. Late submissions are unlikely to be considered. All presentation slots are 45 minutes, with 35 minutes planned for presentations, and 10 minutes for Q&A. All presentations will be recorded and made available under Creative Commons licenses. In the Submission notes field, please indicate that you agree that your presentation will be licensed under the CC-By-SA-4.0 or CC-By-4.0 license and that you agree to have your presentation recorded. For example: "If my presentation is accepted for FOSDEM, I hereby agree to license all recordings, slides, and other associated materials under the Creative Commons Attribution Share-Alike 4.0 International License. Sincerely, <NAME>." In the Submission notes field, please also confirm that if your talk is accepted, you will be able to attend FOSDEM and deliver your presentation. We will not consider proposals from prospective speakers who are unsure whether they will be able to secure funds for travel and lodging to attend FOSDEM. (Sadly, we are not able to offer travel funding for prospective speakers.) Speaker Mentoring Program As a part of the rising efforts to grow our communities and encourage a diverse and inclusive conference ecosystem, we're happy to announce that we'll be offering mentoring for new speakers. Our mentors can help you with tasks such as reviewing your abstract, reviewing your presentation outline or slides, or practicing your talk with you. You may apply to the mentoring program as a newcomer speaker if you: Never presented before or Presented only lightning talks or Presented full-length talks at small meetups (<50 ppl) Submission Guidelines Mentored presentations will have 25-minute slots, where 20 minutes will include the presentation and 5 minutes will be reserved for questions. The number of newcomer session slots is limited, so we will probably not be able to accept all applications. You must submit your talk and abstract to apply for the mentoring program, our mentors are volunteering their time and will happily provide feedback but won't write your presentation for you! If you are experiencing problems with Pentabarf, the proposal submission interface, or have other questions, you can email our devroom mailing list[2] and we will try to help you. How to Apply In addition to agreeing to video recording and confirming that you can attend FOSDEM in case your session is accepted, please write "speaker mentoring program application" in the "Submission notes" field, and list any prior speaking experience or other relevant information for your application. Call for Mentors Interested in mentoring newcomer speakers? We'd love to have your help! Please email iaas-virt-devroom at lists.fosdem.org with a short speaker biography and any specific fields of expertise (for example, KVM, OpenStack, storage, etc.) so that we can match you with a newcomer speaker from a similar field. Estimated time investment can be as low as a 5-10 hours in total, usually distributed weekly or bi-weekly. Never mentored a newcomer speaker but interested to try? As the mentoring program coordinator, email Brian Proffitt[3] and he will be happy to answer your questions! Code of Conduct Following the release of the updated code of conduct for FOSDEM, we'd like to remind all speakers and attendees that all of the presentations and discussions in our devroom are held under the guidelines set in the CoC and we expect attendees, speakers, and volunteers to follow the CoC at all times. If you submit a proposal and it is accepted, you will be required to confirm that you accept the FOSDEM CoC. If you have any questions about the CoC or wish to have one of the devroom organizers review your presentation slides or any other content for CoC compliance, please email us and we will do our best to assist you. Call for Volunteers We are also looking for volunteers to help run the devroom. We need assistance watching time for the speakers, and helping with video for the devroom. Please contact me, Brian Proffitt, for more information. Questions? If you have any questions about this devroom, please send your questions to our devroom mailing list. You can also subscribe to the list to receive updates about important dates, session announcements, and to connect with other attendees. See you all at FOSDEM! [1] <https://penta.fosdem.org/submission/FOSDEM18> https://penta.fosdem.org/submission/FOSDEM18 [2] iaas-virt-devroom at lists.fosdem.org <https://lists.fosdem.org/listinfo/fosdem> [3] bkp at redhat.com

1 0

[libvirt] [PATCH] virsh: domifaddr: clarify description of --full option
by Chen Hanxiao 18 Oct '17

18 Oct '17

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Option --full will always display the name and MAC address of the interface. Both virsh help and virsh man page didn't mention that. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain-monitor.c | 2 +- tools/virsh.pod | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 4c50155e1..35d04b22a 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2153,7 +2153,7 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "full", .type = VSH_OT_BOOL, .flags = VSH_OFLAG_NONE, - .help = N_("display full fields")}, + .help = N_("always display names and MACs of interfaces")}, {.name = "source", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, diff --git a/tools/virsh.pod b/tools/virsh.pod index 9304ca525..db1ede880 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -766,9 +766,9 @@ addresses, or limited output just for one interface if I<interface> is specified. Note that I<interface> can be driver dependent, it can be the name within guest OS or the name you would see in domain XML. Moreover, the whole command may require a guest agent to be configured for the queried domain under -some drivers, notably qemu. If I<--full> is specified, the interface name is -always displayed when the interface has multiple addresses or alias, otherwise -it only displays the interface name for the first address, and "-" for the +some drivers, notably qemu. If I<--full> is specified, the interface name and MAC +address is always displayed when the interface has multiple addresses or alias, +otherwise it only displays the interface name for the first address, and "-" for the others. The I<--source> argument specifies what data source to use for the addresses, currently one of 'lease' to read DHCP leases, or 'agent' to query the guest OS via an agent. If unspecified, 'lease' is the default. -- 2.13.5

2 1

[libvirt] [PATCH v5 0/6] Work around the kernel mdev uevent race in nodedev
by Erik Skultety 18 Oct '17

18 Oct '17

v4: https://www.redhat.com/archives/libvir-list/2017-September/msg00532.html Since v4: - fixed the reviewer's notes in 1/7 - dropped the original 2/7 because of converting the udev private data into a lockable object - current 2/6 is a new patch reworking our current locking approach of the udev private data where we only relied on the driver global lock, after this patch, private data are going to be a self-lockable object - dropped the event counting from 4/7, the thread now reads everything it can until it gets EAGAIN/EWOULDBLOCK from libudev, which renders enablement/disablement of event loop fd polling unnecessary -> other minor adjustments raised during review -> dropped our udev fd sanity check from the worker thread, since the thread will encounter a libudev error sooner or later, so the sanity check inside the worker thread wouldn't really make a difference Erik Skultety (6): nodedev: Introduce udevEventMonitorSanityCheck helper function (ACKed) nodedev: udev: Convert udev private data to a lockable object (NEW) udev: Split udevEventHandleCallback in two functions (2/6 necessary changes) udev: Convert udevEventHandleThread to an actual thread routine (reworked) util: Introduce virFileWaitForExists (unchanged && ACKed) nodedev: Work around the uevent race by hooking up virFileWaitForAccess (unchanged && ACKed) src/libvirt_private.syms | 1 + src/node_device/node_device_udev.c | 281 ++++++++++++++++++++++++++++--------- src/node_device/node_device_udev.h | 3 - src/util/virfile.c | 31 ++++ src/util/virfile.h | 2 + 5 files changed, 249 insertions(+), 69 deletions(-) -- 2.13.6

2 15

[libvirt] [PATCH 0/3] fix crash on libvirtd termination
by Nikolay Shirokovskiy 18 Oct '17

18 Oct '17

Libvirtd termination can crash. One can use [2] patch to trigger it. Call domstats function and send TERM to libvirtd. You'd probably see stacktrace [1]. The problem is that threads with clients requests are joined after drivers cleanup. This patch series address this issue. [1] Crash stacktrace Program received signal SIGSEGV, Segmentation fault. Thread 5 (Thread 0x7fffe6a4d700 (LWP 921916)): #0 0x00007fffd9cb3f14 in qemuDomainObjBeginJobInternal (driver=driver@entry=0x7fffcc103e40, obj=obj@entry=0x7fffcc1a6ca0, job=job@entry=QEMU_JOB_QUERY, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE) at qemu/qemu_domain.c:4114 #1 0x00007fffd9cb82ab in qemuDomainObjBeginJob (driver=driver@entry=0x7fffcc103e40, obj=obj@entry=0x7fffcc1a6ca0, job=job@entry=QEMU_JOB_QUERY) at qemu/qemu_domain.c:4240 #2 0x00007fffd9d23094 in qemuConnectGetAllDomainStats (conn=0x7fffcc1bc140, doms=<optimized out>, ndoms=<optimized out>, stats=127, retStats=0x7fffe6a4cb10, flags=<optimized out>) at qemu/qemu_driver.c:20116 #3 0x00007ffff744a166 in virDomainListGetStats (doms=0x7fffa8000a10, stats=0, retStats=retStats@entry=0x7fffe6a4cb10, flags=0) at libvirt-domain.c:11592 #4 0x000055555557af15 in remoteDispatchConnectGetAllDomainStats (server=<optimized out>, msg=<optimized out>, ret=0x7fffa80008e0, args=0x7fffa80008c0, rerr=0x7fffe6a4cc50, client=<optimized out>) at remote.c:6532 #5 remoteDispatchConnectGetAllDomainStatsHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7fffe6a4cc50, args=0x7fffa80008c0, ret=0x7fffa80008e0) at remote_dispatch.h:615 #6 0x00007ffff74abba2 in virNetServerProgramDispatchCall (msg=0x55555583bf50, client=0x55555583c580, server=0x555555810f40, prog=0x55555583a140) at rpc/virnetserverprogram.c:437 #7 virNetServerProgramDispatch (prog=0x55555583a140, server=server@entry=0x555555810f40, client=0x55555583c580, msg=0x55555583bf50) at rpc/virnetserverprogram.c:307 #8 0x00005555555ae10d in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x555555810f40) at rpc/virnetserver.c:148 #9 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x555555810f40) at rpc/virnetserver.c:169 #10 0x00007ffff7390fd1 in virThreadPoolWorker (opaque=opaque@entry=0x5555558057a0) at util/virthreadpool.c:167 #11 0x00007ffff7390358 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #12 0x00007ffff457be25 in start_thread () from /lib64/libpthread.so.0 #13 0x00007ffff42a934d in clone () from /lib64/libc.so.6 Thread 1 (Thread 0x7ffff7fae880 (LWP 921909)): #0 0x00007ffff457f945 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007ffff73905c6 in virCondWait (c=<optimized out>, m=<optimized out>) at util/virthread.c:154 #2 0x00007ffff73911e0 in virThreadPoolFree (pool=0x555555811030) at util/virthreadpool.c:290 #3 0x00005555555adb44 in virNetServerDispose (obj=0x555555810f40) at rpc/virnetserver.c:767 #4 0x00007ffff736f62b in virObjectUnref (anyobj=<optimized out>) at util/virobject.c:356 #5 0x00007ffff7343e19 in virHashFree (table=0x55555581ba40) at util/virhash.c:318 #6 0x00007ffff74a46b5 in virNetDaemonDispose (obj=0x555555812c50) at rpc/virnetdaemon.c:105 #7 0x00007ffff736f62b in virObjectUnref (anyobj=anyobj@entry=0x555555812c50) at util/virobject.c:356 #8 0x0000555555570479 in main (argc=<optimized out>, argv=<optimized out>) at libvirtd.c:1539 [2] patch to trigger crash # diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c # index cf5e4ad..39a57aa 100644 # --- a/src/qemu/qemu_driver.c # +++ b/src/qemu/qemu_driver.c # @@ -20144,6 +20144,8 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, # domflags = 0; # vm = vms[i]; # # + sleep(5); # + # virObjectLock(vm); # # if (HAVE_JOB(privflags) && Nikolay Shirokovskiy (3): daemon: finish threads on close qemu: monitor: check monitor not closed on send qemu: implement state driver shutdown function daemon/libvirtd.c | 2 ++ src/driver-state.h | 4 ++++ src/libvirt.c | 18 ++++++++++++++++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 39 +++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 27 +++++++++++++-------------- src/rpc/virnetserver.c | 5 +++-- 8 files changed, 81 insertions(+), 16 deletions(-) -- 1.8.3.1

2 9

[libvirt] [PATCH 0/2] Clean up some forgotten tabs from our source files
by Erik Skultety 18 Oct '17

18 Oct '17

I don't think a reliable syntax-check rule checking tab spacing can be used, but I can of course be proven wrong. Erik Skultety (2): maint: Replace tabs with spaces in all source files in repo maint: Remove not-so-much informative block commentaries daemon/remote.c | 7 - docs/search.php.code.in | 350 ++++++++++++++++++++++---------------------- include/libvirt/virterror.h | 278 +++++++++++++++++------------------ src/bhyve/bhyve_monitor.c | 2 +- src/bhyve/bhyve_process.c | 2 +- src/conf/node_device_conf.h | 52 +++---- src/conf/nwfilter_conf.h | 2 +- src/conf/virnodedeviceobj.c | 2 +- src/conf/virnodedeviceobj.h | 4 +- src/network/bridge_driver.c | 2 - src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_monitor.h | 2 +- src/util/viraudit.h | 4 +- src/util/virconf.c | 35 +---- src/util/virconf.h | 10 +- src/util/virerror.h | 5 - src/util/virsysinfo.c | 2 +- src/util/virxml.c | 8 +- src/vbox/vbox_XPCOMCGlue.c | 9 -- src/xen/xen_driver.h | 2 +- src/xen/xen_hypervisor.c | 168 ++++++++++----------- src/xen/xen_hypervisor.h | 2 +- src/xen/xend_internal.c | 23 +-- src/xen/xend_internal.h | 8 +- src/xen/xs_internal.c | 18 +-- src/xen/xs_internal.h | 14 +- src/xenconfig/xen_sxpr.c | 5 - 27 files changed, 468 insertions(+), 556 deletions(-) -- 2.13.6

2 4