- Devel - libvirt List Archives

[libvirt] [PATCH] build: package .pc files for mingw64
by Eric Blake 10 Jul '14

10 Jul '14

Commit 65d8c92a fixed the mingw spec file for 32-bit builds, but forgot to make the adjustment for 64-bit builds: Checking for unpackaged file(s): /usr/lib/rpm/check-files /home/eblake/rpmbuild/BUILDROOT/mingw-libvirt-1.2.7-1.fc20.eblake1404944503.x86_64 error: Installed (but unpackaged) file(s) found: /usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/libvirt-lxc.pc /usr/x86_64-w64-mingw32/sys-root/mingw/lib/pkgconfig/libvirt-qemu.pc * mingw-libvirt.spec.in (%files): List missing .pc files. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule, since I detected it via ./autobuild.sh. Also backporting to v1.2.6-maint. mingw-libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index a555f9c..a1e58cb 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -258,6 +258,8 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh %{mingw64_libdir}/libvirt.dll.a %{mingw64_libdir}/pkgconfig/libvirt.pc +%{mingw64_libdir}/pkgconfig/libvirt-qemu.pc +%{mingw64_libdir}/pkgconfig/libvirt-lxc.pc %{mingw64_libdir}/libvirt-lxc.dll.a %{mingw64_libdir}/libvirt-qemu.dll.a -- 1.9.3

1 0

[libvirt] [PATCH] build: fix gnulib build for mingw
by Eric Blake 10 Jul '14

10 Jul '14

Pavel flagged a build regression under mingw, and traced it to a recent flaw in gnulib for working around nl_langinfo. This picks up the fix. * gnulib: Update to latest, for mingw build fixes. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule * .gnulib 9d5efe7...2d28074 (2): > nl_langinfo: fix build under mingw > mountlist: do not classify a bind-mounted dir entry as "dummy" .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 9d5efe7..2d28074 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9d5efe7d61e1d96a6d7c97ffa4d21c5e33e9bd30 +Subproject commit 2d280742a9e30088aa169f53353765d5daafe4c0 -- 1.9.3

1 0

[libvirt] [PATCH v3] libxl: add discard support to libxl_device_disk
by Olaf Hering 09 Jul '14

09 Jul '14

Translate libvirt discard settings into libxl-4.5 discard settings. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- v3: passing discard= with old libxl is now a fatal error v2: add cast to switch variable to let compiler check if the code handles all enum values src/libxl/libxl_conf.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 8eeaf82..538cfa4 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -715,6 +715,35 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, return -1; } +static int +libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) +{ + if (!x_disk->readwrite) + return 0; +#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE) + switch ((enum virDomainDiskDiscard)discard) { + case VIR_DOMAIN_DISK_DISCARD_DEFAULT: + case VIR_DOMAIN_DISK_DISCARD_LAST: + break; + case VIR_DOMAIN_DISK_DISCARD_UNMAP: + libxl_defbool_set(&x_disk->discard_enable, true); + break; + case VIR_DOMAIN_DISK_DISCARD_IGNORE: + libxl_defbool_set(&x_disk->discard_enable, false); + break; + } + return 0; +#else + if (discard == VIR_DOMAIN_DISK_DISCARD_DEFAULT) + return 0; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("This version of libxenlight does not support " + "disk 'discard' option passing")); + return -1; +#endif +} + + int libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) { @@ -829,6 +858,8 @@ libxlMakeDisk(virDomainDiskDefPtr l_disk, libxl_device_disk *x_disk) x_disk->removable = 1; x_disk->readwrite = !l_disk->readonly; x_disk->is_cdrom = l_disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ? 1 : 0; + if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) + return -1; /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format = LIBXL_DISK_FORMAT_EMPTY;

2 1

[libvirt] [libvirt-glib] [PATCH v4 0/3] Add API to fetch snapshots
by Timm Bäder 09 Jul '14

09 Jul '14

Argh, sorry about the earlier version, die last mail didn't get through the smtp server. This patchset replaces the old one and includes gvir_domain_fetch_snapshots_async as well as a version of gvir_domain_fetch_snapshots that works with it. Timm Bäder (3): libvirt-gobject-domain: Add _fetch_snapshots libvirt-gobject-domain: Add _get_snapshots GVirDomain: Add async version of _fetch_snapshots libvirt-gobject/libvirt-gobject-domain.c | 164 +++++++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-domain.h | 51 ++++++++++ libvirt-gobject/libvirt-gobject.sym | 5 + 3 files changed, 220 insertions(+) -- 2.0.1

2 10

[libvirt] [PATCH] qemu: don't error out when cgroups don't exist
by Martin Kletzander 09 Jul '14

09 Jul '14

When creating cgroups for vcpu and emulator threads whilst starting a domain, we explicitly skip creating those cgroups in case priv->cgroup is NULL (cgroups not supported) because SetAffinity() serves the same purpose. If the host supports only some cgroups (the ones we need are either unmounted or disabled in qemu.conf), we error out with weird message even though we could continue starting the domain. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1097028 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_cgroup.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 3394c68..0af6ac5 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -949,7 +949,11 @@ qemuSetupCgroupForVcpu(virDomainObjPtr vm) virCgroupFree(&cgroup_vcpu); } - return -1; + if (period || quota) + return -1; + + virResetLastError(); + return 0; } int @@ -1016,7 +1020,11 @@ qemuSetupCgroupForEmulator(virQEMUDriverPtr driver, virCgroupFree(&cgroup_emulator); } - return -1; + if (period || quota) + return -1; + + virResetLastError(); + return 0; } int -- 2.0.0

3 4

[libvirt] [PATCH] check for cfg->spiceTLS earlier in qemuProcessSPICEAllocatePorts
by Ján Tomko 09 Jul '14

09 Jul '14

This saves a few lines of code and catches the error when: <spice autoport ='yes' defaultMode='any' ..> <channel name='main' mode='secure'/> </spice> is specified with spice_tls = 0 in qemu.conf. Instead of this error in qemuBuildGraphicsSPICECommandLine: error: unsupported configuration: spice secure channels set in XML configuration, but TLS port is not provided an error is reported in qemuProcessSPICEAllocatePorts: error: unsupported configuration: Auto allocation of spice TLS port requested but spice TLS is disabled in qemu.conf Inspired by: https://www.redhat.com/archives/libvir-list/2014-June/msg01408.html --- src/qemu/qemu_process.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 570960e..ccc571b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3534,7 +3534,8 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: - needTLSPort = true; + if (cfg->spiceTLS) + needTLSPort = true; needPort = true; break; } @@ -3552,28 +3553,16 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, if (needTLSPort || graphics->data.spice.tlsPort == -1) { if (!cfg->spiceTLS) { - /* log an error and fail if tls was specifically - * requested, or simply ignore (don't allocate a port) - * if we're here due to "defaultMode='any'" - * (aka unspecified). - */ - if ((graphics->data.spice.tlsPort == -1) || - (graphics->data.spice.defaultMode - == VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Auto allocation of spice TLS port requested " - "but spice TLS is disabled in qemu.conf")); - goto error; - } - } else { - /* cfg->spiceTLS *is* in place, so it makes sense to - * allocate a port. - */ - if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) - goto error; - - graphics->data.spice.tlsPort = tlsPort; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Auto allocation of spice TLS port requested " + "but spice TLS is disabled in qemu.conf")); + goto error; } + + if (virPortAllocatorAcquire(driver->remotePorts, &tlsPort) < 0) + goto error; + + graphics->data.spice.tlsPort = tlsPort; } return 0; -- 1.8.5.5

2 1

[libvirt] [PATCH] util: storage: Fix build after 25924dec0f9329d429aadae14e273602307e2214
by Peter Krempa 09 Jul '14

09 Jul '14

The commit referenced above changed function arguments of virStorageFileGetMetadataFromBuf() but didn't tweak the ATTRIBUTE_NONNULL tied to them. This was caught by coverity as it actually obeys them. We disabled them for GCC and thus it didn't show up. Additionally in commit 3ea661deeabadc3c114dfb6f662b9fd17d714a01 I passed NULL to the backingFormat argument which was also marked as nonnull. Use a dummy int's address when the argument isn't supplied so that the code doesn't need to change much. --- src/util/virstoragefile.c | 4 ++++ src/util/virstoragefile.h | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 505b652..de0e27a 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -955,6 +955,10 @@ virStorageFileGetMetadataFromBuf(const char *path, int *backingFormat) { virStorageSourcePtr ret = NULL; + int dummy; + + if (!backingFormat) + backingFormat = &dummy; if (!(ret = virStorageFileMetadataNew(path, format))) return NULL; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 744a6ba..528cfad 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -301,8 +301,7 @@ virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path, size_t len, int format, int *backingFormat) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int virStorageFileChainGetBroken(virStorageSourcePtr chain, char **broken_file); -- 2.0.0

3 4

[libvirt] [PATCH 0/3] Couple of seclabels improvements
by Michal Privoznik 09 Jul '14

09 Jul '14

Yes, the first two patches basically revert 693eac388f1759d. Only the last one fixes a real problem. Michal Privoznik (3): virSecurityLabelDef: substitute 'norelabel' with 'relabel' virSecurityDeviceLabelDef: substitute 'norelabel' with 'relabel' conf: Disallow <seclabel type='none' relabel='yes'/> src/conf/domain_conf.c | 40 +++++++++++++++++++++++----------------- src/security/security_apparmor.c | 10 +++++----- src/security/security_dac.c | 22 +++++++++++----------- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 32 ++++++++++++++------------------ src/util/virseclabel.c | 2 +- src/util/virseclabel.h | 4 ++-- 7 files changed, 57 insertions(+), 55 deletions(-) -- 1.8.5.5

1 3

[libvirt] [PATCHv2] conf: Improve metadata type verification
by Peter Krempa 09 Jul '14

09 Jul '14

Split out checking of invalid metadata type from the switch statement so that we can use the typecasted enum value to allow tracking addition of new items by the compliler. Also avoids two dead-code break statements. --- Version 2: - move the check back to the original function so that we don't break forward compat src/conf/domain_conf.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b80e7cf..fa76eb4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19575,6 +19575,12 @@ virDomainObjGetMetadata(virDomainObjPtr vm, virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, NULL); + if (type >= VIR_DOMAIN_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%d'"), type); + goto cleanup; + } + if (virDomainLiveConfigHelperMethod(caps, xmlopt, vm, &flags, &def) < 0) goto cleanup; @@ -19601,10 +19607,7 @@ virDomainObjGetMetadata(virDomainObjPtr vm, goto cleanup; break; - default: - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("unknown metadata type")); - goto cleanup; + case VIR_DOMAIN_METADATA_LAST: break; } @@ -19630,6 +19633,12 @@ virDomainDefSetMetadata(virDomainDefPtr def, char *tmp; int ret = -1; + if (type >= VIR_DOMAIN_METADATA_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("unknown metadata type '%d'"), type); + goto cleanup; + } + switch ((virDomainMetadataType) type) { case VIR_DOMAIN_METADATA_DESCRIPTION: if (VIR_STRDUP(tmp, metadata) < 0) @@ -19683,10 +19692,7 @@ virDomainDefSetMetadata(virDomainDefPtr def, } break; - default: - virReportError(VIR_ERR_INVALID_ARG, "%s", - _("unknown metadata type")); - goto cleanup; + case VIR_DOMAIN_METADATA_LAST: break; } -- 2.0.0

2 2

[libvirt] [PATCH] virsh: document the possibility of accepting integers for numatune mode
by Martin Kletzander 09 Jul '14

09 Jul '14

According to the code, 'virsh numatune' supports integers for specifying --mode as well as the string definitions "strict", "interleave", and "preferred". However, this possibility was not documented anywhere, so this patch adds it to both the man page and command help. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1085706 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-domain.c | 3 ++- tools/virsh.pod | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b5b9f91..5a17aff 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7823,7 +7823,8 @@ static const vshCmdOptDef opts_numatune[] = { }, {.name = "mode", .type = VSH_OT_DATA, - .help = N_("NUMA mode, one of strict, preferred and interleave") + .help = N_("NUMA mode, one of strict, preferred and interleave \n" + "or a number from the virDomainNumatuneMemMode enum") }, {.name = "nodeset", .type = VSH_OT_DATA, diff --git a/tools/virsh.pod b/tools/virsh.pod index 99d0b74..a5e8406 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1402,9 +1402,11 @@ Set or get a domain's numa parameters, corresponding to the <numatune> element of domain XML. Without flags, the current settings are displayed. -I<mode> can be one of `strict', `interleave' and `preferred'. For a -running domain, the mode can't be changed, and the nodeset can be -changed only if the domain was started with a mode of `strict'. +I<mode> can be one of `strict', `interleave' and `preferred' or any +valid number from the virDomainNumatuneMemMode enum in case the daemon +supports it. For a running domain, the mode can't be changed, and the +nodeset can be changed only if the domain was started with a mode of +`strict'. I<nodeset> is a list of numa nodes used by the host for running the domain. Its syntax is a comma separated list, with '-' for ranges and '^' for -- 2.0.0

2 1