- Devel - libvirt List Archives

[libvirt] [PATCH libvirt-python] Fix duplicate entries in AUTHORS
by Jim Fehlig 28 May '15

28 May '15

The generated AUTHORS file contains many duplicates. If an author has N commits, there will be N entries for the author in AUTHORS. Check if an author already exists in the list before appending. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- setup.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 2571742..7a1964b 100755 --- a/setup.py +++ b/setup.py @@ -176,7 +176,9 @@ class my_sdist(sdist): f = os.popen("git log --pretty=format:'%aN <%aE>'") authors = [] for line in f: - authors.append(" " + line.strip()) + line = " " + line.strip() + if line not in authors: + authors.append(line) authors.sort(key=str.lower) -- 2.3.7

3 4

[libvirt] [PATCH] debug: assure NULLSTR() around all %s args in debug at top of public APIs
by Laine Stump 28 May '15

28 May '15

There are also a couple that were very uninformatively just logging the value of the pointer rather than the string itself: * the "name" arg to virNodeDeviceLookupByName() * wwnn and wwpn args to virNodeDeviceLookupSCSIHostByWWN() All char*'s that make sense should now have their contents logged rather than the pointer, and all %s args should now be inside NULLSTR(). --- src/libvirt-domain.c | 36 ++++++++++++++++++------------------ src/libvirt-host.c | 6 +++--- src/libvirt-interface.c | 6 +++--- src/libvirt-network.c | 6 +++--- src/libvirt-nodedev.c | 10 +++++----- src/libvirt-nwfilter.c | 6 +++--- src/libvirt-secret.c | 4 ++-- src/libvirt-storage.c | 16 ++++++++-------- 8 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 2edba1a..5907f58 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -167,7 +167,7 @@ virDomainPtr virDomainCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -235,7 +235,7 @@ virDomainCreateXMLWithFiles(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { VIR_DEBUG("conn=%p, xmlDesc=%s, nfiles=%u, files=%p, flags=%x", - conn, xmlDesc, nfiles, files, flags); + conn, NULLSTR(xmlDesc), nfiles, files, flags); virResetLastError(); @@ -413,7 +413,7 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virDomainPtr virDomainLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -955,7 +955,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, int virDomainRestore(virConnectPtr conn, const char *from) { - VIR_DEBUG("conn=%p, from=%s", conn, from); + VIR_DEBUG("conn=%p, from=%s", conn, NULLSTR(from)); virResetLastError(); @@ -1025,7 +1025,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, unsigned int flags) { VIR_DEBUG("conn=%p, from=%s, dxml=%s, flags=%x", - conn, from, NULLSTR(dxml), flags); + conn, NULLSTR(from), NULLSTR(dxml), flags); virResetLastError(); @@ -1089,7 +1089,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, unsigned int flags) { VIR_DEBUG("conn=%p, file=%s, flags=%x", - conn, file, flags); + conn, NULLSTR(file), flags); virResetLastError(); @@ -1162,7 +1162,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, const char *dxml, unsigned int flags) { VIR_DEBUG("conn=%p, file=%s, dxml=%s, flags=%x", - conn, file, dxml, flags); + conn, NULLSTR(file), NULLSTR(dxml), flags); virResetLastError(); @@ -2623,7 +2623,7 @@ virConnectDomainXMLFromNative(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, format=%s, config=%s, flags=%x", - conn, nativeFormat, nativeConfig, flags); + conn, NULLSTR(nativeFormat), NULLSTR(nativeConfig), flags); virResetLastError(); @@ -2673,7 +2673,7 @@ virConnectDomainXMLToNative(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, format=%s, xml=%s, flags=%x", - conn, nativeFormat, domainXml, flags); + conn, NULLSTR(nativeFormat), NULLSTR(domainXml), flags); virResetLastError(); @@ -4597,7 +4597,7 @@ virDomainMigrateFinish(virConnectPtr dconn, { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " "flags=%lx", dconn, NULLSTR(dname), cookie, cookielen, - uri, flags); + NULLSTR(uri), flags); virResetLastError(); @@ -4639,8 +4639,8 @@ virDomainMigratePrepare2(virConnectPtr dconn, { VIR_DEBUG("dconn=%p, cookie=%p, cookielen=%p, uri_in=%s, uri_out=%p," "flags=%lx, dname=%s, bandwidth=%lu, dom_xml=%s", dconn, - cookie, cookielen, uri_in, uri_out, flags, NULLSTR(dname), - bandwidth, dom_xml); + cookie, cookielen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), + bandwidth, NULLSTR(dom_xml)); virResetLastError(); @@ -4681,7 +4681,7 @@ virDomainMigrateFinish2(virConnectPtr dconn, { VIR_DEBUG("dconn=%p, dname=%s, cookie=%p, cookielen=%d, uri=%s, " "flags=%lx, retcode=%d", dconn, NULLSTR(dname), cookie, - cookielen, uri, flags, retcode); + cookielen, NULLSTR(uri), flags, retcode); virResetLastError(); @@ -4721,7 +4721,7 @@ virDomainMigratePrepareTunnel(virConnectPtr conn, { VIR_DEBUG("conn=%p, stream=%p, flags=%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", conn, st, flags, - NULLSTR(dname), bandwidth, dom_xml); + NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); virResetLastError(); @@ -4817,7 +4817,7 @@ virDomainMigratePrepare3(virConnectPtr dconn, VIR_DEBUG("dconn=%p, cookiein=%p, cookieinlen=%d, cookieout=%p, " "cookieoutlen=%p, uri_in=%s, uri_out=%p, flags=%lx, dname=%s, " "bandwidth=%lu, dom_xml=%s", - dconn, cookiein, cookieinlen, cookieout, cookieoutlen, uri_in, + dconn, cookiein, cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, flags, NULLSTR(dname), bandwidth, dom_xml); virResetLastError(); @@ -4866,7 +4866,7 @@ virDomainMigratePrepareTunnel3(virConnectPtr conn, "cookieoutlen=%p, flags=%lx, dname=%s, bandwidth=%lu, " "dom_xml=%s", conn, st, cookiein, cookieinlen, cookieout, cookieoutlen, flags, - NULLSTR(dname), bandwidth, dom_xml); + NULLSTR(dname), bandwidth, NULLSTR(dom_xml)); virResetLastError(); @@ -6377,7 +6377,7 @@ virDomainGetBlockInfo(virDomainPtr domain, const char *disk, virDomainPtr virDomainDefineXML(virConnectPtr conn, const char *xml) { - VIR_DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, NULLSTR(xml)); virResetLastError(); @@ -6425,7 +6425,7 @@ virDomainDefineXML(virConnectPtr conn, const char *xml) virDomainPtr virDomainDefineXMLFlags(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); diff --git a/src/libvirt-host.c b/src/libvirt-host.c index 03bee1f..9c88426 100644 --- a/src/libvirt-host.c +++ b/src/libvirt-host.c @@ -321,7 +321,7 @@ int virConnectGetMaxVcpus(virConnectPtr conn, const char *type) { - VIR_DEBUG("conn=%p, type=%s", conn, type); + VIR_DEBUG("conn=%p, type=%s", conn, NULLSTR(type)); virResetLastError(); @@ -965,7 +965,7 @@ virConnectCompareCPU(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1009,7 +1009,7 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models, unsigned int flags) { VIR_DEBUG("conn=%p, arch=%s, models=%p, flags=%x", - conn, arch, models, flags); + conn, NULLSTR(arch), models, flags); virResetLastError(); if (models) diff --git a/src/libvirt-interface.c b/src/libvirt-interface.c index 4c155ca..3d1a5ff 100644 --- a/src/libvirt-interface.c +++ b/src/libvirt-interface.c @@ -284,7 +284,7 @@ virConnectListDefinedInterfaces(virConnectPtr conn, virInterfacePtr virInterfaceLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -323,7 +323,7 @@ virInterfaceLookupByName(virConnectPtr conn, const char *name) virInterfacePtr virInterfaceLookupByMACString(virConnectPtr conn, const char *macstr) { - VIR_DEBUG("conn=%p, macstr=%s", conn, macstr); + VIR_DEBUG("conn=%p, macstr=%s", conn, NULLSTR(macstr)); virResetLastError(); @@ -464,7 +464,7 @@ virInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) virInterfacePtr virInterfaceDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); diff --git a/src/libvirt-network.c b/src/libvirt-network.c index e3a3650..3136f27 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -290,7 +290,7 @@ virConnectListDefinedNetworks(virConnectPtr conn, char **const names, virNetworkPtr virNetworkLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -404,7 +404,7 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virNetworkPtr virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) { - VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, NULLSTR(xmlDesc)); virResetLastError(); @@ -444,7 +444,7 @@ virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) virNetworkPtr virNetworkDefineXML(virConnectPtr conn, const char *xml) { - VIR_DEBUG("conn=%p, xml=%s", conn, xml); + VIR_DEBUG("conn=%p, xml=%s", conn, NULLSTR(xml)); virResetLastError(); diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index b6c6d1e..c1ca575 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -1,7 +1,7 @@ /* * libvirt-nodedev.c: entry points for virNodeDevPtr APIs * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -160,7 +160,7 @@ virNodeListDevices(virConnectPtr conn, unsigned int flags) { VIR_DEBUG("conn=%p, cap=%s, names=%p, maxnames=%d, flags=%x", - conn, cap, names, maxnames, flags); + conn, NULLSTR(cap), names, maxnames, flags); virResetLastError(); @@ -199,7 +199,7 @@ virNodeListDevices(virConnectPtr conn, virNodeDevicePtr virNodeDeviceLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%p", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -242,7 +242,7 @@ virNodeDeviceLookupSCSIHostByWWN(virConnectPtr conn, const char *wwpn, unsigned int flags) { - VIR_DEBUG("conn=%p, wwnn=%p, wwpn=%p, flags=%x", conn, wwnn, wwpn, flags); + VIR_DEBUG("conn=%p, wwnn=%s, wwpn=%s, flags=%x", conn, NULLSTR(wwnn), NULLSTR(wwpn), flags); virResetLastError(); @@ -694,7 +694,7 @@ virNodeDeviceCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); diff --git a/src/libvirt-nwfilter.c b/src/libvirt-nwfilter.c index 8bb6fa0..30c7c10 100644 --- a/src/libvirt-nwfilter.c +++ b/src/libvirt-nwfilter.c @@ -1,7 +1,7 @@ /* * libvirt-nwfilter.c: entry points for virNwfilterPtr APIs * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -162,7 +162,7 @@ virConnectListNWFilters(virConnectPtr conn, char **const names, int maxnames) virNWFilterPtr virNWFilterLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -382,7 +382,7 @@ virNWFilterGetUUIDString(virNWFilterPtr nwfilter, char *buf) virNWFilterPtr virNWFilterDefineXML(virConnectPtr conn, const char *xmlDesc) { - VIR_DEBUG("conn=%p, xmlDesc=%s", conn, xmlDesc); + VIR_DEBUG("conn=%p, xmlDesc=%s", conn, NULLSTR(xmlDesc)); virResetLastError(); diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index e77f223..fa306e3 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -1,7 +1,7 @@ /* * libvirt-secret.c: entry points for virSecretPtr APIs * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -336,7 +336,7 @@ virSecretLookupByUsage(virConnectPtr conn, virSecretPtr virSecretDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 474f198..66dd9f0 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -364,7 +364,7 @@ virStoragePoolPtr virStoragePoolLookupByName(virConnectPtr conn, const char *name) { - VIR_DEBUG("conn=%p, name=%s", conn, name); + VIR_DEBUG("conn=%p, name=%s", conn, NULLSTR(name)); virResetLastError(); @@ -521,7 +521,7 @@ virStoragePoolCreateXML(virConnectPtr conn, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, xmlDesc, flags); + VIR_DEBUG("conn=%p, xmlDesc=%s, flags=%x", conn, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -564,7 +564,7 @@ virStoragePoolDefineXML(virConnectPtr conn, const char *xml, unsigned int flags) { - VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, xml, flags); + VIR_DEBUG("conn=%p, xml=%s, flags=%x", conn, NULLSTR(xml), flags); virResetLastError(); @@ -1290,7 +1290,7 @@ virStorageVolPtr virStorageVolLookupByName(virStoragePoolPtr pool, const char *name) { - VIR_DEBUG("pool=%p, name=%s", pool, name); + VIR_DEBUG("pool=%p, name=%s", pool, NULLSTR(name)); virResetLastError(); @@ -1330,7 +1330,7 @@ virStorageVolPtr virStorageVolLookupByKey(virConnectPtr conn, const char *key) { - VIR_DEBUG("conn=%p, key=%s", conn, key); + VIR_DEBUG("conn=%p, key=%s", conn, NULLSTR(key)); virResetLastError(); @@ -1370,7 +1370,7 @@ virStorageVolPtr virStorageVolLookupByPath(virConnectPtr conn, const char *path) { - VIR_DEBUG("conn=%p, path=%s", conn, path); + VIR_DEBUG("conn=%p, path=%s", conn, NULLSTR(path)); virResetLastError(); @@ -1463,7 +1463,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, xmlDesc, flags); + VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, NULLSTR(xmlDesc), flags); virResetLastError(); @@ -1516,7 +1516,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, unsigned int flags) { VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=%x", - pool, xmlDesc, clonevol, flags); + pool, NULLSTR(xmlDesc), clonevol, flags); virResetLastError(); -- 2.1.0

2 2

[libvirt] [PATCH 0/4] libxl: support SPICE graphics
by Jim Fehlig 28 May '15

28 May '15

This series provides support for SPICE graphics in the libxl driver. The first patch is mostly code movement. The second patch is a trivial name change of a structure member. Patch3 populates the libxl_domain_build_info struct with SPICE info. SPICE isn't as nice without QXL, so patch4 provides support for QXL video device. Jim Fehlig (4): libxl: populate build_info vfb in separate function libxl: change reservedVNCPorts to reservedGraphicsPorts libxl: support SPICE graphics for HVM domains libxl: support QXL video device src/libxl/libxl_conf.c | 150 +++++++++++++++++++++++++++++++++++++---------- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_domain.c | 8 ++- src/libxl/libxl_driver.c | 4 +- 4 files changed, 128 insertions(+), 36 deletions(-) -- 1.8.4.5

3 11

[libvirt] [PATCH v2] virsh: Fix to list online cpus using virsh capabilities
by Kothapally Madhu Pavan 28 May '15

28 May '15

Virsh capabilities will list offline cpus as online when libvirt is compiled with numactl option disabled. This fix will list correct set of online cpus. --- src/nodeinfo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 22df95c..410c9de 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1651,6 +1651,47 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) if (VIR_ALLOC_N(cpus, ncpus) < 0) return -1; +#ifdef __linux__ + { + int cid = 0; + int onlinecpus = nodeinfo.cpus; + + id = 0; + for (s = 0; s < nodeinfo.sockets; s++) { + for (c = 0; c < nodeinfo.cores; c++) { + for (t = 0; t < nodeinfo.threads; t++) { + if (virNodeGetCpuValue(SYSFS_CPU_PATH, id, "online", 1)) { + cpus[cid].id = id; + cpus[cid].socket_id = s; + cpus[cid].core_id = c; + if (!(cpus[cid].siblings = virBitmapNew(ncpus))) + goto error; + ignore_value(virBitmapSetBit(cpus[cid].siblings, id)); + cid++; + } + + id++; + } + } + } + + if (virCapabilitiesAddHostNUMACell(caps, 0, + nodeinfo.memory, + onlinecpus, cpus, + 0, NULL, + 0, NULL) < 0) + goto error; + + return 0; + + error: + for (; cid >= 0; cid--) + virBitmapFree(cpus[cid].siblings); + VIR_FREE(cpus); + return -1; + } +#else + { id = 0; for (s = 0; s < nodeinfo.sockets; s++) { for (c = 0; c < nodeinfo.cores; c++) { @@ -1680,6 +1721,8 @@ nodeCapsInitNUMAFake(virCapsPtr caps ATTRIBUTE_UNUSED) virBitmapFree(cpus[id].siblings); VIR_FREE(cpus); return -1; + } +#endif } static int

2 1

[libvirt] [PATCH] conf: Ignore panic device on pSeries.
by Andrea Bolognani 28 May '15

28 May '15

The guest firmware already provides the same functionality, so we can just safely drop the <panic/> element from the domain definition. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1182388 --- src/conf/domain_conf.c | 17 +++++++----- .../qemuxml2argv-pseries-panic.args | 7 +++++ .../qemuxml2argv-pseries-panic.xml | 30 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ .../qemuxml2xmlout-pseries-panic.xml | 29 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 6 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4cd36a1..a7d4efa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15478,13 +15478,18 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } if (n > 0) { - virDomainPanicDefPtr panic = - virDomainPanicDefParseXML(nodes[0]); - if (!panic) - goto error; + /* Ignore the panic device on pSeries, as the guest + * firmware already provides the same functionality */ + if (!(ARCH_IS_PPC64(def->os.arch) && + STRPREFIX(def->os.machine, "pseries"))) { + virDomainPanicDefPtr panic = + virDomainPanicDefParseXML(nodes[0]); + if (!panic) + goto error; - def->panic = panic; - VIR_FREE(nodes); + def->panic = panic; + VIR_FREE(nodes); + } } /* analysis of the shmem devices */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args new file mode 100644 index 0000000..30e4b43 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.args @@ -0,0 +1,7 @@ +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 \ +-nodefconfig -nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -usb \ +-chardev pty,id=charserial0 \ +-device spapr-vty,chardev=charserial0,reg=0x30000000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml new file mode 100644 index 0000000..9312975 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-panic.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <serial type='pty'> + <target port='0'/> + <address type='spapr-vio'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + <address type='spapr-vio'/> + </console> + <memballoon model='none'/> + <panic/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 97c7fba..5719d70 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1360,6 +1360,8 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST, QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("pseries-panic", + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("disk-ide-drive-split", QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_IDE_CD); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml new file mode 100644 index 0000000..8980847 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-panic.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <serial type='pty'> + <target port='0'/> + <address type='spapr-vio'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + <address type='spapr-vio'/> + </console> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b611afd..5db6341 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -534,6 +534,7 @@ mymain(void) DO_TEST("virtio-rng-egd"); DO_TEST("pseries-nvram"); + DO_TEST_DIFFERENT("pseries-panic"); /* These tests generate different XML */ DO_TEST_DIFFERENT("balloon-device-auto"); -- 2.1.0

4 7

[libvirt] [PATCH v2 0/3] storage: Fix problem with disk backend pool allocation calculation
by John Ferlan 28 May '15

28 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1224018 v1 here: http://www.redhat.com/archives/libvir-list/2015-May/msg00865.html This series adjusts the patches in order to first revert patches for https://bugzilla.redhat.com/show_bug.cgi?id=1206521 and rework the patch to be specific to/for the disk backend to not update the allocation and available pool values. That removes the need to add 1 for the extended partition leaving only the need to check for whether it's a refresh or create when zeroing out the allocation value while processing the partition data. If this is accepted, bz 1206521 will be moved back to a state to allow qe to recheck the change. John Ferlan (3): Revert "storage: Don't duplicate efforts of backend driver" storage: Don't adjust pool alloc/avail values for disk backend storage: Fix problem with disk backend pool allocation calculation src/storage/storage_backend_disk.c | 7 ++++++- src/storage/storage_driver.c | 35 ++++++++++++++--------------------- 2 files changed, 20 insertions(+), 22 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH] storage: Report error when using metadata prealloc with non-qcow2 volumes
by Erik Skultety 28 May '15

28 May '15

We already report error from backend (virStorageBackendCreateRaw, virStorageBackendCreateBlockFrom), but we should also report the same error (applies to raw formated volumes and block type volumes as well) when creating a volume from a XML, not only from an existing volume. --- src/storage/storage_driver.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ac4a74a..b519011 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1803,6 +1803,22 @@ storageVolCreateXML(virStoragePoolPtr obj, goto cleanup; } + if (flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA) { + if (voldef->target.format == VIR_STORAGE_FILE_RAW) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("metadata preallocation is not supported for " + "raw volumes")); + goto cleanup; + } + + if (voldef->type == VIR_STORAGE_VOL_BLOCK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("metadata preallocation is not supported for " + "block volumes")); + goto cleanup; + } + } + if (virStorageVolCreateXMLEnsureACL(obj->conn, pool->def, voldef) < 0) goto cleanup; -- 1.9.3

1 1

[libvirt] [PATCH 0/3] volume resize fixes
by Ján Tomko 28 May '15

28 May '15

First two patches fix bugs and are applicable for the freeze. Ján Tomko (3): Simplify allocation check in storageVolResize Fix shrinking volumes with the delta flag virsh: make negative values with vol-resize more convenient src/storage/storage_driver.c | 26 +++++++++----------------- tools/virsh-volume.c | 15 ++++++++------- 2 files changed, 17 insertions(+), 24 deletions(-) -- 2.3.6

2 7

[libvirt] [PATCH] Fix the event name in vshEventTrayChangePrint
by Ján Tomko 28 May '15

28 May '15

https://bugzilla.redhat.com/show_bug.cgi?id=1206114#c5 Reported by: zhenfeng wang <zhwang(a)redhat.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 91a1ca2..fc4d1fc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12076,7 +12076,7 @@ vshEventTrayChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, if (!data->loop && *data->count) return; vshPrint(data->ctl, - _("event 'disk-change' for domain %s disk %s: %s\n"), + _("event 'tray-change' for domain %s disk %s: %s\n"), virDomainGetName(dom), alias, vshDomainEventTrayChangeToString(reason)); (*data->count)++; -- 2.3.6

1 0

[libvirt] [PATCH] lxc: properly clean up qemu-nbd
by Cédric Bosdonnat 28 May '15

28 May '15

Add the qemu-nbd tasks to the container cgroup to make sure those will be killed when the container is stopped. In order to reliably get the qemu-nbd tasks PIDs, we use /sys/devices/virtual/block/<DEV>/pid as qemu-nbd is daemonizing itself. --- src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virprocess.c | 45 ++++++++++++++++++++++++++++++++++++++ src/util/virprocess.h | 2 ++ 4 files changed, 104 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8c50ea2..409bb4f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1973,6 +1973,7 @@ virProcessAbort; virProcessExitWithStatus; virProcessGetAffinity; virProcessGetNamespaces; +virProcessGetPids; virProcessGetStartTime; virProcessKill; virProcessKillPainfully; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index e144c2d..14d873e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -107,6 +107,9 @@ struct _virLXCController { pid_t initpid; + size_t nnbdpids; + pid_t *nbdpids; + size_t nveths; char **veths; @@ -283,6 +286,8 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl) virObjectUnref(ctrl->server); virLXCControllerFreeFuse(ctrl); + VIR_FREE(ctrl->nbdpids); + virCgroupFree(&ctrl->cgroup); /* This must always be the last thing to be closed */ @@ -471,6 +476,9 @@ static int virLXCControllerSetupNBDDeviceFS(virDomainFSDefPtr fs) return -1; } + /* The NBD device will be cleaned up while the cgroup will end. + * For this we need to remember the qemu-nbd pid and add it to + * the cgroup*/ if (virFileNBDDeviceAssociate(fs->src, fs->format, fs->readonly, @@ -503,6 +511,9 @@ static int virLXCControllerSetupNBDDeviceDisk(virDomainDiskDefPtr disk) return -1; } + /* The NBD device will be cleaned up while the cgroup will end. + * For this we need to remember the qemu-nbd pid and add it to + * the cgroup*/ if (virFileNBDDeviceAssociate(src, format, disk->src->readonly, @@ -525,6 +536,38 @@ static int virLXCControllerSetupNBDDeviceDisk(virDomainDiskDefPtr disk) return 0; } +static int virLXCControllerAppendNBDPids(virLXCControllerPtr ctrl, + const char *dev) +{ + char *pidpath = NULL; + pid_t *pids; + size_t npids; + size_t i; + int ret = -1; + pid_t pid; + + if (!STRPREFIX(dev, "/dev/") || + virAsprintf(&pidpath, "/sys/devices/virtual/block/%s/pid", dev + 5) < 0) + goto cleanup; + + if (virPidFileReadPath(pidpath, &pid) < 0) + goto cleanup; + + if (virProcessGetPids(pid, &npids, &pids) < 0) + goto cleanup; + + for (i = 0; i < npids; i++) { + if (VIR_APPEND_ELEMENT(ctrl->nbdpids, ctrl->nnbdpids, pids[i]) < 0) + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(pids); + VIR_FREE(pidpath); + return ret; +} static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) { @@ -570,6 +613,9 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_NBD) { if (virLXCControllerSetupNBDDeviceFS(fs) < 0) goto cleanup; + + if (virLXCControllerAppendNBDPids(ctrl, fs->src) < 0) + goto cleanup; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("fs driver %s is not supported"), @@ -629,6 +675,9 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) } if (virLXCControllerSetupNBDDeviceDisk(disk) < 0) goto cleanup; + + if (virLXCControllerAppendNBDPids(ctrl, virDomainDiskGetSource(disk)) < 0) + goto cleanup; } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("disk driver %s is not supported"), @@ -781,6 +830,7 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) virBitmapPtr auto_nodeset = NULL; int ret = -1; virBitmapPtr nodeset = NULL; + size_t i; VIR_DEBUG("Setting up cgroup resource limits"); @@ -798,6 +848,12 @@ static int virLXCControllerSetupCgroupLimits(virLXCControllerPtr ctrl) if (virCgroupAddTask(ctrl->cgroup, getpid()) < 0) goto cleanup; + /* Add all qemu-nbd tasks to the cgroup */ + for (i = 0; i < ctrl->nnbdpids; i++) { + if (virCgroupAddTask(ctrl->cgroup, ctrl->nbdpids[i]) < 0) + goto cleanup; + } + if (virLXCCgroupSetup(ctrl->def, ctrl->cgroup, nodeset) < 0) goto cleanup; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 7a79970..8b4b32f 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -607,6 +607,51 @@ int virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED, } #endif /* HAVE_SCHED_GETAFFINITY */ +int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) +{ + int ret = -1; + char *taskPath = NULL; + DIR *dir = NULL; + int value; + struct dirent *ent; + + *npids = 0; + *pids = NULL; + + if (virAsprintf(&taskPath, "/proc/%llu/task", + (unsigned long long)pid) < 0) + goto cleanup; + + if (!(dir = opendir(taskPath))) + goto cleanup; + + while ((value = virDirRead(dir, &ent, taskPath)) > 0) { + pid_t tmp_pid; + + /* Skip . and .. */ + if (STRPREFIX(ent->d_name, ".")) + continue; + + if (virStrToLong_i(ent->d_name, NULL, 10, &tmp_pid) < 0) + goto cleanup; + + if (VIR_APPEND_ELEMENT(*pids, *npids, tmp_pid) < 0) + goto cleanup; + } + + if (value < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (!dir) + closedir(dir); + VIR_FREE(taskPath); + if (ret < 0) + VIR_FREE(*pids); + return ret; +} int virProcessGetNamespaces(pid_t pid, size_t *nfdlist, diff --git a/src/util/virprocess.h b/src/util/virprocess.h index c812882..86a633d 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -62,6 +62,8 @@ int virProcessGetAffinity(pid_t pid, virBitmapPtr *map, int maxcpu); +int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids); + int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp); -- 2.1.4

2 1