- Devel - libvirt List Archives

[libvirt] [PATCH]conf: fix incorrect error log in virCPUDefIsEqual
by Chen Hanxiao 07 Nov '13

07 Nov '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> A copy-paste error. s/model/vendor id Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/conf/cpu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 5deb325..c4917b8 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -767,7 +767,7 @@ virCPUDefIsEqual(virCPUDefPtr src, if (STRNEQ_NULLABLE(src->vendor_id, dst->vendor_id)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target CPU model %s does not match source %s"), + _("Target CPU vendor id %s does not match source %s"), NULLSTR(dst->vendor_id), NULLSTR(src->vendor_id)); goto cleanup; } -- 1.8.2.1

2 1

[libvirt] [PATCH] tests: Distribute virpcitestdata
by Michal Privoznik 07 Nov '13

07 Nov '13

Since 21685c955e5466 we have tests/virpcitestdata dir containing the PCI config files for some dummy PCI devices that are used int virpcitest. However, the directory containing the config files is not distributed making 'make rpm' fail. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c2e5a9..70b5f61 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -107,6 +107,7 @@ EXTRA_DIST = \ sysinfodata \ test-lib.sh \ virsh-uriprecedence \ + virpcitestdata \ vmx2xmldata \ xencapsdata \ xmconfigdata \ -- 1.8.1.5

1 0

[libvirt] [PATCH] tests: Fix virtpcitest in VPATH
by Jiri Denemark 07 Nov '13

07 Nov '13

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/virpcimock.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/virpcimock.c b/tests/virpcimock.c index 9d5c079..19062c3 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -305,9 +305,14 @@ pci_device_new_from_stub(const struct pciDevice *data) char *configSrc, *configDst; char tmp[32]; struct stat sb; + char *abs_srcdir; + + abs_srcdir = getenv("abs_srcdir"); + if (!abs_srcdir) + abs_srcdir = getcwd(NULL, 0); if (VIR_ALLOC_QUIET(dev) < 0 || - virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_builddir, data->id) < 0 || + virAsprintfQuiet(&configSrc, "%s/virpcitestdata/%s.config", abs_srcdir, data->id) < 0 || virAsprintfQuiet(&devpath, "%s/devices/%s", fakesysfsdir, data->id) < 0) ABORT_OOM(); -- 1.8.4.2

2 2

[libvirt] [PATCH 0/4] Split out disk source parsing code
by Peter Krempa 07 Nov '13

07 Nov '13

To avoid code duplication when I'll later attempt to add support for snapshots on gluster I'll need to split out the parsing code for disk source. Peter Krempa (4): conf: Refactor virDomainDiskSourcePoolDefParse conf: Split out code to parse the source of a disk definition conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear conf: Refactor virDomainDiskSourceDefParse src/conf/domain_conf.c | 297 +++++++++++++++++++++++++---------------------- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_command.c | 4 +- 4 files changed, 165 insertions(+), 140 deletions(-) -- 1.8.4.2

2 8

[libvirt] When vm's status file being left over, some persistent but inactive vms will be lost by libvirtd after libvirtd rebooting.
by Wangyufei (A) 07 Nov '13

07 Nov '13

Hello, I found a problem that: vm's status file may be left over in the path /var/run/libvirt/qemu under some situation, such as host reboot. When vm's status file is left over, some persistent but inactive vms will be lost by libvirtd after it is rebooted. And you can do as follows to reproduce the problem: 1、Create a vm and start it by the commands: virsh define vm-xml and virsh start vm-name. 2、Stop the libvirtd by the command: service libvirtd stop. 3、Kill the qemu process related to the vm, and make the vm's status file left over. 4、Start libvirtd. After starting the libvirtd service, we find that the vm has been lost by libvirtd with command"virsh list --all". What we expect is that the vm is shown with shutoff status, should we? The reason for the problem is that: During libvirtd startup, it first loads status files of vms under the path /var/run/libvirt/qemu, creates virDomainObj for each vm and adds it to driver->domains list. Then it creates a thread to connect related qemu process for each virDomainObj in the domains list.Because the qemu process has been killed, so connecting to qemu will be failed. When connecting to qemu failed, connection-thread will do the follows: 1、Check if vm->persistent is 1. 2、If vm->persistent is not 1, then qemuDomainRemoveInactive() is called to remove the virDomainObj. 3、Then the following calling sequence will occur:qemuDomainRemoveInactive() -->virDomainObjListRemove()-->virHashRemoveEntry(). Around virHashRemoveEntry(), domlist and dom will be locked and unlocked sequencely. The problem of the above steps is that vm->persistent maybe has been set to 1 by libvirtd main-thread when connection-thread calling virHashRemoveEntry() to remove the dom. That is a persistent virDomainObj is removed during libvirtd startup. Two ways can resolve the above problem: 1、expending the range of locking virDomainObj and virDomainObjList, lock the object of virDomainObj and virDomainObjList in connection-thread before checking vm->persistent. 2、checking vm->persistent again before calling virHashRemoveEntry(). Do you think it is a problem described above and which way listed above is more suitable to resolve the problem, or is there any other better idea? Any suggestions? Best Regards, -WangYufei

2 2

[libvirt] [PATCH] qemu: clean up migration ports when migration cancelled
by Wangyufei (A) 07 Nov '13

07 Nov '13

>From bfb2dafa8ea183781446c7cbe0376e1a2d41a5ae Mon Sep 17 00:00:00 2001 From: Zeng Junliang <zengjunliang(a)huawei.com> Date: Wed, 6 Nov 2013 11:36:57 +0800 Subject: [PATCH] qemu: clean up migration ports when migration cancelled If there's a migration cancelled, the bitmap of migration port should be cleaned up too. Signed-off-by: Zeng Junliang <zengjunliang(a)huawei.com> --- src/qemu/qemu_migration.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4f35a7a..594d1cd 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4387,12 +4387,16 @@ qemuMigrationFinish(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virCapsPtr caps = NULL; + unsigned short port = 0; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", driver, dconn, vm, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, flags, retcode); + port = priv->migrationPort; + priv->migrationPort = 0; + if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; @@ -4439,8 +4443,6 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } qemuMigrationStopNBDServer(driver, vm, mig); - virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); - priv->migrationPort = 0; if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; @@ -4573,6 +4575,7 @@ endjob: } cleanup: + virPortAllocatorRelease(driver->migrationPorts, port); if (vm) { VIR_FREE(priv->origname); virObjectUnlock(vm); -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

2 2

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

07 Nov '13

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

2 8

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

07 Nov '13

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

1 0

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

06 Nov '13

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

2 1

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

06 Nov '13

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

2 1