- Devel - libvirt List Archives

[libvirt] [PATCH] lxc: fuse mount for /proc/cpuinfo
by Cédric Bosdonnat 02 Sep '15

02 Sep '15

We already have a fuse mount to reflect the cgroup memory restrictions in the container. This commit adds the same for the number of available CPUs. Only the CPUs listed by virProcessGetAffinity are shown in the container's cpuinfo. --- src/lxc/lxc_container.c | 42 ++++++++++++------- src/lxc/lxc_fuse.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 136 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a433552..7ae13a8 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1055,24 +1055,38 @@ static int lxcContainerMountProcFuse(virDomainDefPtr def, const char *stateDir) { int ret; - char *meminfo_path = NULL; + char *src_path = NULL; + char *dst_path = NULL; + const char *paths[] = {"meminfo", "cpuinfo"}; + size_t i; - VIR_DEBUG("Mount /proc/meminfo stateDir=%s", stateDir); + for (i = 0; i < 2; i++) { + VIR_DEBUG("Mount /proc/%s stateDir=%s", paths[i], stateDir); + + if ((ret = virAsprintf(&src_path, + "/.oldroot/%s/%s.fuse/%s", + stateDir, + def->name, + paths[i])) < 0) + return ret; + + if ((ret = virAsprintf(&dst_path, + "/proc/%s", + paths[i])) < 0) { + VIR_FREE(src_path); + return ret; + } - if ((ret = virAsprintf(&meminfo_path, - "/.oldroot/%s/%s.fuse/meminfo", - stateDir, - def->name)) < 0) - return ret; + if ((ret = mount(src_path, dst_path, + NULL, MS_BIND, NULL)) < 0) { + virReportSystemError(errno, + _("Failed to mount %s on %s"), + src_path, dst_path); + } - if ((ret = mount(meminfo_path, "/proc/meminfo", - NULL, MS_BIND, NULL)) < 0) { - virReportSystemError(errno, - _("Failed to mount %s on /proc/meminfo"), - meminfo_path); + VIR_FREE(src_path); + VIR_FREE(dst_path); } - - VIR_FREE(meminfo_path); return ret; } #else diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 34a69cc..9c88147 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -42,6 +42,61 @@ #if WITH_FUSE static const char *fuse_meminfo_path = "/meminfo"; +static const char *fuse_cpuinfo_path = "/cpuinfo"; + +static virBufferPtr lxcProcComputeCpuinfo() { + FILE *fd = NULL; + char *line = NULL; + size_t n; + bool writeProc = false; + virBuffer buffer = VIR_BUFFER_INITIALIZER; + virBufferPtr new_cpuinfo = &buffer; + pid_t pid; + virBitmapPtr cpuAffinity = NULL; + + fd = fopen("/proc/cpuinfo", "r"); + if (fd == NULL) { + virReportSystemError(errno, _("%s"), "Cannot open /proc/cpuinfo"); + goto error; + } + + pid = getpid(); + if (!(cpuAffinity = virProcessGetAffinity(pid))) + goto error; + + while (getline(&line, &n, fd) > 0) { + if (STRPREFIX(line, "processor\t:")) { + unsigned long cpuid = 0; + char *suffix = NULL; + if (virStrToLong_ul(line + 12, &suffix, 10, &cpuid) < 0) { + goto error; + } + + if (virBitmapGetBit(cpuAffinity, cpuid, &writeProc) < 0) { + goto error; + } + } + + if (writeProc) { + virBufferAdd(new_cpuinfo, line, -1); + + if (virBufferCheckError(new_cpuinfo) < 0) { + goto error; + } + } + } + + cleanup: + VIR_FREE(line); + VIR_FORCE_FCLOSE(fd); + virBitmapFree(cpuAffinity); + return new_cpuinfo; + + error: + virBufferFreeAndReset(new_cpuinfo); + new_cpuinfo = NULL; + goto cleanup; +} static int lxcProcGetattr(const char *path, struct stat *stbuf) { @@ -50,6 +105,7 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) struct stat sb; struct fuse_context *context = fuse_get_context(); virDomainDefPtr def = (virDomainDefPtr)context->private_data; + virBufferPtr cpuinfo = NULL; memset(stbuf, 0, sizeof(struct stat)); if (virAsprintf(&mempath, "/proc/%s", path) < 0) @@ -76,12 +132,36 @@ static int lxcProcGetattr(const char *path, struct stat *stbuf) stbuf->st_atime = sb.st_atime; stbuf->st_ctime = sb.st_ctime; stbuf->st_mtime = sb.st_mtime; + } else if (STREQ(path, fuse_cpuinfo_path)) { + if (!(cpuinfo = lxcProcComputeCpuinfo())) { + res = -EIO; + goto cleanup; + } + + if (stat(mempath, &sb) < 0) { + res = -errno; + goto cleanup; + } + + stbuf->st_uid = def->idmap.uidmap ? def->idmap.uidmap[0].target : 0; + stbuf->st_gid = def->idmap.gidmap ? def->idmap.gidmap[0].target : 0; + stbuf->st_mode = sb.st_mode; + stbuf->st_nlink = 1; + stbuf->st_blksize = sb.st_blksize; + stbuf->st_size = virBufferUse(cpuinfo); + stbuf->st_blocks = stbuf->st_size / 512; + if (stbuf->st_size % 512 != 0) + stbuf->st_blocks++; + stbuf->st_atime = sb.st_atime; + stbuf->st_ctime = sb.st_ctime; + stbuf->st_mtime = sb.st_mtime; } else { res = -ENOENT; } cleanup: VIR_FREE(mempath); + virBufferFreeAndReset(cpuinfo); return res; } @@ -96,6 +176,7 @@ static int lxcProcReaddir(const char *path, void *buf, filler(buf, ".", NULL, 0); filler(buf, "..", NULL, 0); filler(buf, fuse_meminfo_path + 1, NULL, 0); + filler(buf, fuse_cpuinfo_path + 1, NULL, 0); return 0; } @@ -103,7 +184,8 @@ static int lxcProcReaddir(const char *path, void *buf, static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, struct fuse_file_info *fi ATTRIBUTE_UNUSED) { - if (!STREQ(path, fuse_meminfo_path)) + if (!STREQ(path, fuse_meminfo_path) && + !STREQ(path, fuse_cpuinfo_path)) return -ENOENT; if ((fi->flags & 3) != O_RDONLY) @@ -234,6 +316,28 @@ static int lxcProcReadMeminfo(char *hostpath, virDomainDefPtr def, return res; } +static int lxcProcReadCpuinfo(char *buf, size_t size, off_t offset) +{ + virBufferPtr new_cpuinfo = lxcProcComputeCpuinfo(); + int new_size = -1; + int copied = -1; + + if (!new_cpuinfo) + goto error; + + copied = size; + new_size = virBufferUse(new_cpuinfo); + + if ((new_size - offset) < size) + copied = new_size - offset; + + memcpy(buf, virBufferCurrentContent(new_cpuinfo) + offset, copied); + + error: + virBufferFreeAndReset(new_cpuinfo); + return copied; +} + static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, char *buf ATTRIBUTE_UNUSED, size_t size ATTRIBUTE_UNUSED, @@ -254,6 +358,9 @@ static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, if (STREQ(path, fuse_meminfo_path)) { if ((res = lxcProcReadMeminfo(hostpath, def, buf, size, offset)) < 0) res = lxcProcHostRead(hostpath, buf, size, offset); + } else if (STREQ(path, fuse_cpuinfo_path)) { + if ((res = lxcProcReadCpuinfo(buf, size, offset)) < 0) + res = lxcProcHostRead(hostpath, buf, size, offset); } VIR_FREE(hostpath); -- 2.1.4

2 1

[libvirt] [PATCH] qemu: Need to check for machine.os when using ADDRESS_TYPE_CCW
by John Ferlan 02 Sep '15

02 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1258361 When attaching a disk or rng when providing an address type ccw, we need to ensure the machine.os is valid for the target guest. Checks are made when the address type is not provided, but if provided the os.machine check is bypassed. For an inactive guest, an addition followed by a start would cause the startup to fail after qemu_command builds the command line and attempts to start the guest. For an active guest, libvirtd would crash. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: For 'rng' in qemu_command - rather than change each of the if..else if.. conditions to have the {}, I just made the check up front. Also while I could separate these into disk and rng - since it's the same fix for the same problem it just seem "proper" to include both in same patch src/qemu/qemu_command.c | 15 +++++++++++++++ src/qemu/qemu_hotplug.c | 21 ++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abc57d7..ecdec2c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4296,6 +4296,13 @@ qemuBuildDriveDevStr(virDomainDefPtr def, case VIR_DOMAIN_DISK_BUS_VIRTIO: if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + if (!STREQLEN(def->os.machine, "s390-ccw", 8)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for disk target " + "'%s' using machine type '%s'"), + disk->dst, def->os.machine); + goto error; + } virBufferAddLit(&opt, "virtio-blk-ccw"); if (disk->iothread) virBufferAsprintf(&opt, ",iothread=iothread%u", disk->iothread); @@ -6874,6 +6881,14 @@ qemuBuildRNGDevStr(virDomainDefPtr def, goto error; } + if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW && + !STREQLEN(def->os.machine, "s390-ccw", 8)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for rng device " + "using machine type '%s'"), + def->os.machine); + goto error; + } if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) virBufferAsprintf(&buf, "virtio-rng-ccw,rng=obj%s,id=%s", dev->info.alias, dev->info.alias); diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e71a204..154539c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -319,6 +319,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, int ret = -1; const char* type = virDomainDiskBusTypeToString(disk->bus); qemuDomainObjPrivatePtr priv = vm->privateData; + bool is_s390_ccw = STREQLEN(vm->def->os.machine, "s390-ccw", 8); char *devstr = NULL; char *drivestr = NULL; bool releaseaddr = false; @@ -326,8 +327,7 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, const char *src = virDomainDiskGetSource(disk); if (!disk->info.type) { - if (STREQLEN(vm->def->os.machine, "s390-ccw", 8) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) + if (is_s390_ccw && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) disk->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390; @@ -346,6 +346,13 @@ qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + if (!is_s390_ccw) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for disk target " + "'%s' using machine type '%s'"), + disk->dst, vm->def->os.machine); + return -1; + } if (virDomainCCWAddressAssign(&disk->info, priv->ccwaddrs, !disk->info.addr.ccw.assigned) < 0) goto error; @@ -1642,6 +1649,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, virDomainRNGDefPtr rng) { qemuDomainObjPrivatePtr priv = vm->privateData; + bool is_s390_ccw = STRPREFIX(vm->def->os.machine, "s390-ccw"); char *devstr = NULL; char *charAlias = NULL; char *objAlias = NULL; @@ -1657,7 +1665,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, return -1; if (rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (STRPREFIX(vm->def->os.machine, "s390-ccw") && + if (is_s390_ccw && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) { rng->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { @@ -1670,6 +1678,13 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, if (virDomainPCIAddressEnsureAddr(priv->pciaddrs, &rng->info) < 0) return -1; } else if (rng->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) { + if (!is_s390_ccw) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("cannot use CCW address type for rng device " + "using machine type '%s'"), + vm->def->os.machine); + return -1; + } if (virDomainCCWAddressAssign(&rng->info, priv->ccwaddrs, !rng->info.addr.ccw.assigned) < 0) return -1; -- 2.1.0

3 2

[libvirt] [PATCH] Close the source fd if the destination qemu exits during tunnelled migration
by Shivaprasad G Bhat 02 Sep '15

02 Sep '15

Tunnelled migration can hang if the destination qemu exits despite all the ABI checks. This happens whenever the destination qemu exits before the complete transfer. The savevm state checks at runtime can fail at destination qemu and error out. The source qemu cant notice it as the EPIPE is not propogated to qemu. The qemuMigrationIOFunc() notices the stream being broken from virStreamSend() and it cleans up the stream alone. The qemuMigrationWaitForCompletion() would never get to 100% transfer completion. The qemuMigrationWaitForCompletion() never breaks out as well since the ssh connection to destination is healthy, and the source qemu also thinks the migration is ongoing as the Fd to which it transfers, is never closed or broken. So, the migration will hang forever. Even Ctrl-C on the virsh migrate wouldn't be honoured. Close the source side FD when there is an error in the stream. That way, the source qemu updates itself and qemuMigrationWaitForCompletion() notices the failure. Close the FD for all kinds of errors to be sure. The error message is not copied for EPIPE so that the destination error is copied instead later. Note: Reproducible with repeated migrations between Power hosts running in different subcores-per-core modes. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ff89ab5..4f9aced 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4029,7 +4029,11 @@ static void qemuMigrationIOFunc(void *arg) } error: - virCopyLastError(&data->err); + /* Let the source qemu know that the transfer can't continue anymore. + * Don't copy the error for EPIPE as destination has the actual error */ + VIR_FORCE_CLOSE(data->sock); + if (!virLastErrorIsSystemErrno(EPIPE)) + virCopyLastError(&data->err); virResetLastError(); VIR_FREE(buffer); }

1 0

[libvirt] [PATCH v3 0/5] vz: add migration support
by nshirokovskiy＠virtuozzo.com 02 Sep '15

02 Sep '15

NOTE that minimal command to migrate vz domain is like next: virsh -c vz:///system migrate --direct 200 shiny0 --migrateuri vz+ssh://shiny0/system --live --persistent --compressed ==Difference from v1: 1. Patch is quite different. First patchset implements migration thru managed migration scheme. This one goes thru p2p scheme. I belive this is a better approach. Vz migration is done via vz sdk and first patchset uses 5 phased migration only to get a token from destination on prepare phase which is kind a misuse. This patch just adds vz specific function to driver interface to archive the same goal. 2. Offline migration is supported as there is no more dependency on current flow of managed migration scheme. ==Difference from v2: 1. Implement thru direct migration instead of p2p. p2p is just managed 5-staged migration when managing is done on daemon side. Vz migration stages are all hidden in vz sdk and thus it would be more consistent to use direct scheme. 2. Use existing driver function for prepare migration phase to pass session uuid from destination to source instead of new one. As vz migration is direct one we will not use prepare phase function in a straight forward manner anyway. src/libvirt-domain.c | 3 +- src/vz/vz_driver.c | 315 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/vz/vz_sdk.c | 86 ++++++++++++--- src/vz/vz_sdk.h | 6 + src/vz/vz_utils.h | 4 +- 5 files changed, 398 insertions(+), 16 deletions(-)

4 25

[libvirt] libvirtlight problem with Xen
by Eric 02 Sep '15

02 Sep '15

I'm trying to use virt-manager with Xen. My Dom0 is Debian 8. When I create a DomU (Ubuntu Trusty) as a PV guest, the boot fails with an error saying that libvirtlight failed to connect. The opinion from the virt-manager list group is that the problem is libvirt, not virt-manager. I've googled around, and have seen old posts about this, but these seem to claim that the problem has resolved. Solution? Thanks Eric

2 1

[libvirt] [PATCH] virVMXParseDisk: Recognize scsi-passthru
by Michal Privoznik 01 Sep '15

01 Sep '15

https://bugzilla.redhat.com/show_bug.cgi?id=1172544 So, imagine you have this config: scsi0:1.present = "TRUE" scsi0:1.deviceType = "scsi-passthru" scsi0:1.fileName = "/vmfs/devices/cdrom/mpx.vmhba32:C0:T0:L0" scsi0:1.allowGuestConnectionControl = "FALSE" So far, libvirt does not recognize this pattern and fails. What if we produce the following XML to it? <disk type='block' device='disk'> <source dev='/vmfs/devices/cdrom/mpx.vmhba32:C0:T0:L0'/> <target dev='sdb' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/vmx/vmx.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 36e2891..6d83d81 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2187,6 +2187,17 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con * function to parse a CDROM device may handle it. */ goto ignore; + } else if (STREQ_NULLABLE(deviceType, "scsi-passthru")) { + char *tmp; + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_BLOCK); + if (!(tmp = ctx->parseFileName(fileName, ctx->opaque))) + goto cleanup; + if (virDomainDiskSetSource(*def, tmp) < 0) { + VIR_FREE(tmp); + goto cleanup; + } + VIR_FREE(tmp); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " -- 2.4.6

2 2

[libvirt] Missing CPU vendor in capabilities in 1.2.18+
by Guido Günther 01 Sep '15

01 Sep '15

Hi, We have a report in Debian[1] where after a update from 1.2.16 to 1.2.18 VMs on a Intel i5 CPU fail to start due to libvirt not being able to match the CPU vendor: # virsh start sid error: Failed to start domain sid error: unsupported configuration: guest and host CPU are not compatible: host CPU vendor does not match required CPU vendor Intel The root cause seems to be that the <vendor> element is missing from the hosts capabilities. While I have: $ virsh capabilities | xpath -q -e //host/cpu/vendor <vendor>Intel</vendor> on my Intel box the reporters machine with a Core i5 the <vendor> element is just empty. Any idea what could have triggered this? This is still broken in 1.2.19-rc1. The bug has more details and logs attached. Any pointers would be welcome since I don't have access to such a machine atm to step through src/cpu/cpu_x86.c. Cheers, -- Guido [1] http://bugs.debian.org/797513

1 0

[libvirt] [PATCH] qemu: Default to virtio network devices on ppc64
by Andrea Bolognani 01 Sep '15

01 Sep '15

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1254044 --- src/qemu/qemu_domain.c | 3 ++- .../qemuxml2argvdata/qemuxml2argv-pseries-net-default.args | 6 ++++++ .../qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml | 14 ++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 0a9ed6b..4c5b3ec 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1195,7 +1195,8 @@ qemuDomainDefPostParse(virDomainDefPtr def, static const char * qemuDomainDefaultNetModel(const virDomainDef *def) { - if (ARCH_IS_S390(def->os.arch)) + if (ARCH_IS_S390(def->os.arch) || + ARCH_IS_PPC64(def->os.arch)) return "virtio"; if (def->os.arch == VIR_ARCH_ARMV7L || diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args new file mode 100644 index 0000000..50adffa --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-ppc64 -S -M pseries -m 512 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-device virtio-net-pci,vlan=0,id=net0,mac=52:54:00:55:2b:d9,bus=pci,addr=0x1 \ +-net user,vlan=0,name=hostnet0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml new file mode 100644 index 0000000..7bf8139 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-net-default.xml @@ -0,0 +1,14 @@ +<domain type='qemu'> + <name>pseries-net-default</name> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <interface type='user'> + <mac address='52:54:00:55:2b:d9'/> + </interface> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index c2482e6..f20a94b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1397,6 +1397,7 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_PIIX3_USB_UHCI, QEMU_CAPS_PCI_OHCI, QEMU_CAPS_PCI_MULTIFUNCTION); + DO_TEST("pseries-net-default", QEMU_CAPS_DEVICE); DO_TEST("pseries-vio-user-assigned", QEMU_CAPS_DRIVE, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST_ERROR("pseries-vio-address-clash", QEMU_CAPS_DRIVE, -- 2.4.3

2 1

[libvirt] [PATCH 0/3] Couple of src/Makefile.am fixes
by Michal Privoznik 31 Aug '15

31 Aug '15

I've noticed that 'make distcheck' is failing. While investigating that issue I've came up with some other checks too. Preferably, I'd like to get these into the current release (the fix 2/3 at least). Michal Privoznik (3): src: Check libvirt_admin.syms for exported symbols src: Cleanup libvirt_admin.syms src: Check for symbols ordering in ADMIN_SYM_FILES src/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -- 2.4.6

3 5

[libvirt] [PATCH] migration: remove direct migration dependency on version1 of driver
by Nikolay Shirokovskiy 31 Aug '15

31 Aug '15

From: Nikolay Shirokovskiy <Nikolay Shirokovskiy nshirokovskiy(a)virtuozzo.com> Direct migration should work if *perform3 is present but *perform is not. This is situation when driver migration is implemented after new version of driver function is introduced. We should not be forced to support old version too as its parameter space is subspace of newer one. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/libvirt-domain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 6ab50ba..c89775b 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -3427,7 +3427,8 @@ virDomainMigrateDirect(virDomainPtr domain, NULLSTR(xmlin), flags, NULLSTR(dname), NULLSTR(dconnuri), NULLSTR(miguri), bandwidth); - if (!domain->conn->driver->domainMigratePerform) { + if (!domain->conn->driver->domainMigratePerform && + !domain->conn->driver->domainMigratePerform3) { virReportUnsupportedError(); return -1; } -- 1.7.1

3 6

[libvirt] Entering freeze for libvirt-1.2.19
by Daniel Veillard 31 Aug '15

31 Aug '15

So I have tagged rc1 in git and pushed signed tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ The release works just fine in my limited testing, but others should try it out to check portability and more advanced functionalities. I will likely push rc2 at the end of the week-end and the final release on Tuesday or Wednesday, assuming no big issue is raised in the meantime. thanks for giving it a try. I also note that we have some CI test failing, not for core libvirt but perl bindings, virt-manager, ... it would be good to investigate before we push the release: https://ci.centos.org/view/libvirt-project/ thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

4 5

[libvirt] [libvirt-test-api][PATCH] Add new test case for allocPages API
by Luyao Huang 31 Aug '15

31 Aug '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/test_connection.conf | 4 ++ repos/virconn/connection_allocPages.py | 88 ++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 repos/virconn/connection_allocPages.py diff --git a/cases/test_connection.conf b/cases/test_connection.conf index 336b1ad..600ec32 100644 --- a/cases/test_connection.conf +++ b/cases/test_connection.conf @@ -77,3 +77,7 @@ virconn:connection_getMemoryParameters virconn:connection_getMemoryStats conn qemu:///system + +virconn:connection_allocPages + conn + qemu:///system diff --git a/repos/virconn/connection_allocPages.py b/repos/virconn/connection_allocPages.py new file mode 100644 index 0000000..9ddd474 --- /dev/null +++ b/repos/virconn/connection_allocPages.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = () +optional_params = {'conn': ''} + +HOST_HUGEPAGE = '/sys/devices/system/node/node%d/hugepages/hugepages-%dkB/nr_hugepages' + +def get_host_pagesize(conn): + ret = [] + tree = lxml.etree.fromstring(conn.getCapabilities()) + + set = tree.xpath("/capabilities/host/cpu/pages") + for n in set: + ret.append(int(n.attrib['size'])) + + return ret + +def get_host_pagecount(pagesize): + try: + return int(open(HOST_HUGEPAGE % (0, pagesize)).read()) + except IOError: + return -1 + +def connection_allocPages(params): + """ + test API for allocPages in class virConnect + """ + logger = params['logger'] + fail=0 + + try: + conn=libvirt.open(params['conn']) + logger.info("get connection to libvirtd") + list1 = get_host_pagesize(conn) + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + return 1 + + for i in list1: + logger.info("test hugepage size %d" % i) + + if get_host_pagecount(i) == -1: + logger.info("Skip system page size %d" % i) + continue + + """ test flag VIR_NODE_ALLOC_PAGES_SET """ + try: + cur_count = get_host_pagecount(i) + conn.allocPages({i : cur_count + 1}, 0, 1, libvirt.VIR_NODE_ALLOC_PAGES_SET) + if get_host_pagecount(i) != cur_count + 1: + logger.info("libvirt set a wrong page count to %dKiB hugepage" % i) + fail = 1 + except libvirtError, e: + if "Allocated only" in e.message: + tmp_count = int(e.message.replace(" ", "")[-1:]) + + if tmp_count != get_host_pagecount(i): + logger.info("libvirt output %dKiB hugepage count is not right" % i) + fail = 1 + else: + logger.error("API error message: %s" % e.message) + return 1 + + """ test flag VIR_NODE_ALLOC_PAGES_ADD """ + try: + cur_count = get_host_pagecount(i) + conn.allocPages({i : 1}, 0, 1, libvirt.VIR_NODE_ALLOC_PAGES_ADD) + if get_host_pagecount(i) != cur_count + 1: + logger.info("libvirt set a wrong page count to %dKiB hugepage" % i) + fail = 1 + except libvirtError, e: + if "Allocated only" in e.message: + tmp_count = int(e.message.replace(" ", "")[-1:]) + + if tmp_count != get_host_pagecount(i): + logger.info("libvirt output %dKiB hugepage count is not right" % i) + fail = 1 + else: + logger.error("API error message: %s" % e.message) + return 1 + + return fail -- 1.8.3.1

2 1

[libvirt] [libvirt-test-api][PATCH 1/3] Introduce new test case for add/del IOthread
by Luyao Huang 31 Aug '15

31 Aug '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- cases/linux_domain.conf | 6 +++ repos/domain/add_del_iothread.py | 82 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 repos/domain/add_del_iothread.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index fd32aad..8a7efe9 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -281,6 +281,12 @@ domain:set_memory_period conn qemu:///system +domain:add_del_iothread + guestname + $defaultname + conn + qemu:///system + domain:destroy guestname $defaultname diff --git a/repos/domain/add_del_iothread.py b/repos/domain/add_del_iothread.py new file mode 100644 index 0000000..2d874f9 --- /dev/null +++ b/repos/domain/add_del_iothread.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError +import lxml +import lxml.etree + +required_params = ('guestname',) +optional_params = {'conn': 'qemu:///system'} + +def find_iothreadid_fromxml(vm, running, iothreadid): + if (running == 1): + tree = lxml.etree.fromstring(vm.XMLDesc(0)) + else: + tree = lxml.etree.fromstring(vm.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE)) + + set = tree.xpath("//iothreadids/iothread") + for n in set: + ids = n.attrib['id'] + if int(ids) == iothreadid: + return True + + return False + +def add_del_iothread(params): + """ + test API for addIOThread and delIOThread in class virDomain + """ + + logger = params['logger'] + fail=0 + + try: + conn = libvirt.open(params['conn']) + + logger.info("get connection to libvirtd") + guest = params['guestname'] + vm = conn.lookupByName(guest) + logger.info("test guest name: %s" % guest) + + """ test effect guest running XML """ + if vm.isActive() == 1: + logger.info("guest is running test with running guest") + + for i in range(300, 1000): + if not find_iothreadid_fromxml(vm, 1, i): + logger.info("add iothread %d to running guest" % i) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if find_iothreadid_fromxml(vm, 1, i): + vm.delIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + if find_iothreadid_fromxml(vm, 1, i): + logger.info("FAIL: still can find iothread id in XML") + fail=1 + + break + else: + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + break + + """ test effect guest config""" + logger.info("test with guest inactive XML") + for i in range(300, 1000): + if not find_iothreadid_fromxml(vm, 0, i): + logger.info("add iothread %d to guest config" % i) + vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if find_iothreadid_fromxml(vm, 0, i): + vm.delIOThread(i, libvirt.VIR_DOMAIN_AFFECT_CONFIG) + if find_iothreadid_fromxml(vm, 0, i): + logger.info("FAIL: still can find iothread id in XML") + fail=1 + + break + else: + logger.info("FAIL: cannot find iothread id in XML") + fail=1 + break + + except libvirtError, e: + logger.error("API error message: %s" % e.message) + fail=1 + return fail -- 1.8.3.1

2 3

[libvirt] [PATCH] apparmor: Adjust path to domain monitor socket
by Guido Günther 30 Aug '15

30 Aug '15

f1f68ca33 moved the monitor socket to a per domain directory. Adjust the path accordingly. --- It'd be nice to have this in 1.2.19 since it unbreaks starting qemu based domains. src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index b4a8f27..5de56e5 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1361,7 +1361,7 @@ main(int argc, char **argv) ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) { virBufferAsprintf(&buf, " \"%s/log/libvirt/**/%s.log\" w,\n", LOCALSTATEDIR, ctl->def->name); - virBufferAsprintf(&buf, " \"%s/lib/libvirt/**/%s.monitor\" rw,\n", + virBufferAsprintf(&buf, " \"%s/lib/libvirt/qemu/domain-%s/monitor.sock\" rw,\n", LOCALSTATEDIR, ctl->def->name); virBufferAsprintf(&buf, " \"%s/run/libvirt/**/%s.pid\" rwk,\n", LOCALSTATEDIR, ctl->def->name); -- 2.1.4

2 2

[libvirt] Please give me a wiki account
by Ian Kelling 29 Aug '15

29 Aug '15

I saw a page I'd like to improve a bit. wiki username IanKelling. - Ian Kelling

2 2

[libvirt] libvirt 1.2.19-rc1 can't configure
by Vasiliy Tolstov 29 Aug '15

29 Aug '15

I'm try to configure libvirt 1.2.19-rc1 but get strange error. configure ended with: checking whether <pthread.h> pollutes the namespace... no checking for pthread_t... yes checking for pthread_spinlock_t... yes checking for library containing pthread_create and pthread_join... -pthread checking for pthread_sigmask in -pthread... yes checking whether pthread_sigmask is only a macro... no complete log: https://gist.github.com/raw/f8dc44de0ed7b0675755 -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 3

[libvirt] [PATCH] Revert "LXC: show used memory as 0 when domain is not active"
by Jim Fehlig 28 Aug '15

28 Aug '15

This reverts commit 1ce7c1d20cfd5afb26d2dbc88201085d52415d0e, which introduced a significant semantic change to the virDomainGetInfo() API. Additionally, the change was only made to 2 of the 15 virt drivers. Conflicts: src/qemu/qemu_driver.c Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d8d5119..5b0a757 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -597,7 +597,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, if (!virDomainObjIsActive(vm)) { info->cpuTime = 0; - info->memory = 0; + info->memory = vm->def->mem.cur_balloon; } else { if (virCgroupGetCpuacctUsage(priv->cgroup, &(info->cpuTime)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6998e12..48cc534 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2641,13 +2641,13 @@ qemuDomainGetInfo(virDomainPtr dom, goto cleanup; } - if (virDomainObjIsActive(vm)) { - if (VIR_ASSIGN_IS_OVERFLOW(info->memory, vm->def->mem.cur_balloon)) { - virReportError(VIR_ERR_OVERFLOW, "%s", - _("Current memory size too large")); - goto cleanup; - } + if (VIR_ASSIGN_IS_OVERFLOW(info->memory, vm->def->mem.cur_balloon)) { + virReportError(VIR_ERR_OVERFLOW, "%s", + _("Current memory size too large")); + goto cleanup; + } + if (virDomainObjIsActive(vm)) { if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot read cputime for domain")); -- 2.1.4

4 7

[libvirt] [PATCH] network type ethernet not needs to be reconnected
by Vasiliy Tolstov 28 Aug '15

28 Aug '15

libvirt docs says that network type ethernet not fully managed by libvirt, so don't check for ip. This fixes issue when no ip assigned to interface in libvirt domain xml and somebody want to change link state of interface. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_hotplug.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index aabdb78..db4fdda 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2394,10 +2394,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_ETHERNET: if (STRNEQ_NULLABLE(olddev->data.ethernet.dev, - newdev->data.ethernet.dev) || - olddev->nips == 0 || newdev->nips == 0 || - !virSocketAddrEqual(&olddev->ips[0]->address, - &newdev->ips[0]->address)) { + newdev->data.ethernet.dev)) { needReconnect = true; } break; -- 2.5.0

2 6

[libvirt] Should external snapshots be possible with type volume image files?
by Stefan Bader 28 Aug '15

28 Aug '15

At least up to libvirt version 1.2.16 an external snapshot fails when the image file (supported type like QCOW2) is not specified as type='file' by as type='volume' to a pool that consists of image files (type directory). The reason there is that the source element of the disk definition does not contain the full path but only references to pool and volume name. Which would require an additional indirection in order to find that it actually is a file and what the path is. And that would make things more complicated. So my question is whether this should work and needs fixing in code or was never meant to be used that way. If the latter, then maybe needs a clarification in the documentation. At least the wiki did read for me as only requiring to be a image file of a supported type. And we got at least one bug report about it. Thanks, Stefan

1 0

[libvirt] [PATCH V2 0/3] libxl: a few small migration fixes
by Jim Fehlig 28 Aug '15

28 Aug '15

This series fixes a few issues found while testing migration with latest Xen and libvirt. See the individual patches for details. V2: rebased to latest git master and address Olaf's comment from V1. Jim Fehlig (3): libxl: fix ref counting of libxlMigrationDstArgs libxl: don't attempt to resume domain when suspend fails libxl: acquire a job when receiving a migrating domain src/libxl/libxl_migration.c | 54 +++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) -- 2.3.7

2 9

[libvirt] [PATCH 0/9] qemu: assign addresses to USB devices
by Ján Tomko 28 Aug '15

28 Aug '15

For https://bugzilla.redhat.com/show_bug.cgi?id=1215968 For domains started without the addresses specified on the command line, QEMU makes up the addresses and adds USB hubs if the device is added to the second-to-last USB port. A domain started with these exact ports and hubs specified on the command line is not compatible with this domain. This series only generates the addresses for new domains, to avoid breaking migrating already existing domains. Ján Tomko (9): Remove dead code from qemuDomainAttachControllerDevice Remove unused virDomainVirtioSerialAddrSetRemoveController Store USB port path as an array of integers Add newDomain parameter to qemuDomainAssignAddresses Introduce virDomainUSBAddressSet Add functions for adding usb controllers to addrs Reserve existing USB addresses Assign addresses to USB devices Assign addresses on USB device hotplug src/conf/domain_addr.c | 406 +++++++++++++++++++-- src/conf/domain_addr.h | 53 ++- src/conf/domain_conf.c | 29 +- src/conf/domain_conf.h | 4 +- src/libvirt_private.syms | 10 +- src/qemu/qemu_command.c | 235 +++++++++++- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 22 +- src/qemu/qemu_hotplug.c | 57 ++- src/qemu/qemu_process.c | 6 +- tests/qemuhotplugtest.c | 2 +- ...qemuhotplug-console-compat-2+console-virtio.xml | 4 +- .../qemuhotplug-hotplug-base+disk-usb.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-bios-nvram.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-bios.args | 2 +- .../qemuxml2argv-console-compat-2.xml | 4 +- .../qemuxml2argv-controller-order.args | 7 +- .../qemuxml2argv-controller-order.xml | 2 + .../qemuxml2argv-disk-usb-device-removable.args | 3 +- .../qemuxml2argv-disk-usb-device.args | 3 +- .../qemuxml2argv-graphics-spice-timeout.args | 2 +- ...muxml2argv-hostdev-usb-address-device-boot.args | 2 +- .../qemuxml2argv-hostdev-usb-address-device.args | 3 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.args | 2 +- .../qemuxml2argv-input-usbmouse-addr.xml | 2 +- .../qemuxml2argv-pseries-usb-kbd.args | 2 +- .../qemuxml2argv-serial-spiceport.args | 2 +- .../qemuxml2argv-smartcard-controller.args | 2 +- .../qemuxml2argv-smartcard-host-certificates.args | 2 +- .../qemuxml2argv-smartcard-host.args | 2 +- ...emuxml2argv-smartcard-passthrough-spicevmc.args | 3 +- .../qemuxml2argv-smartcard-passthrough-tcp.args | 2 +- .../qemuxml2argv-sound-device.args | 2 +- .../qemuxml2argv-usb-hub-conflict.xml | 22 ++ .../qemuxml2argv-usb-port-autoassign.args | 15 + .../qemuxml2argv-usb-port-autoassign.xml | 27 ++ tests/qemuxml2argvtest.c | 11 +- tests/qemuxmlnstest.c | 2 +- 40 files changed, 854 insertions(+), 109 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-hub-conflict.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-port-autoassign.xml -- 2.4.6

2 20

[libvirt] [PATCH] lxc: ensure setns() syscall is defined
by Daniel P. Berrange 28 Aug '15

28 Aug '15

Older versions of glibc don't provide the setns() syscall function wrapper, so we must define it ourselves to prevent build failure on old distros. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a RHEL-6 build-break fix --- src/lxc/lxc_container.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8011ed0..feb8fad 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -95,6 +95,40 @@ VIR_LOG_INIT("lxc.lxc_container"); # define CLONE_NEWNET 0x40000000 /* New network namespace */ #endif +/* + * Workaround older glibc. While kernel may support the setns + * syscall, the glibc wrapper might not exist. If that's the + * case, use our own. + */ +#ifndef __NR_setns +# if defined(__x86_64__) +# define __NR_setns 308 +# elif defined(__i386__) +# define __NR_setns 346 +# elif defined(__arm__) +# define __NR_setns 375 +# elif defined(__aarch64__) +# define __NR_setns 375 +# elif defined(__powerpc__) +# define __NR_setns 350 +# elif defined(__s390__) +# define __NR_setns 339 +# endif +#endif + +#ifndef HAVE_SETNS +# if defined(__NR_setns) +# include <sys/syscall.h> + +static inline int setns(int fd, int nstype) +{ + return syscall(__NR_setns, fd, nstype); +} +# else /* !__NR_setns */ +# error Please determine the syscall number for setns on your architecture +# endif +#endif + /* messages between parent and container */ typedef char lxc_message_t; #define LXC_CONTINUE_MSG 'c' -- 2.4.3

2 1

[libvirt] [PATCH 0/4] Couple of LXC fixes
by Michal Privoznik 28 Aug '15

28 Aug '15

After Dan's eff95ac8fce in which he's fixing the build on RHEL-6, I've realized we can do better. We don't need to copy our code around. Michal Privoznik (4): util: Allow virProcessSetNamespaces() to have sparse FD list libvirt_lxc: Claim success for --help lxc_container: Turn lxcAttachNS into calling virProcessSetNamespaces Revert "lxc: ensure setns() syscall is defined" src/lxc/lxc_container.c | 56 +++--------------------------------------------- src/lxc/lxc_controller.c | 1 + src/util/virprocess.c | 3 +++ 3 files changed, 7 insertions(+), 53 deletions(-) -- 2.4.6

3 11

[libvirt] [PATCH 0/2] Fix bridge creation/deletion on 2.6.x kernels
by Laine Stump 28 Aug '15

28 Aug '15

These two patches fix this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1252780 which was also separate reported in libvirt-users a couple days ago. Most people running CentOS6 or RHEL6 also run the downstream version of libvirt-0.10.2 that has many patches backported from later upstream releases, but not the patch described in the commit logs of these proposed patches. And the problem being fixed here only occurs on a 2.6.x kernel, while most people running upstream libvirt are running something much more modern. That's why not many people have seen the bug that these patches fix. Still, we claim to fully support upstream on RHEL6/CentOS6, so we'd better do it right! Two notes: 1) I tried timing 20 iterations of net-start...net-delete with these patches vs. a libvirt build that simply calls the ioctls in the beginnng (i.e. it doesn't try netlink then fall back to ioctl if that fails), and the time to completion was within 0.25%, so the extra overhead of trying one then the other isn't significant even on the older machines that will always fall back to ioctl. 2) There are 2 different versions of Patch 2/2. I did the first one as an exercise to see how ugly it would be to *not* duplicate the entire virNetlinkDelLink() function inside the new virNetDevBridgeDelete(). It was pretty ugly, so I made a cleaner version that duplicates the code instead. I would be okay pushing either version, but I think I slightly prefer the one that duplicates code and remains uncomplicated. Laine Stump (2): util: fallback to ioctl(SIOCBRADDBR) if netlink RTM_NEWLINK fails util: fallback to ioctl(SIOCBRDELBR) if netlink RTM_DELLINK fails src/util/virnetdevbridge.c | 112 ++++++++++++++++++++++++++++++++------------ src/util/virnetdevmacvlan.c | 2 +- src/util/virnetlink.c | 17 +++++-- src/util/virnetlink.h | 2 +- 4 files changed, 98 insertions(+), 35 deletions(-) -- 2.1.0

3 14

[libvirt] PING: [RFC PATCH 0/3] Implement mockup capabilities cache in QEMU tests
by Pavel Fedin 27 Aug '15

27 Aug '15

Hello! I remember you were worrying about a temporary hack in qemu's postparse, because test suite could not generate proper capability cache. I promised to solve this, and here is (almost) a solution, i've outlined one small problem to solve together in the cover message. Since then, no response... Kind regards, Pavel Fedin Expert Engineer Samsung Electronics Research center Russia > -----Original Message----- > From: libvir-list-bounces(a)redhat.com [mailto:libvir-list-bounces@redhat.com] On Behalf Of Pavel > Fedin > Sent: Tuesday, August 18, 2015 12:40 PM > To: libvir-list(a)redhat.com > Cc: Martin Kletzander > Subject: [libvirt] [RFC PATCH 0/3] Implement mockup capabilities cache in QEMU tests > > Since commit e8d55172544c1fafe31a9e09346bdebca4f0d6f9 qemu driver checks > emulator capabilities during domain XML post-parse. However, test suite > does not initialize it, therefore a condition to skip all checks if there > is no cache supplied was added. This is actually a hack, whose sole > purpose is to make existing test suite working. Additionally, it prevents > from writing new tests for this particular functionality. > > This series attempts to solve this problem by implementing proper cache > mockup in test suite. The main idea is to create a cache in standard way > and put there a pre-defined capabilities set (which tests already have). > > The main problem here is to know emulator binary name, which is contained > in the source XML. However, we have to create our cache before reading the > XML. The simplest way to resolve this is to assume particular binary name > from test name. Currently tests which assume cross-architecture binary are > all prefixed with the architecture name (with one exception of "keywrap" > tests which all assume /usr/bin/qemu-system-s390x and do not have "s390-" > prefix in their name). > > This scheme works fine, unless we use "native" emulator binary. Here we > have a mess. Most newer tests use /usr/bin/qemu, however there is a large > number of tests which use /usr/libexec/qemu-kvm or /usr/bin/kvm (i guess > these are leftovers from the epoch when qemu-kvm was a separate fork of > qemu). This is currently not handled in any way, and these tests may > report errors due to missing binaries (because virQEMUCapsCacheLookup() > attempts to populate the cache automatically by querying the binary if > not already known). > > There are several possible ways to resolve this: > a) Add all possible names as aliases for /usr/bin/qemu > b) Forbid to use oldstyle names at all in these tests > c) Declare some prefix like "kvm-" for those tests who want to use > /usr/libexec/qemu-kvm. Again, this would ban /usr/bin/kvm and > /usr/bin/qemu-kvm (if not using aliases like in (b) > d) Hardcode (optional) emulator name per test. IMHO a bad idea because > number of tests is huge. > e) Do some preparsing of the XML and extract binary name from it. Again, > i disliked it for not being simple enough. > > I also thought about an alternate implementation which would patch > postParseCallback and insert own function there which builds a cache. At > this point binary name is already known from the XML. However, such a > design looks like an ugly hack by itself, so i stopped going in this > direction. > > Comments and opinions are welcome. > > Pavel Fedin (3): > Implement virQEMUCapsCache mockup > Use mockup cache > Removed unneeded check > > src/qemu/qemu_capabilities.c | 10 +--------- > src/qemu/qemu_capspriv.h | 36 +++++++++++++++++++++++++++++++++++ > src/qemu/qemu_domain.c | 5 +---- > tests/qemuagenttest.c | 9 ++++++++- > tests/qemuargv2xmltest.c | 5 +++++ > tests/qemuhotplugtest.c | 23 ++++++++++++++-------- > tests/qemuxml2argvtest.c | 5 +++++ > tests/qemuxml2xmltest.c | 6 ++++++ > tests/qemuxmlnstest.c | 5 +++++ > tests/testutilsqemu.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ > tests/testutilsqemu.h | 3 +++ > 11 files changed, 130 insertions(+), 22 deletions(-) > create mode 100644 src/qemu/qemu_capspriv.h > mode change 100644 => 100755 tests/qemuagenttest.c > mode change 100644 => 100755 tests/qemuhotplugtest.c > mode change 100644 => 100755 tests/qemuxml2xmltest.c > mode change 100644 => 100755 tests/testutilsqemu.c > > -- > 2.1.4 > > -- > libvir-list mailing list > libvir-list(a)redhat.com > https://www.redhat.com/mailman/listinfo/libvir-list

2 2