- Devel - libvirt List Archives

[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