- Devel - libvirt List Archives

[libvirt] [PATCH libvirt-site v2] Add information about libvirt-php new location [was Change PHP binding link to new one hosted on libvirt.org]
by Michal Novotny 09 Feb '11

09 Feb '11

Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/bindings.html.in | 8 +++--- docs/php.html.in | 57 ++---------------------------------------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 87d894d..2d936a0 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -28,16 +28,16 @@ <li> <p> <strong>PHP</strong>: Radek Hladik started developing - <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a> in 2010. + <a href="http://libvirt.org/php">PHP bindings</a> in 2010. </p> <p> - In February 2011 the binding development has been moved to the - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt.org as libvirt-php project</a>. + In February 2011 the binding development has been moved to the libvirt.org website as + libvirt-php project. </p> <p> The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information including the information on posting - the patches you to libvirt-php please refer to <a href="php.html">PHP binding page</a>. + the patches you to libvirt-php please refer to <a href="http://libvirt.org/php">PHP binding</a>. </p> </li> <li> diff --git a/docs/php.html.in b/docs/php.html.in index ea4f76a..5283e67 100644 --- a/docs/php.html.in +++ b/docs/php.html.in @@ -24,60 +24,9 @@ It can also be browsed at </pre> <p></p> -<h2>Building</h2> -<p>The code is using autotools to generate the files necessary for compilation. The preferred way of building is - to run autogen.sh to generate configure script and then go on with the standard linux make commands, i.e.</p> - -<pre> -$ cd libvirt-php -$ ./autogen.sh -$ make -</pre> - - -<h2>Enabling the module in PHP</h2> -<p>Before you start using the module you have to install the module first. The module -php_libvirt.so is being generated when you compile it. This is necessary to be loaded -in the extensions sections of php.ini file for PHP version older than PHP-5.</p> -<p> -Starting with PHP-5 you can create a file called libvirt.ini in /etc/php.d having just -one line <code>extension=php_libvirt.so</code> to enable the extension. Of course, you -need to have this module copied in the directory with the rest of your PHP modules to -make PHP find the module for you.</p> -<p> -If you're using PHP as a module (mod_php5.so) in the Apache webserver you need to -restart your Apache to trigger configuration reload for PHP. -</p> -<p> -If you're not sure that you have everything set up right and you don't want to restart -your Apache webserver before you're sure everything will be working fine you could try -running the test using cli-based PHP interpreter. There are some example scripts coming -along the source codes in the <code>example</code> subdirectory so you can try to run -php on the index.php script to check whether it's working fine to establish connection or not. -</p> -<p> -When you're having some issues with the connection make sure the apache user is having -access to libvirt. For more information please see <a href="auth.html">Libvirt access control</a> page. -</p> -<h2>Contribution</h2> -<p> -If you would like to contribute to the libvirt-php project you could write patches for it but please -make sure you're following the procedure below: - -<ol> - <li>Sign up to libvirt list if you're not on it yet (libvir-list(a)redhat.com)</li> - <li>Clone the repository from libvirt.org site using: - <pre>git clone git://libvirt.org/libvirt-php</pre> - </li> - <li>Set your git username and e-mail and also set the subject prefix in the project's repository using: - <pre>git config --local format.subjectprefix "libvirt-php"</pre> - </li> - <li>Create the patch in the form of the commits and include also information about usage (example source codes maybe) and testing</li> - <li>Format it using <code>git format-patch -X</code> where X is the number of patch parts to be posted, for multipart patch (X is greater than 1) please use also numbering (-n) option and include the cover-letter (--cover-letter).</li> - <li>Send to libvir-list(a)redhat.com using the <code>git send-email <files> --to libvir-list(a)redhat.com</code> command where <files> can be <i>000*</i> to send all the patches formatted by git format-patch since git format-patch names the files starting with the 4 digit numbers.</li> -</ol> - -When you send the patch you're patch will be reviewed and later committed to the libvirt-php repository. You'll be contacted in case some flaws are found during the review. +<h2>Project pages</h2> +<p>Since February 2011 the project have it's own pages hosted at libvirt.org. For more information on the project + please refer to <a href="http://libvirt.org/php">http://libvirt.org/php</a>. </p> -- 1.7.3.2

1 0

[libvirt] [PATCH libvirt site] Change PHP binding link to new one hosted on libvirt.org
by Michal Novotny 09 Feb '11

09 Feb '11

Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/bindings.html.in | 8 ++++---- docs/sitemap.html.in | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 87d894d..2d936a0 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -28,16 +28,16 @@ <li> <p> <strong>PHP</strong>: Radek Hladik started developing - <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a> in 2010. + <a href="http://libvirt.org/php">PHP bindings</a> in 2010. </p> <p> - In February 2011 the binding development has been moved to the - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt.org as libvirt-php project</a>. + In February 2011 the binding development has been moved to the libvirt.org website as + libvirt-php project. </p> <p> The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information including the information on posting - the patches you to libvirt-php please refer to <a href="php.html">PHP binding page</a>. + the patches you to libvirt-php please refer to <a href="http://libvirt.org/php">PHP binding</a>. </p> </li> <li> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index ac0af71..c987c49 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -266,10 +266,6 @@ <a href="csharp.html">C#</a> <span>overview of the C# API bindings</span> </li> - <li> - <a href="php.html">PHP</a> - <span>overview of the PHP API bindings</span> - </li> </ul> </li> <li> -- 1.7.3.2

2 4

Re: [libvirt] [virt-tools-list] difference between blkid of a system and uuid of virtual machine by virt-manager
by Cole Robinson 09 Feb '11

09 Feb '11

On 02/08/2011 02:06 PM, Tapas Mishra wrote: > I want to know what is the difference between the output blkid command > shows and the uuid which is set by virt-manager > while creating a guest. > Suppose in case of a re installation sort of situation I want to do a > fresh install and restore things from a backup then > where does this UUID thing comes into picture and what is its role > with respect to Virtual Machines. > > AFAIU it's just a unique identifier for use with libvirt, though nowadays it might be passed down to the guest for other purposes. cc-ing libvirt-list - Cole

1 0

[libvirt] [PATCH] Adjust some log levels in udev driver
by Daniel P. Berrange 09 Feb '11

09 Feb '11

Most of te VIR_INFO calls in the udev driver are only relevant to developers so can switch to VIR_DEBUG. Failure to initialize libpciaccess though is a fatal error * src/node_device/node_device_udev.c: Adjust log levels --- src/node_device/node_device_udev.c | 44 ++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 93390af..475cbb5 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -116,8 +116,8 @@ static int udevGetDeviceProperty(struct udev_device *udev_device, udev_value = udev_device_get_property_value(udev_device, property_key); if (udev_value == NULL) { - VIR_INFO(_("udev reports device '%s' does not have property '%s'"), - udev_device_get_sysname(udev_device), property_key); + VIR_DEBUG("udev reports device '%s' does not have property '%s'", + udev_device_get_sysname(udev_device), property_key); ret = PROPERTY_MISSING; goto out; } @@ -205,8 +205,8 @@ static int udevGetDeviceSysfsAttr(struct udev_device *udev_device, udev_value = udev_device_get_sysattr_value(udev_device, attr_name); if (udev_value == NULL) { - VIR_INFO(_("udev reports device '%s' does not have sysfs attr '%s'"), - udev_device_get_sysname(udev_device), attr_name); + VIR_DEBUG("udev reports device '%s' does not have sysfs attr '%s'", + udev_device_get_sysname(udev_device), attr_name); ret = PROPERTY_MISSING; goto out; } @@ -950,9 +950,9 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) { int ret = -1; - VIR_INFO("Could not find definitive storage type for device " - "with sysfs path '%s', trying to guess it", - def->sysfs_path); + VIR_DEBUG("Could not find definitive storage type for device " + "with sysfs path '%s', trying to guess it", + def->sysfs_path); if (STRPREFIX(def->caps->data.storage.block, "/dev/vd")) { /* virtio disk */ @@ -963,8 +963,8 @@ static int udevKludgeStorageType(virNodeDeviceDefPtr def) } if (ret != 0) { - VIR_INFO("Could not determine storage type for device " - "with sysfs path '%s'", def->sysfs_path); + VIR_DEBUG("Could not determine storage type for device " + "with sysfs path '%s'", def->sysfs_path); } else { VIR_DEBUG("Found storage type '%s' for device " "with sysfs path '%s'", @@ -1062,8 +1062,8 @@ static int udevProcessStorage(struct udev_device *device, } else if (STREQ(def->caps->data.storage.drive_type, "floppy")) { ret = udevProcessFloppy(device, def); } else { - VIR_INFO("Unsupported storage type '%s'", - def->caps->data.storage.drive_type); + VIR_DEBUG("Unsupported storage type '%s'", + def->caps->data.storage.drive_type); goto out; } @@ -1141,9 +1141,9 @@ static int udevGetDeviceType(struct udev_device *device, goto out; } - VIR_INFO("Could not determine device type for device " - "with sysfs path '%s'", - udev_device_get_sysname(device)); + VIR_DEBUG("Could not determine device type for device " + "with sysfs path '%s'", + udev_device_get_sysname(device)); ret = -1; out: @@ -1209,8 +1209,8 @@ static int udevRemoveOneDevice(struct udev_device *device) dev->def->name, name); virNodeDeviceObjRemove(&driverState->devs, dev); } else { - VIR_INFO("Failed to find device to remove that has udev name '%s'", - name); + VIR_DEBUG("Failed to find device to remove that has udev name '%s'", + name); ret = -1; } nodeDeviceUnlock(driverState); @@ -1237,8 +1237,8 @@ static int udevSetParent(struct udev_device *device, parent_sysfs_path = udev_device_get_syspath(parent_device); if (parent_sysfs_path == NULL) { - VIR_INFO("Could not get syspath for parent of '%s'", - udev_device_get_syspath(parent_device)); + VIR_DEBUG("Could not get syspath for parent of '%s'", + udev_device_get_syspath(parent_device)); } dev = virNodeDeviceFindBySysfsPath(&driverState->devs, @@ -1350,8 +1350,8 @@ static int udevProcessDeviceListEntry(struct udev *udev, if (device != NULL) { if (udevAddOneDevice(device) != 0) { - VIR_INFO("Failed to create node device for udev device '%s'", - name); + VIR_DEBUG("Failed to create node device for udev device '%s'", + name); } ret = 0; } @@ -1598,8 +1598,8 @@ static int udevDeviceMonitorStartup(int privileged ATTRIBUTE_UNUSED) if ((pciret = pci_system_init()) != 0) { char ebuf[256]; - VIR_INFO("Failed to initialize libpciaccess: %s", - virStrerror(pciret, ebuf, sizeof ebuf)); + VIR_ERROR("Failed to initialize libpciaccess: %s", + virStrerror(pciret, ebuf, sizeof ebuf)); ret = -1; goto out; } -- 1.7.4

3 2

[libvirt] [libvirt-snmp][PATCH] Created .gitignore to ignore generated/compiled files.
by Michal Privoznik 09 Feb '11

09 Feb '11

I've forgotten to add .gitignore to let git ignore some garbage. --- .gitignore | 27 +++++++++++++++++++++++++++ src/.gitignore | 10 ++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 src/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f4821fb --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +#*# +*.#*# +*.a +*.exe +*.gcda +*.gcno +*.gcov +*.o +*.orig +*.rej +*~ +.git +.git-module-status +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache/ +/config.h +/config.h.in +/config.log +/config.status +/configure +/depcomp +/install-sh +/libvirt-snmp.spec +/missing +/stamp-h1 diff --git a/src/.gitignore b/src/.gitignore new file mode 100644 index 0000000..2c8801e --- /dev/null +++ b/src/.gitignore @@ -0,0 +1,10 @@ +Makefile +Makefile.in +.deps +.libs +*.lo +*.loT +*.la +*.exe +*.cov +/libvirtMib_subagent -- 1.7.3.5

2 1

[libvirt] [PATCH] Reserve PCI addresses 3 and 4 on qemu-system-ppc
by Niels de Vos 09 Feb '11

09 Feb '11

On PPC emulated by recent versions of qemu, PCI-bus 0 already has a macio connected in slot 3 and OHCI on slot 4. Reference: - https://bugzilla.redhat.com/show_bug.cgi?id=667345 Signed-off-by: Niels de Vos <ndevos(a)redhat.com> --- Imho this patch is relatively ugly. Unfortunately I did not find a better way of changing the reserved PCI-addresses on a per architecture basis. It can well be that qemuAssignDevicePCISlots() needs to be updated for other architectures as well. A more modular/dynamic approach might be more suitable. Feel free to suggest an alternative way to solve this. Thanks, Niels src/qemu/qemu_command.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f78ce71..50e3ad7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -983,6 +983,14 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, qemuDomainPCIAddressSetPtr addrs) goto error; } + /* qemu-system-ppc has macio on slot 3 and ohci on slot 4 */ + if (STREQ(def->os.arch, "ppc")) { + if (qemuDomainPCIAddressReserveSlot(addrs, 3) < 0) + goto error; + if (qemuDomainPCIAddressReserveSlot(addrs, 4) < 0) + goto error; + } + /* Network interfaces */ for (i = 0; i < def->nnets ; i++) { if (def->nets[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) -- 1.7.4

3 4

[libvirt] [PATCH RFC] Don't use CLONE_NEWUSER for now
by Serge E. Hallyn 09 Feb '11

09 Feb '11

Until now, user namespaces have not done much, but (for that reason) have been innocuous to glob in with other CLONE_ flags. Upcoming userns development, however, will make tasks cloned with CLONE_NEWUSER far more restricted. In particular, for some time they will be unable to access files with anything other than the world access perms. This patch assumes that noone really needs the user namespaces to be enabled. If that is wrong, then we can try a more baroque patch where we create a file owned by a test userid with 700 perms and, if we can't access it after setuid'ing to that userid, then return 0. Otherwise, assume we are using an older, 'harmless' user namespace implementation. Comments appreciated. Is it ok to do this? Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/lxc/lxc_container.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 876bc62..a735eb7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -810,7 +810,14 @@ static int lxcContainerChild( void *data ) static int userns_supported(void) { +#if 1 + /* + * put off using userns until uid mapping is implemented + */ + return 0; +#else return lxcContainerAvailable(LXC_CONTAINER_FEATURE_USER) == 0; +#endif } /** -- 1.7.2.3

3 2

[libvirt] [PATCH v2] storage: Allow to delete device mapper disk partition
by Osier Yang 09 Feb '11

09 Feb '11

The name convention of device mapper disk is different, and 'parted' can't be used to delete a device mapper disk partition. e.g. # virsh vol-list --pool osier Name Path ----------------------------------------- 3600a0b80005ad1d7000093604cae912fp1 /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 # parted /dev/mapper/3600a0b80005adb0b0000ab2d4cae9254 rm p1 Error: Expecting a partition number. This patch introduces 'dmsetup' to fix it. Changes: - New function "virIsDevMapperDevice" in "src/utils/utils.c" - remove "is_dm_device" in "src/storage/parthelper.c", use "virIsDevMapperDevice" instead. - Requires "device-mapper" for 'with-storage-disk" in "libvirt.spec.in" - Check "dmsetup" in 'configure.ac' for "with-storage-disk" - Changes on "src/Makefile.am" to link against libdevmapper - New entry for "virIsDevMapperDevice" in "src/libvirt_private.syms" Changes from v1 to v2: - s/virIsDeviceMapperDevice/virIsDevMapperDevice/g - replace "virRun" with "virCommand" - sort the list of util functions in "libvirt_private.syms" e.g. # virsh vol-list --pool osier Name Path ----------------------------------------- 3600a0b80005ad1d7000093604cae912fp1 /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 # virsh vol-delete /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 Vol /dev/mapper/3600a0b80005ad1d7000093604cae912fp1 deleted # virsh vol-list --pool osier Name Path ----------------------------------------- --- configure.ac | 19 ++++++++++++++ libvirt.spec.in | 1 + src/Makefile.am | 8 +++--- src/libvirt_private.syms | 5 ++- src/storage/parthelper.c | 14 +--------- src/storage/storage_backend_disk.c | 48 +++++++++++++++++++++-------------- src/util/util.c | 14 ++++++++++ src/util/util.h | 2 + 8 files changed, 73 insertions(+), 38 deletions(-) diff --git a/configure.ac b/configure.ac index 8a4083f..9517bfc 100644 --- a/configure.ac +++ b/configure.ac @@ -1706,12 +1706,19 @@ LIBPARTED_LIBS= if test "$with_storage_disk" = "yes" || test "$with_storage_disk" = "check"; then AC_PATH_PROG([PARTED], [parted], [], [$PATH:/sbin:/usr/sbin]) + AC_PATH_PROG([DMSETUP], [dmsetup], [], [$PATH:/sbin:/usr/sbin]) if test -z "$PARTED" ; then PARTED_FOUND=no else PARTED_FOUND=yes fi + if test -z "$DMSETUP" ; then + DMSETUP_FOUND=no + else + DMSETUP_FOUND=yes + fi + if test "$PARTED_FOUND" = "yes" && test "x$PKG_CONFIG" != "x" ; then PKG_CHECK_MODULES([LIBPARTED], [libparted >= $PARTED_REQUIRED], [], [PARTED_FOUND=no]) @@ -1739,11 +1746,23 @@ if test "$with_storage_disk" = "yes" || with_storage_disk=yes fi + if test "$DMSETUP_FOUND" = "no" ; then + if test "$with_storage_disk" = "yes" ; then + AC_MSG_ERROR([We need dmsetup for disk storage driver]) + else + with_storage_disk=no + fi + else + with_storage_disk=yes + fi + if test "$with_storage_disk" = "yes"; then AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1, [whether Disk backend for storage driver is enabled]) AC_DEFINE_UNQUOTED([PARTED],["$PARTED"], [Location or name of the parted program]) + AC_DEFINE_UNQUOTED([DMSETUP],["$DMSETUP"], + [Location or name of the dmsetup program]) fi fi AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"]) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0a2d10e..27e6a99 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -279,6 +279,7 @@ Requires: iscsi-initiator-utils %if %{with_storage_disk} # For disk driver Requires: parted +Requires: device-mapper %endif %if %{with_storage_mpath} # For multipath support diff --git a/src/Makefile.am b/src/Makefile.am index f8b8434..a8848bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -437,9 +437,9 @@ libvirt_la_BUILT_LIBADD = libvirt_util.la libvirt_util_la_SOURCES = \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ - $(AM_CFLAGS) $(AUDIT_CFLAGS) + $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ - $(LIB_PTHREAD) $(AUDIT_LIBS) + $(LIB_PTHREAD) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -1154,7 +1154,6 @@ libvirt_parthelper_SOURCES = $(STORAGE_HELPER_DISK_SOURCES) libvirt_parthelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS) libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ - $(DEVMAPPER_LIBS) \ libvirt_util.la \ ../gnulib/lib/libgnu.la @@ -1179,7 +1178,8 @@ libvirt_lxc_SOURCES = \ libvirt_lxc_LDFLAGS = $(WARN_CFLAGS) $(AM_LDFLAGS) libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(LIBXML_LIBS) $(NUMACTL_LIBS) $(LIB_PTHREAD) \ - $(LIBNL_LIBS) $(AUDIT_LIBS) ../gnulib/lib/libgnu.la + $(LIBNL_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ + ../gnulib/lib/libgnu.la libvirt_lxc_CFLAGS = \ $(LIBPARTED_CFLAGS) \ $(NUMACTL_CFLAGS) \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 88e270c..63bd721 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -881,6 +881,7 @@ virGetUserID; virGetUserName; virHexToBin; virIndexToDiskName; +virIsDevMapperDevice; virKillProcess; virMacAddrCompare; virParseMacAddr; @@ -895,6 +896,8 @@ virSetCloseExec; virSetNonBlock; virSetUIDGID; virSkipSpaces; +virStrcpy; +virStrncpy; virStrToDouble; virStrToLong_i; virStrToLong_l; @@ -902,8 +905,6 @@ virStrToLong_ll; virStrToLong_ui; virStrToLong_ul; virStrToLong_ull; -virStrcpy; -virStrncpy; virTimestamp; virVasprintf; diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 6ef413d..acc9171 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -59,18 +59,6 @@ enum diskCommand { DISK_GEOMETRY }; -static int -is_dm_device(const char *devname) -{ - struct stat buf; - - if (devname && !stat(devname, &buf) && dm_is_dm_major(major(buf.st_rdev))) { - return 1; - } - - return 0; -} - int main(int argc, char **argv) { PedDevice *dev; @@ -96,7 +84,7 @@ int main(int argc, char **argv) } path = argv[1]; - if (is_dm_device(path)) { + if (virIsDevMapperDevice(path)) { partsep = "p"; canonical_path = strdup(path); if (canonical_path == NULL) { diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index c7ade6b..05eb8c3 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -31,6 +31,7 @@ #include "storage_backend_disk.h" #include "util.h" #include "memory.h" +#include "command.h" #include "configmake.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -647,6 +648,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, char *part_num = NULL; char *devpath = NULL; char *devname, *srcname; + virCommandPtr cmd = NULL; int rc = -1; if (virFileResolveLink(vol->target.path, &devpath) < 0) { @@ -660,38 +662,46 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, srcname = basename(pool->def->source.devices[0].path); DEBUG("devname=%s, srcname=%s", devname, srcname); - if (!STRPREFIX(devname, srcname)) { + if (!virIsDevMapperDevice(devpath) && !STRPREFIX(devname, srcname)) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, _("Volume path '%s' did not start with parent " "pool source device name."), devname); goto cleanup; } - part_num = devname + strlen(srcname); + if (!virIsDevMapperDevice(devpath)) { + part_num = devname + strlen(srcname); - if (*part_num == 0) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse partition number from target " - "'%s'"), devname); - goto cleanup; - } + if (*part_num == 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse partition number from target " + "'%s'"), devname); + goto cleanup; + } - /* eg parted /dev/sda rm 2 */ - const char *prog[] = { - PARTED, - pool->def->source.devices[0].path, - "rm", - "--script", - part_num, - NULL, - }; + cmd = virCommandNew(PARTED); + virCommandAddArgList(cmd, + pool->def->source.devices[0].path, + "rm", + "--script", + part_num, + NULL); - if (virRun(prog, NULL) < 0) - goto cleanup; + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + } else { + cmd = virCommandNew(DMSETUP); + virCommandAddArgList(cmd, "remove", "--force", devpath, NULL); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + } rc = 0; + cleanup: VIR_FREE(devpath); + virCommandFree(cmd); return rc; } diff --git a/src/util/util.c b/src/util/util.c index ee04ca9..fc2e0c9 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -45,6 +45,7 @@ #include <string.h> #include <signal.h> #include <termios.h> +#include <libdevmapper.h> #include "c-ctype.h" #ifdef HAVE_PATHS_H @@ -3100,3 +3101,16 @@ virTimestamp(void) return timestamp; } + +bool +virIsDevMapperDevice(const char *devname) +{ + struct stat buf; + + if (devname && + !stat(devname, &buf) && + dm_is_dm_major(major(buf.st_rdev))) + return true; + + return false; +} diff --git a/src/util/util.h b/src/util/util.h index 8373038..280f86e 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -296,4 +296,6 @@ int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; char *virTimestamp(void); +bool virIsDevMapperDevice(const char *devname); + #endif /* __VIR_UTIL_H__ */ -- 1.7.3.2

2 5

[libvirt] [libvirt-php 0/2] Introduce set_error() function and fix compilation warnings
by Michal Novotny 09 Feb '11

09 Feb '11

Hi, this is the patch to introduce set_error() function to be able to set error from everywhere we want (and not just using the libvirt error handler), e.g. when the API function is not available in the libvirt version the user is using. Also, the formatting and error handling has been fixed. Second part of the patch is fixing the compilation warnings. Patch has been tested on Fedora 14 box using php 5.3.4-1 version of Fedora 14 and it was working as designed. Michal Signed-off-by: Michal Novotny <minovotn(a)redhat.com> Michal Novotny (2): Introduce set_error() function and fix error handling/formatting Fix compilation warnings libvirt.c | 382 ++++++++++++++++++++++++++++++++------------------------- php_libvirt.h | 4 - 2 files changed, 212 insertions(+), 174 deletions(-) -- 1.7.3.2

2 4

[libvirt] Strange nodedev-dumpxml ??
by arnaud.champion＠devatom.fr 09 Feb '11

09 Feb '11

?Hi, I have maybe a strange thing on a nodedev-dumpxml virsh result : virsh # nodedev-dumpxml block_sr0 <device> <name>block_sr0</name> <parent>scsi_0_0_1_0</parent> <capability type='storage'> <block>/dev/sr0</block> <bus>scsi</bus> <drive_type>cdrom</drive_type> <model>DVD RW DRU-190S</model> <vendor>SONY</vendor> <capability type='removable'> <media_available>0</media_available> <media_size>0</media_size> </capability> </capability> </device> I think (note I'm not sure), the capabilty type removable should be in the device element, like this : virsh # nodedev-dumpxml block_sr0 <device> <name>block_sr0</name> <parent>scsi_0_0_1_0</parent> <capability type='storage'> <block>/dev/sr0</block> <bus>scsi</bus> <drive_type>cdrom</drive_type> <model>DVD RW DRU-190S</model> <vendor>SONY</vendor> </capability> <capability type='removable'> <media_available>0</media_available> <media_size>0</media_size> </capability> </device> Let me know if I'm wrong.

2 1