- Devel - libvirt List Archives

[libvirt] virt-manager - applicability
by poma 01 Jun '15

01 Jun '15

Applicability of the changes in configuration is broken, at least to some extent. e.g. Controller USB - USB2 to USB3 and vice versa, etc. $ rpm -q virt-manager virt-manager-1.2.0-1.fc22.noarch $ rpm -q virt-manager virt-manager-1.2.0-1.fc23.noarch However it is resolved upstream. Tested with commit: $ git log -1 commit b02cb7ffa04cf40d66b69cfb4c52b755b90470ed Author: Cole Robinson <crobinso(a)redhat.com> Date: Wed May 20 17:42:45 2015 -0400 delete: Improve dialog sizing and scrolling Drop horizontal scrolling, since with gtk3 hidden scrollbars it might mean users don't realize there's info that is scrolled off. Adjust the default sizing to match that pattern The new release will follow soon?

2 2

[libvirt] [PATCH v2] libxl: load on FreeBSD
by Roman Bogorodskiy 01 Jun '15

01 Jun '15

The libxl tries to check if it's running in dom0 by parsing /proc/xen/capabilities and if that fails it doesn't load. There's no procfs interface in Xen on FreeBSD, so this check always fails. In addition to checking procfs, check if /dev/xen/xenstored, that's enough to check if we're running in dom0 in FreeBSD case. --- src/libxl/libxl_driver.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 12be816..fddafa1 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -74,6 +74,7 @@ VIR_LOG_INIT("libxl.libxl_driver"); #define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr" #define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities" +#define HYPERVISOR_XENSTORED "/dev/xen/xenstored" /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 @@ -427,8 +428,6 @@ static bool libxlDriverShouldLoad(bool privileged) { bool ret = false; - int status; - char *output = NULL; /* Don't load if non-root */ if (!privileged) { @@ -436,24 +435,27 @@ libxlDriverShouldLoad(bool privileged) return ret; } - if (!virFileExists(HYPERVISOR_CAPABILITIES)) { - VIR_INFO("Disabling driver as " HYPERVISOR_CAPABILITIES - " does not exist"); - return ret; - } - /* - * Don't load if not running on a Xen control domain (dom0). It is not - * sufficient to check for the file to exist as any guest can mount - * xenfs to /proc/xen. - */ - status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); - if (status >= 0) - status = strncmp(output, "control_d", 9); - VIR_FREE(output); - if (status) { - VIR_INFO("No Xen capabilities detected, probably not running " - "in a Xen Dom0. Disabling libxenlight driver"); - + if (virFileExists(HYPERVISOR_CAPABILITIES)) { + int status; + char *output = NULL; + /* + * Don't load if not running on a Xen control domain (dom0). It is not + * sufficient to check for the file to exist as any guest can mount + * xenfs to /proc/xen. + */ + status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); + if (status >= 0) + status = strncmp(output, "control_d", 9); + VIR_FREE(output); + if (status) { + VIR_INFO("No Xen capabilities detected, probably not running " + "in a Xen Dom0. Disabling libxenlight driver"); + + return ret; + } + } else if (!virFileExists(HYPERVISOR_XENSTORED)) { + VIR_INFO("Disabling driver as neither " HYPERVISOR_CAPABILITIES + " nor " HYPERVISOR_CAPABILITIES " exist"); return ret; } -- 2.3.7

3 6

[libvirt] [libvirt-glib] gconfig: Don't try to return value from gvir_config_domain_set_memory
by Christophe Fergeau 01 Jun '15

01 Jun '15

gvir_config_domain_set_memory() is a void function, so using g_return_val_if_fail() is not correct. This causes a warning/compilation failure on CentOS CI framework: https://ci.centos.org/view/libvirt-project/job/libvirt-glib-build/systems=l… --- Pushed under the build breaker rule. Christophe libvirt-gconfig/libvirt-gconfig-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 000d4eb..8a6c676 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -462,7 +462,7 @@ void gvir_config_domain_set_memory(GVirConfigDomain *domain, guint64 memory) { GVirConfigObject *node; - g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), 0); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(domain), "memory"); gvir_config_object_set_node_content_uint64(GVIR_CONFIG_OBJECT(node), NULL, memory); -- 2.4.2

1 0

[libvirt] [PATCH v3 0/3] qemu: Deal with panic device on pSeries
by Andrea Bolognani 01 Jun '15

01 Jun '15

Currently, having the <panic> element in a domain XML prevents it from starting on pSeries. The error message in this case is not very accurate, and the first commit improves it. Since the guest firmware provides the same features as the pvpanic device for pSeries guests, the element should be allowed. The second commit implements this change. It being part of the firmware, the <panic> element should actually always be present in the domain XML: the third commit makes sure this is the case. Andrea Bolognani (3): qemu: Improve error message for missing QEMU_CAPS_DEVICE_PANIC. qemu: Allow panic device for pSeries guests qemu: Automatically add <panic> element for pSeries guests. docs/formatdomain.html.in | 8 ++++- src/qemu/qemu_command.c | 34 ++++++++++++++++------ src/qemu/qemu_domain.c | 14 +++++++++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 1 + .../qemuxml2argv-pseries-nvram.xml | 1 + .../qemuxml2argv-pseries-panic-address.xml | 32 ++++++++++++++++++++ .../qemuxml2argv-pseries-panic-missing.args | 7 +++++ .../qemuxml2argv-pseries-panic-missing.xml | 29 ++++++++++++++++++ .../qemuxml2argv-pseries-panic-no-address.args | 7 +++++ .../qemuxml2argv-pseries-panic-no-address.xml | 30 +++++++++++++++++++ tests/qemuxml2argvtest.c | 6 ++++ .../qemuxml2xmlout-pseries-panic-missing.xml | 30 +++++++++++++++++++ tests/qemuxml2xmltest.c | 2 ++ 13 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-address.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic-missing.xml -- 2.1.0

2 5

[libvirt] [v2] storage-pool: API to get/set autostart flag
by Zeeshan Ali (Khattak) 01 Jun '15

01 Jun '15

Add binding for virStoragePoolGetAutostart & virStoragePoolSetAutostart. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 51 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.h | 5 +++ libvirt-gobject/libvirt-gobject.sym | 6 +++ 3 files changed, 62 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index f3eac0d..7f26b1b 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -1048,6 +1048,57 @@ gboolean gvir_storage_pool_delete (GVirStoragePool *pool, return TRUE; } +/** + * gvir_storage_pool_get_autostart: + * @pool: the storage pool + * @err: return location for any #GError + * + * Return value: #True if autostart is enabled, #False otherwise. + */ +gboolean gvir_storage_pool_get_autostart(GVirStoragePool *pool, + GError **err) +{ + int ret; + + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (virStoragePoolGetAutostart(pool->priv->handle, &ret)) { + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to get autostart flag from storage pool"); + } + + return !!ret; +} + +/** + * gvir_storage_pool_set_autostart: + * @pool: the storage pool + * @autostart: Whether or not to autostart + * @err: return location for any #GError + * + * Sets whether or not storage pool @pool is started automatically on boot. + * + * Return value: #TRUE on success, #FALSE otherwise. + */ +gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, + gboolean autostart, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (virStoragePoolSetAutostart(pool->priv->handle, autostart)) { + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to set autostart flag on storage pool"); + return FALSE; + } + + return TRUE; +} + static void gvir_storage_pool_delete_helper(GSimpleAsyncResult *res, GObject *object, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index f8529f0..f7f879c 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -166,6 +166,11 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, GAsyncResult *result, GError **err); +gboolean gvir_storage_pool_get_autostart(GVirStoragePool *pool, + GError **err); +gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, + gboolean autostart, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 927cad9..dcda675 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -265,4 +265,10 @@ LIBVIRT_GOBJECT_0.2.0 { gvir_domain_open_graphics_fd; } LIBVIRT_GOBJECT_0.1.9; +LIBVIRT_GOBJECT_0.2.1 { + global: + gvir_storage_pool_get_autostart; + gvir_storage_pool_set_autostart; +} LIBVIRT_GOBJECT_0.2.0; + # .... define new API here using predicted next version number .... -- 2.1.0

1 0

[libvirt] [libvirt-glib] gconfig: Add precondition checks to some public entry points
by Christophe Fergeau 01 Jun '15

01 Jun '15

It's currently possible to trigger a crash by passing eg NULL to these functions. Better to return a prominent warning to the caller without crashing. --- libvirt-gconfig/libvirt-gconfig-domain.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index 064f307..000d4eb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -258,18 +258,24 @@ void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomain const char *gvir_config_domain_get_name(GVirConfigDomain *domain) { + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), "name"); } const char *gvir_config_domain_get_uuid(GVirConfigDomain *domain) { + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), "uuid"); } const char *gvir_config_domain_get_title(GVirConfigDomain *domain) { + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), "title"); } @@ -281,6 +287,8 @@ const char *gvir_config_domain_get_title(GVirConfigDomain *domain) */ void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name) { + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), "name", name); g_object_notify(G_OBJECT(domain), "name"); @@ -293,6 +301,8 @@ void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name) */ void gvir_config_domain_set_uuid(GVirConfigDomain *domain, const char *uuid) { + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), "uuid", uuid); g_object_notify(G_OBJECT(domain), "uuid"); @@ -308,6 +318,8 @@ void gvir_config_domain_set_uuid(GVirConfigDomain *domain, const char *uuid) */ void gvir_config_domain_set_title(GVirConfigDomain *domain, const char *title) { + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), "title", title); g_object_notify(G_OBJECT(domain), "title"); @@ -315,6 +327,8 @@ void gvir_config_domain_set_title(GVirConfigDomain *domain, const char *title) const char *gvir_config_domain_get_description(GVirConfigDomain *domain) { + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), NULL); + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(domain), "description"); } @@ -327,6 +341,8 @@ const char *gvir_config_domain_get_description(GVirConfigDomain *domain) void gvir_config_domain_set_description(GVirConfigDomain *domain, const char *description) { + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + gvir_config_object_set_node_content(GVIR_CONFIG_OBJECT(domain), "description", description); g_object_notify(G_OBJECT(domain), "description"); @@ -400,6 +416,8 @@ guint64 gvir_config_domain_get_memory(GVirConfigDomain *domain) guint64 unit_base; guint64 memory; + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), 0); + unit = gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(domain), "memory", "unit"); unit_base = get_unit_base(unit, 1024); @@ -421,6 +439,8 @@ guint64 gvir_config_domain_get_current_memory(GVirConfigDomain *domain) guint64 unit_base; guint64 memory; + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), 0); + unit = gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(domain), "currentMemory", "unit"); unit_base = get_unit_base(unit, 1024); @@ -442,6 +462,8 @@ void gvir_config_domain_set_memory(GVirConfigDomain *domain, guint64 memory) { GVirConfigObject *node; + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), 0); + node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(domain), "memory"); gvir_config_object_set_node_content_uint64(GVIR_CONFIG_OBJECT(node), NULL, memory); gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), @@ -468,6 +490,8 @@ void gvir_config_domain_set_current_memory(GVirConfigDomain *domain, { GVirConfigObject *node; + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(domain), "currentMemory"); gvir_config_object_set_node_content_uint64(GVIR_CONFIG_OBJECT(node), NULL, memory); gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(node), @@ -485,6 +509,8 @@ guint64 gvir_config_domain_get_vcpus(GVirConfigDomain *domain) void gvir_config_domain_set_vcpus(GVirConfigDomain *domain, guint64 vcpu_count) { + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + gvir_config_object_set_node_content_uint64(GVIR_CONFIG_OBJECT(domain), "vcpu", vcpu_count); g_object_notify(G_OBJECT(domain), "vcpu"); @@ -530,6 +556,8 @@ void gvir_config_domain_set_features(GVirConfigDomain *domain, GVirConfigObject *features_node; GStrv it; + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + features_node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(domain), "features"); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(features_node)); -- 2.4.2

2 1

[libvirt] [PATCH] parallels: better support of volume based disks in containers
by Maxim Nestratov 01 Jun '15

01 Jun '15

It is possible to attach volumes to containers but since they are added they are reported erroneously as filesystems. It is fixed in this patch. And as soon as bus type has no meaning for containers we always report SATA for such disks. In case a container is created with the only disk based on physical volume we are expected to specify mount point to be able to boot from it, that is done in the patch. Sygned-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- .gnulib | 2 +- src/parallels/parallels_sdk.c | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 10 deletions(-) diff --git a/.gnulib b/.gnulib index 875ec93..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 39c200a..9228bfb 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -452,7 +452,8 @@ prlsdkAddDomainVideoInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) static int prlsdkGetDiskInfo(PRL_HANDLE prldisk, virDomainDiskDefPtr disk, - bool isCdrom) + bool isCdrom, + bool isCt) { char *buf = NULL; PRL_UINT32 buflen = 0; @@ -495,8 +496,13 @@ prlsdkGetDiskInfo(PRL_HANDLE prldisk, if (virDomainDiskSetSource(disk, buf) < 0) goto cleanup; - pret = PrlVmDev_GetIfaceType(prldisk, &ifType); - prlsdkCheckRetGoto(pret, cleanup); + /* Let physical devices added to CT look like SATA disks */ + if (isCt) + ifType = PMS_SATA_DEVICE; + else { + pret = PrlVmDev_GetIfaceType(prldisk, &ifType); + prlsdkCheckRetGoto(pret, cleanup); + } pret = PrlVmDev_GetStackIndex(prldisk, &pos); prlsdkCheckRetGoto(pret, cleanup); @@ -606,10 +612,16 @@ prlsdkAddDomainHardDisksInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) prlsdkCheckRetGoto(pret, error); for (i = 0; i < hddCount; ++i) { + + PRL_UINT32 emulatedType; + pret = PrlVmCfg_GetHardDisk(sdkdom, i, &hdd); prlsdkCheckRetGoto(pret, error); - if (IS_CT(def)) { + pret = PrlVmDev_GetEmulatedType(hdd, &emulatedType); + prlsdkCheckRetGoto(pret, error); + + if (PDT_USE_REAL_DEVICE != emulatedType && IS_CT(def)) { if (VIR_ALLOC(fs) < 0) goto error; @@ -627,7 +639,7 @@ prlsdkAddDomainHardDisksInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) if (!(disk = virDomainDiskDefNew(NULL))) goto error; - if (prlsdkGetDiskInfo(hdd, disk, false) < 0) + if (prlsdkGetDiskInfo(hdd, disk, false, IS_CT(def)) < 0) goto error; if (VIR_APPEND_ELEMENT(def->disks, def->ndisks, disk) < 0) @@ -667,7 +679,7 @@ prlsdkAddDomainOpticalDisksInfo(PRL_HANDLE sdkdom, virDomainDefPtr def) if (!(disk = virDomainDiskDefNew(NULL))) goto error; - if (prlsdkGetDiskInfo(cdrom, disk, true) < 0) + if (prlsdkGetDiskInfo(cdrom, disk, true, IS_CT(def)) < 0) goto error; PrlHandle_Free(cdrom); @@ -2878,7 +2890,10 @@ static int prlsdkDelDisk(PRL_HANDLE sdkdom, int idx) return ret; } -static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootDisk) +static int prlsdkAddDisk(PRL_HANDLE sdkdom, + virDomainDiskDefPtr disk, + bool bootDisk, + bool isCt) { PRL_RESULT pret; PRL_HANDLE sdkdisk = PRL_INVALID_HANDLE; @@ -3039,6 +3054,13 @@ static int prlsdkAddDisk(PRL_HANDLE sdkdom, virDomainDiskDefPtr disk, bool bootD if (prlsdkAddDeviceToBootList(sdkdom, devIndex, devType, 0) < 0) goto cleanup; + + /* If we add physical device as a boot disk to container + * we have to specify mount point for it */ + if (isCt) { + pret = PrlVmDevHd_SetMountPoint(sdkdisk, "/"); + prlsdkCheckRetGoto(pret, cleanup); + } } return 0; @@ -3059,7 +3081,7 @@ prlsdkAttachVolume(virDomainObjPtr dom, virDomainDiskDefPtr disk) if (PRL_FAILED(waitJob(job))) goto cleanup; - ret = prlsdkAddDisk(privdom->sdkdom, disk, false); + ret = prlsdkAddDisk(privdom->sdkdom, disk, false, IS_CT(dom->def)); if (ret == 0) { job = PrlVm_CommitEx(privdom->sdkdom, PVCF_DETACH_HDD_BUNDLE); if (PRL_FAILED(waitJob(job))) { @@ -3282,7 +3304,7 @@ prlsdkDoApplyConfig(virConnectPtr conn, needBoot = false; bootDisk = true; } - if (prlsdkAddDisk(sdkdom, def->disks[i], bootDisk) < 0) + if (prlsdkAddDisk(sdkdom, def->disks[i], bootDisk, IS_CT(def)) < 0) goto error; } -- 2.1.0

3 2

[libvirt] [PATCH] Post-release version bump to 1.2.17
by Daniel P. Berrange 01 Jun '15

01 Jun '15

--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed under trivial rule. NB we might decide to switch to 1.3.0 before next release, so this is just placeholder for now. diff --git a/configure.ac b/configure.ac index 6122fa5..0da3ae8 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.16], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.17], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 2.4.1

1 0

[libvirt] [PATCH python] Include tests in MANIFEST
by Daniel P. Berrange 01 Jun '15

01 Jun '15

The unit tests were missing from the tar.gz archives due to not being listed in the MANIFEST.in file Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index 230baea..b5ba783 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -34,6 +34,8 @@ include MANIFEST include README include sanitytest.py include setup.py +include tests/test_conn.py +include tests/test_domain.py include tox.ini include typewrappers.c include typewrappers.h -- 2.4.1

1 0

[libvirt] [PATCHv2] qemu: fix unsuitable error report when get memory stats
by Wang Yufei 01 Jun '15

01 Jun '15

From: Zhang Bo <oscar.zhangbo(a)huawei.com> when we run the command 'virsh dommemstat xxx', althrough memballoon's model is set 'none' in vm's XML, it still reports an error in libvirtd.log. error : qemuMonitorFindBalloonObjectPath:1042 : internal error: Cannot determine balloon device path Apparently, if we don't set memballoon, we don't need to set balloon device path. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/qemu/qemu_monitor.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f959b74..c72702d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1711,7 +1711,9 @@ qemuMonitorGetMemoryStats(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); if (mon->json) { - ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); + if (mon->vm->def->memballoon && + mon->vm->def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) + ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); mon->ballooninit = true; return qemuMonitorJSONGetMemoryStats(mon, mon->balloonpath, stats, nr_stats); -- 1.7.12.4

2 1

[libvirt] [libvirt-glib] storage-pool: API to get/set autostart flag
by Zeeshan Ali (Khattak) 01 Jun '15

01 Jun '15

Add binding for virStoragePoolGetAutostart & virStoragePoolSetAutostart. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 52 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.h | 5 +++ libvirt-gobject/libvirt-gobject.sym | 6 +++ 3 files changed, 63 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index f3eac0d..e520c6a 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -1048,6 +1048,58 @@ gboolean gvir_storage_pool_delete (GVirStoragePool *pool, return TRUE; } +/** + * gvir_storage_pool_get_autostart: + * @pool: the storage pool + * @err: return location for any #GError + * + * Return value: #True if autostart is enabled, #False otherwise. + */ +gboolean gvir_storage_pool_get_autostart(GVirStoragePool *pool, + GError **err) +{ + gboolean ret = FALSE; + + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), ret); + g_return_val_if_fail(err == NULL || *err == NULL, ret); + + if (virStoragePoolGetAutostart(pool->priv->handle, &ret)) { + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to get autostart flag from storage pool"); + return FALSE; + } + + return ret; +} + +/** + * gvir_storage_pool_set_autostart: + * @pool: the storage pool + * @autostart: New value for autostart flag + * @err: return location for any #GError + * + * Sets whether or not storage pool @pool is started automatically on boot. + * + * Return value: #TRUE on success, #FALSE otherwise. + */ +gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, + gboolean autostart, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (virStoragePoolSetAutostart(pool->priv->handle, autostart)) { + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to set autostart flag on storage pool"); + return FALSE; + } + + return TRUE; +} + static void gvir_storage_pool_delete_helper(GSimpleAsyncResult *res, GObject *object, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index f8529f0..f7f879c 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -166,6 +166,11 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, GAsyncResult *result, GError **err); +gboolean gvir_storage_pool_get_autostart(GVirStoragePool *pool, + GError **err); +gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, + gboolean autostart, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 927cad9..dcda675 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -265,4 +265,10 @@ LIBVIRT_GOBJECT_0.2.0 { gvir_domain_open_graphics_fd; } LIBVIRT_GOBJECT_0.1.9; +LIBVIRT_GOBJECT_0.2.1 { + global: + gvir_storage_pool_get_autostart; + gvir_storage_pool_set_autostart; +} LIBVIRT_GOBJECT_0.2.0; + # .... define new API here using predicted next version number .... -- 2.1.0

2 4

[libvirt] Release of libvirt-1.2.16
by Daniel Veillard 01 Jun '15

01 Jun '15

It's out ! Tagged in git, signed tarball and rpms are in place: ftp://libvirt.org/libvirt/ I also made a libvirt-python-1.2.16 release fund at: ftp://libvirt.org/libvirt/python/ This is a releatively small release, less than 150 commits, maybe the effect of the travels to OpenStack summit this month, also bigger pieces lining up for 1.3.0 planned for next month. There is still a few features, portability patches and tuning for ARM 64, and a fair amount of bug fixes, this should be a relatively safe release (famous last words :-) Features: - Introduce pci-serial (Michal Privoznik) - Introduce virDomainSetUserPassword API (Ján Tomko) - libvirt: Introduce protected key mgmt ops (Tony Krowiak) - add domain vmport feature (Marc-André Lureau) Documentation: - update github project name (Daniel P. Berrange) - formatstorage: Update <permissions> docs (Cole Robinson) - Document new RO repo mirrors (Michal Privoznik) - Document that virNodeGetInfo can return mhz == 0. (Richard W.M. Jones) - fix a small xml error in docs (Luyao Huang) - tests: Fix grammar in comments. (Andrea Bolognani) - add domain vmport feature (Marc-André Lureau) Portability: - qemu: Fix compilation error when enum variable size differs from 'int' (Peter Krempa) - bhyve: fix build with gcc48 (Roman Bogorodskiy) - Add missing XDR_FLAGS (Pavel Fedin) - node_device: fix libvirt build if WITH_HAL is defined (Maxim Nestratov) - util: Avoid shadow of 'ulong' in virMemoryMaxValue (Peter Krempa) - Fix build --without-network (Martin Kletzander) - maint: extend PIE support check (Roman Bogorodskiy) - bhyve: fix bhyvexml2argvtest build with gcc (Roman Bogorodskiy) Bug Fixes: - Allocate priv->vioserialaddrs unconditionally (Ján Tomko) - Properly free the xmlDocPtr when loading pool state (Ján Tomko) - storage: Fix problem with disk backend pool allocation calculation (John Ferlan) - storage: Don't adjust pool alloc/avail values for disk backend (John Ferlan) - virsh: Fix to list online cpus using virsh capabilities (Kothapally Madhu Pavan) - Fix the event name in vshEventTrayChangePrint (Ján Tomko) - Fix shrinking volumes with the delta flag (Ján Tomko) - interface: don't error out if a bond has no interfaces (Lubomir Rintel) - qemu: Limit rtc-reset-reinjection requirement to x86 only. (Andrea Bolognani) - storage_fs: Create directory with UID if needed (Martin Kletzander) - zfs: fix storagepoolxml2xml test (Roman Bogorodskiy) - qemu: Force capabilities cache refresh if libvirtd date is different (John Ferlan) - qemu: Resolve Coverity RESOURCE_LEAK (John Ferlan) - conf: Resolve Coverity NEGATIVE_RETURNS (John Ferlan) - storage: fs: Only force directory permissions if required (Cole Robinson) - parallels: fix possible crash in case of errors in prlsdkLoadDomain (Maxim Nestratov) - virsh: reject negative values for scaled integer (Pavel Hrdina) - network: Resolve Coverity FORWARD_NULL (John Ferlan) - conf: Resolve Coverity FORWARD_NULL (John Ferlan) - storage: Resolve Coverity FORWARD_NULL (John Ferlan) - netdev: fail when setting up an SRIOV VF if PF is offline (Laine Stump) - qemuDomainDetachChrDevice: Fix chardev hot-unplug (Michal Privoznik) - qemuDomainAttachChrDevice: Fix chardev hotplug (Michal Privoznik) - qemu: Log error if domain uses security driver which is not loaded (Erik Skultety) - conf: Restore the XML parser context in virDomainMemoryDefParseXML (Luyao Huang) - conf: Catch memory size overflow earlier (Peter Krempa) - virfile: virDirCreate: Fix ALLOW_EXIST conditional (Cole Robinson) - qemu: Fix numatune nodeset reporting (Martin Kletzander) - xenconfig: fix spice mousemode and copypaste (Jim Fehlig) - xenconfig: fix spicepasswd handling (Jim Fehlig) - node_device: update sriov/iommu info before dumpxml of a device (Laine Stump) - virsh: Fix dommemstat --period option type. (Andrea Bolognani) - qemu: fix exceptions in qemuAssignDeviceControllerAlias (Laine Stump) - qemu: Don't give up on first error in qemuMigrationCancelDriverMirror (Jiri Denemark) - reject out of range memory in SetMemory APIs (Ján Tomko) - qemu: Clear autofil fill flag when pinning iothread (John Ferlan) - virsh: Report an error when cpulist parsing fails (Luyao Huang) - Assign virtio-serial addresses after coldplugging a device (Ján Tomko) - qemu: vnc: error out for invalid port number (Pavel Hrdina) - conf: Remove source host name check for iSCSI (John Ferlan) - qemu: fix double free when RNG cold-plug fails (Luyao Huang) - libvirt-guests: Initialize SYNC_TIME (Michal Privoznik) - conf: Report error for unknown shmem ioeventfd value (Luyao Huang) - qemu: Fix balloon size handling with memory hot(un)plug (Peter Krempa) - conf: Fix up balloon size after removing a memory device from def (Peter Krempa) - caps: Fix regression defaulting to host arch (Cole Robinson) - processSerialChangedEvent: Close agent monitor early (Michal Privoznik) - qemuDomainShutdownFlags: check for domain activeness prior to guest presence (Michal Privoznik) - lxc: don't up the veth interfaces unless explicitly asked to (Lubomir Rintel) - qemu: Resolve Coverity FORWARD_NULL (John Ferlan) - qemu: Resolve Coverity FORWARD_NULL (John Ferlan) - qemu: Resolve Coverity FORWARD_NULL (John Ferlan) - xen: Resolve Coverity FORWARD_NULL (John Ferlan) - qemu: Resolve Coverity FORWARD_NULL (John Ferlan) - qemu: Resolve Coverity IDENTICAL_BRANCHES (John Ferlan) - vbox: Resolve Coverity RESOURCE_LEAK (John Ferlan) - libxl: Resolve Coverity RESOURCE_LEAK (John Ferlan) - conf: Add the cpu duplicate use check for vm numa settings (Luyao Huang) - qemu: Properly rename persistent def after migration (Jiri Denemark) - storage: fs: Don't try to chown directory unless user requested (Cole Robinson) - storage: fs: Don't attempt directory creation if it already exists (Cole Robinson) - storage: fs: Don't overwrite virDirCreate error (Cole Robinson) - virsh: Don't check migrate parameters (Jiri Denemark) - qemu: Forbid unsupported parameters for tunnelled migration (Jiri Denemark) - qemu: fix the vm deadlock when deleting a nonexistent iothread (Luyao Huang) - tools: fix the wrong check when use virsh setvcpus --maximum (Luyao Huang) Improvements: - libxl: support QXL video device (Jim Fehlig) - libxl: support SPICE graphics for HVM domains (Jim Fehlig) - libxl: change reservedVNCPorts to reservedGraphicsPorts (Jim Fehlig) - libxl: populate build_info vfb in separate function (Jim Fehlig) - debug: assure NULLSTR() around all %s args in debug at top of public APIs (Laine Stump) - node_device: more informative error log when device isn't found (Laine Stump) - Simplify allocation check in storageVolResize (Ján Tomko) - parallels: suppress console output from parallels SDK (Maxim Nestratov) - util: make it more robust to calculate timeout value (Zhang Bo) - util: improve the sysinfo element XML format (Luyao Huang) - conf: Avoid formatting empty redirfilter element (Luyao Huang) - maint: update to latest gnulib (Eric Blake) - qemu: Add libvirt version check to refresh capabilities algorithm (John Ferlan) - conf: storage: Don't emit empty <permissions> block (Cole Robinson) - storage: conf: Don't set any default <mode> in the XML (Cole Robinson) - parallels: move up updating parameter in prlsdkLoadDomain (Maxim Nestratov) - zfs: fix storagepoolxml2xml test (Roman Bogorodskiy) - util: better error message after failure to initialize firewall backend (Laine Stump) - interface: allow multiple IPv4 addresses + dhcp on a single interface (Laine Stump) - storage: conf: Don't output owner/group -1 (Cole Robinson) - sysinfo: Fix reports on ARM (Michal Privoznik) - qemu: Implement pci-serial (Michal Privoznik) - qemu: wire up virDomainSetUserPassword (Ján Tomko) - virsh: add set-user-password command (Ján Tomko) - threadpool: Switch to detached threads (Jiri Denemark) - Use virDomainDiskByName where appropriate (Jiri Denemark) - Add wrappers for virDomainDiskIndexBy* (Jiri Denemark) - virDomainNumatuneGetMode: Report if numatune was defined (Michal Privoznik) - Taint domains using cdrom-passthrough (John Ferlan) - virfile: virDirCreate: Drop redundant FORCE_PERMS flag (Cole Robinson) - xenconfig: format spice listenAddr when formating ports (Jim Fehlig) - xenconfig: use local variable for graphics def (Jim Fehlig) - node_device: replace duplicated code in hal and udev backends (Laine Stump) - node_device: new functions to get sriov/iommu info from sysfs (Laine Stump) - node device: prepare node_device_linux_sysfs.c to add more functions (Laine Stump) - nodedev: change if-else if in update_caps to switch (Laine Stump) - conf: make virNodeDevCapData an official type (Laine Stump) - virsh: Improve handling of send-process-signal --pid. (Andrea Bolognani) - virsh: Improve error message on integer value parsing failure. (Andrea Bolognani) - libvirt: tests: test protected key mgmt ops support (Tony Krowiak) - libvirt: qemu: enable/disable protected key management ops (Tony Krowiak) - libxl: provide impl for nodeGetSecurityModel (Jim Fehlig) - qemu: log error when domain has an unsupported IDE controller (Laine Stump) - qemu: clean up qemuBuildCommandline loop that builds controller args (Laine Stump) - qemu: remove test for allowing ide controller in s390, rename usb tests (Laine Stump) - qemu: use controller alias when constructing device/controller args (Laine Stump) - conf: utility to return alias of a controller based on type/index (Laine Stump) - qemu: Keep track of what disks are being migrated (Jiri Denemark) - Move QEMU-only fields from virDomainDiskDef into privateData (Jiri Denemark) - Rename virDomainHasBlockjob as qemuDomainHasBlockjob (Jiri Denemark) - Add privateData to virDomainDiskDef (Jiri Denemark) - Some alignment fixes in lxc_controller and jsontest (Martin Kletzander) - gendispatch: Don't generate long lines (Martin Kletzander) - virnetserver: Remove unnecessary double space (Martin Kletzander) - rpc: Don't mix max_clients and max_workers in PostExecRestart (Martin Kletzander) - conf: Expose iothreadids when delete non sequential iothreadids (John Ferlan) - parallels: remove connection wide wait timeout (Nikolay Shirokovskiy) - qemuMigrationPrepareAny: Drop useless variable @now (zhang bo) - maint: Ignore Vim swap files (Andrea Bolognani) - virSysinfoParseProcessor: Drop useless check for NULL (Michal Privoznik) - libxl: support VNC passwd (Jim Fehlig) - conf: Adjust duplicate source host port check (John Ferlan) - daemon: Suppress logging of VIR_ERR_NO_DOMAIN_METADATA (Peter Krempa) - conf_capabilities: fix wrong indentation (Pavel Hrdina) - XML: escape strings where we should do it (Pavel Hrdina) - qemu: eliminate duplicated code in qemuBuildDriveDevStr() (Laine Stump) - qemu: use qemuDomainMachineIsI440FX() in appropriate place (Laine Stump) - Ignore bridge template names with multiple printf conversions (Ján Tomko) - conf: Always truncate balloon size to maximum memory size (Peter Krempa) - qemu: Convert qemuConnectGetAllDomainStats to use new helpers (Peter Krempa) - conf: Add helper to convert list of virDomains to a list of virDomainObjs (Peter Krempa) - conf: Refactor domain list collection critical section (Peter Krempa) - conf: Rename virDomainObjListFilter type to virDomainObjListACLFilter (Peter Krempa) - conf: Extract code to filter domain list into a separate function (Peter Krempa) - util: Make the virDomainListFree helper more universal (Peter Krempa) - tests: Remove redundant aarch64 tests (Cole Robinson) - qemu: multiqueue for ccw devices (Boris Fiuczynski) - libxl: support soundhw for hvm domains (Jim Fehlig) - libxl: add logrotate config file (Jim Fehlig) - qemu: Implement GIC (Michal Privoznik) - Introduce GIC feature (Michal Privoznik) - polkit: Allow password-less access for 'libvirt' group (Cole Robinson) - storage: fs: Fill in permissions on pool refresh (Cole Robinson) - tests: add machine vmport qemu test (Marc-André Lureau) - qemu: add machine vmport argument (Marc-André Lureau) - qemu: add virQEMUCapsSupportsVmport (Marc-André Lureau) - qemu: move qemuDomainMachineIs{I440FX,Q35} (Marc-André Lureau) - qemu: add QEMU_CAPS_MACHINE_VMPORT_OPT (Marc-André Lureau) - domain/conf: add VIR_DOMAIN_FEATURE_VMPORT (Marc-André Lureau) - virsh: introduce new macros to help check flag requirements (Pavel Hrdina) - qemu: use new macros for setvcpus to check flags and cleanup the code (Pavel Hrdina) - use new macro helpers to check flag requirements (Pavel Hrdina) - use new macro helpers to check exclusive flags (Pavel Hrdina) - internal: introduce macro helpers to check flag requirements (Pavel Hrdina) - internal: introduce macro helpers to reject exclusive flags (Pavel Hrdina) So thanks everybody for your help pulling out this last release of the 1.2 cycle, be it with patches, ideas, reports, reviews ... Enjoy ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] check if console PTY is null before attempting to open
by Shivaprasad G Bhat 31 May '15

31 May '15

Console devices have their pty devices assigned when the qemu is actually started. The libvirt spends considerable amount of time to start the qemu if the guest has multiple passthrough devices. If time is spent during the hostdev preparation, someone attempts to open the console, the libvirt crashes in virChrdevLockFilePath().The patch attempts to fix the crash by adding a check before attempting to open. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1233d8f..fec928f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16278,6 +16278,12 @@ qemuDomainOpenConsole(virDomainPtr dom, goto cleanup; } + if (!(chr->source.data.file.path)) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("PTY device is not yet assigned")); + goto cleanup; + } + /* handle mutually exclusive access to console devices */ ret = virChrdevOpen(priv->devs, &chr->source,

3 2

[libvirt] [PATCH 0/3] Better error reporting of bad IP address ranges
by Laine Stump 29 May '15

29 May '15

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=985653 Laine Stump (3): network: validate DHCP ranges are completely within defined network network: cleanup range loop in networkDnsmasqConfContents util: report all address range errors in virSocketAddrGetRange() src/conf/network_conf.c | 18 +-- src/network/bridge_driver.c | 24 +-- src/util/virsocketaddr.c | 180 ++++++++++++++++++--- src/util/virsocketaddr.h | 6 +- tests/networkxml2xmlupdatein/dhcp-range-10.xml | 1 + tests/networkxml2xmlupdatein/dhcp-range.xml | 2 +- .../dhcp6host-routed-network-another-range.xml | 2 +- .../dhcp6host-routed-network-range.xml | 2 +- tests/networkxml2xmlupdatetest.c | 5 + tests/sockettest.c | 55 ++++--- 10 files changed, 228 insertions(+), 67 deletions(-) create mode 100644 tests/networkxml2xmlupdatein/dhcp-range-10.xml -- 2.1.0

3 6

[libvirt] [PATCH V2 libvirt-python] Fix duplicate entries in AUTHORS
by Jim Fehlig 29 May '15

29 May '15

The generated AUTHORS file contains many duplicates. If an author has N commits, there will be N entries for the author in AUTHORS. Check if an author already exists in the list before appending. While at it, add a .mailmap (derived from libivrt's .mailmap) to futher tidy the generated AUTHORS list. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2: Add .mailmap. I started with libvirt's .mailmap and removed entries where there was no corresponding author in the libvirt-python repo. .mailmap | 16 ++++++++++++++++ setup.py | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..d8ac934 --- /dev/null +++ b/.mailmap @@ -0,0 +1,16 @@ +# 'git shortlog --help' and look for mailmap for the format of each line + +# Email consolidation: +# <Preferred address in AUTHORS> <other alias used by same author> + +<jdenemar(a)redhat.com> <Jiri.Denemark(a)gmail.com> +<jfehlig(a)suse.com> <jfehlig(a)novell.com> +<stefanb(a)us.ibm.com> <stefanb(a)linux.vnet.ibm.com> + +# Name consolidation: +# Preferred author spelling <preferred email> +Alex Jia <ajia(a)redhat.com> +Ján Tomko <jtomko(a)redhat.com> +MATSUDA Daiki <matsudadik(a)intellilink.co.jp> +Serge E. Hallyn <serge.hallyn(a)canonical.com> +Philipp Hahn <hahn(a)univention.de> diff --git a/setup.py b/setup.py index 2571742..7a1964b 100755 --- a/setup.py +++ b/setup.py @@ -176,7 +176,9 @@ class my_sdist(sdist): f = os.popen("git log --pretty=format:'%aN <%aE>'") authors = [] for line in f: - authors.append(" " + line.strip()) + line = " " + line.strip() + if line not in authors: + authors.append(line) authors.sort(key=str.lower) -- 2.3.7

2 2

[libvirt] [PATCH] Allocate priv->vioserialaddrs unconditionally
by Ján Tomko 29 May '15

29 May '15

When attempting to hotplug a virtio-serial console to a domain that had no virtio-serial controllers (not even those that are added by libvirt when some devices need them) at daemon startup, report a user-friendly error: error: Failed to attach device from console.xml error: internal error: no virtio-serial controllers are available instead of crashing the daemon: Process terminating with default action of signal 11 (SIGSEGV): dumping core Access not within mapped region at address 0x8 at 0x531028F: virDomainVirtioSerialAddrNext (domain_addr.c:916) by 0x531028F: virDomainVirtioSerialAddrAssign (domain_addr.c:1029) by 0x1CBF68: qemuDomainAttachChrDevice (qemu_hotplug.c:1565) by 0x1BCD5E: qemuDomainAttachDeviceLive (qemu_driver.c:7997) by 0x1BCD5E: qemuDomainAttachDeviceFlags (qemu_driver.c:8743) Introduced in v1.2.14-30-g5903378. --- src/qemu/qemu_command.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d8ce511..11c6823 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1447,9 +1447,6 @@ qemuDomainAssignVirtioSerialAddresses(virDomainDefPtr def, virDomainVirtioSerialAddrSetPtr addrs = NULL; qemuDomainObjPrivatePtr priv = NULL; - if (virDomainControllerFindByType(def, VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL) == -1) - return 0; - if (!(addrs = virDomainVirtioSerialAddrSetCreate())) goto cleanup; -- 2.3.6

2 1

[libvirt] [PATCH] Properly free the xmlDocPtr when loading pool state
by Ján Tomko 29 May '15

29 May '15

Use xmlFreeDoc instead of plain xmlFree. 4 bytes in 1 blocks are definitely lost in loss record 9 of 1,084 at 0x4C29F80: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x70730D6: xmlStrndup (in /usr/lib64/libxml2.so.2.9.2) by 0x701E3DC: xmlNewDoc (in /usr/lib64/libxml2.so.2.9.2) by 0x70C39F8: xmlSAX2StartDocument (in /usr/lib64/libxml2.so.2.9.2) by 0x7017245: xmlParseDocument (in /usr/lib64/libxml2.so.2.9.2) by 0x7017606: xmlDoRead (in /usr/lib64/libxml2.so.2.9.2) by 0x5309DAD: virXMLParseHelper (virxml.c:742) by 0x5367584: virStoragePoolLoadState (storage_conf.c:1863) --- src/conf/storage_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 7857a5e..df536d4 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1894,7 +1894,7 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools, cleanup: VIR_FREE(stateFile); - xmlFree(xml); + xmlFreeDoc(xml); xmlXPathFreeContext(ctxt); return pool; -- 2.3.6

2 1

[libvirt] Entering freeze for libvirt 1.2.16
by Daniel Veillard 29 May '15

29 May '15

I'm one day late but I have tagged the release candidate 1 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ we have a bit less than 160 commits so far since 1.2.15. I tried it with my usual limited testing and it looks fine, https://ci.centos.org/ seems fine when it comes to libvirt, but please give it a try so we can get potential bugs or portability issues out. I will probably make an rc2 on Friday and push the final release next Monday or Tuesday, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 1

[libvirt] HELP - Virsh migrate issue
by VONDRA Alain 29 May '15

29 May '15

Hi, When I use the Live migration through the oVirt Administration Portal, everything works fine without any errors, but When I want to migrate VMs using the command virsh migrate, it doesn't work at all. The connexion works fine : [root@unc-srv-hyp2 ~]$ virsh -c qemu+ssh://root@unc-srv-hyp1/system Please enter your authentication name: root Please enter your password: Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # hostname unc-srv-hyp1.cfu.local But when I try to live migrate I have the same issue from any of the two hypervisors : [root@unc-srv-hyp1 ~]$ virsh migrate --live unc-cli-xrt qemu+ssh://root@unc-srv-hyp2/system Please enter your authentication name: root Please enter your password: Please enter your authentication name: root Please enter your password: error: Failed to open file '/rhev/data-center/f422de63-8869-41ef-a782-8b0c9ee03c41/d7b9d7cc-f7d6-43c7-ae13-e720951657c9/images/dd4801b5-310c-4bc2-b330- a47ec9bb9870/0d05a0e4-726b-4e6e-b25a-0f85e6c983f3': No such file or directory Have you any ideas to find the answer ? Thanks Alain ________________________________ Alain VONDRA Charg? d'exploitation des Syst?mes d'Information Direction Administrative et Financi?re +33 1 44 39 77 76 UNICEF France 3 rue Duguay Trouin 75006 PARIS www.unicef.fr<http://www.unicef.fr/> <http://www.unicef.fr> <http://www.unicef.fr/> <http://www.unicef.fr/>[cid:urg_nepal_siganture_v2d2f17c]<http://www.unicef.fr> ________________________________ <http://www.unicef.fr>

1 0

[libvirt] [PATCH] virsh: Fix printing of XML for pool-create-as
by John Ferlan 29 May '15

29 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1224088 commit id 'bd00e00e' neglected to add the new adapter source options into the if condition that allowed printing the <source> XML fields. The <adapter type='fc_host'.../> doesn't require other options in order to be complete. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tools/virsh-pool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 4865831..b420fe2 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -284,7 +284,8 @@ vshBuildPoolXML(vshControl *ctl, virBufferAsprintf(&buf, "<pool type='%s'>\n", type); virBufferAdjustIndent(&buf, 2); virBufferAsprintf(&buf, "<name>%s</name>\n", name); - if (srcHost || srcPath || srcDev || srcFormat || srcName) { + if (srcHost || srcPath || srcDev || srcFormat || srcName || + (adapterWwnn && adapterWwpn) || adapterName) { virBufferAddLit(&buf, "<source>\n"); virBufferAdjustIndent(&buf, 2); -- 2.1.0

2 1

[libvirt] [RFC 0/7] Live Migration with Pass-through Devices proposal
by Chen Fan 29 May '15

29 May '15

backgrond: Live migration is one of the most important features of virtualization technology. With regard to recent virtualization techniques, performance of network I/O is critical. Current network I/O virtualization (e.g. Para-virtualized I/O, VMDq) has a significant performance gap with native network I/O. Pass-through network devices have near native performance, however, they have thus far prevented live migration. No existing methods solve the problem of live migration with pass-through devices perfectly. There was an idea to solve the problem in website: https://www.kernel.org/doc/ols/2008/ols2008v2-pages-261-267.pdf Please refer to above document for detailed information. So I think this problem maybe could be solved by using the combination of existing technology. and the following steps are we considering to implement: - before boot VM, we anticipate to specify two NICs for creating bonding device (one plugged and one virtual NIC) in XML. here we can specify the NIC's mac addresses in XML, which could facilitate qemu-guest-agent to find the network interfaces in guest. - when qemu-guest-agent startup in guest it would send a notification to libvirt, then libvirt will call the previous registered initialize callbacks. so through the callback functions, we can create the bonding device according to the XML configuration. and here we use netcf tool which can facilitate to create bonding device easily. - during migration, unplug the passthroughed NIC. then do native migration. - on destination side, check whether need to hotplug new NIC according to specified XML. usually, we use migrate "--xml" command option to specify the destination host NIC mac address to hotplug a new NIC, because source side passthrough NIC mac address is different, then hotplug the deivce according to the destination XML configuration. TODO: 1. when hot add a new NIC in destination side after migration finished, the NIC device need to re-enslave on bonding device in guest. otherwise, it is offline. maybe we should consider bonding driver to support add interfaces dynamically. This is an example on how this might work, so I want to hear some voices about this scenario. Thanks, Chen Chen Fan (7): qemu-agent: add agent init callback when detecting guest setup qemu: add guest init event callback to do the initialize work for guest hostdev: add a 'bond' type element in <hostdev> element qemu-agent: add qemuAgentCreateBond interface hostdev: add parse ip and route for bond configure migrate: hot remove hostdev at perform phase for bond device migrate: add hostdev migrate status to support hostdev migration docs/schemas/basictypes.rng | 6 ++ docs/schemas/domaincommon.rng | 37 ++++++++ src/conf/domain_conf.c | 195 ++++++++++++++++++++++++++++++++++++++--- src/conf/domain_conf.h | 40 +++++++-- src/conf/networkcommon_conf.c | 17 ---- src/conf/networkcommon_conf.h | 17 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_agent.c | 196 +++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_agent.h | 12 +++ src/qemu/qemu_command.c | 3 + src/qemu/qemu_domain.c | 70 +++++++++++++++ src/qemu/qemu_domain.h | 14 +++ src/qemu/qemu_driver.c | 38 ++++++++ src/qemu/qemu_hotplug.c | 8 +- src/qemu/qemu_migration.c | 91 ++++++++++++++++++++ src/qemu/qemu_migration.h | 4 + src/qemu/qemu_process.c | 32 +++++++ src/util/virhostdev.c | 3 + 18 files changed, 745 insertions(+), 39 deletions(-) -- 1.9.3

8 44

[libvirt] Plans for next release
by Daniel Veillard 29 May '15

29 May '15

Hi everybody, if we want to get it by next month, we should probably freeze on Tuesday for an 1.2.16 on June 1st, we 'only' have 137 commits since 1.2.15 but sticking to the monthly release is important. I hope this works for everybody, thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 7

[libvirt] [PATCH libvirt-python] Fix duplicate entries in AUTHORS
by Jim Fehlig 28 May '15

28 May '15

The generated AUTHORS file contains many duplicates. If an author has N commits, there will be N entries for the author in AUTHORS. Check if an author already exists in the list before appending. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2571742..7a1964b 100755 --- a/setup.py +++ b/setup.py @@ -176,7 +176,9 @@ class my_sdist(sdist): f = os.popen("git log --pretty=format:'%aN <%aE>'") authors = [] for line in f: - authors.append(" " + line.strip()) + line = " " + line.strip() + if line not in authors: + authors.append(line) authors.sort(key=str.lower) -- 2.3.7

3 4

[libvirt] [PATCH] debug: assure NULLSTR() around all %s args in debug at top of public APIs
by Laine Stump 28 May '15

28 May '15

There are also a couple that were very uninformatively just logging the value of the pointer rather than the string itself: * the "name" arg to virNodeDeviceLookupByName() * wwnn and wwpn args to virNodeDeviceLookupSCSIHostByWWN() All char*'s that make sense should now have their contents logged rather than the pointer, and all %s args should now be inside NULLSTR(). --- src/libvirt-domain.c | 36 ++++++++++++++++++------------------ src/libvirt-host.c | 6 +++--- src/libvirt-interface.c | 6 +++--- src/libvirt-network.c | 6 +++--- src/libvirt-nodedev.c | 10 +++++----- src/libvirt-nwfilter.c | 6 +++--- src/libvirt-secret.c | 4 ++-- src/libvirt-storage.c | 16 ++++++++-------- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 2edba1a..5907f58 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -167,7 +167,7 @@ virDomainPtr virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -235,7 +235,7 @@ virDomainCreateXMLWithFiles(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { VIR_DEBUG("conn=%p, xmlDesc=%s, nfiles=%u, files=%p, flags=%x", - conn, xmlDesc, nfiles, files, flags); + conn, NULLSTR(xmlDesc), nfiles, files, flags); virResetLastError(); @@ -413,7 +413,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virDomainPtr virDomainLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -955,7 +955,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, int virDomainRestore(virConnectPtr conn, const char *from) { - VIR_DEBUG("conn=%p, from=%s", conn, from); + VIR_DEBUG("conn=%p, from=%s", conn, NULLSTR(from)); virResetLastError(); @@ -1025,7 +1025,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, unsigned int flags) { VIR_DEBUG("conn=%p, from=%s, dxml=%s, flags=%x", - conn, from, NULLSTR(dxml), flags); + conn, NULLSTR(from), NULLSTR(dxml), flags); virResetLastError(); @@ -1089,7 +1089,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, unsigned int flags) { VIR_DEBUG("conn=%p, file=%s, flags=%x", - conn, file, flags); + conn, NULLSTR(file), flags); virResetLastError(); @@ -1162,7 +1162,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, const char *dxml, unsigned int flags) { VIR_DEBUG("conn=%p, file=%s, dxml=%s, flags=%x", - conn, file, dxml, flags); + conn, NULLSTR(file), NULLSTR(dxml), flags); virResetLastError(); @@ -2623,7 +2623,7 @@ virConnectDomainXMLFromNative(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, format=%s, config=%s, flags=%x", - conn, nativeFormat, nativeConfig, flags); + conn, NULLSTR(nativeFormat), NULLSTR(nativeConfig), flags); virResetLastError(); @@ -2673,7 +2673,7 @@ virConnectDomainXMLToNative(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=%x", - conn, nativeFormat, domainXml, flags); + conn, NULLSTR(nativeFormat), NULLSTR(domainXml), flags); virResetLastError(); @@ -4597,7 +4597,7 @@ virDomainMigrateFinish(virConnectPtr dconn, { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " "flags=%lx", dconn, NULLSTR(dname), cookie, cookielen, - uri, flags); + NULLSTR(uri), flags); virResetLastError(); @@ -4639,8 +4639,8 @@ virDomainMigratePrepare2(virConnectPtr dconn, { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p," "flags=%lx, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, - cookie, cookielen, uri_in, uri_out, flags, NULLSTR(dname), - bandwidth, dom_xml); + cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), + bandwidth, NULLSTR(dom_xml)); virResetLastError(); @@ -4681,7 +4681,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " "flags=%lx, retcode=%d", dconn, NULLSTR(dname), cookie, - cookielen, uri, flags, retcode); + cookielen, NULLSTR(uri), flags, retcode); virResetLastError(); @@ -4721,7 +4721,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, { VIR_DEBUG("conn=%p, stream=%p, flags=%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", conn, st, flags, - NULLSTR(dname), bandwidth, dom_xml); + NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); virResetLastError(); @@ -4817,7 +4817,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, VIR_DEBUG("dconn=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " "cookieoutlen=%p, uri_in=%s, uri_out=%p, flags=%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", - dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, + dconn, cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth, dom_xml); virResetLastError(); @@ -4866,7 +4866,7 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, "cookieoutlen=%p, flags=%lx, dname=%s, bandwidth=%lu, " "dom_xml=%s", conn, st, cookiein, cookieinlen, cookieout, cookieoutlen, flags, - NULLSTR(dname), bandwidth, dom_xml); + NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); virResetLastError(); @@ -6377,7 +6377,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, virDomainPtr virDomainDefineXML(virConnectPtr conn, const char *xml) { - VIR_DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, NULLSTR(xml)); virResetLastError(); @@ -6425,7 +6425,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) virDomainPtr virDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 03bee1f..9c88426 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -321,7 +321,7 @@ int virConnectGetMaxVcpus(virConnectPtr conn, const char *type) { - VIR_DEBUG("conn=%p, type=%s", conn, type); + VIR_DEBUG("conn=%p, type=%s", conn, NULLSTR(type)); virResetLastError(); @@ -965,7 +965,7 @@ virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1009,7 +1009,7 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, unsigned int flags) { VIR_DEBUG("conn=%p, arch=%s, models=%p, flags=%x", - conn, arch, models, flags); + conn, NULLSTR(arch), models, flags); virResetLastError(); if (models) diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 4c155ca..3d1a5ff 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -284,7 +284,7 @@ virConnectListDefinedInterfaces(virConnectPtr conn, virInterfacePtr virInterfaceLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -323,7 +323,7 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) virInterfacePtr virInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) { - VIR_DEBUG("conn=%p, macstr=%s", conn, macstr); + VIR_DEBUG("conn=%p, macstr=%s", conn, NULLSTR(macstr)); virResetLastError(); @@ -464,7 +464,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); diff --git a/src/libvirt-network.c b/src/libvirt-network.c index e3a3650..3136f27 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -290,7 +290,7 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, virNetworkPtr virNetworkLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -404,7 +404,7 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virNetworkPtr virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) { - VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, NULLSTR(xmlDesc)); virResetLastError(); @@ -444,7 +444,7 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) virNetworkPtr virNetworkDefineXML(virConnectPtr conn, const char *xml) { - VIR_DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, NULLSTR(xml)); virResetLastError(); diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index b6c6d1e..c1ca575 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -1,7 +1,7 @@ /* * libvirt-nodedev.c: entry points for virNodeDevPtr APIs * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -160,7 +160,7 @@ virNodeListDevices(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%x", - conn, cap, names, maxnames, flags); + conn, NULLSTR(cap), names, maxnames, flags); virResetLastError(); @@ -199,7 +199,7 @@ virNodeListDevices(virConnectPtr conn, virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%p", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -242,7 +242,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, const char *wwpn, unsigned int flags) { - VIR_DEBUG("conn=%p, wwnn=%p, wwpn=%p, flags=%x", conn, wwnn, wwpn, flags); + VIR_DEBUG("conn=%p, wwnn=%s, wwpn=%s, flags=%x", conn, NULLSTR(wwnn), NULLSTR(wwpn), flags); virResetLastError(); @@ -694,7 +694,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index 8bb6fa0..30c7c10 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -1,7 +1,7 @@ /* * libvirt-nwfilter.c: entry points for virNwfilterPtr APIs * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -162,7 +162,7 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) virNWFilterPtr virNWFilterLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -382,7 +382,7 @@ virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) virNWFilterPtr virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) { - VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, NULLSTR(xmlDesc)); virResetLastError(); diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index e77f223..fa306e3 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -1,7 +1,7 @@ /* * libvirt-secret.c: entry points for virSecretPtr APIs * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -336,7 +336,7 @@ virSecretLookupByUsage(virConnectPtr conn, virSecretPtr virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 474f198..66dd9f0 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -364,7 +364,7 @@ virStoragePoolPtr virStoragePoolLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -521,7 +521,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -564,7 +564,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -1290,7 +1290,7 @@ virStorageVolPtr virStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { - VIR_DEBUG("pool=%p, name=%s", pool, name); + VIR_DEBUG("pool=%p, name=%s", pool, NULLSTR(name)); virResetLastError(); @@ -1330,7 +1330,7 @@ virStorageVolPtr virStorageVolLookupByKey(virConnectPtr conn, const char *key) { - VIR_DEBUG("conn=%p, key=%s", conn, key); + VIR_DEBUG("conn=%p, key=%s", conn, NULLSTR(key)); virResetLastError(); @@ -1370,7 +1370,7 @@ virStorageVolPtr virStorageVolLookupByPath(virConnectPtr conn, const char *path) { - VIR_DEBUG("conn=%p, path=%s", conn, path); + VIR_DEBUG("conn=%p, path=%s", conn, NULLSTR(path)); virResetLastError(); @@ -1463,7 +1463,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, xmlDesc, flags); + VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1516,7 +1516,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, unsigned int flags) { VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=%x", - pool, xmlDesc, clonevol, flags); + pool, NULLSTR(xmlDesc), clonevol, flags); virResetLastError(); -- 2.1.0

2 2

[libvirt] [PATCH 0/4] libxl: support SPICE graphics
by Jim Fehlig 28 May '15

28 May '15

This series provides support for SPICE graphics in the libxl driver. The first patch is mostly code movement. The second patch is a trivial name change of a structure member. Patch3 populates the libxl_domain_build_info struct with SPICE info. SPICE isn't as nice without QXL, so patch4 provides support for QXL video device. Jim Fehlig (4): libxl: populate build_info vfb in separate function libxl: change reservedVNCPorts to reservedGraphicsPorts libxl: support SPICE graphics for HVM domains libxl: support QXL video device src/libxl/libxl_conf.c | 150 +++++++++++++++++++++++++++++++++++++---------- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_domain.c | 8 ++- src/libxl/libxl_driver.c | 4 +- 4 files changed, 128 insertions(+), 36 deletions(-) -- 1.8.4.5

3 11

[libvirt] [PATCH v2] virsh: Fix to list online cpus using virsh capabilities
by Kothapally Madhu Pavan 28 May '15

28 May '15

Virsh capabilities will list offline cpus as online when libvirt is compiled with numactl option disabled. This fix will list correct set of online cpus. --- src/nodeinfo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 22df95c..410c9de 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1651,6 +1651,47 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) if (VIR_ALLOC_N(cpus, ncpus) < 0) return -1; +#ifdef __linux__ + { + int cid = 0; + int onlinecpus = nodeinfo.cpus; + + id = 0; + for (s = 0; s < nodeinfo.sockets; s++) { + for (c = 0; c < nodeinfo.cores; c++) { + for (t = 0; t < nodeinfo.threads; t++) { + if (virNodeGetCpuValue(SYSFS_CPU_PATH, id, "online", 1)) { + cpus[cid].id = id; + cpus[cid].socket_id = s; + cpus[cid].core_id = c; + if (!(cpus[cid].siblings = virBitmapNew(ncpus))) + goto error; + ignore_value(virBitmapSetBit(cpus[cid].siblings, id)); + cid++; + } + + id++; + } + } + } + + if (virCapabilitiesAddHostNUMACell(caps, 0, + nodeinfo.memory, + onlinecpus, cpus, + 0, NULL, + 0, NULL) < 0) + goto error; + + return 0; + + error: + for (; cid >= 0; cid--) + virBitmapFree(cpus[cid].siblings); + VIR_FREE(cpus); + return -1; + } +#else + { id = 0; for (s = 0; s < nodeinfo.sockets; s++) { for (c = 0; c < nodeinfo.cores; c++) { @@ -1680,6 +1721,8 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) virBitmapFree(cpus[id].siblings); VIR_FREE(cpus); return -1; + } +#endif } static int

2 1

[libvirt] [PATCH] conf: Ignore panic device on pSeries.
by Andrea Bolognani 28 May '15

28 May '15

The guest firmware already provides the same functionality, so we can just safely drop the <panic/> element from the domain definition. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1182388 --- src/conf/domain_conf.c | 17 +++++++----- .../qemuxml2argv-pseries-panic.args | 7 +++++ .../qemuxml2argv-pseries-panic.xml | 30 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-pseries-panic.xml | 29 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cd36a1..a7d4efa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15478,13 +15478,18 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } if (n > 0) { - virDomainPanicDefPtr panic = - virDomainPanicDefParseXML(nodes[0]); - if (!panic) - goto error; + /* Ignore the panic device on pSeries, as the guest + * firmware already provides the same functionality */ + if (!(ARCH_IS_PPC64(def->os.arch) && + STRPREFIX(def->os.machine, "pseries"))) { + virDomainPanicDefPtr panic = + virDomainPanicDefParseXML(nodes[0]); + if (!panic) + goto error; - def->panic = panic; - VIR_FREE(nodes); + def->panic = panic; + VIR_FREE(nodes); + } } /* analysis of the shmem devices */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args new file mode 100644 index 0000000..30e4b43 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic \ +-nodefconfig -nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \ +-chardev pty,id=charserial0 \ +-device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml new file mode 100644 index 0000000..9312975 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <serial type='pty'> + <target port='0'/> + <address type='spapr-vio'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + <address type='spapr-vio'/> + </console> + <memballoon model='none'/> + <panic/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 97c7fba..5719d70 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1360,6 +1360,8 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("pseries-panic", + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-ide-drive-split", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml new file mode 100644 index 0000000..8980847 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <serial type='pty'> + <target port='0'/> + <address type='spapr-vio'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + <address type='spapr-vio'/> + </console> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b611afd..5db6341 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -534,6 +534,7 @@ mymain(void) DO_TEST("virtio-rng-egd"); DO_TEST("pseries-nvram"); + DO_TEST_DIFFERENT("pseries-panic"); /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); -- 2.1.0

4 7

[libvirt] [PATCH v2 0/3] storage: Fix problem with disk backend pool allocation calculation
by John Ferlan 28 May '15

28 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1224018 v1 here: http://www.redhat.com/archives/libvir-list/2015-May/msg00865.html This series adjusts the patches in order to first revert patches for https://bugzilla.redhat.com/show_bug.cgi?id=1206521 and rework the patch to be specific to/for the disk backend to not update the allocation and available pool values. That removes the need to add 1 for the extended partition leaving only the need to check for whether it's a refresh or create when zeroing out the allocation value while processing the partition data. If this is accepted, bz 1206521 will be moved back to a state to allow qe to recheck the change. John Ferlan (3): Revert "storage: Don't duplicate efforts of backend driver" storage: Don't adjust pool alloc/avail values for disk backend storage: Fix problem with disk backend pool allocation calculation src/storage/storage_backend_disk.c | 7 ++++++- src/storage/storage_driver.c | 35 ++++++++++++++--------------------- 2 files changed, 20 insertions(+), 22 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH] storage: Report error when using metadata prealloc with non-qcow2 volumes
by Erik Skultety 28 May '15

28 May '15

We already report error from backend (virStorageBackendCreateRaw, virStorageBackendCreateBlockFrom), but we should also report the same error (applies to raw formated volumes and block type volumes as well) when creating a volume from a XML, not only from an existing volume. --- src/storage/storage_driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ac4a74a..b519011 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1803,6 +1803,22 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; } + if (flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA) { + if (voldef->target.format == VIR_STORAGE_FILE_RAW) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("metadata preallocation is not supported for " + "raw volumes")); + goto cleanup; + } + + if (voldef->type == VIR_STORAGE_VOL_BLOCK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("metadata preallocation is not supported for " + "block volumes")); + goto cleanup; + } + } + if (virStorageVolCreateXMLEnsureACL(obj->conn, pool->def, voldef) < 0) goto cleanup; -- 1.9.3

1 1

[libvirt] [PATCH 0/3] volume resize fixes
by Ján Tomko 28 May '15

28 May '15

First two patches fix bugs and are applicable for the freeze. Ján Tomko (3): Simplify allocation check in storageVolResize Fix shrinking volumes with the delta flag virsh: make negative values with vol-resize more convenient src/storage/storage_driver.c | 26 +++++++++----------------- tools/virsh-volume.c | 15 ++++++++------- 2 files changed, 17 insertions(+), 24 deletions(-) -- 2.3.6

2 7

[libvirt] [PATCH] Fix the event name in vshEventTrayChangePrint
by Ján Tomko 28 May '15

28 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1206114#c5 Reported by: zhenfeng wang <zhwang(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 91a1ca2..fc4d1fc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12076,7 +12076,7 @@ vshEventTrayChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, if (!data->loop && *data->count) return; vshPrint(data->ctl, - _("event 'disk-change' for domain %s disk %s: %s\n"), + _("event 'tray-change' for domain %s disk %s: %s\n"), virDomainGetName(dom), alias, vshDomainEventTrayChangeToString(reason)); (*data->count)++; -- 2.3.6

1 0

[libvirt] [PATCH] lxc: properly clean up qemu-nbd
by Cédric Bosdonnat 28 May '15

28 May '15

Add the qemu-nbd tasks to the container cgroup to make sure those will be killed when the container is stopped. In order to reliably get the qemu-nbd tasks PIDs, we use /sys/devices/virtual/block/<DEV>/pid as qemu-nbd is daemonizing itself. --- src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virprocess.c | 45 ++++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 2 ++ 4 files changed, 104 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8c50ea2..409bb4f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1973,6 +1973,7 @@ virProcessAbort; virProcessExitWithStatus; virProcessGetAffinity; virProcessGetNamespaces; +virProcessGetPids; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index e144c2d..14d873e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -107,6 +107,9 @@ struct _virLXCController { pid_t initpid; + size_t nnbdpids; + pid_t *nbdpids; + size_t nveths; char **veths; @@ -283,6 +286,8 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl) virObjectUnref(ctrl->server); virLXCControllerFreeFuse(ctrl); + VIR_FREE(ctrl->nbdpids); + virCgroupFree(&ctrl->cgroup); /* This must always be the last thing to be closed */ @@ -471,6 +476,9 @@ static int virLXCControllerSetupNBDDeviceFS(virDomainFSDefPtr fs) return -1; } + /* The NBD device will be cleaned up while the cgroup will end. + * For this we need to remember the qemu-nbd pid and add it to + * the cgroup*/ if (virFileNBDDeviceAssociate(fs->src, fs->format, fs->readonly, @@ -503,6 +511,9 @@ static int virLXCControllerSetupNBDDeviceDisk(virDomainDiskDefPtr disk) return -1; } + /* The NBD device will be cleaned up while the cgroup will end. + * For this we need to remember the qemu-nbd pid and add it to + * the cgroup*/ if (virFileNBDDeviceAssociate(src, format, disk->src->readonly, @@ -525,6 +536,38 @@ static int virLXCControllerSetupNBDDeviceDisk(virDomainDiskDefPtr disk) return 0; } +static int virLXCControllerAppendNBDPids(virLXCControllerPtr ctrl, + const char *dev) +{ + char *pidpath = NULL; + pid_t *pids; + size_t npids; + size_t i; + int ret = -1; + pid_t pid; + + if (!STRPREFIX(dev, "/dev/") || + virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5) < 0) + goto cleanup; + + if (virPidFileReadPath(pidpath, &pid) < 0) + goto cleanup; + + if (virProcessGetPids(pid, &npids, &pids) < 0) + goto cleanup; + + for (i = 0; i < npids; i++) { + if (VIR_APPEND_ELEMENT(ctrl->nbdpids, ctrl->nnbdpids, pids[i]) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(pids); + VIR_FREE(pidpath); + return ret; +} static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) { @@ -570,6 +613,9 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_NBD) { if (virLXCControllerSetupNBDDeviceFS(fs) < 0) goto cleanup; + + if (virLXCControllerAppendNBDPids(ctrl, fs->src) < 0) + goto cleanup; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs driver %s is not supported"), @@ -629,6 +675,9 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) } if (virLXCControllerSetupNBDDeviceDisk(disk) < 0) goto cleanup; + + if (virLXCControllerAppendNBDPids(ctrl, virDomainDiskGetSource(disk)) < 0) + goto cleanup; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk driver %s is not supported"), @@ -781,6 +830,7 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) virBitmapPtr auto_nodeset = NULL; int ret = -1; virBitmapPtr nodeset = NULL; + size_t i; VIR_DEBUG("Setting up cgroup resource limits"); @@ -798,6 +848,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) if (virCgroupAddTask(ctrl->cgroup, getpid()) < 0) goto cleanup; + /* Add all qemu-nbd tasks to the cgroup */ + for (i = 0; i < ctrl->nnbdpids; i++) { + if (virCgroupAddTask(ctrl->cgroup, ctrl->nbdpids[i]) < 0) + goto cleanup; + } + if (virLXCCgroupSetup(ctrl->def, ctrl->cgroup, nodeset) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 7a79970..8b4b32f 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -607,6 +607,51 @@ int virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED, } #endif /* HAVE_SCHED_GETAFFINITY */ +int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) +{ + int ret = -1; + char *taskPath = NULL; + DIR *dir = NULL; + int value; + struct dirent *ent; + + *npids = 0; + *pids = NULL; + + if (virAsprintf(&taskPath, "/proc/%llu/task", + (unsigned long long)pid) < 0) + goto cleanup; + + if (!(dir = opendir(taskPath))) + goto cleanup; + + while ((value = virDirRead(dir, &ent, taskPath)) > 0) { + pid_t tmp_pid; + + /* Skip . and .. */ + if (STRPREFIX(ent->d_name, ".")) + continue; + + if (virStrToLong_i(ent->d_name, NULL, 10, &tmp_pid) < 0) + goto cleanup; + + if (VIR_APPEND_ELEMENT(*pids, *npids, tmp_pid) < 0) + goto cleanup; + } + + if (value < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (!dir) + closedir(dir); + VIR_FREE(taskPath); + if (ret < 0) + VIR_FREE(*pids); + return ret; +} int virProcessGetNamespaces(pid_t pid, size_t *nfdlist, diff --git a/src/util/virprocess.h b/src/util/virprocess.h index c812882..86a633d 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -62,6 +62,8 @@ int virProcessGetAffinity(pid_t pid, virBitmapPtr *map, int maxcpu); +int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids); + int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp); -- 2.1.4

2 1

[libvirt] [PATCH] parallels: suppress console output from parallels SDK
by Maxim Nestratov 28 May '15

28 May '15

It is necessary to have unpolluted screen when connecting to parallels driver via virsh. Otherwise a lot of unexpected output one will get on the console. Signed-off-by: Maxim Nestratov <mnestratov(a)parallels.com> --- src/parallels/parallels_sdk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/parallels/parallels_sdk.c b/src/parallels/parallels_sdk.c index 542e09e..b717ccf 100644 --- a/src/parallels/parallels_sdk.c +++ b/src/parallels/parallels_sdk.c @@ -205,6 +205,9 @@ prlsdkInit(void) { PRL_RESULT ret; + /* Disable console output */ + PrlApi_SwitchConsoleLogging(0); + ret = PrlApi_InitEx(PARALLELS_API_VER, PAM_SERVER, 0, 0); if (PRL_FAILED(ret)) { logPrlError(ret); -- 2.1.0

4 6

[libvirt] [PATCH] node_device: more informative error log when device isn't found
by Laine Stump 28 May '15

28 May '15

In a couple of cases, the node device driver (and the test node device driver which likely copied it) was only logging "Node device not found" when it couldn't find the requested device. This patch changes those cases to log the name (and in the case when it's relevant, the wwnn and wwpn) as well. --- src/node_device/node_device_driver.c | 14 ++++++++++---- src/test/test_driver.c | 8 ++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 34ba1fa..768db7f 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -248,7 +248,9 @@ nodeDeviceLookupByName(virConnectPtr conn, const char *name) nodeDeviceUnlock(); if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + name); goto cleanup; } @@ -597,8 +599,10 @@ nodeDeviceCreateXML(virConnectPtr conn, * we're returning what we get... */ if (dev == NULL) - virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); - + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device for '%s' with matching " + "wwnn '%s' and wwpn '%s'"), + def->name, wwnn, wwpn); cleanup: nodeDeviceUnlock(); virNodeDeviceDefFree(def); @@ -621,7 +625,9 @@ nodeDeviceDestroy(virNodeDevicePtr dev) nodeDeviceUnlock(); if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); goto out; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 038b2b8..d1f0af3 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -5673,7 +5673,9 @@ testNodeDeviceLookupByName(virConnectPtr conn, const char *name) testDriverUnlock(driver); if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + name); goto cleanup; } @@ -5893,7 +5895,9 @@ testNodeDeviceDestroy(virNodeDevicePtr dev) testDriverUnlock(driver); if (!obj) { - virReportError(VIR_ERR_NO_NODE_DEVICE, NULL); + virReportError(VIR_ERR_NO_NODE_DEVICE, + _("no node device with matching name '%s'"), + dev->name); goto out; } -- 2.1.0

2 1

[libvirt] [PATCH] qemu: Only issue the rtc-reset-reinjection QMP command on x86.
by Andrea Bolognani 28 May '15

28 May '15

The command is only defined in QEMU for TARGET_I386, so issuing it on any other architecture can't possibly work. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1211938 --- src/qemu/qemu_driver.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa0acde..743ca6e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18945,7 +18945,10 @@ qemuDomainSetTime(virDomainPtr dom, goto endjob; } - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) { + /* The rtc-reset-reinjection QMP command is only available on x86 */ + if (ARCH_IS_X86(vm->def->os.arch) && + !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_RTC_RESET_REINJECTION)) + { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot set time: qemu doesn't support " "rtc-reset-reinjection command")); @@ -18968,13 +18971,16 @@ qemuDomainSetTime(virDomainPtr dom, goto endjob; } - qemuDomainObjEnterMonitor(driver, vm); - rv = qemuMonitorRTCResetReinjection(priv->mon); - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto endjob; + /* The rtc-reset-reinjection QMP command is only available on x86 */ + if (ARCH_IS_X86(vm->def->os.arch)) { + qemuDomainObjEnterMonitor(driver, vm); + rv = qemuMonitorRTCResetReinjection(priv->mon); + if (qemuDomainObjExitMonitor(driver, vm) < 0) + goto endjob; - if (rv < 0) - goto endjob; + if (rv < 0) + goto endjob; + } ret = 0; -- 2.1.0

3 10

[libvirt] [PATCH 0/2] virsh: Further improve handling of integer options
by Andrea Bolognani 28 May '15

28 May '15

As suggested by Michal: now that we have a generic error message for failures related to the parsing of integer options, it makes sense to perform the corresponding check in a single spot instead of replicating it every time vshCommandOpt*() is used. Andrea Bolognani (2): virsh: Pass vshControl to all vshCommandOpt*() calls. virsh: Move error messages inside vshCommandOpt*() functions. tests/vcpupin | 4 +- tools/virsh-domain-monitor.c | 97 +++--- tools/virsh-domain.c | 696 +++++++++++++++++++------------------------ tools/virsh-host.c | 87 ++---- tools/virsh-interface.c | 18 +- tools/virsh-network.c | 38 ++- tools/virsh-nodedev.c | 6 +- tools/virsh-pool.c | 26 +- tools/virsh-secret.c | 8 +- tools/virsh-snapshot.c | 88 +++--- tools/virsh-volume.c | 50 ++-- tools/virsh.c | 195 ++++++------ tools/virsh.h | 77 ++--- 13 files changed, 624 insertions(+), 766 deletions(-) -- 2.1.0

3 13

[libvirt] [PATCH libvirt] interface: don't error out if a bond has no interfaces
by Lubomir Rintel 27 May '15

27 May '15

It's not a problem at all and causes virt-manager to break down. Note: netcf 0.2.8 generates invalid XML for a bond with no interfaces anyway, so this error is in fact not reached as we fail earlier. Fix submitted upstream. Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- src/conf/interface_conf.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index c2eb945..29769ac 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -553,19 +553,15 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, nbItf = virXPathNodeSet("./interface", ctxt, &interfaces); if (nbItf < 0) { ret = -1; - goto error; + goto cleanup; } - if (nbItf == 0) { - virReportError(VIR_ERR_XML_ERROR, - "%s", _("bond has no interfaces")); - ret = -1; - goto error; - } + if (nbItf == 0) + goto cleanup; if (VIR_ALLOC_N(def->data.bond.itf, nbItf) < 0) { ret = -1; - goto error; + goto cleanup; } def->data.bond.nbItf = nbItf; @@ -575,12 +571,12 @@ virInterfaceDefParseBondItfs(virInterfaceDefPtr def, if (itf == NULL) { ret = -1; def->data.bond.nbItf = i; - goto error; + goto cleanup; } def->data.bond.itf[i] = itf; } - error: + cleanup: VIR_FREE(interfaces); ctxt->node = bond; return ret; -- 2.4.1

2 1

[libvirt] [PATCHv3] util: make it more robust to calculate timeout value
by Wang Yufei 27 May '15

27 May '15

From: Zhang Bo <oscar.zhangbo(a)huawei.com> When we change system clock to years ago, a certain CPU may use up 100% cputime. The reason is that in function virEventPollCalculateTimeout(), we assign the unsigned long long result to an INT variable, *timeout = then - now; // timeout is INT, and then/now are long long if (*timeout < 0) *timeout = 0; there's a chance that variable @then minus variable @now may be a very large number that overflows INT value expression, then *timeout will be negative and be assigned to 0. Next the 'poll' in function virEventPollRunOnce() will get into an 'endless' while loop there. thus, the cpu that virEventPollRunOnce() thread runs on will go up to 100%. Although as we discussed before in https://www.redhat.com/archives/libvir-list/2015-May/msg00400.html it should be prohibited to set-time while other applications are running, but it does seems to have no harm to make the codes more robust. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/vireventpoll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index ffda206..4e4f407 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -357,9 +357,10 @@ static int virEventPollCalculateTimeout(int *timeout) return -1; EVENT_DEBUG("Schedule timeout then=%llu now=%llu", then, now); - *timeout = then - now; - if (*timeout < 0) + if (then <= now) *timeout = 0; + else + *timeout = ((then-now) > INT_MAX) ? INT_MAX : (then-now); } else { *timeout = -1; } -- 1.7.12.4

2 2

[libvirt] [PATCH] storage_fs: Create directory with UID if needed
by Martin Kletzander 27 May '15

27 May '15

The code already exists there, it just modified different flags. I just noticed this when looking at the code. This patch is better to view with bigger context or '-W'. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/storage/storage_backend_fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index bcbbb3ae252a..5dc712925b27 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1,7 +1,7 @@ /* * storage_backend_fs.c: storage backend for FS and directory handling * - * Copyright (C) 2007-2014 Red Hat, Inc. + * Copyright (C) 2007-2015 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -807,7 +807,7 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, (needs_create_as_uid || !virFileExists(pool->def->target.path))) mode = VIR_STORAGE_DEFAULT_POOL_PERM_MODE; if (needs_create_as_uid) - flags |= VIR_DIR_CREATE_AS_UID; + dir_create_flags |= VIR_DIR_CREATE_AS_UID; /* Now create the final dir in the path with the uid/gid/mode * requested in the config. If the dir already exists, just set -- 2.4.1

3 2

[libvirt] [PATCH] zfs: fix storagepoolxml2xml test
by Roman Bogorodskiy 27 May '15

27 May '15

Commit 7c2d65d dropped setting default mode. Update zfs tests accordingly. --- tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml | 3 --- tests/storagepoolxml2xmlout/pool-zfs.xml | 3 --- 2 files changed, 6 deletions(-) diff --git a/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml b/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml index 89dcdbf..8d9be73 100644 --- a/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml +++ b/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml @@ -10,8 +10,5 @@ </source> <target> <path>/dev/zvol/testpool</path> - <permissions> - <mode>0755</mode> - </permissions> </target> </pool> diff --git a/tests/storagepoolxml2xmlout/pool-zfs.xml b/tests/storagepoolxml2xmlout/pool-zfs.xml index c9e5df9..1a8de4f 100644 --- a/tests/storagepoolxml2xmlout/pool-zfs.xml +++ b/tests/storagepoolxml2xmlout/pool-zfs.xml @@ -9,8 +9,5 @@ </source> <target> <path>/dev/zvol/testpool</path> - <permissions> - <mode>0755</mode> - </permissions> </target> </pool> -- 2.3.5

2 2

[libvirt] Libvirt now using Zanata for translation
by Daniel P. Berrange 27 May '15

27 May '15

As of current GIT master, libvirt is fully using Zanata for po file translation After some trouble with the zanata python client, I have now successfully refreshed & pushed the current libvirt.pot file, and synchronized all the translation po files back down to GIT master. For ongoing refreshes of the libvirt.pot, it can be rebuild & pushed to zanata and .po files resynchonized using # cd po # rm libvirt.pot # make libvirt.pot # zanata-cli push # zanata-cli pull Where 'zanata-cli' is the *JAVA* client, not the python client. I strongly recommend against use of the python client for the libvirt project as it doesn't handle the size of the libvirt.pot/.po files well resulting in unexplained data loss. Even the java client has problems pushing the .po files to the server due to poorly designed rate limiting in the zanata server. Fortunately this is not something we need do again, now we have imported the existing .po file. The java client has been troublefree wrt to pushing the .pot file and pulling .po files, which is all we need for ongoing work now. Currently myself & Daniel Veillard are setup as admins of the libvirt project in Zanata & we can add further people as required. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 5

[libvirt] [PATCH] util: improve the sysinfo element XML format
by Luyao Huang 27 May '15

27 May '15

When set sysinfo element without sub-elements, libvirt will format it as: <sysinfo type='smbios'> </sysinfo> After improve the format: <sysinfo type='smbios'/> Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/util/virsysinfo.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 8bb17f0..f87376f 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -1041,31 +1041,42 @@ virSysinfoMemoryFormat(virBufferPtr buf, virSysinfoDefPtr def) int virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def) { + virBuffer childrenBuf = VIR_BUFFER_INITIALIZER; const char *type = virSysinfoTypeToString(def->type); + int indent = virBufferGetIndent(buf, false); + int ret = -1; if (!type) { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected sysinfo type model %d"), def->type); virBufferFreeAndReset(buf); - return -1; + goto cleanup; } - virBufferAsprintf(buf, "<sysinfo type='%s'>\n", type); - virBufferAdjustIndent(buf, 2); + virBufferAdjustIndent(&childrenBuf, indent + 2); - virSysinfoBIOSFormat(buf, def); - virSysinfoSystemFormat(buf, def); - virSysinfoProcessorFormat(buf, def); - virSysinfoMemoryFormat(buf, def); + virSysinfoBIOSFormat(&childrenBuf, def); + virSysinfoSystemFormat(&childrenBuf, def); + virSysinfoProcessorFormat(&childrenBuf, def); + virSysinfoMemoryFormat(&childrenBuf, def); - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "</sysinfo>\n"); + virBufferAsprintf(buf, "<sysinfo type='%s'", type); + if (virBufferUse(&childrenBuf)) { + virBufferAddLit(buf, ">\n"); + virBufferAddBuffer(buf, &childrenBuf); + virBufferAddLit(buf, "</sysinfo>\n"); + } else { + virBufferAddLit(buf, "/>\n"); + } if (virBufferCheckError(buf) < 0) - return -1; + goto cleanup; - return 0; + ret = 0; + cleanup: + virBufferFreeAndReset(&childrenBuf); + return ret; } bool virSysinfoIsEqual(virSysinfoDefPtr src, -- 1.8.3.1

3 5

[libvirt] [PATCH v2] qemu: Fix compilation error when enum variable size differs from 'int'
by Peter Krempa 27 May '15

27 May '15

Since commit bcd9a564b631aa virDomainNumatuneGetMode returns the value via a pointer rather than in the return value. The change triggered problems with platforms where the compiler decides to use a data type of size different than integer at the point where we typecast it. Work around the issue by using an intermediate variable of the correct type that gets casted back by the default typecasting rules. --- Version 2: - removed block from the case statement - added ignore value section to silence coverity and initialized the temp variable src/qemu/qemu_driver.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa0acde..1233d8f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10524,6 +10524,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, size_t i; virDomainObjPtr vm = NULL; virDomainDefPtr persistentDef = NULL; + virDomainNumatuneMemMode tmpmode = VIR_DOMAIN_NUMATUNE_MEM_STRICT; char *nodeset = NULL; int ret = -1; virCapsPtr caps = NULL; @@ -10567,12 +10568,12 @@ qemuDomainGetNumaParameters(virDomainPtr dom, switch (i) { case 0: /* fill numa mode here */ + ignore_value(virDomainNumatuneGetMode(def->numa, -1, &tmpmode)); + if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_MODE, - VIR_TYPED_PARAM_INT, 0) < 0) + VIR_TYPED_PARAM_INT, tmpmode) < 0) goto cleanup; - virDomainNumatuneGetMode(def->numa, -1, - (virDomainNumatuneMemMode *) &param->value.i); break; case 1: /* fill numa nodeset here */ -- 2.4.1

2 2

[libvirt] [PATCH] conf: improve the address check for dimm type
by Luyao Huang 27 May '15

27 May '15

When hot-plug/cold-plug a memory device, we use memcmp() function to check if there is a memory device have the same address with the memory device we want hot-pluged. But qemu forbid use/hot-plug 2 memory device with same slot *or* the same base(qemu side this elemnt named addr). Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e57425..413f839 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3089,7 +3089,10 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM: - if (memcmp(&a->addr.dimm, &b->addr.dimm, sizeof(a->addr.dimm))) + if (a->addr.dimm.slot != b->addr.dimm.slot && + (a->addr.dimm.base == 0 || + b->addr.dimm.base == 0 || + a->addr.dimm.base != b->addr.dimm.base)) return false; break; } -- 1.8.3.1

3 2

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 26 May '15

26 May '15

Time to update to new gnulib before a release. gcc 5.1 introduced a new -Wformat-signedness, and new gnulib now turns it on by default. However, it is still rather lame at the moment, because it warns for enums, even though there is no way to control the signeness of an enum which does not use any members that are negative or larger than INT_MAX, and even though such an enum would always print the same for both %d and %u: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66249 In file included from ../../src/util/virarch.c:26:0: ../../src/util/virarch.c: In function 'virArchFromHost': ../../src/util/virarch.c:180:15: error: format '%d' expects argument of type 'int', but argument 9 has type 'unsigned int' [-Werror=format=] VIR_DEBUG("Mapped %s to %d (%s)", So this patch turns off the new warning as part of enabling all other new gcc 5.1 warnings that gnulib now enables. * .gnulib: Update to latest, in part for gcc 5.1 interaction. * m4/virt-compile-warnings.m4: Ignore -Wformat-signedness, for now. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- It looks like DV hasn't done the freeze yet, so I'll push this under the gnulib rule. I still have a pending gnulib patch that helps the build under rawhide mingw (where newer gcc broke how older gnulib was probing for whether PRIdMAX was "lld" vs. "I64d"); that may miss the freeze, but my goal in pushing this now is that if it is the only gnulib change post-freeze, then we are minimizing the risk on other platforms by getting the rest picked up now. * .gnulib 106a386...875ec93 (34): > autoupdate > gitlog-to-changelog: parse "Tiny-change" > update from texinfo > doc: document glibc posix_fallocate() issues > gendocs.sh: document new htmlarg default > extern-inline: no need for workaround in GCC 5.1 > update from texinfo > eealloc, pagealign_alloc, xalloc: avoid clang warnings > tests: pacify GCC 5.1's stricter printf checking > fts: port to GCC 5.1 with --enable-gcc-warnings > file-has-acl: port to CentOS 6 > file-has-acl: always return false when ACLs aren't supported > gettext: propagate po/Makefile.in.in too > file-has-acl: new module, split from acl > manywarnings: add GCC 5.1 warnings > autoupdate > doc: update FDL template to match FDL examples. > lstat: fix cross-compilation 'ln -s' problem > gendocs.sh: default to a common CSS style sheet for HTML output > gnulib-tool: output bold attribute more portably > qacl: Simplify HP-UX acl_nontrivial check > acl: On Linux, check for acls without libacl > acl, qacl: split off shared functions into separate object file > git-version-gen: revert "detect untagged revisions" > tempname: avoid unused parameter warnings > git-version-gen: detect untagged revisions > fseeko: fix build failure on NetBSD >= 6 > gitlog-to-changelog: port to MS-Windows > gendocs: new option --tex for texi2dvi options > sync gettext .m4 files from gettext > uniname/uniname-tests: fix failure due to alias > hash: remove deprecated hash_insert0 function > mountlist: remove dependency on libmount > stddef: port to pre-C11 GCC on x86 .gnulib | 2 +- m4/virt-compile-warnings.m4 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 106a386..875ec93 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 +Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 8aebdb0..3dd0665 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -59,6 +59,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dontwarn="$dontwarn -Waggregate-return" # gcc 4.4.6 complains this is C++ only; gcc 4.7.0 implies this from -Wall dontwarn="$dontwarn -Wenum-compare" + # gcc 5.1 -Wformat-signedness mishandles enums, not ready for prime time + dontwarn="$dontwarn -Wformat-signedness" # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), # which triggers spurious warnings for our usage -- 2.1.0

1 0

[libvirt] ANNOUNCE: virt-manager 1.2.0 released
by Cole Robinson 26 May '15

26 May '15

I'm happy to announce the release of virt-manager 1.2.0! 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/ The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-1.2.0.ta… This release includes: - OVMF/AAVMF Support (Laszlo Ersek, Giuseppe Scrivano, Cole Robinson) - Improved support for AArch64 qemu/kvm - virt-install: Support --disk type=network parameters - virt-install: Make --disk just work - virt-install: Add --disk sgio= option (Giuseppe Scrivano) - addhardware: default to an existing bus when adding a new disk (Giuseppe Scrivano) - virt-install: Add --input device option - virt-manager: Unify storagebrowser and storage details functionality - virt-manager: allow setting a custom connection row name - virt-install: Support --hostdev scsi passthrough - virt-install: Fill in a bunch of --graphics spice options - Disable spice image compression for new local VMs - virt-manager: big reworking of the migration dialog Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

2 2

[libvirt] [PATCH] Allow PCI virtio on ARM "virt" machine
by Pavel Fedin 26 May '15

26 May '15

Virt machine in qemu has PCI generic host controller, and can use PCI devices. This provides performance improvement as well as vhost-net with irqfd support for virtio-net. However libvirt still insists on virtio devices attached to Virt machine to have MMIO bindings. This patch allows to use both. If the user doesn't specify <address type='virtio-mmio'>, PCI will be used by default. "virt-" prefix is intentionally ignored in third chunk because it is a temporary thing and qemu developers agreed to use "gic version" option, for which there is already support in libvirt. --- src/qemu/qemu_command.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 81e89fc..0580a37 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -457,7 +457,7 @@ qemuDomainSupportsNicdev(virDomainDefPtr def, /* non-virtio ARM nics require legacy -net nic */ if (((def->os.arch == VIR_ARCH_ARMV7L) || (def->os.arch == VIR_ARCH_AARCH64)) && - net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) + strcmp(net->model, "virtio")) return false; return true; @@ -1374,9 +1374,7 @@ qemuDomainAssignARMVirtioMMIOAddresses(virDomainDefPtr def, { if (((def->os.arch == VIR_ARCH_ARMV7L) || (def->os.arch == VIR_ARCH_AARCH64)) && - (STRPREFIX(def->os.machine, "vexpress-") || - STREQ(def->os.machine, "virt") || - STRPREFIX(def->os.machine, "virt-")) && + STRPREFIX(def->os.machine, "vexpress-") && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_MMIO)) { qemuDomainPrimeVirtioDeviceAddresses( def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO); @@ -2501,6 +2499,12 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) continue; + if (((def->os.arch == VIR_ARCH_ARMV7L) || + (def->os.arch == VIR_ARCH_AARCH64)) && + STREQ(def->os.machine, "virt") && + def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) + continue; + if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("virtio disk cannot have an address of type '%s'"), -- 1.9.5.msysgit.0

2 3

[libvirt] [PATCH 0/2] Adjust refresh capabilities cache algorithm
by John Ferlan 26 May '15

26 May '15

Based on RFC posted and discussion therein: http://www.redhat.com/archives/libvir-list/2015-May/msg00655.html Threw away 1/2 from the RFC, but kept 2/2 since that seemed to be generally acceptible - even if it's still not clear the exact steps taken in order to create the problem. So 2/2 becomes 1/2 here. Added in a new 2/2 which adds LIBVIR_VERSION_NUMBER as a variable in the decision process for whether to refresh the cache. The theory behind this is if there's any oddities with time algorithms and time changes perhaps affecting 'ctime' - at least if the version is different in the cache file than determined for the running libvirtd, then we'll refresh that cache file. John Ferlan (2): qemu: Force capabilities cache refresh if libvirtd date is different qemu: Add libvirt version check to refresh capabilities algorithm src/qemu/qemu_capabilities.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) -- 2.1.0

3 6

[libvirt] [PATCH 0/8 v2] parallels: add vz driver
by Maxim Nestratov 26 May '15

26 May '15

v1-v2 change: * Only "parallels: accept vz as a driver uri and name" patch is changed. Fixed ability to connect to 'parallels' driver and deal with 'Paralells' domain virt type. Maxim Nestratov (8): parallels: introduce vz driver constant and string parallels: use newly introduced VIR_DOMAIN_VIRT_VZ parallels: add new guest capabilities assigned to vz driver parallels: accept vz as a driver uri and name parallels: add a new vz connection driver and hypervisor structures parallels: increment the number of connection drivers parallels: recommend to connect to vz:///system when connection fails parallels: set VIR_DOMAIN_VIRT_VZ virtType for new domains src/conf/domain_conf.c | 19 ++++++++---- src/conf/domain_conf.h | 1 + src/libvirt.c | 2 +- src/parallels/parallels_driver.c | 61 +++++++++++++++++++++++++++++++++++---- src/parallels/parallels_network.c | 3 +- src/parallels/parallels_sdk.c | 2 +- src/parallels/parallels_storage.c | 3 +- 7 files changed, 75 insertions(+), 16 deletions(-) -- 2.1.0

1 8

[libvirt] [PATCH] po: fix translation error for "caller" in zh_CN.po
by zhang bo 26 May '15

26 May '15

IME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit caller should be translated to "璋冪敤绋嬪簭" rather than "璋冨害绋嬪簭", which in fact refers to "scheduler" in English. --- po/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index f5c7cf1..38cf6a9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20800,12 +20800,12 @@ msgstr "瀹夊叏 doi 瓒呰繃鏈€澶ч暱搴︼細%zu" #: src/remote/remote_driver.c:2639 msgid "caller ignores cookie or cookielen" -msgstr "璋冨害绋嬪簭蹇界暐 cookie 鎴栬€?cookielen" +msgstr "璋冪敤绋嬪簭蹇界暐 cookie 鎴栬€?cookielen" #: src/remote/remote_driver.c:2648 src/remote/remote_driver.c:6106 #: src/remote/remote_driver.c:7136 msgid "caller ignores uri_out" -msgstr "璋冨害绋嬪簭蹇界暐 uri_out" +msgstr "璋冪敤绋嬪簭蹇界暐 uri_out" #: src/remote/remote_driver.c:2781 #, c-format @@ -20892,7 +20892,7 @@ msgstr "鏃?internalFlags 鏀寔" #: src/remote/remote_driver.c:7127 src/remote/remote_driver.c:7225 #: src/remote/remote_driver.c:7297 src/remote/remote_driver.c:7370 msgid "caller ignores cookieout or cookieoutlen" -msgstr "鍡茬敤绋嬪簭蹇界暐 cookieout 鎴栬€?cookieoutlen" +msgstr "璋冪敤绋嬪簭蹇界暐 cookieout 鎴栬€?cookieoutlen" #: src/remote/remote_driver.c:6386 #, c-format @@ -25090,7 +25090,7 @@ msgstr "鍦?Win32 骞冲彴涓儴鏀寔鎵ц鏂拌繘绋? #: src/util/vircommand.c:2224 msgid "cannot mix caller fds with blocking execution" -msgstr "鏃犳硶灏嗚皟搴︾▼搴?fd 涓庨樆姝㈡墽琛屾贩鍚? +msgstr "鏃犳硶灏嗚皟鐢ㄧ▼搴?fd 涓庨樆姝㈡墽琛屾贩鍚? #: src/util/vircommand.c:2230 msgid "cannot mix string I/O with daemon" -- 1.7.12.4

2 6

[libvirt] [RFC PATCH] threshold: new API virDomainBlockSetWriteThreshold
by Eric Blake 26 May '15

26 May '15

qemu 2.3 added a new QMP command block-set-write-threshold, which allows callers to get an interrupt when a file hits a write threshold, rather than the current approach of repeatedly polling for file allocation. This patch prepares the API for callers to register to receive the event, as well as a way to query the threshold. The event is one-shot in qemu - a guest must re-register a new threshold after each time it triggers. However, the virConnectDomainEventRegisterAny() call does not allow parameterization, so callers must use a pair of APIs - one to register the callback (one-time call), and another to repeatedly set the desired threshold (repeated each time a threshold changes). Note that the threshold is registered as a double, but reported as an unsigned long long. This is intentional, as it allows the use of a flag for registering a threshold via a percentage, but once registered, the threshold is normalized according to the current size of the disk. To make the patch series more digestible, this patch intentionally omits remote support, by using a couple of placeholders at a point where the compiler forces the addition of a case within a switch statement. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Posting now to get feedback on the proposed API, before the actual implementation is complete. daemon/remote.c | 2 + include/libvirt/libvirt-domain.h | 48 +++++++++++++++++++ src/conf/domain_event.c | 4 +- src/driver-hypervisor.h | 7 +++ src/libvirt-domain.c | 101 +++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + tools/virsh-domain.c | 23 +++++++++ tools/virsh.pod | 1 + 8 files changed, 186 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index e259a76..51d7de5 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1102,6 +1102,8 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventTunable), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventAgentLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceAdded), + /* TODO: Implement RPC support for this */ + VIR_DOMAIN_EVENT_CALLBACK(NULL), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index d851225..0c4fd62 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -515,6 +515,15 @@ typedef virDomainBlockStatsStruct *virDomainBlockStatsPtr; # define VIR_DOMAIN_BLOCK_STATS_ERRS "errs" /** + * VIR_DOMAIN_BLOCK_STATS_WRITE_THRESHOLD: + * + * Macro represents the typed parameter, as an llong, that reports + * the threshold in bytes at which the block device will trigger a + * VIR_DOMAIN_EVENT_ID_WRITE_THRESHOLD, or 0 if no threshold is registered. + */ +# define VIR_DOMAIN_BLOCK_STATS_WRITE_THRESHOLD "write-threshold" + +/** * virDomainInterfaceStats: * * Network interface stats for virDomainInterfaceStats. @@ -1297,6 +1306,16 @@ int virDomainBlockStatsFlags (virDomainPtr dom, virTypedParameterPtr params, int *nparams, unsigned int flags); + +typedef enum { + /* threshold is a percentage rather than byte limit */ + VIR_DOMAIN_BLOCK_SET_WRITE_THRESHOLD_PERCENTAGE = (1 << 0), +} virDomainBlockSetWriteThresholdFlags; +int virDomainBlockSetWriteThreshold(virDomainPtr dom, + const char *disk, + double threshold, + unsigned int flags); + int virDomainInterfaceStats (virDomainPtr dom, const char *path, virDomainInterfaceStatsPtr stats, @@ -3246,6 +3265,34 @@ typedef void (*virConnectDomainEventDeviceAddedCallback)(virConnectPtr conn, void *opaque); /** + * virConnectDomainEventWriteThresholdCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @devAlias: device alias + * @threshold: threshold that was exceeded, in bytes + * @length: length beyond @threshold that was involved in the triggering write + * @opaque: application specified data + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_WRITE_THRESHOLD with virConnectDomainEventRegisterAny() + * + * This callback occurs when a block device detects a write event that + * exceeds a non-zero threshold set by + * virDomainBlockSetWriteThreshold(). When this event occurs, the + * threshold is reset to 0, and a new limit must be installed to see + * the event again on the same device. The intent of this event is to + * allow time for the underlying storage to be resized dynamically + * prior to the point where the guest would be paused due to running + * out of space, without having to poll for allocation values. + */ +typedef void (*virConnectDomainEventWriteThresholdCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *devAlias, + unsigned long long threshold, + unsigned long long length, + void *opaque); + +/** * VIR_DOMAIN_TUNABLE_CPU_VCPUPIN: * * Macro represents formatted pinning for one vcpu specified by id which is @@ -3528,6 +3575,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_TUNABLE = 17, /* virConnectDomainEventTunableCallback */ VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE = 18,/* virConnectDomainEventAgentLifecycleCallback */ VIR_DOMAIN_EVENT_ID_DEVICE_ADDED = 19, /* virConnectDomainEventDeviceAddedCallback */ + VIR_DOMAIN_EVENT_ID_WRITE_THRESHOLD = 20, /* virConnectDomainEventWriteThreshold */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 20d66e1..c43799f 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -1,7 +1,7 @@ /* * domain_event.c: domain event queue processing helpers * - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2008 VirtualIron * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * @@ -1614,6 +1614,8 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; } + case VIR_DOMAIN_EVENT_ID_WRITE_THRESHOLD: + /* TODO: Implement RPC support for this */ case VIR_DOMAIN_EVENT_ID_LAST: break; } diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 3275343..81b80d3 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -484,6 +484,12 @@ typedef int unsigned int flags); typedef int +(*virDrvDomainBlockSetWriteThreshold)(virDomainPtr domain, + const char *disk, + double threshold, + unsigned int flags); + +typedef int (*virDrvDomainInterfaceStats)(virDomainPtr domain, const char *path, virDomainInterfaceStatsPtr stats); @@ -1324,6 +1330,7 @@ struct _virHypervisorDriver { virDrvDomainBlockResize domainBlockResize; virDrvDomainBlockStats domainBlockStats; virDrvDomainBlockStatsFlags domainBlockStatsFlags; + virDrvDomainBlockSetWriteThreshold domainBlockSetWriteThreshold; virDrvDomainInterfaceStats domainInterfaceStats; virDrvDomainSetInterfaceParameters domainSetInterfaceParameters; virDrvDomainGetInterfaceParameters domainGetInterfaceParameters; diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 2edba1a..a211de0 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -5743,6 +5743,105 @@ virDomainBlockStatsFlags(virDomainPtr dom, /** + * virDomainBlockSetWriteThreshold: + * @dom: pointer to domain object + * @disk: path to the block device, or device shorthand + * @threshold: limit at which a write threshold event can trigger + * @flags: bitwise-OR of virDomainBlockSetWriteThresholdFlags + * + * This function is used to set a one-shot write threshold. It should + * be used in tandem with virConnectDomainEventRegisterAny() + * installing a handler for VIR_DOMAIN_EVENT_ID_WRITE_THRESHOLD. If + * the hypervisor detects that a write request (whether guest data, or + * host metadata) would exceed the host byte offset specified in + * @threshold, then an event is raised, and the threshold is reset to + * 0 at that time. The event registration is only needed once, but + * this function must be called each time a new threshold is desired; + * the event will only fire if a non-zero threshold is + * exceeded. + * + * By default, @threshold is specified in bytes, and must not exceed + * the size of the block device. However, when @flags includes + * VIR_DOMAIN_BLOCK_SET_WRITE_THRESHOLD_PERCENTAGE, @threshold is + * instead a value between 0.0 and 100.0, and the driver will compute + * a byte value based on the current size of the disk. A driver may + * round the requested threshold to a granularity that can actually + * be supported. + * + * Setting a threshold allows event-based resizing of host resources + * that back a guest disk without having to poll the current disk + * allocation, while still having enough time to complete the resize + * before the guest would end up halting due to insufficient space. + * Calling this function to set the threshold back to zero will stop + * further firing of the event. virDomainBlockStatsFlags() and + * virConnectGetAllDomainStats() can be used to track the current + * threshold value, always in the form normalized to bytes. + * + * The @disk parameter is either the device target shorthand (the + * <target dev='...'/> sub-element, such as "vda"), or (since 0.9.8) + * an unambiguous source name of the block device (the <source + * file='...'/> sub-element, such as "/path/to/image"). Valid names + * can be found by calling virDomainGetXMLDesc() and inspecting + * elements within //domain/devices/disk. Some drivers might also + * accept strings such as "vda[1]" for setting the threshold of a + * backing image, useful when doing a block commit into the backing + * image. + * + * Domains may have more than one block device. To set thresholds for + * each you should make multiple calls to this function. If write + * thresholds are not supported, an application will have to instead + * poll virDomainGetBlockInfo() or similar to track allocation. + * + * Returns -1 in case of error, 0 in case of success. + */ +int +virDomainBlockSetWriteThreshold(virDomainPtr dom, + const char *disk, + double threshold, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(dom, "disk=%s, threshold=%g, flags=%x", + disk, threshold, flags); + + virResetLastError(); + + virCheckDomainReturn(dom, -1); + virCheckNonNullArgGoto(disk, error); + virCheckNonNegativeArgGoto(threshold, error); + if (flags & VIR_DOMAIN_BLOCK_SET_WRITE_THRESHOLD_PERCENTAGE) { + if (threshold > 100.0) + virReportError(VIR_ERR_INVALID_ARG, + _("threshold in %s must be a percentage"), + __FUNCTION__); + goto error; + } else { + if (threshold > LLONG_MAX) + virReportError(VIR_ERR_INVALID_ARG, + _("threshold in %s must fit in unsigned long long"), + __FUNCTION__); + goto error; + } + conn = dom->conn; + + if (conn->driver->domainBlockSetWriteThreshold) { + int ret; + ret = conn->driver->domainBlockSetWriteThreshold(dom, disk, threshold, + flags); + if (ret < 0) + goto error; + return ret; + } + virReportUnsupportedError(); + + error: + virDispatchError(dom->conn); + return -1; +} + + +/** * virDomainInterfaceStats: * @dom: pointer to the domain object * @path: path to the interface @@ -11201,6 +11300,8 @@ virConnectGetDomainCapabilities(virConnectPtr conn, * unsigned long long. * "block.<num>.errors" - Xen only: the 'oo_req' value as * unsigned long long. + * "block.<num>.write-threshold" - byte at which a write threshold event + * will fire, as unsigned long long. * "block.<num>.allocation" - offset of the highest written sector * as unsigned long long. * "block.<num>.capacity" - logical size in bytes of the block device backing diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 716dd2f..5131fcf 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -712,6 +712,7 @@ LIBVIRT_1.2.15 { LIBVIRT_1.2.16 { global: + virDomainBlockSetWriteThreshold; virDomainSetUserPassword; } LIBVIRT_1.2.15; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 91a1ca2..98db6a3 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12150,6 +12150,27 @@ vshEventDeviceAddedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static void +vshEventWriteThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + const char *alias, + unsigned long long threshold, + unsigned long long length, + void *opaque) +{ + vshDomEventData *data = opaque; + + if (!data->loop && *data->count) + return; + vshPrint(data->ctl, + _("event 'write-threshold' for domain %s disk %s: threshold %lld " + "exceeded by %lld bytes\n"), + virDomainGetName(dom), alias, threshold, length); + (*data->count)++; + if (!data->loop) + vshEventDone(data->ctl); +} + +static void vshEventTunablePrint(virConnectPtr conn ATTRIBUTE_UNUSED, virDomainPtr dom, virTypedParameterPtr params, @@ -12256,6 +12277,8 @@ static vshEventCallback vshEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(vshEventAgentLifecyclePrint), }, { "device-added", VIR_DOMAIN_EVENT_CALLBACK(vshEventDeviceAddedPrint), }, + { "write-threshold", + VIR_DOMAIN_EVENT_CALLBACK(vshEventWriteThresholdPrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); diff --git a/tools/virsh.pod b/tools/virsh.pod index d588e5a..14dd2c3 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -919,6 +919,7 @@ local file or block device, "block.<num>.fl.reqs" - total flush requests, "block.<num>.fl.times" - total time (ns) spent on cache flushing, "block.<num>.errors" - Xen only: the 'oo_req' value, +"block.<num>.write-threshold" - write threshold event trigger, in bytes, "block.<num>.allocation" - offset of highest written sector in bytes, "block.<num>.capacity" - logical size of source file in bytes, "block.<num>.physical" - physical size of source file in bytes -- 2.1.0

3 4

[libvirt] [PATCH] docs: update github project name
by Daniel P. Berrange 26 May '15

26 May '15

The github project was renamed from libvirtproject to libvirt --- docs/downloads.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as a trivial docs fix diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 73599d6..13a6db1 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -81,7 +81,7 @@ </p> <pre> - <a href="https://github.com/libvirtproject/libvirt">https://github.com/libvirtproject/libvirt</a> + <a href="https://github.com/libvirt/libvirt">https://github.com/libvirt/libvirt</a> <a href="http://repo.or.cz/w/libvirt.git">http://repo.or.cz/w/libvirt.git</a> <a href="https://gitlab.com/libvirt/libvirt">https://gitlab.com/libvirt/libvirt</a></pre> -- 2.1.0

1 0

[libvirt] [PATCH] storage: Fix problem with disk backend pool allocation calculation
by John Ferlan 26 May '15

26 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1224018 The disk pool recalculates the pool allocation, capacity, and available values each time through processing a newly created disk partition. However, there were two issues with doing so. The process generally is to read the partition table via virStorageBackendDiskReadPartitions and process the volume. This is called during create and refresh backend API's with the only difference being create passes a specific volume to be processed while refresh processes all volumes (passing NULL for the volume value). The first issue via virStorageBackendDiskCreateVol was that the pool's available value was cleared, so when virStorageBackendDiskMakeVol processes the (new) volume it will ignore any other partitions on the disk, thus after returning the pool allocation would only include the newly added volume. The second is while processing a partition, the adjustment of the available value depends on the type of partition. For "primary" and "logical" partitions, the available value was adjusted. However, for "extended" partitions, the available value wasn't adjusted. Since the calling function(s) storageVolCreateXML[From] will only adjust the pool available value when they determine that the backend code didn't this resulted in the available value being incorrectly adjusted by that code. If a pool refresh was executed, the "correct" value showed up. To fix the first issue, only clear the available value when we're being processed from the refresh path (vol will be NULL). To fix the second issue, increment available by 1 so that the calling function won't adjust after we're done. That could leave the appearance of a single byte being used by a pool that only has an extended partition, but that's better than having it show up as the size of the partition until someone refreshes. The refresh path will also nick by the same value so it'll be consistent. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_disk.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 6394dac..bc14aab 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -164,8 +164,18 @@ virStorageBackendDiskMakeDataVol(virStoragePoolObjPtr pool, return -1; } + /* For "data", adjust the pool's allocation by the size of the volume + * For "metadata" (aka "extended" volume), we haven't yet used the space; + * however, the calling createVol path will adjust the pool allocation + * by the volume allocation if it determines a storage backend doesn't + * adjust the pool's allocation value. So bump the allocation to avoid + * having the calling code misrepresent the value. The refresh path + * would resolve/change the value. + */ if (STRNEQ(groups[2], "metadata")) pool->def->allocation += vol->target.allocation; + else + pool->def->allocation++; if (vol->source.extents[0].end > pool->def->capacity) pool->def->capacity = vol->source.extents[0].end; @@ -309,7 +319,13 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPtr pool, pool->def->source.devices[0].path, NULL); - pool->def->allocation = pool->def->capacity = pool->def->available = 0; + /* The reload/restart/refresh path will recalculate everything; + * otherwise, keep allocation as is as capacity and available + * will be adjusted + */ + if (!vol) + pool->def->allocation = 0; + pool->def->capacity = pool->def->available = 0; ret = virCommandRunNul(cmd, 6, -- 2.1.0

2 2

[libvirt] Strange test build failure
by Dimitri John Ledkov 26 May '15

26 May '15

# VIR_TEST_VERBOSE=1 VIR_TEST_DEBUG=1 ./qemuxml2argvtest 2>&1 | grep NUMA 61) QEMU XML-2-ARGV hugepages-pages ... libvirt: error : unsupported configuration: NUMA node 1 is unavailable 64) QEMU XML-2-ARGV hugepages-shared ... libvirt: error : unsupported configuration: NUMA node 1 is unavailable 331) QEMU XML-2-ARGV numatune-memnode ... libvirt: error : unsupported configuration: NUMA node 1 is unavailable 333) QEMU XML-2-ARGV numatune-memnode-no-memory ... libvirt: error : unsupported configuration: NUMA node 3 is unavailable 336) QEMU XML-2-ARGV numatune-auto-prefer ... libvirt: error : unsupported configuration: NUMA node 1 is unavailable 449) QEMU XML-2-ARGV memory-hotplug-dimm ... libvirt: error : unsupported configuration: NUMA node 1 is unavailable 450) QEMU XML-2-ARGV memory-hotplug-dimm-addr ... libvirt: error : unsupported configuration: NUMA node 1 is unavailable So the test fails, but I don't believe I'm compiling libvirt with numad support... So I don't understand what is being asserted here. -- Regards, Dimitri. Pura Vida! https://clearlinux.org Open Source Technology Center Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ.

4 8

[libvirt] [PATCH 00/10] Get ready for migration events
by Jiri Denemark 26 May '15

26 May '15

QEMU will soon get support for migration events which will finally allows us to get rid of polling query-migrate every 50ms. However, we first need to be able to wait for all events related to migration (migration status changes, block job events, async abort requests) at once. This series prepares the infrastructure which will allows us to do it (patches 1 and 2) and then makes use of it for block job events (patch 4) and abort requests (patch 10). Patch 8 fixes a bug in migration recovery after libvirtd restarts. The rest of the patches are mostly cleanups or bugfixes or other small changes required by the 5 main patches. Jiri Denemark (10): util: Introduce thread queues thread: Create thread local condition for every thread qemu: Introduce qemuBlockJobUpdate qemu: Properly report failed migration qemu: Use thread queues for synchronous block jobs qemu: Don't mess up with disk->mirrorState Pass domain object to private data formatter/parser qemu: Make qemuMigrationCancelDriveMirror usable without async job qemu: Cancel disk mirrors after libvirtd restart qemu: Use thread queues for asyncAbort po/POTFILES.in | 2 +- src/Makefile.am | 2 + src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 6 +- src/libvirt_private.syms | 17 ++ src/libxl/libxl_domain.c | 10 +- src/lxc/lxc_domain.c | 12 +- src/qemu/qemu_blockjob.c | 177 +++++---------------- src/qemu/qemu_blockjob.h | 15 +- src/qemu/qemu_domain.c | 97 +++++++++--- src/qemu/qemu_domain.h | 8 +- src/qemu/qemu_driver.c | 24 ++- src/qemu/qemu_migration.c | 392 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_migration.h | 3 + src/qemu/qemu_process.c | 17 +- src/util/virthread.c | 21 ++- src/util/virthreadqueue.c | 343 ++++++++++++++++++++++++++++++++++++++++ src/util/virthreadqueue.h | 54 +++++++ 18 files changed, 841 insertions(+), 363 deletions(-) create mode 100644 src/util/virthreadqueue.c create mode 100644 src/util/virthreadqueue.h -- 2.4.1

4 22

[libvirt] [PATCH] qemu: Fix compilation error when enum variable size differs from 'int'
by Peter Krempa 26 May '15

26 May '15

Since commit bcd9a564b631aa virDomainNumatuneGetMode returns the value via a pointer rather than in the return value. The change triggered problems with platforms where the compiler decides to use a data type of size different than integer at the point where we typecast it. Work around the issue by using an intermediate variable of the correct type that gets casted back by the default typecasting rules. --- src/qemu/qemu_driver.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa0acde..2b9f125 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10566,14 +10566,16 @@ qemuDomainGetNumaParameters(virDomainPtr dom, virMemoryParameterPtr param = &params[i]; switch (i) { - case 0: /* fill numa mode here */ + case 0: { /* fill numa mode here */ + virDomainNumatuneMemMode tmp; + virDomainNumatuneGetMode(def->numa, -1, &tmp); + if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_MODE, - VIR_TYPED_PARAM_INT, 0) < 0) + VIR_TYPED_PARAM_INT, tmp) < 0) goto cleanup; - virDomainNumatuneGetMode(def->numa, -1, - (virDomainNumatuneMemMode *) &param->value.i); break; + } case 1: /* fill numa nodeset here */ nodeset = virDomainNumatuneFormatNodeset(def->numa, NULL, -1); -- 2.4.1

3 5

[libvirt] [PATCH 0/5] Selective block device migration implementation
by Pavel Boldin 26 May '15

26 May '15

The patchset represented in the mail thread implements the selective block device migration for the QEMU driver. This closes the referenced bug [1]. First the supplementary API implemented allowing for multiple key-values pair in the virTypedParameter arrays. This is used to pass the list of block devices to migrate in the following patches. Unit tests for this are added as well. This is the subject of the first three patches. Fourth patch is adding the necessary parameter `migrate_disks' and passes it through the QEMU driver call stack. The introduced `qemuMigrateBlockDevice' function is then checks that the disk is to be migrated because it is in the list. If there is no list specified then the legacy check is used: the device is not shared, not readonly and has a source. Fifth and the last patch is adding the necessary code to the `virsh' utility making it able for user to specify a comma-separated list of the block device names that are to be migrated. The implemented Python bindings patch is to be presented. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1203032 Pavel Boldin (5): util: multi-value virTypedParameter util: virTypedParamsPick* multikey API util: add virTypedParamsPackStrings qemu: migration: selective block device migration virsh: selective block device migration include/libvirt/libvirt-domain.h | 9 ++ include/libvirt/libvirt-host.h | 24 ++++ src/libvirt_public.syms | 3 + src/qemu/qemu_driver.c | 63 ++++++--- src/qemu/qemu_migration.c | 197 ++++++++++++++++---------- src/qemu/qemu_migration.h | 23 ++-- src/util/virtypedparam.c | 290 +++++++++++++++++++++++++++++++-------- tests/Makefile.am | 6 + tests/virtypedparamtest.c | 289 ++++++++++++++++++++++++++++++++++++++ tools/virsh-domain.c | 44 ++++++ 10 files changed, 788 insertions(+), 160 deletions(-) create mode 100644 tests/virtypedparamtest.c -- 1.9.1

3 27

[libvirt] [PATCH v3 0/4] storage: fs: tweak dir perms handling on build
by Cole Robinson 26 May '15

26 May '15

Consider the following issue - Using virt-manager with qemu:///session - User adds a storage pool pointing at /tmp. No explicit permissions are requested in the XML - virt-manager calls PoolDefine, then PoolBuild - libvirt tries to unconditionally chmod 755 /tmp. This fails because my user doesn't own root. Pool build fails, virt-manager reports failure Yes there's a couple ways we could avoid this specific case in virt-manager, but I think it makes more sense to have pool.build on a directory be a no-op in this case. The following patches address this. I already pushed some bits of v2 of the series. Now the patches are: - Patch 1 (new) update existing docs about storage <permissions> - Patch 2 changes storage XML to not hardcode a <mode> value if the user didn't specify one in. - Patch 3 (new) don't output empty <permissions> block - Patch 4 makes pool.build skip dir chmod unless the user explicitly requested <mode> via the XML. However if a mode is required for mkdir, continue to use the previous default. Cole Robinson (4): docs: formatstorage: Update <permissions> docs storage: conf: Don't set any default <mode> in the XML conf: storage: Don't emit empty <permissions> block storage: fs: Only force directory permissions if required docs/formatstorage.html.in | 40 ++++++++----- docs/schemas/storagecommon.rng | 8 ++- src/conf/storage_conf.c | 70 ++++++++++++---------- src/storage/storage_backend.c | 20 +++++-- src/storage/storage_backend.h | 3 + src/storage/storage_backend_fs.c | 32 ++++++---- src/storage/storage_backend_logical.c | 4 +- src/util/virfile.c | 4 +- tests/storagepoolxml2xmlout/pool-netfs-gluster.xml | 3 - tests/storagevolxml2xmlout/vol-gluster-dir.xml | 3 - tests/storagevolxml2xmlout/vol-sheepdog.xml | 3 - 11 files changed, 113 insertions(+), 77 deletions(-) -- 2.4.1

2 13

[libvirt] [PATCH 0/8] parallels: add vz driver
by Maxim Nestratov 26 May '15

26 May '15

This new driver 'vz' will be used as a substitution for parallels driver. New domains will be created with 'vz' domain type. Old 'parallels' domains remain supported. Connection to the driver can be made either way: vz:///system or parallels:///system. Maxim Nestratov (8): parallels: introduce vz driver constant and string parallels: use newly introduced VIR_DOMAIN_VIRT_VZ parallels: add new guest capabilities assigned to vz driver parallels: accept vz as a driver uri and name parallels: add a new vz connection driver and hypervisor structures parallels: increment the number of connection drivers parallels: recommend to connect to vz:///system when connection fails parallels: set VIR_DOMAIN_VIRT_VZ virtType for new domains src/conf/domain_conf.c | 19 +++++++++----- src/conf/domain_conf.h | 1 + src/libvirt.c | 2 +- src/parallels/parallels_driver.c | 52 ++++++++++++++++++++++++++++++++++----- src/parallels/parallels_network.c | 3 ++- src/parallels/parallels_sdk.c | 2 +- src/parallels/parallels_storage.c | 3 ++- 7 files changed, 66 insertions(+), 16 deletions(-) -- 2.1.0

2 9

[libvirt] [PATCH 0/2 v2] parallels: fix prlsdkLoadDomain
by Maxim Nestratov 25 May '15

25 May '15

Maxim Nestratov (2): parallels: move up updating parameter in prlsdkLoadDomain parallels: fix possible crash in case of errors in prlsdkLoadDomain src/parallels/parallels_sdk.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH] rpc: add testing of RPC JSON (de)serialization
by Daniel P. Berrange 25 May '15

25 May '15

The virNetServer class has the ability to serialize its state to a JSON file, and then re-load that data after an in-place execve() call to re-connect to active file handles. This data format is critical ABI that must have compatibility across releases, so it should be tested... --- src/libvirt_remote.syms | 1 + src/rpc/virnetserver.c | 4 +- src/rpc/virnetserver.h | 3 + src/rpc/virnetserverclient.c | 13 +- src/rpc/virnetserverservice.c | 6 +- tests/Makefile.am | 7 + tests/virnetserverdata/README | 14 + .../virnetserverdata/input-data-anon-clients.json | 63 +++++ tests/virnetserverdata/input-data-initial.json | 62 +++++ .../virnetserverdata/output-data-anon-clients.json | 63 +++++ tests/virnetserverdata/output-data-initial.json | 63 +++++ tests/virnetservertest.c | 290 +++++++++++++++++++++ 12 files changed, 579 insertions(+), 10 deletions(-) create mode 100644 tests/virnetserverdata/README create mode 100644 tests/virnetserverdata/input-data-anon-clients.json create mode 100644 tests/virnetserverdata/input-data-initial.json create mode 100644 tests/virnetserverdata/output-data-anon-clients.json create mode 100644 tests/virnetserverdata/output-data-initial.json create mode 100644 tests/virnetservertest.c diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 950e56e..bdd68f6 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -77,6 +77,7 @@ xdr_virNetMessageError; # rpc/virnetserver.h +virNetServerAddClient; virNetServerAddProgram; virNetServerAddService; virNetServerAddShutdownInhibition; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 42427dc..091a1dc 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -259,8 +259,8 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr client, } -static int virNetServerAddClient(virNetServerPtr srv, - virNetServerClientPtr client) +int virNetServerAddClient(virNetServerPtr srv, + virNetServerClientPtr client) { virObjectLock(srv); diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 8c5ae07..4b452be 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -79,6 +79,9 @@ int virNetServerAddService(virNetServerPtr srv, virNetServerServicePtr svc, const char *mdnsEntryName); +int virNetServerAddClient(virNetServerPtr srv, + virNetServerClientPtr client); + int virNetServerAddProgram(virNetServerPtr srv, virNetServerProgramPtr prog); diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index 34c1994..0e3a71f 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -536,13 +536,14 @@ virJSONValuePtr virNetServerClientPreExecRestart(virNetServerClientPtr client) goto error; } - if (client->privateData && client->privateDataPreExecRestart && - !(child = client->privateDataPreExecRestart(client, client->privateData))) - goto error; + if (client->privateData && client->privateDataPreExecRestart) { + if (!(child = client->privateDataPreExecRestart(client, client->privateData))) + goto error; - if (virJSONValueObjectAppend(object, "privateData", child) < 0) { - virJSONValueFree(child); - goto error; + if (virJSONValueObjectAppend(object, "privateData", child) < 0) { + virJSONValueFree(child); + goto error; + } } virObjectUnlock(client); diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index d3cf31a..4df26cb 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -303,12 +303,15 @@ virNetServerServicePtr virNetServerServiceNewFD(int fd, /* IO callback is initially disabled, until we're ready * to deal with incoming clients */ + virObjectRef(svc); if (virNetSocketAddIOCallback(svc->socks[i], 0, virNetServerServiceAccept, svc, - virObjectFreeCallback) < 0) + virObjectFreeCallback) < 0) { + virObjectUnref(svc); goto error; + } } @@ -388,7 +391,6 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj svc, virObjectFreeCallback) < 0) { virObjectUnref(svc); - virObjectUnref(sock); goto error; } } diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e2dbec..c9e2c8a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -188,6 +188,7 @@ if WITH_REMOTE test_programs += \ virnetmessagetest \ virnetsockettest \ + virnetservertest \ virnetserverclienttest \ $(NULL) if WITH_GNUTLS @@ -921,6 +922,12 @@ virnetsockettest_SOURCES = \ virnetsockettest.c testutils.h testutils.c virnetsockettest_LDADD = $(LDADDS) +virnetservertest_SOURCES = \ + virnetservertest.c \ + testutils.h testutils.c +virnetservertest_CFLAGS = $(XDR_CFLAGS) $(AM_CFLAGS) +virnetservertest_LDADD = $(LDADDS) + virnetserverclienttest_SOURCES = \ virnetserverclienttest.c \ testutils.h testutils.c diff --git a/tests/virnetserverdata/README b/tests/virnetserverdata/README new file mode 100644 index 0000000..d6d79d2 --- /dev/null +++ b/tests/virnetserverdata/README @@ -0,0 +1,14 @@ + virnetservertest data files + =========================== + +The various input-data-*.json files are a record of all the historical +formats that libvirt has been able to produce data for. Everytime a +new field is added to the JSON output, a *new* input data file should +be created. We must not add new fields to existing input-data files, +nor must we ever re-structure them if code changes, as we must check +new code handles the legacy formats. + +The various output-data-*.json files are the record of what the *new* +JSON output should look like for the correspondingly named input-data +file. It is permissible to change the existing output-data-*.json +files if the format we save in is updated. diff --git a/tests/virnetserverdata/input-data-anon-clients.json b/tests/virnetserverdata/input-data-anon-clients.json new file mode 100644 index 0000000..ed91b57 --- /dev/null +++ b/tests/virnetserverdata/input-data-anon-clients.json @@ -0,0 +1,63 @@ +{ + "min_workers": 10, + "max_workers": 50, + "priority_workers": 5, + "max_clients": 100, + "max_anonymous_clients": 10, + "keepaliveInterval": 120, + "keepaliveCount": 5, + "keepaliveRequired": true, + "mdnsGroupName": "libvirtTest", + "services": [ + { + "auth": 0, + "readonly": true, + "nrequests_client_max": 2, + "socks": [ + { + "fd": 100, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + }, + { + "auth": 2, + "readonly": false, + "nrequests_client_max": 5, + "socks": [ + { + "fd": 101, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + } + ], + "clients": [ + { + "auth": 1, + "readonly": true, + "nrequests_max": 15, + "sock": { + "fd": 102, + "errfd": -1, + "pid": -1, + "isClient": true + } + }, + { + "auth": 2, + "readonly": true, + "nrequests_max": 66, + "sock": { + "fd": 103, + "errfd": -1, + "pid": -1, + "isClient": true + } + } + ] +} diff --git a/tests/virnetserverdata/input-data-initial.json b/tests/virnetserverdata/input-data-initial.json new file mode 100644 index 0000000..7956225 --- /dev/null +++ b/tests/virnetserverdata/input-data-initial.json @@ -0,0 +1,62 @@ +{ + "min_workers": 10, + "max_workers": 50, + "priority_workers": 5, + "max_clients": 100, + "keepaliveInterval": 120, + "keepaliveCount": 5, + "keepaliveRequired": true, + "mdnsGroupName": "libvirtTest", + "services": [ + { + "auth": 0, + "readonly": true, + "nrequests_client_max": 2, + "socks": [ + { + "fd": 100, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + }, + { + "auth": 2, + "readonly": false, + "nrequests_client_max": 5, + "socks": [ + { + "fd": 101, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + } + ], + "clients": [ + { + "auth": 1, + "readonly": true, + "nrequests_max": 15, + "sock": { + "fd": 102, + "errfd": -1, + "pid": -1, + "isClient": true + } + }, + { + "auth": 2, + "readonly": true, + "nrequests_max": 66, + "sock": { + "fd": 103, + "errfd": -1, + "pid": -1, + "isClient": true + } + } + ] +} diff --git a/tests/virnetserverdata/output-data-anon-clients.json b/tests/virnetserverdata/output-data-anon-clients.json new file mode 100644 index 0000000..ed91b57 --- /dev/null +++ b/tests/virnetserverdata/output-data-anon-clients.json @@ -0,0 +1,63 @@ +{ + "min_workers": 10, + "max_workers": 50, + "priority_workers": 5, + "max_clients": 100, + "max_anonymous_clients": 10, + "keepaliveInterval": 120, + "keepaliveCount": 5, + "keepaliveRequired": true, + "mdnsGroupName": "libvirtTest", + "services": [ + { + "auth": 0, + "readonly": true, + "nrequests_client_max": 2, + "socks": [ + { + "fd": 100, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + }, + { + "auth": 2, + "readonly": false, + "nrequests_client_max": 5, + "socks": [ + { + "fd": 101, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + } + ], + "clients": [ + { + "auth": 1, + "readonly": true, + "nrequests_max": 15, + "sock": { + "fd": 102, + "errfd": -1, + "pid": -1, + "isClient": true + } + }, + { + "auth": 2, + "readonly": true, + "nrequests_max": 66, + "sock": { + "fd": 103, + "errfd": -1, + "pid": -1, + "isClient": true + } + } + ] +} diff --git a/tests/virnetserverdata/output-data-initial.json b/tests/virnetserverdata/output-data-initial.json new file mode 100644 index 0000000..da02aac --- /dev/null +++ b/tests/virnetserverdata/output-data-initial.json @@ -0,0 +1,63 @@ +{ + "min_workers": 10, + "max_workers": 50, + "priority_workers": 5, + "max_clients": 100, + "max_anonymous_clients": 100, + "keepaliveInterval": 120, + "keepaliveCount": 5, + "keepaliveRequired": true, + "mdnsGroupName": "libvirtTest", + "services": [ + { + "auth": 0, + "readonly": true, + "nrequests_client_max": 2, + "socks": [ + { + "fd": 100, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + }, + { + "auth": 2, + "readonly": false, + "nrequests_client_max": 5, + "socks": [ + { + "fd": 101, + "errfd": -1, + "pid": 0, + "isClient": false + } + ] + } + ], + "clients": [ + { + "auth": 1, + "readonly": true, + "nrequests_max": 15, + "sock": { + "fd": 102, + "errfd": -1, + "pid": -1, + "isClient": true + } + }, + { + "auth": 2, + "readonly": true, + "nrequests_max": 66, + "sock": { + "fd": 103, + "errfd": -1, + "pid": -1, + "isClient": true + } + } + ] +} diff --git a/tests/virnetservertest.c b/tests/virnetservertest.c new file mode 100644 index 0000000..08431d7 --- /dev/null +++ b/tests/virnetservertest.c @@ -0,0 +1,290 @@ +/* + * Copyright (C) 2015 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "testutils.h" +#include "virerror.h" +#include "rpc/virnetserver.h" + +#define VIR_FROM_THIS VIR_FROM_RPC + +#ifdef HAVE_SOCKETPAIR +static virNetServerPtr +testCreateServer(const char *host, int family) +{ + virNetServerPtr srv = NULL; + virNetServerServicePtr svc1 = NULL, svc2 = NULL; + virNetServerClientPtr cln1 = NULL, cln2 = NULL; + virNetSocketPtr sk1 = NULL, sk2 = NULL; + int fdclient[2]; + + if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) { + virReportSystemError(errno, "%s", + "Cannot create socket pair"); + goto cleanup; + } + + if (!(srv = virNetServerNew(10, 50, 5, 100, 10, + 120, 5, true, + "libvirtTest", + NULL, + NULL, + NULL, + NULL))) + goto error; + + if (!(svc1 = virNetServerServiceNewTCP(host, + NULL, + family, + VIR_NET_SERVER_SERVICE_AUTH_NONE, +# ifdef WITH_GNUTLS + NULL, +# endif + true, + 5, + 2))) + goto error; + + if (!(svc2 = virNetServerServiceNewTCP(host, + NULL, + VIR_NET_SERVER_SERVICE_AUTH_POLKIT, + family, +# ifdef WITH_GNUTLS + NULL, +# endif + false, + 25, + 5))) + goto error; + + if (virNetServerAddService(srv, svc1, "libvirt-ro") < 0) + goto error; + if (virNetServerAddService(srv, svc2, "libvirt-ro") < 0) + goto error; + + if (virNetSocketNewConnectSockFD(fdclient[0], &sk1) < 0) + goto error; + if (virNetSocketNewConnectSockFD(fdclient[1], &sk2) < 0) + goto error; + + if (!(cln1 = virNetServerClientNew(sk1, + VIR_NET_SERVER_SERVICE_AUTH_SASL, + true, + 15, +# ifdef WITH_GNUTLS + NULL, +# endif + NULL, NULL, NULL, NULL))) + goto error; + + if (!(cln2 = virNetServerClientNew(sk2, + VIR_NET_SERVER_SERVICE_AUTH_POLKIT, + true, + 66, +# ifdef WITH_GNUTLS + NULL, +# endif + NULL, NULL, NULL, NULL))) + goto error; + + if (virNetServerAddClient(srv, cln1) < 0) + goto error; + + if (virNetServerAddClient(srv, cln2) < 0) + goto error; + + cleanup: + virObjectUnref(cln1); + virObjectUnref(cln2); + virObjectUnref(svc1); + virObjectUnref(svc2); + return srv; + + error: + virObjectUnref(srv); + srv = NULL; + goto cleanup; +} + +static char *testGenerateJSON(void) +{ + virNetServerPtr srv = NULL; + virJSONValuePtr json = NULL; + char *jsonstr = NULL; + bool has_ipv4, has_ipv6; + + /* Our pre-saved JSON file is created so that each service + * only has one socket. If we let libvirt bind to IPv4 and + * IPv6 we might end up with two sockets, so force one or + * the other based on what's available on thehost + */ + if (virNetSocketCheckProtocols(&has_ipv4, + &has_ipv6) < 0) + return NULL; + + if (!has_ipv4 && !has_ipv6) + return NULL; + + if (!(srv = testCreateServer( + has_ipv4 ? "127.0.0.1" : "::1", + has_ipv4 ? AF_INET : AF_INET6))) + goto cleanup; + + if (!(json = virNetServerPreExecRestart(srv))) + goto cleanup; + + if (!(jsonstr = virJSONValueToString(json, true))) + goto cleanup; + fprintf(stderr, "%s\n", jsonstr); + cleanup: + virNetServerClose(srv); + virObjectUnref(srv); + virJSONValueFree(json); + return jsonstr; +} + + +struct testExecRestartData { + const char *jsonfile; +}; + +static int testExecRestart(const void *opaque) +{ + int ret = -1; + virNetServerPtr srv = NULL; + const struct testExecRestartData *data = opaque; + char *infile = NULL, *outfile = NULL; + char *injsonstr = NULL, *outjsonstr = NULL; + virJSONValuePtr injson = NULL, outjson = NULL; + int fdclient[2] = { -1, -1 }, fdserver[2] = { -1, -1 }; + + if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdclient) < 0) { + virReportSystemError(errno, "%s", + "Cannot create socket pair"); + goto cleanup; + } + + if (socketpair(PF_UNIX, SOCK_STREAM, 0, fdserver) < 0) { + virReportSystemError(errno, "%s", + "Cannot create socket pair"); + goto cleanup; + } + + /* We're blindly assuming the test case isn't using + * fds 100->103 for something else, which is probably + * fairly reasonable in general + */ + dup2(fdserver[0], 100); + dup2(fdserver[1], 101); + dup2(fdclient[0], 102); + dup2(fdclient[1], 103); + + if (virAsprintf(&infile, "%s/virnetserverdata/input-data-%s.json", + abs_srcdir, data->jsonfile) < 0) + goto cleanup; + + if (virAsprintf(&outfile, "%s/virnetserverdata/output-data-%s.json", + abs_srcdir, data->jsonfile) < 0) + goto cleanup; + + if (virFileReadAll(infile, 8192, &injsonstr) < 0) + goto cleanup; + + if (!(injson = virJSONValueFromString(injsonstr))) + goto cleanup; + + if (!(srv = virNetServerNewPostExecRestart(injson, + NULL, NULL, NULL, + NULL, NULL))) + goto cleanup; + + if (!(outjson = virNetServerPreExecRestart(srv))) + goto cleanup; + + if (!(outjsonstr = virJSONValueToString(outjson, true))) + goto cleanup; + + if (virtTestCompareToFile(outjsonstr, outfile) < 0) + goto fail; + + ret = 0; + + cleanup: + if (ret < 0) { + virErrorPtr err = virGetLastError(); + fprintf(stderr, "%s\n", err->message); + } + fail: + VIR_FREE(infile); + VIR_FREE(outfile); + VIR_FREE(injsonstr); + VIR_FREE(outjsonstr); + virJSONValueFree(injson); + virJSONValueFree(outjson); + virObjectUnref(srv); + VIR_FORCE_CLOSE(fdserver[0]); + VIR_FORCE_CLOSE(fdserver[1]); + VIR_FORCE_CLOSE(fdclient[0]); + VIR_FORCE_CLOSE(fdclient[1]); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + + /* Hack to make it easier to generate new JSON files when + * the RPC classes change. Just set this env var, save + * the generated JSON, and replace the file descriptor + * numbers with 100, 101, 102, 103. + */ + if (getenv("VIR_GENERATE_JSON")) { + char *json = testGenerateJSON(); + fprintf(stdout, "%s\n", json); + VIR_FREE(json); + return EXIT_SUCCESS; + } + +# define EXEC_RESTART_TEST(file) \ + do { \ + struct testExecRestartData data = { \ + file \ + }; \ + if (virtTestRun("ExecRestart " file, \ + testExecRestart, &data) < 0) \ + ret = -1; \ + } while (0) + + EXEC_RESTART_TEST("initial"); + EXEC_RESTART_TEST("anon-clients"); + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} +#else +static int +mymain(void) +{ + return EXIT_AM_SKIP; +} +#endif +VIRT_TEST_MAIN(mymain); -- 2.1.0

2 1

[libvirt] [PATCH 0/3] Patches for a couple of Coverity errors
by John Ferlan 25 May '15

25 May '15

The first one is one I forgot the last time I sent Coverity patches a few weeks ago. The next two are from changes made recently. John Ferlan (3): storage: Resolve Coverity FORWARD_NULL conf: Resolve Coverity FORWARD_NULL network: Resolve Coverity FORWARD_NULL src/conf/domain_conf.c | 2 ++ src/network/bridge_driver.c | 2 +- src/storage/storage_backend_disk.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) -- 2.1.0

3 14

[libvirt] [PATCH] virsh: reject negative values for scaled integer
by Pavel Hrdina 25 May '15

25 May '15

Some virsh commands have a size parameter, which is handled as scaled integer. We don't have any *feature* that would allow to use '-1' as maximum size, so it's safe to reject any negative values for those commands. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1159171 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tools/virsh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4425774..1005ba8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1811,7 +1811,7 @@ vshCommandOptScaledInt(const vshCmd *cmd, const char *name, ret = vshCommandOptString(cmd, name, &str); if (ret <= 0) return ret; - if (virStrToLong_ull(str, &end, 10, value) < 0 || + if (virStrToLong_ullp(str, &end, 10, value) < 0 || virScaleInteger(value, end, scale, max) < 0) return -1; return 1; -- 2.3.6

2 2

[libvirt] [PATCH] libxl: load on FreeBSD
by Roman Bogorodskiy 24 May '15

24 May '15

The libxl tries to check if it's running in dom0 by parsing /proc/xen/capabilities and if that fails it doesn't load. There's no procfs interface in Xen on FreeBSD, so this check always fails. Instead of using procfs, check if /dev/xen/xenstored, that's enough to check if we're running in dom0 in FreeBSD case. -- The 'HYPERVISOR_CAPABILITIES' name could be misleading now, however, I'd prefer to use a common variable to avoid duplicating of the file checking code. Maybe it should be renamed to something like HYPERVISOR_CONTROL? --- src/libxl/libxl_driver.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 12be816..c848210 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -73,7 +73,11 @@ VIR_LOG_INIT("libxl.libxl_driver"); #define LIBXL_CONFIG_FORMAT_XM "xen-xm" #define LIBXL_CONFIG_FORMAT_SEXPR "xen-sxpr" -#define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities" +#ifdef __FreeBSD__ +# define HYPERVISOR_CAPABILITIES "/dev/xen/xenstored" +#else +# define HYPERVISOR_CAPABILITIES "/proc/xen/capabilities" +#endif /* Number of Xen scheduler parameters */ #define XEN_SCHED_CREDIT_NPARAM 2 @@ -427,8 +431,6 @@ static bool libxlDriverShouldLoad(bool privileged) { bool ret = false; - int status; - char *output = NULL; /* Don't load if non-root */ if (!privileged) { @@ -441,21 +443,28 @@ libxlDriverShouldLoad(bool privileged) " does not exist"); return ret; } - /* - * Don't load if not running on a Xen control domain (dom0). It is not - * sufficient to check for the file to exist as any guest can mount - * xenfs to /proc/xen. - */ - status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); - if (status >= 0) - status = strncmp(output, "control_d", 9); - VIR_FREE(output); - if (status) { - VIR_INFO("No Xen capabilities detected, probably not running " - "in a Xen Dom0. Disabling libxenlight driver"); +#if !defined(__FreeBSD__) + { + int status; + char *output = NULL; - return ret; + /* + * Don't load if not running on a Xen control domain (dom0). It is not + * sufficient to check for the file to exist as any guest can mount + * xenfs to /proc/xen. + */ + status = virFileReadAll(HYPERVISOR_CAPABILITIES, 10, &output); + if (status >= 0) + status = strncmp(output, "control_d", 9); + VIR_FREE(output); + if (status) { + VIR_INFO("No Xen capabilities detected, probably not running " + "in a Xen Dom0. Disabling libxenlight driver"); + + return ret; + } } +#endif /* Don't load if legacy xen toolstack (xend) is in use */ if (virFileExists("/usr/sbin/xend")) { -- 2.3.7

2 2

[libvirt] [PATCH] docs: Document new RO repo mirrors
by Michal Privoznik 24 May '15

24 May '15

In the upstream discussion on creating a github mirror [1], it turned out that there are some read-only mirrors of our repository. Lets advertise them on our downloads page. But do it wisely and discourage people in sending a pull requests on GitHub. 1: https://www.redhat.com/archives/libvir-list/2015-May/msg00775.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/downloads.html.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 435c2f1..a0ef7e6 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -71,6 +71,20 @@ <pre> <a href="http://libvirt.org/git/?p=libvirt.git;a=summary">http://libvirt.org/git/?p=libvirt.git;a=summary</a></pre> + <p> + In addition to this repository, there are following read-only + repositories which mirror the master one. Note that we currently may not + be using the full set of features on these mirrors (e.g. pull requests on + GitHub, please don't use them). We want the discussion and patch review + to happen at one place - on the list. Also note that some repositories + listed below allows HTTP checkouts too. + </p> + + <pre> + <a href="https://github.com/libvirtproject/libvirt">https://github.com/libvirtproject/libvirt</a> + <a href="http://repo.or.cz/w/libvirt.git">http://repo.or.cz/w/libvirt.git</a> + <a href="https://gitlab.com/libvirt/libvirt">https://gitlab.com/libvirt/libvirt</a></pre> + <br /> <h1>libvirt Application Development Guide</h1> -- 2.3.6

2 1

[libvirt] [PATCH] zfs: fix storagepoolxml2xml test
by Roman Bogorodskiy 24 May '15

24 May '15

Commit c4d27bd dropped output of owner/group -1. Update zfs tests accordingly. --- tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml | 2 -- tests/storagepoolxml2xmlout/pool-zfs.xml | 2 -- 2 files changed, 4 deletions(-) diff --git a/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml b/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml index bbd2e9f..89dcdbf 100644 --- a/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml +++ b/tests/storagepoolxml2xmlout/pool-zfs-sourcedev.xml @@ -12,8 +12,6 @@ <path>/dev/zvol/testpool</path> <permissions> <mode>0755</mode> - <owner>-1</owner> - <group>-1</group> </permissions> </target> </pool> diff --git a/tests/storagepoolxml2xmlout/pool-zfs.xml b/tests/storagepoolxml2xmlout/pool-zfs.xml index ff02329..c9e5df9 100644 --- a/tests/storagepoolxml2xmlout/pool-zfs.xml +++ b/tests/storagepoolxml2xmlout/pool-zfs.xml @@ -11,8 +11,6 @@ <path>/dev/zvol/testpool</path> <permissions> <mode>0755</mode> - <owner>-1</owner> - <group>-1</group> </permissions> </target> </pool> -- 2.3.7

2 2

[libvirt] [PATCH] bhyve: fix build with gcc48
by Roman Bogorodskiy 24 May '15

24 May '15

Build with gcc 4.8 fails with: bhyve/bhyve_monitor.c: In function 'bhyveMonitorIO': bhyve/bhyve_monitor.c:51:18: error: missing initializer for field 'tv_sec' of 'const struct timespec' [-Werror=missing-field-initializers] const struct timespec zerowait = {}; Explicitly initialize zerowait to fix the build. --- src/bhyve/bhyve_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index 7f19c6e..1316720 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -48,7 +48,7 @@ struct _bhyveMonitor { static void bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) { - const struct timespec zerowait = {}; + const struct timespec zerowait = { 0, 0 }; bhyveMonitorPtr mon = opaque; struct kevent kev; int rc, status; -- 2.3.7

3 3

[libvirt] [PATCH] Add missing XDR_FLAGS
by Pavel Fedin 23 May '15

23 May '15

Fixes build problems on x86_64-cygwin host for aarch64 target: CC lxc/libvirt_driver_lxc_impl_la-lxc_monitor_protocol.lo In file included from lxc/lxc_monitor_protocol.c:7:0: lxc/lxc_monitor_protocol.h:9:21: fatal error: rpc/rpc.h: No such file or directory CC rpc/libvirt_setuid_rpc_client_la-virnetmessage.lo In file included from rpc/virnetmessage.h:24:0, from rpc/virnetmessage.c:26: rpc/virnetprotocol.h:9:21: fatal error: rpc/rpc.h: No such file or directory CC lxc/libvirt_lxc-lxc_monitor_protocol.o In file included from lxc/lxc_monitor_protocol.c:7:0: lxc/lxc_monitor_protocol.h:9:21: fatal error: rpc/rpc.h: No such file or directory Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- src/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 579421d..0d1f58b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1290,6 +1290,7 @@ endif ! WITH_DRIVER_MODULES libvirt_driver_lxc_impl_la_CFLAGS = \ $(LIBNL_CFLAGS) \ $(FUSE_CFLAGS) \ + $(XDR_CFLAGS) \ -I$(srcdir)/access \ -I$(srcdir)/conf \ $(AM_CFLAGS) @@ -2216,6 +2217,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ -I$(srcdir)/rpc \ $(AM_CFLAGS) \ $(SECDRIVER_CFLAGS) \ + $(XDR_CFLAGS) \ $(NULL) endif WITH_LXC @@ -2665,6 +2667,7 @@ libvirt_lxc_CFLAGS = \ $(LIBNL_CFLAGS) \ $(FUSE_CFLAGS) \ $(DBUS_CFLAGS) \ + $(XDR_CFLAGS) \ $(NULL) if WITH_BLKID libvirt_lxc_CFLAGS += $(BLKID_CFLAGS) -- 1.9.5.msysgit.0

2 1

[libvirt] [PATCH 00/13] Admin API
by Martin Kletzander 23 May '15

23 May '15

This is a working part of the administration API with some usability helpers. We're still missing documentation and proper client (for which virsh needs to be split), but apart from the last three patches, this series is ready to go in if we decide that the documentation and client work can be done later on. Martin Kletzander (13): util: add virJSONValueCopy Move daemon-related parts of virNetServer to virNetDaemon Teach gendispatch how to handle admin dispatching files Add admin protocol Build client headers for admin protocol Add admin error domain Add libvirt-admin library Add XML files with admin API specification Add configuration options for permissions on daemon's admin socket Add support for admin API in libvirt daemon rpc: Add virNetServerGetNClients admin: Add virAdmHello function Example virt-admin .gitignore | 5 + Makefile.am | 4 +- cfg.mk | 9 +- configure.ac | 11 +- daemon/Makefile.am | 34 +- daemon/admin_server.c | 139 +++++++ daemon/admin_server.h | 36 ++ daemon/libvirtd-config.c | 5 +- daemon/libvirtd-config.h | 1 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 205 +++++++--- daemon/libvirtd.conf | 8 + daemon/libvirtd.h | 14 +- daemon/test_libvirtd.aug.in | 1 + docs/Makefile.am | 23 +- docs/apibuild.py | 10 +- docs/internals.html.in | 4 +- docs/internals/rpc.html.in | 7 + include/libvirt/Makefile.am | 4 +- include/libvirt/libvirt-admin.h | 63 ++++ include/libvirt/virterror.h | 3 +- libvirt-admin.pc.in | 13 + libvirt.spec.in | 10 + po/POTFILES.in | 4 + src/Makefile.am | 127 ++++++- src/admin/admin_protocol.x | 78 ++++ src/admin_protocol-structs | 18 + src/datatypes.c | 30 ++ src/datatypes.h | 37 ++ src/internal.h | 1 + src/libvirt-admin.c | 412 ++++++++++++++++++++ src/libvirt_admin.syms | 19 + src/libvirt_private.syms | 1 + src/libvirt_remote.syms | 29 +- src/locking/lock_daemon.c | 63 ++-- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_daemon_dispatch.c | 4 +- src/lxc/lxc_controller.c | 65 ++-- src/rpc/gendispatch.pl | 130 ++++--- src/rpc/virnetdaemon.c | 746 +++++++++++++++++++++++++++++++++++++ src/rpc/virnetdaemon.h | 82 ++++ src/rpc/virnetserver.c | 536 ++++---------------------- src/rpc/virnetserver.h | 46 +-- src/rpc/virnetserverprogram.h | 3 + src/util/virerror.c | 1 + src/util/virjson.c | 65 +++- src/util/virjson.h | 4 +- tests/confdata/libvirtd.conf | 6 + tests/confdata/libvirtd.out | 5 + tests/jsontest.c | 111 ++++++ tools/virt-admin/Makefile.am | 70 ++++ tools/virt-admin/virt-admin.c | 72 ++++ tools/virt-admin/virt-admin.pod | 43 +++ 53 files changed, 2735 insertions(+), 685 deletions(-) create mode 100644 daemon/admin_server.c create mode 100644 daemon/admin_server.h create mode 100644 include/libvirt/libvirt-admin.h create mode 100644 libvirt-admin.pc.in create mode 100644 src/admin/admin_protocol.x create mode 100644 src/admin_protocol-structs create mode 100644 src/libvirt-admin.c create mode 100644 src/libvirt_admin.syms create mode 100644 src/rpc/virnetdaemon.c create mode 100644 src/rpc/virnetdaemon.h create mode 100644 tools/virt-admin/Makefile.am create mode 100644 tools/virt-admin/virt-admin.c create mode 100644 tools/virt-admin/virt-admin.pod -- 2.4.0

3 39

[libvirt] [PATCHv2] netdev: fail when setting up an SRIOV VF if PF is offline
by Laine Stump 23 May '15

23 May '15

If an SRIOV PF is offline, the kernel won't complain if you set the mac address and vlan tag for a VF via this PF, and it will even let you assign the VF to a guest using PCI device assignment or macvtap passthrough. But in this case (the PF isn't online), the device won't be usable in the guest. Silently setting the PF online would solve the connectivity problem, but as pointed out by Dan Berrange, when an interface is set online with no associated config, the kernel will by default turn on IPv6 autoconf, which could create unexpected security problems for the host. For this reason, this patch instead logs an error and fails the operation. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=893738 Originally filed against RHEL6, but present in every version of libvirt until today. --- src/util/virnetdev.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index e14b401..d0580a0 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -2258,6 +2258,28 @@ virNetDevReplaceVfConfig(const char *pflinkdev, int vf, char macstr[VIR_MAC_STRING_BUFLEN]; char *fileData = NULL; int ifindex = -1; + bool pfIsOnline; + + /* Assure that PF is online prior to twiddling with the VF. It + * *should* be, but if the PF isn't online the changes made to the + * VF via the PF won't take effect, yet there will be no error + * reported. In the case that it isn't online, fail and report the + * error, since setting an unconfigured interface online + * automatically turns on IPv6 autoconfig, which may not be what + * the admin expects, so we want them to explicitly enable the PF + * in the host system network config. + */ + if (virNetDevGetOnline(pflinkdev, &pfIsOnline) < 0) + goto cleanup; + if (!pfIsOnline) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Unable to configure VF %d of PF '%s' " + "because the PF is not online. Please " + "change host network config to put the " + "PF online.", + vf, pflinkdev); + goto cleanup; + } if (virNetDevGetVfConfig(pflinkdev, vf, &oldmac, &oldvlanid) < 0) goto cleanup; -- 2.1.0

2 1

[libvirt] Plans for next release
by Daniel Veillard 23 May '15

23 May '15

if we want to get it by next month, we should probably freeze on Tuesday for an 1.2.16 on June 1st, we 'only' have 137 commits since 1.2.15 but sticking to the monthly release is important. I hope this works for everybody, thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] official libvirt mirror on github?
by Cole Robinson 22 May '15

22 May '15

Hey all, Anyone considered setting up libvirt*.git mirrors on github? Given the popularity of github these days, IMO it's unfortunate we don't have an official mirror on there. As far as the actual mirroring though, we'd probably need to set up hooks on libvirt.org to push new commits up to github, there doesn't appear to be any better way than that. Thoughts? - Cole

9 18

[libvirt] [PATCHv2] util: make it more robust to calculate timeout value
by Wang Yufei 22 May '15

22 May '15

From: Zhang Bo <oscar.zhangbo(a)huawei.com> When we change system clock to years ago, a certain CPU may use up 100% cputime. The reason is that in function virEventPollCalculateTimeout(), we assign the unsigned long long result to an INT variable, *timeout = then - now; // timeout is INT, and then/now are long long if (*timeout < 0) *timeout = 0; there's a chance that variable @then minus variable @now may be a very large number that overflows INT value expression, then *timeout will be negative and be assigned to 0. Next the 'poll' in function virEventPollRunOnce() will get into an 'endless' while loop there. thus, the cpu that virEventPollRunOnce() thread runs on will go up to 100%. Although as we discussed before in https://www.redhat.com/archives/libvir-list/2015-May/msg00400.html it should be prohibited to set-time while other applications are running, but it does seems to have no harm to make the codes more robust. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/vireventpoll.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index ffda206..9c9e7af 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -357,9 +357,12 @@ static int virEventPollCalculateTimeout(int *timeout) return -1; EVENT_DEBUG("Schedule timeout then=%llu now=%llu", then, now); - *timeout = then - now; - if (*timeout < 0) + if (then <= now) { *timeout = 0; + } else { + *timeout = (int) (then - now); + *timeout = (*timeout > 0) ? (*timeout) : (*timeout)*(-1); + } } else { *timeout = -1; } -- 1.7.12.4

2 1

[libvirt] [PATCH] Fix to list online cpus using virsh capabilities
by Kothapally Madhu Pavan 22 May '15

22 May '15

Virsh capabilities will list offline cpus as online when libvirt is compiled with numactl option disabled. This fix will list correct set of online cpus. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 22df95c..602c76c 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1639,28 +1639,38 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) { virNodeInfo nodeinfo; virCapsHostNUMACellCPUPtr cpus; - int ncpus; + int ncpus, onlinecpus; int s, c, t; - int id; + int id, cid; + char *sysfs_cpudir = NULL; if (nodeGetInfo(&nodeinfo) < 0) return -1; ncpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + onlinecpus = nodeinfo.cpus; + + if (VIR_ALLOC_N(cpus, onlinecpus) < 0) + return -1; - if (VIR_ALLOC_N(cpus, ncpus) < 0) + if (virAsprintf(&sysfs_cpudir, SYSFS_CPU_PATH) < 0) return -1; id = 0; + cid = 0; for (s = 0; s < nodeinfo.sockets; s++) { for (c = 0; c < nodeinfo.cores; c++) { for (t = 0; t < nodeinfo.threads; t++) { - cpus[id].id = id; - cpus[id].socket_id = s; - cpus[id].core_id = c; - if (!(cpus[id].siblings = virBitmapNew(ncpus))) - goto error; - ignore_value(virBitmapSetBit(cpus[id].siblings, id)); + if (virNodeGetCpuValue(sysfs_cpudir, id, "online", 0)) { + cpus[cid].id = id; + cpus[cid].socket_id = s; + cpus[cid].core_id = c; + if (!(cpus[cid].siblings = virBitmapNew(ncpus))) + goto error; + ignore_value(virBitmapSetBit(cpus[cid].siblings, id)); + cid++; + } + id++; } } @@ -1668,17 +1678,19 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) if (virCapabilitiesAddHostNUMACell(caps, 0, nodeinfo.memory, - ncpus, cpus, + onlinecpus, cpus, 0, NULL, 0, NULL) < 0) goto error; + VIR_FREE(sysfs_cpudir); return 0; error: - for (; id >= 0; id--) - virBitmapFree(cpus[id].siblings); + for (; cid >= 0; cid--) + virBitmapFree(cpus[cid].siblings); VIR_FREE(cpus); + VIR_FREE(sysfs_cpudir); return -1; }

2 1

[libvirt] [PATCH v5] inspector: recognize ppc64 and ppc64le archs (RHBZ#1211996)
by Maros Zatko 22 May '15

22 May '15

Patch extracts MSB/LSB info from /bin/file output and passes it as separate parameret from elf_arch. Then it is sent to impl_file_architecture and checked/ Modified magic_for_file to handle regex changes. Now with tests for file_architecture, and error reporting for unknown endianness. Fixes: RHBZ#1211996 Maros Zatko (1): inspector: recognize ppc64 and ppc64le archs (RHBZ#1211996) generator/actions.ml | 8 ++++++++ src/filearch.c | 28 +++++++++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) -- 1.9.3

2 3

[libvirt] [PATCH 0/3] Three simple bugfixes
by Laine Stump 22 May '15

22 May '15

Patch 1 was posted several days ago, but may have gotten lost in the stream, so I'm reposting it. (The patches are unrelated other than that they are nominally related to networking, they were all in my queue at the same time, and they're all three very short. I'm just posting them together to make it easier to keep track of them.) Laine Stump (3): netdev: fail when setting up an SRIOV VF if PF is offline interface: allow multiple IPv4 addresses + dhcp on a single interface util: better error message after failure to initialize firewall backend docs/schemas/interface.rng | 28 ++++++++++------------ src/util/virfirewall.c | 10 +++++++- src/util/virnetdev.c | 22 +++++++++++++++++ .../ethernet-dhcp-and-multi-static.xml | 9 +++++++ tests/interfacexml2xmltest.c | 1 + 5 files changed, 54 insertions(+), 16 deletions(-) create mode 100644 tests/interfaceschemadata/ethernet-dhcp-and-multi-static.xml -- 2.1.0

2 5

[libvirt] [PATCH] conf: fix issue on virCPUDefCopy
by Thibaut Collet 22 May '15

22 May '15

This patch is only for maintenance branches v1.2.9-maint, v1.2.10-maint, v1.2.11-maint and v1.2.12-maint Thibaut Collet (1): conf: fix issue on virCPUDefCopy src/conf/cpu_conf.c | 1 + 1 file changed, 1 insertion(+) -- 1.7.10.4

2 2

[libvirt] [RFC PATCH 0/2] Clear capabilities cache options
by John Ferlan 22 May '15

22 May '15

Posting this as an RFC since I'm trying to get upstream feedback on whether either approach is better or whether perhaps both approaches should be used. The problem occurred primarily for downstream installations where it seems the order of the build libvirtd caused issues regarding whether certain capabilities bits were present. Although the history of the case doesn't "prove" my theory exactly other issues around the same time that were part of a private bz or email stream (I forget now) seem to indicate that the order of libvirtd builds and installations would be very important as they relate to when the cache is rebuilt. In the instances seen there was lots of testing going on related to whether patches were found in a 'maintenance release' and the 'mainline release'. Since the process is build the mainline first and then backport the patch(es) to the maintenance release, it's possible the date of the maintenance libvirtd would be later than that of the mainline release. If testing installs the maintenance release first and the cache gets updated based on the 'ctime' of libvirtd being later than what was currently installed and then the mainline release is installed with a libvirtd 'ctime' that would possibly be prior to that of the maintentance release, then the cache wouldn't be updated. The fix for testing has been just to delete the cache. In looking at the code and history, I see a couple possible solutions. The first seems to be a "big hammer" - on every libvirtd installation we delete the entire cache - this would force the reread. I believe I got that right using %post of the install to clear out anything in the capabilities directory (whether just created or already existing from some prior installation). Another solution was to adjust the libvirtd 'ctime' check to be if different than what is found in the cache. When looking at the original commit, this seems to be what the intention was in the commit message, but the actual code was slightly different. Upstream review comments for changes didn't mention the difference either, see: http://www.redhat.com/archives/libvir-list/2014-March/msg00629.html and https://www.redhat.com/archives/libvir-list/2014-March/msg00301.html John Ferlan (2): spec: Remove capabilities cache during %post install qemu: Force capabilities cache read if libvirtd date is different libvirt.spec.in | 11 +++++++++++ src/qemu/qemu_capabilities.c | 6 ++++-- 2 files changed, 15 insertions(+), 2 deletions(-) -- 2.1.0

4 15

[libvirt] RFC: exposing qemu's block-set-write-threshold
by Eric Blake 22 May '15

22 May '15

I'm trying to wire up libvirt to do event reporting based on qemu 2.3's BLOCK_WRITE_THRESHOLD event. Doing this will allow management applications to do event-based notification on when to enlarge LVM (or other) storage underlying a qcow2 volume, rather than their current requirement to frequently poll block statistics. But I'm stuck on the best way to expose the new parameter: One idea is to treat it as part of the domain XML, and have virDomainSetBlockIoTune add one more typed parameter for a disk's current write threshold. Doing this could allow setting a threshold even for an offline domain (although the threshold is only meaningful for a running domain), but might get weird because qemu's event is one-shot (you have to re-arm a new threshold every time an existing threshold fires - so every time it fires, the domain XML is rewritten, even though it is not guest-visible ABI that was changing). At least with this approach, it is also easy for a client to poll the current setting of the threshold, via virDomainGetBlockIoTune. But the threshold isn't quite a tuning parameter (it isn't throttling how fast the guest can write to the block device, only how full the host side can get in order to allow transparent resizing of the host storage prior to running out of space). Another idea is to add a completely new API, maybe named virDomainBlockSetWriteThreshold(virDomainPtr dom, const char *disk, long long int threshold, unsigned int flags) (with threshold in bytes). Here, virDomainBlockStatsFlags() could be a way to query the current threshold. And if desired, we could add a flag value to treat threshold as a percentage instead of a byte value (but is 1% too large of granularity, and how would you scale the percentage to anything finer while still keeping the parameter as long long int rather than double?) Of course, I'd want virConnectGetAllDomainStats() to list the current threshold setting (0 if no threshold or if the event has already fired, non-zero if the threshold is still set waiting to fire), so that clients can query thresholds for multiple domains and multiple disks per domain in one API call. But I don't know if we have any good way to set multiple thresholds in one call (at least virDomainSetBlockIoTune must be called once per disk; it might be possible for my proposed virDomainBlockStatsFlags() to set a threshold for multiple disks if the disk name is passed as NULL - but then we're back to the question of what happens if the guest has multiple disks of different sizes; it's better to set per-disk thresholds than to assume all disks must be at the same byte or percentage threshold). I'm also worried about what happens across libvirtd restarts - if the qemu event fires while libvirtd is unconnected, should libvirt be tracking that a threshold was registered in the XML, and upon reconnection check if qemu still has the threshold? If qemu no longer has a threshold, then libvirt can assume it missed the event, and generate one as part of reconnecting to the domain. Thoughts? If I don't hear anything, I'll base my first implementation on adding a new API, rather than reusing virDomainSetBlockIoTune. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 8

[libvirt] [PATCH] conf: fix forget restore ctxt->node when parse memory device success
by Luyao Huang 22 May '15

22 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1223631 When set a memory device in the xml, <sysinfo> in xml will be lost. Because we forgot restore ctxt->node to the oldnode after parse memory device, this will make the parse function after virDomainMemoryDefParseXML cannot find a node they need when parse a full xml(virDomainDefParseXML). Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bfdc94e..7ddc1ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11828,6 +11828,7 @@ virDomainMemoryDefParseXML(xmlNodePtr memdevNode, if (virDomainDeviceInfoParseXML(memdevNode, NULL, &def->info, flags) < 0) goto error; + ctxt->node = save; return def; error: -- 1.8.3.1

4 4

[libvirt] [PATCH] virsh: fix a typos issue cause error not right
by Luyao Huang 22 May '15

22 May '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index a72fd05..e939dac 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -500,7 +500,7 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptScaledInt(cmd, "pagesize", &tmp, 1024, UINT_MAX) < 0) { vshError(ctl, _("Numeric value for <%s> option is malformed or out of range"), - "cellno"); + "pagesize"); return false; } pageSizes[0] = VIR_DIV_UP(tmp, 1024); -- 1.8.3.1

3 2

[libvirt] [PATCH v2 0/5] storage: fs: tweak dir perms handling on build
by Cole Robinson 21 May '15

21 May '15

Consider the following issue - Using virt-manager with qemu:///session - User adds a storage pool pointing at /tmp. No explicit permissions are requested in the XML - virt-manager calls PoolDefine, then PoolBuild - libvirt tries to unconditionally chmod 755 /tmp. This fails because my user doesn't own root. Pool build fails, virt-manager reports failure Yes there's a couple ways we could avoid this specific case in virt-manager, but I think it makes more sense to have pool.build on a directory be a no-op in this case. The following patches address this. I already pushed some bits of v1 of the series. Now the patches are: - Patch 1 (new) fixes a bug in the previous patches I pushed - Patch 2 (new) changes storage XML to not output -1 for owner/group - Patch 3 changes storage XML to not hardcode a <mode> value if the user didn't specify one in. - Patch 4 (new) drops a redundant flag to virDirCreate - Patch 5 makes pool.build skip dir chmod unless the user explicitly requested <mode> via the XML. However if a mode is required for mkdir, continue to use the previous default. v2: Add patches 1, 3, 4, adjust other patches to match Style fix in patch 5 Cole Robinson (5): virfile: virDirCreate: Fix ALLOW_EXIST conditional storage: conf: Don't output owner/group -1 storage: conf: Don't set any default <mode> in the XML virfile: virDirCreate: Drop redundand FORCE_PERMS flag storage: fs: Only force directory permissions if required docs/schemas/storagecommon.rng | 36 ++++++++------ src/conf/storage_conf.c | 57 +++++++++++----------- src/storage/storage_backend.c | 20 ++++++-- src/storage/storage_backend.h | 3 ++ src/storage/storage_backend_fs.c | 21 +++++--- src/storage/storage_backend_logical.c | 4 +- src/util/virfile.c | 8 ++- src/util/virfile.h | 3 +- tests/storagepoolxml2xmlout/pool-dir-naming.xml | 2 - tests/storagepoolxml2xmlout/pool-dir.xml | 2 - tests/storagepoolxml2xmlout/pool-netfs-gluster.xml | 3 -- tests/storagevolxml2xmlin/vol-file.xml | 4 +- .../vol-gluster-dir-neg-uid.xml | 2 - tests/storagevolxml2xmlout/vol-gluster-dir.xml | 3 -- tests/storagevolxml2xmlout/vol-sheepdog.xml | 3 -- 15 files changed, 91 insertions(+), 80 deletions(-) -- 2.4.0

4 15

[libvirt] [PATCH] build fix: fix libvirt build if WITH_HAL is defined
by Maxim Nestratov 21 May '15

21 May '15

--- src/node_device/node_device_hal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 2d3bc17..6d18a87 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -372,7 +372,7 @@ gather_capability(LibHalContext *ctx, const char *udi, virNodeDevCapsDefPtr caps; if (VIR_ALLOC(caps) < 0) return ENOMEM; - caps->type = entry->type; + caps->data.type = entry->type; if (entry->gather_fn) { int rv = (*entry->gather_fn)(ctx, udi, &caps->data); if (rv != 0) { -- 2.1.0

2 1

[libvirt] [PATCH v2] sysinfo: Fix reports on ARM
by Michal Privoznik 21 May '15

21 May '15

Due to a kernel commit (b4b8f770e), cpuinfo format has changed on ARMs. Firstly, 'Processor: ...' may not be reported, it's replaced by 'model name: ...'. Secondly, the "Processor" string may occur in CPU name, e.g. 'ARMv7 Processor rev 5 (v7l)'. Therefore, we must firstly look for 'model name' and then for 'Processor' if not found. Moreover, lines in the cpuinfo file are shuffled, so we better not manipulate the pointer to start of internal buffer as we may lost some info. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Jan's comments worked in - added new test case (yes, there really is a space at EOL in cpuinfo on my ARM) src/util/virsysinfo.c | 9 +++---- tests/sysinfodata/arm-rpi2cpuinfo.data | 43 ++++++++++++++++++++++++++++++++ tests/sysinfodata/arm-rpi2sysinfo.expect | 18 +++++++++++++ tests/sysinfotest.c | 22 ++++++++++++---- 4 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 tests/sysinfodata/arm-rpi2cpuinfo.data create mode 100644 tests/sysinfodata/arm-rpi2sysinfo.expect diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 8bb17f0..40390ab 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -289,16 +289,15 @@ virSysinfoParseProcessor(const char *base, virSysinfoDefPtr ret) virSysinfoProcessorDefPtr processor; char *processor_type = NULL; - if (!(tmp_base = strstr(base, "Processor"))) + if (!(tmp_base = strstr(base, "model name")) && + !(tmp_base = strstr(base, "Processor"))) return 0; - base = tmp_base; - eol = strchr(base, '\n'); - cur = strchr(base, ':') + 1; + eol = strchr(tmp_base, '\n'); + cur = strchr(tmp_base, ':') + 1; virSkipSpaces(&cur); if (eol && VIR_STRNDUP(processor_type, cur, eol - cur) < 0) goto error; - base = cur; while ((tmp_base = strstr(base, "processor")) != NULL) { base = tmp_base; diff --git a/tests/sysinfodata/arm-rpi2cpuinfo.data b/tests/sysinfodata/arm-rpi2cpuinfo.data new file mode 100644 index 0000000..41fde00 --- /dev/null +++ b/tests/sysinfodata/arm-rpi2cpuinfo.data @@ -0,0 +1,43 @@ +processor : 0 +model name : ARMv7 Processor rev 5 (v7l) +BogoMIPS : 38.40 +Features : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x0 +CPU part : 0xc07 +CPU revision : 5 + +processor : 1 +model name : ARMv7 Processor rev 5 (v7l) +BogoMIPS : 38.40 +Features : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x0 +CPU part : 0xc07 +CPU revision : 5 + +processor : 2 +model name : ARMv7 Processor rev 5 (v7l) +BogoMIPS : 38.40 +Features : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x0 +CPU part : 0xc07 +CPU revision : 5 + +processor : 3 +model name : ARMv7 Processor rev 5 (v7l) +BogoMIPS : 38.40 +Features : half thumb fastmult vfp edsp neon vfpv3 tls vfpv4 idiva idivt vfpd32 lpae evtstrm +CPU implementer : 0x41 +CPU architecture: 7 +CPU variant : 0x0 +CPU part : 0xc07 +CPU revision : 5 + +Hardware : BCM2709 +Revision : a01041 +Serial : 00000000c9e9323d diff --git a/tests/sysinfodata/arm-rpi2sysinfo.expect b/tests/sysinfodata/arm-rpi2sysinfo.expect new file mode 100644 index 0000000..acb3ad9 --- /dev/null +++ b/tests/sysinfodata/arm-rpi2sysinfo.expect @@ -0,0 +1,18 @@ +<sysinfo type='smbios'> + <processor> + <entry name='socket_destination'>0</entry> + <entry name='type'>ARMv7 Processor rev 5 (v7l)</entry> + </processor> + <processor> + <entry name='socket_destination'>1</entry> + <entry name='type'>ARMv7 Processor rev 5 (v7l)</entry> + </processor> + <processor> + <entry name='socket_destination'>2</entry> + <entry name='type'>ARMv7 Processor rev 5 (v7l)</entry> + </processor> + <processor> + <entry name='socket_destination'>3</entry> + <entry name='type'>ARMv7 Processor rev 5 (v7l)</entry> + </processor> +</sysinfo> diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index d8266a7..74e5f71 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -166,11 +166,23 @@ VIRT_TEST_MAIN(test_x86) static int test_arm(void) { - return sysinfotest_run("arm sysinfo", - NULL, - NULL, - "/sysinfodata/armcpuinfo.data", - "/sysinfodata/armsysinfo.expect"); + int ret = EXIT_SUCCESS; + + if (sysinfotest_run("arm sysinfo", + NULL, + NULL, + "/sysinfodata/armcpuinfo.data", + "/sysinfodata/armsysinfo.expect") != EXIT_SUCCESS) + ret = EXIT_FAILURE; + + if (sysinfotest_run("Raspberry Pi 2 sysinfo", + NULL, + NULL, + "/sysinfodata/arm-rpi2cpuinfo.data", + "/sysinfodata/arm-rpi2sysinfo.expect") != EXIT_SUCCESS) + ret = EXIT_FAILURE; + + return ret; } VIRT_TEST_MAIN(test_arm) -- 2.3.6

3 2

[libvirt] [PATCH] util: Avoid shadow of 'ulong' in virMemoryMaxValue
by Peter Krempa 21 May '15

21 May '15

Old compilers whine: src/util/virutil.c: In function 'virMemoryMaxValue': src/util/virutil.c:2612: error: declaration of 'ulong' shadows a global declaration [-Wshadow] /usr/include/sys/types.h:151: error: shadowed declaration is here [-Wshadow] s/ulong/capped/ to work around the problem ---1 Pushed under the trivial && build-breaker rules. src/util/virutil.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 638d6e2..e479cce 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2603,17 +2603,17 @@ virMemoryLimitIsSet(unsigned long long value) /** * virMemoryMaxValue * - * @ulong: whether the value must fit into unsigned long + * @capped: whether the value must fit into unsigned long * (long long is assumed otherwise) * * Returns the maximum possible memory value in bytes. */ unsigned long long -virMemoryMaxValue(bool ulong) +virMemoryMaxValue(bool capped) { /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ - if (ulong && sizeof(unsigned long) < sizeof(long long)) + if (capped && sizeof(unsigned long) < sizeof(long long)) return 1024ull * ULONG_MAX; else return LLONG_MAX; -- 2.3.5

1 0

[libvirt] [PATCH 0/3] Support changing user passwords in the guest
by Ján Tomko 21 May '15

21 May '15

The guest-set-user-password command was added to qemu-agent in the 2.3.0 release by Daniel Berrange (some of you might have heard of him): commit 215a2771a7b6b29037ee8deba484815d816b6fdd qga: add guest-set-user-password command http://git.qemu.org/?p=qemu.git;a=commitdiff;h=215a277 This mini-series introduces a libvirt API, set_password ACL, a virsh command and wires up the API in the QEMU driver. Any bikesh^Wsuggestions regarding the API naming and the order of the virsh parameters are welcome. Ján Tomko (3): Introduce virDomainSetUserPassword API virsh: add set-user-password command qemu: wire up virDomainSetUserPassword include/libvirt/libvirt-domain.h | 9 +++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 6 ++++ src/driver-hypervisor.h | 7 ++++ src/libvirt-domain.c | 47 +++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_agent.c | 39 +++++++++++++++++++++ src/qemu/qemu_agent.h | 4 +++ src/qemu/qemu_driver.c | 55 +++++++++++++++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 +++++++- src/remote_protocol-structs | 7 ++++ tools/virsh-domain.c | 76 ++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 11 ++++++ 14 files changed, 282 insertions(+), 2 deletions(-) -- 2.0.5

3 9

[libvirt] [PATCH 0/3] parallels: fix prlsdkLoadDomain and prlsdkAddDomain
by Maxim Nestratov 21 May '15

21 May '15

Maxim Nestratov (3): parallels: fix prlsdkAddDomain parallels: move up updating autostart parameter in prlsdkLoadDomain parallels: fix possible crash in case of errors in prlsdkLoadDomain src/parallels/parallels_sdk.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) -- 2.1.0

5 15

[libvirt] [PATCH 0/2] Add and use for virDomainDiskIndexBy*
by Jiri Denemark 21 May '15

21 May '15

Sometimes the only thing we need is the pointer to virDomainDiskDef and having to call virDomainDiskIndexBy* APIs, storing the disk index, and looking it up in the disks array is ugly. After this patch, we can just call virDomainDiskBy* and get the pointer in one step. Jiri Denemark (2): Add wrappers for virDomainDiskIndexBy* Use virDomainDiskByName where appropriate src/conf/domain_conf.c | 20 +++++++++++++++ src/conf/domain_conf.h | 8 ++++++ src/libvirt_private.syms | 2 ++ src/libxl/libxl_driver.c | 4 +-- src/lxc/lxc_driver.c | 10 +++----- src/qemu/qemu_agent.c | 9 ++++--- src/qemu/qemu_blockjob.c | 5 ++-- src/qemu/qemu_driver.c | 62 ++++++++++++++++++----------------------------- src/qemu/qemu_migration.c | 6 ++--- src/qemu/qemu_process.c | 23 ++++-------------- 10 files changed, 72 insertions(+), 77 deletions(-) -- 2.4.1

4 9

[libvirt] [PATCH] threadpool: Switch to detached threads
by Jiri Denemark 21 May '15

21 May '15

Using joinable threads does not help anything, but it can lead to memory leaks. When a worker thread exits, it decreases nWorkers or nPrioWorkers and once both nWorkers and nPrioWorkers are zero (i.e., the last worker is gone), quit_cond is signaled. When freeing the pool we first tell all threads to die and then we are waiting for both nWorkers and nPrioWorkers to become zero. At this point we already know all threads are gone. So the only reason for calling virThreadJoin of all workers is to free the memory allocated for joinable threads. If we avoid allocating this memory, we don't need to take care of freeing it. Moreover, any memory associated with a worker thread which died before we asked it to die (e.g., because virCondWait failed in the thread) would be lost anyway since virThreadPoolFree calls virThreadJoin only for threads which were running at the time virThreadPoolFree was called. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/util/virthreadpool.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c index ed22486..f640448 100644 --- a/src/util/virthreadpool.c +++ b/src/util/virthreadpool.c @@ -201,7 +201,7 @@ virThreadPoolNewFull(size_t minWorkers, data->cond = &pool->cond; if (virThreadCreateFull(&pool->workers[i], - true, + false, virThreadPoolWorker, pool->jobFuncName, true, @@ -225,7 +225,7 @@ virThreadPoolNewFull(size_t minWorkers, data->priority = true; if (virThreadCreateFull(&pool->prioWorkers[i], - true, + false, virThreadPoolWorker, pool->jobFuncName, true, @@ -249,16 +249,11 @@ void virThreadPoolFree(virThreadPoolPtr pool) { virThreadPoolJobPtr job; bool priority = false; - size_t i; - size_t nWorkers; - size_t nPrioWorkers; if (!pool) return; virMutexLock(&pool->mutex); - nWorkers = pool->nWorkers; - nPrioWorkers = pool->nPrioWorkers; pool->quit = true; if (pool->nWorkers > 0) virCondBroadcast(&pool->cond); @@ -275,12 +270,6 @@ void virThreadPoolFree(virThreadPoolPtr pool) VIR_FREE(job); } - for (i = 0; i < nWorkers; i++) - virThreadJoin(&pool->workers[i]); - - for (i = 0; i < nPrioWorkers; i++) - virThreadJoin(&pool->prioWorkers[i]); - VIR_FREE(pool->workers); virMutexUnlock(&pool->mutex); virMutexDestroy(&pool->mutex); @@ -338,7 +327,7 @@ int virThreadPoolSendJob(virThreadPoolPtr pool, data->cond = &pool->cond; if (virThreadCreateFull(&pool->workers[pool->nWorkers - 1], - true, + false, virThreadPoolWorker, pool->jobFuncName, true, -- 2.4.1

2 4

[libvirt] [PATCH] qemu: Log error if domain uses security driver which is not loaded
by Erik Skultety 21 May '15

21 May '15

When starting a domain, if we find out domain requests security drivers we do not have loaded, we fail. However we don't check for this during reconnect, so any operation relying on security driver functionality would fail. If someone e.g. starts a domain with selinux driver loaded, then they turn off the security driver in config, restart the daemon and call dump/save/.., QEMU returns an error. As we shouldn't kill the domain, we should at least log an error to let the user know that domain reconnect wasn't completely clean. https://bugzilla.redhat.com/show_bug.cgi?id=1183893 --- src/qemu/qemu_process.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 56719eb..8da79e5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3747,6 +3747,12 @@ qemuProcessReconnect(void *opaque) if ((qemuDomainAssignAddresses(obj->def, priv->qemuCaps, obj)) < 0) goto error; + /* if domain requests security driver we haven't loaded, report error, but + * do not kill the domain + */ + ignore_value(virSecurityManagerCheckAllLabel(driver->securityManager, + obj->def)); + if (virSecurityManagerReserveLabel(driver->securityManager, obj->def, obj->pid) < 0) goto error; -- 1.9.3

3 2

[libvirt] [PATCH 0/3] virsh: Fix and enhance handling of numeric options
by Andrea Bolognani 21 May '15

21 May '15

The first commit improves error messages by making them much more consistent and a little bit more helpful to the user. The other two commits contain smaller fixes and enhancement. Andrea Bolognani (3): virsh: Improve error message on integer value parsing failure. virsh: Fix dommemstat --period option type. virsh: Improve handling of send-process-signal --pid. tests/vcpupin | 4 +- tools/virsh-domain-monitor.c | 12 +++-- tools/virsh-domain.c | 114 ++++++++++++++++++++++++++++++------------- tools/virsh-host.c | 44 ++++++++++++----- tools/virsh-interface.c | 4 +- tools/virsh-network.c | 4 +- tools/virsh-volume.c | 16 ++++-- 7 files changed, 141 insertions(+), 57 deletions(-) -- 2.1.0

2 6

[libvirt] [PATCH 0/2] Fix virsh nodeset on shutoff domains
by Michal Privoznik 21 May '15

21 May '15

This goes on the top of Martin's (ACKed) patch: https://www.redhat.com/archives/libvir-list/2015-May/msg00585.html Michal Privoznik (2): virDomainNumatuneGetMode: Report if numatune was defined qemuDomainGetNumaParameters: Don't report spurious info src/conf/numa_conf.c | 38 ++++++++++++++++++++++-------- src/conf/numa_conf.h | 5 ++-- src/lxc/lxc_cgroup.c | 5 ++-- src/lxc/lxc_controller.c | 30 ++++++++++++------------ src/parallels/parallels_sdk.c | 5 ++-- src/qemu/qemu_cgroup.c | 15 +++++++----- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_driver.c | 54 ++++++++++++++++++++++++++++--------------- src/qemu/qemu_process.c | 28 +++++++++++----------- 9 files changed, 113 insertions(+), 71 deletions(-) -- 2.3.6

2 6

[libvirt] [libvirt-python 0/3] reproducible builds
by Guido Günther 20 May '15

20 May '15

Debian tries to make builds reporducible[0] therefore we need predictable output (i.e. no timestamps, predictable iteration over hashes, etc.). This patch (mostly by Chris Lamb) to libvirt-python makes the necessary changes. [0] https://wiki.debian.org/ReproducibleBuilds Guido Günther (3): Sort dictionary keys Simplify sorting Sort tuples on both items generator.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) -- 2.1.4

2 7

[libvirt] [PATCH v3 0/4] Introduce pci-serial
by Michal Privoznik 20 May '15

20 May '15

diff to v2: - Allocate address on domain define diff to v1: - Fix hot(un-)plug Michal Privoznik (4): Introduce pci-serial qemu: Implement pci-serial qemuDomainAttachChrDevice: Fix chardev hotplug qemuDomainDetachChrDevice: Fix chardev hot-unplug docs/formatdomain.html.in | 16 ++++++---- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 30 +++++++++++++++++- src/qemu/qemu_hotplug.c | 36 ++++++++++++++++----- tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + .../qemuxml2argv-pci-serial-dev-chardev.args | 7 ++++ .../qemuxml2argv-pci-serial-dev-chardev.xml | 37 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ tests/qemuxml2xmltest.c | 1 + 18 files changed, 128 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.xml -- 2.3.6

2 8

[libvirt] [PATCH] conf: Catch memory size overflow earlier
by Peter Krempa 20 May '15

20 May '15

virDomainParseMemory parses the size and then rounds up while converting it to kibibytes. Since the number is limit-checked before the rounding it's possible to use a number that would be correctly parsed the first time, but not the second time. For numbers not limited to 32 bit systems the magic is 9223372036854775807 bytes. That number then can't be parsed back in kibibytes. To solve the issue add a second overflow check for the few values that would cause the problem. Since virDomainParseMemory is used in config parsing, this avoids vanishing VMs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1221504 --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bfdc94e..ba4f430 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7237,6 +7237,13 @@ virDomainParseMemory(const char *xpath, /* Yes, we really do use kibibytes for our internal sizing. */ *mem = VIR_DIV_UP(bytes, 1024); + + if (*mem >= VIR_DIV_UP(max, 1024)) { + virReportError(VIR_ERR_OVERFLOW, "%s", _("size value too large")); + ret = -1; + goto cleanup; + } + ret = 0; cleanup: return ret; -- 2.3.5

2 2

[libvirt] [PATCH] Taint domains using cdrom-passthrough
by John Ferlan 20 May '15

20 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=976387 For a domain configured using the host cdrom, we should taint the domain due to problems encountered when the host and guest try to control the tray. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_domain.c | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index add857c..a67e200 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -101,7 +101,8 @@ VIR_ENUM_IMPL(virDomainTaint, VIR_DOMAIN_TAINT_LAST, "disk-probing", "external-launch", "host-cpu", - "hook-script"); + "hook-script", + "cdrom-passthrough"); VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "qemu", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2cd105a7..0867e8b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2280,6 +2280,7 @@ typedef enum { VIR_DOMAIN_TAINT_EXTERNAL_LAUNCH, /* Externally launched guest domain */ VIR_DOMAIN_TAINT_HOST_CPU, /* Host CPU passthrough in use */ VIR_DOMAIN_TAINT_HOOK, /* Domain (possibly) changed via hook script */ + VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH,/* CDROM passthrough */ VIR_DOMAIN_TAINT_LAST } virDomainTaintFlags; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fa8229f..b66ee89 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2031,6 +2031,12 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver, qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, logFD); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM && + virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_BLOCK && + disk->src->path) + qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CDROM_PASSTHROUGH, + logFD); + virObjectUnref(cfg); } -- 2.1.0

2 4

[libvirt] [PATCH 0/3] Introduce yet another type to SMBIOS
by Michal Privoznik 20 May '15

20 May '15

The specification is here: http://www.dmtf.org/sites/default/files/standards/documents/DSP0134_3.0.0.p… The first two patches rework the code a bit, and the last one adds something useful. Michal Privoznik (3): virSysinfoDef: Exempt BIOS variables virSysinfoDef: Exempt SYSTEM variables virSysinfo: Introduce SMBIOS type 2 support docs/formatdomain.html.in | 37 +- docs/schemas/domaincommon.rng | 24 ++ src/conf/domain_conf.c | 252 ++++++++--- src/libvirt_private.syms | 3 + src/qemu/qemu_command.c | 112 +++-- src/util/virsysinfo.c | 528 +++++++++++++++++++----- src/util/virsysinfo.h | 51 ++- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 9 + 9 files changed, 804 insertions(+), 214 deletions(-) -- 2.3.6

2 7

[libvirt] [python PATCHv2] examples: Add example to make guest agent lifecycle event useful
by Peter Krempa 19 May '15

19 May '15

This example allows to use the guest agent event and metadata to track vCPU count set via the guest agent (agent-based onlining/offlining) and keep it persistent accross domain restarts. The daemon listens for the agent lifecycle event, and if it's received it looks into doman's metadata to see whether a desired count was set and issues the guest agent command. --- MANIFEST.in | 2 + examples/README | 2 + examples/guest-vcpus/guest-vcpu-daemon.py | 160 ++++++++++++++++++++++++++++++ examples/guest-vcpus/guest-vcpu.py | 74 ++++++++++++++ 4 files changed, 238 insertions(+) create mode 100755 examples/guest-vcpus/guest-vcpu-daemon.py create mode 100755 examples/guest-vcpus/guest-vcpu.py diff --git a/MANIFEST.in b/MANIFEST.in index ad08207..230baea 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,6 +11,8 @@ include examples/domsave.py include examples/domstart.py include examples/esxlist.py include examples/event-test.py +include examples/guest-vcpus/guest-vcpu-daemon.py +include examples/guest-vcpus/guest-vcpu.py include examples/topology.py include generator.py include libvirt-lxc-override-api.xml diff --git a/examples/README b/examples/README index 1d4b425..0cb4513 100644 --- a/examples/README +++ b/examples/README @@ -12,6 +12,8 @@ esxlist.py - list active domains of an VMware ESX host and print some info. also demonstrates how to use the libvirt.openAuth() method dhcpleases.py - list dhcp leases for a given virtual network domipaddrs.py - list IP addresses for guest domains +guest-vcpus - two helpers to make the guest agent event useful with agent based + vCPU state modification The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed diff --git a/examples/guest-vcpus/guest-vcpu-daemon.py b/examples/guest-vcpus/guest-vcpu-daemon.py new file mode 100755 index 0000000..c7c08a8 --- /dev/null +++ b/examples/guest-vcpus/guest-vcpu-daemon.py @@ -0,0 +1,160 @@ +#!/usr/bin/env python + +import libvirt +import threading +from xml.dom import minidom +import time +import sys +import getopt +import os + +uri = "qemu:///system" +customXMLuri = "guest-cpu.python.libvirt.org" +connectRetryTimeout = 5 + +def usage(): + print("usage: "+os.path.basename(sys.argv[0])+" [-h] [uri]") + print(" uri will default to qemu:///system") + print(" --help, -h Print(this help message") + print("") + print("This service waits for the guest agent lifecycle event and reissues " + + "guest agent calls to modify the cpu count according to the metadata " + + "set by guest-vcpu.py example") + +class workerData: + def __init__(self): + self.doms = list() + self.conn = None + self.cond = threading.Condition() + + def notify(self): + self.cond.acquire() + self.cond.notify() + self.cond.release() + + def waitNotify(self): + self.cond.acquire() + self.cond.wait() + self.cond.release() + + def addDomainNotify(self, dom): + self.doms.append(dom) + self.notify() + + def closeConnectNotify(self): + conn = self.conn + self.conn = None + conn.close() + self.notify() + + def setConnect(self, conn): + self.conn = conn + + def hasConn(self): + return self.conn is not None + + def hasDom(self): + return len(self.doms) > 0 + + def getDom(self): + return self.doms.pop() + + def setDoms(self, doms): + self.doms = doms + + +def virEventLoopNativeRun(): + while True: + libvirt.virEventRunDefaultImpl() + +def handleAgentLifecycleEvent(conn, dom, state, reason, opaque): + if state == libvirt.VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_STATE_CONNECTED: + opaque.addDomainNotify(dom) + +def handleConnectClose(conn, reason, opaque): + print('Disconnected from ' + uri) + opaque.closeConnectNotify() + +def handleLibvirtLibraryError(opaque, error): + pass + +def processAgentConnect(dom): + try: + cpus = dom.metadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, customXMLuri, + libvirt.VIR_DOMAIN_AFFECT_LIVE) + doc = minidom.parseString(cpus) + ncpus = int(doc.getElementsByTagName('ncpus')[0].getAttribute('count')) + except: + return + + try: + dom.setVcpusFlags(ncpus, libvirt.VIR_DOMAIN_AFFECT_LIVE | libvirt.VIR_DOMAIN_VCPU_GUEST) + print("set vcpu count for domain " + dom.name() + " to " + str(ncpus)) + except: + print("failed to set vcpu count for domain " + dom.name()) + +def work(): + data = workerData() + + print("Using uri: " + uri) + + while True: + if not data.hasConn(): + try: + conn = libvirt.open(uri) + except: + print('Failed to connect to ' + uri + ', retry in ' + str(connectRetryTimeout)) + ' seconds' + time.sleep(connectRetryTimeout) + continue + + print('Connected to ' + uri) + + data.setConnect(conn) + conn.registerCloseCallback(handleConnectClose, data) + conn.setKeepAlive(5, 3) + conn.domainEventRegisterAny(None, + libvirt.VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, + handleAgentLifecycleEvent, + data) + + data.setDoms(conn.listAllDomains(libvirt.VIR_CONNECT_LIST_DOMAINS_ACTIVE)) + + while data.hasConn() and data.hasDom(): + processAgentConnect(data.getDom()) + + data.waitNotify() + +def main(): + libvirt.virEventRegisterDefaultImpl() + libvirt.registerErrorHandler(handleLibvirtLibraryError, None) + + worker = threading.Thread(target=work) + worker.setDaemon(True) + worker.start() + + eventLoop = threading.Thread(target=virEventLoopNativeRun) + eventLoop.setDaemon(True) + eventLoop.start() + + while True: + time.sleep(1) + +if __name__ == "__main__": + try: + opts, args = getopt.getopt(sys.argv[1:], "h", ["help"]) + except getopt.GetoptError as err: + print(str(err)) + usage() + sys.exit(2) + for o, a in opts: + if o in ("-h", "--help"): + usage() + sys.exit() + + if len(args) > 1: + usage() + sys.exit(1) + elif len(args) == 1: + uri = args[0] + + main() diff --git a/examples/guest-vcpus/guest-vcpu.py b/examples/guest-vcpus/guest-vcpu.py new file mode 100755 index 0000000..8faba87 --- /dev/null +++ b/examples/guest-vcpus/guest-vcpu.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python + +import libvirt +import sys +import getopt +import os + +customXMLuri = "guest-cpu.python.libvirt.org" + +def usage(): + print("usage: "+os.path.basename(sys.argv[0])+" [-hcl] domain count [uri]") + print(" uri will default to qemu:///system") + print(" --help, -h Print(this help message") + print(" --config, -c Modify persistent domain configuration") + print(" --live, -l Modify live domain configuration") + print("") + print("Sets the vCPU count via the guest agent and sets the metadata element " + + "used by guest-vcpu-daemon.py example") + +uri = "qemu:///system" +flags = 0 +live = False; +config = False; + +try: + opts, args = getopt.getopt(sys.argv[1:], "hcl", ["help", "config", "live"]) +except getopt.GetoptError as err: + # print help information and exit: + print(str(err)) # will print something like "option -a not recognized" + usage() + sys.exit(2) +for o, a in opts: + if o in ("-h", "--help"): + usage() + sys.exit() + if o in ("-c", "--config"): + config = True + flags |= libvirt.VIR_DOMAIN_AFFECT_CONFIG + if o in ("-l", "--live"): + live = True + flags |= libvirt.VIR_DOMAIN_AFFECT_LIVE + +if len(args) < 2: + usage() + sys.exit(1) +elif len(args) >= 3: + uri = args[2] + +domain = args[0] +count = int(args[1]) + +conn = libvirt.open(uri) +dom = conn.lookupByName(domain) + +if flags == 0 or config: + confvcpus = dom.vcpusFlags(libvirt.VIR_DOMAIN_AFFECT_CONFIG) + + if confvcpus < count: + print("Persistent domain configuration has only " + str(confvcpus) + " vcpus configured") + sys.exit(1) + +if flags == 0 or live: + livevcpus = dom.vcpusFlags(libvirt.VIR_DOMAIN_AFFECT_LIVE) + + if livevcpus < count: + print("Live domain configuration has only " + str(livevcpus) + " vcpus configured") + sys.exit(1) + +if flags == 0 or live: + dom.setVcpusFlags(count, libvirt.VIR_DOMAIN_AFFECT_LIVE | libvirt.VIR_DOMAIN_VCPU_GUEST) + +meta = "<ncpus count='" + str(count) + "'/>" + +dom.setMetadata(libvirt.VIR_DOMAIN_METADATA_ELEMENT, meta, "guestvcpudaemon", customXMLuri, flags) -- 2.3.5

2 2

[libvirt] [PATCHv2] docs: add dimm address document in docs
by Luyao Huang 19 May '15

19 May '15

As we have a new device address type 'dimm', add some document. As we do not want user touch this address, so no need add an XML example in the doc. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v2: remove the xml example and values range, and point out no need specified this address by users. docs/formatdomain.html.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e0b6ba7..4adf827 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2876,6 +2876,14 @@ attributes: <code>iobase</code> and <code>irq</code>. <span class="since">Since 1.2.1</span> </dd> + <dt><code>type='dimm'</code></dt> + <dd>DIMM addresses, for memory device, have the following additional + attributes: <code>slot</code> and <code>base</code>. No need specified + address when use memory device usually, these 2 attributes' values are + determined automatically when start the vm or hot-plug the memory + device. + <span class="since">Since 1.2.14</span> + </dd> </dl> <h4><a name="elementsControllers">Controllers</a></h4> -- 1.8.3.1

1 0

[libvirt] [PATCH] qemu: Fix numatune nodeset reporting
by Martin Kletzander 19 May '15

19 May '15

Since af2a1f0587d88656f2c14265a63fbc11ecbd924e, qemuDomainGetNumaParameters() returns invalid value for a running guest. The problem is that it is getting the information from cgroups, but the parent cgroup is being left alone since the mentioned commit. Since the running guest's XML is in sync with cgroups, there is no need to look into cgroups (unless someone changes the configuration behind libvirt's back). Returning the info from the definition fixes a bug and is also a cleanup. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1221047 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c00cdc..0cc0a29 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10523,7 +10523,7 @@ qemuDomainGetNumaParameters(virDomainPtr dom, char *nodeset = NULL; int ret = -1; virCapsPtr caps = NULL; - qemuDomainObjPrivatePtr priv; + virDomainDefPtr def = NULL; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG | @@ -10537,8 +10537,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom, if (!(vm = qemuDomObjFromDomain(dom))) return -1; - priv = vm->privateData; - if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; @@ -10555,6 +10553,11 @@ qemuDomainGetNumaParameters(virDomainPtr dom, goto cleanup; } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) + def = persistentDef; + else + def = vm->def; + for (i = 0; i < QEMU_NB_NUMA_PARAM && i < *nparams; i++) { virMemoryParameterPtr param = &params[i]; @@ -10564,35 +10567,17 @@ qemuDomainGetNumaParameters(virDomainPtr dom, VIR_TYPED_PARAM_INT, 0) < 0) goto cleanup; - if (flags & VIR_DOMAIN_AFFECT_CONFIG) - param->value.i = virDomainNumatuneGetMode(persistentDef->numa, -1); - else - param->value.i = virDomainNumatuneGetMode(vm->def->numa, -1); + param->value.i = virDomainNumatuneGetMode(def->numa, -1); break; case 1: /* fill numa nodeset here */ - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - nodeset = virDomainNumatuneFormatNodeset(persistentDef->numa, - NULL, -1); - if (!nodeset) - goto cleanup; - } else { - if (!virCgroupHasController(priv->cgroup, - VIR_CGROUP_CONTROLLER_CPUSET) || - virCgroupGetCpusetMems(priv->cgroup, &nodeset) < 0) { - nodeset = virDomainNumatuneFormatNodeset(vm->def->numa, - NULL, -1); - if (!nodeset) - goto cleanup; - } - } - - if (virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, + nodeset = virDomainNumatuneFormatNodeset(def->numa, NULL, -1); + if (!nodeset || + virTypedParameterAssign(param, VIR_DOMAIN_NUMA_NODESET, VIR_TYPED_PARAM_STRING, nodeset) < 0) goto cleanup; nodeset = NULL; - break; /* coverity[dead_error_begin] */ -- 2.4.0

2 1