- Devel - libvirt List Archives

[libvirt] [PATCH 1/3] qemu: avoid dead store in qemuProcessStart
by ajia＠redhat.com 08 Aug '11

08 Aug '11

Value stored to 'ret' is never read, in fact, 'cleanup' section will directly return -1 when function is fail, so remove this dead assignment. * src/qemu/qemu_process.c: kill dead assignment. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 88cefd5..b0d2149 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2908,13 +2908,11 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Writing early domain status to disk"); if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { - ret = -1; goto cleanup; } VIR_DEBUG("Waiting for handshake from child"); if (virCommandHandshakeWait(cmd) < 0) { - ret = -1; goto cleanup; } @@ -2943,7 +2941,6 @@ int qemuProcessStart(virConnectPtr conn, VIR_DEBUG("Labelling done, completing handshake to child"); if (virCommandHandshakeNotify(cmd) < 0) { - ret = -1; goto cleanup; } VIR_DEBUG("Handshake complete, child running"); -- 1.7.1

3 8

[libvirt] [PATCH] qemu: Avoid overwriting errors from virGetHostname
by Jiri Denemark 05 Aug '11

05 Aug '11

--- src/qemu/qemu_migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7aeea69..4d0e062 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -257,7 +257,7 @@ qemuMigrationCookieNew(virDomainObjPtr dom) memcpy(mig->uuid, dom->def->uuid, VIR_UUID_BUFLEN); if (!(mig->localHostname = virGetHostname(NULL))) - goto no_memory; + goto error; if (virGetHostUUID(mig->localHostuuid) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to obtain host UUID")); -- 1.7.6

2 2

[libvirt] Disk snapshot mode proposal: patch for storing the snapshot mode from .vmx to .xml
by computernews＠rambler.ru 05 Aug '11

05 Aug '11

Hello, Few days ago I have proposed to implement the snapshot mode functionality for esx/vpx: |Mail subject: "[libvirt] VMWare "independent disk" processing needed" Sent: "04.07.2011" Sender: "computernews(a)rambler.ru" | What I meant is to allow "libvirt" to handle (see full .vmx attached) : |vmx: scsi0:1.mode = "independent-persistent" vmx: scsi0:2.mode = "independent-nonpersistent"| As none has responded I decided to start implementing that myself. By now I have the managed to implement the .vmx -> .xml part. According to "General tips for contributing patches" (http://libvirt.org/hacking.html#patches) I am sending the patch back to the community as early as it has sense as I still hope to contribute this feature to the community. It builds and has been functionally tested. I also tried my best to stick to coding conventions applied on the project. So I hope my patch will not take long time to analyze for someone experienced enough. I saw someone already has started (put few comments about snapshot modes in src/vmx/vmx.c). So tried to undestand an original idea and keep up with it. I hope I was not wrong there. I am willing to keep working in this direction. So if someone would be so kind to take a look at my efforts and provide a feedback - it would be very nice and, I hope, useful for the rest of the project. Attached are: 1. patch itself 2. ".vmx" file I am testing on 3. ".xml" file produced by my changes Looking forward to hear any feedback/criticism/advices. Thanks in advance. Best regards Oleh Paliy

3 6

[libvirt] [PATCH] qemu: avoid pass null pointer as an argument
by ajia＠redhat.com 05 Aug '11

05 Aug '11

In fact, 'pos' is always -1, this reason is because qemuProcessStart function assigns -1 to 'pos' variable then call qemuProcessWaitForMonitor, meanwhile, qemuProcessAttach function also call qemuProcessWaitForMonitor and directly pass -1 as an argument, so if (pos != -1) statement can't been run for ever, it also means we can't allocate memory to 'buf' variable, that is, 'buf' is a initial value NULL, however, the function qemuProcessReadLogFD(logfd, buf, buf_size, strlen(buf)) will be called on 'cleanup' section, null pointer passed as an argument. * src/qemu/qemu_process.c: avoid null pointer passed as an argument to a 'nonnull' parameter. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b0d2149..570992d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1189,6 +1189,11 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, goto closelog; } + if (VIR_ALLOC_N(buf, buf_size) < 0) { + virReportOOMError(); + return -1; + } + VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name); if (qemuConnectMonitor(driver, vm) < 0) { goto cleanup; -- 1.7.5.1

3 6

[libvirt] PCI devices passthough to LXC containers using libvirt
by Devendra K. Modium 05 Aug '11

05 Aug '11

Hi All Please let me know if anyone have given access to PCI devices for a LXC container. I have tried getting the xml from "virsh nodedev-dumpxml pci_device" and added to the libvirt xml file as shown below <device> <name>pci_0000_03_00_0</name> <parent>pci_0000_00_03_0</parent> <driver> <name>nvidia</name> </driver> <capability type='pci'> <domain>0</domain> <bus>3</bus> <slot>0</slot> <function>0</function> <product id='0x06fd' /> <vendor id='0x10de'>nVidia Corporation</vendor> </capability> </device> But it didn't work. I see the logs and it says couldn't get physical and virtual functions of these devices with error get_physical_function_linux:323 : Attempting to get SR IOV physical function for device with sysfs path '/sys/devices/pci0000:00/0000:00:00.0' 16:48:34.033: 13802: debug : get_sriov_function:270 : Attempting to resolve device path from device link '/sys/devices/pci0000:00/0000:00:00.0/physfn' 16:48:34.033: 13802: debug : get_sriov_function:274 : SR IOV function link '/sys/devices/pci0000:00/0000:00:00.0/physfn' does not exist 16:48:34.033: 13802: debug : get_virtual_functions_linux:348 : Attempting to get SR IOV virtual functions for devicewith sysfs path '/sys/devices/pci0000:00/0000:00:00.0' If anyone got some guidelines how to debug, please let me know. Thanks in advance Regards Devendra

2 3

[libvirt] [PATCH] qemu: avoid double free in qemuProcessWaitForMonitor
by ajia＠redhat.com 05 Aug '11

05 Aug '11

Reported by Eric. * src/qemu/qemu_process.c: avoid double free 'buf' on closelog lable. Signed-off-by: Alex Jia <ajia(a)redhat.com> --- src/qemu/qemu_process.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b0d2149..5ef25cb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1225,8 +1225,6 @@ cleanup: } closelog: - VIR_FREE(buf); - if (VIR_CLOSE(logfd) < 0) { char ebuf[1024]; VIR_WARN("Unable to close logfile: %s", -- 1.7.1

2 1

[libvirt] qemu-kvm>=0.14 is unable to boot
by Zdenek Styblik 05 Aug '11

05 Aug '11

Hello, I'm wondering what might be behind qemu-kvm>=0.14 is unable to boot except from PXE and perhaps virtio HDD. I mean, is somebody running qemu-kvm>=0.14 and libvirt-0.9.3/0.9.4 around here, thus is my setup broken? Thanks, Zdenek -- Zdenek Styblik email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

2 3

[libvirt] [PATCH] Set qemu migration speed unlimited when migrating to file
by Jim Fehlig 04 Aug '11

04 Aug '11

Discussed previously: https://www.redhat.com/archives/libvir-list/2011-August/msg00166.html The qemu migration speed default is 32MiB/s as defined in migration.c /* Migration speed throttling */ static int64_t max_throttle = (32 << 20); There is no reason to throttle migration when targeting a file. For dump and save operations, set migration speed to unlimited prior to migration and restore to default value after migration. Default units is MB for migrate_set_speed monitor command, so (INT64_MAX / (1024 * 1024)) is used for unlimited migration speed. Tested with both json and text monitors. --- src/qemu/qemu_migration.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7aeea69..4542289 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2676,6 +2676,13 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, virCommandPtr cmd = NULL; int pipeFD[2] = { -1, -1 }; + /* No need for qemu default of 32MiB/s when migrating to a file. + Default speed unit is MB, so set to unlimited with INT64_MAX / 1M. + Failure to change migration speed is not fatal. */ + qemuDomainObjEnterMonitor(driver, vm); + qemuMonitorSetMigrationSpeed(priv->mon, INT64_MAX / (1024 * 1024)); + qemuDomainObjExitMonitor(driver, vm); + if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATE_QEMU_FD) && (!compressor || pipe(pipeFD) == 0)) { /* All right! We can use fd migration, which means that qemu @@ -2783,6 +2790,11 @@ qemuMigrationToFile(struct qemud_driver *driver, virDomainObjPtr vm, ret = 0; cleanup: + /* Restore migration speed to 32MiB/s default */ + qemuDomainObjEnterMonitor(driver, vm); + qemuMonitorSetMigrationSpeed(priv->mon, (32 << 20)); + qemuDomainObjExitMonitor(driver, vm); + VIR_FORCE_CLOSE(pipeFD[0]); VIR_FORCE_CLOSE(pipeFD[1]); virCommandFree(cmd); -- 1.7.5.4

2 6

[libvirt] [PATCH] Allow use of block devices for guest filesystem
by Daniel P. Berrange 04 Aug '11

04 Aug '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently the LXC driver can only populate filesystems from host filesystems, using bind mounts. This patch allows host block devices to be mounted. It autodetects the filesystem format at mount time, and adds the block device to the cgroups ACL. Example usage is <filesystem type='block' accessmode='passthrough'> <source dev='/dev/sda1'/> <target dir='/home'/> </filesystem> * src/lxc/lxc_container.c: Mount block device filesystems * src/lxc/lxc_controller.c: Add block device filesystems to cgroups ACL --- src/lxc/lxc_container.c | 179 +++++++++++++++++++++++++++++++++++++++++++++- src/lxc/lxc_controller.c | 17 +++++ 2 files changed, 195 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 026d621..f6ab407 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -35,6 +35,7 @@ #include <sys/stat.h> #include <unistd.h> #include <mntent.h> +#include <dirent.h> /* Yes, we want linux private one, for _syscall2() macro */ #include <linux/unistd.h> @@ -597,12 +598,184 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, virReportSystemError(errno, _("Failed to make directory %s readonly"), fs->dst); + } + } + + ret = 0; + +cleanup: + VIR_FREE(src); + return ret; +} + + + +/* + * This functions attempts todo automatic detection of filesystem + * type following the same rules as the util-linux 'mount' binary. + * + * The main difference is that we don't (currently) try to use + * libblkid to detect the format first. We go straight to using + * /etc/filesystems, and then /proc/filesystems + */ +static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, + int flags, + const char *src, + const char *srcprefix) +{ + FILE *fp = NULL; + int ret = -1; + bool tryProc = false; + bool gotStar = false; + char *fslist = NULL; + char *line = NULL; + const char *type; + + VIR_DEBUG("src=%s srcprefix=%s dst=%s", src, srcprefix, fs->dst); + + /* First time around we use /etc/filesystems */ +retry: + if (virAsprintf(&fslist, "%s%s", + srcprefix, tryProc ? "/proc/filesystems" : "/etc/filesystems") < 0) { + virReportOOMError(); + goto cleanup; + } + + VIR_DEBUG("Open fslist %s", fslist); + if (!(fp = fopen(fslist, "r"))) { + /* If /etc/filesystems does not exist, then we need to retry + * with /proc/filesystems next + */ + if (errno == ENOENT && + !tryProc) { + tryProc = true; + VIR_FREE(fslist); + goto retry; + } + + virReportSystemError(errno, + _("Unable to read %s"), + fslist); + goto cleanup; + } + + while (!feof(fp)) { + size_t n; + VIR_FREE(line); + if (getline(&line, &n, fp) <= 0) { + if (feof(fp)) + break; + goto cleanup; } + if (strstr(line, "nodev")) + continue; + + type = strchr(line, '\n'); + if (type) + line[type-line] = '\0'; + + type = line; + virSkipSpaces(&type); + + /* + * /etc/filesystems is only allowed to contain '*' on the last line + */ + if (gotStar) { + lxcError(VIR_ERR_INTERNAL_ERROR, + _("%s has unexpected '*' before last line"), + fslist); + goto cleanup; + } + + /* An '*' on the last line in /etc/filesystems + * means try /proc/filesystems next. We don't + * jump immediately though, since we need to see + * if any more lines follow + */ + if (!tryProc && + STREQ(type, "*")) + gotStar = true; + + VIR_DEBUG("Trying mount %s with %s", src, type); + if (mount(src, fs->dst, type, flags, NULL) < 0) { + /* These errnos indicate a bogus filesystem type for + * the image we have, so skip to the next type + */ + if (errno == EINVAL || errno == ENODEV) + continue; + + virReportSystemError(errno, + _("Failed to bind mount directory %s to %s"), + src, fs->dst); + goto cleanup; + } + + ret = 0; + break; } - ret = 0; + /* We've got to the end of /etc/filesystems and saw + * a '*', so we mhust try /proc/filesystems next + */ + if (ret != 0 && + !tryProc && + gotStar) { + tryProc = true; + VIR_FREE(fslist); + VIR_FORCE_FCLOSE(fp); + goto retry; + } + + VIR_DEBUG("Done mounting filesystem ret=%d tryProc=%d", ret, tryProc); + +cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fp); + return ret; +} + + +/* + * Mount a block device 'src' on fs->dst, automatically + * probing for filesystem type + */ +static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, + const char *src, + const char *srcprefix) +{ + int flags = 0; + int ret = -1; + if (fs->readonly) + flags |= MS_RDONLY; + + if (virFileMakePath(fs->dst) < 0) { + virReportSystemError(errno, + _("Failed to create %s"), + fs->dst); + goto cleanup; + } + + ret = lxcContainerMountFSBlockAuto(fs, flags, src, srcprefix); + +cleanup: + return ret; +} + + +static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, + const char *srcprefix) +{ + char *src = NULL; + int ret = -1; + + if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) { + virReportOOMError(); + goto cleanup; + } + + ret = lxcContainerMountFSBlockHelper(fs, src, srcprefix); VIR_DEBUG("Done mounting filesystem ret=%d", ret); @@ -620,6 +793,10 @@ static int lxcContainerMountFS(virDomainFSDefPtr fs, if (lxcContainerMountFSBind(fs, srcprefix) < 0) return -1; break; + case VIR_DOMAIN_FS_TYPE_BLOCK: + if (lxcContainerMountFSBlock(fs, srcprefix) < 0) + return -1; + break; default: lxcError(VIR_ERR_CONFIG_UNSUPPORTED, _("Cannot mount filesystem type %s"), diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index ff42aa5..bc5ee25 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -188,6 +188,23 @@ static int lxcSetContainerResources(virDomainDefPtr def) } } + for (i = 0 ; i < def->nfss ; i++) { + if (def->fss[i]->type != VIR_DOMAIN_FS_TYPE_BLOCK) + continue; + + rc = virCgroupAllowDevicePath(cgroup, + def->fss[i]->src, + def->fss[i]->readonly ? + VIR_CGROUP_DEVICE_READ : + VIR_CGROUP_DEVICE_RW); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to allow device %s for domain %s"), + def->fss[i]->src, def->name); + goto cleanup; + } + } + rc = virCgroupAllowDeviceMajor(cgroup, 'c', LXC_DEV_MAJ_PTY, VIR_CGROUP_DEVICE_RWM); if (rc != 0) { -- 1.7.6

2 1

[libvirt] [PATCH] network: eliminate lag in updating dnsmasq hosts files
by Laine Stump 04 Aug '11

04 Aug '11

This addresses https://bugzilla.redhat.com/show_bug.cgi?id=713728 When "defining" a new network (or one that exists but isn't currently active) the new definition is stored in network->def, but for a network that already exists and is active, the new definition is stored in network->newDef, and then moved over to network->def as soon as the network is destroyed. However, the code that writes the dhcp and dns hosts files used by dnsmasq was always using network->def for its information, even when the new data was actually in network->newDef, so the hosts files always lagged one edit behind the definition. This patch changes the code to keep the pointer to the new definition after it's been assigned into the network, and use it directly (regardless of whether it's stored in network->newDef or network->def) to construct the hosts files. --- src/network/bridge_driver.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c7d2dfd..c90db63 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2338,6 +2338,7 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { struct network_driver *driver = conn->networkPrivateData; virNetworkIpDefPtr ipdef, ipv4def = NULL; virNetworkDefPtr def; + bool freeDef = true; virNetworkObjPtr network = NULL; virNetworkPtr ret = NULL; int ii; @@ -2367,21 +2368,19 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { if (!(network = virNetworkAssignDef(&driver->networks, def))) goto cleanup; - def = NULL; + freeDef = false; network->persistent = 1; - if (virNetworkSaveConfig(driver->networkConfigDir, - network->newDef ? network->newDef : network->def) < 0) { - virNetworkRemoveInactive(&driver->networks, - network); + if (virNetworkSaveConfig(driver->networkConfigDir, def) < 0) { + virNetworkRemoveInactive(&driver->networks, network); network = NULL; goto cleanup; } /* We only support dhcp on one IPv4 address per defined network */ for (ii = 0; - (ipdef = virNetworkDefGetIpByIndex(network->def, AF_UNSPEC, ii)); + (ipdef = virNetworkDefGetIpByIndex(def, AF_UNSPEC, ii)); ii++) { if (VIR_SOCKET_IS_FAMILY(&ipdef->address, AF_INET)) { if (ipdef->nranges || ipdef->nhosts) { @@ -2396,18 +2395,19 @@ static virNetworkPtr networkDefine(virConnectPtr conn, const char *xml) { } } if (ipv4def) { - dctx = dnsmasqContextNew(network->def->name, DNSMASQ_STATE_DIR); + dctx = dnsmasqContextNew(def->name, DNSMASQ_STATE_DIR); if (dctx == NULL || - networkBuildDnsmasqHostsfile(dctx, ipv4def, network->def->dns) < 0 || + networkBuildDnsmasqHostsfile(dctx, ipv4def, def->dns) < 0 || dnsmasqSave(dctx) < 0) goto cleanup; } - VIR_INFO("Defining network '%s'", network->def->name); - ret = virGetNetwork(conn, network->def->name, network->def->uuid); + VIR_INFO("Defining network '%s'", def->name); + ret = virGetNetwork(conn, def->name, def->uuid); cleanup: - virNetworkDefFree(def); + if (freeDef) + virNetworkDefFree(def); dnsmasqContextFree(dctx); if (network) virNetworkObjUnlock(network); -- 1.7.3.4

2 2