- Devel - libvirt List Archives

[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