March 2017 - Devel - libvirt List Archives

[libvirt] [PATCH] domain_conf: move iothread check for address type back to qemu_command
by Pavel Hrdina 09 Mar '17

09 Mar '17

This partially reverts commit c96bd78e4e. If an API virDomainAttachDevice(Flags) is used the device address is assigned after the validation and the address type may not be set. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1430275 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 18 ++++-------------- src/qemu/qemu_command.c | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 97d42fe993..747706e673 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4769,12 +4769,10 @@ virDomainDiskDefValidate(const virDomainDef *def, } if (disk->iothread > 0) { - if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO || - (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOThreads are only available for virtio pci and " - "virtio ccw disk")); + if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("IOThreads are not available for bus '%s', disk '%s'"), + virDomainDiskBusTypeToString(disk->bus), disk->dst); return -1; } @@ -4850,14 +4848,6 @@ virDomainControllerDefValidate(const virDomainDef *def, return -1; } - if (cont->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - cont->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("IOThreads are only available for virtio pci and " - "virtio ccw controllers")); - return -1; - } - if (!virDomainIOThreadIDFind(def, cont->iothread)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Invalid IOThread id '%u' for controller '%s'"), diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6545a93259..b49242a7df 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1871,6 +1871,21 @@ qemuBuildDriveStr(virDomainDiskDefPtr disk, } +static int +qemuBuildCheckIOThreadAddress(virDomainDeviceInfo info) +{ + if (info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && + info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("IOThreads are only available for virtio pci and " + "virtio ccw")); + return -1; + } + + return 0; +} + + char * qemuBuildDriveDevStr(const virDomainDef *def, virDomainDiskDefPtr disk, @@ -1889,6 +1904,9 @@ qemuBuildDriveDevStr(const virDomainDef *def, if (!qemuCheckCCWS390AddressSupport(def, disk->info, qemuCaps, disk->dst)) goto error; + if (disk->iothread > 0 && qemuBuildCheckIOThreadAddress(disk->info) < 0) + goto error; + switch (disk->bus) { case VIR_DOMAIN_DISK_BUS_IDE: if (disk->info.addr.drive.target != 0) { @@ -2571,6 +2589,8 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, if (def->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { virBufferAddLit(&buf, "virtio-scsi-ccw"); if (def->iothread) { + if (qemuBuildCheckIOThreadAddress(def->info) < 0) + goto error; virBufferAsprintf(&buf, ",iothread=iothread%u", def->iothread); } @@ -2583,6 +2603,8 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, } else { virBufferAddLit(&buf, "virtio-scsi-pci"); if (def->iothread) { + if (qemuBuildCheckIOThreadAddress(def->info) < 0) + goto error; virBufferAsprintf(&buf, ",iothread=iothread%u", def->iothread); } -- 2.12.0

2 1

[libvirt] [PATCH] doc updates
by Philipp Hahn 09 Mar '17

09 Mar '17

3 13

[libvirt] Making containers creation easy
by Cedric Bosdonnat 09 Mar '17

09 Mar '17

Hi all, I've worked on making the containers rootfs creation easy. Here is a wrap-up of my work: http://bosdonnat.fr/system-container-images.html Any opinion on that? Anything to do to move it forward? -- Cedric

3 4

[libvirt] [PATCH v2 0/2] fix migration related graphics listen code bugs
by Pavel Hrdina 09 Mar '17

09 Mar '17

Pavel Hrdina (2): conf: store "autoGenerated" for graphics listen in status XML conf: properly skip graphics listen element in migratable XML src/conf/domain_conf.c | 20 +++++++++++++++++++- src/qemu/qemu_domain.c | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-) -- 2.12.0

2 3

[libvirt] [PATCH v2 00/10] perf: Add software perf events
by Nitesh Konkar 09 Mar '17

09 Mar '17

This patch series adds software perf events. The perl and go patches shall follow shortly. Nitesh Konkar (10): perf: add cpu_clock software perf event support perf: add task_clock software perf event support perf: add page_faults software perf event support perf: add context_switches software perf event support perf: add cpu_migrations software perf event support perf: add page_faults_min software perf event support perf: add page_faults_maj software perf event support perf: add alignment_faults software perf event support perf: add emulation_faults software perf event support news: Update the news.xml about perf events added docs/formatdomain.html.in | 74 +++++++++++++++++++++++ docs/news.xml | 11 ++++ docs/schemas/domaincommon.rng | 9 +++ include/libvirt/libvirt-domain.h | 92 +++++++++++++++++++++++++++++ src/libvirt-domain.c | 25 ++++++++ src/qemu/qemu_driver.c | 9 +++ src/util/virperf.c | 33 ++++++++++- src/util/virperf.h | 9 +++ tests/genericxml2xmlindata/generic-perf.xml | 9 +++ tools/virsh.pod | 27 +++++++++ 10 files changed, 297 insertions(+), 1 deletion(-) -- 1.9.3

3 14

[libvirt] [PATCH 0/2] fix migration related graphics listen code bugs
by Pavel Hrdina 09 Mar '17

09 Mar '17

Pavel Hrdina (2): conf: store "autoGenerated" for graphics listen in status XML conf: properly skip graphics listen element in migratable XML src/conf/domain_conf.c | 18 +++++++++++++++++- src/qemu/qemu_domain.c | 3 ++- 2 files changed, 19 insertions(+), 2 deletions(-) -- 2.11.1

2 3

[libvirt] ANNOUNCE: virt-manager 1.4.1 released
by Cole Robinson 09 Mar '17

09 Mar '17

I'm happy to announce the release of virt-manager 1.4.1! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - storage/nodedev event API support (Jovanka Gulicoska) - UI options for enabling spice GL (Marc-André Lureau) - Add default virtio-rng /dev/urandom for supported guest OS - Cloning and rename support for UEFI VMs (Pavel Hrdina) - libguestfs inspection UI improvements (Pino Toscano) - virt-install: Add --qemu-commandline - virt-install: Add --network vhostuser (Chen Hanxiao) - virt-install: Add --sysinfo (Charles Arnold) Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH] qemu: Rename variable
by John Ferlan 08 Mar '17

08 Mar '17

Rename 'secretUsageType' to 'usageType' since it's superfluous in an API qemu*Secret* Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial - based upon Jirka's review comment from patch 1 of the "Alter TLS/UUID algorithms to be a bit more generic" series. src/qemu/qemu_domain.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bffb8ac..4d184d3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -965,7 +965,7 @@ qemuDomainChrSourcePrivateDispose(void *obj) /* qemuDomainSecretPlainSetup: * @conn: Pointer to connection * @secinfo: Pointer to secret info - * @secretUsageType: The virSecretUsageType + * @usageType: The virSecretUsageType * @username: username to use for authentication (may be NULL) * @seclookupdef: Pointer to seclookupdef data * @@ -976,7 +976,7 @@ qemuDomainChrSourcePrivateDispose(void *obj) static int qemuDomainSecretPlainSetup(virConnectPtr conn, qemuDomainSecretInfoPtr secinfo, - virSecretUsageType secretUsageType, + virSecretUsageType usageType, const char *username, virSecretLookupTypeDefPtr seclookupdef) { @@ -984,7 +984,7 @@ qemuDomainSecretPlainSetup(virConnectPtr conn, if (VIR_STRDUP(secinfo->s.plain.username, username) < 0) return -1; - return virSecretGetSecretString(conn, seclookupdef, secretUsageType, + return virSecretGetSecretString(conn, seclookupdef, usageType, &secinfo->s.plain.secret, &secinfo->s.plain.secretlen); } @@ -995,7 +995,7 @@ qemuDomainSecretPlainSetup(virConnectPtr conn, * @priv: pointer to domain private object * @secinfo: Pointer to secret info * @srcalias: Alias of the disk/hostdev used to generate the secret alias - * @secretUsageType: The virSecretUsageType + * @usageType: The virSecretUsageType * @username: username to use for authentication (may be NULL) * @seclookupdef: Pointer to seclookupdef data * @isLuks: True/False for is for luks (alias generation) @@ -1009,7 +1009,7 @@ qemuDomainSecretAESSetup(virConnectPtr conn, qemuDomainObjPrivatePtr priv, qemuDomainSecretInfoPtr secinfo, const char *srcalias, - virSecretUsageType secretUsageType, + virSecretUsageType usageType, const char *username, virSecretLookupTypeDefPtr seclookupdef, bool isLuks) @@ -1038,7 +1038,7 @@ qemuDomainSecretAESSetup(virConnectPtr conn, goto cleanup; /* Grab the unencoded secret */ - if (virSecretGetSecretString(conn, seclookupdef, secretUsageType, + if (virSecretGetSecretString(conn, seclookupdef, usageType, &secret, &secretlen) < 0) goto cleanup; @@ -1072,7 +1072,7 @@ qemuDomainSecretAESSetup(virConnectPtr conn, * @priv: pointer to domain private object * @secinfo: Pointer to secret info * @srcalias: Alias of the disk/hostdev used to generate the secret alias - * @secretUsageType: The virSecretUsageType + * @usageType: The virSecretUsageType * @username: username to use for authentication (may be NULL) * @seclookupdef: Pointer to seclookupdef data * @isLuks: True when is luks (generates different alias) @@ -1089,22 +1089,22 @@ qemuDomainSecretSetup(virConnectPtr conn, qemuDomainObjPrivatePtr priv, qemuDomainSecretInfoPtr secinfo, const char *srcalias, - virSecretUsageType secretUsageType, + virSecretUsageType usageType, const char *username, virSecretLookupTypeDefPtr seclookupdef, bool isLuks) { if (virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_SECRET) && - (secretUsageType == VIR_SECRET_USAGE_TYPE_CEPH || - secretUsageType == VIR_SECRET_USAGE_TYPE_VOLUME || - secretUsageType == VIR_SECRET_USAGE_TYPE_TLS)) { + (usageType == VIR_SECRET_USAGE_TYPE_CEPH || + usageType == VIR_SECRET_USAGE_TYPE_VOLUME || + usageType == VIR_SECRET_USAGE_TYPE_TLS)) { if (qemuDomainSecretAESSetup(conn, priv, secinfo, srcalias, - secretUsageType, username, + usageType, username, seclookupdef, isLuks) < 0) return -1; } else { - if (qemuDomainSecretPlainSetup(conn, secinfo, secretUsageType, + if (qemuDomainSecretPlainSetup(conn, secinfo, usageType, username, seclookupdef) < 0) return -1; } @@ -1253,14 +1253,14 @@ qemuDomainSecretDiskPrepare(virConnectPtr conn, qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk); if (qemuDomainSecretDiskCapable(src)) { - virSecretUsageType secretUsageType = VIR_SECRET_USAGE_TYPE_ISCSI; + virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI; if (src->protocol == VIR_STORAGE_NET_PROTOCOL_RBD) - secretUsageType = VIR_SECRET_USAGE_TYPE_CEPH; + usageType = VIR_SECRET_USAGE_TYPE_CEPH; if (!(diskPriv->secinfo = qemuDomainSecretInfoNew(conn, priv, disk->info.alias, - secretUsageType, src->auth->username, + usageType, src->auth->username, &src->auth->seclookupdef, false))) return -1; } -- 2.9.3

1 0

[libvirt] [PATCH] tests: Add storagevol tests for format=iso
by Cole Robinson 08 Mar '17

08 Mar '17

Demonstrates the bug fix in commit 0e5db762627 --- tests/storagevolxml2argvdata/iso-input.argv | 1 + tests/storagevolxml2argvdata/iso.argv | 1 + tests/storagevolxml2argvtest.c | 7 +++++++ tests/storagevolxml2xmlin/vol-file-iso.xml | 10 ++++++++++ tests/storagevolxml2xmlout/vol-file-iso.xml | 11 +++++++++++ tests/storagevolxml2xmltest.c | 1 + 6 files changed, 31 insertions(+) create mode 100644 tests/storagevolxml2argvdata/iso-input.argv create mode 100644 tests/storagevolxml2argvdata/iso.argv create mode 100644 tests/storagevolxml2xmlin/vol-file-iso.xml create mode 100644 tests/storagevolxml2xmlout/vol-file-iso.xml diff --git a/tests/storagevolxml2argvdata/iso-input.argv b/tests/storagevolxml2argvdata/iso-input.argv new file mode 100644 index 0000000..333d7e6 --- /dev/null +++ b/tests/storagevolxml2argvdata/iso-input.argv @@ -0,0 +1 @@ +qemu-img convert -f raw -O raw /var/lib/libvirt/images/test.iso /var/lib/libvirt/images/sparse.img \ No newline at end of file diff --git a/tests/storagevolxml2argvdata/iso.argv b/tests/storagevolxml2argvdata/iso.argv new file mode 100644 index 0000000..40b99c5 --- /dev/null +++ b/tests/storagevolxml2argvdata/iso.argv @@ -0,0 +1 @@ +qemu-img create -f raw /var/lib/libvirt/images/test.iso 1024K \ No newline at end of file diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index bf9dbe5..24c3bac 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -272,6 +272,13 @@ mymain(void) "pool-dir", "vol-qcow2-nocapacity-backing", NULL, NULL, "qcow2-nocapacity", 0, FMT_OPTIONS); + DO_TEST("pool-dir", "vol-file-iso", + NULL, NULL, + "iso", 0, FMT_OPTIONS); + DO_TEST("pool-dir", "vol-file", + "pool-dir", "vol-file-iso", + "iso-input", 0, FMT_OPTIONS); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/storagevolxml2xmlin/vol-file-iso.xml b/tests/storagevolxml2xmlin/vol-file-iso.xml new file mode 100644 index 0000000..b1f0756 --- /dev/null +++ b/tests/storagevolxml2xmlin/vol-file-iso.xml @@ -0,0 +1,10 @@ +<volume> + <name>test.iso</name> + <source/> + <capacity unit="MiB">1</capacity> + <allocation unit="MiB">1</allocation> + <target> + <format type='iso'/> + <path>/var/lib/libvirt/images/test.iso</path> + </target> +</volume> diff --git a/tests/storagevolxml2xmlout/vol-file-iso.xml b/tests/storagevolxml2xmlout/vol-file-iso.xml new file mode 100644 index 0000000..9783124 --- /dev/null +++ b/tests/storagevolxml2xmlout/vol-file-iso.xml @@ -0,0 +1,11 @@ +<volume type='file'> + <name>test.iso</name> + <source> + </source> + <capacity unit='bytes'>1048576</capacity> + <allocation unit='bytes'>1048576</allocation> + <target> + <path>/var/lib/libvirt/images/test.iso</path> + <format type='iso'/> + </target> +</volume> diff --git a/tests/storagevolxml2xmltest.c b/tests/storagevolxml2xmltest.c index db82bea..18e8016 100644 --- a/tests/storagevolxml2xmltest.c +++ b/tests/storagevolxml2xmltest.c @@ -100,6 +100,7 @@ mymain(void) DO_TEST("pool-dir", "vol-file"); DO_TEST("pool-dir", "vol-file-naming"); DO_TEST("pool-dir", "vol-file-backing"); + DO_TEST("pool-dir", "vol-file-iso"); DO_TEST("pool-dir", "vol-qcow2"); DO_TEST("pool-dir", "vol-qcow2-1.1"); DO_TEST("pool-dir", "vol-qcow2-lazy"); -- 2.9.3

2 1

[libvirt] [PATCH] Make use of PERF_COUNT_HW_REF_CPU_CYCLES conditional
by Daniel P. Berrange 08 Mar '17

08 Mar '17

The PERF_COUNT_HW_REF_CPU_CYCLES constant is not available on all Linux distros libvirt targets, so its use must be made conditional. Other constant have existed long enough that we can assume they exist, as we don't support very old distros like RHEL-5 any more. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virperf.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virperf.c b/src/util/virperf.c index 49ec258..f64692b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -104,8 +104,14 @@ static struct virPerfEventAttr attrs[] = { .attrType = PERF_TYPE_HARDWARE, .attrConfig = PERF_COUNT_HW_STALLED_CYCLES_BACKEND}, {.type = VIR_PERF_EVENT_REF_CPU_CYCLES, +# ifdef PERF_COUNT_HW_REF_CPU_CYCLES .attrType = PERF_TYPE_HARDWARE, - .attrConfig = PERF_COUNT_HW_REF_CPU_CYCLES}, + .attrConfig = PERF_COUNT_HW_REF_CPU_CYCLES +# else + .attrType = 0, + .attrConfig = 0, +# endif + }, }; typedef struct virPerfEventAttr *virPerfEventAttrPtr; -- 2.9.3

2 2