March 2012 - Devel - libvirt List Archives

[libvirt] [RFC] qemu: support for QEMU bridge helper
by Corey Bryant 15 Mar '12

15 Mar '12

The QEMU bridge helper allows QEMU to be executed with bridge networking support from a non-privileged user. For more details see: http://lists.gnu.org/archive/html/qemu-devel/2012-01/msg03562.html I would like to see if there is interest in adding support to allow libvirt to execute guests with "-net bridge" support. This support would complement another feature we are currently working on, which provides per-guest configurable user/group for QEMU processes. This will enable guests to be run from separate non-privileged IDs. For more details see: http://www.redhat.com/archives/libvir-list/2012-February/msg00990.html -- Regards, Corey

1 0

[libvirt] [PATCH] qemu: Use scsi-block for lun passthrough instead of scsi-disk
by Osier Yang 15 Mar '12

15 Mar '12

And don't allow to hotplug a usb disk with "device == lun". This is the missed pieces in previous virtio-scsi patchset: http://www.redhat.com/archives/libvir-list/2012-February/msg01052.html --- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 46 +++++++++++++------ src/qemu/qemu_driver.c | 14 ++++-- tests/qemuhelptest.c | 3 +- .../qemuxml2argv-disk-scsi-lun-passthrough.args | 10 ++++ .../qemuxml2argv-disk-scsi-lun-passthrough.xml | 32 ++++++++++++++ tests/qemuxml2argvtest.c | 4 ++ 8 files changed, 93 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 64a4546..ace5011 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -154,6 +154,7 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "drive-iotune", /* 85 */ "system_wakeup", "scsi-disk.channel", + "scsi-block", ); struct qemu_feature_flags { @@ -1444,6 +1445,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) qemuCapsSet(flags, QEMU_CAPS_VIRTIO_BLK_SCSI); if (strstr(str, "scsi-disk.channel")) qemuCapsSet(flags, QEMU_CAPS_SCSI_DISK_CHANNEL); + if (strstr(str, "scsi-block")) + qemuCapsSet(flags, QEMU_CAPS_SCSI_BLOCK); return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index db584ce..62b4270 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -122,6 +122,7 @@ enum qemuCapsFlags { QEMU_CAPS_DRIVE_IOTUNE = 85, /* -drive bps= and friends */ QEMU_CAPS_WAKEUP = 86, /* system_wakeup monitor command */ QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ + QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6ec1eb9..048bad8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2190,6 +2190,15 @@ qemuBuildDriveDevStr(virDomainDefPtr def, disk->info.addr.drive.unit); break; case VIR_DOMAIN_DISK_BUS_SCSI: + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_BLOCK)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support scsi-block for " + "lun passthrough")); + goto error; + } + } + controllerModel = virDomainDiskFindControllerModel(def, disk, VIR_DOMAIN_CONTROLLER_TYPE_SCSI); @@ -2205,30 +2214,37 @@ qemuBuildDriveDevStr(virDomainDefPtr def, goto error; } - virBufferAddLit(&opt, "scsi-disk"); + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) + virBufferAddLit(&opt, "scsi-block"); + else + virBufferAddLit(&opt, "scsi-disk"); virBufferAsprintf(&opt, ",bus=scsi%d.%d,scsi-id=%d", disk->info.addr.drive.controller, disk->info.addr.drive.bus, disk->info.addr.drive.unit); } else { - if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_CHANNEL)) { - if (disk->info.addr.drive.target > 7) { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU doesn't support target " - "greater than 7")); - goto error; - } + if ((disk->device != VIR_DOMAIN_DISK_DEVICE_LUN)) { + if (!qemuCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_CHANNEL)) { + if (disk->info.addr.drive.target > 7) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU doesn't support target " + "greater than 7")); + goto error; + } - if ((disk->info.addr.drive.bus != disk->info.addr.drive.unit) && - (disk->info.addr.drive.bus != 0)) { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This QEMU only supports both bus and " - "unit equal to 0")); - goto error; + if ((disk->info.addr.drive.bus != disk->info.addr.drive.unit) && + (disk->info.addr.drive.bus != 0)) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("This QEMU only supports both bus and " + "unit equal to 0")); + goto error; + } } + virBufferAddLit(&opt, "scsi-disk"); + } else { + virBufferAddLit(&opt, "scsi-block"); } - virBufferAddLit(&opt, "scsi-disk"); virBufferAsprintf(&opt, ",bus=scsi%d.0,channel=%d,scsi-id=%d,lun=%d", disk->info.addr.drive.controller, disk->info.addr.drive.bus, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index be678f3..b4878c3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5090,17 +5090,23 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, break; case VIR_DOMAIN_DISK_DEVICE_DISK: case VIR_DOMAIN_DISK_DEVICE_LUN: - if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) + if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) { + if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disk device='lun' is not supported for usb bus")); + break; + } ret = qemuDomainAttachUsbMassstorageDevice(conn, driver, vm, disk); - else if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) { ret = qemuDomainAttachPciDiskDevice(conn, driver, vm, disk); - else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) + } else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { ret = qemuDomainAttachSCSIDisk(conn, driver, vm, disk); - else + } else { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk bus '%s' cannot be hotplugged."), virDomainDiskBusTypeToString(disk->bus)); + } break; default: qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 370cd0d..05fdc4d 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -673,7 +673,8 @@ mymain(void) QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO, QEMU_CAPS_CPU_HOST, - QEMU_CAPS_FSDEV_WRITEOUT); + QEMU_CAPS_FSDEV_WRITEOUT, + QEMU_CAPS_SCSI_BLOCK); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args new file mode 100644 index 0000000..1d2b476 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args @@ -0,0 +1,10 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ +-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ +-device lsi,id=scsi1,bus=pci.0,addr=0x4 \ +-drive file=/dev/HostVG/QEMUGuest1,if=none,id=drive-scsi0-0-0-0 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0 \ +-drive file=/dev/HostVG/QEMUGuest2,if=none,id=drive-scsi0-0-1-1 \ +-device scsi-block,bus=scsi0.0,channel=0,scsi-id=1,lun=1,drive=drive-scsi0-0-1-1,id=scsi0-0-1-1 \ +-usb -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.xml new file mode 100644 index 0000000..7f0cc81 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu>1</vcpu> + <os> + <type arch='i686' machine='pc'>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</emulator> + <disk type='block' device='lun'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <disk type='block' device='lun'> + <source dev='/dev/HostVG/QEMUGuest2'/> + <target dev='hda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='1' unit='1'/> + </disk> + <controller type='scsi' index='0' model='virtio-scsi'/> + <controller type='scsi' index='1' model='lsilogic'/> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9001834..d0affc7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -487,6 +487,10 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_VIRTIO_BLK_SCSI, QEMU_CAPS_VIRTIO_BLK_SG_IO); + DO_TEST("disk-scsi-lun-passthrough", false, + QEMU_CAPS_DRIVE, + QEMU_CAPS_DEVICE, + QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_VIRTIO_BLK_SG_IO); DO_TEST("graphics-vnc", false, NONE); DO_TEST("graphics-vnc-socket", false, NONE); -- 1.7.1

2 6

[libvirt] [PATCH v2] Allow overriding default URI in config file
by Daniel P. Berrange 15 Mar '12

15 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently if the URI passed to virConnectOpen* is NULL, then we - Look for LIBVIRT_DEFAULT_URI env var - Probe for drivers This changes it so that - Look for LIBVIRT_DEFAULT_URI env var - Look for 'uri_default' in $HOME/.libvirt/libvirt.conf - Probe for drivers --- docs/uri.html.in | 16 ++++++++- src/libvirt.c | 107 +++++++++++++++++++++++++++++++++++++----------------- src/libvirt.conf | 6 +++ tools/virsh.pod | 4 ++- 4 files changed, 98 insertions(+), 35 deletions(-) diff --git a/docs/uri.html.in b/docs/uri.html.in index 79f8786..2f76e8f 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -52,6 +52,19 @@ uri_aliases = [ set, no alias lookup will be attempted. </p> + <h2><a name="URI_default">Default URI choice</a></h2> + + <p> +If the URI passed to <code>virConnectOpen*</code> is NULL, then libvirt will use the following +logic to determine what URI to use. +</p> + + <ol> + <li>The environment variable <code>LIBVIRT_DEFAULT_URI</code></li> + <li>The client configuration file <code>uri_default</code> parameter</li> + <li>Probe each hypervisor in turn until one that works is found</li> + </ol> + <h2> <a name="URI_virsh">Specifying URIs to virsh, virt-manager and virt-install</a> </h2> @@ -64,7 +77,8 @@ virsh <b>-c test:///default</b> list <p> If virsh finds the environment variable <code>VIRSH_DEFAULT_CONNECT_URI</code> set, it will try this URI by -default. +default. Use of this environment variable is, however, deprecated +now that libvirt supports <code>LIBVIRT_DEFAULT_URI</code> itself. </p> <p> When using the interactive virsh shell, you can also use the diff --git a/src/libvirt.c b/src/libvirt.c index e916aa0..1c0cdf7 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -961,7 +961,7 @@ error: } static char * -virConnectConfigFile(void) +virConnectGetConfigFilePath(void) { char *path; if (geteuid() == 0) { @@ -989,6 +989,33 @@ error: return NULL; } +static int +virConnectGetConfigFile(virConfPtr *conf) +{ + char *filename = NULL; + int ret = -1; + + *conf = NULL; + + if (!(filename = virConnectGetConfigFilePath())) + goto cleanup; + + if (!virFileExists(filename)) { + ret = 0; + goto cleanup; + } + + VIR_DEBUG("Loading config file '%s'", filename); + if (!(*conf = virConfReadFile(filename, 0))) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(filename); + return ret; +} + #define URI_ALIAS_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-" static int @@ -1050,35 +1077,45 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * } static int -virConnectOpenResolveURIAlias(const char *alias, char **uri) +virConnectOpenResolveURIAlias(virConfPtr conf, + const char *alias, char **uri) { - char *config = NULL; int ret = -1; - virConfPtr conf = NULL; virConfValuePtr value = NULL; *uri = NULL; - if (!(config = virConnectConfigFile())) - goto cleanup; - - if (!virFileExists(config)) { - ret = 0; - goto cleanup; - } - - VIR_DEBUG("Loading config file '%s'", config); - if (!(conf = virConfReadFile(config, 0))) - goto cleanup; - if ((value = virConfGetValue(conf, "uri_aliases"))) ret = virConnectOpenFindURIAliasMatch(value, alias, uri); else ret = 0; + return ret; +} + + +static int +virConnectGetDefaultURI(virConfPtr conf, + const char **name) +{ + int ret = -1; + virConfValuePtr value = NULL; + char *defname = getenv("LIBVIRT_DEFAULT_URI"); + if (defname && *defname) { + VIR_DEBUG("Using LIBVIRT_DEFAULT_URI '%s'", defname); + *name = defname; + } else if ((value = virConfGetValue(conf, "uri_default"))) { + if (value->type != VIR_CONF_STRING) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a string for 'uri_default' config parameter")); + goto cleanup; + } + VIR_DEBUG("Using config file uri '%s'", value->str); + *name = value->str; + } + + ret = 0; cleanup: - virConfFree(conf); - VIR_FREE(config); return ret; } @@ -1089,6 +1126,7 @@ do_open (const char *name, { int i, res; virConnectPtr ret; + virConfPtr conf = NULL; virResetLastError(); @@ -1096,20 +1134,20 @@ do_open (const char *name, if (ret == NULL) return NULL; + if (virConnectGetConfigFile(&conf) < 0) + goto failed; + + if (name && name[0] == '\0') + name = NULL; + /* * If no URI is passed, then check for an environment string if not * available probe the compiled in drivers to find a default hypervisor * if detectable. */ - if (!name || name[0] == '\0') { - char *defname = getenv("LIBVIRT_DEFAULT_URI"); - if (defname && *defname) { - VIR_DEBUG("Using LIBVIRT_DEFAULT_URI %s", defname); - name = defname; - } else { - name = NULL; - } - } + if (!name && + virConnectGetDefaultURI(conf, &name) < 0) + goto failed; if (name) { char *alias = NULL; @@ -1124,7 +1162,7 @@ do_open (const char *name, name = "xen:///"; if (!(flags & VIR_CONNECT_NO_ALIASES) && - virConnectOpenResolveURIAlias(name, &alias) < 0) + virConnectOpenResolveURIAlias(conf, name, &alias) < 0) goto failed; ret->uri = virURIParse (alias ? alias : name); @@ -1308,9 +1346,12 @@ do_open (const char *name, } } + virConfFree(conf); + return ret; failed: + virConfFree(conf); virUnrefConnect(ret); return NULL; @@ -1325,11 +1366,11 @@ failed: * * Returns a pointer to the hypervisor connection or NULL in case of error * - * If @name is NULL then probing will be done to determine a suitable - * default driver to activate. This involves trying each hypervisor - * in turn until one successfully opens. If the LIBVIRT_DEFAULT_URI - * environment variable is set, then it will be used in preference - * to probing for a driver. + * If @name is NULL, if the LIBVIRT_DEFAULT_URI environment variable is set, + * then it will be used. Otherwise if the client configuration file + * has the "uri_default" parameter set, then it will be used. Finally + * probing will be done to determine a suitable default driver to activate. + * This involves trying each hypervisor in turn until one successfully opens. * * If connecting to an unprivileged hypervisor driver which requires * the libvirtd daemon to be active, it will automatically be launched diff --git a/src/libvirt.conf b/src/libvirt.conf index c54903c..016cd24 100644 --- a/src/libvirt.conf +++ b/src/libvirt.conf @@ -10,3 +10,9 @@ # "hail=qemu+ssh://root@hail.cloud.example.com/system", # "sleet=qemu+ssh://root@sleet.cloud.example.com/system", #] + +# +# This can be used to prevent probing of the hypervisor +# driver when no URI is supplied by the application. + +#uri_default = "qemu:///system" diff --git a/tools/virsh.pod b/tools/virsh.pod index 64b00ee..4cc91cc 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2632,7 +2632,9 @@ The file to log virsh debug messages. =item VIRSH_DEFAULT_CONNECT_URI The hypervisor to connect to by default. Set this to a URI, in the same -format as accepted by the B<connect> option. +format as accepted by the B<connect> option. This environment variable +is deprecated in favour of the global B<LIVIRT_DEFAULT_URI> variable +which serves the same purpose. =item VISUAL -- 1.7.7.6

2 1

[libvirt] [PATCH] Allow overriding default URI in config file
by Daniel P. Berrange 15 Mar '12

15 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently if the URI passed to virConnectOpen* is NULL, then we - Look for LIBVIRT_DEFAULT_URI env var - Probe for drivers This changes it so that - Look for LIBVIRT_DEFAULT_URI env var - Look for 'uri_default' in $HOME/.libvirt/libvirt.conf - Probe for drivers --- docs/uri.html.in | 13 +++++++ src/libvirt.c | 107 +++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 87 insertions(+), 33 deletions(-) diff --git a/docs/uri.html.in b/docs/uri.html.in index 79f8786..48f6498 100644 --- a/docs/uri.html.in +++ b/docs/uri.html.in @@ -52,6 +52,19 @@ uri_aliases = [ set, no alias lookup will be attempted. </p> + <h2><a name="URI_default">Default URI choice</a></h2> + + <p> +If the URI passed to <code>virConnectOpen*</code> is NULL, then libvirt will use the following +logic to determine what URI to use. +</p> + + <ol> + <li>The environment variable <code>LIBVIRT_DEFAULT_URI</code></li> + <li>The client configuration file <code>uri_default</code> parameter</li> + <li>Probe each hypervisor in turn until one that works is found</li> + </ol> + <h2> <a name="URI_virsh">Specifying URIs to virsh, virt-manager and virt-install</a> </h2> diff --git a/src/libvirt.c b/src/libvirt.c index e916aa0..c5c2e84 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -961,7 +961,7 @@ error: } static char * -virConnectConfigFile(void) +virConnectGetConfigFilePath(void) { char *path; if (geteuid() == 0) { @@ -989,6 +989,32 @@ error: return NULL; } +static int virConnectGetConfigFile(virConfPtr *conf) +{ + char *filename = NULL; + int ret = -1; + + *conf = NULL; + + if (!(filename = virConnectGetConfigFilePath())) + goto cleanup; + + if (!virFileExists(filename)) { + ret = 0; + goto cleanup; + } + + VIR_DEBUG("Loading config file '%s'", filename); + if (!(*conf = virConfReadFile(filename, 0))) + goto cleanup; + + ret = 0; + +cleanup: + VIR_FREE(filename); + return ret; +} + #define URI_ALIAS_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-" static int @@ -1050,35 +1076,46 @@ virConnectOpenFindURIAliasMatch(virConfValuePtr value, const char *alias, char * } static int -virConnectOpenResolveURIAlias(const char *alias, char **uri) +virConnectOpenResolveURIAlias(virConfPtr conf, + const char *alias, char **uri) { - char *config = NULL; int ret = -1; - virConfPtr conf = NULL; virConfValuePtr value = NULL; *uri = NULL; - if (!(config = virConnectConfigFile())) - goto cleanup; - - if (!virFileExists(config)) { - ret = 0; - goto cleanup; - } - - VIR_DEBUG("Loading config file '%s'", config); - if (!(conf = virConfReadFile(config, 0))) - goto cleanup; - if ((value = virConfGetValue(conf, "uri_aliases"))) ret = virConnectOpenFindURIAliasMatch(value, alias, uri); else ret = 0; + return ret; +} + + +static int virConnectGetDefaultURI(virConfPtr conf, + const char **name) +{ + int ret = -1; + virConfValuePtr value = NULL; + char *defname = getenv("LIBVIRT_DEFAULT_URI"); + if (defname && *defname) { + VIR_DEBUG("Using LIBVIRT_DEFAULT_URI %s", defname); + *name = defname; + } + + if ((value = virConfGetValue(conf, "uri_default"))) { + if (value->type != VIR_CONF_STRING) { + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Expected a string for 'uri_default' config parameter")); + goto cleanup; + } + + *name = value->str; + } + + ret = 0; cleanup: - virConfFree(conf); - VIR_FREE(config); return ret; } @@ -1089,6 +1126,7 @@ do_open (const char *name, { int i, res; virConnectPtr ret; + virConfPtr conf = NULL; virResetLastError(); @@ -1096,20 +1134,20 @@ do_open (const char *name, if (ret == NULL) return NULL; + if (virConnectGetConfigFile(&conf) < 0) + goto failed; + + if (name && name[0] == '\0') + name = NULL; + /* * If no URI is passed, then check for an environment string if not * available probe the compiled in drivers to find a default hypervisor * if detectable. */ - if (!name || name[0] == '\0') { - char *defname = getenv("LIBVIRT_DEFAULT_URI"); - if (defname && *defname) { - VIR_DEBUG("Using LIBVIRT_DEFAULT_URI %s", defname); - name = defname; - } else { - name = NULL; - } - } + if (!name && + virConnectGetDefaultURI(conf, &name) < 0) + goto failed; if (name) { char *alias = NULL; @@ -1124,7 +1162,7 @@ do_open (const char *name, name = "xen:///"; if (!(flags & VIR_CONNECT_NO_ALIASES) && - virConnectOpenResolveURIAlias(name, &alias) < 0) + virConnectOpenResolveURIAlias(conf, name, &alias) < 0) goto failed; ret->uri = virURIParse (alias ? alias : name); @@ -1308,9 +1346,12 @@ do_open (const char *name, } } + virConfFree(conf); + return ret; failed: + virConfFree(conf); virUnrefConnect(ret); return NULL; @@ -1325,11 +1366,11 @@ failed: * * Returns a pointer to the hypervisor connection or NULL in case of error * - * If @name is NULL then probing will be done to determine a suitable - * default driver to activate. This involves trying each hypervisor - * in turn until one successfully opens. If the LIBVIRT_DEFAULT_URI - * environment variable is set, then it will be used in preference - * to probing for a driver. + * If @name is NULL, if the LIBVIRT_DEFAULT_URI environment variable is set, + * then it will be used. Otherwise if the client configuration file + * has the "uri_default" parameter set, then it will be used. Finally + * probing will be done to determine a suitable default driver to activate. + * This involves trying each hypervisor in turn until one successfully opens. * * If connecting to an unprivileged hypervisor driver which requires * the libvirtd daemon to be active, it will automatically be launched -- 1.7.7.6

2 3

[libvirt] [PATCH] Add container_uuid env variable to LXC guests
by Daniel P. Berrange 14 Mar '12

14 Mar '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Systemd has declared that all container virtualization technologies should set 'container_uuid' to identify themselves. http://cgit.freedesktop.org/systemd/systemd/commit/?id=09b967eaa51a39dabb7f… --- src/lxc/lxc_container.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2282eb0..d827b35 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -125,6 +125,7 @@ static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef) virCommandAddEnvString(cmd, "PATH=/bin:/sbin"); virCommandAddEnvString(cmd, "TERM=linux"); virCommandAddEnvString(cmd, "container=lxc-libvirt"); + virCommandAddEnvPair(cmd, "container_uuid", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name); if (vmDef->os.cmdline) -- 1.7.7.6

2 1

[libvirt] [PATCH] python: add virDomainGetCPUStats python binding API
by Guannan Ren 14 Mar '12

14 Mar '12

dom.cPUStats(True, 0) [{'cpu_time': 370942649768L, 'system_time': 11640000000L, 'user_time': 890000000L}] dom.cPUStats(False, 0) [{'cpu_time': 38378374721L}, {'cpu_time': 12475521087L}, {'cpu_time': 127388622598L}, {'cpu_time': 192720388324L}] --- python/libvirt-override-api.xml | 10 +++ python/libvirt-override.c | 164 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 174 insertions(+), 0 deletions(-) diff --git a/python/libvirt-override-api.xml b/python/libvirt-override-api.xml index ab8f33a..c906cc3 100644 --- a/python/libvirt-override-api.xml +++ b/python/libvirt-override-api.xml @@ -149,6 +149,16 @@ <arg name='path' type='char *' info='the path for the block device'/> <arg name='flags' type='int' info='flags (unused; pass 0)'/> </function> + <function name='virDomainGetCPUStats' file='python'> + <info>Extracts CPU statistics for a running domain, On success it will return a list of data of dictionary type. + If boolean total is True, the first element of the list refers to CPU0 on the host, second element is CPU1, and so on. + The format of data struct is like [{cpu_time:xxx},{cpu_time:xxx}, ...] + If it is False, it returns total domain CPU statistics like [{cpu_time:xxx, user_time:xxx, system_time:xxx}]</info> + <return type='str *' info='returns a list of dictionary in case of success, None in case of error'/> + <arg name='domain' type='virDomainPtr' info='pointer to domain object'/> + <arg name='total' type='bool' info='on true, return total domain CPU statistics, false return per-cpu info'/> + <arg name='flags' type='int' info='flags (unused; pass 0)'/> + </function> <function name='virDomainInterfaceStats' file='python'> <info>Extracts interface device statistics for a domain</info> <return type='virDomainInterfaceStats' info='a tuple of statistics'/> diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 792cfa3..eb24c60 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -378,6 +378,169 @@ cleanup: } static PyObject * +libvirt_virDomainGetCPUStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) +{ + virDomainPtr domain; + PyObject *pyobj_domain, *totalbool; + PyObject *ret = NULL; + PyObject *cpu, *total; + PyObject *error; + int i, i_retval; + int ncpus = -1; + int sumparams, nparams = -1; + unsigned int flags; + virTypedParameterPtr params, cpuparams; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainGetNumaParameters", + &pyobj_domain, &totalbool, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (!PyBool_Check(totalbool)) { + PyErr_Format(PyExc_TypeError, + "The \"total\" attribute must be bool"); + return NULL; + } + + if ((ret = PyList_New(0)) == NULL) + return NULL; + + if (totalbool == Py_False) { + LIBVIRT_BEGIN_ALLOW_THREADS; + ncpus = virDomainGetCPUStats(domain, NULL, 0, 0, 0, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (ncpus < 0) { + error = VIR_PY_NONE; + goto failed; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + nparams = virDomainGetCPUStats(domain, NULL, 0, 0, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nparams < 0) { + error = VIR_PY_NONE; + goto failed; + } + + if (!nparams) { + if ((cpu = PyDict_New()) == NULL) { + error = NULL; + goto failed; + } + + if (PyList_Append(ret, cpu) < 0) { + Py_DECREF(cpu); + error = NULL; + goto failed; + } + + Py_DECREF(cpu); + return ret; + } + sumparams = nparams * ncpus; + + if (VIR_ALLOC_N(params, sumparams) < 0) { + error = PyErr_NoMemory(); + goto failed; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetCPUStats(domain, params, nparams, 0, ncpus, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + error = VIR_PY_NONE; + goto cleanup; + } + + for (i = 0; i < ncpus; i++) { + if (params[i * nparams].type == 0) + continue; + + cpuparams = &params[i * nparams]; + if ((cpu = getPyVirTypedParameter(cpuparams, nparams)) == NULL) { + error = NULL; + goto cleanup; + } + if (PyList_Append(ret, cpu) < 0) { + Py_DECREF(cpu); + error = NULL; + goto cleanup; + } + Py_DECREF(cpu); + } + + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + return ret; + } else { + LIBVIRT_BEGIN_ALLOW_THREADS; + nparams = virDomainGetCPUStats(domain, NULL, 0, -1, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (nparams < 0) { + error = VIR_PY_NONE; + goto failed; + } + + if (!nparams) { + if ((total = PyDict_New()) == NULL) { + error = NULL; + goto failed; + } + if (PyList_Append(ret, total) < 0) { + Py_DECREF(total); + error = NULL; + goto failed; + } + + Py_DECREF(total); + return ret; + } + sumparams = nparams; + + if (VIR_ALLOC_N(params, nparams) < 0) { + error = PyErr_NoMemory(); + goto failed; + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + i_retval = virDomainGetCPUStats(domain, params, nparams, -1, 1, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (i_retval < 0) { + error = VIR_PY_NONE; + goto cleanup; + } + + if ((total = getPyVirTypedParameter(params, nparams)) == NULL) { + error = NULL; + goto cleanup; + } + if (PyList_Append(ret, total) < 0) { + Py_DECREF(total); + error = NULL; + goto cleanup; + } + Py_DECREF(total); + + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + return ret; + } + +cleanup: + virTypedParameterArrayClear(params, sumparams); + VIR_FREE(params); + +failed: + Py_DECREF(ret); + return error; +} + +static PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; @@ -5366,6 +5529,7 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virNetworkGetAutostart", libvirt_virNetworkGetAutostart, METH_VARARGS, NULL}, {(char *) "virDomainBlockStats", libvirt_virDomainBlockStats, METH_VARARGS, NULL}, {(char *) "virDomainBlockStatsFlags", libvirt_virDomainBlockStatsFlags, METH_VARARGS, NULL}, + {(char *) "virDomainGetCPUStats", libvirt_virDomainGetCPUStats, METH_VARARGS, NULL}, {(char *) "virDomainInterfaceStats", libvirt_virDomainInterfaceStats, METH_VARARGS, NULL}, {(char *) "virDomainMemoryStats", libvirt_virDomainMemoryStats, METH_VARARGS, NULL}, {(char *) "virNodeGetCellsFreeMemory", libvirt_virNodeGetCellsFreeMemory, METH_VARARGS, NULL}, -- 1.7.7.5

4 7

[libvirt] [libvirt-glib 1/3] Fix GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_GUESTFWD name
by Christophe Fergeau 14 Mar '12

14 Mar '12

It was called GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_GUESTFWD, which in turn confused glib-mkenums, leading to a wrong value being generated in the XML when trying to use this enumeration. --- libvirt-gconfig/libvirt-gconfig-domain-channel.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-channel.h b/libvirt-gconfig/libvirt-gconfig-domain-channel.h index a8a3020..5141d11 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-channel.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-channel.h @@ -57,7 +57,7 @@ struct _GVirConfigDomainChannelClass }; typedef enum { - GVIR_CONFIG_DOMAIN_CONSOLE_TARGET_GUESTFWD, + GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_GUESTFWD, GVIR_CONFIG_DOMAIN_CHANNEL_TARGET_VIRTIO, } GVirConfigDomainChannelTargetType; -- 1.7.7.6

4 15

[libvirt] [PATCH] qemu: Reverse condition in qemuDomainCheckDiskPresence
by Michal Privoznik 14 Mar '12

14 Mar '12

With current code, we pass true iff domain is cold booting. However, if disk is inaccessible and startupPolicy for that disk is set to 'requisite' we have to fail iff cold booting. --- src/qemu/qemu_domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f8b7c96..625c595 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1703,7 +1703,7 @@ qemuDomainSetFakeReboot(struct qemud_driver *driver, int qemuDomainCheckDiskPresence(struct qemud_driver *driver, virDomainObjPtr vm, - bool start_with_state) + bool cold_boot) { int ret = -1; int i; @@ -1738,7 +1738,7 @@ qemuDomainCheckDiskPresence(struct qemud_driver *driver, break; case VIR_DOMAIN_STARTUP_POLICY_REQUISITE: - if (!start_with_state) { + if (cold_boot) { virReportSystemError(errno, _("cannot access file '%s'"), disk->src); -- 1.7.8.5

2 1

[libvirt] Coverity automatic detection
by Alex Jia 14 Mar '12

14 Mar '12

This email is automatically generated. The test result is based on the following git commit: 19c7980 qemu: fix segfault when detaching non-existent network device Analysis summary report: ------------------------ Files analyzed : 254 Total LoC input to cov-analyze : 348334 Functions analyzed : 8419 Paths analyzed : 998857 Defect occurrences found : 88 Total 7 ATOMICITY 6 CHECKED_RETURN 13 DEADCODE 1 EVALUATION_ORDER 7 FORWARD_NULL 13 LOCK 3 NEGATIVE_RETURNS 1 NO_EFFECT 3 NULL_RETURNS 1 OVERRUN_STATIC 11 RESOURCE_LEAK 1 RETURN_LOCAL 12 REVERSE_INULL 1 SIZEOF_MISMATCH 6 UNINIT 2 UNUSED_VALUE Exceeded path limit of 5000 paths in 0.49% of functions (normally up to 5% of functions encounter this limitation) For details, please see attachment. Regards, Alex

1 0

[libvirt] Schedule for the next release
by Daniel Veillard 14 Mar '12

14 Mar '12

I did let the one month cycle go a bit for a change, last release was on the 13th and considering how short Feb is and the fact that aligning with end of month makes things easier to remember and plan for, I suggest to slip by two week and plan for the end of March. More specifically I would suggest to enter freeze for 0.9.11 on the 24 i.e. in 10 days and shoot for a release on the 30th, using the last week of March for testing and bug fixes. Then we will try to keep aligned again with end of month release :-) Hopefully this is okay, but please raise your voice if you think this is a problem, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0