- Devel - libvirt List Archives

[libvirt] [PATCH] build: fix recent syntax-check breakage
by Eric Blake 16 May '12

16 May '12

The use of readlink() in lxc_container.c is intentional; we don't want an absolute pathname there. * src/util/cgroup.h (VIR_CGROUP_SYSFS_MOUNT): Indent properly. * cfg.mk (exclude_file_name_regexp--sc_prohibit_readlink): Add exemption. --- Pushing under the build-breaker rule. cfg.mk | 3 ++- src/util/cgroup.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 7f81933..07fb7b2 100644 --- a/cfg.mk +++ b/cfg.mk @@ -800,7 +800,8 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \ exclude_file_name_regexp--sc_prohibit_raw_allocation = \ ^(src/util/memory\.[ch]|examples/.*)$$ -exclude_file_name_regexp--sc_prohibit_readlink = ^src/util/util\.c$$ +exclude_file_name_regexp--sc_prohibit_readlink = \ + ^(src/(util/util|lxc/lxc_container)\.c$$ exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$ diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 857945d..05325ae 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -16,7 +16,7 @@ struct virCgroup; typedef struct virCgroup *virCgroupPtr; -#define VIR_CGROUP_SYSFS_MOUNT "/sys/fs/cgroup" +# define VIR_CGROUP_SYSFS_MOUNT "/sys/fs/cgroup" enum { VIR_CGROUP_CONTROLLER_CPU, -- 1.7.7.6

1 0

[libvirt] F17's libvirt takes comments into LIBVIRTD_ARGS
by Dan Kenigsberg 16 May '12

16 May '12

On Tue, May 15, 2012 at 04:16:11PM +0800, Shu Ming wrote: > On 2012-5-14 7:30, Dan Kenigsberg wrote: > >On Sun, May 13, 2012 at 11:51:48PM +0800, Shu Ming wrote: > >>Hi, > >> Recently, I found that my host in engine was always in a > >>"unassigned state" after the host node was installed. After looking > >>into the vdsm.log, it seemed that vdsm failed to call libvirt as an > >>error, "libvirtError: Cannot write data: Broken pipe". When I > >>started virsh in the host node at that time, a warning was given > >>"WARNING: no socket to connect to" and core dumped with "virsh > >>net-list". It looks like that no right socket was created for > >>virsh to connect to libvirtd. Any comments about this problem? The > >>followings are my steps in the node: > >> > >>[root@ovirt-node1 ~]# rpm -qa |grep vdsm > >>vdsm-cli-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>vdsm-python-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>vdsm-hook-vhostmd-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>vdsm-4.9.6-0.183.git107644d.fc16.shuming1336622293.x86_64 > >>vdsm-reg-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>vdsm-debug-plugin-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>vdsm-hook-faqemu-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>vdsm-bootstrap-4.9.6-0.183.git107644d.fc16.shuming1336622293.noarch > >>[root@ovirt-node1 ~]# > >>[root@ovirt-node1 ~]# ps -ef |grep libvirt > >> > >>libvirt-daemon-0.9.11-1.fc17.x86_64 > >>libvirt-daemon-config-nwfilter-0.9.11-1.fc17.x86_64 > >>libvirt-client-0.9.11-1.fc17.x86_64 > >>libvirt-daemon-config-network-0.9.11-1.fc17.x86_64 > >>libvirt-python-0.9.11-1.fc17.x86_64 > >> > >>[root@ovirt-node1 ~]# virsh net-list > >>WARNING: no socket to connect to > >>Segmentation fault > >I think that merits a libvirt bug. please attach strace output to > >bugzilla. > > > >>[root@ovirt-node1 ~]# > >> > >> > >>[root@ovirt-node1 ~]# ps -ef |grep vdsm > >>root 1299 1 0 23:10 ? 00:00:00 /usr/sbin/libvirtd > >>--listen # by vdsm > >The command line of libvirt process is very odd - the comment that vdsm > >puts into /etc/sysconfig/libvirtd is somehow taken verbatim. That's bad, > >and may be related to Fedora 17's systemd services. Try to remove the > >comment and restart libvirtd to see if this is the case. > The comment come from > > [root@ovirt-node1 ~]# cat /etc/sysconfig/libvirtd: I know that (see my text above). However, in F16 and before, comments have been stripped before being passed to commandline. Have you tested if all is well when the commment is removed? Let's see what our friends in libvir-list think. Dan.

3 7

[libvirt] [PATCH] qemu: Rollback on used USB devices
by Michal Privoznik 16 May '12

16 May '12

One of our latest USB device handling patches 05abd1507d66aabb6cad12eeafeb4c4d1911c585 introduced a regression. That is, we first create a temporary list of all USB devices that are to be used by domain just starting up. Then we iterate over and check if a device from the list is in the global list of currently assigned devices (activeUsbHostdevs). If not, we add it there and continue with next iteration then. But if a device from temporary list is either taken already or adding to the activeUsbHostdevs fails, we remove all devices in temp list from the activeUsbHostdevs list. Therefore, if a device is already taken we remove it from activeUsbHostdevs even if we should not. Thus, next time we allow the device to be assigned to another domain. --- src/qemu/qemu_hostdev.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index b649ae0..ff13305 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -567,7 +567,7 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, const char *name, usbDeviceList *list) { - int i; + int i, j; unsigned int count; usbDevice *tmp; @@ -586,7 +586,7 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, qemuReportError(VIR_ERR_OPERATION_INVALID, _("USB device %s is already in use"), usbDeviceGetName(tmp)); - return -1; + goto error; } usbDeviceSetUsedBy(usb, name); @@ -598,9 +598,16 @@ qemuPrepareHostdevUSBDevices(struct qemud_driver *driver, * perform rollback on failure. */ if (usbDeviceListAdd(driver->activeUsbHostdevs, usb) < 0) - return -1; + goto error; } return 0; + +error: + for (j = 0; j < i; j++) { + tmp = usbDeviceListGet(list, i); + usbDeviceListSteal(driver->activeUsbHostdevs, tmp); + } + return -1; } static int @@ -621,8 +628,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver, if (!(list = usbDeviceListNew())) goto cleanup; - /* Loop 1: build temporary list and validate no usb device - * is already taken + /* Loop 1: build temporary list */ for (i = 0 ; i < nhostdevs ; i++) { virDomainHostdevDefPtr hostdev = hostdevs[i]; @@ -678,7 +684,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver, * wrong, perform rollback. */ if (qemuPrepareHostdevUSBDevices(driver, def->name, list) < 0) - goto inactivedevs; + goto cleanup; /* Loop 2: Temporary list was successfully merged with * driver list, so steal all items to avoid freeing them @@ -690,16 +696,6 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver, } ret = 0; - goto cleanup; - -inactivedevs: - /* Steal devices from driver->activeUsbHostdevs. - * We will free them later. - */ - for (i = 0; i < usbDeviceListCount(list); i++) { - tmp = usbDeviceListGet(list, i); - usbDeviceListSteal(driver->activeUsbHostdevs, tmp); - } cleanup: usbDeviceListFree(list); -- 1.7.8.5

2 2

[libvirt] [PATCH] Fix build compat with older libselinux for LXC
by Daniel P. Berrange 16 May '12

16 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Most versions of libselinux do not contain the function selinux_lxc_contexts_path() that the security driver recently started using for LXC. We must add a conditional check for it in configure and then disable the LXC security driver for builds where libselinux lacks this function. NB although this qualifies as a build breaker fix, I'm not pushing until it has had review * configure.ac: Check for selinux_lxc_contexts_path * src/security/security_selinux.c: Disable LXC security if selinux_lxc_contexts_path() is missing --- configure.ac | 1 + src/security/security_selinux.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9c356c9..d666736 100644 --- a/configure.ac +++ b/configure.ac @@ -1360,6 +1360,7 @@ else fail=0 AC_CHECK_FUNC([selinux_virtual_domain_context_path], [], [fail=1]) AC_CHECK_FUNC([selinux_virtual_image_context_path], [], [fail=1]) + AC_CHECK_FUNCS([selinux_lxc_contexts_path]) CFLAGS="$old_cflags" LIBS="$old_libs" diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index b0bb0a0..2b8ff19 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -127,6 +127,7 @@ err: } +#ifdef HAVE_SELINUX_LXC_CONTEXTS_PATH static int SELinuxLXCInitialize(virSecurityManagerPtr mgr) { @@ -189,6 +190,15 @@ error: VIR_FREE(data->content_context); return -1; } +#else +static int +SELinuxLXCInitialize(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("libselinux does not support LXC contexts path")); + return -1; +} +#endif static int @@ -443,9 +453,12 @@ SELinuxSecurityDriverProbe(const char *virtDriver) if (!is_selinux_enabled()) return SECURITY_DRIVER_DISABLE; - if (virtDriver && STREQ(virtDriver, "LXC") && - !virFileExists(selinux_lxc_contexts_path())) - return SECURITY_DRIVER_DISABLE; + if (virtDriver && STREQ(virtDriver, "LXC")) { +#if HAVE_SELINUX_LXC_CONTEXTS_PATH + if (!virFileExists(selinux_lxc_contexts_path())) +#endif + return SECURITY_DRIVER_DISABLE; + } return SECURITY_DRIVER_ENABLE; } -- 1.7.7.6

2 1

[libvirt] [PATCH libvirt] Reject any non-option command line arguments
by Daniel P. Berrange 16 May '12

16 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Due to a bug in editing /etc/sysconfig/libvirtd, VDSM was causing libvirt processes to run with the following command line args /usr/sbin/libvirtd --listen '#' 'by vdsm' While it correctly rejects any invalid option flags, libvirtd was not rejecting any non-option command line arguments * daemon/libvirtd.c: Reject non-option argv --- daemon/libvirtd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 2696c54..0b5ae35 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -999,6 +999,12 @@ int main(int argc, char **argv) { } } + if (optind != argc) { + fprintf(stderr, "%s: unexpected, non-option, command line arguments\n", + argv[0]); + exit(EXIT_FAILURE); + } + if (!(config = daemonConfigNew(privileged))) { VIR_ERROR(_("Can't create initial configuration")); exit(EXIT_FAILURE); -- 1.7.10.1

2 1

[libvirt] [PATCH v4 0/3] usb devices with same vendorID, productID hotplug support
by Guannan Ren 16 May '12

16 May '12

v4 updates: make each patch not break build make usbDeviceSearch flags filtering code simpler https://bugzilla.redhat.com/show_bug.cgi?id=815755 The set of patch tries to fix the issue when multiple usb devices with same idVendor, idProduct are availible on host, the usb device with lowest bus:device will be attached to guest if usb xml file is given like this: <hostdev mode='subsystem' type='usb' managed='yes'> <source> <vendor id='0x15e1'/> <product id='0x2007'/> </source> </hostdev> The reason is that the usb hotplug function searchs usb device in system files to match vendor and product id, the file with lowest number is always found first. After fix, in this case, libvirt will report an error like: # virsh attach-device rhel6u1 /tmp/usb.xml error: Failed to attach device from /tmp/usb.xml error: operation failed: multiple USB devices for 15e1:2007, use <address> to specify one At the same time, the usb part of domain initilization is also updated in patch 2/3 These patches also fix the problem when using the following xml, the usb device could be hotplugged in two domains without raising errors <hostdev mode='subsystem' type='usb' managed='yes'> <source> <address bus='6' device='7'/> </source> </hostdev> # virsh attach-device rhel6u12nd /tmp/usb_by_bus.xml error: Failed to attach device from /tmp/usb_by_bus.xml error: Requested operation is not valid: USB device 006:007 is in use by domain rhel6u1

3 11

[libvirt] [PATCH v2] Remount cgroups controllers after setting up new /sys in LXC
by Daniel P. Berrange 16 May '12

16 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Normal practice is for cgroups controllers to be mounted at /sys/fs/cgroup. When setting up a container, /sys is mounted with a new sysfs instance, thus we must re-mount all the cgroups controllers. The complexity is that we must mount them in the same layout as the host OS. ie if 'cpu' and 'cpuacct' were mounted at the same location in the host we must preserve this in the container. Also if any controllers are co-located we must setup symlinks from the individual controller name to the co-located mount-point Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 243 +++++++++++++++++++++++++++++++++++++++++++++-- src/util/cgroup.h | 2 + 2 files changed, 236 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a3ca76c..e606108 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> @@ -1122,6 +1123,192 @@ cleanup: } +struct lxcContainerCGroup { + const char *dir; + const char *linkDest; +}; + + +static void lxcContainerCGroupFree(struct lxcContainerCGroup *mounts, + size_t nmounts) +{ + size_t i; + + if (!mounts) + return; + + for (i = 0 ; i < nmounts ; i++) { + VIR_FREE(mounts[i].dir); + VIR_FREE(mounts[i].linkDest); + } + VIR_FREE(mounts); +} + + +static int lxcContainerIdentifyCGroups(struct lxcContainerCGroup **mountsret, + size_t *nmountsret) +{ + FILE *procmnt = NULL; + struct mntent mntent; + struct dirent *dent; + char mntbuf[1024]; + int ret = -1; + struct lxcContainerCGroup *mounts = NULL; + size_t nmounts = 0; + DIR *dh = NULL; + char *path = NULL; + + *mountsret = NULL; + *nmountsret = 0; + + VIR_DEBUG("Finding cgroups mount points under %s", VIR_CGROUP_SYSFS_MOUNT); + + if (!(procmnt = setmntent("/proc/mounts", "r"))) { + virReportSystemError(errno, "%s", + _("Failed to read /proc/mounts")); + return -1; + } + + while (getmntent_r(procmnt, &mntent, mntbuf, sizeof(mntbuf)) != NULL) { + VIR_DEBUG("Got %s", mntent.mnt_dir); + if (STRNEQ(mntent.mnt_type, "cgroup") || + !STRPREFIX(mntent.mnt_dir, VIR_CGROUP_SYSFS_MOUNT)) + continue; + + /* Skip named mounts with no controller since they're + * for application use only ie systemd */ + if (strstr(mntent.mnt_opts, "name=")) + continue; + + if (VIR_EXPAND_N(mounts, nmounts, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + if (!(mounts[nmounts-1].dir = strdup(mntent.mnt_dir))) { + virReportOOMError(); + goto cleanup; + } + VIR_DEBUG("Grabbed %s", mntent.mnt_dir); + } + + VIR_DEBUG("Checking for symlinks in %s", VIR_CGROUP_SYSFS_MOUNT); + if (!(dh = opendir(VIR_CGROUP_SYSFS_MOUNT))) { + virReportSystemError(errno, + _("Unable to read directory %s"), + VIR_CGROUP_SYSFS_MOUNT); + goto cleanup; + } + + while ((dent = readdir(dh)) != NULL) { + ssize_t rv; + /* The cgroups links are just relative to the local + * dir so we don't need a large buf */ + char linkbuf[100]; + + if (dent->d_name[0] == '.') + continue; + + VIR_DEBUG("Checking entry %s", dent->d_name); + if (virAsprintf(&path, "%s/%s", VIR_CGROUP_SYSFS_MOUNT, dent->d_name) < 0) { + virReportOOMError(); + goto cleanup; + } + + if ((rv = readlink(path, linkbuf, sizeof(linkbuf)-1)) < 0) { + if (errno != EINVAL) { + virReportSystemError(errno, + _("Unable to resolve link %s"), + path); + VIR_FREE(path); + goto cleanup; + } + /* Ok not a link */ + VIR_FREE(path); + } else { + linkbuf[rv] = '\0'; + VIR_DEBUG("Got a link %s to %s", path, linkbuf); + if (VIR_EXPAND_N(mounts, nmounts, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + if (!(mounts[nmounts-1].linkDest = strdup(linkbuf))) { + virReportOOMError(); + goto cleanup; + } + mounts[nmounts-1].dir = path; + path = NULL; + } + } + + *mountsret = mounts; + *nmountsret = nmounts; + ret = 0; + +cleanup: + closedir(dh); + endmntent(procmnt); + VIR_FREE(path); + + if (ret < 0) + lxcContainerCGroupFree(mounts, nmounts); + return ret; +} + + +static int lxcContainerMountCGroups(struct lxcContainerCGroup *mounts, + size_t nmounts) +{ + size_t i; + + VIR_DEBUG("Mounting cgroups at '%s'", VIR_CGROUP_SYSFS_MOUNT); + + if (virFileMakePath(VIR_CGROUP_SYSFS_MOUNT) < 0) { + virReportSystemError(errno, + _("Unable to create directory %s"), + VIR_CGROUP_SYSFS_MOUNT); + return -1; + } + + if (mount("tmpfs", VIR_CGROUP_SYSFS_MOUNT, "tmpfs", MS_NOSUID|MS_NODEV|MS_NOEXEC, "mode=755") < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s type %s"), + "tmpfs", VIR_CGROUP_SYSFS_MOUNT, "tmpfs"); + return -1; + } + + for (i = 0 ; i < nmounts ; i++) { + if (mounts[i].linkDest) { + VIR_DEBUG("Link mount point '%s' to '%s'", + mounts[i].dir, mounts[i].linkDest); + if (symlink(mounts[i].linkDest, mounts[i].dir) < 0) { + virReportSystemError(errno, + _("Unable to symlink directory %s to %s"), + mounts[i].dir, mounts[i].linkDest); + return -1; + } + } else { + VIR_DEBUG("Create mount point '%s'", mounts[i].dir); + if (virFileMakePath(mounts[i].dir) < 0) { + virReportSystemError(errno, + _("Unable to create directory %s"), + mounts[i].dir); + return -1; + } + + if (mount("cgroup", mounts[i].dir, "cgroup", + 0, mounts[i].dir + strlen(VIR_CGROUP_SYSFS_MOUNT) + 1) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s"), + "cgroup", mounts[i].dir); + return -1; + } + } + } + + return 0; +} + + /* Got a FS mapped to /, we're going the pivot_root * approach to do a better-chroot-than-chroot * this is based on this thread http://lkml.org/lkml/2008/3/5/29 @@ -1132,31 +1319,49 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, size_t nttyPaths, virSecurityManagerPtr securityDriver) { + struct lxcContainerCGroup *mounts = NULL; + size_t nmounts = 0; + int ret = -1; + + /* Before pivoting we need to identify any + * cgroups controllers that are mounted */ + if (lxcContainerIdentifyCGroups(&mounts, &nmounts) < 0) + goto cleanup; + /* Gives us a private root, leaving all parent OS mounts on /.oldroot */ if (lxcContainerPivotRoot(root) < 0) - return -1; + goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ if (lxcContainerMountBasicFS(vmDef, true, securityDriver) < 0) - return -1; + goto cleanup; + + /* Now we can re-mount the cgroups controllers in the + * same configuration as before */ + if (lxcContainerMountCGroups(mounts, nmounts) < 0) + goto cleanup; /* Mounts /dev/pts */ if (lxcContainerMountFSDevPTS(root) < 0) - return -1; + goto cleanup; /* Populates device nodes in /dev/ */ if (lxcContainerPopulateDevices(ttyPaths, nttyPaths) < 0) - return -1; + goto cleanup; /* Sets up any non-root mounts from guest config */ if (lxcContainerMountAllFS(vmDef, "/.oldroot", true) < 0) - return -1; + goto cleanup; /* Gets rid of all remaining mounts from host OS, including /.oldroot itself */ if (lxcContainerUnmountSubtree("/.oldroot", true) < 0) - return -1; + goto cleanup; - return 0; + ret = 0; + +cleanup: + lxcContainerCGroupFree(mounts, nmounts); + return ret; } @@ -1166,6 +1371,10 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, virDomainFSDefPtr root, virSecurityManagerPtr securityDriver) { + int ret = -1; + struct lxcContainerCGroup *mounts = NULL; + size_t nmounts = 0; + VIR_DEBUG("def=%p", vmDef); /* * This makes sure that any new filesystems in the @@ -1190,19 +1399,35 @@ static int lxcContainerSetupExtraMounts(virDomainDefPtr vmDef, if (lxcContainerMountAllFS(vmDef, "", false) < 0) return -1; + /* Before replacing /sys we need to identify any + * cgroups controllers that are mounted */ + if (lxcContainerIdentifyCGroups(&mounts, &nmounts) < 0) + goto cleanup; + /* Gets rid of any existing stuff under /proc, since we need new * namespace aware versions of those. We must do /proc second * otherwise we won't find /proc/mounts :-) */ if (lxcContainerUnmountSubtree("/sys", false) < 0 || lxcContainerUnmountSubtree("/proc", false) < 0) - return -1; + goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ if (lxcContainerMountBasicFS(vmDef, false, securityDriver) < 0) - return -1; + goto cleanup; + + /* Now we can re-mount the cgroups controllers in the + * same configuration as before */ + if (lxcContainerMountCGroups(mounts, nmounts) < 0) + goto cleanup; VIR_DEBUG("Mounting completed"); return 0; + + ret = 0; + +cleanup: + lxcContainerCGroupFree(mounts, nmounts); + return ret; } diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 8486c42..857945d 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -16,6 +16,8 @@ struct virCgroup; typedef struct virCgroup *virCgroupPtr; +#define VIR_CGROUP_SYSFS_MOUNT "/sys/fs/cgroup" + enum { VIR_CGROUP_CONTROLLER_CPU, VIR_CGROUP_CONTROLLER_CPUACCT, -- 1.7.10.1

2 1

[libvirt] [PATCH 0/4] Improve mount setup in LXC containers
by Daniel P. Berrange 16 May '12

16 May '12

These 4 patches improve the way we setup special mounts like /sys and /proc in LXC containers. This should help ensure systemd is happier with the cgroups setup These apply ontop of the earlier series to improve SELinux driver integration

3 10

[libvirt] [libvirt-glib] Add getter for GVirConfigDomain.virt_type
by Zeeshan Ali (Khattak) 16 May '12

16 May '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gconfig/libvirt-gconfig-domain.c | 12 ++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 2 ++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index b6b43f0..7477400 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -187,6 +187,18 @@ GVirConfigDomain *gvir_config_domain_new(void) return GVIR_CONFIG_DOMAIN(object); } +GVirConfigDomainVirtType gvir_config_domain_get_virt_type(GVirConfigDomain *domain) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN(domain), + GVIR_CONFIG_DOMAIN_VIRT_QEMU); + + return gvir_config_object_get_attribute_genum + (GVIR_CONFIG_OBJECT(domain), + NULL, + "type", + GVIR_CONFIG_TYPE_DOMAIN_VIRT_TYPE, + GVIR_CONFIG_DOMAIN_VIRT_QEMU); +} void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomainVirtType type) { diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index bdb842b..5deb58e 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -99,6 +99,7 @@ GType gvir_config_domain_get_type(void); GVirConfigDomain *gvir_config_domain_new_from_xml(const gchar *xml, GError **error); GVirConfigDomain *gvir_config_domain_new(void); +GVirConfigDomainVirtType gvir_config_domain_get_virt_type(GVirConfigDomain *domain); void gvir_config_domain_set_virt_type(GVirConfigDomain *domain, GVirConfigDomainVirtType type); const char *gvir_config_domain_get_name(GVirConfigDomain *domain); void gvir_config_domain_set_name(GVirConfigDomain *domain, const char *name); diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 21fff46..f1af2ea 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -376,6 +376,8 @@ LIBVIRT_GCONFIG_0.0.8 { LIBVIRT_GCONFIG_0.0.9 { global: + gvir_config_domain_get_virt_type; + gvir_config_domain_get_os; gvir_config_domain_os_get_boot_devices; -- 1.7.7.6

3 2

[libvirt] [PATCH] Set a sensible default master start port for ehci companion controllers
by Daniel P. Berrange 16 May '12

16 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The uhci1, uhci2, uhci3 companion controllers for ehci1 must have a master start port set. Since this value is predictable we should set it automatically if the app does not supply it --- src/conf/domain_conf.c | 22 ++++++++++++++++++ .../qemuxml2argv-usb-ich9-ehci-addr.xml | 24 +++++--------------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 54ac1db..f4775be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4066,6 +4066,28 @@ virDomainControllerDefParseXML(xmlNodePtr node, VIR_FREE(vectors); break; } + case VIR_DOMAIN_CONTROLLER_TYPE_USB: { + /* If the XML has a uhci1, uhci2, uhci3 controller and no + * master port was given, we should set a sensible one */ + int masterPort = -1; + switch (def->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI1: + masterPort = 0; + break; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI2: + masterPort = 2; + break; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_ICH9_UHCI3: + masterPort = 4; + break; + } + if (masterPort != -1 && + def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_NONE) { + def->info.mastertype = VIR_DOMAIN_CONTROLLER_MASTER_USB; + def->info.master.usb.startport = masterPort; + } + break; + } default: break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml index 8eff1d7..ad85d63 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml @@ -19,19 +19,13 @@ <controller type='usb' index='1' model='ich9-ehci1'> </controller> - <controller type='usb' index='0' model='ich9-uhci1'> - <master startport='0'/> - </controller> - <controller type='usb' index='1' model='ich9-uhci1'> - <master startport='0'/> - </controller> + <controller type='usb' index='0' model='ich9-uhci1'/> + <controller type='usb' index='1' model='ich9-uhci1'/> <controller type='usb' index='2' model='ich9-uhci1'> <master startport='0'/> </controller> - <controller type='usb' index='0' model='ich9-uhci3'> - <master startport='4'/> - </controller> + <controller type='usb' index='0' model='ich9-uhci3'/> <controller type='usb' index='1' model='ich9-uhci3'> <master startport='4'/> </controller> @@ -39,15 +33,9 @@ <master startport='4'/> </controller> - <controller type='usb' index='2' model='ich9-uhci2'> - <master startport='2'/> - </controller> - <controller type='usb' index='1' model='ich9-uhci2'> - <master startport='2'/> - </controller> - <controller type='usb' index='0' model='ich9-uhci2'> - <master startport='2'/> - </controller> + <controller type='usb' index='2' model='ich9-uhci2'/> + <controller type='usb' index='1' model='ich9-uhci2'/> + <controller type='usb' index='0' model='ich9-uhci2'/> <memballoon model='virtio'/> </devices> </domain> -- 1.7.10.1

3 10