- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Fix EmulatorPinInfo without emulatorpin
by Martin Kletzander 31 Oct '12

31 Oct '12

https://bugzilla.redhat.com/show_bug.cgi?id=871312 Recent fixes made almost all the right steps to make emulator pinned to the cpuset of the whole domain in case <emulatorpin> isn't specified, but qemudDomainGetEmulatorPinInfo still reports all the CPUs even when cpuset is specified. This patch fixes that. --- src/qemu/qemu_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3980c10..8b5f06a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4352,7 +4352,6 @@ qemudDomainGetEmulatorPinInfo(virDomainPtr dom, virDomainDefPtr targetDef = NULL; int ret = -1; int maxcpu, hostcpus, pcpu; - virDomainVcpuPinDefPtr emulatorpin = NULL; virBitmapPtr cpumask = NULL; bool pinned; @@ -4394,14 +4393,15 @@ qemudDomainGetEmulatorPinInfo(virDomainPtr dom, cpumaps[maplen - 1] &= (1 << maxcpu % 8) - 1; } - /* If no emulatorpin, all cpus should be used */ - emulatorpin = targetDef->cputune.emulatorpin; - if (!emulatorpin) { + if (targetDef->cputune.emulatorpin) { + cpumask = targetDef->cputune.emulatorpin->cpumask; + } else if (targetDef->cpumask) { + cpumask = targetDef->cpumask; + } else { ret = 0; goto cleanup; } - cpumask = emulatorpin->cpumask; for (pcpu = 0; pcpu < maxcpu; pcpu++) { if (virBitmapGetBit(cpumask, pcpu, &pinned) < 0) goto cleanup; -- 1.7.12.4

2 2

[libvirt] [PATCH] nodeinfo: Add workaround if kernel reports bogous numa topology.
by Peter Krempa 31 Oct '12

31 Oct '12

This patch adds a workaround for the cpu topology detection code if the kernel reports incorrect count of numa nodes or any other reason that might result in duplicate core ID's in one socket. If such a situation is detected, the detection code reports the correct number of processors but the topology is mangled: $ virsh nodeinfo CPU model: x86_64 CPU(s): 24 CPU frequency: 2200 MHz CPU socket(s): 1 Core(s) per socket: 24 Thread(s) per core: 1 NUMA cell(s): 1 Memory size: 8047272 KiB This patch also adds test data for such a situation. Reported (and test data provided) by: gcbirzan on #virt@OFTC --- This patch looks huge but it's mostly test data. --- src/nodeinfo.c | 40 +- .../linux-test7/cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu0/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu1/online | 1 + .../linux-test7/cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu1/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu10/online | 1 + .../linux-test7/cpu/cpu10/topology/core_id | 1 + .../cpu/cpu10/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu10/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu11/online | 1 + .../linux-test7/cpu/cpu11/topology/core_id | 1 + .../cpu/cpu11/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu11/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu12/online | 1 + .../linux-test7/cpu/cpu12/topology/core_id | 1 + .../cpu/cpu12/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu12/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu13/online | 1 + .../linux-test7/cpu/cpu13/topology/core_id | 1 + .../cpu/cpu13/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu13/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu14/online | 1 + .../linux-test7/cpu/cpu14/topology/core_id | 1 + .../cpu/cpu14/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu14/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu15/online | 1 + .../linux-test7/cpu/cpu15/topology/core_id | 1 + .../cpu/cpu15/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu15/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu16/online | 1 + .../linux-test7/cpu/cpu16/topology/core_id | 1 + .../cpu/cpu16/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu16/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu17/online | 1 + .../linux-test7/cpu/cpu17/topology/core_id | 1 + .../cpu/cpu17/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu17/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu18/online | 1 + .../linux-test7/cpu/cpu18/topology/core_id | 1 + .../cpu/cpu18/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu18/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu19/online | 1 + .../linux-test7/cpu/cpu19/topology/core_id | 1 + .../cpu/cpu19/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu19/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu2/online | 1 + .../linux-test7/cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu2/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu20/online | 1 + .../linux-test7/cpu/cpu20/topology/core_id | 1 + .../cpu/cpu20/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu20/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu21/online | 1 + .../linux-test7/cpu/cpu21/topology/core_id | 1 + .../cpu/cpu21/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu21/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu22/online | 1 + .../linux-test7/cpu/cpu22/topology/core_id | 1 + .../cpu/cpu22/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu22/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu23/online | 1 + .../linux-test7/cpu/cpu23/topology/core_id | 1 + .../cpu/cpu23/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu23/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu3/online | 1 + .../linux-test7/cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu3/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu4/online | 1 + .../linux-test7/cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu4/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu5/online | 1 + .../linux-test7/cpu/cpu5/topology/core_id | 1 + .../cpu/cpu5/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu5/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu6/online | 1 + .../linux-test7/cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu6/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu7/online | 1 + .../linux-test7/cpu/cpu7/topology/core_id | 1 + .../cpu/cpu7/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu7/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu8/online | 1 + .../linux-test7/cpu/cpu8/topology/core_id | 1 + .../cpu/cpu8/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu8/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/cpu/cpu9/online | 1 + .../linux-test7/cpu/cpu9/topology/core_id | 1 + .../cpu/cpu9/topology/physical_package_id | 1 + .../linux-test7/cpu/cpu9/topology/thread_siblings | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu0 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu1 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu10 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu11 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu12 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu13 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu14 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu15 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu16 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu17 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu18 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu19 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu2 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu20 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu21 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu22 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu23 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu3 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu4 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu5 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu6 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu7 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu8 | 1 + tests/nodeinfodata/linux-test7/node/node0/cpu9 | 1 + tests/nodeinfodata/linux-test7/node/node0/meminfo | 29 + tests/nodeinfodata/linux-test7/node/online | 1 + tests/nodeinfodata/linux-test7/node/possible | 1 + tests/nodeinfodata/linux-x86-test7.cpuinfo | 648 +++++++++++++++++++++ tests/nodeinfodata/linux-x86-test7.expected | 1 + tests/nodeinfotest.c | 1 + 126 files changed, 833 insertions(+), 7 deletions(-) create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu0/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu0/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu0/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu1/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu1/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu1/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu1/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu10/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu10/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu10/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu10/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu11/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu11/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu11/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu11/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu12/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu12/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu12/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu12/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu13/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu13/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu13/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu13/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu14/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu14/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu14/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu14/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu15/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu15/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu15/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu15/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu16/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu16/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu16/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu16/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu17/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu17/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu17/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu17/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu18/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu18/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu18/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu18/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu19/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu19/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu19/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu19/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu2/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu2/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu2/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu2/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu20/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu20/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu20/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu20/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu21/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu21/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu21/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu21/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu22/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu22/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu22/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu22/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu23/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu23/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu23/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu23/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu3/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu3/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu3/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu3/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu4/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu4/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu4/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu4/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu5/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu5/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu5/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu5/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu6/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu6/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu6/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu6/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu7/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu7/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu7/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu7/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu8/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu8/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu8/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu8/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu9/online create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu9/topology/core_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu9/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-test7/cpu/cpu9/topology/thread_siblings create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu10 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu11 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu12 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu13 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu14 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu15 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu16 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu17 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu18 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu19 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu2 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu20 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu21 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu22 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu23 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu3 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu5 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu6 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu7 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu8 create mode 120000 tests/nodeinfodata/linux-test7/node/node0/cpu9 create mode 100644 tests/nodeinfodata/linux-test7/node/node0/meminfo create mode 100644 tests/nodeinfodata/linux-test7/node/online create mode 100644 tests/nodeinfodata/linux-test7/node/possible create mode 100644 tests/nodeinfodata/linux-x86-test7.cpuinfo create mode 100644 tests/nodeinfodata/linux-x86-test7.expected diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 8f96b8b..840910d 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -200,7 +200,9 @@ CPU_COUNT(cpu_set_t *set) # endif /* !CPU_COUNT */ /* parses a node entry, returning number of processors in the node and - * filling arguments */ + * filling arguments. + * Returns -1 on error, -2 if kernel reports invalid numa topology and number + * of processors in the node otherwise */ static int virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) @@ -219,6 +221,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) int siblings; unsigned int cpu; int online; + bool bad_topology = false; *threads = 0; *cores = 0; @@ -300,11 +303,14 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) core = virNodeGetCpuValue(node, cpu, "topology/core_id", false); # endif - CPU_SET(core, &core_maps[sock]); - if (!(siblings = virNodeCountThreadSiblings(node, cpu))) goto cleanup; + if (CPU_ISSET(core, &core_maps[sock]) && siblings <= 1) + bad_topology = true; + + CPU_SET(core, &core_maps[sock]); + if (siblings > *threads) *threads = siblings; @@ -338,6 +344,18 @@ cleanup: } VIR_FREE(core_maps); + /* WORKAROUND: This is needed if a kernel on a machine doesn't + * report the complete numa topology through sysfs. We will lie about + * the underlying topology just to correctly report the number of processors + */ + if (bad_topology) { + VIR_WARN("Kernel reports bogous numa topology."); + ret = -2; + *cores = processors; + *threads = 1; + *sockets = 1; + } + return ret; } @@ -470,8 +488,12 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, } if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, - &cores, &threads)) < 0) - goto cleanup; + &cores, &threads)) < 0) { + if (cpus == -2) + goto fallback; + else + goto cleanup; + } VIR_FREE(sysfs_cpudir); @@ -505,8 +527,12 @@ fallback: goto cleanup; } - if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, &cores, &threads)) < 0) - goto cleanup; + if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, &cores, &threads)) < 0) { + if (cpus != -2) + goto cleanup; + + cpus = cores; + } nodeinfo->nodes = 1; nodeinfo->cpus = cpus; diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/core_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/thread_siblings new file mode 100644 index 0000000..3dc19f2 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu0/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000001 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu1/online b/tests/nodeinfodata/linux-test7/cpu/cpu1/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu1/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/core_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/thread_siblings new file mode 100644 index 0000000..7d4e089 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu1/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000002 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu10/online b/tests/nodeinfodata/linux-test7/cpu/cpu10/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu10/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/core_id new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/core_id @@ -0,0 +1 @@ +4 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/thread_siblings new file mode 100644 index 0000000..de0e54d --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu10/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000400 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu11/online b/tests/nodeinfodata/linux-test7/cpu/cpu11/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu11/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/core_id new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/core_id @@ -0,0 +1 @@ +5 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/thread_siblings new file mode 100644 index 0000000..b1e6e03 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu11/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000800 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu12/online b/tests/nodeinfodata/linux-test7/cpu/cpu12/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu12/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/core_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/thread_siblings new file mode 100644 index 0000000..73f3cf7 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu12/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00001000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu13/online b/tests/nodeinfodata/linux-test7/cpu/cpu13/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu13/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/core_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/thread_siblings new file mode 100644 index 0000000..b60939a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu13/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00002000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu14/online b/tests/nodeinfodata/linux-test7/cpu/cpu14/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu14/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/core_id new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/core_id @@ -0,0 +1 @@ +2 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/thread_siblings new file mode 100644 index 0000000..0159580 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu14/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00004000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu15/online b/tests/nodeinfodata/linux-test7/cpu/cpu15/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu15/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/core_id new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/core_id @@ -0,0 +1 @@ +3 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/thread_siblings new file mode 100644 index 0000000..c5e4575 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu15/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00008000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu16/online b/tests/nodeinfodata/linux-test7/cpu/cpu16/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu16/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/core_id new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/core_id @@ -0,0 +1 @@ +4 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/thread_siblings new file mode 100644 index 0000000..a5a8466 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu16/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00010000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu17/online b/tests/nodeinfodata/linux-test7/cpu/cpu17/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu17/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/core_id new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/core_id @@ -0,0 +1 @@ +5 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/thread_siblings new file mode 100644 index 0000000..b563c50 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu17/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00020000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu18/online b/tests/nodeinfodata/linux-test7/cpu/cpu18/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu18/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/core_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/thread_siblings new file mode 100644 index 0000000..5bae96b --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu18/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00040000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu19/online b/tests/nodeinfodata/linux-test7/cpu/cpu19/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu19/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/core_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/thread_siblings new file mode 100644 index 0000000..03f1958 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu19/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00080000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu2/online b/tests/nodeinfodata/linux-test7/cpu/cpu2/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu2/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/core_id new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/core_id @@ -0,0 +1 @@ +2 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/thread_siblings new file mode 100644 index 0000000..bc1eab3 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu2/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000004 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu20/online b/tests/nodeinfodata/linux-test7/cpu/cpu20/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu20/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/core_id new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/core_id @@ -0,0 +1 @@ +2 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/thread_siblings new file mode 100644 index 0000000..a3242c0 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu20/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00100000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu21/online b/tests/nodeinfodata/linux-test7/cpu/cpu21/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu21/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/core_id new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/core_id @@ -0,0 +1 @@ +3 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/thread_siblings new file mode 100644 index 0000000..fac7d63 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu21/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00200000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu22/online b/tests/nodeinfodata/linux-test7/cpu/cpu22/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu22/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/core_id new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/core_id @@ -0,0 +1 @@ +4 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/thread_siblings new file mode 100644 index 0000000..74389e7 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu22/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00400000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu23/online b/tests/nodeinfodata/linux-test7/cpu/cpu23/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu23/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/core_id new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/core_id @@ -0,0 +1 @@ +5 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/physical_package_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/physical_package_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/thread_siblings new file mode 100644 index 0000000..6c55473 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu23/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00800000 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu3/online b/tests/nodeinfodata/linux-test7/cpu/cpu3/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu3/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/core_id new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/core_id @@ -0,0 +1 @@ +3 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/thread_siblings new file mode 100644 index 0000000..13c4744 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu3/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000008 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu4/online b/tests/nodeinfodata/linux-test7/cpu/cpu4/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu4/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/core_id new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/core_id @@ -0,0 +1 @@ +4 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/thread_siblings new file mode 100644 index 0000000..5ce9ab8 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu4/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000010 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu5/online b/tests/nodeinfodata/linux-test7/cpu/cpu5/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu5/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/core_id new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/core_id @@ -0,0 +1 @@ +5 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/thread_siblings new file mode 100644 index 0000000..ae752a0 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu5/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000020 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu6/online b/tests/nodeinfodata/linux-test7/cpu/cpu6/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu6/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/core_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/thread_siblings new file mode 100644 index 0000000..024ff71 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu6/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000040 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu7/online b/tests/nodeinfodata/linux-test7/cpu/cpu7/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu7/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/core_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/thread_siblings new file mode 100644 index 0000000..bb5a722 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu7/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000080 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu8/online b/tests/nodeinfodata/linux-test7/cpu/cpu8/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu8/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/core_id new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/core_id @@ -0,0 +1 @@ +2 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/thread_siblings new file mode 100644 index 0000000..5bd120b --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu8/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000100 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu9/online b/tests/nodeinfodata/linux-test7/cpu/cpu9/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu9/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/core_id b/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/core_id new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/core_id @@ -0,0 +1 @@ +3 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/physical_package_id b/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/thread_siblings b/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/thread_siblings new file mode 100644 index 0000000..3572438 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/cpu/cpu9/topology/thread_siblings @@ -0,0 +1 @@ +00000000,00000000,00000000,00000200 diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu0 b/tests/nodeinfodata/linux-test7/node/node0/cpu0 new file mode 120000 index 0000000..c841bea --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu0 @@ -0,0 +1 @@ +../../cpu/cpu0 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu1 b/tests/nodeinfodata/linux-test7/node/node0/cpu1 new file mode 120000 index 0000000..5f45362 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu1 @@ -0,0 +1 @@ +../../cpu/cpu1 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu10 b/tests/nodeinfodata/linux-test7/node/node0/cpu10 new file mode 120000 index 0000000..a6dc6bb --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu10 @@ -0,0 +1 @@ +../../cpu/cpu10 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu11 b/tests/nodeinfodata/linux-test7/node/node0/cpu11 new file mode 120000 index 0000000..e29d898 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu11 @@ -0,0 +1 @@ +../../cpu/cpu11 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu12 b/tests/nodeinfodata/linux-test7/node/node0/cpu12 new file mode 120000 index 0000000..211519e --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu12 @@ -0,0 +1 @@ +../../cpu/cpu12 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu13 b/tests/nodeinfodata/linux-test7/node/node0/cpu13 new file mode 120000 index 0000000..52d3b69 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu13 @@ -0,0 +1 @@ +../../cpu/cpu13 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu14 b/tests/nodeinfodata/linux-test7/node/node0/cpu14 new file mode 120000 index 0000000..24cb3b4 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu14 @@ -0,0 +1 @@ +../../cpu/cpu14 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu15 b/tests/nodeinfodata/linux-test7/node/node0/cpu15 new file mode 120000 index 0000000..e905d85 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu15 @@ -0,0 +1 @@ +../../cpu/cpu15 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu16 b/tests/nodeinfodata/linux-test7/node/node0/cpu16 new file mode 120000 index 0000000..445de40 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu16 @@ -0,0 +1 @@ +../../cpu/cpu16 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu17 b/tests/nodeinfodata/linux-test7/node/node0/cpu17 new file mode 120000 index 0000000..13929db --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu17 @@ -0,0 +1 @@ +../../cpu/cpu17 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu18 b/tests/nodeinfodata/linux-test7/node/node0/cpu18 new file mode 120000 index 0000000..3809adc --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu18 @@ -0,0 +1 @@ +../../cpu/cpu18 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu19 b/tests/nodeinfodata/linux-test7/node/node0/cpu19 new file mode 120000 index 0000000..c671083 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu19 @@ -0,0 +1 @@ +../../cpu/cpu19 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu2 b/tests/nodeinfodata/linux-test7/node/node0/cpu2 new file mode 120000 index 0000000..2dcca33 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu2 @@ -0,0 +1 @@ +../../cpu/cpu2 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu20 b/tests/nodeinfodata/linux-test7/node/node0/cpu20 new file mode 120000 index 0000000..a37c370 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu20 @@ -0,0 +1 @@ +../../cpu/cpu20 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu21 b/tests/nodeinfodata/linux-test7/node/node0/cpu21 new file mode 120000 index 0000000..68a7cad --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu21 @@ -0,0 +1 @@ +../../cpu/cpu21 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu22 b/tests/nodeinfodata/linux-test7/node/node0/cpu22 new file mode 120000 index 0000000..2c226ae --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu22 @@ -0,0 +1 @@ +../../cpu/cpu22 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu23 b/tests/nodeinfodata/linux-test7/node/node0/cpu23 new file mode 120000 index 0000000..75c2f57 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu23 @@ -0,0 +1 @@ +../../cpu/cpu23 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu3 b/tests/nodeinfodata/linux-test7/node/node0/cpu3 new file mode 120000 index 0000000..c7690e5 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu3 @@ -0,0 +1 @@ +../../cpu/cpu3 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu4 b/tests/nodeinfodata/linux-test7/node/node0/cpu4 new file mode 120000 index 0000000..9e77a64 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu4 @@ -0,0 +1 @@ +../../cpu/cpu4 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu5 b/tests/nodeinfodata/linux-test7/node/node0/cpu5 new file mode 120000 index 0000000..cc07c3b --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu5 @@ -0,0 +1 @@ +../../cpu/cpu5 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu6 b/tests/nodeinfodata/linux-test7/node/node0/cpu6 new file mode 120000 index 0000000..2e75763 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu6 @@ -0,0 +1 @@ +../../cpu/cpu6 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu7 b/tests/nodeinfodata/linux-test7/node/node0/cpu7 new file mode 120000 index 0000000..09e3f79 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu7 @@ -0,0 +1 @@ +../../cpu/cpu7 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu8 b/tests/nodeinfodata/linux-test7/node/node0/cpu8 new file mode 120000 index 0000000..bda10cc --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu8 @@ -0,0 +1 @@ +../../cpu/cpu8 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/cpu9 b/tests/nodeinfodata/linux-test7/node/node0/cpu9 new file mode 120000 index 0000000..1ec1db2 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/cpu9 @@ -0,0 +1 @@ +../../cpu/cpu9 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-test7/node/node0/meminfo b/tests/nodeinfodata/linux-test7/node/node0/meminfo new file mode 100644 index 0000000..09a9d24 --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/node0/meminfo @@ -0,0 +1,29 @@ +Node 0 MemTotal: 134215764 kB +Node 0 MemFree: 4659184 kB +Node 0 MemUsed: 129556580 kB +Node 0 Active: 57038240 kB +Node 0 Inactive: 50860308 kB +Node 0 Active(anon): 7992112 kB +Node 0 Inactive(anon): 2321780 kB +Node 0 Active(file): 49046128 kB +Node 0 Inactive(file): 48538528 kB +Node 0 Unevictable: 3492 kB +Node 0 Mlocked: 3492 kB +Node 0 Dirty: 7736 kB +Node 0 Writeback: 0 kB +Node 0 FilePages: 97948672 kB +Node 0 Mapped: 39292 kB +Node 0 AnonPages: 9953768 kB +Node 0 Shmem: 361396 kB +Node 0 KernelStack: 4792 kB +Node 0 PageTables: 48328 kB +Node 0 NFS_Unstable: 0 kB +Node 0 Bounce: 0 kB +Node 0 WritebackTmp: 0 kB +Node 0 Slab: 1572840 kB +Node 0 SReclaimable: 1463196 kB +Node 0 SUnreclaim: 109644 kB +Node 0 AnonHugePages: 9218048 kB +Node 0 HugePages_Total: 8192 +Node 0 HugePages_Free: 4466 +Node 0 HugePages_Surp: 0 diff --git a/tests/nodeinfodata/linux-test7/node/online b/tests/nodeinfodata/linux-test7/node/online new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/online @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-test7/node/possible b/tests/nodeinfodata/linux-test7/node/possible new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-test7/node/possible @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-x86-test7.cpuinfo b/tests/nodeinfodata/linux-x86-test7.cpuinfo new file mode 100644 index 0000000..4be2980 --- /dev/null +++ b/tests/nodeinfodata/linux-x86-test7.cpuinfo @@ -0,0 +1,648 @@ +processor : 0 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 0 +cpu cores : 12 +apicid : 16 +initial apicid : 0 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 1 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 1 +cpu cores : 12 +apicid : 17 +initial apicid : 1 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 2 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 2 +cpu cores : 12 +apicid : 18 +initial apicid : 2 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 3 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 3 +cpu cores : 12 +apicid : 19 +initial apicid : 3 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 4 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 4 +cpu cores : 12 +apicid : 20 +initial apicid : 4 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 5 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 5 +cpu cores : 12 +apicid : 21 +initial apicid : 5 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 6 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 0 +cpu cores : 12 +apicid : 22 +initial apicid : 6 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 7 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 1 +cpu cores : 12 +apicid : 23 +initial apicid : 7 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 8 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 2 +cpu cores : 12 +apicid : 24 +initial apicid : 8 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 9 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 3 +cpu cores : 12 +apicid : 25 +initial apicid : 9 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 10 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 4 +cpu cores : 12 +apicid : 26 +initial apicid : 10 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 11 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 0 +siblings : 12 +core id : 5 +cpu cores : 12 +apicid : 27 +initial apicid : 11 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.30 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 12 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 0 +cpu cores : 12 +apicid : 32 +initial apicid : 16 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 13 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 1 +cpu cores : 12 +apicid : 33 +initial apicid : 17 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 14 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 2 +cpu cores : 12 +apicid : 34 +initial apicid : 18 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 15 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 3 +cpu cores : 12 +apicid : 35 +initial apicid : 19 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 16 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 4 +cpu cores : 12 +apicid : 36 +initial apicid : 20 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 17 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 5 +cpu cores : 12 +apicid : 37 +initial apicid : 21 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 18 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 0 +cpu cores : 12 +apicid : 38 +initial apicid : 22 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 19 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 1 +cpu cores : 12 +apicid : 39 +initial apicid : 23 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 20 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 2 +cpu cores : 12 +apicid : 40 +initial apicid : 24 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 21 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 3 +cpu cores : 12 +apicid : 41 +initial apicid : 25 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 22 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 4 +cpu cores : 12 +apicid : 42 +initial apicid : 26 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + +processor : 23 +vendor_id : AuthenticAMD +cpu family : 16 +model : 9 +model name : AMD Opteron(tm) Processor 6174 +stepping : 1 +microcode : 0x10000d4 +cpu MHz : 2200.000 +cache size : 512 KB +physical id : 1 +siblings : 12 +core id : 5 +cpu cores : 12 +apicid : 43 +initial apicid : 27 +fpu : yes +fpu_exception : yes +cpuid level : 5 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm 3dnowext 3dnow constant_tsc rep_good nopl nonstop_tsc extd_apicid amd_dcm pni monitor cx16 popcnt lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs skinit wdt nodeid_msr hw_pstate npt lbrv svm_lock nrip_save pausefilter +bogomips : 4390.52 +TLB size : 1024 4K pages +clflush size : 64 +cache_alignment : 64 +address sizes : 48 bits physical, 48 bits virtual +power management: ts ttp tm stc 100mhzsteps hwpstate + diff --git a/tests/nodeinfodata/linux-x86-test7.expected b/tests/nodeinfodata/linux-x86-test7.expected new file mode 100644 index 0000000..e56360d --- /dev/null +++ b/tests/nodeinfodata/linux-x86-test7.expected @@ -0,0 +1 @@ +CPUs: 24/24, MHz: 2200, Nodes: 1, Sockets: 1, Cores: 24, Threads: 1 diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index c44cc8a..7dae580 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -131,6 +131,7 @@ mymain(void) "test4", "test5", "test6", + "test7", # endif }; -- 1.7.12.4

3 7

[libvirt] [PATCH] util: Improve error reporting from absolutePathFromBaseFile helper
by Peter Krempa 31 Oct '12

31 Oct '12

There are multiple reasons canonicalize_file_name() used in absolutePathFromBaseFile helper can fail. This patch enhances error reporting from that helper. --- src/util/storage_file.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/src/util/storage_file.c b/src/util/storage_file.c index e0b4178..f4c2943 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -530,22 +530,36 @@ qedGetBackingStore(char **res, static char * absolutePathFromBaseFile(const char *base_file, const char *path) { - char *res; - char *tmp; - size_t d_len = dir_len (base_file); + char *res = NULL; + char *tmp = NULL; + size_t d_len = dir_len(base_file); /* If path is already absolute, or if dirname(base_file) is ".", just return a copy of path. */ - if (*path == '/' || d_len == 0) - return canonicalize_file_name(path); + if (*path == '/' || d_len == 0) { + if (!(res = canonicalize_file_name(path))) + virReportSystemError(errno, + _("Can't canonicalize path '%s'"), path); + + goto cleanup; + } /* Ensure that the following cast-to-int is valid. */ - if (d_len > INT_MAX) - return NULL; + if (d_len > INT_MAX) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "Directory name too long: '%s'", base_file); + goto cleanup; + } - if (virAsprintf(&tmp, "%.*s/%s", (int) d_len, base_file, path) < 0) - return NULL; - res = canonicalize_file_name(tmp); + if (virAsprintf(&tmp, "%.*s/%s", (int) d_len, base_file, path) < 0) { + virReportOOMError(); + goto cleanup; + } + + if (!(res = canonicalize_file_name(tmp))) + virReportSystemError(errno, _("Can't canonicalize path '%s'"), path); + +cleanup: VIR_FREE(tmp); return res; } @@ -713,7 +727,6 @@ virStorageFileGetMetadataFromBuf(int format, meta->backingStoreRaw = meta->backingStore; meta->backingStore = absolutePathFromBaseFile(path, backing); if (meta->backingStore == NULL) { - virReportOOMError(); VIR_FREE(backing); return -1; } -- 1.7.12.4

2 2

[libvirt] [Libvirt] Support for HyperV Server 2012?
by Mark Ashton 31 Oct '12

31 Oct '12

Hi All, According to libvirt.org "The libvirt Microsoft Hyper-V driver can manage Hyper-V 2008 R2.". I have verified this after enabling HyperV in libvirt, building libvirt (+openwsman) and performing some management against a server running Hyper-V 2008 R2. What is the current level of support for Microsoft Hyper-V Server 2012? Are there plans to support Microsoft Hyper-V Server 2012 in a future release? If so, when is this likely to happen? Thanks in advance! Kind Regards, Mark

1 0

[libvirt] [PATCH 0/2] Make non-KVM machines work with QMP probing
by Martin Kletzander 31 Oct '12

31 Oct '12

This "series wannabe" fixes a problem with SW emulated machines not being able to be run with upstream qemu (no qemu-kvm + QMP probing). Libvirt currently sets QEMU_CAPS_KVM based on the fact that QEMU knows about 'query-kvm' QMP command. This not necessarily means that '-no-kvm' option needs to be supplied in order to disable KVM and that consequently leads to a non-startable domain when qemu doesn't know about the option. In order to fix this issue only with QMP, I thought about two possibilities, so... The first patch represents what's identical for both possibilities, whether the second one can be chosen from [2/2 v1] and [2/2 v2] (I didn't come up with better naming, sorry). Martin Kletzander (2): qemu: Enhance QMP detection of KVM state qemu: Fix SW emulated machines src/qemu/qemu_capabilities.c | 33 +++++++++++++++++++++++++++++- src/qemu/qemu_command.c | 6 ++++-- src/qemu/qemu_monitor.c | 23 +++++++++++++++++++++ src/qemu/qemu_monitor.h | 4 ++++ src/qemu/qemu_monitor_json.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 +++++ 6 files changed, 116 insertions(+), 3 deletions(-) -- 1.7.12.4

2 6

[libvirt] [PATCH] bugfix: ip6tables rule removal
by Gene Czarcinski 31 Oct '12

31 Oct '12

Three FORWARD chain rules are added and two INPUT chain rules are added when a network is started but only the FORWARD chain rules are removed when the network is destroyed. --- src/network/bridge_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f814f6f..3dbf009 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1578,6 +1578,8 @@ networkRemoveGeneralIp6tablesRules(struct network_driver *driver, if (!virNetworkDefGetIpByIndex(network->def, AF_INET6, 0)) return; + iptablesRemoveUdpInput(driver->iptables, AF_INET6, network->def->bridge, 53); + iptablesRemoveTcpInput(driver->iptables, AF_INET6, network->def->bridge, 53); iptablesRemoveForwardAllowCross(driver->iptables, AF_INET6, network->def->bridge); iptablesRemoveForwardRejectIn(driver->iptables, AF_INET6, network->def->bridge); iptablesRemoveForwardRejectOut(driver->iptables, AF_INET6, network->def->bridge); -- 1.7.11.7

2 1

[libvirt] [PATCH] maint: log xml during volume creation
by Eric Blake 31 Oct '12

31 Oct '12

I noticed this while answering a list question about Java bindings of volume creation. * src/libvirt.c (virStorageVolCreateXML) (virStorageVolCreateXMLFrom): Use consistent spelling of xmlDesc, and log the argument. --- Pushing under the trivial rule. src/libvirt.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 8e01443..2a01b80 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -13298,7 +13298,7 @@ virStorageVolGetKey(virStorageVolPtr vol) /** * virStorageVolCreateXML: * @pool: pointer to storage pool - * @xmldesc: description of volume to create + * @xmlDesc: description of volume to create * @flags: extra flags; not used yet, so callers should always pass 0 * * Create a storage volume within a pool based @@ -13309,10 +13309,10 @@ virStorageVolGetKey(virStorageVolPtr vol) */ virStorageVolPtr virStorageVolCreateXML(virStoragePoolPtr pool, - const char *xmldesc, + const char *xmlDesc, unsigned int flags) { - VIR_DEBUG("pool=%p, flags=%x", pool, flags); + VIR_DEBUG("pool=%p, xmlDesc=%s, flags=%x", pool, xmlDesc, flags); virResetLastError(); @@ -13322,7 +13322,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, return NULL; } - virCheckNonNullArgGoto(xmldesc, error); + virCheckNonNullArgGoto(xmlDesc, error); if (pool->conn->flags & VIR_CONNECT_RO) { virLibConnError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); @@ -13331,7 +13331,7 @@ virStorageVolCreateXML(virStoragePoolPtr pool, if (pool->conn->storageDriver && pool->conn->storageDriver->volCreateXML) { virStorageVolPtr ret; - ret = pool->conn->storageDriver->volCreateXML (pool, xmldesc, flags); + ret = pool->conn->storageDriver->volCreateXML (pool, xmlDesc, flags); if (!ret) goto error; return ret; @@ -13348,7 +13348,7 @@ error: /** * virStorageVolCreateXMLFrom: * @pool: pointer to parent pool for the new volume - * @xmldesc: description of volume to create + * @xmlDesc: description of volume to create * @clonevol: storage volume to use as input * @flags: extra flags; not used yet, so callers should always pass 0 * @@ -13361,11 +13361,12 @@ error: */ virStorageVolPtr virStorageVolCreateXMLFrom(virStoragePoolPtr pool, - const char *xmldesc, + const char *xmlDesc, virStorageVolPtr clonevol, unsigned int flags) { - VIR_DEBUG("pool=%p, flags=%x, clonevol=%p", pool, flags, clonevol); + VIR_DEBUG("pool=%p, xmlDesc=%s, clonevol=%p, flags=%x", + pool, xmlDesc, clonevol, flags); virResetLastError(); @@ -13380,7 +13381,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, goto error; } - virCheckNonNullArgGoto(xmldesc, error); + virCheckNonNullArgGoto(xmlDesc, error); if (pool->conn->flags & VIR_CONNECT_RO || clonevol->conn->flags & VIR_CONNECT_RO) { @@ -13391,7 +13392,7 @@ virStorageVolCreateXMLFrom(virStoragePoolPtr pool, if (pool->conn->storageDriver && pool->conn->storageDriver->volCreateXMLFrom) { virStorageVolPtr ret; - ret = pool->conn->storageDriver->volCreateXMLFrom (pool, xmldesc, + ret = pool->conn->storageDriver->volCreateXMLFrom (pool, xmlDesc, clonevol, flags); if (!ret) goto error; -- 1.7.11.7

1 0

[libvirt] [PATCH] Create temporary dir for socket
by Guido Günther 31 Oct '12

31 Oct '12

to avoid ENAMETOOLONG: https://buildd.debian.org/status/fetch.php?pkg=libvirt&arch=amd64&ver=1.0.0… --- tests/qemumonitortestutils.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 7133c99..1369cb7 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -424,9 +424,23 @@ static qemuMonitorCallbacks qemuCallbacks = { qemuMonitorTestPtr qemuMonitorTestNew(bool json, virCapsPtr caps) { qemuMonitorTestPtr test; - const char *path = abs_builddir "/qemumonitorjsontest.sock"; virDomainChrSourceDef src; + char *tmpdir = NULL, *path = NULL; + char template[] = "/tmp/libvirt_XXXXXX"; + + tmpdir = mkdtemp(template); + if (tmpdir == NULL) { + virReportSystemError(errno, "%s", + "Failed to create temporary directory"); + goto error; + } + + if (virAsprintf(&path, "%s/qemumonitorjsontest.sock", tmpdir) < 0) { + virReportOOMError(); + goto error; + } + memset(&src, 0, sizeof(src)); src.type = VIR_DOMAIN_CHR_TYPE_UNIX; src.data.nix.path = (char *)path; @@ -494,11 +508,15 @@ qemuMonitorTestPtr qemuMonitorTestNew(bool json, virCapsPtr caps) test->running = true; virMutexUnlock(&test->lock); +cleanup: + if (tmpdir) + rmdir(tmpdir); + VIR_FREE(path); return test; error: qemuMonitorTestFree(test); - return NULL; + goto cleanup; } qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test) -- 1.7.10.4

2 2

[libvirt] [PATCH] util: do a better job of matching up pids with their binaries
by Laine Stump 31 Oct '12

31 Oct '12

This patch resolves: https://bugzilla.redhat.com/show_bug.cgi?id=871201 If libvirt is restarted after updating the dnsmasq or radvd packages, a subsequent "virsh net-destroy" will fail to kill the dnsmasq/radvd process. The problem is that when libvirtd restarts, it re-reads the dnsmasq and radvd pidfiles, then does a sanity check on each pid it finds, including checking that the symbolic link in /proc/$pid/exe actually points to the same file as the path used by libvirt to execute the binary in the first place. If this fails, libvirt assumes that the process is no longer alive. But if the original binary has been replaced, the link in /proc is set to "$binarypath (deleted)" (it literally has the string " (deleted)" appended to the link text stored in the filesystem), so even if a new binary exists in the same location, attempts to resolve the link will fail. In the end, not only is the old dnsmasq/radvd not terminated when the network is stopped, but a new dnsmasq can't be started when the network is later restarted (because the original process is still listening on the ports that the new process wants). The solution is, when the initial "use stat to check for identical inodes" check for identity between /proc/$pid/exe and $binpath fails, to check /proc/$pid/exe for a link ending with " (deleted)" and if so, truncate that part of the link and compare what's left with the original binarypath. A twist to this problem is that on systems with "merged" /sbin and /usr/sbin (i.e. /sbin is really just a symlink to /usr/sbin; Fedora 17+ is an example of this), libvirt may have started the process using one path, but /proc/$pid/exe lists a different path (indeed, on F17 this is the case - libvirtd uses /sbin/dnsmasq, but /proc/$pid/exe shows "/usr/sbin/dnsmasq"). The further bit of code to resolve this is to call virFileResolveAllLinks() on both the original binarypath and on the truncated link we read from /proc/$pid/exe, and compare the results. The resulting code still succeeds in all the same cases it did before, but also succeeds if the binary was deleted or replaced after it was started. --- src/util/virpidfile.c | 92 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 19 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index c2a087d..cb8a992 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -35,6 +35,7 @@ #include "logging.h" #include "virterror_internal.h" #include "c-ctype.h" +#include "areadlink.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -203,38 +204,91 @@ int virPidFileRead(const char *dir, */ int virPidFileReadPathIfAlive(const char *path, pid_t *pid, - const char *binpath) + const char *binPath) { - int rc; - char *procpath = NULL; + int ret, retPid; + bool isLink; + char *procPath = NULL; + char *procLink = NULL; + size_t procLinkLen; + char *resolvedBinPath = NULL; + char *resolvedProcLink = NULL; + const char deletedText[] = " (deleted)"; + size_t deletedTextLen = strlen(deletedText); + - rc = virPidFileReadPath(path, pid); - if (rc < 0) - return rc; + /* only set this at the very end on success */ + *pid = -1; + + if ((ret = virPidFileReadPath(path, &retPid)) < 0) + goto cleanup; #ifndef WIN32 /* Check that it's still alive. Safe to skip this sanity check on * mingw, which lacks kill(). */ - if (kill(*pid, 0) < 0) { - *pid = -1; - return 0; + if (kill(retPid, 0) < 0) { + ret = 0; + retPid = -1; + goto cleanup; } #endif - if (binpath) { - if (virAsprintf(&procpath, "/proc/%lld/exe", (long long)*pid) < 0) { - *pid = -1; - return -1; - } + if (!binPath) { + /* we only knew the pid, and that pid is alive, so we can + * return it. + */ + ret = 0; + goto cleanup; + } + + if (virAsprintf(&procPath, "/proc/%lld/exe", (long long)retPid) < 0) { + ret = -ENOMEM; + goto cleanup; + } - if (virFileIsLink(procpath) && - virFileLinkPointsTo(procpath, binpath) == 0) - *pid = -1; + if ((ret = virFileIsLink(procPath)) < 0) + goto cleanup; + isLink = ret; - VIR_FREE(procpath); + if (isLink && virFileLinkPointsTo(procPath, binPath)) { + /* the link in /proc/$pid/exe is a symlink to a file + * that has the same inode as the file at binpath. + */ + ret = 0; + goto cleanup; } - return 0; + /* Even if virFileLinkPointsTo returns a mismatch, it could be + * that the binary was deleted/replaced after it was executed. In + * that case the link in /proc/$pid/exe will contain + * "$procpath (deleted)". Read that link, remove the " (deleted)" + * part, and see if it has the same canonicalized name as binpath. + */ + if (!(procLink = areadlink(procPath))) { + ret = -errno; + goto cleanup; + } + procLinkLen = strlen(procLink); + if (procLinkLen > deletedTextLen) + procLink[procLinkLen - deletedTextLen] = 0; + + if ((ret = virFileResolveAllLinks(binPath, &resolvedBinPath)) < 0) + goto cleanup; + if ((ret = virFileResolveAllLinks(procLink, &resolvedProcLink)) < 0) + goto cleanup; + + ret = STREQ(resolvedBinPath, resolvedProcLink) ? 0 : -1; + +cleanup: + VIR_FREE(procPath); + VIR_FREE(procLink); + VIR_FREE(resolvedProcLink); + VIR_FREE(resolvedBinPath); + + /* return the originally set pid of -1 unless we proclaim success */ + if (ret == 0) + *pid = retPid; + return ret; } -- 1.7.11.7

2 3

[libvirt] [PATCH] cpu: Fix definition of flag smap
by Peter Krempa 30 Oct '12

30 Oct '12

A mild case of dyslexia caused that commit 012f9b19ef3812884e207dc431571502de4cebce specifies wrong mask for the smap cpu feature flag. This patch fixes that mistake. --- The flags definition file in qemu can be accessed at: http://git.qemu.org/?p=qemu.git;a=blob;f=target-i386/cpu.c;h=f3708e63b76541… --- src/cpu/cpu_map.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index d059e20..f0a1f04 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -270,7 +270,7 @@ <cpuid function='0x00000007' ebx='0x00000080'/> </feature> <feature name='smap'> - <cpuid function='0x00000007' ebx='0x00080000'/> + <cpuid function='0x00000007' ebx='0x00100000'/> </feature>  -- 1.7.12.4

2 2

[libvirt] [jbrooks@redhat.com: [Users] oVirt at LinuxCon Europe Next Week]
by Dave Allan 30 Oct '12

30 Oct '12

FYI, there's a bunch of oVirt related stuff going on at LinuxCon next week. ----- Forwarded message from Jason Brooks <jbrooks(a)redhat.com> ----- Date: Mon, 29 Oct 2012 14:11:29 -0700 From: Jason Brooks <jbrooks(a)redhat.com> To: oVirt Mailing List <users(a)ovirt.org>, announce(a)ovirt.org Subject: [Users] oVirt at LinuxCon Europe Next Week User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121016 Thunderbird/16.0.1 LinuxCon Europe 2012 is taking place next week in Barcelona, Spain, alongside a cluster of related workshops and summits, several of which will focus on the oVirt Project. If you are planning on attending LinuxCon Europe next week, it should provide a great opportunity to connect with other oVirt community members in attendance. If you know others outside the community who plan to be at LinuxCon Europe, and who may be interested in learning more about oVirt, please pass along this information. On Monday November 5, from 10:30am to 7:00pm, and continuing on Tuesday from 10:30am to 4:30pm, there will be a Technology Showcase with booths from LinuxCon Europe exhibitors. The oVirt Project will be in booth #22, on the ground floor of the Hotel Fira Palace. On Tuesday November 6, the oVirt Project's own Itamar Heim, from Red Hat, will giving the talk, "Introduction to the oVirt Virtualization Management Platform," from 2:15 pm to 3:10pm, at the Hotel Fira Palace, in the Verdi room, as part of the CloudOpen Summit. On Wednesday November 7, the oVirt Workshop will kick off at 9am in the L'ARIA Restaurant, before covering an introduction to oVirt, architecture and roadmap presentations, and deep dives into oVirt networking and storage, leading up to a Hands-On Install & Play Lab from 3:30pm to 6:00pm. Also on Wednesday, at the KVM Forum, there will be an oVirt Demo from 5:30pm to 6:00pm in the Ambar room. On Thursday November 8, the oVirt Workshop resumes at 9:00am in the Rubi room, with a full day of sessions devoted to oVirt integration topics. Also on Thursday, at 11:15am, Red Hat's Vijay Bellur will be giving a talk on "Integrating GlusterFS, oVirt and KVM" as part of the Gluster Workshop, in the Vivaldi room. On Friday November 9, the oVirt Workshop will begin its final day with a brief keynote in the Ambar room, before proceeding with a day of developer-focused topics back in the Rubi room. For details on the oVirt Workshop agenda, see the schedule at http://events.linuxfoundation.org/events/kvm-forum/schedule. For information about LinuxCon Europe 2012, see event site at http://events.linuxfoundation.org/events/linuxcon-europe. _______________________________________________ Users mailing list Users(a)ovirt.org http://lists.ovirt.org/mailman/listinfo/users ----- End forwarded message -----

2 1

[libvirt] [PATCH] nodeinfotest: Delete NUL bytes from test data
by Peter Krempa 30 Oct '12

30 Oct '12

The test data contained extra \0 bytes after newlines probably due to a kernel off-by-one bug. --- Pushed under the trivial rule. --- tests/nodeinfodata/linux-test3/node/possible | Bin 5 -> 4 bytes tests/nodeinfodata/linux-test4/node/possible | Bin 5 -> 4 bytes tests/nodeinfodata/linux-test6/node/online | Bin 3 -> 2 bytes tests/nodeinfodata/linux-test6/node/possible | Bin 3 -> 2 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/nodeinfodata/linux-test3/node/possible b/tests/nodeinfodata/linux-test3/node/possible index 21408fdea85537c7277785de368c5cef105e30ed..74fc2fb6b048c39d90b0c17de3824095162634f8 100644 GIT binary patch literal 4 LcmXreHRl2V0mA^F literal 5 McmXreHRoag00LqFp8x;= diff --git a/tests/nodeinfodata/linux-test4/node/possible b/tests/nodeinfodata/linux-test4/node/possible index 138b411f24a5cecb7a254a97b9584b276c805be2..8b0fab869c1d36fcc3c0dc686412f10644aef53a 100644 GIT binary patch literal 4 LcmXreHRJ*S0k;5| literal 5 McmXreHRNId00K||nE(I) diff --git a/tests/nodeinfodata/linux-test6/node/online b/tests/nodeinfodata/linux-test6/node/online index c1da2e294b3f3646e368cc0056986632de06e2cc..573541ac9702dd3969c9bc859d2b91ec1f7e6e56 100644 GIT binary patch literal 2 JcmXru0ssJP06PEx literal 3 KcmXruVgLXDrvN(u diff --git a/tests/nodeinfodata/linux-test6/node/possible b/tests/nodeinfodata/linux-test6/node/possible index c1da2e294b3f3646e368cc0056986632de06e2cc..573541ac9702dd3969c9bc859d2b91ec1f7e6e56 100644 GIT binary patch literal 2 JcmXru0ssJP06PEx literal 3 KcmXruVgLXDrvN(u -- 1.7.12.4

1 0

[libvirt] [PATCH v2] sanlock: Introduce 'user' and 'group' conf variables
by Michal Privoznik 30 Oct '12

30 Oct '12

through which user set under what permissions does sanlock daemon run so libvirt will set the same permissions for files exposed to it. --- diff to v1: -update spec file so sanlock dir is installed with root:sanlock iff group sanlock exists docs/locking.html.in | 22 +++++++++ libvirt.spec.in | 7 +++ src/locking/libvirt_sanlock.aug | 2 + src/locking/lock_driver_sanlock.c | 76 ++++++++++++++++++++++++++++++- src/locking/sanlock.conf | 11 ++++- src/locking/test_libvirt_sanlock.aug.in | 2 + 6 files changed, 118 insertions(+), 2 deletions(-) diff --git a/docs/locking.html.in b/docs/locking.html.in index 6d7b517..19dd6a3 100644 --- a/docs/locking.html.in +++ b/docs/locking.html.in @@ -121,6 +121,28 @@ </pre> + If your sanlock daemon happen to run under non-root + privileges, you need to tell this to libvirt so it + chowns created files correctly. This can be done by + setting <code>user</code> and/or <code>group</code> + variables in the configuration file. Accepted values + range is specified in description to the same + variables in <code>/etc/libvirt/qemu.conf</code>. For + example: + + + <pre> + augtool -s set /files/etc/libvirt/qemu-sanlock.conf/user sanlock + augtool -s set /files/etc/libvirt/qemu-sanlock.conf/group sanlock + </pre> + + + But remember, that if this is NFS share, you need a + no_root_squash-ed one for chown (and chmod possibly) + to succeed. + + + In terms of storage requirements, if the filesystem uses 512 byte sectors, you need to allow for <code>1MB</code> of storage for each guest disk. So if you have a network diff --git a/libvirt.spec.in b/libvirt.spec.in index ebebfab..edc43af 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1568,6 +1568,13 @@ fi /bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || : %endif +%pre lock-sanlock +if $(getent group sanlock > /dev/null; echo $?) == 0 + chmod 0770 %{_localstatedir}/lib/libvirt/sanlock + chown root:sanlock %{_localstatedir}/lib/libvirt/sanlock +endif + + %files %defattr(-, root, root) diff --git a/src/locking/libvirt_sanlock.aug b/src/locking/libvirt_sanlock.aug index d65b002..a78a444 100644 --- a/src/locking/libvirt_sanlock.aug +++ b/src/locking/libvirt_sanlock.aug @@ -22,6 +22,8 @@ module Libvirt_sanlock = | int_entry "host_id" | bool_entry "require_lease_for_disks" | bool_entry "ignore_readonly_and_shared_disks" + | str_entry "user" + | str_entry "group" let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 4682701..d988a6d 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -71,6 +71,10 @@ struct _virLockManagerSanlockDriver { int hostID; bool autoDiskLease; char *autoDiskLeasePath; + + /* under which permissions does sanlock run */ + uid_t user; + gid_t group; }; static virLockManagerSanlockDriver *driver = NULL; @@ -94,6 +98,7 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) { virConfPtr conf; virConfValuePtr p; + char *tmp; if (access(configFile, R_OK) == -1) { if (errno != ENOENT) { @@ -142,6 +147,39 @@ static int virLockManagerSanlockLoadConfig(const char *configFile) else driver->requireLeaseForDisks = !driver->autoDiskLease; + p = virConfGetValue(conf, "user"); + CHECK_TYPE("user", VIR_CONF_STRING); + if (p) { + if (!(tmp = strdup(p->str))) { + virReportOOMError(); + virConfFree(conf); + return -1; + } + + if (virGetUserID(tmp, &driver->user) < 0) { + VIR_FREE(tmp); + virConfFree(conf); + return -1; + } + VIR_FREE(tmp); + } + + p = virConfGetValue (conf, "group"); + CHECK_TYPE ("group", VIR_CONF_STRING); + if (p) { + if (!(tmp = strdup(p->str))) { + virReportOOMError(); + virConfFree(conf); + return -1; + } + if (virGetGroupID(tmp, &driver->group) < 0) { + VIR_FREE(tmp); + virConfFree(conf); + return -1; + } + VIR_FREE(tmp); + } + virConfFree(conf); return 0; } @@ -177,6 +215,7 @@ static int virLockManagerSanlockSetupLockspace(void) * space allocated for it and is initialized with lease */ if (stat(path, &st) < 0) { + int perms = 0600; VIR_DEBUG("Lockspace %s does not yet exist", path); if (!(dir = mdir_name(path))) { @@ -191,7 +230,10 @@ static int virLockManagerSanlockSetupLockspace(void) goto error; } - if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, 0600)) < 0) { + if (driver->group != -1) + perms |= 0060; + + if ((fd = open(path, O_WRONLY|O_CREAT|O_EXCL, perms)) < 0) { if (errno != EEXIST) { virReportSystemError(errno, _("Unable to create lockspace %s"), @@ -200,6 +242,17 @@ static int virLockManagerSanlockSetupLockspace(void) } VIR_DEBUG("Someone else just created lockspace %s", path); } else { + /* chown() the path to make sure sanlock can access it */ + if ((driver->user != -1 || driver->group != -1) && + (fchown(fd, driver->user, driver->group) < 0)) { + virReportSystemError(errno, + _("cannot chown '%s' to (%u, %u)"), + path, + (unsigned int) driver->user, + (unsigned int) driver->group); + goto error_unlink; + } + if ((rv = sanlock_align(&ls.host_id_disk)) < 0) { if (rv <= -200) virReportError(VIR_ERR_INTERNAL_ERROR, @@ -242,6 +295,26 @@ static int virLockManagerSanlockSetupLockspace(void) } VIR_DEBUG("Lockspace %s has been initialized", path); } + } else if (S_ISREG(st.st_mode)) { + /* okay, the lease file exists. Check the permissions */ + if (((driver->user != -1 && driver->user != st.st_uid) || + (driver->group != -1 && driver->group != st.st_gid)) && + (chown(path, driver->user, driver->group) < 0)) { + virReportSystemError(errno, + _("cannot chown '%s' to (%u, %u)"), + path, + (unsigned int) driver->user, + (unsigned int) driver->group); + goto error; + } + + if ((driver->group != -1 && (st.st_mode & 0060) != 0060) && + chmod(path, 0660) < 0) { + virReportSystemError(errno, + _("cannot chmod '%s' to 0660"), + path); + goto error; + } } ls.host_id = driver->hostID; @@ -299,6 +372,7 @@ static int virLockManagerSanlockInit(unsigned int version, driver->requireLeaseForDisks = true; driver->hostID = 0; driver->autoDiskLease = false; + driver->user = driver->group = -1; if (!(driver->autoDiskLeasePath = strdup(LOCALSTATEDIR "/lib/libvirt/sanlock"))) { VIR_FREE(driver); virReportOOMError(); diff --git a/src/locking/sanlock.conf b/src/locking/sanlock.conf index efc35ee..40ece65 100644 --- a/src/locking/sanlock.conf +++ b/src/locking/sanlock.conf @@ -29,7 +29,8 @@ # # Recommendation is to just mount this default location as # an NFS volume. Uncomment this, if you would prefer the mount -# point to be somewhere else. +# point to be somewhere else. Moreover, please make sure +# sanlock daemon can access the specified path. # #disk_lease_dir = "/var/lib/libvirt/sanlock" @@ -52,3 +53,11 @@ # to enabled, otherwise it defaults to disabled. # #require_lease_for_disks = 1 + +# +# The combination of user and group under which the sanlock +# daemon runs. Libvirt will chown created files (like +# content of disk_lease_dir) to make sure sanlock daemon can +# access them. Accepted values are described in qemu.conf. +#user = "root" +#group = "root" diff --git a/src/locking/test_libvirt_sanlock.aug.in b/src/locking/test_libvirt_sanlock.aug.in index 288f329..ef98ea6 100644 --- a/src/locking/test_libvirt_sanlock.aug.in +++ b/src/locking/test_libvirt_sanlock.aug.in @@ -6,3 +6,5 @@ module Test_libvirt_sanlock = { "disk_lease_dir" = "/var/lib/libvirt/sanlock" } { "host_id" = "1" } { "require_lease_for_disks" = "1" } +{ "user" = "root" } +{ "group" = "root" } -- 1.7.8.6

2 3

[libvirt] [PATCH 0/2] qemu: Fix <address/> is ignored for USB disks
by Vladislav Bogdanov 30 Oct '12

30 Oct '12

This is a follow-up to https://bugzilla.redhat.com/show_bug.cgi?id=861309 If one has USB disks configured for domain with explicit <address/>, libvirtd ignores that node when building qemu command line. So, disk is connected to the first free USB port implicitly by qemu. That breaks other USB devices which have explicit <address/> - ports they should be connected to may be already occupied by disks. With first patch applied, if one has USB disk connected to the USB hub, qemu fails to start, because it does not know anything about hubs yet (when parsing disks). That's why second patch is needed. Vladislav Bogdanov (2): qemu: Do not ignore address for USB disks qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly

3 5

[libvirt] can not create "qcow2" format volume by Java library.
by zhijun liu 30 Oct '12

30 Oct '12

hi，all, when I use Java library to create volume ,specified format "qcow2"，but when I check it use qemu-img info ,it show format is "raw".。 I think it a bug,can you fix it .. thanks very much. the java library version：0.4.8 libvirt version：0.9.8

1 0

[libvirt] [PATCH] esx: Fix connection to ESX 5.1
by Martin Kletzander 30 Oct '12

30 Oct '12

After separating 5.x and 5.1 versions of ESX, we forgot to add 5.1 into the list of allowed connections, so connections to 5.1 fail since v1.0.0-rc1-5-g1e7cd39 --- src/esx/esx_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 8d13829..2aa6978 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -718,6 +718,7 @@ esxConnectToHost(virConnectPtr conn, priv->host->productVersion != esxVI_ProductVersion_ESX41 && priv->host->productVersion != esxVI_ProductVersion_ESX4x && priv->host->productVersion != esxVI_ProductVersion_ESX50 && + priv->host->productVersion != esxVI_ProductVersion_ESX51 && priv->host->productVersion != esxVI_ProductVersion_ESX5x) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s is neither an ESX 3.5, 4.x nor 5.x host"), @@ -847,6 +848,7 @@ esxConnectToVCenter(virConnectPtr conn, priv->vCenter->productVersion != esxVI_ProductVersion_VPX41 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX4x && priv->vCenter->productVersion != esxVI_ProductVersion_VPX50 && + priv->vCenter->productVersion != esxVI_ProductVersion_VPX51 && priv->vCenter->productVersion != esxVI_ProductVersion_VPX5x) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s is neither a vCenter 2.5, 4.x nor 5.x server"), -- 1.7.12.4

2 2

[libvirt] [PATCH] Added QEMU support for IVSHMEM devices
by Shawn Furrow 30 Oct '12

30 Oct '12

*Created at Virginia Tech's Systems Software Research Group This patch adds the XML schema and implementation for IVSHMEM device driver support. Currently it defaults to using interrupts. A sample IVSHMEM entry in the VM's XML file is: <ivshmem id='nahanni' size='16834' path='/tmp/'/> --- docs/schemas/domaincommon.rng | 17 +++++ src/conf/domain_conf.c | 152 ++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 16 ++++- src/qemu/qemu_command.c | 75 ++++++++++++++++++++ src/qemu/qemu_command.h | 6 ++ 5 files changed, 264 insertions(+), 2 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f47fdad..ddf8eb1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2576,6 +2576,23 @@ </optional> </element> </define> + <define name="ivshmem"> + <element name="ivshmem"> + <attribute name="id"> + <ref name="deviceName"> + </attribute> + <optional> + <attribute name="size"> + <ref name="memoryKB"> + </attribute> + </optional> + <optional> + <attribute name="path"> + <ref name="filePath"> + </attribute> + </optional> + </element> + </define> <define name="parallel"> <element name="parallel"> <ref name="qemucdev"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4aa08d0..0cd2f98 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -156,7 +156,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "redirdev", "smartcard", "chr", - "memballoon") + "memballoon", + "ivshmem") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", @@ -1374,6 +1375,16 @@ void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def) VIR_FREE(def); } +void virDomainIvshmemDefFree(virDomainIvshmemDefPtr def) +{ + if (!def) + return; + + virDomainDeviceInfoClear(&def->info); + + VIR_FREE(def); +} + void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def) { if (!def) @@ -1707,6 +1718,8 @@ void virDomainDefFree(virDomainDefPtr def) virDomainMemballoonDefFree(def->memballoon); + virDomainIvshmemDefFree(dev->ivshmem); + for (i = 0; i < def->nseclabels; i++) virSecurityLabelDefFree(def->seclabels[i]); VIR_FREE(def->seclabels); @@ -2136,6 +2149,12 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, if (cb(def, &device, &def->memballoon->info, opaque) < 0) return -1; } + if (def->ivshmem) { + device.type = VIR_DOMAIN_DEVICE_IVSHMEM; + device.data.ivshmem = def->ivshmem; + if (cb(def, &device, &def->ivshmem->info, opaque) < 0) + return -1; + } device.type = VIR_DOMAIN_DEVICE_HUB; for (i = 0; i < def->nhubs ; i++) { device.data.hub = def->hubs[i]; @@ -6935,6 +6954,69 @@ error: goto cleanup; } +static virDomainIvshmemDefPtr +virDomainIvshmemDefParseXML(const xmlNodePtr node, + unsigned int flags) +{ + char *id = NULL; + char *size = NULL; + char *path = NULL; + virDomainIvshmemDefPtr def; + + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + return NULL; + } + + id = virXMLPropString(node, "id"); + VIR_DEBUG("ivshmem: id = '%s'", id); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("ivshmem id=' %s'"), id); + if (id == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("ERROR: ivshmem, id not defined' %s'"), id); + goto error; + } + + def->id = id; + size = virXMLPropString(node, "size"); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("ivshmem size=' %s'"), size); + + VIR_DEBUG("ivshmem: size = '%s'", size); + if (size) { + if (virStrToLong_i(size, NULL, 10, &def->size) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse ivshmem size %s"), size); + VIR_FREE(size); + goto error; + } + } else { + def->size = 16834; + } + + path = virXMLPropString(node, "path"); + VIR_DEBUG("ivshmem: path = '%s'", path); + if (path == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("ERROR: ivshmem, path not defined' %s'"), path); + goto error; + } + def->path = path; + + if (virDomainDeviceInfoParseXML(node, NULL, &def->info, flags) < 0) + goto error; + +cleanup: + VIR_FREE(size); + return def; + +error: + virDomainIvshmemDefFree(def); + def = NULL; + goto cleanup; +} + static virSysinfoDefPtr virSysinfoParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -9742,6 +9824,28 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, } } + /* analysis of the ivshmem devices */ + def->ivshmem = NULL; + if ((n = virXPathNodeSet("./devices/ivshmem", ctxt, &nodes)) < 0) { + goto error; + } + + if (n > 0) { + virDomainIvshmemDefPtr ivshmem = + virDomainIvshmemDefParseXML(nodes[0], flags); + if (!ivshmem) + goto error; + + def->ivshmem = ivshmem; + VIR_FREE(nodes); + } else if (def->virtType != VIR_DOMAIN_VIRT_QEMU) { + /* TODO: currently ivshmem only on QEMU */ + virDomainIvshmemDefPtr ivshmem; + if (VIR_ALLOC(ivshmem) < 0) + goto no_memory; + def->ivshmem = 0; + } + /* analysis of the hub devices */ if ((n = virXPathNodeSet("./devices/hub", ctxt, &nodes)) < 0) { goto error; @@ -12673,6 +12777,49 @@ virDomainMemballoonDefFormat(virBufferPtr buf, return 0; } + +static int +virDomainIvshmemDefFormat(virBufferPtr buf, + virDomainIvshmemDefPtr def, + unsigned int flags) +{ + const char *id = def->id; + const char *path = def->path; + + if (!id) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected ivshmem id = %s"), def->id); + return -1; + } + if (!def->size) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected ivshmem size = %d"), def->size); + return -1; + } + + if (!path) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected ivshmem id = %s"), def->path); + return -1; + } + + virBufferAsprintf(buf, " <ivshmem id='%s'", id); + virBufferAsprintf(buf, " size='%d'", def->size); + virBufferAsprintf(buf, " path='%s'", path); + + if (virDomainDeviceInfoIsSet(&def->info, flags)) { + virBufferAddLit(buf, ">\n"); + if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0) + return -1; + virBufferAddLit(buf, " </ivshmem>\n"); + } else { + virBufferAddLit(buf, "/>\n"); + } + + return 0; +} + + static int virDomainSysinfoDefFormat(virBufferPtr buf, virSysinfoDefPtr def) @@ -13828,6 +13975,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (def->memballoon) virDomainMemballoonDefFormat(buf, def->memballoon, flags); + if (def->ivshmem) + virDomainIvshmemDefFormat(buf, def->ivshmem, flags); + virBufferAddLit(buf, " </devices>\n"); virBufferAdjustIndent(buf, 2); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1a61318..78bdf84 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -114,6 +114,9 @@ typedef virDomainSnapshotObj *virDomainSnapshotObjPtr; typedef struct _virDomainSnapshotObjList virDomainSnapshotObjList; typedef virDomainSnapshotObjList *virDomainSnapshotObjListPtr; +typedef struct _virDomainIvshmemDef virDomainIvshmemDef; +typedef virDomainIvshmemDef *virDomainIvshmemDefPtr; + /* Flags for the 'type' field in virDomainDeviceDef */ typedef enum { VIR_DOMAIN_DEVICE_NONE = 0, @@ -133,6 +136,7 @@ typedef enum { VIR_DOMAIN_DEVICE_SMARTCARD, VIR_DOMAIN_DEVICE_CHR, VIR_DOMAIN_DEVICE_MEMBALLOON, + VIR_DOMAIN_DEVICE_IVSHMEM, VIR_DOMAIN_DEVICE_LAST } virDomainDeviceType; @@ -157,7 +161,8 @@ struct _virDomainDeviceDef { virDomainRedirdevDefPtr redirdev; virDomainSmartcardDefPtr smartcard; virDomainChrDefPtr chr; - virDomainMemballoonDefPtr memballoon; + virDomainMemballoonDefPtr memballoon, + virDomainIvshmemDefPtr ivshmem; } data; }; @@ -1344,6 +1349,12 @@ struct _virDomainMemballoonDef { virDomainDeviceInfo info; }; +struct _virDomainIvshmemDef { + char *id; + int size; + char *path; + virDomainDeviceInfo info; +}; enum virDomainSmbiosMode { VIR_DOMAIN_SMBIOS_NONE, @@ -1752,6 +1763,7 @@ struct _virDomainDef { /* Only 1 */ virDomainWatchdogDefPtr watchdog; virDomainMemballoonDefPtr memballoon; + virDomainIvshmemDefPtr ivshmem; virCPUDefPtr cpu; virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; @@ -1859,6 +1871,7 @@ int virDomainChrSourceDefCopy(virDomainChrSourceDefPtr src, void virDomainSoundCodecDefFree(virDomainSoundCodecDefPtr def); void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); +void virDomainIvshmemDefFree(virDomainIvshmemDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefAlloc(void); @@ -2194,6 +2207,7 @@ VIR_ENUM_DECL(virDomainSoundCodec) VIR_ENUM_DECL(virDomainSoundModel) VIR_ENUM_DECL(virDomainMemDump) VIR_ENUM_DECL(virDomainMemballoonModel) +VIR_ENUM_DECL(virDomainIvshmemModel) VIR_ENUM_DECL(virDomainSmbiosMode) VIR_ENUM_DECL(virDomainWatchdogModel) VIR_ENUM_DECL(virDomainWatchdogAction) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e7bb88e..6c66075 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -770,6 +770,10 @@ qemuAssignDeviceAliases(virDomainDefPtr def, qemuCapsPtr caps) if (virAsprintf(&def->memballoon->info.alias, "balloon%d", 0) < 0) goto no_memory; } + if (def->ivshmem) { + if (virAsprintf(&def->ivshmem->info.alias, "ivshmem%d", 0) < 0) + goto no_memory; + } return 0; @@ -3245,6 +3249,58 @@ error: return NULL; } +//adds the options for the "-device" portion of QEMU command line for ivshmem +char * +qemuBuildIvshmemDevStr(virDomainIvshmemDefPtr dev, + qemuCapsPtr caps) +{ +virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAddLit(&buf, "ivshmem"); + virBufferAsprintf(&buf, ",chardev=%s", dev->id); + virBufferAsprintf(&buf, ",size=%dm", dev->size/1024); + virBufferAsprintf(&buf, ",ioeventfd=on"); + virBufferAsprintf(&buf, ",vectors=8"); + //virBufferAsprintf(&buf, ",shm=%s", dev->id); + if (qemuBuildDeviceAddressStr(&buf, &dev->info, caps) < 0) + goto error; + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} + +//adds the options for the "-chardev" portion of QEMU command line for ivshmem +char * +qemuBuildIvshmemCharDevStr(virDomainIvshmemDefPtr dev, + qemuCapsPtr caps) +{ +virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAddLit(&buf, "socket"); + virBufferAsprintf(&buf, ",id=%s", dev->id); + virBufferAsprintf(&buf, ",path=%s%s", dev->path,dev->id); + if (qemuBuildDeviceAddressStr(&buf, &dev->info, caps) < 0) + goto error; + + if (virBufferError(&buf)) { + virReportOOMError(); + goto error; + } + + return virBufferContentAndReset(&buf); + +error: + virBufferFreeAndReset(&buf); + return NULL; +} char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, @@ -6582,6 +6638,25 @@ qemuBuildCommandLine(virConnectPtr conn, } } + // adds ivshmem QEMU command line entries + if ((def->ivshmem) && (def->ivshmem->id != NULL)) { + char *optstr; + virCommandAddArg(cmd, "-chardev"); + optstr = qemuBuildIvshmemCharDevStr(def->ivshmem, caps); + if (!optstr) + goto error; + virCommandAddArg(cmd, optstr); + + optstr = NULL; + + virCommandAddArg(cmd, "-device"); + optstr = qemuBuildIvshmemDevStr(def->ivshmem, caps); + if (!optstr) + goto error; + virCommandAddArg(cmd, optstr); + VIR_FREE(optstr); + } + if (snapshot) virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 939833d..80e7565 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -118,6 +118,12 @@ char * qemuBuildWatchdogDevStr(virDomainWatchdogDefPtr dev, char * qemuBuildMemballoonDevStr(virDomainMemballoonDefPtr dev, qemuCapsPtr caps); +char * qemuBuildIvshmemDevStr(virDomainIvshmemDefPtr dev, + qemuCapsPtr caps); + +char * qemuBuildIvshmemCharDevStr(virDomainIvshmemDefPtr dev, + qemuCapsPtr caps); + char * qemuBuildUSBInputDevStr(virDomainInputDefPtr dev, qemuCapsPtr caps); -- 1.7.0.4

4 3

[libvirt] [PATCH v2] helper of copy-storage-* features
by liguang 30 Oct '12

30 Oct '12

help to create disk images copy-storage-* required, try to do non-shared migration without bothering to create disk images at target by hand. consider this situation: 1. non-shared migration virsh migrate --copy-storage-all ... 2. migration fails 3. create disk images required qemu-img create ... 4 migration run smoothly so, try do remove step 2, 3, 4 this kind of usage had been discussed before, http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html maybe there're some flaws: - It did not handle more about complete situations suggested by Daniel P. Berrange, https://www.redhat.com/archives/libvir-list/2012-October/msg00407.html but may try to take care of them later. so, now only normal disk image files be handled. - for creation of disk images, size was setting as 0xffffffff boldly, hope it can consolidate qemu, haven't constructed a comfortable idea to solve it. v2: 1. handle disk encrytion case 2. check kvm-img & qemu-img 3. set disk image size to 0xfffffffK bytes blindly Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- src/qemu/qemu_migration.c | 112 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index db69a0a..55eb98e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -49,6 +49,7 @@ #include "storage_file.h" #include "viruri.h" #include "hooks.h" +#include "dirname.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -70,6 +71,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +79,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "copystorage"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_COPYSTORAGE = (1 << QEMU_MIGRATION_COOKIE_FLAG_COPYSTORAGE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +442,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + virBufferAsprintf(buf, " <copystorage/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +668,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE)) { + if (virXPathBoolean("count(./copystorage) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_COPYSTORAGE; + } + return 0; error: @@ -721,6 +732,9 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + mig->flags |= QEMU_MIGRATION_COOKIE_COPYSTORAGE; + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1168,6 +1182,14 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & (VIR_MIGRATE_NON_SHARED_DISK | + VIR_MIGRATE_NON_SHARED_INC)) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1215,6 +1237,79 @@ qemuMigrationPrepareCleanup(struct qemud_driver *driver, qemuDomainObjDiscardAsyncJob(driver, vm); } +/* + if gen_del is 1, find out disk images migration required, + so try to generate them at target, + if gen_del is 0, delete disk images generated before. +*/ +static int qemuMigrationHandleDiskFiles(virDomainDefPtr def, int gen_del) +{ + char *tmp_dir = NULL, *outbuf = NULL; + char *size = _("0xffffffffK"), *img_tool; + virCommandPtr cmd = NULL; + int i, ret = -1; + + if (!def->ndisks) + return 0; + + img_tool = virFindFileInPath("kvm-img"); + if (!img_tool) + img_tool = virFindFileInPath("qemu-img"); + if (!img_tool) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("unable to find kvm-img or qemu-img")); + return -1; + } + + for (i = 0; i < def->ndisks; i++) { + if (STRNEQ(def->disks[i]->driverName, "qemu")) + continue; + if (def->disks[i]->src == NULL) + continue; + if (def->disks[i]->driverType == NULL) + continue; + if (virFileExists(def->disks[i]->src) && gen_del) + continue; + if (!gen_del && !virFileExists(def->disks[i]->src)) + continue; + if ((tmp_dir = mdir_name(def->disks[i]->src)) == NULL) + continue; + if (!virFileExists(tmp_dir)) + if (virFileMakePath(tmp_dir) < 0) + continue; + if (gen_del) { + cmd = virCommandNewArgList(img_tool, "create", "-f", + def->disks[i]->driverType, def->disks[i]->src, + size, NULL); + if (def->disks[i]->encryption) + virCommandAddArgList(cmd, "-o", "encryption=on", NULL); + virCommandSetOutputBuffer(cmd, &outbuf); + if (virCommandRun(cmd, NULL) < 0) { + virReportSystemError(errno, "%s", outbuf); + goto cleanup; + } + } else { + if (unlink(def->disks[i]->src) < 0) { + virReportError(errno, "%s", _("fail to unlink disk image file")); + goto cleanup; + } + } + virCommandFree(cmd); + VIR_FREE(tmp_dir); + VIR_FREE(outbuf); + } + + ret = 0; + +cleanup: + if (ret < 0) { + virCommandFree(cmd); + VIR_FREE(tmp_dir); + VIR_FREE(outbuf); + } + return ret; +} + static int qemuMigrationPrepareAny(struct qemud_driver *driver, virConnectPtr dconn, @@ -1308,6 +1403,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* virDomainAssignDef already set the error */ goto cleanup; } + + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_COPYSTORAGE))) + goto cleanup; + + if (mig->flags & QEMU_MIGRATION_COOKIE_COPYSTORAGE) + if (qemuMigrationHandleDiskFiles(def, 1) < 0) + goto cleanup; + def = NULL; priv = vm->privateData; priv->origname = origname; @@ -2929,7 +3033,7 @@ qemuMigrationFinish(struct qemud_driver *driver, int newVM = 1; qemuMigrationCookiePtr mig = NULL; virErrorPtr orig_err = NULL; - int cookie_flags = 0; + int cookie_flags = 0, migration_status = 0; qemuDomainObjPrivatePtr priv = vm->privateData; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " @@ -3088,7 +3192,11 @@ qemuMigrationFinish(struct qemud_driver *driver, if (qemuMigrationBakeCookie(mig, driver, vm, cookieout, cookieoutlen, 0) < 0) VIR_WARN("Unable to encode migration cookie"); + migration_status = 1; + endjob: + if (!migration_status) + qemuMigrationHandleDiskFiles(vm->def, 0); if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; } else if (!vm->persistent && !virDomainObjIsActive(vm)) { -- 1.7.1

1 0

[libvirt] Need help of guest lifecycle control
by Zhimou Peng 30 Oct '12

30 Oct '12

Hi, I have a question about guest lifecycle control, many content of element not works, i don't know if i use it in a wrong way. #virsh shutdown aaa <on_poweroff>destroy</on_poweroff> Domain aaa shut off and not power up again. -----> expect <on_poweroff>restart</on_poweroff> should power up again but not. -----> not expect <on_poweroff>preserve</on_poweroff> guest poweroff, nothing happend. ----> how to use it ? <on_poweroff>rename-restart</on_poweroff> guest poweroff, and should boot up again with newname? but it's only powered off. --->not expect ------------------------------------------------------------------------------------- #virsh reboot aaa <on_reboot>destroy</on_reboot> guest not boot up again. it works. <on_reboot>restart</on_reboot> guest boot up again. it works. <on_reboot>preserve</on_reboot> guest poweroff, nothing happend. -----> how to use it ? <on_reboot>rename-restart</on_reboot> guest poweroff, and should boot up again with newname. but it's only powered off. --->not expect -------------------------------------------------------------------------------------- <on_crash>xxxxxxx</on_crash> --->qemu not support this yet, right? https://bugzilla.redhat.com/show_bug.cgi?id=833530 zhpeng BR

1 1

[libvirt] [PATCH] build: place attributes in correct location
by Eric Blake 30 Oct '12

30 Oct '12

Ever since commit eefb881, ATTRIBUTE_NONNULL has been a no-op under gcc (since it tends to cause more bugs than it cures given gcc's current lame implementation of the macro). However, the macro is still useful to Coverity and other static-analysis tools, but only if we use it correctly. Gcc (and thus Coverity) accepts function declarations with attributes at the end, but function bodies must attach attributes to the return type. That is, these are valid: void foo(void *arg) ATTRIBUTE_NONNULL(1); void ATTRIBUTE_NONNULL(1) foo(void *arg); void ATTRIBUTE_NONNULL(1) foo(void *arg) {} but this is not: void foo(void *arg) ATTRIBUTE_NONNULL(1) {} Bug introduced in commit 80533ca, with these symptoms: nodeinfo.c:206: error: expected ',' or ';' before '{' token cc1: warning: unrecognized command line option "-Wno-suggest-attribute=const" cc1: warning: unrecognized command line option "-Wno-suggest-attribute=pure" make[3]: *** [libvirt_driver_la-nodeinfo.lo] Error 1 * src/nodeinfo.c (virNodeParseNode): Fix syntax error when non-null attribute is in use. --- Pushing under the build-breaker rule. src/nodeinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index d8b71dd..35c5f96 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -202,9 +202,9 @@ CPU_COUNT(cpu_set_t *set) /* parses a node entry, returning number of processors in the node and * filling arguments */ static int +ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) +ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) { int ret = -1; int processors = 0; -- 1.7.11.7

1 0

[libvirt] [PATCHv2] xml: print uuids or shell-escaped names in the warning
by Ján Tomko 30 Oct '12

30 Oct '12

In the XML warning, this prints uuids for domain names with special characters in them and shell-escaped names for other elements (like snapshosts and networks) with special names. --- When saving snapshots, the domain name is appended to the "snapshot-edit" command, so using a domain name that needs escaping would lead to something that can't be just fed to the shell as it would glue them together. diff to xml: shell-escape domain name in comment: - Domain names don't get escaped, UUIDs are preferred. - The command gets escaped too. diff to v1: don't try to use CDATA (it doesn't belong there) --- src/conf/domain_conf.c | 6 +++- src/libvirt_private.syms | 2 + src/qemu/qemu_domain.c | 3 +- src/util/buf.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/buf.h | 1 + src/util/xml.c | 62 ++++++++++++++++++++++--------------------- src/util/xml.h | 1 + 7 files changed, 109 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0933c08..a8cadeb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14252,6 +14252,7 @@ int virDomainSaveXML(const char *configDir, virDomainDefPtr def, const char *xml) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; char *configFile = NULL; int ret = -1; @@ -14265,7 +14266,10 @@ int virDomainSaveXML(const char *configDir, goto cleanup; } - ret = virXMLSaveFile(configFile, def->name, "edit", xml); + virUUIDFormat(def->uuid, uuidstr); + ret = virXMLSaveFile(configFile, + virXMLPickShellSafeComment(def->name,uuidstr), "edit", + xml); cleanup: VIR_FREE(configFile); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 699c9a3..b17ef88 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -37,6 +37,7 @@ virBufferError; virBufferEscape; virBufferEscapeSexpr; virBufferEscapeShell; +virBufferEscapeShellXMLComment; virBufferEscapeString; virBufferFreeAndReset; virBufferGetIndent; @@ -1816,6 +1817,7 @@ virURIParse; # xml.h virXMLChildElementCount; virXMLParseHelper; +virXMLPickShellSafeComment; virXMLPropString; virXMLSaveFile; virXPathBoolean; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4e6a5e9..e4ef7e6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1622,7 +1622,8 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, goto cleanup; } - if (virAsprintf(&tmp, "snapshot-edit %s", vm->def->name) < 0) { + if (virAsprintf(&tmp, "snapshot-edit %s", + virXMLPickShellSafeComment(vm->def->name, uuidstr)) < 0) { virReportOOMError(); goto cleanup; } diff --git a/src/util/buf.c b/src/util/buf.c index 030dc97..a326465 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -623,6 +623,72 @@ virBufferEscapeShell(virBufferPtr buf, const char *str) } /** + * virBufferEscapeShellXMLComment: + * @buf: the buffer to append to + * @str: an unquoted string + * + * Quotes a string so that the shell (/bin/sh) will interpret the + * quoted string to mean str. Auto indentation may be applied. + * It also escapes any "--" so that the string can be used in XML comments. + */ +void virBufferEscapeShellXMLComment(virBufferPtr buf, const char *str) +{ + int len; + char *escaped, *out; + const char *cur; + char prev = '\0'; + + if ((buf == NULL) || (str == NULL)) + return; + + if (buf->error) + return; + + /* Only quote if str includes shell metacharacters. */ + if (*str && !strpbrk(str, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~") && + !strstr(str, "--")) { + virBufferAdd(buf, str, -1); + return; + } + + if (*str) { + len = strlen(str); + if (xalloc_oversized(4, len) || + VIR_ALLOC_N(escaped, 4 * len + 3) < 0) { + virBufferSetError(buf, errno); + return; + } + } else { + virBufferAddChar(buf, '\''); + return; + } + + cur = str; + out = escaped; + + *out++ = '\''; + while (*cur != 0) { + if (*cur == '\'') { + *out++ = '\''; + /* Replace literal ' with a close ', a \', and a open ' */ + *out++ = '\\'; + *out++ = '\''; + } else if (prev == '-' && *cur == '-') { + /* Replace -- with -''- */ + *out++ = '\''; + *out++ = '\''; + } + prev = *cur; + *out++ = *cur++; + } + *out++ = '\''; + *out = 0; + + virBufferAdd(buf, escaped, -1); + VIR_FREE(escaped); +} + +/** * virBufferStrcat: * @buf: the buffer to append to * @...: the variable list of strings, the last argument must be NULL diff --git a/src/util/buf.h b/src/util/buf.h index c3a498d..25e31fd 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -69,6 +69,7 @@ void virBufferEscapeString(virBufferPtr buf, const char *format, void virBufferEscapeSexpr(virBufferPtr buf, const char *format, const char *str); void virBufferEscapeShell(virBufferPtr buf, const char *str); +void virBufferEscapeShellXMLComment(virBufferPtr buf, const char *str); void virBufferURIEncodeString(virBufferPtr buf, const char *str); # define virBufferAddLit(buf_, literal_string_) \ diff --git a/src/util/xml.c b/src/util/xml.c index f3dc256..01507a9 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -780,49 +780,51 @@ error: goto cleanup; } +const char *virXMLPickShellSafeComment(const char *str1, const char *str2) +{ + if(str1 && !strpbrk(str1, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~") && + !strstr(str1, "--")) + return str1; + if(str2 && !strpbrk(str2, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~") && + !strstr(str2, "--")) + return str2; + return NULL; +} static int virXMLEmitWarning(int fd, const char *name, const char *cmd) { + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *str = NULL; size_t len; - const char *prologue = "\n\n"; if (fd < 0 || !name || !cmd) { errno = EINVAL; return -1; } - len = strlen(prologue); - if (safewrite(fd, prologue, len) != len) - return -1; - - len = strlen(cmd); - if (safewrite(fd, cmd, len) != len) - return -1; - - /* Omit the domain name if it contains a double hyphen - * because they aren't allowed in XML comments */ - if (!strstr(name, "--")) { - if (safewrite(fd, " ", 1) != 1) - return -1; - - len = strlen(name); - if (safewrite(fd, name, len) != len) - return -1; - } - - len = strlen(epilogue); - if (safewrite(fd, epilogue, len) != len) - return -1; + virBufferAddLit(&buf, "\n\n"); + + str = virBufferContentAndReset(&buf); + len = strlen(str); + if (str) + if (safewrite(fd, str, len) == len) { + VIR_FREE(str); + return 0; + } - return 0; + VIR_FREE(str); + return -1; } diff --git a/src/util/xml.h b/src/util/xml.h index a3750fa..c3b05df 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -61,6 +61,7 @@ xmlDocPtr virXMLParseHelper(int domcode, const char *url, xmlXPathContextPtr *pctxt); +const char *virXMLPickShellSafeComment(const char *str1, const char *str2); /** * virXMLParse: * @filename: file to parse, or NULL for string parsing -- 1.7.8.6

5 4

[libvirt] [PATCH] build: fix linking with systemtap probes
by Eric Blake 30 Oct '12

30 Oct '12

Commit 34e8f63a3 altered virfile.o to drag in additional symbols, which in turn led to pulling in other .o files and eventually causing a link failure when systemtap probes are enabled, such as: ./.libs/libvirt_util.a(libvirt_util_la-event_poll.o): In function `virEventPollRunOnce': /home/dummy/libvirt/src/util/event_poll.c:614: undefined reference to `libvirt_event_poll_run_semaphore' ./.libs/libvirt_util.a(libvirt_util_la-event_poll.o):(.note.stapsdt+0x24): undefined reference to `libvirt_event_poll_add_handle_semaphore' Even though libvirt_iohelper and libvirt_parthelper don't directly use the portion of virfile.o that drags in probing, it was easier to satisfy the linker and get the build back up, than to figure out whether it is even possible or worth trying to disentangle the mess. * src/Makefile.am (libvirt_iohelper_LDADD) (libvirt_parthelper_LDADD): Use libvirt_probes.lo when needed. --- Pushing under the build-breaker rule, in response to: https://www.redhat.com/archives/libvir-list/2012-October/msg01679.html src/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index 187663f..1f32263 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1631,6 +1631,9 @@ libvirt_iohelper_LDFLAGS = $(WARN_LDFLAGS) $(AM_LDFLAGS) libvirt_iohelper_LDADD = \ libvirt_util.la \ ../gnulib/lib/libgnu.la +if WITH_DTRACE_PROBES +libvirt_iohelper_LDADD += libvirt_probes.lo +endif libvirt_iohelper_CFLAGS = $(AM_CFLAGS) endif @@ -1645,6 +1648,9 @@ libvirt_parthelper_LDADD = \ $(LIBPARTED_LIBS) \ libvirt_util.la \ ../gnulib/lib/libgnu.la +if WITH_DTRACE_PROBES +libvirt_parthelper_LDADD += libvirt_probes.lo +endif libvirt_parthelper_CFLAGS = $(LIBPARTED_CFLAGS) $(AM_CFLAGS) endif -- 1.7.11.7

1 0

[libvirt] [PATCH] qemu: Report errors from iohelper
by Michal Privoznik 30 Oct '12

30 Oct '12

Currently, we use iohelper when saving/restoring a domain. However, if there's some kind of error (like I/O) it is not propagated to libvirt. Since it is not qemu who is doing the actual write() it will not get error. The iohelper does. Therefore we should check for iohelper errors as it makes libvirt more user friendly. --- diff to v1: -incorporate the event loop to read iohelper's stderr src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 7 ++- src/util/virfile.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 2 + 4 files changed, 105 insertions(+), 2 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 699c9a3..68440d0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1332,6 +1332,7 @@ virDomainListSnapshots; virFileLoopDeviceAssociate; virFileClose; virFileDirectFdFlag; +virFileWrapperFdCatchError; virFileWrapperFdClose; virFileWrapperFdFree; virFileWrapperFdNew; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8af316f..c8e97cf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2945,6 +2945,7 @@ endjob: if (rc < 0) VIR_WARN("Unable to resume guest CPUs after save failure"); } + virFileWrapperFdCatchError(wrapperFd); } if (qemuDomainObjEndAsyncJob(driver, vm) == 0) vm = NULL; @@ -3282,9 +3283,11 @@ doCoreDump(struct qemud_driver *driver, cleanup: VIR_FORCE_CLOSE(fd); - virFileWrapperFdFree(wrapperFd); - if (ret != 0) + if (ret != 0) { + virFileWrapperFdCatchError(wrapperFd); unlink(path); + } + virFileWrapperFdFree(wrapperFd); return ret; } diff --git a/src/util/virfile.c b/src/util/virfile.c index 5b00ead..36b3420 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -135,10 +135,58 @@ virFileDirectFdFlag(void) * read-write is not supported, just a single direction. */ struct _virFileWrapperFd { virCommandPtr cmd; /* Child iohelper process to do the I/O. */ + int err_fd; /* FD to read stderr of @cmd */ + char *err_msg; /* stderr of @cmd */ + size_t err_msg_len; /* strlen of err_msg so we don't + have to compute it every time */ + int err_watch; /* ID of watch in the event loop */ }; #ifndef WIN32 /** + * virFileWrapperFdReadStdErr: + * @watch: watch ID + * @fd: the read end of pipe to iohelper's stderr + * @events: an OR-ed set of events which occurred on @fd + * @opaque: virFileWrapperFdPtr + * + * This is a callback to our eventloop which will read iohelper's + * stderr, reallocate @opaque->err_msg and copy data. + */ +static void +virFileWrapperFdReadStdErr(int watch ATTRIBUTE_UNUSED, + int fd, int events, void *opaque) +{ + virFileWrapperFdPtr wfd = (virFileWrapperFdPtr) opaque; + char ebuf[1024]; + ssize_t nread; + + if (events & VIR_EVENT_HANDLE_READABLE) { + while ((nread = saferead(fd, ebuf, sizeof(ebuf)))) { + if (nread < 0) { + if (errno != EAGAIN) + virReportSystemError(errno, "%s", + _("unable to read iohelper's stderr")); + break; + } + + if (VIR_REALLOC_N(wfd->err_msg, wfd->err_msg_len + nread + 1) < 0) { + virReportOOMError(); + return; + } + memcpy(wfd->err_msg + wfd->err_msg_len, ebuf, nread); + wfd->err_msg_len += nread; + wfd->err_msg[wfd->err_msg_len] = '\0'; + } + } + + if (events & VIR_EVENT_HANDLE_HANGUP) { + virEventRemoveHandle(watch); + wfd->err_watch = -1; + } +} + +/** * virFileWrapperFdNew: * @fd: pointer to fd to wrap * @name: name of fd, for diagnostics @@ -197,6 +245,8 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) return NULL; } + ret->err_watch = -1; + mode = fcntl(*fd, F_GETFL); if (mode < 0) { @@ -229,9 +279,36 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) virCommandAddArg(ret->cmd, "0"); } + /* In order to catch iohelper stderr, we must: + * - pass a FD to virCommand (-1 to auto-allocate one) + * - change iohelper's env so virLog functions print to stderr + */ + ret->err_fd = -1; + virCommandSetErrorFD(ret->cmd, &ret->err_fd); + virCommandAddEnvPair(ret->cmd, "LIBVIRT_LOG_OUTPUTS", "1:stderr"); + if (virCommandRunAsync(ret->cmd, NULL) < 0) goto error; + /* deliberately don't use virCommandNonblockingFDs here as it is all or + * nothing. And we want iohelper's stdin to block. */ + if (virSetNonBlock(ret->err_fd) < 0) { + virReportSystemError(errno, "%s", + _("Failed to set non-blocking " + "file descriptor flag")); + goto error; + } + + if ((ret->err_watch = virEventAddHandle(ret->err_fd, + VIR_EVENT_HANDLE_READABLE, + virFileWrapperFdReadStdErr, + ret, NULL)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unable to register iohelper's " + "stderr FD in the eventloop")); + goto error; + } + if (VIR_CLOSE(pipefd[!output]) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unable to close pipe")); goto error; @@ -280,6 +357,21 @@ virFileWrapperFdClose(virFileWrapperFdPtr wfd) return virCommandWait(wfd->cmd, NULL); } + +/** + * virFileWrapperFdCatchError: + * @wfd: fd wrapper, or NULL + * + * If iohelper reported any error VIR_WARN() about it. + */ +void +virFileWrapperFdCatchError(virFileWrapperFdPtr wfd) +{ + if (wfd->err_msg) + VIR_WARN("iohelper reports: %s", wfd->err_msg); +} + + /** * virFileWrapperFdFree: * @wfd: fd wrapper, or NULL @@ -295,6 +387,11 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) if (!wfd) return; + VIR_FORCE_CLOSE(wfd->err_fd); + if (wfd->err_watch != -1) + virEventRemoveHandle(wfd->err_watch); + VIR_FREE(wfd->err_msg); + virCommandFree(wfd->cmd); VIR_FREE(wfd); } diff --git a/src/util/virfile.h b/src/util/virfile.h index c885b73..80daf86 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -90,6 +90,8 @@ int virFileWrapperFdClose(virFileWrapperFdPtr dfd); void virFileWrapperFdFree(virFileWrapperFdPtr dfd); +void virFileWrapperFdCatchError(virFileWrapperFdPtr dfd); + int virFileLock(int fd, bool shared, off_t start, off_t len); int virFileUnlock(int fd, off_t start, off_t len); -- 1.7.8.6

2 4

[libvirt] [PATCH 0/2] v3: dnsmasq conf-file and interface= patches
by Gene Czarcinski 30 Oct '12

30 Oct '12

I am sorry about the clutter with my multiple patch submissions. I am just trynig to get it right so that, the next time, I will not make so many stupid mistakes. Gene Czarcinski (2): v3: put dnsmasq parameters into a file instead of the command line v3: add dnsmasq interface= parameter so bind-interfaces works src/network/bridge_driver.c | 183 ++++++++++++++------- src/network/bridge_driver.h | 8 +- tests/networkxml2argvdata/isolated-network.argv | 25 ++- .../networkxml2argvdata/nat-network-dns-hosts.argv | 15 +- .../nat-network-dns-srv-record-minimal.argv | 36 ++-- .../nat-network-dns-srv-record.argv | 36 ++-- .../nat-network-dns-txt-record.argv | 30 ++-- tests/networkxml2argvdata/nat-network.argv | 28 ++-- tests/networkxml2argvdata/netboot-network.argv | 29 ++-- .../networkxml2argvdata/netboot-proxy-network.argv | 26 ++- tests/networkxml2argvdata/routed-network.argv | 13 +- tests/networkxml2argvtest.c | 44 +---- 12 files changed, 278 insertions(+), 195 deletions(-) -- 1.7.11.7

2 19

[libvirt] libvirt can not get right stats of a rbd pool
by yue 30 Oct '12

30 Oct '12

Allocation exceed Capacity ,but Available is not 0. #virsh pool-info 2361a6d4-0edc-3534-87ae-e7ee09199921 Name: 2361a6d4-0edc-3534-87ae-e7ee09199921 UUID: 2361a6d4-0edc-3534-87ae-e7ee09199921 State: running Persistent: yes Autostart: no Capacity: 285.57 GiB Allocation: 489.89 GiB Available: 230.59 GiB

1 0