- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] more storage cleanups
by Eric Blake 07 Nov '13

07 Nov '13

I'm still plugging away at getting gluster backing chains to work; here's a couple of independent cleanups that can be applied first. Eric Blake (3): storage: use simpler 'char *' storage: avoid short reads while chasing backing chain storage: reduce number of stat calls src/libvirt_private.syms | 1 + src/storage/storage_backend.c | 62 +++++++++++++++++-------------------- src/storage/storage_backend.h | 10 ++++-- src/storage/storage_backend_fs.c | 5 +-- src/storage/storage_backend_mpath.c | 7 +++-- src/storage/storage_backend_scsi.c | 7 +++-- src/util/virfile.c | 21 +++++++++++++ src/util/virfile.h | 9 ++++-- src/util/virstoragefile.c | 52 ++++++++++++++----------------- 9 files changed, 100 insertions(+), 74 deletions(-) -- 1.8.3.1

2 8

[libvirt] [PATCH] nodeinfo: fix build on non-Linux
by Eric Blake 07 Nov '13

07 Nov '13

Commit b0f8546 broke the build on mingw, by exposing code that had Linux-specific dependencies but which was previously protected by libnuma ifdef guards: make[3]: Entering directory `/home/eblake/libvirt-tmp/build/src' CC libvirt_driver_la-nodeinfo.lo ../../src/nodeinfo.c: In function 'virNodeGetSiblingsList': ../../src/nodeinfo.c:1543:30: error: 'SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX' undeclared (first use in this function) if (virFileReadAll(path, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, &buf) < 0) ^ ../../src/nodeinfo.c:1543:30: note: each undeclared identifier is reported only once for each function it appears in ../../src/nodeinfo.c: In function 'virNodeCapsFillCPUInfo': ../../src/nodeinfo.c:1562:5: error: implicit declaration of function 'virNodeGetCpuValue' [-Werror=implicit-function-declaration] if ((tmp = virNodeGetCpuValue(SYSFS_CPU_PATH, cpu_id, ^ ../../src/nodeinfo.c:1562:5: error: nested extern declaration of 'virNodeGetCpuValue' [-Werror=nested-externs] ../../src/nodeinfo.c:1562:35: error: 'SYSFS_CPU_PATH' undeclared (first use in this function) if ((tmp = virNodeGetCpuValue(SYSFS_CPU_PATH, cpu_id, ^ cc1: all warnings being treated as errors * src/nodeinfo.c (virNodeCapsFillCPUInfo): Make conditional. (virNodeGetSiblingsList): Move into #ifdef linux block. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/nodeinfo.c | 56 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 6c1fcc7..1838547 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -867,6 +867,30 @@ error: virBitmapFree(map); return NULL; } + + +static virBitmapPtr +virNodeGetSiblingsList(const char *dir, int cpu_id) +{ + char *path = NULL; + char *buf = NULL; + virBitmapPtr ret = NULL; + + if (virAsprintf(&path, "%s/cpu%u/topology/thread_siblings_list", + dir, cpu_id) < 0) + goto cleanup; + + if (virFileReadAll(path, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, &buf) < 0) + goto cleanup; + + if (virBitmapParse(buf, 0, &ret, virNumaGetMaxCPUs()) < 0) + goto cleanup; + +cleanup: + VIR_FREE(buf); + VIR_FREE(path); + return ret; +} #endif int nodeGetInfo(virNodeInfoPtr nodeinfo) @@ -1529,33 +1553,12 @@ nodeGetFreeMemoryFake(void) return ret; } -static virBitmapPtr -virNodeGetSiblingsList(const char *dir, int cpu_id) -{ - char *path = NULL; - char *buf = NULL; - virBitmapPtr ret = NULL; - - if (virAsprintf(&path, "%s/cpu%u/topology/thread_siblings_list", - dir, cpu_id) < 0) - goto cleanup; - - if (virFileReadAll(path, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, &buf) < 0) - goto cleanup; - - if (virBitmapParse(buf, 0, &ret, virNumaGetMaxCPUs()) < 0) - goto cleanup; - -cleanup: - VIR_FREE(buf); - VIR_FREE(path); - return ret; -} - /* returns 1 on success, 0 if the detection failed and -1 on hard error */ static int -virNodeCapsFillCPUInfo(int cpu_id, virCapsHostNUMACellCPUPtr cpu) +virNodeCapsFillCPUInfo(int cpu_id ATTRIBUTE_UNUSED, + virCapsHostNUMACellCPUPtr cpu ATTRIBUTE_UNUSED) { +#ifdef __linux__ int tmp; cpu->id = cpu_id; @@ -1575,6 +1578,11 @@ virNodeCapsFillCPUInfo(int cpu_id, virCapsHostNUMACellCPUPtr cpu) return -1; return 0; +#else + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("node cpu info not implemented on this platform")); + return -1; +#endif } int -- 1.8.3.1

1 0

[libvirt] [PATCH] add SystemTap to apps using libvirt
by Jonathan Lebon 06 Nov '13

06 Nov '13

Starting from v2.4 (released today!), SystemTap can use libvirt to execute scripts inside virtual machines. Not sure if this matches the spirit of the page (I see that most other apps are virtualization- oriented by nature). In the case it does not, feel free to ignore this patch. --- docs/apps.html.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index c7e2f64..3598062 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -103,6 +103,13 @@ in a virtual machine. It prints out a list of facts about the virtual machine, derived from heuristics. </dd> + <dt><a href="http://sourceware.org/systemtap/">stap</a></dt> + <dd> + SystemTap is a tool used to gather rich information about a running + system through the use of scripts. Starting from v2.4, the front-end + application stap can use libvirt to gather data within virtual + machines. + </dd> </dl> <h2><a name="configmgmt">Configuration Management</a></h2> -- 1.8.3.1

2 1

[libvirt] [PATCH] test driver: add support for .connectBaselineCPU
by Giuseppe Scrivano 06 Nov '13

06 Nov '13

It uses the same functionalities of the qemu driver. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/test/test_driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c2e530e..2678247 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1512,6 +1512,21 @@ static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, return 32; } +static char * +testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, + const char **xmlCPUs, + unsigned int ncpus, + unsigned int flags) +{ + char *cpu; + + virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, NULL); + + cpu = cpuBaselineXML(xmlCPUs, ncpus, NULL, 0, flags); + + return cpu; +} + static int testNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) { @@ -7177,6 +7192,8 @@ static virDriver testDriver = { .domainSnapshotCreateXML = testDomainSnapshotCreateXML, /* 1.1.4 */ .domainRevertToSnapshot = testDomainRevertToSnapshot, /* 1.1.4 */ .domainSnapshotDelete = testDomainSnapshotDelete, /* 1.1.4 */ + + .connectBaselineCPU = testConnectBaselineCPU, /* 1.1.5 */ }; static virNetworkDriver testNetworkDriver = { -- 1.8.3.1

2 1

[libvirt] [PATCH]docs: fix a typo in formatnwfilter
by Chen Hanxiao 06 Nov '13

06 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/fragement/fragment Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/formatnwfilter.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index ec20300..c5ab68d 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -1827,7 +1827,7 @@ initiate a connection from TCP port 80 back towards the VM. By default the connection state match that enables connection tracking and then enforcement of directionality of traffic is turned on. <br/> - The following shows an example XML fragement where this feature has been + The following shows an example XML fragment where this feature has been turned off for incoming connections to TCP port 12345. </p> <pre> -- 1.8.2.1

3 2

[libvirt] ANNOUNCE: libvirt 1.1.3.1 maintenance release
by Cole Robinson 06 Nov '13

06 Nov '13

libvirt 1.1.3.1 maintenance release is now available. This is libvirt 1.1.3 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.1.3.1.tar.gz Changes in this version: * Push RPM deps down into libvirt-daemon-driver-XXXX sub-RPMs * Fix race condition reconnecting to vms & loading configs * Fix leak of objects when reconnecting to QEMU instances * Don't update dom->persistent without lock held * Block all use of libvirt.so in setuid programs * Remove (nearly) all use of getuid()/getgid() * Add stub getegid impl for platforms lacking it * Don't allow remote driver daemon autostart when running setuid * Only allow the UNIX transport in remote driver when setuid * Block all use of getenv with syntax-check * Remove all direct use of getenv * Make virCommand env handling robust in setuid env * Initialize threading & error layer in LXC controller * Fix flaw in detecting log format * Move virt-login-shell into libvirt-login-shell sub-RPM * Set a sane $PATH for virt-login-shell * remote: fix regression in event deregistration * python: Fix Create*WithFiles filefd passing * build: fix build of virt-login-shell on systems with older gnutls * build: fix linking virt-login-shell * Don't link virt-login-shell against libvirt.so (CVE-2013-4400) * Close all non-stdio FDs in virt-login-shell (CVE-2013-4400) * Only allow 'stderr' log output when running setuid (CVE-2013-4400) * Add helpers for getting env vars in a setuid environment * Fix perms for virConnectDomainXML{To,From}Native (CVE-2013-4401) * build: Add lxc testcase to dist list * Convert uuid to a string before printing it * LXC: Fix handling of RAM filesystem size units * qemuMonitorJSONSendKey: Avoid double free * rpc: fix getsockopt for LOCAL_PEERCRED on Mac OS X * Remove use of virConnectPtr from all remaining nwfilter code * Don't pass virConnectPtr in nwfilter 'struct domUpdateCBStruct' * Remove virConnectPtr arg from virNWFilterDefParse * qemu: cgroup: Fix crash if starting nographics guest * virNetDevBandwidthEqual: Make it more robust * qemu_hotplug: Allow QoS update in qemuDomainChangeNet * Adjust legacy max payload size to account for header information For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.0.5.7 maintenance release
by Cole Robinson 06 Nov '13

06 Nov '13

libvirt 1.0.5.7 maintenance release is now available. This is libvirt 1.0.5 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.0.5.7.tar.gz Changes in this version: * qemuSetupMemoryCgroup: Handle hard_limit properly * qemu: Drop qemuDomainMemoryLimit * remote: fix regression in event deregistration * virsh: Fix debugging * Fix URI connect precedence * virDomainDefParseXML: set the argument of virBitmapFree to NULL after calling virBitmapFree * build: Add lxc testcase to dist list * LXC: Fix handling of RAM filesystem size units * qemuMonitorJSONSendKey: Avoid double free * virsh domjobinfo: Do not return 1 if job is NONE * Remove use of virConnectPtr from all remaining nwfilter code * Don't pass virConnectPtr in nwfilter 'struct domUpdateCBStruct' * Remove virConnectPtr arg from virNWFilterDefParse * virNetDevBandwidthEqual: Make it more robust * qemu_hotplug: Allow QoS update in qemuDomainChangeNet * qemu: Use "migratable" XML definition when doing external checkpoints * qemu: Fix checking of ABI stability when restoring external checkpoints * virsh: Fix regression of vol-resize For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH 0/3] Some qemu monitor crashers fix
by Michal Privoznik 06 Nov '13

06 Nov '13

The patches are pretty independent with each other. Michal Privoznik (3): qemu: Avoid double free of VM qemu: Don't access vm->priv on unlocked domain qemuMonitorDispose: Reset lastError src/qemu/qemu_migration.c | 9 +++++---- src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_process.c | 9 --------- 3 files changed, 6 insertions(+), 13 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH] pci: properly handle out-of-order SRIOV virtual functions
by Laine Stump 06 Nov '13

06 Nov '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1025397 When libvirt creates the list of an SRIOV Physical Function's (PF) Virtual Functions (VF), it assumes that the order of "virtfn*" links returned by readdir() from the PF's sysfs directory is already in the correct order. Experience has shown that this is not always the case. This results in 1) incorrect assumptions made by consumers of the output of the virt_functions list of virsh nodedev-dumpxml, and 2) setting MAC address and vlan tag on the wrong VF (since libvirt uses netlink to set mac address and vlan tag, netlink requires the VF#, and the function virPCIGetVirtualFunctionIndex() returns the wrong index due to the improperly ordered VF list). See the bugzilla report for an example of this improper behavior. The solution provided by this patch is for virPCIGetVirtualFunctions to first gather all the "virtfn*" names from the PFs sysfs directory, then allocate a virtual_functions array large enough to hold all entries, and finally to create a device entry for each virtfn* name and place it into the virtual_functions array at the proper index (based on interpreting the value following "virtfn" in the name). Checks are introduced to ensure that 1) the virtfn list given in sysfs is not sparse (ie, there are no indexes larger than the length of the list), and that no two virtfn* entries decode to the same index. --- I briefly debated solving this problem by changing the virtual_functions array from being just a list of PCI device addresses into being an array of new objects that have both a PCI address and a virtual function index. I decided against it because it would have modified the XML format and required more substantial changes to other parts of the code (and anyway is unnecessary, since the virtual function array is never "sparse", so it can be appropriately represented by implying the virtual function index from a device's position in the list). src/util/virpci.c | 91 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 25 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 148631f..e70fa3d 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2379,6 +2379,8 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path, return ret; } +static const char *virtfnPrefix = "virtfn"; + /* * Returns virtual functions of a physical function */ @@ -2393,6 +2395,8 @@ virPCIGetVirtualFunctions(const char *sysfs_path, struct dirent *entry = NULL; char *device_link = NULL; char errbuf[64]; + char **virtfnNames = NULL; + size_t nVirtfnNames = 0; VIR_DEBUG("Attempting to get SR IOV virtual functions for device" "with sysfs path '%s'", sysfs_path); @@ -2411,51 +2415,88 @@ virPCIGetVirtualFunctions(const char *sysfs_path, while ((entry = readdir(dir))) { if (STRPREFIX(entry->d_name, "virtfn")) { - virPCIDeviceAddress *config_addr = NULL; + char *tempName; - if (virBuildPath(&device_link, sysfs_path, entry->d_name) == -1) { - virReportOOMError(); + /* save these to sort into virtual_functions array */ + if (VIR_STRDUP(tempName, entry->d_name) < 0) + goto error; + if (VIR_APPEND_ELEMENT(virtfnNames, nVirtfnNames, tempName) < 0) { + VIR_FREE(tempName); goto error; } + } + } - VIR_DEBUG("Number of virtual functions: %d", - *num_virtual_functions); + /* pre-allocate because we will be filling in out of order */ + if (nVirtfnNames && VIR_ALLOC_N(*virtual_functions, nVirtfnNames) < 0) + goto error; + *num_virtual_functions = nVirtfnNames; - if (virPCIGetDeviceAddressFromSysfsLink(device_link, - &config_addr) != - SRIOV_FOUND) { - VIR_WARN("Failed to get SRIOV function from device " - "link '%s'", device_link); - VIR_FREE(device_link); - continue; - } + for (i = 0; i < nVirtfnNames; i++) { + virPCIDeviceAddress *config_addr = NULL; + unsigned int virtfnIndex; - if (VIR_REALLOC_N(*virtual_functions, - *num_virtual_functions + 1) < 0) { - VIR_FREE(config_addr); - goto error; - } + if (virBuildPath(&device_link, sysfs_path, virtfnNames[i]) < 0) { + virReportOOMError(); + goto error; + } + + if (virStrToLong_ui(virtfnNames[i] + strlen(virtfnPrefix), + 0, 10, &virtfnIndex) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid virtual function link name '%s' " + "in physical function directory '%s'"), + virtfnNames[i], sysfs_path); + goto error; + } + + if (virtfnIndex >= nVirtfnNames) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Virtual function link name '%s' larger than " + "total count of virtual functions %zu " + "in physical function directory '%s'"), + virtfnNames[i], nVirtfnNames, sysfs_path); + goto error; + } - (*virtual_functions)[*num_virtual_functions] = config_addr; - (*num_virtual_functions)++; + if ((*virtual_functions)[virtfnIndex]) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Virtual function link name '%s' " + "generates duplicate index %zu " + "in physical function directory '%s'"), + virtfnNames[i], nVirtfnNames, sysfs_path); + goto error; + } + + if (virPCIGetDeviceAddressFromSysfsLink(device_link, &config_addr) != + SRIOV_FOUND) { + VIR_WARN("Failed to get SRIOV function from device link '%s'", + device_link); VIR_FREE(device_link); + continue; } + + VIR_DEBUG("Found virtual function %d", virtfnIndex); + (*virtual_functions)[virtfnIndex] = config_addr; + VIR_FREE(device_link); } + VIR_DEBUG("Number of virtual functions: %d", *num_virtual_functions); ret = 0; cleanup: + for (i = 0; i < nVirtfnNames; i++) + VIR_FREE(virtfnNames[i]); + VIR_FREE(virtfnNames); VIR_FREE(device_link); if (dir) closedir(dir); return ret; error: - if (*virtual_functions) { - for (i = 0; i < *num_virtual_functions; i++) - VIR_FREE((*virtual_functions)[i]); - VIR_FREE(*virtual_functions); - } + for (i = 0; i < *num_virtual_functions; i++) + VIR_FREE((*virtual_functions)[i]); + VIR_FREE(*virtual_functions); goto cleanup; } -- 1.8.3.1

2 2

[libvirt] Live migration for containers - Was "RE: libvirt support for LXC"
by Christian Benvenuti (benve) 06 Nov '13

06 Nov '13

Hello, based on the 3D below, it seems that the most logical way to add support for container live migration to libvirt is to integrate the latter with CRIU. If I understand it correctly, Daniel's suggestion below would be that of - 1st converting CRIU to a library - 2nd making libvirt use that library to C/R the container/s CRIU has recently announced support for CRIU as a service and the reason why they opted for a service instead of a library [1] seems to be associated with a use case they had: ability for an application to invoke a self-dump C/R In Libvirt's case it would not be the container to ask for a self dump, but it would be libvirt itself to orchestrate it. In light of the new CRIU as a service feature, is libvirt's preference still that of using a library? Would a service be equally good? Is there anyone actively working or looking at this (libvirt+CRIU)? Thanks /Chris [1] CRIU: Time and Space Travel Service for Linux Applications http://www.youtube.com/watch?v=R2Net9eItBc @37'10'' - CRIU as a system service > -----Original Message----- > From: libvir-list-bounces(a)redhat.com [mailto:libvir-list- > bounces(a)redhat.com] On Behalf Of Dmitry Guryanov > Sent: Wednesday, February 13, 2013 2:58 AM > To: Daniel P. Berrange > Cc: libvir-list(a)redhat.com; criu(a)openvz.org; Kunal Kushwaha > Subject: Re: [libvirt] libvirt support for LXC > > On 130207 15:19:08, Daniel P. Berrange wrote: > > On Thu, Feb 07, 2013 at 03:51:52PM +0530, Kunal Kushwaha wrote: > > > Hi, > > > > > > I am new to this community and am not much aware of current status > > > libvirt work for LXC. > > > > > > Currently I am evaluating LXC with libvirt. > > > and I found still many features like checkpoint/restore/live > > > migration , > > > > Checkpoint/restore/migration is something we'd have to delegate to the > > CRIU code (http://criu.org/LXC) I'm not sure how easy that is todo > > though, since CRIU code is not a nicely reusable library, it is a set > > of command line tools. This will need some investigation. I don't > > believe anyone is actively working on it. > > Please, feel free to contact CRIU development team > (https://lists.openvz.org/mailman/listinfo/criu) > > We are open for discussion and will help with integration.

3 2

[libvirt] [PATCH] virpcitst: Introduce testVirPCIDeviceReset
by Michal Privoznik 06 Nov '13

06 Nov '13

This addition, however, requires some refactoring to be done. First of all, to match the best practice we should detach the device prior resetting it. That's why testVirPCIDeviceDetach is detaching all devices within 0000:00:01.0 and 0000:00:03.0 range. Then, the brand new test will reset the 0000:00:02.0 device, so the last testVirPCIDeviceReattach can reattach all the devices back. In order to perform a PCI device reset, the dummy config file is not sufficient anymore and must be replaced with real PCI config (binary mess). Such config files are to be stored under tests/virpcitestdata/ and ought to have '.config' suffix. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- cfg.mk | 2 +- tests/virpcimock.c | 19 ++++- tests/virpcitest.c | 116 +++++++++++++++++++------------ tests/virpcitestdata/0000:00:01.0.config | Bin 0 -> 4096 bytes tests/virpcitestdata/0000:00:02.0.config | Bin 0 -> 256 bytes tests/virpcitestdata/0000:00:03.0.config | Bin 0 -> 4096 bytes 6 files changed, 91 insertions(+), 46 deletions(-) create mode 100644 tests/virpcitestdata/0000:00:01.0.config create mode 100644 tests/virpcitestdata/0000:00:02.0.config create mode 100644 tests/virpcitestdata/0000:00:03.0.config diff --git a/cfg.mk b/cfg.mk index ed47a9b..befd231 100644 --- a/cfg.mk +++ b/cfg.mk @@ -971,7 +971,7 @@ exclude_file_name_regexp--sc_prohibit_close = \ (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c|tests/vir(cgroup|pci)mock\.c)$$) exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ - (^tests/(qemuhelp|nodeinfo)data/|\.(gif|ico|png|diff)$$) + (^tests/(qemuhelp|nodeinfo|virpcitest)data/|\.(gif|ico|png|diff)$$) _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon) exclude_file_name_regexp--sc_prohibit_fork_wrappers = \ diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 2944780..b0b9457 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -302,9 +302,12 @@ pci_device_new_from_stub(const struct pciDevice *data) { struct pciDevice *dev; char *devpath; + char *configSrc, *configDst; char tmp[32]; + struct stat sb; if (VIR_ALLOC_QUIET(dev) < 0 || + virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_builddir, data->id) < 0 || virAsprintfQuiet(&devpath, "%s/devices/%s", fakesysfsdir, data->id) < 0) ABORT_OOM(); @@ -313,7 +316,21 @@ pci_device_new_from_stub(const struct pciDevice *data) if (virFileMakePath(devpath) < 0) ABORT("Unable to create: %s", devpath); - make_file(devpath, "config", "some dummy config"); + /* If there is a config file for the device within virpcitestdata dir, + * symlink it. Otherwise create a dummy config file. */ + if ((realstat && realstat(configSrc, &sb) == 0) || + (real__xstat && real__xstat(_STAT_VER, configSrc, &sb) == 0)) { + /* On success make symlink to @configSrc */ + if (virAsprintfQuiet(&configDst, "%s/config", devpath) < 0) + ABORT_OOM(); + + if (symlink(configSrc, configDst) < 0) + ABORT("Unable to create symlink: %s", configDst); + } else { + /* If there's no config data in the virpcitestdata dir, create a dummy + * config file */ + make_file(devpath, "config", "some dummy config"); + } if (snprintf(tmp, sizeof(tmp), "0x%.4x", dev->vendor) < 0) ABORT("@tmp overflow"); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index d301a94..5fe6d49 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -61,7 +61,7 @@ cleanup: if ((count = virPCIDeviceListCount(list)) != cnt) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ "Unexpected count of items in " #list ": %d, " \ - "expecting " #cnt, count); \ + "expecting %zu", count, (size_t) cnt); \ goto cleanup; \ } @@ -69,88 +69,112 @@ static int testVirPCIDeviceDetach(const void *oaque ATTRIBUTE_UNUSED) { int ret = -1; - virPCIDevicePtr dev = NULL, unbindedDev = NULL; + virPCIDevicePtr dev[] = {NULL, NULL, NULL}; + size_t i, nDev = ARRAY_CARDINALITY(dev); virPCIDeviceListPtr activeDevs = NULL, inactiveDevs = NULL; int count; - if (!(dev = virPCIDeviceNew(0, 0, 1, 0)) || - !(unbindedDev = virPCIDeviceNew(0, 0, 3, 0)) || - !(activeDevs = virPCIDeviceListNew()) || + if (!(activeDevs = virPCIDeviceListNew()) || !(inactiveDevs = virPCIDeviceListNew())) goto cleanup; CHECK_LIST_COUNT(activeDevs, 0); CHECK_LIST_COUNT(inactiveDevs, 0); - if (virPCIDeviceSetStubDriver(dev, "pci-stub") < 0 || - virPCIDeviceSetStubDriver(unbindedDev, "pci-stub") < 0) - goto cleanup; + for (i = 0; i < nDev; i++) { + if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0)) || + virPCIDeviceSetStubDriver(dev[i], "pci-stub") < 0) + goto cleanup; - if (virPCIDeviceDetach(dev, activeDevs, inactiveDevs) < 0) - goto cleanup; + if (virPCIDeviceDetach(dev[i], activeDevs, inactiveDevs) < 0) + goto cleanup; - CHECK_LIST_COUNT(activeDevs, 0); - CHECK_LIST_COUNT(inactiveDevs, 1); + CHECK_LIST_COUNT(activeDevs, 0); + CHECK_LIST_COUNT(inactiveDevs, i + 1); + } + + ret = 0; +cleanup: + for (i = 0; i < nDev; i++) + virPCIDeviceFree(dev[i]); + virObjectUnref(activeDevs); + virObjectUnref(inactiveDevs); + return ret; +} - if (virPCIDeviceDetach(unbindedDev, activeDevs, inactiveDevs) < 0) +static int +testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUSED) +{ + int ret = -1; + virPCIDevicePtr dev[] = {NULL, NULL, NULL}; + size_t i, nDev = ARRAY_CARDINALITY(dev); + virPCIDeviceListPtr activeDevs = NULL, inactiveDevs = NULL; + int count; + + if (!(activeDevs = virPCIDeviceListNew()) || + !(inactiveDevs = virPCIDeviceListNew())) goto cleanup; CHECK_LIST_COUNT(activeDevs, 0); - CHECK_LIST_COUNT(inactiveDevs, 2); + CHECK_LIST_COUNT(inactiveDevs, 0); + + for (i = 0; i < nDev; i++) { + if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0)) || + virPCIDeviceSetStubDriver(dev[i], "pci-stub") < 0) + goto cleanup; + + if (virPCIDeviceReset(dev[i], activeDevs, inactiveDevs) < 0) + goto cleanup; + } ret = 0; cleanup: - virPCIDeviceFree(dev); - virPCIDeviceFree(unbindedDev); + for (i = 0; i < nDev; i++) + virPCIDeviceFree(dev[i]); virObjectUnref(activeDevs); virObjectUnref(inactiveDevs); return ret; } -# define FAKESYSFSDIRTEMPLATE abs_builddir "/fakesysfsdir-XXXXXX" - static int -testVirPCIDeviceReattach(const void *oaque ATTRIBUTE_UNUSED) +testVirPCIDeviceReattach(const void *opaque ATTRIBUTE_UNUSED) { int ret = -1; - virPCIDevicePtr dev = NULL, unbindedDev = NULL; + virPCIDevicePtr dev[] = {NULL, NULL, NULL}; + size_t i, nDev = ARRAY_CARDINALITY(dev); virPCIDeviceListPtr activeDevs = NULL, inactiveDevs = NULL; int count; - if (!(dev = virPCIDeviceNew(0, 0, 1, 0)) || - !(unbindedDev = virPCIDeviceNew(0, 0, 3, 0)) || - !(activeDevs = virPCIDeviceListNew()) || + if (!(activeDevs = virPCIDeviceListNew()) || !(inactiveDevs = virPCIDeviceListNew())) goto cleanup; - if (virPCIDeviceListAdd(inactiveDevs, dev) < 0) { - virPCIDeviceFree(dev); - virPCIDeviceFree(unbindedDev); - goto cleanup; - } - - if (virPCIDeviceListAdd(inactiveDevs, unbindedDev) < 0) { - virPCIDeviceFree(unbindedDev); - goto cleanup; - } + for (i = 0; i < nDev; i++) { + if (!(dev[i] = virPCIDeviceNew(0, 0, i + 1, 0))) + goto cleanup; - CHECK_LIST_COUNT(activeDevs, 0); - CHECK_LIST_COUNT(inactiveDevs, 2); + if (virPCIDeviceListAdd(inactiveDevs, dev[i]) < 0) { + virPCIDeviceFree(dev[i]); + goto cleanup; + } - if (virPCIDeviceSetStubDriver(dev, "pci-stub") < 0) - goto cleanup; + CHECK_LIST_COUNT(activeDevs, 0); + CHECK_LIST_COUNT(inactiveDevs, i + 1); - if (virPCIDeviceReattach(dev, activeDevs, inactiveDevs) < 0) - goto cleanup; + if (virPCIDeviceSetStubDriver(dev[i], "pci-stub") < 0) + goto cleanup; + } CHECK_LIST_COUNT(activeDevs, 0); - CHECK_LIST_COUNT(inactiveDevs, 1); + CHECK_LIST_COUNT(inactiveDevs, nDev); - if (virPCIDeviceReattach(unbindedDev, activeDevs, inactiveDevs) < 0) - goto cleanup; + for (i = 0; i < nDev; i++) { + if (virPCIDeviceReattach(dev[i], activeDevs, inactiveDevs) < 0) + goto cleanup; - CHECK_LIST_COUNT(activeDevs, 0); - CHECK_LIST_COUNT(inactiveDevs, 0); + CHECK_LIST_COUNT(activeDevs, 0); + CHECK_LIST_COUNT(inactiveDevs, nDev - i - 1); + } ret = 0; cleanup: @@ -158,6 +182,9 @@ cleanup: virObjectUnref(inactiveDevs); return ret; } + +# define FAKESYSFSDIRTEMPLATE abs_builddir "/fakesysfsdir-XXXXXX" + static int mymain(void) { @@ -184,6 +211,7 @@ mymain(void) DO_TEST(testVirPCIDeviceNew); DO_TEST(testVirPCIDeviceDetach); + DO_TEST(testVirPCIDeviceReset); DO_TEST(testVirPCIDeviceReattach); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) diff --git a/tests/virpcitestdata/0000:00:01.0.config b/tests/virpcitestdata/0000:00:01.0.config new file mode 100644 index 0000000000000000000000000000000000000000..2de3f8effb1e87a572d644ce6da0c60ed5527387 GIT binary patch literal 4096 zcmZo`uyA5y6<{!BXkZdxU|?WjaQFnIu!6P*K|zqj38*YLBUWVtBFK0_8RRTp)(4FY zJOU5?fgEwsk%2*gfsx@rAA^7ZhX8}%95x0gMnRA_;ee5WQ3S>jRA7TJ6<{KSX=b4L zUjp*~|G%z6Sn;Te(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7@!aU07AtR An*aa+ literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0000:00:02.0.config b/tests/virpcitestdata/0000:00:02.0.config new file mode 100644 index 0000000000000000000000000000000000000000..f60b222017d5b4a3d96e776d2c1a02c41849660e GIT binary patch literal 256 zcmZo`aARO+nZUrrz`)D^1S|{;pFlJZ1H%On%_spPAz+nwlp=^V0m|oQWMJTA;9*ot zRAlG?it&q!i!(3;FmpoXfz&<*1}31<!~@m~j0`*<9{gMA2+<=bD99kpzy@@iNP;Sh ll>yu&9HufZQGzRBV1y_FI+KB+0U-=xt>%|tka$qO8vvZn5}5!1 literal 0 HcmV?d00001 diff --git a/tests/virpcitestdata/0000:00:03.0.config b/tests/virpcitestdata/0000:00:03.0.config new file mode 100644 index 0000000000000000000000000000000000000000..8c1d6e7aaa0ffb0e1d2d0f6e80480fbffccee4e6 GIT binary patch literal 4096 zcmZn=RC>Y2D8RtTz{(-O(7?dJ5by~|U<IqhjTJ!>0Z>_PMhGJzu?fmzU|_9ifXbp$ zf)x-xOd(?f^FIa$1{;vg2mViB70}>h5X@m`bYc_~0I58{jH(~R1KH1lB)kB`HUMIv z<AEfX5r~fpCT=o%0JhQrDsI5=4{W{!0|OICh>3x*0V)Nj{xg6B0?r?0jE2By2#kin xXb6mkz;FuzMquR$1BME03=9fD9uO}8Qlnrr1V%$(Gz3ONU^E0qLtuD@005R_7jpmr literal 0 HcmV?d00001 -- 1.8.1.5

2 2

[libvirt] [PATCH]lxc: add debug logs when dst for mounting does not exist
by Chen Hanxiao 06 Nov '13

06 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> We automatically create dir when dst for mounting does not exist. Add debug log for it. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index e8f7a75..570dc1d 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1085,6 +1085,7 @@ static int lxcContainerMountFSBind(virDomainFSDefPtr fs, src); goto cleanup; } + VIR_DEBUG("dst '%s' not found, create it in container for mounting", fs->dst); if (S_ISDIR(st.st_mode)) { if (virFileMakePath(fs->dst) < 0) { virReportSystemError(errno, -- 1.8.2.1

1 0

[libvirt] GenericVmConfigFault - Unable to allocate a PCI SCSI adapter. Too many PCI devices are already configured.
by Andrew Holway 06 Nov '13

06 Nov '13

Hello, I am trying to create virtual machines on a VMware ESXi 5.5.0 build-1331820 with Virsh 1.1.4 on Fedora 19. I see the following. Can anyone show me where I am going wrong or perhaps suggest a more sensible way of spawning virtual machines on ESXi with libvirt. Thanks, Andrew [aholway@libvirt ~]$ virsh --connect esx://10.51.3.59/?no_verify=1 virsh # vol-list --pool "datastore1 (1)" Name Path ----------------------------------------- VM001/VM001.vmdk [datastore1 (1)] VM001/VM001.vmdk VM002/VM002.vmdk [datastore1 (1)] VM002/VM002.vmdk virsh # vol-clone --pool "datastore1 (1)" VM001/VM001.vmdk VM003/VM003.vmdk Vol VM003/VM003.vmdk cloned from VM001/VM001.vmdk virsh # define domain.xml Domain VM003 defined from domain.xml virsh # start VM003 error: Failed to start domain VM003 error: internal error: Could not start domain: GenericVmConfigFault - Unable to allocate a PCI SCSI adapter. Too many PCI devices are already configured. #### domain.xml #### <domain type='vmware'> <name>VM003</name> <memory unit='KiB'>2097152</memory> <currentMemory unit='KiB'>2097152</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='x86_64'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> <source file='[datastore1 (1)] VM003/VM003.vmdk'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='scsi' index='0' model='vmpvscsi'/> <interface type='bridge'> <mac address='00:50:56:8c:32:65'/> <source bridge='10G'/> <model type='vmxnet3'/> </interface> <video> <model type='vmvga' vram='4096'/> </video> </devices> </domain> #### VM003.vmdk #### # Disk DescriptorFile version=1 encoding="UTF-8" CID=fffffffe parentCID=ffffffff isNativeSnapshot="no" createType="vmfs" # Extent description RW 33554432 VMFS "VM003-flat.vmdk" # The Disk Data Base #DDB ddb.adapterType = "lsilogic" ddb.deletable = "true" ddb.geometry.cylinders = "2088" ddb.geometry.heads = "255" ddb.geometry.sectors = "63" ddb.longContentID = "1a5627c7a84f812eeec7f9aafffffffe" ddb.uuid = "60 00 C2 9a 31 de b1 1d-ca 50 4c c2 1a 1a 7d ab" ddb.virtualHWVersion = "8" #### VM003.vmx #### .encoding = "UTF-8" config.version = "8" virtualHW.version = "8" guestOS = "other-64" uuid.bios = "07 fd ba 3e 47 fb 49 00-ae 2f f0 26 04 90 ee e2" displayName = "VM003" memsize = "2048" numvcpus = "1" scsi0.present = "true" scsi0.virtualDev = "pvscsi" scsi0:0.present = "true" scsi0:0.deviceType = "scsi-hardDisk" scsi0:0.fileName = "/vmfs/volumes/527267fd-20e8ff06-e667-7845c4faefd1/VM003/VM003.vmdk" ethernet0.present = "true" ethernet0.virtualDev = "vmxnet3" ethernet0.networkName = "10G" ethernet0.connectionType = "bridged" ethernet0.addressType = "vpx" ethernet0.generatedAddress = "00:50:56:8c:32:65" svga.vramSize = "4194304" extendedConfigFile = "VM003.vmxf" virtualHW.productCompatibility = "hosted" floppy0.present = "FALSE" floppy1.present = "FALSE" sched.swap.derivedName = "/vmfs/volumes/527267fd-20e8ff06-e667-7845c4faefd1/VM003/VM003-42cd42fb.vswp" uuid.location = "56 4d 21 b1 88 3d de 7e-5e 33 79 e2 70 ac ac 91" replay.supported = "FALSE" replay.filename = "" scsi0:0.redo = "" scsi0.pciSlotNumber = "21" ethernet0.pciSlotNumber = "22" vc.uuid = "50 0c f8 80 50 18 27 e2-ef 43 8d 60 66 e7 48 a1"

1 0

[libvirt] [PATCH] virt-login-shell: also build virAtomic.h
by Guido Günther 05 Nov '13

05 Nov '13

Needed for architectures that don't use gcc atomic ops but pthread. This fixes the armel build that otherwise breaks like: CCLD virt-login-shell ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virClassNew': /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:150: undefined reference to `virAtomicLock' ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virObjectNew': /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:202: undefined reference to `virAtomicLock' ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virObjectUnref': /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:274: undefined reference to `virAtomicLock' ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-virobject.o): In function `virObjectRef': /«PKGBUILDDIR»/debian/build/src/../../../src/util/virobject.c:295: undefined reference to `virAtomicLock' collect2: error: ld returned 1 exit status See https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=armel&ver=1.1.4… --- src/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 21b9caf..ad39b74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1982,6 +1982,8 @@ noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la libvirt_setuid_rpc_client_la_SOURCES = \ util/viralloc.c \ + util/viratomic.c \ + util/viratomic.h \ util/virbitmap.c \ util/virbuffer.c \ util/vircommand.c \ -- 1.8.4.2

2 2

[libvirt] [PATCHv2 00/10] Strip libnuma functions from nodeinfo.c
by Peter Krempa 05 Nov '13

05 Nov '13

As a pre-requisite for doing unit tests for topology detection code the code in nodeinfo.c needs to be cleaned up. Peter Krempa (10): nodeinfo: Rename linuxNodeInfoCPUPopulate and export it properly numa: Introduce virNumaIsAvailable and use it instead of numa_available nodeinfo: Avoid forward declarations of static functions numa: Introduce virNumaGetMaxNode and use it instead of numa_max_node numa: Introduce virNumaGetNodeMemory and use it instead of numa_node_size64 nodeinfo: Get rid of nodeGetCellMemory numa: Replace NUMA_MAX_N_CPUS macro with virNumaGetMaxCPUs() caps: Fix function docs for virCapabilitiesAddHostNUMACell numa: Add wrapper of numa_node_to_cpus and use it nodeinfo: Remove libnuma include src/conf/capabilities.c | 1 + src/libvirt_linux.syms | 2 +- src/libvirt_private.syms | 3 + src/nodeinfo.c | 222 +++++++++++++---------------------------------- src/nodeinfo.h | 5 ++ src/util/virnuma.c | 221 +++++++++++++++++++++++++++++++++++++++++++++- src/util/virnuma.h | 11 +++ tests/nodeinfotest.c | 6 +- 8 files changed, 304 insertions(+), 167 deletions(-) -- 1.8.3.2

4 24

[libvirt] [PATCH] storage: recognize gluster as networked file
by Eric Blake 05 Nov '13

05 Nov '13

A qcow2 file with a backing file of 'gluster://host/vol/file' should not try to look for a directory named './gluster:/' in the file system. * src/util/virstoragefile.c (virBackingStoreIsFile): Broaden check to include all protocols. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This one will be important to my work on gluster backing chains, but can be reviewed and applied independently now. src/util/virstoragefile.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 1b4d4cf..8f04b78 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -671,8 +671,13 @@ virStorageFileMatchesVersion(int format, static bool virBackingStoreIsFile(const char *backing) { - /* Backing store is a network block device or Rados block device */ - if (STRPREFIX(backing, "nbd:") || STRPREFIX(backing, "rbd:")) + char *colon = strchr(backing, ':'); + char *slash = strchr(backing, '/'); + + /* Reject anything that looks like a protocol (such as nbd: or + * rbd:); if someone really does want a relative file name that + * includes ':', they can always prefix './'. */ + if (colon && (!slash || colon < slash)) return false; return true; } -- 1.8.3.1

2 3

[libvirt] [PATCH] virpcitest: Fix variable arguments using in pci_driver_new
by Michal Privoznik 05 Nov '13

05 Nov '13

In the pci_driver_new function it is possible to set a list of <vendor:device> IDs that the driver knows. These IDs are passed as variable arguments and are processed the usual way using va_start() and va_arg(). However, after all arguments has been processed, we should call va_end() what we aren't currently doing. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/virpcimock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 2944780..9385d2c 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -405,6 +405,8 @@ pci_driver_new(const char *name, ...) driver->len++; } + va_end(args); + make_file(driverpath, "bind", NULL); make_file(driverpath, "unbind", NULL); make_file(driverpath, "new_id", NULL); -- 1.8.1.5

2 1

[libvirt] [PATCH] network: fix connections count in case of allocate failure
by Laine Stump 05 Nov '13

05 Nov '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1020135 If networkAllocateActualDevice() had failed due to a pool of hostdev or direct devices being depleted, the calling function could still call networkReleaseActualDevice() as part of its cleanup, and that function would then unconditionally decrement the connections count for the network, even though it hadn't been incremented (due to failure of allocate). This *was* necessary because the .actual member of the netdef was allocated with a "lazy" algorithm, only being created if there was a need to store data there (e.g. if a device was allocated from a pool, or bandwidth was allocated for the device), so there was no simple way for networkReleaseActualDevice() to tell if something really had been allocated (i.e. if "connections++" had been executed). This patch changes networkAllocateDevice() to *always* allocate an actual device for any netdef of type='network', even if it isn't needed for any other reason. This has no ill effects anywhere else in the code (except for using a small amount of memory), and networkReleaseActualDevice() can then determine if there was a previous successful allocate by checking for .actual != NULL (if not, it skips the "connections--"). --- src/network/bridge_driver.c | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3ce3130..41edb97 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3151,6 +3151,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) } netdef = network->def; + if (VIR_ALLOC(iface->data.network.actual) < 0) + goto error; + /* portgroup can be present for any type of network, in particular * for bandwidth information, so we need to check for that and * fill it in appropriately for all forward types. @@ -3167,14 +3170,9 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) else if (portgroup && portgroup->bandwidth) bandwidth = portgroup->bandwidth; - if (bandwidth) { - if (!iface->data.network.actual && - VIR_ALLOC(iface->data.network.actual) < 0) - goto error; - if (virNetDevBandwidthCopy(&iface->data.network.actual->bandwidth, - bandwidth) < 0) - goto error; - } + if (bandwidth && virNetDevBandwidthCopy(&iface->data.network.actual->bandwidth, + bandwidth) < 0) + goto error; /* copy appropriate vlan info to actualNet */ if (iface->vlan.nTags > 0) @@ -3184,13 +3182,8 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) else if (netdef->vlan.nTags > 0) vlan = &netdef->vlan; - if (vlan) { - if (!iface->data.network.actual && - VIR_ALLOC(iface->data.network.actual) < 0) - goto error; - if (virNetDevVlanCopy(&iface->data.network.actual->vlan, vlan) < 0) - goto error; - } + if (vlan && virNetDevVlanCopy(&iface->data.network.actual->vlan, vlan) < 0) + goto error; if ((netdef->forward.type == VIR_NETWORK_FORWARD_NONE) || (netdef->forward.type == VIR_NETWORK_FORWARD_NAT) || @@ -3199,8 +3192,7 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) *NETWORK; we just keep the info from the portgroup in * iface->data.network.actual */ - if (iface->data.network.actual) - iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_NETWORK; + iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_NETWORK; if (networkPlugBandwidth(network, iface) < 0) goto error; @@ -3212,10 +3204,6 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) * is VIR_DOMAIN_NET_TYPE_BRIDGE */ - if (!iface->data.network.actual && - VIR_ALLOC(iface->data.network.actual) < 0) - goto error; - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_BRIDGE; if (VIR_STRDUP(iface->data.network.actual->data.bridge.brname, netdef->bridge) < 0) @@ -3248,10 +3236,6 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) virDomainHostdevSubsysPciBackendType backend; - if (!iface->data.network.actual && - VIR_ALLOC(iface->data.network.actual) < 0) - goto error; - iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_HOSTDEV; if (netdef->forward.npfs > 0 && netdef->forward.nifs <= 0 && networkCreateInterfacePool(netdef) < 0) { @@ -3335,10 +3319,6 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) * VIR_DOMAIN_NET_TYPE_DIRECT. */ - if (!iface->data.network.actual && - VIR_ALLOC(iface->data.network.actual) < 0) - goto error; - /* Set type=direct and appropriate <source mode='xxx'/> */ iface->data.network.actual->type = actualType = VIR_DOMAIN_NET_TYPE_DIRECT; switch (netdef->forward.type) { @@ -3813,7 +3793,8 @@ networkReleaseActualDevice(virDomainNetDefPtr iface) } success: - netdef->connections--; + if (iface->data.network.actual) + netdef->connections--; VIR_DEBUG("Releasing network %s, %d connections", netdef->name, netdef->connections); ret = 0; -- 1.8.3.1

2 1

[libvirt] [PATCH v4] qemu: don't use deprecated -no-kvm-pit-reinjection
by Ján Tomko 05 Nov '13

05 Nov '13

Since qemu-kvm 1.1 [1] (since 1.3. in upstream QEMU [2]) '-no-kvm-pit-reinjection' has been deprecated. Use -global kvm-pit.lost_tick_policy=discard instead. https://bugzilla.redhat.com/show_bug.cgi?id=978719 [1] http://git.kernel.org/cgit/virt/kvm/qemu-kvm.git/commit/?id=4e4fa39 [2] http://git.qemu.org/?p=qemu.git;a=commitdiff;h=c21fb4f --- v4: check for the property of the kvm-pit device instead of just the kvm-pit device keep the NO_KVM_PIT capability v3: use -global instead of trying to add another -device v2: https://www.redhat.com/archives/libvir-list/2013-July/msg00821.html v1: https://www.redhat.com/archives/libvir-list/2013-July/msg00045.html src/qemu/qemu_capabilities.c | 7 ++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 14 +++++++++++ tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 14 +++++++++++ tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 14 +++++++++++ tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 14 +++++++++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 14 +++++++++++ tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 14 +++++++++++ .../qemuxml2argv-kvm-pit-delay.args | 5 ++++ .../qemuxml2argv-kvm-pit-delay.xml | 29 ++++++++++++++++++++++ .../qemuxml2argv-kvm-pit-device.args | 5 ++++ .../qemuxml2argv-kvm-pit-device.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 5 ++++ 20 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 17095b4..71a913b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -242,6 +242,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "usb-storage.removable", "virtio-mmio", "ich9-intel-hda", + "kvm-pit-lost-tick-policy", ); struct _virQEMUCaps { @@ -1458,6 +1459,10 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsUsbStorage[] = { { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE }, }; +static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsKVMPit[] = { + { "lost_tick_policy", QEMU_CAPS_KVM_PIT_TICK_POLICY }, +}; + struct virQEMUCapsObjectTypeProps { const char *type; struct virQEMUCapsStringFlags *props; @@ -1501,6 +1506,8 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = { ARRAY_CARDINALITY(virQEMUCapsObjectPropsQ35PciHost) }, { "usb-storage", virQEMUCapsObjectPropsUsbStorage, ARRAY_CARDINALITY(virQEMUCapsObjectPropsUsbStorage) }, + { "kvm-pit", virQEMUCapsObjectPropsKVMPit, + ARRAY_CARDINALITY(virQEMUCapsObjectPropsKVMPit) }, }; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f1faa76..02d47c6 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -197,6 +197,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ + QEMU_CAPS_KVM_PIT_TICK_POLICY = 159, /* kvm-pit.lost_tick_policy */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63e235d..e48c9c2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7993,11 +7993,15 @@ qemuBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: /* delay is the default if we don't have kernel (-no-kvm-pit), otherwise, the default is catchup. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLICY)) + virCommandAddArgList(cmd, "-global", + "kvm-pit.lost_tick_policy=discard", NULL); + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT)) virCommandAddArg(cmd, "-no-kvm-pit-reinjection"); break; case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLICY)) { /* do nothing - this is default for kvm-pit */ } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TDF)) { /* -tdf switches to 'catchup' with userspace pit. */ diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps index c580c0c..73a561d 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.caps @@ -111,4 +111,5 @@ <flag name='vnc-share-policy'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> + <flag name='kvm-pit-lost-tick-policy'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies index 96fe4f2..345c32b 100644 --- a/tests/qemucapabilitiesdata/caps_1.2.2-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.2.2-1.replies @@ -1394,6 +1394,20 @@ { "return": [ { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { "name": "xenpv" }, { diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps index 02ccc09..da15d8b 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.caps @@ -125,4 +125,5 @@ <flag name='dmi-to-pci-bridge'/> <flag name='usb-storage'/> <flag name='usb-storage.removable'/> + <flag name='kvm-pit-lost-tick-policy'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies index 1d033cb..63c18da 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.3.1-1.replies @@ -1553,6 +1553,20 @@ { "return": [ { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { "name": "xenpv" }, { diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps index 08e9c20..c419068 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.caps @@ -126,4 +126,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies index bcf202c..4fb4061 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.4.2-1.replies @@ -1600,6 +1600,20 @@ { "return": [ { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { "name": "xenpv" }, { diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps index 323ac82..09cf657 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.caps @@ -130,4 +130,5 @@ <flag name='usb-storage'/> <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies index 8ff17ce..686fa3e 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3-1.replies @@ -1674,6 +1674,20 @@ { "return": [ { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { "name": "pc-q35-1.4", "cpu-max": 255 }, diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps index 3587d45..33ee73b 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.caps @@ -134,4 +134,5 @@ <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies index 1b983d0..95e0c37 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0-1.replies @@ -1736,6 +1736,20 @@ { "return": [ { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { "name": "xenpv", "cpu-max": 1 }, diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps index 0bface5..a66034a 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.caps +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.caps @@ -133,4 +133,5 @@ <flag name='usb-storage.removable'/> <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> + <flag name='kvm-pit-lost-tick-policy'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies index ab78cb3..3ecf185 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.50-1.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.50-1.replies @@ -1700,6 +1700,20 @@ { "return": [ { + "name": "lost_tick_policy", + "type": "LostTickPolicy" + }, + { + "name": "iobase", + "type": "hex32" + } + ], + "id": "libvirt-26" +} + +{ + "return": [ + { "name": "xenpv", "cpu-max": 1 }, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args new file mode 100644 index 0000000..ca5823f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-kvm-pit-reinjection -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml new file mode 100644 index 0000000..7835a1b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'> + <timer name='pit' tickpolicy='delay'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args new file mode 100644 index 0000000..f03840f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-global kvm-pit.lost_tick_policy=discard -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml new file mode 100644 index 0000000..7835a1b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'> + <timer name='pit' tickpolicy='delay'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b14e713..a74ac2a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1103,6 +1103,11 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("kvm-pit-device", QEMU_CAPS_KVM_PIT_TICK_POLICY); + DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); + DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, + QEMU_CAPS_KVM_PIT_TICK_POLICY); + virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.5

2 2

[libvirt] [PATCH] Resolve Coverity issue regarding not checking return value
by John Ferlan 05 Nov '13

05 Nov '13

Coverity complains that the call to virPCIDeviceDetach() in qemuPrepareHostdevPCIDevices() doesn't check status return like other calls. Seems this just was lurking until a recent change to this module resulted in Coverity looking harder and finding the issue. Introduced by 'a4efb2e33' when function was called 'pciReAttachDevice()' Just added a ignore_value() since it doesn't appear to matter if the call fails since we're on a failure path already. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_hostdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 57ab28c..f5cad15 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -819,7 +819,8 @@ reattachdevs: /* NB: This doesn't actually re-bind to original driver, just * unbinds from the stub driver */ - virPCIDeviceReattach(dev, driver->activePciHostdevs, NULL); + ignore_value(virPCIDeviceReattach(dev, driver->activePciHostdevs, + NULL)); } cleanup: -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/5] Test our PCI device handling functions
by Michal Privoznik 05 Nov '13

05 Nov '13

The 4/5 is actually fix for a bug, Michal Privoznik (5): tests: Introduce virpcitest virpcitest: Test virPCIDeviceDetach virpcitest: Introduce testVirPCIDeviceReattach virpci: Don't error on not binded devices virpcitest: Introduce check for unbinded devices .gitignore | 1 + cfg.mk | 4 +- src/util/virpci.c | 12 +- tests/Makefile.am | 21 +- tests/virpcimock.c | 913 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/virpcitest.c | 204 ++++++++++++ 6 files changed, 1148 insertions(+), 7 deletions(-) create mode 100644 tests/virpcimock.c create mode 100644 tests/virpcitest.c -- 1.8.1.5

6 15

[libvirt] PATCH: pci-subsystem: ixgbe: SR-IOV: kernel way to order driver's virtfn -entries is odd causing libvirt failures.
by Niilona 05 Nov '13

05 Nov '13

Hi. As Bjorn Helgaas recommend, this might be the item to discuss in the wider area. ----------------------------------- There is a behavior effecting virtfn -entries in sysfs, when amount of them increases over 10. Run VM's through LIBVIRT -> QEMU/KVM, this causes : - MAC address setting by LIBVIRT disordered ie. setting targeted to wrong VF. - VLAN setting by LIBVIRT overall failed Basics of this are in "/libvirt-x.x.x/src/util/virpci.c" ; in function below, which don't order virtfn entries correctly. /* * Returns virtual functions of a physical function */ int virPCIGetVirtualFunctions(const char *sysfs_path, virPCIDeviceAddressPtr **virtual_functions, unsigned int *num_virtual_functions) { But I let you to decide which is best way to fix this, as if every application reads "virtfn" entries from PF's directory, they all need to sort entries in alphabet. order to avoid this influence. So personally I did get over this by adding pre-zeroes to names to have them in sorted order in PF's directory. ---------------------------- Tested : - kernel 3.8.0-21 - libvirt 1.0.2 & libvirt 1.1.3 - ixgbe 3.11.33-k, ixgbe 3.17-3 & ixgbe 3.18.7 After applying this MAC/VLAN seen to work and VM's get contacted using MAC's & VLAN's, which been checked using tcpdump. P.S. Tested with 3.8.0-21, but patch constructed against "https://github.com/torvalds/linux.git", so there is possibilty this works in latest kernel, but haven't checked it. At least ordering scheme seen in "iov.c" in same form as before. ----------------------------- >From fac886b86099dca1937730026da24c34857c4077 Mon Sep 17 00:00:00 2001 From: Niilo Minkkinen <niilo.minkkinen(a)tieto.com> Date: Wed, 23 Oct 2013 14:50:07 +0300 Subject: [PATCH 1/1] Fixes ordering of virtfn -entries on drivers with more than 10 entries ( virtfn0...virtfn9 ). This effects on drivers like Intel 82599 "ixgbe", which have max 31 VF's (Virtual Function) on one PF (Physical Function). Currently, ordering is "diffused", which in case causes MAC/VLAN -settings on libvirt based to PCI -addressing failed. Signed-off-by: Niilo Minkkinen <niilo.minkkinen(a)tieto.com> Signed-off-by: Tommy Varre <tommy.varre(a)tieto.com> --- drivers/pci/iov.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 21a7182..fbd1209 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -106,7 +106,7 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset) mutex_unlock(&iov->dev->sriov->lock); rc = pci_bus_add_device(virtfn); - sprintf(buf, "virtfn%u", id); + sprintf(buf, "virtfn%02u", id); rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf); if (rc) goto failed1; @@ -149,7 +149,7 @@ static void virtfn_remove(struct pci_dev *dev, int id, int reset) __pci_reset_function(virtfn); } - sprintf(buf, "virtfn%u", id); + sprintf(buf, "virtfn%02u", id); sysfs_remove_link(&dev->dev.kobj, buf); /* * pci_stop_dev() could have been called for this virtfn already, -- 1.8.1.2 ----------------------------- What you think ? Niilo Minkkinen niilo.minkkinen(a)tieto.com

3 3

[libvirt] [PATCH v3] qemu: don't use deprecated -no-kvm-pit-reinjection
by Ján Tomko 05 Nov '13

05 Nov '13

Since qemu-kvm 1.1 [1] (since 1.3. in upstream QEMU [2]) '-no-kvm-pit-reinjection' has been deprecated. Use -global kvm-pit.lost_tick_policy=discard instead. https://bugzilla.redhat.com/show_bug.cgi?id=978719 [1] http://git.kernel.org/cgit/virt/kvm/qemu-kvm.git/commit/?id=4e4fa39 [2] http://git.qemu.org/?p=qemu.git;a=commitdiff;h=c21fb4f --- v3: use -global instead of trying to add another -device re: https://www.redhat.com/archives/libvir-list/2013-July/msg00833.html Unsetting the QEMU_CAPS_NO_KVM_PIT capability for QEMU >1.2 seems to work okay with libvirtd upgrades. v2: https://www.redhat.com/archives/libvir-list/2013-July/msg00821.html v1: https://www.redhat.com/archives/libvir-list/2013-July/msg00045.html src/qemu/qemu_capabilities.c | 5 ++-- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++++-- .../qemuxml2argv-kvm-pit-delay.args | 5 ++++ .../qemuxml2argv-kvm-pit-delay.xml | 29 ++++++++++++++++++++++ .../qemuxml2argv-kvm-pit-device.args | 5 ++++ .../qemuxml2argv-kvm-pit-device.xml | 29 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 +++ 8 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index dc8f0be..06b71b5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -242,6 +242,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "usb-storage.removable", "virtio-mmio", "ich9-intel-hda", + "kvm-pit", ); struct _virQEMUCaps { @@ -1393,6 +1394,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE }, { "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO }, { "ich9-intel-hda", QEMU_CAPS_DEVICE_ICH9_INTEL_HDA }, + { "kvm-pit", QEMU_CAPS_DEVICE_KVM_PIT }, }; static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBlk[] = { @@ -2477,13 +2479,12 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, /* * Currently only x86_64 and i686 support PCI-multibus, - * -no-acpi and -no-kvm-pit-reinjection. + * -no-acpi */ if (qemuCaps->arch == VIR_ARCH_X86_64 || qemuCaps->arch == VIR_ARCH_I686) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } ret = 0; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index f8dc728..770744e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -197,6 +197,7 @@ enum virQEMUCapsFlags { QEMU_CAPS_USB_STORAGE_REMOVABLE = 156, /* usb-storage.removable */ QEMU_CAPS_DEVICE_VIRTIO_MMIO = 157, /* -device virtio-mmio */ QEMU_CAPS_DEVICE_ICH9_INTEL_HDA = 158, /* -device ich9-intel-hda */ + QEMU_CAPS_DEVICE_KVM_PIT = 159, /* -device kvm-pit */ QEMU_CAPS_LAST, /* this must always be the last item */ }; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ba102f4..c988646 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7966,11 +7966,15 @@ qemuBuildCommandLine(virConnectPtr conn, case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: /* delay is the default if we don't have kernel (-no-kvm-pit), otherwise, the default is catchup. */ - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT)) + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_KVM_PIT)) + virCommandAddArgList(cmd, "-global", + "kvm-pit.lost_tick_policy=discard", NULL); + else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT)) virCommandAddArg(cmd, "-no-kvm-pit-reinjection"); break; case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT)) { + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_KVM_PIT) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_KVM_PIT)) { /* do nothing - this is default for kvm-pit */ } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TDF)) { /* -tdf switches to 'catchup' with userspace pit. */ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args new file mode 100644 index 0000000..ca5823f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-no-kvm-pit-reinjection -no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml new file mode 100644 index 0000000..7835a1b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'> + <timer name='pit' tickpolicy='delay'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args new file mode 100644 index 0000000..f03840f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args @@ -0,0 +1,5 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m 214 -smp 2 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait \ +-global kvm-pit.lost_tick_policy=discard -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml new file mode 100644 index 0000000..7835a1b --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'> + <timer name='pit' tickpolicy='delay'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0b808a4..58eb3e9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1080,6 +1080,10 @@ mymain(void) QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST("kvm-pit-device", QEMU_CAPS_DEVICE_KVM_PIT); + DO_TEST("kvm-pit-delay", QEMU_CAPS_NO_KVM_PIT); + DO_TEST("kvm-pit-device", QEMU_CAPS_NO_KVM_PIT, QEMU_CAPS_DEVICE_KVM_PIT); + virObjectUnref(driver.config); virObjectUnref(driver.caps); virObjectUnref(driver.xmlopt); -- 1.8.1.5

3 4

[libvirt] Host local_host running without virtualization hardware acceleration
by Sandro Bonazzola 05 Nov '13

05 Nov '13

Hi, I had to reinstall ovirt yesterday and now it seems that it doesn't work anymore. I'm running nightly on Fedora 18. kernel-3.11.4-101.fc18.x86_64 sanlock-2.8-1.fc18.x86_64 libvirt-1.1.4-1.fc18.x86_64 qemu-1.5.1-1.fc18.x86_64 vdsm-4.13.0-93.gitea8c8f0.fc18.x86_64 ovirt-engine-3.4.0-0.2.master.20131104192919.git3b65870.fc18.noarch engine-setup with all-in-one detects hardware virtualization and allow me to configure the system. (it fails detecting engine health status due probably to recent changes in its URL, I'm already looking into it) Once added localhost to the engine, it has been moved to non operational mode saying I don't have virtualization hardware acceleration anymore. I've found that: # modinfo kvm filename: /lib/modules/3.11.4-101.fc18.x86_64/kernel/arch/x86/kvm/kvm.ko license: GPL author: Qumranet depends: intree: Y vermagic: 3.11.4-101.fc18.x86_64 SMP mod_unload parm: min_timer_period_us:uint parm: ignore_msrs:bool parm: tsc_tolerance_ppm:uint parm: allow_unsafe_assigned_interrupts:Enable device assignment on platforms without interrupt remapping support. (bool) # /usr/bin/qemu-kvm Could not access KVM kernel module: No such file or directory failed to initialize KVM: No such file or directory looking at strace: open("/dev/kvm", O_RDWR|O_CLOEXEC) = -1 ENOENT (No such file or directory) Any clue on what may be happened? -- Sandro Bonazzola Better technology. Faster innovation. Powered by community collaboration. See how it works at redhat.com

4 5

[libvirt] Fwd: Re: [PATCH] virsh domxml-from-native to treat SCSI as the bus type for pseries by default
by Shivaprasad bhat 05 Nov '13

05 Nov '13

Hi Eric, I realised you have not received my mails due to some problem with IMAP server. I sent out second version of my patch with your suggestions last week. https://www.redhat.com/archives/libvir-list/2013-October/msg01110.html Could you please help me reviewing the V2 ? Thanks and Regards, Shiva ---------- Forwarded message ---------- From: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> Date: Tue, Nov 5, 2013 at 12:07 PM Subject: Fwd: Re: [libvirt] [PATCH] virsh domxml-from-native to treat SCSI as the bus type for pseries by default To: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> -------- Original Message -------- Message-ID: <526E1EB5.5050902(a)linux.vnet.ibm.com> <526E1EB5.5050902(a)linux.vnet.ibm.com> Date: Mon, 28 Oct 2013 13:52:13 +0530 From: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> <sbhat(a)linux.vnet.ibm.com> User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Eric Blake <eblake(a)redhat.com> <eblake(a)redhat.com>, Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> <shivaprasadbhat(a)gmail.com>, libvir-list(a)redhat.com, zhlcindy(a)linux.vnet.ibm.com CC: bpradip(a)in.ibm.com Subject: Re: [libvirt] [PATCH] virsh domxml-from-native to treat SCSI as the bus type for pseries by default References: <20131024070709.13853.10308.stgit(a)localhost.localdomain><20131024070709.13853.10308.stgit(a)localhost.localdomain> <5268CB8C.3090404(a)redhat.com> <5268CB8C.3090404(a)redhat.com> In-Reply-To: <5268CB8C.3090404(a)redhat.com> <5268CB8C.3090404(a)redhat.com> Content-Type: multipart/alternative; boundary="------------050306080405050600030204" Thanks Eric and Li. Sending out the v2 with the recommended changes. Regards, Shiva On 10/24/2013 12:56 PM, Eric Blake wrote: On 10/24/2013 08:07 AM, Shivaprasad G Bhat wrote: From: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> <sbhat(a)linux.vnet.ibm.com> The bus type IDE being enum Zero, the bus type on pseries system appears as IDE for all the disk types. Pseries platform needs this to appear as SCSI instead of IDE. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abb62e9..728409f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9995,6 +9995,7 @@ error: static virDomainDiskDefPtr qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, const char *val, + virDomainDefPtr dom, TAB damage. Please run 'make syntax-check' and fix that. int nvirtiodisk, bool old_style_ceph_args) { @@ -10018,7 +10019,11 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_ALLOC(def) < 0) goto cleanup; - def->bus = VIR_DOMAIN_DISK_BUS_IDE; + if (((dom->os.arch == VIR_ARCH_PPC64) && + dom->os.machine && STREQ(dom->os.machine, "pseries"))) + def->bus = VIR_DOMAIN_DISK_BUS_SCSI; + else + def->bus = VIR_DOMAIN_DISK_BUS_IDE; I'm wondering if we should reuse our post-XML-parse callbacks here, rather than open-coding a machine check. In other words, since we already have code that knows how to do per-machine fixups to a domain definition, we should be reusing those instead of open-coding duplicate checks. (Actually, domxml-from-native needs a LOT of TLC, there's much more wrong with it, even on non-pseries machines, than what you are trying to patch). -- libvir-list mailing listlibvir-list@redhat.comhttps://www.redhat.com/mailman/listinfo/libvir-list

1 0

[libvirt] [PATCHv2 0/3] glusterfs storage pool
by Eric Blake 04 Nov '13

04 Nov '13

Fixes some problems identified in v1: https://www.redhat.com/archives/libvir-list/2013-October/msg01354.html Eric Blake (3): storage: initial support for linking with libgfapi storage: document gluster pool storage: implement rudimentary glusterfs pool refresh configure.ac | 21 +++ docs/formatstorage.html.in | 11 +- docs/schemas/storagepool.rng | 21 +++ docs/storage.html.in | 90 ++++++++++- libvirt.spec.in | 15 ++ m4/virt-gluster.m4 | 26 +++ po/POTFILES.in | 1 + src/Makefile.am | 9 ++ src/conf/storage_conf.c | 20 ++- src/conf/storage_conf.h | 3 +- src/storage/storage_backend.c | 6 + src/storage/storage_backend.h | 6 +- src/storage/storage_backend_gluster.c | 228 +++++++++++++++++++++++++++ src/storage/storage_backend_gluster.h | 29 ++++ tests/storagepoolxml2xmlin/pool-gluster.xml | 8 + tests/storagepoolxml2xmlout/pool-gluster.xml | 11 ++ tests/storagepoolxml2xmltest.c | 1 + 17 files changed, 493 insertions(+), 13 deletions(-) create mode 100644 m4/virt-gluster.m4 create mode 100644 src/storage/storage_backend_gluster.c create mode 100644 src/storage/storage_backend_gluster.h create mode 100644 tests/storagepoolxml2xmlin/pool-gluster.xml create mode 100644 tests/storagepoolxml2xmlout/pool-gluster.xml -- 1.8.3.1

2 5

[libvirt] libvirt-1.4.4 is out
by Daniel Veillard 04 Nov '13

04 Nov '13

As planned I tagged the git tree earlier today and pushed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ The release is a bit smaller than usual in terms of commited patches probably due to a large part of the team travelling to KVM Forum ! This is mostly a bug fix and maintainance release, it includes 4 important security patches in addition to the usual set of bug and leak fixes. To note the added support for ARM 64 bits arch, and quite a large set of portability fixes: Features: - Add support for AArch64 architecture (Pranavkumar Sawargaonkar) - Various improvements on test code and test driver (many people) Security: - Don't link virt-login-shell against libvirt.so (CVE-2013-4400) (Daniel P. Berrange) - Close all non-stdio FDs in virt-login-shell (CVE-2013-4400) (Daniel P. Berrange) - Only allow 'stderr' log output when running setuid (CVE-2013-4400) (Daniel P. Berrange) - Fix perms for virConnectDomainXML{To,From}Native (CVE-2013-4401) (Daniel P. Berrange) Documentation: - generate links from plain text documentation (Claudio Bley) - define style of code blocks inside descriptions (Claudio Bley) - add class "description" to div's containing descriptions (Claudio Bley) - process code blocks similar to Markdown (Claudio Bley) - fix typos in formatnwfilter (Chen Hanxiao) - fix a typo in formatdomain (Chen Hanxiao) - virsh: fix doc typos (Eric Blake) - maint: typo fixes (Eric Blake) - fix some typos about 'informations' (Chen Hanxiao) - fix a typo in formatdomain (Chen Hanxiao) - Expand description of host-model CPU mode (Jiri Denemark) - virsh: fix a typo in virsh-domain (Chen Hanxiao) - storage: document existing pools (Eric Blake) - remote-driver: Fix 'leav' typo in comment (Christophe Fergeau) - change the minimum weight description for blkio (Chen Hanxiao) - Add some notes about secure usage of libvirt (Daniel P. Berrange) - lxc: Fix an improper comment in lxc_process.c (Chen Hanxiao) - nwfilter: fix a typo in nwfilter_gentech_driver.c (Hongwei Bi) - cgroup: fix a comment typo in vircgroup.c (Chen Hanxiao) - fix typo in HACKING (Chen Hanxiao) - aclpolkit: Fix a heading typo (Cole Robinson) Portability: - virnetsocket: fix getsockopt on FreeBSD (Ryota Ozaki) - MacOS: Handle changes to xdrproc_t definition (Doug Goldstein) - fix api changes in xen restore (Bamvor Jian Zhang) - MacOS: Re-add support for QEMU backend (Doug Goldstein) - rpc: Retrieve peer PID via new getsockopt() for Mac (Doug Goldstein) - build: fix build of virt-login-shell on systems with older gnutls (Jim Fehlig) - build: fix linking virt-login-shell (Jim Fehlig) - nodeinfo: fix physical memory size on Mac OS X (Ryota Ozaki) - Add stub getegid impl for platforms lacking it (Daniel P. Berrange) - better error checking for LOCAL_PEERCRED (Brian Candler) - Add support for detecting PPC little endian arches (Daniel P. Berrange) - xenapi: Fix build after const correctnes changes (Peter Krempa) - rpc: Fix getsockopt on Snow Leopard and lower (Doug Goldstein) - build: fix linker error on FreeBSD (Giuseppe Scrivano) - tests: avoid compile failure on linux kernels older than 2.6.19 (Giuseppe Scrivano) - nodeinfo: make freebsdNodeGetCPUCount work on Mac OS X (Ryota Ozaki) - rpc: fix getsockopt for LOCAL_PEERCRED on Mac OS X (Ryota Ozaki) - build: fix build on 32-bit platforms (Eric Blake) - build: fix build on RHEL 5 (Eric Blake) - build: fix build --without-remote (Eric Blake) Bug fixes: - Fix race in starting transient VMs (Daniel P. Berrange) - Use a port from the migration range for NBD as well (Ján Tomko) - nodedev_hal: fix segfault when virDBusGetSystemBus fails (Ryota Ozaki) - Fix race condition reconnecting to vms & loading configs (Daniel P. Berrange) - Don't update dom->persistent without lock held (Daniel P. Berrange) - storage: fix incorrect typedef (Eric Blake) - apparmor: Fix typo in function name in driver struct initialization (Peter Krempa) - qemu: fix well-formed migration URI formatting (Michael Chapman) - LXC: don't free tty before using it in lxcContainerSetupDevices (Gao feng) - python: Fix Create*WithFiles filefd passing (Marian Neagul) - networkStartDhcpDaemon: Check for dnsmasqCapsRefresh failure (Hongwei Bi) - virsh: Fix job watching when STDIN is not a tty (Peter Krempa) - qemu: fix removal of <interface type='hostdev'> (Laine Stump) - Fix a problem introduced by commit 99889012 (Geoff Hickey) - qemu: Avoid assigning unavailable migration ports (Wang Yufei) - viralloc.h: Fix typo in VIR_APPEND_ELEMENT_COPY_QUIT (Michal Privoznik) - remote: fix regression in event deregistration (Zhou Yimin) - daemon: don't free domain if it's null (Chen Hanxiao) - Remove ATTRIBUTE_NONNULL(3) from qemuMonitorJSONDrivePivot (John Ferlan) - rpc: Correct the wrong payload size checking (Osier Yang) - Fix typo breaking cgroups for NBD backed filesystems (Daniel P. Berrange) - Ignore thin pool LVM devices. (Dusty Mabe) - domain_conf.c: Initialize arrVar and cntVar (Michal Privoznik) - vbox: handle 'saved' state of VMs (Ryota Ozaki) - esx: Fix floppy.fileName handling in the vmx file parser (Geoff Hickey) - Convert uuid to a string before printing it (Ján Tomko) - Initialize threading & error layer in LXC controller (Daniel P. Berrange) - Don't ignore all dbus connection errors (Daniel P. Berrange) - Fix exit status of lxc controller (Daniel P. Berrange) - Fix flaw in detecting log format (Daniel P. Berrange) - qemu_migration: Avoid crashing if domain dies too quickly (Michal Privoznik) - util: fix two virCompareLimitUlong bugs (Bing Bu Cao) - storage_backend: Fix issue with allocation of 0 length volume (John Ferlan) - qemu: Init @pcidevs in qemuPrepareHostdevPCIDevices (Michal Privoznik) - LXC: Fix handling of RAM filesystem size units (Ján Tomko) - Don't clobber 'ret' variable in testCompareXMLToXMLHelper (Daniel P. Berrange) - Adjust legacy max payload size to account for header information (Claudio Bley) - storage: fix file allocation behavior in file cloning (Oskari Saarenmaa) - virfile: safezero: fix buffer allocation max size (Oskari Saarenmaa) - test: Fix coverity warnings (Cole Robinson) - nodedev: Resolve Relax-NG validity error (John Ferlan) - Free cmd in virNetDevVethCreate (Gao feng) - Free cmd in virNetDevVethDelete (Gao feng) - qemu: check actual netdev type rather than config netdev type during init (Laine Stump) - qemuMonitorTestFree: Join worker thread (Michal Privoznik) - Avoid deleting NULL veth device name (Daniel P. Berrange) - qemuMonitorJSONSendKey: Avoid double free (Michal Privoznik) - qemuMonitorJSONGetVirtType: Fix error message (Michal Privoznik) - qemu: cgroup: Fix crash if starting nographics guest (Cole Robinson) - selinux: Only close the selabel_handle once (Ján Tomko) - Fix handling of IPv6 listen addresses in cmdDomDisplay (Ján Tomko) - util: recognize SMB/CIFS filesystems as shared (Laine Stump) - Fix leak of objects when reconnecting to QEMU instances (Daniel P. Berrange) Improvements: - libxl: fix dubious cpumask handling in libxlDomainSetVcpuAffinities (Jeremy Fitzhardinge) - Improve debugging of QEMU start/stop (Daniel P. Berrange) - Improve debugging of job enter/exit code (Daniel P. Berrange) - storage: use correct type for array count (Eric Blake) - maint: avoid further typedef accidents (Eric Blake) - libvirt.c: indent code of virDomainGetMemoryParameters's documentation (Claudio Bley) - libvirt.c: add 2 spaces of indentation to example code of virStreamSend (Claudio Bley) - Add '+' to uid/gid printing for label processing (John Ferlan) - Push RPM deps down into libvirt-daemon-driver-XXXX sub-RPMs (Daniel P. Berrange) - capabilities: add baselabel per sec driver/virt type to secmodel (Giuseppe Scrivano) - security: add new internal function "virSecurityManagerGetBaseLabel" (Giuseppe Scrivano) - security: use a single function to set DAC user and group (Giuseppe Scrivano) - virsh: new environment variable VIRSH_HISTSIZE (Pavel Raiskup) - maint: update to latest gnulib (Eric Blake) - Skip debug message in lxcContainerSetID if no map is set. (Chen Hanxiao) - Avoid Coverity DEADCODE warning (John Ferlan) - virsh: allow alias to expand to opt=value pair (Eric Blake) - Ignore GNU Global tag files (Martin Kletzander) - build: Fix prohibit_int_ijk (and iijjkk) on RHEL 5 (Martin Kletzander) - Get rid of shadowed booleans (Michal Privoznik) - vircgroupmock: Mock access() to some more files (Michal Privoznik) - tests: Use lv_abs_top_builddir instead of bare abs_top_builddir (Michal Privoznik) - qemu: move qemuDomainRemoveNetDevice to avoid forward reference (Laine Stump) - qemu: simplify calling qemuDomainHostdevNetConfigRestore (Laine Stump) - Move virt-login-shell into libvirt-login-shell sub-RPM (Daniel P. Berrange) - Block all use of libvirt.so in setuid programs (Daniel P. Berrange) - Remove (nearly) all use of getuid()/getgid() (Daniel P. Berrange) - Don't allow remote driver daemon autostart when running setuid (Daniel P. Berrange) - Only allow the UNIX transport in remote driver when setuid (Daniel P. Berrange) - Block all use of getenv with syntax-check (Daniel P. Berrange) - Remove all direct use of getenv (Daniel P. Berrange) - Make virCommand env handling robust in setuid env (Daniel P. Berrange) - Set a sane $PATH for virt-login-shell (Daniel P. Berrange) - Add helpers for getting env vars in a setuid environment (Daniel P. Berrange) - qemu: Fix augeas support for migration ports (Michal Privoznik) - qemu: Make migration port range configurable (Jiri Denemark) - netcf: Don't complain when cleanup is called before init (Christophe Fergeau) - virsh: improve usability of '--print-xml' flag for attach-disk command (Chen Hanxiao) - esx: Remove unnecessary NULL comparisons (3/3) (Geoff Hickey) - esx: Remove unnecessary NULL comparisons (2/3) (Geoff Hickey) - esx: Remove unnecessary NULL comparisons (1/3) (Geoff Hickey) - Add support for enabling SASL for SPICE guests (Daniel P. Berrange) - qemuDomainCleanupRemove: s/memmove/VIR_DELETE_ELEMENT_INPLACE/ (Michal Privoznik) - build: use the gnulib version of the .m4 files when present (Giuseppe Scrivano) - storage: allow interleave in pool XML (Eric Blake) - Add some logging to LXC disk/fs nbd/loop setup (Daniel P. Berrange) - Add logging to LXC cgroup devices setup (Daniel P. Berrange) - Add log statement when NBD device is setup (Daniel P. Berrange) - AArch64: Add qemu capabilities schemeta for test. (Pranavkumar Sawargaonkar) - Implement minimal sysinfo for AArch64 platforms. (Pranavkumar Sawargaonkar) - AArch64: Parse cputopology from /proc/cpuinfo. (Pranavkumar Sawargaonkar) - AArch64: CPU Support for AArch64 (ARMv8 64bit). (Pranavkumar Sawargaonkar) - AArch64: Add AArch64 architecture to list of valid arches. (Pranavkumar Sawargaonkar) - cpu: x86: Clean up error messages in x86VendorLoad() (Peter Krempa) - cpu: x86: Use whitespace to clarify context and use consistent labels (Peter Krempa) - cpu: x86: Fix function header formatting and whitespace (Peter Krempa) - cpu: x86: Fix return types of x86cpuidMatch and x86cpuidMatchMasked (Peter Krempa) - cpu: x86: Rename data_iterator and DATA_ITERATOR_INIT (Peter Krempa) - cpu: x86: Rename x86DataAddCpuid as virCPUx86DataAddCPUID (Jiri Denemark) - cpu: x86: Rename x86MakeCPUData as virCPUx86MakeData (Jiri Denemark) - cpu: x86: Rename x86DataFree() as virCPUx86DataFree() (Jiri Denemark) - cpu: x86: Rename struct cpuX86Data as virCPUx86Data (Jiri Denemark) - cpu: x86: Rename struct cpuX86cpuid as virCPUx86CPUID (Jiri Denemark) - cpu: Add support for loading and storing CPU data (Jiri Denemark) - qemu: command: Fix macro indentation (Peter Krempa) - conf: Mark user provided strings in error messages when parsing XML (Peter Krempa) - schema: Rename option 'hypervtristate' to 'featurestate' (Peter Krempa) - fix typo in lxc_driver.c and virsh-nodedev.c (Hongwei Bi) - build: Add lxc testcase to dist list (Daniel Hansel) - cgroup: leave blkio cgroup value checking to kernel (Chen Hanxiao) - cgroup: show error when EINVAL is returned (Chen Hanxiao) - vbox: merge duplicate state conversions (Ryota Ozaki) - build: syntax check to avoid 'const fooPtr' (Eric Blake) - maint: avoid 'const fooPtr' in all remaining places (Eric Blake) - maint: avoid 'const fooPtr' in qemu (Eric Blake) - maint: avoid 'const fooPtr' in security (Eric Blake) - maint: avoid 'const fooPtr' in conf (Eric Blake) - maint: avoid 'const fooPtr' in domain_conf (Eric Blake) - maint: fix awkward typing of virDomainChrGetDomainPtrs (Eric Blake) - maint: avoid 'const fooPtr' in python bindings (Eric Blake) - maint: avoid 'const fooPtr' in tests (Eric Blake) - maint: avoid 'const fooPtr' in nwfilter files (Eric Blake) - maint: avoid 'const fooPtr' in cpu files (Eric Blake) - maint: avoid 'const fooPtr' in virnet files (Eric Blake) - maint: avoid 'const fooPtr' in several util files (Eric Blake) - maint: avoid 'const fooPtr' in hashes (Eric Blake) - maint: avoid 'const fooPtr' in public API (Eric Blake) - Improve log filtering in virLXCProcessReadLogOutputData (Daniel P. Berrange) - Ensure lxcContainerResolveSymlinks reports errors (Daniel P. Berrange) - Ensure lxcContainerMain reports errors on stderr (Daniel P. Berrange) - VMX: Serial devices don't have to be attached (Doug Goldstein) - Revert "VMX: Some serial ports are not actually connected" (Doug Goldstein) - qemu: snapshot: Add support for compressing external snapshot memory (Peter Krempa) - qemu: managedsave: Add support for compressing managed save images (Peter Krempa) - Improve error reporting with LXC controller (Daniel P. Berrange) - Make LXC controller use a private dbus connection & close it (Daniel P. Berrange) - Add a method for closing the dbus system bus connection (Daniel P. Berrange) - Allow use of a private dbus bus connection (Daniel P. Berrange) - VMware: Do version detection earlier (Doug Goldstein) - VMware: Simplify array walk for driver type (Doug Goldstein) - qemu: Include listenAddress in debug prints (Michal Privoznik) - Move virNetDevVPort enum impl into virnetdevvportprofile.c (Daniel P. Berrange) - qemu_conf: Introduce "migration_address" (Michal Privoznik) - qemu: Implement support for VIR_MIGRATE_PARAM_LISTEN_ADDRESS (Michal Privoznik) - virsocket: Introduce virSocketAddrIsWildcard (Michal Privoznik) - Migration: Introduce VIR_MIGRATE_PARAM_LISTEN_ADDRESS (Michal Privoznik) - qemu: Introduce qemuDomainDefCheckABIStability (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONSendKey (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetVirtType (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetCPUInfo (Michal Privoznik) - qemumonitorjsontest: Extend the test for yet another monitor commands (Michal Privoznik) - qemu: Prefer VFIO for PCI device passthrough (Peter Krempa) - qemu: hostdev: Add checks if PCI passthrough is available in the host (Peter Krempa) - qemu: hostdev: Fix function spacing and header formatting (Peter Krempa) - qemu: refactor qemuCompressProgramAvailable() (Peter Krempa) - qemu: Fix coding style in qemuDomainSaveFlags() (Peter Krempa) - storage: Use bool instead of int (Ján Tomko) - tests: Add qemu test for multiple timers (Cole Robinson) - qemu: hostdev: Refactor PCI passhrough handling (Peter Krempa) - virerror: s/VIR_ERR_STORAGE_VOL_EXISTS/VIR_ERR_STORAGE_VOL_EXISTS/ (Michal Privoznik) - fix a ambiguous output of the command:'virsh vol-create-as' (Hongwei Bi) - build: add configure --without-readline (Eric Blake) - build: move readline check into its own macro (Eric Blake) - build: kill maintainer mode, always rebuild by default (Eric Blake) - Remove use of virConnectPtr from all remaining nwfilter code (Daniel P. Berrange) - Don't pass virConnectPtr in nwfilter 'struct domUpdateCBStruct' (Daniel P. Berrange) - Remove virConnectPtr arg from virNWFilterDefParse* (Daniel P. Berrange) - qemu: Use maximum guest memory size when getting NUMA placement advice (Peter Krempa) - virfile: safezero: fall back to writing block by block if mmap fails (Oskari Saarenmaa) - test: snapshot: Add REDEFINE support (Cole Robinson) - qemu: snapshot: Break out redefine preparation to shared function (Cole Robinson) - test: Implement snapshot create/delete/revert APIs (Cole Robinson) - test: Allow specifying domainsnapshot XML (Cole Robinson) - qemu: snapshots: Simplify REDEFINE flag check (Cole Robinson) - qemucapabilitiesdata: Add qemu-1.6.50 data (Michal Privoznik) - qemucapabilitiesdata: Add qemu-1.6.0 data (Michal Privoznik) - qemucapabilitiesdata: Add qemu-1.4.2 data (Michal Privoznik) - qemucapabilitiesdata: Add qemu-1.3.1 data (Michal Privoznik) - qemucapabilitiesdata: Add qemu-1.2.2 data (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONSystemPowerdown (Michal Privoznik) - Use 'vnet' as prefix for veth devices (Daniel P. Berrange) - Retry veth device creation on failure (Daniel P. Berrange) - Avoid reporting an error if veth device is already deleted (Daniel P. Berrange) - Don't set netdev offline in container cleanup (Daniel P. Berrange) - qemumonitorjsontest: Test qemuMonitorJSONGetMigrationCapability (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetTargetArch (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONSetBlockIoThrottle (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetPtyPaths (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetSpiceMigrationStatus (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetMigrationStatus (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetMigrationCacheSize (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetBlockStatsInfo (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetBlockInfo (Michal Privoznik) - qemumonitorjsontest: Test qemuMonitorJSONGetBalloonInfo (Michal Privoznik) - qemu_hotplug: Allow QoS update in qemuDomainChangeNet (Michal Privoznik) - virNetDevBandwidthEqual: Make it more robust (Michal Privoznik) - test: Implement readonly snapshot APIs (Cole Robinson) - test: Wire up managed save APIs (Cole Robinson) - test: Allow specifying object transient state in driver XML (Cole Robinson) - tests: Introduce qemucapabilitiestest (Michal Privoznik) - qemuMonitorTest: Make check for monitor command match optional (Michal Privoznik) - tests: Learn qemuMonitorTestNew optional greeting (Michal Privoznik) - qemu_capabilities: Introduce virQEMUCapsInitQMPMonitor (Michal Privoznik) Cleanups: - xenapi: fix coding style in xenapi_driver.c (Hongwei Bi) - virsh: undocument --shareable (--mode already covers it) (Eric Blake) - Remove test case average timing (Daniel P. Berrange) - Remove existing OOM test impl (Daniel P. Berrange) Thanks everybody for everyone who helped for this release, be it for documentation, bug reports, patches, etc ... Enjoy ! 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/

2 2

[libvirt] [PATCHv2 0/8] Introduce paravirtual spinlock support
by Peter Krempa 04 Nov '13

04 Nov '13

Version 2 fixes stuff pointed out in Dan's review Jiri Denemark (2): cpu: Export few x86-specific APIs qemu: Add monitor APIs to fetch CPUID data from QEMU Peter Krempa (6): cpu_x86: Refactor storage of CPUID data to add support for KVM features cpu: x86: Parse the CPU feature map only once cpu: x86: Add internal CPUID features support and KVM feature bits conf: Refactor storing and usage of feature flags qemu: Add support for paravirtual spinlocks in the guest qemu: process: Validate specific CPUID flags of a guest docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 10 +- src/conf/domain_conf.c | 195 +++++++++--- src/conf/domain_conf.h | 3 +- src/cpu/cpu_x86.c | 350 +++++++++++---------- src/cpu/cpu_x86.h | 9 + src/cpu/cpu_x86_data.h | 20 +- src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 9 +- src/lxc/lxc_container.c | 6 +- src/qemu/qemu_command.c | 28 +- src/qemu/qemu_monitor.c | 35 +++ src/qemu/qemu_monitor.h | 5 + src/qemu/qemu_monitor_json.c | 145 +++++++++ src/qemu/qemu_monitor_json.h | 2 + src/qemu/qemu_process.c | 53 ++++ src/vbox/vbox_tmpl.c | 45 ++- src/xenapi/xenapi_driver.c | 10 +- src/xenapi/xenapi_utils.c | 22 +- src/xenxs/xen_sxpr.c | 20 +- src/xenxs/xen_xm.c | 30 +- tests/Makefile.am | 1 + .../qemumonitorjson-getcpu-full.data | 5 + .../qemumonitorjson-getcpu-full.json | 46 +++ .../qemumonitorjson-getcpu-host.data | 6 + .../qemumonitorjson-getcpu-host.json | 45 +++ tests/qemumonitorjsontest.c | 76 +++++ .../qemuxml2argv-pv-spinlock-disabled.args | 5 + .../qemuxml2argv-pv-spinlock-disabled.xml | 26 ++ .../qemuxml2argv-pv-spinlock-enabled.args | 5 + .../qemuxml2argv-pv-spinlock-enabled.xml | 26 ++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + 33 files changed, 952 insertions(+), 304 deletions(-) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-full.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-full.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-host.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-host.json create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.xml -- 1.8.3.2

2 20

[libvirt] [RFC] net-dhcp-leases: Query: Reg: Leases API Script
by Nehal J Wani 04 Nov '13

04 Nov '13

Q1. The --dhcp-script option will require libvirt to provide a script or executable file to be run. Now as the man page says, this file is executed "Whenever a new DHCP ease is created, or an old one destroyed". Life was easy with the script, as it used the command sed to remove the destroyed lease. eblake had suggested me to use a C program instead. So I wanted to finalize whether to go with C or continue with shell script. Q2. The above executable file will be writing the custom formatted lease parameters to a file "dnsmasq-ip-mac.status" (suggestion open for name). This newly created/updated file will be parsed by the API. We need to decide the format for the file. Do we continue with space separated parameters as before? Q3. What should be the location of the above two files? Is there any example that I can follow in libvirt for deploying custom-script files/C programs which are not to be linked? Script is attached. -- Nehal J Wani

3 8

[libvirt] pvpanic plans?
by Paolo Bonzini 04 Nov '13

04 Nov '13

The thread from yesterday has died off (perhaps also because of my inappropriate answer to Michael, for which I apologize to him and everyone). I took some time to discuss the libvirt requirements further with Daniel Berrange and Eric Blake on IRC. If anyone is interested, I can give logs. This is a suggestion for how to proceed in both QEMU and libvirt. == Builtin pvpanic == QEMU will remove pvpanic from pc-1.5 in 1.6.1 and 1.5.4. This does not break migration. == Support in libvirt for current functionality == libvirt will add a <panic-notifier/> element, and possibly a capability for it accessible via "virsh capabilities". There are two possibilities: 1) On QEMU 1.5.4/1.6.1 and newer (and on QEMU 1.6.0 with a machine type other than pc-1.5), <on_crash> will only work if the element is there. On QEMU 1.5.0->1.5.3, and on QEMU 1.6.0 with the pc-1.5 machine type, <on_crash> will be obeyed always, and may override e.g. reboot-on-panic if a guest driver exist. 2) On all versions, <on_crash> will only work if the element is there. In turn, there are two ways to implement (2): 2a) libvirt will always add -global pvpanic.iobase=0 to neutralize the builtin pvpanic device if present. <panic-notifier/> will create the device with -device pvpanic,iobase=0x505 Advantage: no changes to QEMU Disadvantage 1: writes to port 0 with QEMU 1.{5.0,5.1,5.2,5.3,6.0} and pc-1.5 machine type will write to a pvpanic device instead of the DMA controller. Probably harmless, and limited to some QEMU versions. Disadvantage 2: libvirt has knowledge of the pvpanic port number 2b) QEMU will provide a way for libvirt to detect that no machine type has the builtin pvpanic. If some machine type may have the builtin pvpanic, and <panic-notifier/> is absent, libvirt will add "-global pvpanic.iobase=0" to neutralize it. Otherwise, libvirt will create the device normally. A possible way for libvirt to detect "good" machine types is a dummy property. This is a bit ugly in that the property would not affect the behavior of the device. The property would remain in the long term. Another possibility is for QEMU to rename the device, e.g. to isa-pvpanic. This is also somewhat gross, but not visible in the long term when the "pvpanic" name will be lost in history. Advantage 1: libvirt has no knowledge of the pvpanic port number Disadvantage 1: same as above Disadvantage 2: need a somewhat gross change in QEMU This method also provides an (also somewhat gross on the QEMU side) way to detect other changes in the pvpanic semantics. One example mentioned below, is making the panicked state temporary. == Possible improvements to pvpanic == The current implementation of pvpanic supports three modes: reset system on panic, destroy domain on panic, preserve domain with no possibility to resume it. (Optionally a domain can be dumped too). Long term, the choice to include pvpanic should not be on the guest admin's shoulders, but rather in libosinfo. Thus, it would be nice to have a fourth mode where the panic is logged but the guest otherwise keeps running. This mode would let libosinfo add pvpanic by default without affecting the guest's behavior on panic. With this change, <on_crash>ignore</on_crash> will behave as follows for the three possibilities above: (1) With QEMU 1.5.0 to 1.6.1, <on_crash> will _not_ obey the setting, never (even if no <panic-notifier/> is specified). libvirt will have to pick a fallback action. advantage of destroy as fallback: it is the default (but note that restart is the default for virt-install) advantage of preserve as fallback: lets the admin examine the panic advantage of restart as fallback: maximum availability of the VM, it is the default for virt-install (2a) With QEMU 1.5.0 to 1.6.1, <on_crash> will _not_ obey the setting if <panic-notifier/> is specified. libvirt has _no way_ to learn about this, so the capability would always be present with these QEMU versions and libosinfo would always add <panic-notifier/> with these versions. Given the libosinfo scenario being considered here, this is not very different from (1). (2b) With QEMU 1.5.0 to 1.6.1, the <panic-notifier/> element will not be available and not exposed in libvirt capabilities. Thus with this version libosinfo would omit <panic-notifier/> from the XML. Guest policy will always be followed correctly. The problem in both (1) and (2a) can be summarized as follows. First, libvirt will have to implement and document a fallback action for buggy QEMU. Second, even though the problems would be limited to some version of QEMU, they would be relatively hard to debug for a casual user, could start happening randomly by updating any one of QEMU, libvirt, libosinfo or the guest kernel, and there is no fallback action for libvirt that is always correct. Thus, considering future libosinfo support for pvpanic, (2b) is preferrable in my opinion. Now, making pvpanic reversible requires a change in QEMU (patch already posted). Andreas proposed using a pvpanic property to determine whether the panicked state is temporary or definitive. libvirt could piggyback on such a property to detect the "goodness" of machine types (as mentioned regarding solution 2b above). However: First, this would require a more intrusive patch, less appealing for 1.5 and 1.6 stable branches. Second, there is no reason why libvirt would want to make the panicked state definitive. To achieve the same effect, libvirt can just not issue the "continue" monitor command when the guest is panicked. Thus the new property would be useless except to communicate pvpanic behavior---and renaming the device still seems preferrable to me. Thanks for reading up to here! Paolo

12 54

Re: [libvirt] Libvirt support of mac-programming over macvtap planned?
by Amos Kong 04 Nov '13

04 Nov '13

On Tue, Oct 29, 2013 at 09:50:56AM -0400, Matthew Rosato wrote: > Amos Kong provided QEMU support to facilitate macvtap rx-filter change > notification here: > http://lists.nongnu.org/archive/html/qemu-devel/2013-07/msg02736.html > > Libvirt work was mentioned, but I haven't noticed any activity here > regarding exploitation -- Is someone working this or planning to in the > near future? Don't want to duplicate effort. Anything that I can do to > help? We have an redhat internal bug to track it: https://bugzilla.redhat.com/show_bug.cgi?id=848199 CC Laine > Thanks, > Matt -- Amos.

2 2

[libvirt] [PATCHv2 1/2] virsh: move command cpu-baseline from domain group to host group.
by liyang 04 Nov '13

04 Nov '13

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> cpu-baseline command can compute baseline CPU for a set of given CPUs, I think it should not belong to domain group, should belong to host group, so I moved the related source from virsh-domain.c to virsh-host.c Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 116 ------------------------------------------------- tools/virsh-host.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+), 116 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 42c9920..8fc6c59 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6107,116 +6107,6 @@ cleanup: } /* - * "cpu-baseline" command - */ -static const vshCmdInfo info_cpu_baseline[] = { - {.name = "help", - .data = N_("compute baseline CPU") - }, - {.name = "desc", - .data = N_("Compute baseline CPU for a set of given CPUs.") - }, - {.name = NULL} -}; - -static const vshCmdOptDef opts_cpu_baseline[] = { - {.name = "file", - .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, - .help = N_("file containing XML CPU descriptions") - }, - {.name = "features", - .type = VSH_OT_BOOL, - .help = N_("Show features that are part of the CPU model type") - }, - {.name = NULL} -}; - -static bool -cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) -{ - const char *from = NULL; - bool ret = false; - char *buffer; - char *result = NULL; - char **list = NULL; - unsigned int flags = 0; - int count = 0; - - xmlDocPtr xml = NULL; - xmlNodePtr *node_list = NULL; - xmlXPathContextPtr ctxt = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - size_t i; - - if (vshCommandOptBool(cmd, "features")) - flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES; - - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) - return false; - - if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) - return false; - - /* add a separate container around the xml */ - virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); - if (virBufferError(&buf)) - goto no_memory; - - VIR_FREE(buffer); - buffer = virBufferContentAndReset(&buf); - - - if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) - goto cleanup; - - if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", - ctxt, &node_list)) == -1) - goto cleanup; - - if (count == 0) { - vshError(ctl, _("No host CPU specified in '%s'"), from); - goto cleanup; - } - - list = vshCalloc(ctl, count, sizeof(const char *)); - - for (i = 0; i < count; i++) { - if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) { - vshSaveLibvirtError(); - goto cleanup; - } - } - - result = virConnectBaselineCPU(ctl->conn, - (const char **)list, count, flags); - - if (result) { - vshPrint(ctl, "%s", result); - ret = true; - } - -cleanup: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); - VIR_FREE(result); - if (list != NULL && count > 0) { - for (i = 0; i < count; i++) - VIR_FREE(list[i]); - } - VIR_FREE(list); - VIR_FREE(buffer); - VIR_FREE(node_list); - - return ret; - -no_memory: - vshError(ctl, "%s", _("Out of memory")); - ret = false; - goto cleanup; -} - -/* * "cpu-stats" command */ static const vshCmdInfo info_cpu_stats[] = { @@ -10517,12 +10407,6 @@ const vshCmdDef domManagementCmds[] = { .flags = 0 }, #endif - {.name = "cpu-baseline", - .handler = cmdCPUBaseline, - .opts = opts_cpu_baseline, - .info = info_cpu_baseline, - .flags = 0 - }, {.name = "cpu-compare", .handler = cmdCPUCompare, .opts = opts_cpu_compare, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 1d1bb97..b69de7c 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -35,6 +35,7 @@ #include "virbuffer.h" #include "viralloc.h" #include "virsh-domain.h" +#include "virfile.h" #include "virxml.h" #include "virtypedparam.h" #include "virstring.h" @@ -193,6 +194,116 @@ cleanup: } /* + * "cpu-baseline" command + */ +static const vshCmdInfo info_cpu_baseline[] = { + {.name = "help", + .data = N_("compute baseline CPU") + }, + {.name = "desc", + .data = N_("Compute baseline CPU for a set of given CPUs.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_cpu_baseline[] = { + {.name = "file", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("file containing XML CPU descriptions") + }, + {.name = "features", + .type = VSH_OT_BOOL, + .help = N_("Show features that are part of the CPU model type") + }, + {.name = NULL} +}; + +static bool +cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) +{ + const char *from = NULL; + bool ret = false; + char *buffer; + char *result = NULL; + char **list = NULL; + unsigned int flags = 0; + int count = 0; + + xmlDocPtr xml = NULL; + xmlNodePtr *node_list = NULL; + xmlXPathContextPtr ctxt = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + if (vshCommandOptBool(cmd, "features")) + flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES; + + if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + return false; + + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) + return false; + + /* add a separate container around the xml */ + virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); + if (virBufferError(&buf)) + goto no_memory; + + VIR_FREE(buffer); + buffer = virBufferContentAndReset(&buf); + + + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", + ctxt, &node_list)) == -1) + goto cleanup; + + if (count == 0) { + vshError(ctl, _("No host CPU specified in '%s'"), from); + goto cleanup; + } + + list = vshCalloc(ctl, count, sizeof(const char *)); + + for (i = 0; i < count; i++) { + if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) { + vshSaveLibvirtError(); + goto cleanup; + } + } + + result = virConnectBaselineCPU(ctl->conn, + (const char **)list, count, flags); + + if (result) { + vshPrint(ctl, "%s", result); + ret = true; + } + +cleanup: + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(result); + if (list != NULL && count > 0) { + for (i = 0; i < count; i++) + VIR_FREE(list[i]); + } + VIR_FREE(list); + VIR_FREE(buffer); + VIR_FREE(node_list); + + return ret; + +no_memory: + vshError(ctl, "%s", _("Out of memory")); + ret = false; + goto cleanup; +} + +/* * "maxvcpus" command */ static const vshCmdInfo info_maxvcpus[] = { @@ -955,6 +1066,12 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_hostname, .flags = 0 }, + {.name = "cpu-baseline", + .handler = cmdCPUBaseline, + .opts = opts_cpu_baseline, + .info = info_cpu_baseline, + .flags = 0 + }, {.name = "maxvcpus", .handler = cmdMaxvcpus, .opts = opts_maxvcpus, -- 1.7.1

1 3

[libvirt] [PATCH] virnetsocket: fix getsockopt on FreeBSD
by Ryota Ozaki 04 Nov '13

04 Nov '13

aa0f099 introduced a strict error checking for getsockopt and it revealed that getting a peer credential of a socket on FreeBSD didn't work. Libvirtd hits the error: error : virNetSocketGetUNIXIdentity:1198 : Failed to get valid client socket identity groups SOL_SOCKET (0xffff) was used as a level of getsockopt for LOCAL_PEERCRED, however, it was wrong. 0 is correct as well as Mac OS X. So for LOCAL_PEERCRED our options are SOL_LOCAL (if defined) or 0 on Mac OS X and FreeBSD. According to the fact, the patch simplifies the code by removing ifdef __APPLE__. I tested the patch on FreeBSD 8.4, 9.2 and 10.0-BETA1. Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/rpc/virnetsocket.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 3eb5708..04bf25a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1152,18 +1152,17 @@ cleanup: /* VIR_SOL_PEERCRED - the value needed to let getsockopt() work with * LOCAL_PEERCRED */ -# ifdef __APPLE__ -# ifdef SOL_LOCAL -# define VIR_SOL_PEERCRED SOL_LOCAL -# else -/* Prior to Mac OS X 10.7, SOL_LOCAL was not defined and users were - * expected to supply 0 as the second value for getsockopt() when using - * LOCAL_PEERCRED - */ -# define VIR_SOL_PEERCRED 0 -# endif + +/* Mac OS X 10.8 provides SOL_LOCAL for LOCAL_PEERCRED */ +# ifdef SOL_LOCAL +# define VIR_SOL_PEERCRED SOL_LOCAL # else -# define VIR_SOL_PEERCRED SOL_SOCKET +/* FreeBSD and Mac OS X prior to 10.7, SOL_LOCAL is not defined and + * users are expected to supply 0 as the second value for getsockopt() + * when using LOCAL_PEERCRED. NB SOL_SOCKET cannot be used instead + * of SOL_LOCAL + */ +# define VIR_SOL_PEERCRED 0 # endif int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, -- 1.8.4

3 4

[libvirt] Entering freeze for libvirt-1.1.4
by Daniel Veillard 04 Nov '13

04 Nov '13

I finally tagged and genrated tarballs for RC1 of 1.1.4, so we have now entered freeze. The bits are available as usual at: ftp://libvirt.org/libvirt/ My initial testing doesn't show anything suspicious but is limited, so please give it a try, especially for portability issues ! If all goes well i will probably make an rc2 by Thurday and release 1.1.4 for good on Monday 4th. Give it a try ! 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/

2 3

[libvirt] Erratic failure of
by Daniel Veillard 04 Nov '13

04 Nov '13

While building the release my first rpm build failed with FAIL: securityselinuxtest i.e. rpmbuit -ta based on libvirt-1.1.4 tarball on an up to date Fedora release 19, it did not reproduce (subsequent builds just worked fine) so i don't really have clues of what happened, except I didn't caught anything in my logs either. That didn't happen for rc1 or rc2 but that could be just pure luck . Sorry for the lack of details, 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/

1 0

[libvirt] [PATCH] MacOS: Handle changes to args in xdrproc_t
by Doug Goldstein 03 Nov '13

03 Nov '13

With Mac OS X 10.9, xdrproc_t is no longer defined as: typedef bool_t (*xdrproc_t) (XDR *, void *, ...); but instead as typedef bool-t (*xdrproc_t) (XDR *, void *, unsigned int); The rationale explained in the header is that using a vararg is incorrect and has a potential to change the ABI slightly. They decided to specify the exact number of parameters and for compatibility with old code decided to make the signature require 3 arguments. The third argument is ignored for cases that its not used and its recommended to supply a 0. --- configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++ src/rpc/virnetmessage.c | 10 ++++++++-- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1c5b168..f2bae88 100644 --- a/configure.ac +++ b/configure.ac @@ -697,6 +697,47 @@ if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then *) XDR_CFLAGS=$lv_cv_xdr_cflags ;; esac AC_SUBST([XDR_CFLAGS]) + + dnl Mac OS X Mavericks (10.9) dropped the varargs definition that + dnl allowed 2 or 3 parameters to xdrproc_t callbacks and decided on + dnl 3 arguments being a must. + old_CFLAGS=$CFLAGS + AC_CACHE_CHECK([whether xdrproc_t callbacks take 2 or 3 args], + [lv_cv_xdrproc_t_args], [ + CFLAGS="$old_CFLAGS $XDR_CFLAGS" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ + #include <rpc/rpc.h> + ]], + [[ + XDR xdr; + xdrproc_t filter = NULL; + + return (filter)(&xdr, NULL); + ]])], + [lv_cv_xdrproc_t_args=2], [ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[ + #include <rpc/rpc.h> + ]], + [[ + XDR xdr; + xdrproc_t filter = NULL; + + return (filter)(&xdr, NULL, 0); + ]])], + [lv_cv_xdrproc_t_args=3], + [lv_cv_xdrproc_t_args=unknown]) + ]) + CFLAGS="$old_CFLAGS" + ]) + case $lv_cv_xdrproc_t_args in + unknown) AC_MSG_ERROR([cannot determine arg count for xdrproc_t]) ;; + *) + AC_DEFINE_UNQUOTED([XDRPROC_T_ARG_COUNT], [$lv_cv_xdrproc_t_args], + [number of arguments that xdrproc_t func ptr takes]) + ;; + esac fi diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index d60366b..79e496f 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -33,6 +33,12 @@ #define VIR_FROM_THIS VIR_FROM_RPC +#if XDRPROC_T_ARG_COUNT == 3 +# define VIR_XDRPROC(proc, xdr, data) ((proc)((xdr), (data), 0)) +#else +# define VIR_XDRPROC(proc, xdr, data) ((proc)((xdr), (data))) +#endif + virNetMessagePtr virNetMessageNew(bool tracked) { virNetMessagePtr msg; @@ -345,7 +351,7 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, msg->bufferLength - msg->bufferOffset, XDR_ENCODE); /* Try to encode the payload. If the buffer is too small increase it. */ - while (!(*filter)(&xdr, data)) { + while (!VIR_XDRPROC(*filter, &xdr, data)) { unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4; if (newlen > VIR_NET_MESSAGE_MAX) { @@ -402,7 +408,7 @@ int virNetMessageDecodePayload(virNetMessagePtr msg, xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, msg->bufferLength - msg->bufferOffset, XDR_DECODE); - if (!(*filter)(&xdr, data)) { + if (!VIR_XDRPROC(*filter, &xdr, data)) { virReportError(VIR_ERR_RPC, "%s", _("Unable to decode message payload")); goto error; } -- 1.8.1.5

4 6

[libvirt] [PATCH] MacOS: Handle changes to xdrproc_t definition
by Doug Goldstein 03 Nov '13

03 Nov '13

With Mac OS X 10.9, xdrproc_t is no longer defined as: typedef bool_t (*xdrproc_t)(XDR *, ...); but instead as: typdef bool_t (*xdrproc_t)(XDR *, void *, unsigned int); For reference, Linux systems typically define it as: typedef bool_t (*xdrproc_t)(XDR *, void *, ...); The rationale explained in the header is that using a vararg is incorrect and has a potential to change the ABI slightly do to compiler optimizations taken and the undefined behavior. They decided to specify the exact number of parameters and for compatibility with old code decided to make the signature require 3 arguments. The third argument is ignored for cases that its not used and its recommended to supply a 0. --- src/rpc/virnetmessage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index d60366b..af07404 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -345,7 +345,7 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, msg->bufferLength - msg->bufferOffset, XDR_ENCODE); /* Try to encode the payload. If the buffer is too small increase it. */ - while (!(*filter)(&xdr, data)) { + while (!(*filter)(&xdr, data, 0)) { unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4; if (newlen > VIR_NET_MESSAGE_MAX) { @@ -402,7 +402,7 @@ int virNetMessageDecodePayload(virNetMessagePtr msg, xdrmem_create(&xdr, msg->buffer + msg->bufferOffset, msg->bufferLength - msg->bufferOffset, XDR_DECODE); - if (!(*filter)(&xdr, data)) { + if (!(*filter)(&xdr, data, 0)) { virReportError(VIR_ERR_RPC, "%s", _("Unable to decode message payload")); goto error; } -- 1.8.1.5

3 4

[libvirt] libvirt doesn't compile on OS X 10.9 Mavericks
by Ryan Schmidt 02 Nov '13

02 Nov '13

libvirt 1.1.3 doesn't compile on OS X 10.9 Mavericks. A bug report has already been filed, but I was asked to write to this mailing list to bring the matter to your attention. https://bugzilla.redhat.com/show_bug.cgi?id=1023860 In that bug report it mentions that this was fixed, however the patch linked to does not fix the problem.

2 2

[libvirt] [RFC PATCHv2 0/2] gluster pools
by Eric Blake 01 Nov '13

01 Nov '13

This addresses the review from RFCv1 for splitting the glfs checks to be different from the storage backend checks: https://www.redhat.com/archives/libvir-list/2013-October/msg00645.html I'm still just in RFC stage; wanting to make sure I have the documentation correct for sample XML prior to actually coding up the use of <glfs.h> from storage_backend_gluster.c. Note that qemu's block/gluster.c documents that qemu expects that when using glfs to bypass the file system, the image will always be specified as: * file=gluster[+transport]://[server[:port]]/volname/image[?socket=...] which means that there is no way to pass a direct gluster volume as a raw block device to qemu (it is always a file embedded within the gluster volume); hence my choice of making a single gluster volume act as the storage pool. Eric Blake (2): storage: initial support for linking with libgfapi storage: document gluster pool configure.ac | 21 +++++++ docs/formatstorage.html.in | 11 ++-- docs/schemas/storagepool.rng | 21 +++++++ docs/storage.html.in | 90 +++++++++++++++++++++++++++- libvirt.spec.in | 15 +++++ m4/virt-gluster.m4 | 26 ++++++++ po/POTFILES.in | 1 + src/Makefile.am | 9 +++ src/conf/storage_conf.c | 20 +++++-- src/conf/storage_conf.h | 3 +- src/storage/storage_backend.c | 6 ++ src/storage/storage_backend.h | 6 +- src/storage/storage_backend_gluster.c | 46 ++++++++++++++ src/storage/storage_backend_gluster.h | 29 +++++++++ tests/storagepoolxml2xmlin/pool-gluster.xml | 8 +++ tests/storagepoolxml2xmlout/pool-gluster.xml | 11 ++++ tests/storagepoolxml2xmltest.c | 1 + 17 files changed, 311 insertions(+), 13 deletions(-) create mode 100644 m4/virt-gluster.m4 create mode 100644 src/storage/storage_backend_gluster.c create mode 100644 src/storage/storage_backend_gluster.h create mode 100644 tests/storagepoolxml2xmlin/pool-gluster.xml create mode 100644 tests/storagepoolxml2xmlout/pool-gluster.xml -- 1.8.3.1

1 4

[libvirt] Using external ceph.conf for RBD pools and disks
by Michael Chapman 01 Nov '13

01 Nov '13

Hi all, At the moment, RBD storage pools in libvirt must be supplied with a list of Ceph monitor addresses, using <host> elements in the pool's source definition. Ceph itself has a configuration file, and this is used by default by all Ceph command-line utilities. This file can contain the monitor addresses for the cluster, as well as a bunch of other useful options (e.g. for tuning and debugging). I think it would be nice if libvirt were able to load in this file when starting RBD storage pools. Before I send some patches through. however, I thought I'd better check to see whether my approach is sound. First, I am not keen on having libvirt get librados to load the configuration file automatically. librados actually uses a search path to find the configuration file, and that path includes silly things like the current working directory. Since it can be told to load a single file, I think it would be better if it were made explicit in the storage pool XML, i.e.: <pool type="rbd"> <name>rbd</name> <source> <name>rbd</name> <config file="/etc/ceph/ceph.conf"/> <auth username="user" type="ceph"> <secret usage="mycephcluster"/> </auth> </source> </pool> <config> would be able to be used in addition to, or as an alternative to, a list of <host> elements. Would something along these lines this be suitable? Would it be better to use the <config> element's text content as the filename, rather than use an attribute? I'm not sure what style guidelines there are for something like this. The second part is of course to make a similar change to RBD-based domain disk definitions, i.e.: ... <disk type="network"> <driver name="qemu" type="raw"/> <source protocol="rbd" name="pool/volume"> <config file="/etc/ceph/ceph.conf"/> </source> <target dev="vda" bus="virtio"/> <auth username="user"> <secret type="ceph" usage="mycephcluster"/> </auth> </disk> ... Again, <config> could be used instead of or alongside some <host> elements. This is where it gets a little tricky. At the moment, <host> in a disk's source definition is entirely optional. Furthermore, QEMU _always_ loads a Ceph configuration file -- either one supplied as a "conf" argument for the block device, or one found through the search path mentioned earlier. The only way to suppress this is to pass conf=/dev/null... but for backwards-compatibility (users may be relying on QEMU's use of the search path), I don't think we can do this now. There's one final gotcha in all of this: if QEMU is given both a "conf" argument and a "mon_addr" argument, only the latter will take effect. This means if both <config> and <host> are supplied, then the <host> elements will override any monitor addresses from the configuration file. For consistency, I intend to make an RBD storage pool have the same behaviour. However, would it perhaps be better if the user could only choose _either_ <config> or a list of <host> elements? Personally, I don't think it's a big deal if the behaviour is clearly documented -- being able to load options from a config file while still defining hosts in the libvirt XML could be useful. Anyway, before I send my patches through I'm interested in hearing people's thoughts on this. All sound sane? Too intrusive? A waste of time? :-) - Michael

4 5

Re: [libvirt] [PATCH] network_conf.c: correct the value of the 'result' variable
by Hongwei Bi 01 Nov '13

01 Nov '13

2013/11/1 Eric Blake <eblake(a)redhat.com>: > [off-list] > > On 10/31/2013 06:20 PM, Hongwei Bi wrote: > > Your system clock is off. From your headers: > > Received: from localhost ([112.23.86.63]) > by mx.google.com with ESMTPSA id q4sm5224371pba.12.2013.10.31.09.39.20 > for <multiple recipients> > (version=TLSv1.2 cipher=RC4-SHA bits=128/128); > Thu, 31 Oct 2013 09:39:21 -0700 (PDT) > Date: Fri, 1 Nov 2013 08:20:12 +0800 > > your system claimed to have sent at 12:20 UTC on Friday, but your mail > server received it at 16:39 UTC on Thursday. Your clock is about 8 > hours off, and it messes up mail clients that sort threads by most > recent activity. > > -- > Eric Blake eblake redhat com +1-919-301-3266 > Libvirt virtualization library http://libvirt.org > According to the following link https://www.redhat.com/archives/libvir-list/2013-November/msg00016.html It seems that there is no need to add this patch. But the caller virNetworkDefFormatInternal() has a check of the return value which is described as " if (virNetworkDNSDefFormat(buf, &def->dns) < 0) ". So I think we should at least change one or the other.

2 2

[libvirt] RHBZ 1013045: Crash on xen domain startup: *** Error in `/usr/sbin/libvirtd': free(): invalid next size (fast): 0x00007f82c8003210 ***
by Jeremy Fitzhardinge 01 Nov '13

01 Nov '13

Hi all, I posted this bug (https://bugzilla.redhat.com/show_bug.cgi?id=1013045) to the Redhat Bugzilla a while ago, and the only response has been to post a note to this list about the bug. Summary below, but it looks like a pretty clear use-after-free or something. The full details are attached to the bug report. Thanks, J -- Description of problem: When starting a Xen domain with libvirt + libxl, it crashes after creating the domain. The domain is left in a paused state, and works fine if manually unpaused with xl unpause. virt-manager never shows the domain as running. [...] Steps to Reproduce: 1. Open virt-manager 2. Connect to localhost (xen) 3. Start a domain Actual results: Domain is created in a paused state, virt-manager shows errors about losing connection to the daemon. Logs show libvirtd crashed. Expected results: Domain creation. Additional info: Sep 27 09:08:30 saboo libvirtd[24880]: *** Error in `/usr/sbin/libvirtd': free(): invalid next size (fast): 0x00007f82c8003210 *** Sep 27 09:08:30 saboo libvirtd[24880]: ======= Backtrace: ========= Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libc.so.6(+0x365b27d0e8)[0x7f82f5a7a0e8] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libvirt.so.0(virFree+0x1a)[0x7f82f8f07d5a] Sep 27 09:08:30 saboo libvirtd[24880]: /usr/lib64/libvirt/connection-driver/libvirt_driver_libxl.so(+0x14b6c)[0x7f82e032bb6c] Sep 27 09:08:30 saboo libvirtd[24880]: /usr/lib64/libvirt/connection-driver/libvirt_driver_libxl.so(+0x154d4)[0x7f82e032c4d4] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libvirt.so.0(virDomainCreate+0xf7)[0x7f82f8fdb6b7] Sep 27 09:08:30 saboo libvirtd[24880]: /usr/sbin/libvirtd(+0x350c7)[0x7f82f9a1a0c7] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libvirt.so.0(virNetServerProgramDispatch+0x3ba)[0x7f82f90314aa] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libvirt.so.0(+0x3a33f822d8)[0x7f82f902c2d8] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libvirt.so.0(+0x3a33ea0c15)[0x7f82f8f4ac15] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libvirt.so.0(+0x3a33ea0691)[0x7f82f8f4a691] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libpthread.so.0(+0x365ba07c53)[0x7f82f61ccc53] Sep 27 09:08:30 saboo libvirtd[24880]: /lib64/libc.so.6(clone+0x6d)[0x7f82f5af2d3d]

5 15

[libvirt] [PATCH] fix api changes in xen restore
by Bamvor Jian Zhang 01 Nov '13

01 Nov '13

in recently xen commit: 7051d5c8, there is a api changes in libxl_domain_create_restore. Author: Andrew Cooper <andrew.cooper3(a)citrix.com> Date: Thu Oct 10 12:23:10 2013 +0100 tools/migrate: Fix regression when migrating from older version of Xen use the macro LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS in libxl.h in order to make libvirt could compile with old and new xen. the params checkpointed_stream is useful if libvirt libxl driver support migration. for new, set it as zero. Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> --- src/libxl/libxl_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 4928695..104ad31 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -555,6 +555,9 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, int managed_save_fd = -1; libxlDomainObjPrivatePtr priv = vm->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); +#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS + libxl_domain_restore_params params; +#endif if (libxlDomainObjPrivateInitCtx(vm) < 0) goto error; @@ -619,8 +622,14 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, ret = libxl_domain_create_new(priv->ctx, &d_config, &domid, NULL, NULL); else +#ifdef LIBXL_HAVE_DOMAIN_CREATE_RESTORE_PARAMS + params.checkpointed_stream = 0; + ret = libxl_domain_create_restore(priv->ctx, &d_config, &domid, + restore_fd, &params, NULL, NULL); +#else ret = libxl_domain_create_restore(priv->ctx, &d_config, &domid, restore_fd, NULL, NULL); +#endif if (ret) { if (restore_fd < 0) -- 1.8.1.4

3 2

[libvirt] the POLLHUP envet for a pipe descriptor is the cause that the libvirt_lxc costs 100% cpu usage.
by jj zhong 01 Nov '13

01 Nov '13

I found the poll in virEventPollRunOnce (vireventpoll.c), a POLLHUP event occurred for a pipe descriptor, thus the poll always returned because of it.( the pipe broken). this may be the best I could track temporarily，I don't know what to do netx , to mask the hangup event or to do something to handle the hangup event , what to do ? Is it a bug or something ? any help would be appreciate. :)

3 2

[libvirt] [PATCH] Use a port from the migration range for NBD as well
by Ján Tomko 01 Nov '13

01 Nov '13

Instead of using a port from the remote display range. --- src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index cb59620..4f35a7a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1115,7 +1115,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, goto cleanup; if (!port && - ((virPortAllocatorAcquire(driver->remotePorts, &port) < 0) || + ((virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) || (qemuMonitorNBDServerStart(priv->mon, listenAddr, port) < 0))) { qemuDomainObjExitMonitor(driver, vm); goto cleanup; -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix race in starting transient VMs
by Daniel P. Berrange 01 Nov '13

01 Nov '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When starting a transient VM the first thing done is to check for duplicates. The check looks if there are any running VMs with the matching name/uuid. It explicitly allows there to be inactive VMs, so that a persistent VM can be temporarily booted with a different config. There is a race condition, however, where 2 or more clients try to create the same transient VM. The first client will cause a virDomainObjPtr to be added to the domain list, and it is inactive at this stage. The second client may then come along and see this inactive VM, and mistake it for a persistent VM. If the first VM fails to start its transient guest for any reason, then it'll remove the virDomainObjPtr from the list. The second client now has a virDomainObjPtr that it can try to boot, which libvirt no longer has a record of. The result can be a running QEMU process that is orphaned. It was also, however, possible for the virDomainObjPtr to be completely free'd which will cause libvirtd to crash in some scenarios. The fix is to only allow an existing inactive VM if it is marked as persistent. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 51c4e29..454fbfe 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2171,6 +2171,12 @@ virDomainObjListAddLocked(virDomainObjListPtr doms, vm->def->name); goto error; } + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain is being started as '%s'"), + vm->def->name); + goto error; + } } virDomainObjAssignDef(vm, -- 1.8.3.1

2 4

[libvirt] [PATCH v2] xenapi: fix the coding stype in xenapi_driver.c
by Hongwei Bi 01 Nov '13

01 Nov '13

fix the if statement coding stype Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/xenapi/xenapi_driver.c | 63 ++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 21 deletions(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 4b522c0..c5b8d8f 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -437,7 +437,8 @@ xenapiConnectGetCapabilities(virConnectPtr conn) virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps; if (caps) { char *xml = virCapabilitiesFormatXML(caps); - if (!xml) goto cleanup; + if (!xml) + goto cleanup; return xml; } cleanup: @@ -704,7 +705,8 @@ xenapiDomainLookupByName(virConnectPtr conn, } } } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL); return NULL; } @@ -739,7 +741,8 @@ xenapiDomainSuspend(virDomainPtr dom) return 0; } } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -774,7 +777,8 @@ xenapiDomainResume(virDomainPtr dom) return 0; } } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -812,7 +816,8 @@ xenapiDomainShutdownFlags(virDomainPtr dom, unsigned int flags) return 0; } } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -855,7 +860,8 @@ xenapiDomainReboot(virDomainPtr dom, unsigned int flags) xen_vm_set_free(vms); return 0; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -899,7 +905,8 @@ xenapiDomainDestroyFlags(virDomainPtr dom, dom->id = -1; return 0; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -949,7 +956,8 @@ xenapiDomainGetOSType(virDomainPtr dom) xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); cleanup: - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); return ostype; } /* @@ -977,7 +985,8 @@ xenapiDomainGetMaxMemory(virDomainPtr dom) xen_vm_set_free(vms); return mem_static_max / 1024; } else { - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return 0; } @@ -1011,7 +1020,8 @@ xenapiDomainSetMaxMemory(virDomainPtr dom, unsigned long memory) } xen_vm_set_free(vms); } else { - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -1057,7 +1067,8 @@ xenapiDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) xen_vm_set_free(vms); return 0; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -1145,7 +1156,8 @@ xenapiDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, return 0; } } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -1198,7 +1210,8 @@ xenapiDomainPinVcpu(virDomainPtr dom, unsigned int vcpu ATTRIBUTE_UNUSED, return -1; } } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL); return -1; } @@ -1319,7 +1332,8 @@ xenapiDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) xen_vm_set_free(vms); return (int)maxvcpu; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, NULL); return -1; } @@ -1360,7 +1374,8 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) /* Flags checked by virDomainDefFormat */ - if (!xen_vm_get_by_name_label(session, &vms, dom->name)) return NULL; + if (!xen_vm_get_by_name_label(session, &vms, dom->name)) + return NULL; if (vms->size != 1) { xenapiSessionErrorHandler(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Domain name is not unique")); @@ -1524,7 +1539,8 @@ xenapiDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) } xen_vif_set_free(vif_set); } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xml = virDomainDefFormat(defPtr, flags); virDomainDefFree(defPtr); return xml; @@ -1654,7 +1670,8 @@ xenapiDomainCreateWithFlags(virDomainPtr dom, unsigned int flags) xen_vm_set_free(vms); } else { - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -1748,7 +1765,8 @@ xenapiDomainUndefineFlags(virDomainPtr dom, unsigned int flags) xen_vm_set_free(vms); return 0; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -1800,10 +1818,12 @@ xenapiDomainGetAutostart(virDomainPtr dom, int *autostart) } xen_vm_set_free(vms); xen_string_string_map_free(result); - if (flag == 0) return -1; + if (flag == 0) + return -1; return 0; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } @@ -1842,7 +1862,8 @@ xenapiDomainSetAutostart(virDomainPtr dom, int autostart) xen_vm_set_free(vms); return 0; } - if (vms) xen_vm_set_free(vms); + if (vms) + xen_vm_set_free(vms); xenapiSessionErrorHandler(dom->conn, VIR_ERR_NO_DOMAIN, NULL); return -1; } -- 1.8.1.2

3 2

[libvirt] [PATCH 0/3] Test our PCI device handling functions
by Michal Privoznik 01 Nov '13

01 Nov '13

*** BLURB HERE *** Michal Privoznik (3): tests: Introduce virpcitest virpcitest: Test virPCIDeviceDetach virpcitest: Introduce testVirPCIDeviceReattach .gitignore | 1 + cfg.mk | 4 +- tests/Makefile.am | 21 +- tests/virpcimock.c | 872 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/virpcitest.c | 184 +++++++++++ 5 files changed, 1078 insertions(+), 4 deletions(-) create mode 100644 tests/virpcimock.c create mode 100644 tests/virpcitest.c -- 1.8.1.5

2 6

[libvirt] [PATCH 0/2] Support IPv6 in port allocator
by Ján Tomko 01 Nov '13

01 Nov '13

This goes on top of: [PATCH v2 0/2] Report an error in virPortAllocatorAcquire if all ports are used https://www.redhat.com/archives/libvir-list/2013-October/msg01289.html v1: Support IPv6 in port allocator https://www.redhat.com/archives/libvir-list/2013-October/msg00007.html Ján Tomko (2): Split out bind() from virPortAllocatorAcquire Support IPv6 in port allocator src/util/virportallocator.c | 107 ++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 29 deletions(-) -- 1.8.1.5

3 7

[libvirt] [PATCH] storage: implement rudimentary glusterfs pool refresh
by Eric Blake 01 Nov '13

01 Nov '13

Actually put gfapi to use, by allowing the creation of a gluster pool. Right now, all volumes are treated as raw; further patches will allow peering into files to allow for qcow2 files and backing chains, and reporting proper volume allocation. I've reported a couple of glusterfs bugs; if we were to require a minimum of (not-yet-released) glusterfs 3.5, we could use the new glfs_readdir [1] and not worry about the bogus return value of glfs_fini [2], but for now I'm testing with Fedora 19's glusterfs 3.4.1. [1] http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00085.html [2] http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00086.html * src/storage/storage_backend_gluster.c (virStorageBackendGlusterRefreshPool): Initial implementation. (virStorageBackendGlusterOpen, virStorageBackendGlusterClose): New helper functions. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Depends on these pre-req patches: https://www.redhat.com/archives/libvir-list/2013-October/msg01266.html https://www.redhat.com/archives/libvir-list/2013-October/msg00913.html My next task - figuring out the use of glfs_open() to read metadata from a file and determine backing chains. src/storage/storage_backend_gluster.c | 138 ++++++++++++++++++++++++++++++++-- 1 file changed, 133 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index 2863c73..b0b6ce6 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -23,20 +23,148 @@ #include <glusterfs/api/glfs.h> -#include "virerror.h" #include "storage_backend_gluster.h" #include "storage_conf.h" +#include "viralloc.h" +#include "virerror.h" +#include "virlog.h" +#include "virstoragefile.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_STORAGE +struct _virStorageBackendGlusterState { + glfs_t *vol; +}; + +typedef struct _virStorageBackendGlusterState virStorageBackendGlusterState; +typedef virStorageBackendGlusterState *virStorageBackendGlusterStatePtr; + +static void +virStorageBackendGlusterClose(virStorageBackendGlusterStatePtr state) +{ + if (!state || !state->vol) + return; + /* Yuck - glusterfs-api-3.4.1 appears to always return -1 for + * glfs_fini, with errno containing random data, so there's no way + * to tell if it succeeded. 3.4.2 is supposed to fix this.*/ + if (glfs_fini(state->vol) < 0) + VIR_DEBUG("shutdown of gluster failed with errno %d", errno); +} + +static virStorageBackendGlusterStatePtr +virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) +{ + virStorageBackendGlusterStatePtr ret = NULL; + + if (VIR_ALLOC(ret) < 0) + return NULL; + + if (!(ret->vol = glfs_new(pool->def->source.name))) { + virReportOOMError(); + goto error; + } + + /* FIXME: allow alternate transport in the pool xml */ + if (glfs_set_volfile_server(ret->vol, "tcp", + pool->def->source.hosts[0].name, + pool->def->source.hosts[0].port) < 0 || + glfs_init(ret->vol) < 0) { + virReportSystemError(errno, _("failed to connect to gluster %s/%s"), + pool->def->source.hosts[0].name, + pool->def->name); + goto error; + } + + return ret; + +error: + virStorageBackendGlusterClose(ret); + return NULL; +} static int virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) + virStoragePoolObjPtr pool) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("gluster pool type not fully supported yet")); - return -1; + int ret = -1; + virStorageBackendGlusterStatePtr state = NULL; + struct { + struct dirent ent; + /* See comment below about readdir_r needing padding */ + char padding[MAX(1, 256 - (int) (sizeof(struct dirent) + - offsetof(struct dirent, d_name)))]; + } de; + struct dirent *ent; + glfs_fd_t *dir = NULL; + virStorageVolDefPtr vol = NULL; + struct statvfs sb; + + if (!(state = virStorageBackendGlusterOpen(pool))) + goto cleanup; + + /* Why oh why did glfs 3.4 decide to expose only readdir_r rather + * than readdir? POSIX admits that readdir_r is inherently a + * flawed design, because systems are not required to define + * NAME_MAX: http://austingroupbugs.net/view.php?id=696 + * http://womble.decadent.org.uk/readdir_r-advisory.html + * + * Fortunately, gluster uses _only_ XFS file systems, and XFS has + * a known NAME_MAX of 255; so we are guaranteed that if we + * provide 256 bytes of tail padding, then we have enough space to + * avoid buffer overflow no matter whether the OS used d_name[], + * d_name[1], or d_name[256] in its 'struct dirent'. + * http://lists.gnu.org/archive/html/gluster-devel/2013-10/msg00083.html + */ + + if (!(dir = glfs_opendir(state->vol, "."))) { + virReportSystemError(errno, _("cannot open path '%s'"), + pool->def->name); + goto cleanup; + } + while (!(errno = glfs_readdir_r(dir, &de.ent, &ent)) && ent) { + if (STREQ(ent->d_name, ".") || STREQ(ent->d_name, "..")) + continue; + if (VIR_ALLOC(vol) < 0 || + VIR_STRDUP(vol->name, ent->d_name) < 0) + goto cleanup; + /* FIXME - must open files to determine if they are non-raw */ + vol->type = VIR_STORAGE_VOL_NETWORK; + vol->target.format = VIR_STORAGE_FILE_RAW; + if (virAsprintf(&vol->key, "%s/%s", + pool->def->name, vol->name) < 0) + goto cleanup; + if (VIR_APPEND_ELEMENT(pool->volumes.objs, pool->volumes.count, + vol) < 0) + goto cleanup; + } + if (errno) { + virReportSystemError(errno, _("failed to read directory '%s'"), + pool->def->name); + goto cleanup; + } + + if (glfs_statvfs(state->vol, ".", &sb) < 0) { + virReportSystemError(errno, _("cannot statvfs path '%s'"), + pool->def->name); + goto cleanup; + } + + pool->def->capacity = ((unsigned long long)sb.f_frsize * + (unsigned long long)sb.f_blocks); + pool->def->available = ((unsigned long long)sb.f_bfree * + (unsigned long long)sb.f_frsize); + pool->def->allocation = pool->def->capacity - pool->def->available; + + ret = 0; +cleanup: + if (dir) + glfs_closedir(dir); + virStorageVolDefFree(vol); + virStorageBackendGlusterClose(state); + if (ret < 0) + virStoragePoolObjClearVols(pool); + return ret; } virStorageBackend virStorageBackendGluster = { -- 1.8.3.1

3 13