- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] parallels: Implementation of attach/detach network devices and small network fixes
by Mikhail Feoktistov 15 Jun '15

15 Jun '15

Mikhail Feoktistov (4): parallels: Fix initialization of buflen variable in each loop iteration parallels: Fix false error messages in libvirt log parallels: Switch on DHCP for newly created network adapters parallels: implementation of attach/detach network devices

1 4

[libvirt] [PATCH] configure: Remove check for pkcheck_supports_uid
by Guido Günther 15 Jun '15

15 Jun '15

We're using Polkit's DBus API so no need to check wether this feature is supported. We don't use the result or the path to the pkcheck program anywhere. --- configure.ac | 9 --------- 1 file changed, 9 deletions(-) diff --git a/configure.ac b/configure.ac index abf4436..073624b 100644 --- a/configure.ac +++ b/configure.ac @@ -1362,15 +1362,6 @@ if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then dnl Check for new polkit first - just a binary AC_PATH_PROG([PKCHECK_PATH],[pkcheck], [], [/usr/sbin:$PATH]) if test "x$PKCHECK_PATH" != "x" ; then - AC_DEFINE_UNQUOTED([PKCHECK_PATH],["$PKCHECK_PATH"],[Location of pkcheck program]) - AC_MSG_CHECKING([whether pkcheck supports uid value]) - pkcheck_supports_uid=`$PKG_CONFIG --variable pkcheck_supports_uid polkit-gobject-1` - if test "x$pkcheck_supports_uid" = "xtrue"; then - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED([PKCHECK_SUPPORTS_UID], 1, [Pass uid to pkcheck]) - else - AC_MSG_RESULT([no]) - fi AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, [use PolicyKit for UNIX socket access checks]) AC_DEFINE_UNQUOTED([WITH_POLKIT1], 1, -- 2.1.4

2 3

[libvirt] [PATCH] conf: Fix virDomainObjGetDefs when getting persistent config on a live vm
by Peter Krempa 15 Jun '15

15 Jun '15

If @flags contains only VIR_DOMAIN_AFFECT_CONFIG and @vm is active, the function would return the active config rather than the persistent one that it should return. This happened due to the fact that virDomainObjGetDefs was checking the updated flags which may not contain VIR_DOMAIN_AFFECT_LIVE if it is not requested even if @vm is active. The mistake was caught by the virt-test suite. --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e79610..fd38c5d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2933,7 +2933,7 @@ virDomainObjGetDefs(virDomainObjPtr vm, if (virDomainObjUpdateModificationImpact(vm, &flags) < 0) return -1; - if (flags & VIR_DOMAIN_AFFECT_LIVE) { + if (virDomainObjIsActive(vm)) { if (liveDef) *liveDef = vm->def; -- 2.4.1

1 1

[libvirt] [glib PATCH] domain config: add API to set the filesystem image format
by Cédric Bosdonnat 15 Jun '15

15 Jun '15

Add the gvir_config_domain_filesys_set_driver_format function to allow setting nbd driver type + image format for containers filesystems. --- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 30 +++++++++++++++++++++++- libvirt-gconfig/libvirt-gconfig-domain-filesys.h | 4 ++++ libvirt-gconfig/libvirt-gconfig.sym | 5 ++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 006a407..fffbe88 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -125,7 +125,9 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); - node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + if (!(node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver"))) { + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + } g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); if (type != GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT) gvir_config_object_set_attribute_with_type( @@ -137,6 +139,32 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys g_object_unref(G_OBJECT(node)); } +void gvir_config_domain_filesys_set_driver_format(GVirConfigDomainFilesys *filesys, + GVirConfigDomainDiskFormat format) +{ + GVirConfigObject *node; + GVirConfigDomainFilesysDriverType type = GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_LOOP; + + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); + if (!(node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver"))) { + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + } + g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); + if (format != GVIR_CONFIG_DOMAIN_DISK_FORMAT_RAW) + type = GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_NBD; + + gvir_config_object_set_attribute_with_type( + node, "type", + GVIR_CONFIG_TYPE_DOMAIN_FILESYS_DRIVER_TYPE, + type, NULL); + + gvir_config_object_set_attribute_with_type( + node, "format", + GVIR_CONFIG_TYPE_DOMAIN_DISK_FORMAT, + format, NULL); + g_object_unref(G_OBJECT(node)); +} + void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, const char *source) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h index 4f3973e..18c4069 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.h @@ -75,6 +75,8 @@ typedef enum { GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT, GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_PATH, GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_HANDLE, + GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_LOOP, + GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_NBD, } GVirConfigDomainFilesysDriverType; GType gvir_config_domain_filesys_get_type(void); @@ -89,6 +91,8 @@ void gvir_config_domain_filesys_set_access_type(GVirConfigDomainFilesys *filesys GVirConfigDomainFilesysAccessType type); void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys, GVirConfigDomainFilesysDriverType type); +void gvir_config_domain_filesys_set_driver_format(GVirConfigDomainFilesys *filesys, + GVirConfigDomainDiskFormat format); void gvir_config_domain_filesys_set_source(GVirConfigDomainFilesys *filesys, const char *source); void gvir_config_domain_filesys_set_ram_usage(GVirConfigDomainFilesys *filesys, diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 407a52f..6ce1511 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -719,4 +719,9 @@ global: gvir_config_storage_vol_target_set_compat; } LIBVIRT_GCONFIG_0.1.9; +LIBVIRT_GCONFIG_0.2.1 { +global: + gvir_config_domain_filesys_set_driver_format; +} LIBVIRT_GCONFIG_0.2.0; + # .... define new API here using predicted next version number .... -- 2.1.4

3 3

[libvirt] [PATCH] add more domain memory functions
by Vasiliy Tolstov 15 Jun '15

15 Jun '15

* libvirt_domain_set_max_memory * libvirt_domain_set_memory * libvirt_domain_set_memory_flags Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/libvirt-php.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 3 +++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 0adc4be..b2ace23 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -1361,6 +1361,11 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_DOMAIN_AFFECT_LIVE", 1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_DOMAIN_AFFECT_CONFIG", 2, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_MEM_CONFIG", VIR_DOMAIN_MEM_CONFIG, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_MEM_CURRENT", VIR_DOMAIN_MEM_CURRENT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_MEM_LIVE", VIR_DOMAIN_MEM_LIVE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_MEM_MAXIMUM", VIR_DOMAIN_MEM_MAXIMUM, CONST_CS | CONST_PERSISTENT); + /* Connect flags */ REGISTER_LONG_CONSTANT("VIR_CONNECT_FLAG_SOUNDHW_GET_NAMES", CONNECT_FLAG_SOUNDHW_GET_NAMES, CONST_CS | CONST_PERSISTENT); @@ -3286,6 +3291,75 @@ PHP_FUNCTION(libvirt_domain_is_persistent) } /* + Function name: libvirt_domain_set_max_memory + Since version: 0.5.1 + Description: Function to set max memory for domain + Arguments: @res [resource]: libvirt domain resource + @memory [int]: memory size in 1024 bytes (Kb) + Returns: TRUE for success, FALSE for failure +*/ +PHP_FUNCTION(libvirt_domain_set_max_memory) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + long memory = 0; + + GET_DOMAIN_FROM_ARGS ("rl", &zdomain, &memory); + + if (virDomainSetMaxMemory(domain->domain, memory) != 0) + RETURN_FALSE; + + RETURN_TRUE; +} + +/* + Function name: libvirt_domain_set_memory + Since version: 0.5.1 + Description: Function to set memory for domain + Arguments: @res [resource]: libvirt domain resource + @memory [int]: memory size in 1024 bytes (Kb) + Returns: TRUE for success, FALSE for failure +*/ +PHP_FUNCTION(libvirt_domain_set_memory) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + long memory = 0; + + GET_DOMAIN_FROM_ARGS ("rl", &zdomain, &memory); + + if (virDomainSetMemory(domain->domain, memory) != 0) + RETURN_FALSE; + + RETURN_TRUE; +} + +/* + Function name: libvirt_domain_set_memory_flags + Since version: 0.5.1 + Description: Function to set max memory for domain + Arguments: @res [resource]: libvirt domain resource + @memory [int]: memory size in 1024 bytes (Kb) + @flags [int]: bitwise-OR VIR_DOMAIN_MEM_* flags + Returns: TRUE for success, FALSE for failure +*/ +PHP_FUNCTION(libvirt_domain_set_memory_flags) +{ + php_libvirt_domain *domain = NULL; + zval *zdomain; + long memory = 0; + long flags = 0; + + GET_DOMAIN_FROM_ARGS ("rl|l", &zdomain, &memory, &flags); + + if (virDomainSetMemoryFlags(domain->domain, memory, flags) != 0) + RETURN_FALSE; + + RETURN_TRUE; +} + + +/* Function name: libvirt_domain_get_autostart Since version: 0.4.1(-1) Description: Function is getting the autostart value for the domain @@ -8863,4 +8937,3 @@ PHP_FUNCTION(libvirt_logfile_set) RETURN_TRUE; } #endif - diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 3bcc682..cd3d0a9 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -399,6 +399,9 @@ PHP_FUNCTION(libvirt_domain_undefine); PHP_FUNCTION(libvirt_domain_reboot); PHP_FUNCTION(libvirt_domain_define_xml); PHP_FUNCTION(libvirt_domain_create_xml); +PHP_FUNCTION(libvirt_domain_set_max_memory); +PHP_FUNCTION(libvirt_domain_set_memory); +PHP_FUNCTION(libvirt_domain_set_memory_flags); PHP_FUNCTION(libvirt_domain_memory_peek); PHP_FUNCTION(libvirt_domain_memory_stats); PHP_FUNCTION(libvirt_domain_update_device); -- 2.3.3

2 1

[libvirt] [PATCH v2 0/1] qemu: monitor: Add memory balloon support for virtio-ccw
by Boris Fiuczynski 15 Jun '15

15 Jun '15

v2: * corrected historic spelling error in comment * added return code checking of the first qemuMonitorJSONFindLinkPath call to prevent the second call of qemuMonitorJSONFindLinkPath on "error bail out" return code. A comment on this version: I find that even so this version is technically more correct the simplicity and perceivability have suffered profoundly. I am not sure that after the recent rework by which the init function protects itself from being fully run a second time during a run of the domain it is necessary to prevent a single second call returning "error bail out". Boris Fiuczynski (1): qemu: monitor: Add memory balloon support for virtio-ccw src/qemu/qemu_monitor.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) -- 2.3.0

2 2

[libvirt] [PATCH 0/4] Various cleanups
by Martin Kletzander 15 Jun '15

15 Jun '15

*** BLURB HERE *** Martin Kletzander (4): build: Remove unnecessarily repeated rules for syms -> def rpc: Fix possible crash when MDNSAddEntry fails Generate JSON with mDNS entries only when built --with-avahi tests: Use libvirt properly with initialization and error dispatching src/Makefile.am | 20 ++------------------ src/rpc/virnetserver.c | 4 +++- tests/virnetservertest.c | 35 ++++++++++++++++++++--------------- 3 files changed, 25 insertions(+), 34 deletions(-) -- 2.4.3

2 5

[libvirt] [libvirt-php][PATCH 00/10] Couple of PHP fixes
by Michal Privoznik 15 Jun '15

15 Jun '15

Even though this project is not actively developed, it does not mean we can't make some things better in it. After this patchset, distcheck works, targets are not built everytime, only when necessary, and so on. Michal Privoznik (10): Update .gitignore Update autotools generated files get_next_free_numeric_value: Use correct format for sscanf() tools: Cleanup Makefile configure.ac: Check for libtool src: Clean up Makefile tests: Clean up Makefile.am tests: Update qemu path tests: run under distcheck Install libvirt-php.ini more wisely .gitignore | 28 ++ INSTALL | 8 +- Makefile.am | 4 +- configure.ac | 8 +- install-sh | 14 +- missing | 412 ++++++++++----------------- src/Makefile.am | 64 +++-- src/libvirt-php.c | 2 +- tests/Makefile.am | 37 ++- tests/data/example-qcow2-disk.xml | 2 +- tests/{functions.phpt => functions.phpt.in} | 4 +- tests/php.ini | 2 +- tests/runtests.sh | 4 +- tests/test-domain-create-and-coredump.phpt | 3 +- tests/test-domain-create-and-get-xpath.phpt | 3 +- tests/test-domain-create-get-metadata.phpt | 3 +- tests/test-domain-create.phpt | 3 +- tests/test-domain-define-create-destroy.phpt | 3 +- tests/test-domain-define-undefine.phpt | 3 +- tests/test-domain-snapshot.phpt | 3 +- tools/Makefile.am | 29 +- 21 files changed, 309 insertions(+), 330 deletions(-) rename tests/{functions.phpt => functions.phpt.in} (91%) -- 2.3.6

2 13

[libvirt] [PATCH] qemu: emulatorpin: Don't reset pinning when pinning to all cpus
by Peter Krempa 15 Jun '15

15 Jun '15

Similarly to 3813b648e9761aeed5b4f3ee7e62253a9172ce8e remove the default pinning assumption from emulatorpin. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1227180 --- src/qemu/qemu_driver.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 34e5581..c8e4aa9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5285,7 +5285,6 @@ qemuDomainPinEmulator(virDomainPtr dom, virDomainDefPtr persistentDef; int ret = -1; qemuDomainObjPrivatePtr priv; - bool doReset = false; virBitmapPtr pcpumap = NULL; virQEMUDriverConfigPtr cfg = NULL; virObjectEventPtr event = NULL; @@ -5329,12 +5328,6 @@ qemuDomainPinEmulator(virDomainPtr dom, goto endjob; } - /* pinning to all physical cpus means resetting, - * so check if we can reset setting. - */ - if (virBitmapIsAllSet(pcpumap)) - doReset = true; - if (def) { if (virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUSET)) { if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_EMULATOR, @@ -5359,8 +5352,7 @@ qemuDomainPinEmulator(virDomainPtr dom, virBitmapFree(def->cputune.emulatorpin); def->cputune.emulatorpin = NULL; - if (!doReset && - !(def->cputune.emulatorpin = virBitmapNewCopy(pcpumap))) + if (!(def->cputune.emulatorpin = virBitmapNewCopy(pcpumap))) goto endjob; if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) @@ -5380,8 +5372,7 @@ qemuDomainPinEmulator(virDomainPtr dom, virBitmapFree(persistentDef->cputune.emulatorpin); persistentDef->cputune.emulatorpin = NULL; - if (!doReset && - !(persistentDef->cputune.emulatorpin = virBitmapNewCopy(pcpumap))) + if (!(persistentDef->cputune.emulatorpin = virBitmapNewCopy(pcpumap))) goto endjob; ret = virDomainSaveConfig(cfg->configDir, persistentDef); -- 2.4.1

2 2

[libvirt] [sandbox PATCH 0/4] Getting qemu sandboxes run as root + host-image format
by Cédric Bosdonnat 15 Jun '15

15 Jun '15

Hi all, Here are a few patches to make sandboxes run with qemu:///system connection. The last one is just a new feature to allow using somethings else than RAW images in host-image mounts. This feature will later be needed to run docker container using Eren's work. Cédric Bosdonnat (4): Make sure the sandbox state dir and config can be accessed Write /dev/vd* instead of vd* in mounts.cfg qemu: mount all host-images as ext4 Add host-image format parameter .../libvirt-sandbox-builder-container.c | 4 + libvirt-sandbox/libvirt-sandbox-builder-machine.c | 13 +++- .../libvirt-sandbox-config-mount-host-image.c | 91 +++++++++++++++++++++- .../libvirt-sandbox-config-mount-host-image.h | 5 +- libvirt-sandbox/libvirt-sandbox-config.c | 70 +++++++++++++++-- .../libvirt-sandbox-context-interactive.c | 4 +- libvirt-sandbox/libvirt-sandbox.sym | 5 ++ libvirt-sandbox/tests/test-config.c | 1 + 8 files changed, 180 insertions(+), 13 deletions(-) -- 2.1.4

1 4

[libvirt] [PATCH] man: clarify usage of virsh blockcopy with --xml
by Ján Tomko 15 Jun '15

15 Jun '15

The --xml option is mandatory if an XML description is used. Otherwise the third parameter is treated as the destination. https://bugzilla.redhat.com/show_bug.cgi?id=1206406#c3 --- tools/virsh.pod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 9b57c8c..154922e 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -989,12 +989,12 @@ unlimited. The hypervisor can choose whether to reject the value or convert it to the maximum value allowed. =item B<blockcopy> I<domain> I<path> { I<dest> [I<format>] [I<--blockdev>] -| I<xml> } [I<--shallow>] [I<--reuse-external>] [I<bandwidth>] +| I<--xml> B<file> } [I<--shallow>] [I<--reuse-external>] [I<bandwidth>] [I<--wait> [I<--async>] [I<--verbose>]] [{I<--pivot> | I<--finish>}] [I<--timeout> B<seconds>] [I<granularity>] [I<buf-size>] Copy a disk backing image chain to a destination. Either I<dest> as -the destination file name, or I<xml> as the name of an XML file containing +the destination file name, or I<--xml> with the name of an XML file containing a top-level <disk> element describing the destination, must be present. Additionally, if I<dest> is given, I<format> should be specified to declare the format of the destination (if I<format> is omitted, then libvirt -- 2.3.6

2 1

[libvirt] [PATCH] storage: Disallow wiping an extended disk partition
by John Ferlan 15 Jun '15

15 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1225694 Check if the disk partition to be wiped is the extended partition, if so then disallow it. Do this via changing the wipeVol backend to check the volume before passing to the common virStorageBackendVolWipeLocal Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_disk.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index c4bd6fe..a283a86 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -851,6 +851,24 @@ virStorageBackendDiskBuildVolFrom(virConnectPtr conn, } +static int +virStorageBackendDiskVolWipe(virConnectPtr conn, + virStoragePoolObjPtr pool, + virStorageVolDefPtr vol, + unsigned int algorithm, + unsigned int flags) +{ + if (vol->source.partType != VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) + return virStorageBackendVolWipeLocal(conn, pool, vol, algorithm, flags); + + /* Wiping an extended partition is not support */ + virReportError(VIR_ERR_NO_SUPPORT, + _("cannot wipe extended partition '%s'"), + vol->target.path); + return -1; +} + + virStorageBackend virStorageBackendDisk = { .type = VIR_STORAGE_POOL_DISK, @@ -862,5 +880,5 @@ virStorageBackend virStorageBackendDisk = { .buildVolFrom = virStorageBackendDiskBuildVolFrom, .uploadVol = virStorageBackendVolUploadLocal, .downloadVol = virStorageBackendVolDownloadLocal, - .wipeVol = virStorageBackendVolWipeLocal, + .wipeVol = virStorageBackendDiskVolWipe, }; -- 2.1.0

2 2

[libvirt] [PATCH] scsi: Adjust return status from getBlockDevice
by John Ferlan 15 Jun '15

15 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1224233 Currently it's not possible to determine the difference between a fatal memory allocation or failure to open/read the directory error with a perhaps less fatal, I didn't find the "block" device in the directory (which may be a disk entry without a block device). In the case of the latter, we shouldn't cause failure to continue searching in the caller (virStorageBackendSCSIFindLUs), rather we should allow trying reading the next directory entry. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_scsi.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index e6c8bb5..c5105ec 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -329,6 +329,15 @@ getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED, } +/* + * Search a device entry for the "block" file + * + * Returns + * + * 0 => Found it + * -1 => Fatal error + * -2 => Didn't find in lun_path directory + */ static int getBlockDevice(uint32_t host, uint32_t bus, @@ -354,6 +363,10 @@ getBlockDevice(uint32_t host, goto out; } + /* As long as virDirRead doesn't fail, if we fail to find the + * "block" file in this directory, allow caller to continue + */ + retval = -2; while ((direrr = virDirRead(lun_dir, &lun_dirent, lun_path)) > 0) { if (STREQLEN(lun_dirent->d_name, "block", 5)) { if (strlen(lun_dirent->d_name) == 5) { @@ -368,6 +381,9 @@ getBlockDevice(uint32_t host, break; } } + /* Keep retval = -2 unless there was a fatal error in virDirRead */ + if (retval == -2 && direrr < 0) + retval = -1; closedir(lun_dir); @@ -417,9 +433,9 @@ processLU(virStoragePoolObjPtr pool, VIR_DEBUG("%u:%u:%u:%u is a Direct-Access LUN", host, bus, target, lun); - if (getBlockDevice(host, bus, target, lun, &block_device) < 0) { + if ((retval = getBlockDevice(host, bus, target, lun, &block_device)) < 0) { VIR_DEBUG("Failed to find block device for this LUN"); - return -1; + return retval; } retval = virStorageBackendSCSINewLun(pool, host, bus, target, lun, -- 2.1.0

2 1

[libvirt] [PATCH] virfile: Report useful error fork approach to create NFS mount point fails
by Erik Skultety 15 Jun '15

15 Jun '15

Commit 92d9114e tweaked the way we handle child errors when using fork approach to set specific permissions. The same logic should be used to create directories with specified permissions as well, otherwise the parent process doesn't report any useful error "unknown cause" while still returning negative errcode. https://bugzilla.redhat.com/show_bug.cgi?id=1230137 --- src/util/virfile.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 5ff4668..7675eeb 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2376,6 +2376,7 @@ virDirCreate(const char *path, if (pid) { /* parent */ /* wait for child to complete, and retrieve its exit code */ VIR_FREE(groups); + while ((waitret = waitpid(pid, &status, 0)) == -1 && errno == EINTR); if (waitret == -1) { ret = -errno; @@ -2384,11 +2385,33 @@ virDirCreate(const char *path, path); goto parenterror; } - if (!WIFEXITED(status) || (ret = -WEXITSTATUS(status)) == -EACCES) { - /* fall back to the simpler method, which works better in - * some cases */ - return virDirCreateNoFork(path, mode, uid, gid, flags); + + /* + * If waitpid succeeded, but if the child exited abnormally or + * reported non-zero status, report failure, except for EACCES where + * we try to fall back to non-fork method as in the original logic. + */ + if (!WIFEXITED(status) || (WEXITSTATUS(status)) != 0) { + if (WEXITSTATUS(status) == EACCES) + return virDirCreateNoFork(path, mode, uid, gid, flags); + char *msg = virProcessTranslateStatus(status); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("child failed to create '%s': %s"), + path, msg); + VIR_FREE(msg); + /* Use child exit status if possible; otherwise, + * just use -EACCES, since by our original failure in + * the non fork+setuid path would have been EACCES or + * EPERM by definition (see qemuOpenFileAs after the + * first virFileOpenAs failure), but EACCES is close enough. + * Besides -EPERM is like returning fd == -1. + */ + if (WIFEXITED(status)) + ret = -WEXITSTATUS(status); + else + ret = -EACCES; } + parenterror: return ret; } @@ -2400,15 +2423,14 @@ virDirCreate(const char *path, ret = -errno; goto childerror; } + if (mkdir(path, mode) < 0) { ret = -errno; - if (ret != -EACCES) { - /* in case of EACCES, the parent will retry */ - virReportSystemError(errno, _("child failed to create directory '%s'"), - path); - } + virReportSystemError(errno, _("child failed to create directory '%s'"), + path); goto childerror; } + /* check if group was set properly by creating after * setgid. If not, try doing it with chown */ if (stat(path, &st) == -1) { @@ -2417,6 +2439,7 @@ virDirCreate(const char *path, _("stat of '%s' failed"), path); goto childerror; } + if ((st.st_gid != gid) && (chown(path, (uid_t) -1, gid) < 0)) { ret = -errno; virReportSystemError(errno, @@ -2424,13 +2447,20 @@ virDirCreate(const char *path, path, (unsigned int) gid); goto childerror; } + if (mode != (mode_t) -1 && chmod(path, mode) < 0) { virReportSystemError(errno, _("cannot set mode of '%s' to %04o"), path, mode); goto childerror; } + childerror: + ret = -ret; + if ((ret & 0xff) != ret) { + VIR_WARN("unable to pass desired return value %d", ret); + ret = 0xff; + } _exit(ret); } -- 1.9.3

2 1

[libvirt] [PATCH] qemu: Do not support 'serial' scsi-block 'lun' devices
by John Ferlan 15 Jun '15

15 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1021480 Seems the property has been deprecated for qemu, although seemingly ignored. This patch enforces from a libvirt perspective that a scsi-block 'lun' device should not provide the 'serial' property. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/formatdomain.html.in | 3 +++ src/qemu/qemu_command.c | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1781996..4eb907d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2502,6 +2502,9 @@ <dd>If present, this specify serial number of virtual hard drive. For example, it may look like <code><serial>WD-WMAP9A966149</serial></code>. + Not supported for scsi-block devices, that is those using + disk <code>type</code> 'block' using <code>device</code> 'lun' + on <code>bus</code> 'scsi'. <span class="since">Since 0.7.1</span> </dd> <dt><code>wwn</code></dt> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0a6d92f..cbea0d5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3731,6 +3731,13 @@ qemuBuildDriveStr(virConnectPtr conn, virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL)) { if (qemuSafeSerialParamValue(disk->serial) < 0) goto error; + if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI && + disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("scsi-block 'lun' devices do not support the " + "serial property")); + goto error; + } virBufferAddLit(&opt, ",serial="); virBufferEscape(&opt, '\\', " ", "%s", disk->serial); } -- 2.1.0

2 1

[libvirt] [PATCH] qemu: fix cannot attach a virtio channel
by Luyao Huang 15 Jun '15

15 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1230039 When attach a channel which target type is virtio, we will get an error: error: Failed to attach device from channel-file.xml error: internal error: virtio serial device has invalid address type This issue was introduced in commit 9807c4. We didn't check the chr device type is serial then check if the device target type is pci-serial, but not all the Chr device is a serial type so we should check the device type before check the target type to avoid assign wrong address to other device type chr device. Also most of chr device do not need {pci, virtio-serial} address in qemu, we just get the address for the device which needed. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_hotplug.c | 72 +++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3562de6..4d60513 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1531,6 +1531,48 @@ qemuDomainChrRemove(virDomainDefPtr vmdef, return ret; } +static int +qemuDomainAttachChrDeviceAssignAddr(qemuDomainObjPrivatePtr priv, + virDomainChrDefPtr chr) +{ + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO && + virDomainVirtioSerialAddrAutoAssign(NULL, priv->vioserialaddrs, + &chr->info, true) < 0) + return -1; + + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI && + (chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && + virDomainPCIAddressEnsureAddr(priv->pciaddrs, &chr->info) < 0) + return -1; + + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && + virDomainVirtioSerialAddrAutoAssign(NULL, priv->vioserialaddrs, + &chr->info, false) < 0) + return -1; + + return 0; +} + +static void +qemuDomainAttachChrDeviceReleaseAddr(qemuDomainObjPrivatePtr priv, + virDomainObjPtr vm, + virDomainChrDefPtr chr) +{ + if ((chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && + chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) || + (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && + chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO)) + virDomainVirtioSerialAddrRelease(priv->vioserialaddrs, &chr->info); + + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) + qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); +} + int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainChrDefPtr chr) @@ -1541,7 +1583,6 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, char *devstr = NULL; char *charAlias = NULL; bool need_release = false; - bool allowZero = false; if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -1552,22 +1593,8 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, if (qemuAssignDeviceChrAlias(vmdef, chr, -1) < 0) goto cleanup; - if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && - chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO) - allowZero = true; - - if (chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) { - if (virDomainPCIAddressEnsureAddr(priv->pciaddrs, &chr->info) < 0) - goto cleanup; - } else if (chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) { - /* XXX */ - } else { - if (virDomainVirtioSerialAddrAutoAssign(NULL, - priv->vioserialaddrs, - &chr->info, - allowZero) < 0) - goto cleanup; - } + if (qemuDomainAttachChrDeviceAssignAddr(priv, chr) < 0) + goto cleanup; need_release = true; if (qemuBuildChrDeviceStr(&devstr, vm->def, chr, priv->qemuCaps) < 0) @@ -1601,15 +1628,8 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver, cleanup: if (ret < 0 && virDomainObjIsActive(vm)) qemuDomainChrInsertPreAllocCleanup(vm->def, chr); - if (ret < 0 && need_release) { - if (chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_PCI) { - qemuDomainReleaseDeviceAddress(vm, &chr->info, NULL); - } else if (chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB) { - /* XXX */ - } else { - virDomainVirtioSerialAddrRelease(priv->vioserialaddrs, &chr->info); - } - } + if (ret < 0 && need_release) + qemuDomainAttachChrDeviceReleaseAddr(priv, vm, chr); VIR_FREE(charAlias); VIR_FREE(devstr); return ret; -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu caps: spell queue
by Ján Tomko 15 Jun '15

15 Jun '15

--- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvtest.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8a64422..27a632a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -286,7 +286,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "pci-serial", "aarch64-off", - "vhost-user-multiq", /* 190 */ + "vhost-user-multiqueue", /* 190 */ ); @@ -3317,7 +3317,7 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, /* vhost-user supports multi-queue from v2.4.0 onwards, * but there is no way to query for that capability */ if (qemuCaps->version >= 2004000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQ); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3c166b6..30aa504 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -229,7 +229,7 @@ typedef enum { QEMU_CAPS_DEA_KEY_WRAP = 187, /* -machine dea_key_wrap */ QEMU_CAPS_DEVICE_PCI_SERIAL = 188, /* -device pci-serial */ QEMU_CAPS_CPU_AARCH64_OFF = 189, /* -cpu ...,aarch64=off */ - QEMU_CAPS_VHOSTUSER_MULTIQ = 190, /* vhost-user with -netdev queues= */ + QEMU_CAPS_VHOSTUSER_MULTIQUEUE = 190, /* vhost-user with -netdev queues= */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 89f775d..9f247de 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8141,7 +8141,7 @@ qemuBuildVhostuserCommandLine(virCommandPtr cmd, net->info.alias, net->info.alias); if (queues > 1) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQ)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("multi-queue is not supported for vhost-user " "with this QEMU binary")); diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 35bfd29..a90f9a6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -981,7 +981,7 @@ mymain(void) DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE); DO_TEST("net-vhostuser", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV); DO_TEST("net-vhostuser-multiq", - QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_VHOSTUSER_MULTIQ); + QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); DO_TEST_FAILURE("net-vhostuser-multiq", QEMU_CAPS_DEVICE, QEMU_CAPS_NETDEV); DO_TEST("net-user", NONE); DO_TEST("net-virtio", NONE); -- 2.3.6

3 2

[libvirt] [PATCH] virCapabilitiesDomainDataLookup: Produce saner error message
by Michal Privoznik 15 Jun '15

15 Jun '15

During a review, I've noticed this error message that was eventually produced when I was trying to define a domain: error: invalid argument: could not find capabilities for arch=mips64el domaintype=(null) Look at the (null). Why is it there? Well, during XML parsing, we try to look up the default emulator for given OS type and possibly virt type too. And this is the problem, because if we don't want to look up by virt type, a -1 is passed to note this fact. Later, the code handles -1 just right. Except for error message. When it is constructed (in a very fabulous way I must say), the value is compared to zero, not -1. And since we don't have any translation from -1 to a virt type string, we just print (null). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 6decde8..9c2c6b4 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -678,7 +678,7 @@ virCapabilitiesDomainDataLookupInternal(virCapsPtr caps, virDomainOSTypeToString(ostype)); if (arch) virBufferAsprintf(&buf, "arch=%s ", virArchToString(arch)); - if (domaintype) + if (domaintype != -1) virBufferAsprintf(&buf, "domaintype=%s ", virDomainVirtTypeToString(domaintype)); if (emulator) -- 2.3.6

2 2

[libvirt] Deleted all setting after reboot
by Amir Azemati 15 Jun '15

15 Jun '15

Hello all great, We had a question, We use OpenStack IceHouse on CentOS 6.5. We use libvirt for create network, attach interface to our VMs and ... There is a problem. When our server restart (reboot), all settings are deleted. We have to go back and do all the setting (create network, attach an interface and ...) from the beginning. How can we solve our problem. our command we enterd: virsh list virsh domiflist ID virsh attach-interface --domain ID --type bridge --source br100 virsh managedsave ID

2 1

[libvirt] [PATCH] qemu: update netdevs of the same mac addrs correctly
by zhang bo 15 Jun '15

15 Jun '15

If a guest has multiple network devices with the same MAC address, when we online update the second device, libvirtd always updates the first one. commit def31e4c forgot to fix the online updating scenario. We need to use virDomainNetFindIdx() to find the correct network device. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/qemu/qemu_hotplug.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 94ebe35..d455bd6 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2052,20 +2052,6 @@ int qemuDomainAttachHostDevice(virConnectPtr conn, return -1; } -static virDomainNetDefPtr *qemuDomainFindNet(virDomainObjPtr vm, - virDomainNetDefPtr dev) -{ - size_t i; - - for (i = 0; i < vm->def->nnets; i++) { - if (virMacAddrCmp(&vm->def->nets[i]->mac, &dev->mac) == 0) - return &vm->def->nets[i]; - } - - return NULL; -} - - static int qemuDomainChangeNetBridge(virDomainObjPtr vm, virDomainNetDefPtr olddev, @@ -2195,7 +2181,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, virDomainDeviceDefPtr dev) { virDomainNetDefPtr newdev = dev->data.net; - virDomainNetDefPtr *devslot = qemuDomainFindNet(vm, newdev); + virDomainNetDefPtr *devslot = NULL; virDomainNetDefPtr olddev; int oldType, newType; bool needReconnect = false; @@ -2205,8 +2191,13 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, bool needReplaceDevDef = false; bool needBandwidthSet = false; int ret = -1; + int changeidx = -1; + + if ((changeidx = virDomainNetFindIdx(vm->def, newdev)) < 0) + goto cleanup; + devslot = &vm->def->nets[changeidx]; - if (!devslot || !(olddev = *devslot)) { + if (!(olddev = *devslot)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot find existing network device to modify")); goto cleanup; -- 1.7.12.4 -- Oscar oscar.zhangbo(a)huawei.com

2 3

[libvirt] [PATCH] libxl: Add timestamp to the libxl driver log.
by Anthony PERARD 13 Jun '15

13 Jun '15

Signed-off-by: Anthony PERARD <anthony.perard(a)citrix.com> --- src/libxl/libxl_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 9b258ac..e845759 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1541,7 +1541,7 @@ libxlDriverConfigNew(void) cfg->logger = (xentoollog_logger *)xtl_createlogger_stdiostream(cfg->logger_file, - XTL_DEBUG, 0); + XTL_DEBUG, XTL_STDIOSTREAM_SHOW_DATE); if (!cfg->logger) { VIR_ERROR(_("cannot create logger for libxenlight, disabling driver")); goto error; -- Anthony PERARD

2 1

Re: [libvirt] [libvirt-php][PATCH] add more domain memory functions
by Vasiliy Tolstov 12 Jun '15

12 Jun '15

2015-06-12 15:40 GMT+03:00 Vasiliy Tolstov <v.tolstov(a)selfip.ru>: > * libvirt_domain_set_max_memory > * libvirt_domain_set_memory > * libvirt_domain_set_memory_flags Sorry, miss subject prefix =( -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH] nodeinfo: fix to parse present cpus rather than possible cpus
by Kothapally Madhu Pavan 12 Jun '15

12 Jun '15

Currently we are parsing all the possible cpus to get the nodeinfo. This fix will perform a check for present cpus before parsing. Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 2fafe2d..9e6684f 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -57,6 +57,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("nodeinfo"); +virBitmapPtr nodeGetPresentCPUBitmap(void); #if defined(__FreeBSD__) || defined(__APPLE__) static int @@ -418,6 +419,7 @@ virNodeParseNode(const char *node, int processors = 0; DIR *cpudir = NULL; struct dirent *cpudirent = NULL; + virBitmapPtr present_cpumap = NULL; int sock_max = 0; cpu_set_t sock_map; int sock; @@ -438,12 +440,17 @@ virNodeParseNode(const char *node, goto cleanup; } + present_cpumap = nodeGetPresentCPUBitmap(); + /* enumerate sockets in the node */ CPU_ZERO(&sock_map); while ((direrr = virDirRead(cpudir, &cpudirent, node)) > 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if (!(virBitmapIsBitSet(present_cpumap, cpu))) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; @@ -477,6 +484,9 @@ virNodeParseNode(const char *node, if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if (!(virBitmapIsBitSet(present_cpumap, cpu))) + continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup;

2 1

[libvirt] Accessing libvirtd remotely as non-root user
by Dan Mossor 12 Jun '15

12 Jun '15

I manage libvirtd on a few remote machines, and my security policies require me to disable root login via SSH. Up to this point, I've been using root due to the systems being in staging, but this is the final step before they're moved to production. What is the current proscribed method of connecting virt-manager or virsh to a remote system with a non-root account? I keep getting "authentication failed: no agent is available to authenticate" with a user that is in the kvm and qemu groups on the systems I've tried using the ssh transport. Thanks in advance Dan -- Dan Mossor, RHCSA Systems Engineer Fedora Server WG | Fedora KDE WG | Fedora QA Team Fedora Infrastructure Apprentice FAS: dmossor IRC: danofsatx San Antonio, Texas, USA

3 5

[libvirt] [PATCH] virsysinfo: s/system/sysdef/
by Michal Privoznik 12 Jun '15

12 Jun '15

A variable can't be named system, obviously. Well, it can if the compiler is new enough to distinguish a variable named system and a function call system(). And some older systems, don't have wise compiler. Whatever. CC util/libvirt_util_la-virsysinfo.lo cc1: warnings being treated as errors ../../src/util/virsysinfo.c: In function 'virSysinfoParseSystem': ../../src/util/virsysinfo.c:649: error: declaration of 'system' shadows a global declaration [-Wshadow] /usr/include/stdlib.h:717: error: shadowed declaration is here [-Wshadow] make[3]: *** [util/libvirt_util_la-virsysinfo.lo] Error 1 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virsysinfo.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 692c921..42cd946 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -150,7 +150,7 @@ void virSysinfoDefFree(virSysinfoDefPtr def) #if defined(__powerpc__) static int -virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) +virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef) { int ret = -1; char *eol = NULL; @@ -193,7 +193,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) def = NULL; } - *system = def; + *sysdef = def; def = NULL; ret = 0; cleanup: @@ -280,7 +280,7 @@ virSysinfoRead(void) #elif defined(__arm__) || defined(__aarch64__) static int -virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) +virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef) { int ret = -1; char *eol = NULL; @@ -323,7 +323,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) def = NULL; } - *system = def; + *sysdef = def; def = NULL; ret = 0; cleanup: @@ -452,7 +452,7 @@ virSysinfoParseLine(const char *base, const char *name, char **value) } static int -virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) +virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef) { int ret = -1; virSysinfoSystemDefPtr def; @@ -478,7 +478,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) def = NULL; } - *system = def; + *sysdef = def; def = NULL; ret = 0; cleanup: @@ -646,7 +646,7 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) } static int -virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) +virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *sysdef) { int ret = -1; const char *cur, *eol = NULL; @@ -708,7 +708,7 @@ virSysinfoParseSystem(const char *base, virSysinfoSystemDefPtr *system) def = NULL; } - *system = def; + *sysdef = def; def = NULL; ret = 0; cleanup: -- 2.3.6

2 1