- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] For 1.2.14: Fix regression in synchronous block job ABORT/PIVOT
by Peter Krempa 31 Mar '15

31 Mar '15

When a block job is terminated via the synchronous API the backing chain would be updated in a separate thread and thus allowed applications to get outdated data. This broke live snapshot merge on oVirt. Since the commit breaking this (see patch 3/3) was not released yet I'm asking to merge this during the freeze. Peter Krempa (3): qemu: processBlockJob: Don't unlock @vm twice qemu: Extract internals of processBlockJobEvent into a helper qemu: blockjob: Synchronously update backing chain in XML on ABORT/PIVOT src/conf/domain_conf.c | 16 +++- src/conf/domain_conf.h | 6 ++ src/qemu/qemu_driver.c | 246 ++++++++++++++++++++++++------------------------ src/qemu/qemu_process.c | 38 +++++--- 4 files changed, 169 insertions(+), 137 deletions(-) -- 2.2.2

2 7

[libvirt] [PATCH] qemucaps2xmltest: fix test to successfully run without kvm support
by Pavel Hrdina 31 Mar '15

31 Mar '15

Function virQEMUCapsInitGuestFromBinary detect kvm support by testing whether /dev/kvm exists or whether we pass path to kvmbin. Provide the path we are testing via kvmbin for testing purpose instead of detecting presence of /dev/kvm to successfully run the tests on all hosts. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/qemucaps2xmltest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index b3975b4..826f9ea 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -118,8 +118,8 @@ testGetCaps(char *capsData, const testQemuData *data) if (virQEMUCapsInitGuestFromBinary(caps, "/usr/bin/qemu-system-i386", qemuCaps, - NULL, - NULL, + "/usr/bin/qemu-system-i386", + qemuCaps, data->guestarch) < 0) { fprintf(stderr, "failed to create the capabilities from qemu"); goto error; -- 2.0.5

3 4

[libvirt] [PATCH] Strip control codes in virBufferEscapeString
by Ján Tomko 31 Mar '15

31 Mar '15

These cannot be represented in XML. We have been stripping them, but only if the string had characters that needed escaping: <>"'& Extend the strcspn check to include control codes, and strip them even if we don't do any escaping. https://bugzilla.redhat.com/show_bug.cgi?id=1184131 https://bugzilla.redhat.com/show_bug.cgi?id=1066564 --- src/util/virbuffer.c | 14 +++++++++++--- tests/virbuftest.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index 706dbfa..3d13c90 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -438,6 +438,13 @@ virBufferEscapeString(virBufferPtr buf, const char *format, const char *str) int len; char *escaped, *out; const char *cur; + const char forbidden_characters[] = { + 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, + /*\t*/ /*\n*/ 0x0B, 0x0C, /*\r*/ 0x0E, 0x0F, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, '"', '&', '\'', '<', '>', + '\0' + }; if ((format == NULL) || (buf == NULL) || (str == NULL)) return; @@ -446,7 +453,7 @@ virBufferEscapeString(virBufferPtr buf, const char *format, const char *str) return; len = strlen(str); - if (strcspn(str, "<>&'\"") == len) { + if (strcspn(str, forbidden_characters) == len) { virBufferAsprintf(buf, format, str); return; } @@ -490,8 +497,7 @@ virBufferEscapeString(virBufferPtr buf, const char *format, const char *str) *out++ = 'o'; *out++ = 's'; *out++ = ';'; - } else if (((unsigned char)*cur >= 0x20) || (*cur == '\n') || (*cur == '\t') || - (*cur == '\r')) { + } else if (!strchr(forbidden_characters, *cur)) { /* * default case, just copy ! * Note that character over 0x80 are likely to give problem @@ -499,6 +505,8 @@ virBufferEscapeString(virBufferPtr buf, const char *format, const char *str) * it's hard to handle properly we have to assume it's UTF-8 too */ *out++ = *cur; + } else { + /* silently ignore control characters */ } cur++; } diff --git a/tests/virbuftest.c b/tests/virbuftest.c index 21cb18b..10398d5 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -349,6 +349,39 @@ testBufAddStr(const void *opaque ATTRIBUTE_UNUSED) static int +testBufEscapeStr(const void *opaque ATTRIBUTE_UNUSED) +{ + const struct testBufAddStrData *data = opaque; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *actual; + int ret = -1; + + virBufferAddLit(&buf, "<c>\n"); + virBufferAdjustIndent(&buf, 2); + virBufferEscapeString(&buf, "<el>%s</el>\n", data->data); + virBufferAdjustIndent(&buf, -2); + virBufferAddLit(&buf, "</c>"); + + if (!(actual = virBufferContentAndReset(&buf))) { + TEST_ERROR("buf is empty"); + goto cleanup; + } + + if (STRNEQ_NULLABLE(actual, data->expect)) { + TEST_ERROR("testBufEscapeStr(): Strings don't match:\n"); + virtTestDifference(stderr, data->expect, actual); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(actual); + return ret; +} + + +static int mymain(void) { int ret = 0; @@ -379,6 +412,22 @@ mymain(void) DO_TEST_ADD_STR("<a/>\n", "<c>\n <a/>\n</c>"); DO_TEST_ADD_STR("\n <a/>\n\n", "<c>\n \n <a/>\n \n</c>"); +#define DO_TEST_ESCAPE(data, expect) \ + do { \ + struct testBufAddStrData info = { data, expect }; \ + if (virtTestRun("Buf: EscapeStr", testBufEscapeStr, &info) < 0) \ + ret = -1; \ + } while (0) + + DO_TEST_ESCAPE("<td></td><td></td>", + "<c>\n <el><td></td><td></td></el>\n</c>"); + DO_TEST_ESCAPE("\007\"&&\"\x15", + "<c>\n <el>"&&"</el>\n</c>"); + DO_TEST_ESCAPE(",,'..',,", + "<c>\n <el>,,'..',,</el>\n</c>"); + DO_TEST_ESCAPE("\x01\x01\x02\x03\x05\x08", + "<c>\n <el></el>\n</c>"); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 2.0.5

5 7

[libvirt] [PATCH] qemu: blockCopy: Pass adjusted bandwidth when called via blockRebase
by Peter Krempa 30 Mar '15

30 Mar '15

The block copy API takes the speed in bytes/s rather than MiB/s that was the prior approach in virDomainBlockRebase. We correctly converted the speed to bytes/s in the old API but we still called the common helper virDomainBlockCopyCommon with the unadjusted variable. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1207122 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4d05221..6700fc9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16811,7 +16811,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, flags &= (VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT); ret = qemuDomainBlockCopyCommon(vm, dom->conn, path, dest, - bandwidth, 0, 0, flags, true); + speed, 0, 0, flags, true); dest = NULL; cleanup: -- 2.2.2

2 2

[libvirt] [PATCH 0/6] Few NUMA fixes
by Michal Privoznik 30 Mar '15

30 Mar '15

The heart of the patchset are the last two patches. Long story short, if a domain is configured to be pinned onto a set of NUMA nodes stricly, we use both CGroups and numa_set_membind(). While we can change the former later on a user's wish, we can't change the latter. Therefore, any subsequent memory enlargement (e.g. via virsh setmem $dom) will result in memory still being allocated from old NUMA nodes and OOM killer interference is likely to occur. Michal Privoznik (6): virCgroupNewPartition: Fix comment virCgroupNew: Enhance debug message virCgroupController: Check the enum fits into 'int' qemuDomainGetNumaParameters: Check for the correct CGroup controller qemuProcessHook: Call virNuma*() iff needed virLXCControllerSetupResourceLimits: Call virNuma*() iff needed src/lxc/lxc_controller.c | 31 +++++++++++++++++++++++++------ src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 32 ++++++++++++++++++++++++++++---- src/util/vircgroup.c | 6 +++--- src/util/vircgroup.h | 5 +++++ 5 files changed, 62 insertions(+), 14 deletions(-) -- 2.0.5

2 9

[libvirt] [PATCH] interface: allow multiple IPv4 addresses in interface XML
by Laine Stump 30 Mar '15

30 Mar '15

An upcoming netcf release will support multiple ipv4 addresses, so let's loosen up libvirt's interface.rng to allow it. --- docs/schemas/interface.rng | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index bf0346c..45b40cd 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -326,12 +326,14 @@ <choice> <ref name="dhcp-element"/> <group> - <element name="ip"> - <attribute name="address"><ref name="ipv4Addr"/></attribute> - <optional> - <attribute name="prefix"><ref name="ipv4Prefix"/></attribute> - </optional> - </element> + <oneOrMore> + <element name="ip"> + <attribute name="address"><ref name="ipv4Addr"/></attribute> + <optional> + <attribute name="prefix"><ref name="ipv4Prefix"/></attribute> + </optional> + </element> + </oneOrMore> <optional> <element name="route"> <attribute name="gateway"><ref name="ipv4Addr"/></attribute> -- 2.1.0

2 1

[libvirt] ceph rbd key
by Raymond Durand 30 Mar '15

30 Mar '15

Is there a way that qemu takes the key of ceph rbd from a file rather than reading it from the file cinder.conf? Going from something like rbd_secret_uuid=UUID key to something like rbd_secret_uuid=/path/to/key (to restrict the access rights to the file and avoid the secret_uuid to be readable from anyone with ps kind of command) Regards,

1 0

[libvirt] [RFC] Add uptime to API returning Dom Info
by Nehal J Wani 30 Mar '15

30 Mar '15

This is an attempt to fix: https://bugzilla.redhat.com/show_bug.cgi?id=812911 Calculate vm uptime by subtracting process starttime from system uptime: Almost equivalent to: echo $(($(($(awk '{print $1}' /proc/uptime)*1e9 - $(($(cut -d " " -f22 /proc/$PID/stat)*1e7))))/(1.0 * 1e9))) --- include/libvirt/libvirt-domain.h | 1 + src/qemu/qemu_driver.c | 32 +++++++++++++++++++++++++------- src/remote/remote_protocol.x | 1 + src/remote_protocol-structs | 1 + tools/virsh-domain-monitor.c | 8 ++++++++ 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 7be4219..2df0241 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -275,6 +275,7 @@ struct _virDomainInfo { unsigned long memory; /* the memory in KBytes used by the domain */ unsigned short nrVirtCpu; /* the number of virtual CPUs for the domain */ unsigned long long cpuTime; /* the CPU time used in nanoseconds */ + unsigned long long upTime; /* the total uptime in nanoseconds */ }; /** diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f07e4fb..0b5098f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1309,11 +1309,12 @@ static char *qemuConnectGetCapabilities(virConnectPtr conn) { static int qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, - pid_t pid, int tid) + pid_t pid, int tid, unsigned long long *upTime) { char *proc; FILE *pidinfo; - unsigned long long usertime = 0, systime = 0; + unsigned long long usertime = 0, systime = 0, starttime = 0; + double _uptime; long rss = 0; int cpu = 0; int ret; @@ -1337,13 +1338,29 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, /* pid -> stime */ "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %llu %llu" /* cutime -> endcode */ - "%*d %*d %*d %*d %*d %*d %*u %*u %ld %*u %*u %*u" + "%*d %*d %*d %*d %*d %*d %llu %*u %ld %*u %*u %*u" /* startstack -> processor */ "%*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %d", - &usertime, &systime, &rss, &cpu) != 4) { + &usertime, &systime, &starttime, &rss, &cpu) != 5) { VIR_WARN("cannot parse process status data"); } + ret = virAsprintf(&proc, "/proc/uptime"); + if (ret < 0) + return -1; + + pidinfo = fopen(proc, "r"); + VIR_FREE(proc); + + if (!pidinfo || fscanf(pidinfo, "%lf %*f", &_uptime) != 1) { + VIR_WARN("cannot parse machine uptime data"); + } + + if (upTime) + *upTime = 1000ull * 1000ull * 1000ull * _uptime - + (1000ull * 1000ull * 1000ull * starttime) + / (unsigned long long)sysconf(_SC_CLK_TCK); + /* We got jiffies * We want nanoseconds * _SC_CLK_TCK is jiffies per second @@ -1404,7 +1421,8 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, &(info[i].cpu), NULL, vm->pid, - priv->vcpupids[i]) < 0) { + priv->vcpupids[i], + NULL) < 0) { virReportSystemError(errno, "%s", _("cannot get vCPU placement & pCPU time")); return -1; @@ -2595,7 +2613,7 @@ static int qemuDomainGetInfo(virDomainPtr dom, if (!virDomainObjIsActive(vm)) { info->cpuTime = 0; } else { - if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0) < 0) { + if (qemuGetProcessInfo(&(info->cpuTime), NULL, NULL, vm->pid, 0, &(info->upTime)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot read cputime for domain")); goto cleanup; @@ -11474,7 +11492,7 @@ qemuDomainMemoryStats(virDomainPtr dom, if (ret >= 0 && ret < nr_stats) { long rss; - if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0) < 0) { + if (qemuGetProcessInfo(NULL, NULL, &rss, vm->pid, 0, NULL) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("cannot get RSS for domain")); } else { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index d90e6b5..193f501 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -901,6 +901,7 @@ struct remote_domain_get_info_ret { /* insert@1 */ unsigned hyper memory; unsigned short nrVirtCpu; unsigned hyper cpuTime; + unsigned hyper upTime; }; struct remote_domain_save_args { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index e614f77..1f54d5d 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -531,6 +531,7 @@ struct remote_domain_get_info_ret { uint64_t memory; u_short nrVirtCpu; uint64_t cpuTime; + uint64_t upTime; }; struct remote_domain_save_args { remote_nonnull_domain dom; diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 6951db2..027790f 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1246,6 +1246,14 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%-15s %.1lfs\n", _("CPU time:"), cpuUsed); } + if (info.upTime != 0) { + double upTime = info.upTime; + + upTime /= 1000000000.0; + + vshPrint(ctl, "%-15s %.1lfs\n", _("Uptime:"), upTime); + } + if (info.maxMem != UINT_MAX) vshPrint(ctl, "%-15s %lu KiB\n", _("Max memory:"), info.maxMem); -- 2.1.0

2 3

[libvirt] [PATCH] qemu: fix crash in qemuProcessAutoDestroy
by Michael Chapman 30 Mar '15

30 Mar '15

The destination libvirt daemon in a migration may segfault if the client disconnects immediately after the migration has begun: # virsh -c qemu+tls://remote/system list --all Id Name State ---------------------------------------------------- ... # timeout --signal KILL 1 \ virsh migrate example qemu+tls://remote/system \ --verbose --compressed --live --auto-converge \ --abort-on-error --unsafe --persistent \ --undefinesource --copy-storage-all --xml example.xml Killed # virsh -c qemu+tls://remote/system list --all error: failed to connect to the hypervisor error: unable to connect to server at 'remote:16514': Connection refused The crash is in: 1531 void 1532 qemuDomainObjEndJob(virQEMUDriverPtr driver, virDomainObjPtr obj) 1533 { 1534 qemuDomainObjPrivatePtr priv = obj->privateData; 1535 qemuDomainJob job = priv->job.active; 1536 1537 priv->jobs_queued--; Backtrace: #0 at qemuDomainObjEndJob at qemu/qemu_domain.c:1537 #1 in qemuDomainRemoveInactive at qemu/qemu_domain.c:2497 #2 in qemuProcessAutoDestroy at qemu/qemu_process.c:5646 #3 in virCloseCallbacksRun at util/virclosecallbacks.c:350 #4 in qemuConnectClose at qemu/qemu_driver.c:1154 ... qemuDomainRemoveInactive calls virDomainObjListRemove, which in this case is holding the last remaining reference to the domain. qemuDomainRemoveInactive then calls qemuDomainObjEndJob, but the domain object has been freed and poisoned by then. This patch bumps the domain's refcount until qemuDomainRemoveInactive has completed. We also ensure qemuProcessAutoDestroy does not return the domain to virCloseCallbacksRun to be unlocked in this case. There is similar logic in bhyveProcessAutoDestroy and lxcProcessAutoDestroy (which call virDomainObjListRemove directly). Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_domain.c | 5 +++++ src/qemu/qemu_process.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 758fcd9..0ae4693 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2487,11 +2487,16 @@ qemuDomainRemoveInactive(virQEMUDriverPtr driver, VIR_WARN("unable to remove snapshot directory %s", snapDir); VIR_FREE(snapDir); } + + virObjectRef(vm); + virDomainObjListRemove(driver->domains, vm); virObjectUnref(cfg); if (haveJob) qemuDomainObjEndJob(driver, vm); + + virObjectUnref(vm); } void diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 79f763e..fe987c8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5642,8 +5642,10 @@ qemuProcessAutoDestroy(virDomainObjPtr dom, qemuDomainObjEndJob(driver, dom); - if (!dom->persistent) + if (!dom->persistent) { qemuDomainRemoveInactive(driver, dom); + dom = NULL; + } if (event) qemuDomainEventQueue(driver, event); -- 2.1.0

2 1

[libvirt] [PATCH] build: avoid variable named 'interface', for mingw
by Eric Blake 29 Mar '15

29 Mar '15

Commit 2f36e6944 (re-)introduced a use of an identifier 'interface', which causes this build failure on mingw: ../../tools/virsh-domain-monitor.c: In function 'cmdDomIfAddr': ../../tools/virsh-domain-monitor.c:2233:17: error: expected identifier or '(' before 'struct' const char *interface = NULL; ^ See also commit 6512c8b. Sadly, I'm not quite sure how to write a syntax check that can poison the use of this identifier. * tools/virsh-domain-monitor.c (cmdDomIfAddr): Use ifacestr instead. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tools/virsh-domain-monitor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index d307881..6951db2 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1,7 +1,7 @@ /* * virsh-domain-monitor.c: Commands to monitor domain status * - * Copyright (C) 2005, 2007-2014 Red Hat, Inc. + * Copyright (C) 2005, 2007-2015 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -2230,7 +2230,7 @@ static bool cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - const char *interface = NULL; + const char *ifacestr = NULL; virDomainInterfacePtr *ifaces = NULL; size_t i, j; int ifaces_count = 0; @@ -2242,7 +2242,7 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptString(cmd, "interface", &interface) < 0) + if (vshCommandOptString(cmd, "interface", &ifacestr) < 0) goto cleanup; if (vshCommandOptString(cmd, "source", &sourcestr) < 0) goto cleanup; @@ -2273,7 +2273,7 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) char *ip_addr_str = NULL; const char *type = NULL; - if (interface && STRNEQ(interface, iface->name)) + if (ifacestr && STRNEQ(ifacestr, iface->name)) continue; /* When the interface has no IP address */ -- 2.1.0

2 1

[libvirt] Instances
by Dave Sayles 28 Mar '15

28 Mar '15

I'm running libvirt with qemu-kvm underneath. My network stack has the eth0 interface which is bridged to a br0 interface. Usually, when a VM starts up, a new "vnet" interface is created as well by libvirt. That vnet interface has a matching HWaddr to the VM that was spun up with it, so I'm assuming they're associated somehow. Sometimes, after using libvirt's "virt-install" to create a VM, I'm unable to "virsh start" it. Virsh will print this out to stderr that it couldn't start that VM, since the connection was "Reset by peer". I've yet to find a repro case for this issue. Eventually, I am able to "virsh start" the instance, but only after several minutes. Are there any known issues with libvirt/qemu-kvm failing to instantiate network devices when it spins up VMs? This is printed to the logs as well: Mar 27 16:21:07 localhost kernel: device vnet42 entered promiscuous mode Mar 27 16:21:07 localhost kernel: br0: port 44(vnet42) entering forwarding state Mar 27 16:21:07 localhost logger: KVM: 43 guests now active Mar 27 16:21:08 localhost kernel: br0: port 44(vnet42) entering disabled state Mar 27 16:21:08 localhost kernel: device vnet42 left promiscuous mode Mar 27 16:21:08 localhost kernel: br0: port 44(vnet42) entering disabled state Mar 27 16:21:08 localhost logger: KVM: 42 guests now active

2 2

Re: [libvirt] GSoC/OPW:Problems Compilling libvirt
by Noella Ashu 28 Mar '15

28 Mar '15

Hello Yandong, (1)As I known, before compiling libvirt, some packages should be installed. > > sudo apt-get install gcc make pkg-config libxml2-dev libgnutils-dev > libdevmapper-dev libcur l4-gnutls-dev python-dev libpciaccess-dev > libxen-dev libnl-dev > > I just ran $yum builddep libvirt and it installed all the dependencies for libvirt. I have successfully compiled libvirt. I'll select some bugs to start working on. Thanks, > >> > > > -- > ---------------------------------------------------------- > regards, > yandong > >

1 0

[libvirt] GSoC/OPW:Problems Compilling libvirt
by Noella Ashu 28 Mar '15

28 Mar '15

Hello, I have been trying to compile libvirt, I have cloned the git repo, tried running ./configure but it looks like it's not executable. So when I try running ./autogen.sh script. I get the following errors: https://paste.kde.org/p8liujgxg I have tried installing autopoint, python-config. It's not working. Is there anything I'm missing? I do not see any file listing the dependencies I have to install. Thanks, Noella

1 0

[libvirt] [libvirt-python PATCH v12] Expose virDomainInterfacesAddresses to python binding
by Pavel Hrdina 28 Mar '15

28 Mar '15

From: Nehal J Wani <nehaljw.kkd1(a)gmail.com> examples/Makefile.am: * Add new file domipaddrs.py examples/README: * Add documentation for the python example libvirt-override-api.xml: * Add new symbol for virDomainInterfacesAddresses libvirt-override.c: * Hand written python api Example: $ python examples/domipaddrs.py qemu:///system f18 Interface MAC address Protocol Address vnet0 52:54:00:20:70:3d ipv4 192.168.105.240/16 In v11: - Cope with hwaddr being NULL by filling in PY_NONE Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- MANIFEST.in | 1 + examples/README | 1 + examples/domipaddrs.py | 57 +++++++++++++++++++++ generator.py | 2 + libvirt-override-api.xml | 7 +++ libvirt-override.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 3 ++ 7 files changed, 199 insertions(+) create mode 100755 examples/domipaddrs.py diff --git a/MANIFEST.in b/MANIFEST.in index d7bc545..dd05221 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,6 +4,7 @@ include COPYING include COPYING.LESSER include ChangeLog include examples/consolecallback.py +include examples/domipaddrs.py include examples/dominfo.py include examples/domrestore.py include examples/domsave.py diff --git a/examples/README b/examples/README index 5b5d405..1d4b425 100644 --- a/examples/README +++ b/examples/README @@ -11,6 +11,7 @@ domrestore.py - restore domU's from their saved files in a directory esxlist.py - list active domains of an VMware ESX host and print some info. also demonstrates how to use the libvirt.openAuth() method dhcpleases.py - list dhcp leases for a given virtual network +domipaddrs.py - list IP addresses for guest domains The XML files in this directory are examples of the XML format that libvirt expects, and will have to be adapted for your setup. They are only needed diff --git a/examples/domipaddrs.py b/examples/domipaddrs.py new file mode 100755 index 0000000..d6d5cac --- /dev/null +++ b/examples/domipaddrs.py @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# domipaddrs - print domain interfaces along with their MAC and IP addresses + +import libvirt +import sys + +def usage(): + print "Usage: %s [URI] DOMAIN" % sys.argv[0] + print " Print domain interfaces along with their MAC and IP addresses" + +uri = None +name = None +args = len(sys.argv) + +if args == 2: + name = sys.argv[1] +elif args == 3: + uri = sys.argv[1] + name = sys.argv[2] +else: + usage() + sys.exit(2) + +conn = libvirt.open(uri) +if conn == None: + print "Unable to open connection to libvirt" + sys.exit(1) + +try: + dom = conn.lookupByName(name) +except libvirt.libvirtError: + print "Domain %s not found" % name + sys.exit(0) + +ifaces = dom.interfaceAddresses(libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE); +if (ifaces == None): + print "Failed to get domain interfaces" + sys.exit(0) + +print " {0:10} {1:20} {2:12} {3}".format("Interface", "MAC address", "Protocol", "Address") + +def toIPAddrType(addrType): + if addrType == libvirt.VIR_IP_ADDR_TYPE_IPV4: + return "ipv4" + elif addrType == libvirt.VIR_IP_ADDR_TYPE_IPV6: + return "ipv6" + +for (name, val) in ifaces.iteritems(): + if val['addrs']: + for addr in val['addrs']: + print " {0:10} {1:19}".format(name, val['hwaddr']), + print " {0:12} {1}/{2} ".format(toIPAddrType(addr['type']), addr['addr'], addr['prefix']), + print + else: + print " {0:10} {1:19}".format(name, val['hwaddr']), + print " {0:12} {1}".format("N/A", "N/A"), + print diff --git a/generator.py b/generator.py index df7a74d..8c1c48e 100755 --- a/generator.py +++ b/generator.py @@ -483,6 +483,7 @@ skip_impl = ( 'virDomainBlockCopy', 'virNodeAllocPages', 'virDomainGetFSInfo', + 'virDomainInterfaceAddresses', ) lxc_skip_impl = ( @@ -595,6 +596,7 @@ skip_function = ( 'virDomainStatsRecordListFree', # only useful in C, python uses dict 'virDomainFSInfoFree', # only useful in C, python code uses list 'virDomainIOThreadsInfoFree', # only useful in C, python code uses list + 'virDomainInterfaceFree', # only useful in C, python code uses list ) lxc_skip_function = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 4660c9f..40ad602 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -678,5 +678,12 @@ <arg name='flags' type='unsigned int' info='unused, pass 0'/> <return type='char *' info="list of mounted filesystems information"/> </function> + <function name='virDomainInterfaceAddresses' file='python'> + <info>returns a dictionary of domain interfaces along with their MAC and IP addresses</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='source' type='unsigned int' info='the data source'/> + <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> + <return type='char *' info="dictionary of domain interfaces along with their MAC and IP addresses"/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index 1241305..b64c101 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -5120,6 +5120,131 @@ cleanup: return py_retval; } + +#if LIBVIR_CHECK_VERSION(1, 2, 14) +static PyObject * +libvirt_virDomainInterfaceAddresses(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = VIR_PY_NONE; + PyObject *pyobj_domain; + virDomainPtr domain; + virDomainInterfacePtr *ifaces = NULL; + unsigned int source; + unsigned int flags; + int ifaces_count = 0; + size_t i, j; + + if (!PyArg_ParseTuple(args, (char *) "Oii:virDomainInterfaceAddresses", + &pyobj_domain, &source, &flags)) + goto error; + + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + LIBVIRT_BEGIN_ALLOW_THREADS; + ifaces_count = virDomainInterfaceAddresses(domain, &ifaces, source, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (ifaces_count < 0) + goto cleanup; + + if (!(py_retval = PyDict_New())) + goto error; + + for (i = 0; i < ifaces_count; i++) { + virDomainInterfacePtr iface = ifaces[i]; + PyObject *py_addrs = NULL; + PyObject *py_iface = NULL; + PyObject *py_iname = NULL; + PyObject *py_ivalue = NULL; + + if (!(py_iface = PyDict_New())) + goto error; + + if ((py_iname = libvirt_charPtrWrap(iface->name)) == NULL || + PyDict_SetItem(py_retval, py_iname, py_iface) < 0) { + Py_XDECREF(py_iname); + Py_DECREF(py_iface); + goto error; + } + + if (iface->naddrs) { + if (!(py_addrs = PyList_New(iface->naddrs))) { + goto error; + } + } else { + py_addrs = VIR_PY_NONE; + } + + if ((py_iname = libvirt_constcharPtrWrap("addrs")) == NULL || + PyDict_SetItem(py_iface, py_iname, py_addrs) < 0) { + Py_XDECREF(py_iname); + Py_DECREF(py_addrs); + goto error; + } + + if ((py_iname = libvirt_constcharPtrWrap("hwaddr")) == NULL || + (py_ivalue = libvirt_constcharPtrWrap(iface->hwaddr)) == NULL || + PyDict_SetItem(py_iface, py_iname, py_ivalue) < 0) { + Py_XDECREF(py_iname); + Py_XDECREF(py_ivalue); + goto error; + } + + for (j = 0; j < iface->naddrs; j++) { + virDomainIPAddressPtr addr = &(iface->addrs[j]); + PyObject *py_addr = PyDict_New(); + + if (!py_addr) + goto error; + + if (PyList_SetItem(py_addrs, j, py_addr) < 0) { + Py_DECREF(py_addr); + goto error; + } + + if ((py_iname = libvirt_constcharPtrWrap("addr")) == NULL || + (py_ivalue = libvirt_constcharPtrWrap(addr->addr)) == NULL || + PyDict_SetItem(py_addr, py_iname, py_ivalue) < 0) { + Py_XDECREF(py_iname); + Py_XDECREF(py_ivalue); + goto error; + } + if ((py_iname = libvirt_constcharPtrWrap("prefix")) == NULL || + (py_ivalue = libvirt_intWrap(addr->prefix)) == NULL || + PyDict_SetItem(py_addr, py_iname, py_ivalue) < 0) { + Py_XDECREF(py_iname); + Py_XDECREF(py_ivalue); + goto error; + } + if ((py_iname = libvirt_constcharPtrWrap("type")) == NULL || + (py_ivalue = libvirt_intWrap(addr->type)) == NULL || + PyDict_SetItem(py_addr, py_iname, py_ivalue) < 0) { + Py_XDECREF(py_iname); + Py_XDECREF(py_ivalue); + goto error; + } + } + } + +cleanup: + if (ifaces && ifaces_count > 0) { + for (i = 0; i < ifaces_count; i++) { + virDomainInterfaceFree(ifaces[i]); + } + } + VIR_FREE(ifaces); + + return py_retval; + +error: + Py_XDECREF(py_retval); + py_retval = NULL; + goto cleanup; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ + + /******************************************* * Helper functions to avoid importing modules * for every callback @@ -8750,6 +8875,9 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(1, 2, 11) {(char *) "virDomainGetFSInfo", libvirt_virDomainGetFSInfo, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 2, 11) */ +#if LIBVIR_CHECK_VERSION(1, 2, 14) + {(char *) "virDomainInterfaceAddresses", libvirt_virDomainInterfaceAddresses, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 14) */ {NULL, NULL, 0, NULL} }; diff --git a/sanitytest.py b/sanitytest.py index 0e6e0e5..cae234a 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -145,6 +145,9 @@ for cname in wantfunctions: if name[0:26] == "virDomainIOThreadsInfoFree": continue + if name[0:22] == "virDomainInterfaceFree": + continue + if name[0:21] == "virDomainListGetStats": name = "virConnectDomainListGetStats" -- 2.0.5

2 2

[libvirt] [perl PATCH 0/2] Rename IOThreads* APIs to IOThread
by Ján Tomko 28 Mar '15

28 Mar '15

These depend on the rename being pushed to libvirt.git: (first four patches of:) https://www.redhat.com/archives/libvir-list/2015-March/msg01325.html Ján Tomko (2): Adapt to rename of virDomainIOThreadsInfoFree to virDomainIOThreadInfoFree Adapt to rename of virDomainGetIOThreadsInfo to virDomainGetIOThreadInfo Changes | 2 ++ Virt.xs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.0.5

2 6

[libvirt] [libvirt-python PATCH 0/2] Rename IOThreads* APIs to IOThread
by Ján Tomko 28 Mar '15

28 Mar '15

These depend on the rename being pushed to libvirt.git: (first four patches of:) https://www.redhat.com/archives/libvir-list/2015-March/msg01325.html Ján Tomko (2): Rename virDomainIOThreadsInfoFree to virDomainIOThreadInfoFree Rename virDomainGetIOThreadsInfo to virDomainGetIOThreadInfo generator.py | 6 +++--- libvirt-override-api.xml | 2 +- libvirt-override.c | 12 ++++++------ sanitytest.py | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) -- 2.0.5

3 8

[libvirt] [PATCH] vircgroup: Fix build issue on mingw
by John Ferlan 27 Mar '15

27 Mar '15

Commit id 'ba1dfc5' added virCgroupSetCpusetMemoryMigrate and virCgroupGetCpusetMemoryMigrate, but did not add the corresponding entry points into the "#else /* !VIR_CGROUP_SUPPORTED */" section Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Not pushing as a build break since I'm not 100% it fixes the issue eblake mentions in his review of a recent cgroup series. src/util/vircgroup.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0a2e729..093a146 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4420,6 +4420,26 @@ virCgroupGetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED, int +virCgroupSetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED, + bool migrate ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + + +int +virCgroupGetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED, + bool *migrate ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + + +int virCgroupSetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED, const char *cpus ATTRIBUTE_UNUSED) { -- 2.1.0

2 2

Re: [libvirt] bug#20082: new warning from ar on rawhide systems
by Eric Blake 27 Mar '15

27 Mar '15

[redirecting to libvirt; a continuation of https://www.redhat.com/archives/libvir-list/2015-February/msg01227.html] On 03/27/2015 02:43 PM, Pavel Raiskup wrote: > [+cc back libtool bug; as fixing automake does not seem to be enough] > >> >> Hmm. How hard is it to change ARFLAGS to 'cr' instead of the default of >> 'cru', so that projects that want to silence the warning now can do so >> without waiting on automake to catch up? (Remember, the warning is live >> on rawhide systems now, and even if we release a new automake with a >> patch to change the default, there are TONS of packages built with older >> automake that will still warn until such time as autoreconf is run on >> those packages to update them to the newer automake) > > Agreed here, while trying to look at possible patch, I found that libtool > historically does not respect automake's ARFLAGS, it has its own AR_FLAGS: > http://lists.gnu.org/archive/html/libtool/2008-05/msg00050.html > So fixing automake does not help for libtool-enabled projects, and, in some > situations users could need AR_FLAGS=X ARFLAGS=X, but yes - still easy to > define on per-project basis. > > FTR, Libtool uses AR_FLAGS from ~2000 (commit 8300de4c54e6f04f0d), automake > ARFLAGS from ~2003 (commit a71b3490639831ca). > Given the discussion on automake/libtool lists, I'm going to play with a patch that just sets AR[_]FLAGS to 'cr' to shut up the compilation warnings on rawhide. Anyone see a problem with that plan? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH 0/2] really fix qemucaps2xmltest
by Pavel Hrdina 27 Mar '15

27 Mar '15

Pavel Hrdina (2): Revert "qemucaps2xmltest: fix test to successfully run without kvm support" tests: introduce qemucaps2xmlmock tests/Makefile.am | 7 +++++++ tests/qemucaps2xmlmock.c | 33 +++++++++++++++++++++++++++++++++ tests/qemucaps2xmltest.c | 6 +++--- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 tests/qemucaps2xmlmock.c -- 2.0.5

2 4

[libvirt] [PATCH] virnetlink: fix build error
by Pavel Hrdina 27 Mar '15

27 Mar '15

Commint 0473b45cc introduced new function virNetlinkDelLink, but in it's counterpart for non-linux platform there should be ATTRIBUTE_UNUSED instead of ATTRIBUTE_UNSUPPORTED. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/util/virnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 86c9c9c..0052ef9 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -886,7 +886,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, int -virNetlinkDelLink(const char *ifname ATTRIBUTE_UNSUPPORTED) +virNetlinkDelLink(const char *ifname ATTRIBUTE_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; -- 2.0.5

2 1

[libvirt] [PATCH 0/2] vshPrintPinInfo cleanups
by Ján Tomko 27 Mar '15

27 Mar '15

Ján Tomko (2): Fix indentation in cmdVcpuPin Rewrite vshPrintPinInfo tools/virsh-domain.c | 55 ++++++++++++++++------------------------------------ 1 file changed, 17 insertions(+), 38 deletions(-) -- 2.0.5

2 3

[libvirt] [PATCH v4 0/3] Parallels disk device attach
by Alexander Burluka 27 Mar '15

27 Mar '15

This patchset implements disk device attachment and allows OpenStack to attach volumes to Parallels-driven instances. Parallels Cloud Server SDK supports live attachment of disk devices and virtual interfaces cards. Alexander Burluka (3): Parallels: remove disk serial number check Parallels: implement domainAttachDeviceFlags Parallels: implemented domainAttachDevice

2 4

Re: [libvirt] iscsi multipath failure with "libvirtError: Failed to open file '/dev/mapper/Mar': No such file or directory"
by Stefan Hajnoczi 27 Mar '15

27 Mar '15

On Mon, Mar 23, 2015 at 10:14:31PM +0530, mad Engineer wrote: > hello All, > I know the issue is related to libvirt,but i dont know > where to ask. The libvirt mailing list is the place to ask libvirt questions. I have CCed it. > i have centos 6.6 running KVM as compute node in openstack icehouse > > when i try to attach volume to instance it shows > > 2596: error : virStorageFileGetMetadataRecurse:952 : Failed to open > file '/dev/mapper/Mar': No such file or directory > > in libvirt log > > This does not always happen when it happens no one will be able to > attach volume to instance > > > using EMC VNX as storage backend. > > > multipath.conf > > > # Skip the files uner /dev that are definitely not FC/iSCSI devices > # Different system may need different customization > devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" > devnode "^hd[a-z][0-9]*" > devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" > > # Skip LUNZ device from VNX > device { > vendor "DGC" > product "LUNZ" > } > } > > defaults { > user_friendly_names no > flush_on_last_del yes > } > > devices { > # Device attributed for EMC CLARiiON and VNX series ALUA > device { > vendor "DGC" > product ".*" > product_blacklist "LUNZ" > path_grouping_policy group_by_prio > path_selector "round-robin 0" > path_checker emc_clariion > features "1 queue_if_no_path" > hardware_handler "1 alua" > prio alua > failback immediate > } > } > > > Can any one help me with this issue You may need to check dmesg or logs related to the EMC storage. In particular, check for LUNs going offline, coming online, or the multipath device changing state. Stefan

1 0

[libvirt] [PATCH v3 0/3] Parallels disk device attach
by Alexander Burluka 27 Mar '15

27 Mar '15

This patchset implements disk device attachment and allows OpenStack to attach volumes to Parallels-driven instances. Parallels Cloud Server SDK supports live attachment of disk devices and virtual interfaces cards. Alexander Burluka (3): Parallels: remove disk serial number check Parallels: implement domainAttachDeviceFlags Parallels: implemented domainAttachDevice

2 4

[libvirt] [PATCH v2 0/3] Parallels disk device attach
by Alexander Burluka 27 Mar '15

27 Mar '15

This patchset implements disk device attachment and allows OpenStack to attach volumes to Parallels-driven instances. Parallels Cloud Server SDK supports live attachment of disk devices and virtual interfaces cards. Alexander Burluka (3): Parallels: remove disk serial number check Parallels: implement domainAttachDeviceFlags Parallels: implemented domainAttachDevice

3 5

[libvirt] [PATCH] qemu: end the job when try to blockcopy to non-file destination
by Shanzhi Yu 27 Mar '15

27 Mar '15

Blockcopy to non-file destination is not supported according the code while a 'goto endjob' is missed after check the destination which lead qemu try to do drive-mirror. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1206406 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index db4f0b4..f07e4fb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16642,6 +16642,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (!virStorageSourceIsLocalStorage(mirror)) { virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("non-file destination not supported yet")); + goto endjob; } if (stat(mirror->path, &st) < 0) { if (errno != ENOENT) { -- 2.1.0

2 1

[libvirt] [PATCH 1/1] nodeinfo: Increase the num of CPU thread siblings to a larger value
by Wei Huang 27 Mar '15

27 Mar '15

Current libvirt can only handle up to 1024 thread siblings when it reads Linux sysfs topology/thread_siblings. This isn't enough for Linux distributions that support a large value. This patch fixes the problem by using VIR_ALLOC()/VIR_FREE(), instead of using a fixed-size (1024) local char array. In the meanwhile SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX is increased to 8192 which should be large enough for a foreseeable future. Signed-off-by: Wei Huang <wei(a)redhat.com> --- src/nodeinfo.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 34d27a6..66dc7ef 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -287,7 +287,7 @@ freebsdNodeGetMemoryStats(virNodeMemoryStatsPtr params, # define PROCSTAT_PATH "/proc/stat" # define MEMINFO_PATH "/proc/meminfo" # define SYSFS_MEMORY_SHARED_PATH "/sys/kernel/mm/ksm" -# define SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX 1024 +# define SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX 8192 # define LINUX_NB_CPU_STATS 4 # define LINUX_NB_MEMORY_STATS_ALL 4 @@ -345,7 +345,7 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu) unsigned long ret = 0; char *path; FILE *pathfp; - char str[1024]; + char *str = NULL; size_t i; if (virAsprintf(&path, "%s/cpu%u/topology/thread_siblings", @@ -365,7 +365,10 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu) return 0; } - if (fgets(str, sizeof(str), pathfp) == NULL) { + if (VIR_ALLOC_N(str, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX) < 0) + goto cleanup; + + if (fgets(str, SYSFS_THREAD_SIBLINGS_LIST_LENGTH_MAX, pathfp) == NULL) { virReportSystemError(errno, _("cannot read from %s"), path); goto cleanup; } @@ -382,6 +385,7 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu) } cleanup: + VIR_FREE(str); VIR_FORCE_FCLOSE(pathfp); VIR_FREE(path); -- 1.8.3.1

3 5

[libvirt] qemu_migration: Precreate missing storage breaks with network drives
by Noel Burton-Krahn 27 Mar '15

27 Mar '15

Hi Michal, We're testing libvirt-1.2.13 and found it failed to live migrate domains with attached network drives. The change to libvirt was made in commit cf54c606, announced here: https://www.redhat.com/archives/libvir-list/2014-November/msg01053.html It's not necessary to precreate network drives. They're created during nova live migration in openstack. How about this patch? diff -U3 -r libvirt-1.2.13.orig/src/qemu/qemu_migration.c libvirt-1.2.13/src/qemu/qemu_migration.c --- libvirt-1.2.13.orig/src/qemu/qemu_migration.c 2015-02-23 22:04:12.000000000 -0800 +++ libvirt-1.2.13/src/qemu/qemu_migration.c 2015-03-18 12:18:14.137990147 -0700 @@ -1510,6 +1510,9 @@ case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_NETWORK: + ret = 0; + goto cleanup; + break; case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, Cheers, -- Noel Burton-Krahn Sr, Distributed Systems Engineer Piston Cloud Computing

4 11

[libvirt] [libvirt-test-API][PATCH] Add connection_getDomainCapabilities test case
by jiahu 27 Mar '15

27 Mar '15

In the case, we will validate getDomainCapabilities API for libvirt. jiahu (1): Add connection_getDomainCapabilities test case cases/test_connection.conf | 10 + repos/virconn/connection_getDomainCapabilities.py | 438 ++++++++++++++++++++++ 2 files changed, 448 insertions(+) create mode 100644 repos/virconn/connection_getDomainCapabilities.py -- 1.8.1.4

2 2

[libvirt] [PATCH] relaxng: allow : in /dev/disk/by-path names
by Eric Blake 27 Mar '15

27 Mar '15

On IRC, Hydrar pointed a problem where 'virsh edit' failed on his domain created through an ISCSI pool managed by virt-manager, all because the XML included a block device with colons in the name. * docs/schemas/basictypes.rng (absFilePath): Add colon as safe. * tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml: New file. * tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args: Likewise. * tests/qemuxml2argvtest.c (mymain): Test it. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/schemas/basictypes.rng | 2 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 ++++++ tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml | 28 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 0cd1c4e..f086ad2 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -242,7 +242,7 @@ <define name="absFilePath"> <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%,]+</param> + <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&"'<>/%,:]+</param> </data> </define> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args new file mode 100644 index 0000000..b987a38 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args @@ -0,0 +1,7 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -nographic -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb \ +-hda /dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver\ +:hydrar-desktop.win7vm-lun-0 -net none \ +-serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml new file mode 100644 index 0000000..e4d9c97 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.xml @@ -0,0 +1,28 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3c2fbf1..57ef053 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -708,6 +708,7 @@ mymain(void) DO_TEST("hugepages-pages6", NONE); DO_TEST("nosharepages", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); + DO_TEST("disk-iscsi", NONE); DO_TEST("disk-cdrom-network-http", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, QEMU_CAPS_DRIVE); DO_TEST("disk-cdrom-network-https", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE, -- 2.1.0

2 2

[libvirt] [PATCH] libxl: Fix memory leak if pthread_create fails.
by Konrad Rzeszutek Wilk 26 Mar '15

26 Mar '15

If we fail to create the thread we leak the shutdown_info structure. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk(a)oracle.com> --- src/libxl/libxl_domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 774b070..0ac5c62 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -482,7 +482,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) libxlDriverPrivatePtr driver = data; virDomainObjPtr vm = NULL; libxl_shutdown_reason xl_reason = event->u.domain_shutdown.shutdown_reason; - struct libxlShutdownThreadInfo *shutdown_info; + struct libxlShutdownThreadInfo *shutdown_info = NULL; virThread thread; libxlDriverConfigPtr cfg; @@ -535,6 +535,7 @@ libxlDomainEventHandler(void *data, VIR_LIBXL_EVENT_CONST libxl_event *event) virObjectUnref(cfg); if (vm) virObjectUnlock(vm); + VIR_FREE(shutdown_info); } void -- 1.8.4.2

2 1

[libvirt] [PATCH 0/3] Parallels disk device attach
by Alexander Burluka 26 Mar '15

26 Mar '15

This patchset implements disk device attachment and allows OpenStack to attach volumes to Parallels-driven instances. Parallels Cloud Server SDK supports live attachment of disk devices and virtual interfaces cards. Alexander Burluka (3): Parallels: remove disk serial number check Parallels: implement domainAttachDeviceFlags Parallels: implemented domainAttachDevice

2 6

[libvirt] [PATCH 0/4] util: use netlink to create bridge devices
by Laine Stump 26 Mar '15

26 Mar '15

This patch series comes out of a comment in: https://bugzilla.redhat.com/show_bug.cgi?id=1125755 that pointed out that sioctl(SIOCBRDELBR) won't delete a bridge interface if it is IFF_UP, but the netlink RTM_DELLINK message doesn't care - it will delete it anyway. In these patches we switch to using RTM_DELLINK to avoid failures caused by a bridge interface that is IFF_UP. Laine Stump (4): util: netlink function to delete any network device util: replace body of virNetDevMacVLanDelete() with virNetlinkDelLink() util: use netlink to delete bridge devices util: use netlink to create bridge devices src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 90 +++++++++++++++++++++++++++++++++++++++++++-- src/util/virnetdevmacvlan.c | 67 +-------------------------------- src/util/virnetlink.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 3 +- 5 files changed, 181 insertions(+), 69 deletions(-) -- 2.1.0

2 11

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 26 Mar '15

26 Mar '15

Needed to silence a valgrind detection of uninitialized memory: https://bugzilla.redhat.com/show_bug.cgi?id=1174147 * .gnulib: Update to latest. * bootstrap: Resync to gnulib. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I've missed RC1, so I'll wait for a review on this one (are we sure that RC2 will be enough time to ensure the gnulib update doesn't cause regressions, basically). .gnulib | 2 +- bootstrap | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index c27f1a3..8be5f2c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c27f1a356f2f321daa7f971ef276a1dbfa873bf8 +Subproject commit 8be5f2c10eeb05e52cc4a33cdcd37078742ff5db diff --git a/bootstrap b/bootstrap index 2fdf267..e72894c 100755 --- a/bootstrap +++ b/bootstrap @@ -915,7 +915,8 @@ if test $use_libtool = 1; then esac fi echo "$0: $gnulib_tool $gnulib_tool_options --import ..." -$gnulib_tool $gnulib_tool_options --import $gnulib_modules && +$gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ -- 2.1.0

4 6

[libvirt] [PATCH] Fix common misspellings
by Martin Kletzander 26 Mar '15

26 Mar '15

Wikipedia's list of common misspellings [1] has a machine-readable version. This patch fixes those misspellings mentioned in the list which don't have multiple right variants (as e.g. "accension", which can be both "accession" and "ascension"), such misspellings are left untouched. The list of changes was manually re-checked for false positives. [1] https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_ma… Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- This is in no way automated, it's merely a check on whether this makes sense. Also I left out three words and two files which I thought might not be what we want. docs/bugs.html.in | 2 +- docs/contact.html.in | 2 +- docs/schemas/basictypes.rng | 2 +- docs/schemas/interface.rng | 2 +- docs/securityprocess.html.in | 6 +++--- examples/systemtap/lock-debug.stp | 2 +- include/libvirt/libvirt-host.h | 2 +- include/libvirt/virterror.h | 2 +- src/bhyve/bhyve_driver.c | 6 +++--- src/cpu/cpu_powerpc.c | 2 +- src/datatypes.c | 4 ++-- src/network/bridge_driver_linux.c | 2 +- src/qemu/THREADS.txt | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/util/virfirewall.c | 2 +- src/util/virprocess.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vbox/vbox_common.h | 2 +- src/xen/xend_internal.c | 2 +- src/xenconfig/xen_xm.c | 2 +- tools/wireshark/samples/libvirt-sample.pdml | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 140d1b4..55ceb60 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -11,7 +11,7 @@ If you think that an issue with libvirt may have security - implications, please do not publically + implications, please do not publicly report it in the bug tracker, mailing lists, or irc. Libvirt has <a href="securityprocess.html">a dedicated process for handling (potential) security issues</a> that should be used instead. So if your issue has security diff --git a/docs/contact.html.in b/docs/contact.html.in index 51cc775..9ab0ab9 100644 --- a/docs/contact.html.in +++ b/docs/contact.html.in @@ -10,7 +10,7 @@ If you think that an issue with libvirt may have security - implications, please do not publically + implications, please do not publicly report it in the bug tracker, mailing lists, or irc. Libvirt has <a href="securityprocess.html">a dedicated process for handling (potential) security issues</a> that should be used instead. So if your issue has security diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 3e1841c..8b49a27 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -115,7 +115,7 @@    -  +     diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index d78f877..bf0346c 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -4,7 +4,7 @@ xmlns:v="http://netcf.org/xml/version/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">  diff --git a/docs/securityprocess.html.in b/docs/securityprocess.html.in index 3efd687..bdef1e9 100644 --- a/docs/securityprocess.html.in +++ b/docs/securityprocess.html.in @@ -66,9 +66,9 @@ The libvirt security team operates a policy of <a href="http://en.wikipedia.org/wiki/Responsible_disclosure">responsible disclosure</a>. - As such any security issue reported, that is not already publically disclosed + As such any security issue reported, that is not already publicly disclosed elsewhere, will have an embargo date assigned. Members of the security team agree - not to publically disclose any details of the security issue until the embargo + not to publicly disclose any details of the security issue until the embargo date expires. @@ -77,7 +77,7 @@ are two weeks or less in duration. If a problem is identified with a proposed patch for a security issue, requiring further investigation and bug fixing, the embargo clock may be restarted. - In exceptional circumstances longer initial embargos may be + In exceptional circumstances longer initial embargoes may be negotiated by mutual agreement between members of the security team and other relevant parties to the problem. Any such extended embargoes will aim to be at most one month in duration. diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp index 8f06340..78e94ba 100644 --- a/examples/systemtap/lock-debug.stp +++ b/examples/systemtap/lock-debug.stp @@ -49,7 +49,7 @@ probe unlock = library.function("virMutexUnlock") probe begin { %( $# > 1 %? println("error: Too many parameters"); exit(); - %: print("Started, press ^C when the proccess hangs\n"); %) + %: print("Started, press ^C when the process hangs\n"); %) } probe lock.call diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 77058af..953366b 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -218,7 +218,7 @@ typedef enum { * * The types virSchedParameter, virBlkioParameter, and * virMemoryParameter are aliases of this type, for use when - * targetting libvirt earlier than 0.9.2. + * targeting libvirt earlier than 0.9.2. */ typedef struct _virTypedParameter virTypedParameter; diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 3d3d80a..5dc99dc 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -304,7 +304,7 @@ typedef enum { VIR_ERR_STORAGE_VOL_EXIST = 90, /* the storage vol already exists */ VIR_ERR_CPU_INCOMPATIBLE = 91, /* given CPU is incompatible with host CPU*/ - VIR_ERR_XML_INVALID_SCHEMA = 92, /* XML document doens't validate against schema */ + VIR_ERR_XML_INVALID_SCHEMA = 92, /* XML document doesn't validate against schema */ } virErrorNumber; /** diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 33a12be..21db277 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1160,14 +1160,14 @@ bhyveStateCleanup(void) } static int -bhyveStateInitialize(bool priveleged, +bhyveStateInitialize(bool privileged, virStateInhibitCallback callback ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { virConnectPtr conn = NULL; - if (!priveleged) { - VIR_INFO("Not running priveleged, disabling driver"); + if (!privileged) { + VIR_INFO("Not running privileged, disabling driver"); return 0; } diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index c77374c..733a0cd 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -102,7 +102,7 @@ ppcModelFindPVR(const struct ppc_map *map, /* PowerPC Processor Version Register is interpreted as follows : * Higher order 16 bits : Power ISA generation. * Lower order 16 bits : CPU chip version number. - * If the exact CPU isnt found, return the nearest matching CPU generation + * If the exact CPU isn't found, return the nearest matching CPU generation */ if (pvr & 0x0000FFFFul) return ppcModelFindPVR(map, (pvr & 0xFFFF0000ul)); diff --git a/src/datatypes.c b/src/datatypes.c index 1afaf00..0f535b4 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -377,7 +377,7 @@ virInterfaceDispose(void *obj) * @name: pointer to the storage pool name * @uuid: pointer to the uuid * @privateData: pointer to driver specific private data - * @freeFunc: private data cleanup function pointer specfic to driver + * @freeFunc: private data cleanup function pointer specific to driver * * Allocates a new storage pool object. When the object is no longer needed, * virObjectUnref() must be called in order to not leak data. @@ -453,7 +453,7 @@ virStoragePoolDispose(void *obj) * @name: pointer to the storage vol name * @key: pointer to unique key of the volume * @privateData: pointer to driver specific private data - * @freeFunc: private data cleanup function pointer specfic to driver + * @freeFunc: private data cleanup function pointer specific to driver * * Allocates a new storage volume object. When the object is no longer needed, * virObjectUnref() must be called in order to not leak data. diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c index aa2ad10..e394daf 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -450,7 +450,7 @@ networkRemoveGeneralIPv4FirewallRules(virFirewallPtr fw, /* Add all once/network rules required for IPv6. * If no IPv6 addresses are defined and <network ipv6='yes'> is - * specified, then allow IPv6 commuinications between virtual systems. + * specified, then allow IPv6 communications between virtual systems. * If any IPv6 addresses are defined, then add the rules for regular operation. */ static void diff --git a/src/qemu/THREADS.txt b/src/qemu/THREADS.txt index dfa372b..1ad63cc 100644 --- a/src/qemu/THREADS.txt +++ b/src/qemu/THREADS.txt @@ -29,7 +29,7 @@ There are a number of locks on various objects methods. However, preferred method is qemuDomObjFromDomain() that uses virDomainFindByUUIDRef() which also increases the reference counter and finds the domain in the domain list without blocking all other lookups. - When the domain is locked and the reference increased, the prefered way of + When the domain is locked and the reference increased, the preferred way of decrementing the reference counter and unlocking the domain is using the qemuDomObjEndAPI() function. diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ccf22f0..ce6767c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1266,7 +1266,7 @@ virQEMUCapsComputeCmdFlags(const char *help, * promises to keep the human interface stable, but requests that * we use QMP (the JSON interface) for everything. If the user * forgot to include YAJL libraries when building their own - * libvirt but is targetting a newer qemu, we are better off + * libvirt but is targeting a newer qemu, we are better off * telling them to recompile (the spec file includes the * dependency, so distros won't hit this). This check is * also in m4/virt-yajl.m4 (see $with_yajl). */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d9217b..3cd5f8b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6357,7 +6357,7 @@ qemuDomainSaveImageUpdateDef(virQEMUDriverPtr driver, * @open_write: open the file for writing (for updates) * @unlink_corrupt: remove the image file if it is corrupted * - * Returns the opened fd of the save image file and fills the apropriate fields + * Returns the opened fd of the save image file and fills the appropriate fields * on success. On error returns -1 on most failures, -3 if corrupt image was * unlinked (no error raised). */ diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index cd7afa5..2251f97 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -945,7 +945,7 @@ virFirewallApply(virFirewallPtr firewall) VIR_DEBUG("Applying groups for %p", firewall); for (i = 0; i < firewall->ngroups; i++) { if (virFirewallApplyGroup(firewall, i) < 0) { - VIR_DEBUG("Rolling back groups upto %zu for %p", i, firewall); + VIR_DEBUG("Rolling back groups up to %zu for %p", i, firewall); size_t first = i; virErrorPtr saved_error = virSaveLastError(); diff --git a/src/util/virprocess.c b/src/util/virprocess.c index aa00a99..ab1e039 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -354,7 +354,7 @@ virProcessKillPainfully(pid_t pid, bool force) /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and * @force is requested, a SIGKILL will be sent, and this will - * wait upto 5 seconds more for the process to exit before + * wait up to 5 seconds more for the process to exit before * returning. * * Note that setting @force could result in dataloss for the process. diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 0fb53aa..20211b2 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7413,7 +7413,7 @@ vboxConnectListAllDomains(virConnectPtr conn, /* filter out flag options that will produce 0 results in vbox driver: * - managed save: vbox guests don't have managed save images * - autostart: vbox doesn't support autostarting guests - * - persistance: vbox doesn't support transient guests + * - persistence: vbox doesn't support transient guests */ if ((MATCH(VIR_CONNECT_LIST_DOMAINS_TRANSIENT) && !MATCH(VIR_CONNECT_LIST_DOMAINS_PERSISTENT)) || diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index d318921..f9ce612 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -32,7 +32,7 @@ * vbox_CAPI_v*.h. It tells the vbox_common.c * how to treat with this symbols. This file * can't be included with files such as - * vbox_CAPI_v*.h, or it would casue multiple + * vbox_CAPI_v*.h, or it would cause multiple * definitions. * * You can see the more informations in vbox_api.h diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 6c8ec7c..3813900 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -523,7 +523,7 @@ xend_op_ext(virConnectPtr xend, const char *path, const char *key, va_list ap) * @ap: input values to pass to the operation * @...: input values to pass to the operation * - * internal routine to run a POST RPC operation to the Xen Daemon targetting + * internal routine to run a POST RPC operation to the Xen Daemon targeting * a given domain. * * Returns 0 in case of success, -1 in case of failure. diff --git a/src/xenconfig/xen_xm.c b/src/xenconfig/xen_xm.c index 5d70af6..c6bdbd3 100644 --- a/src/xenconfig/xen_xm.c +++ b/src/xenconfig/xen_xm.c @@ -469,7 +469,7 @@ xenFormatXMInputDevs(virConfPtr conf, virDomainDefPtr def) verify(MAX_VIRT_CPUS <= sizeof(1UL) * CHAR_BIT); /* - * Convert a virDomainDef object inot an XM config record. + * Convert a virDomainDef object into an XM config record. */ virConfPtr xenFormatXM(virConnectPtr conn, diff --git a/tools/wireshark/samples/libvirt-sample.pdml b/tools/wireshark/samples/libvirt-sample.pdml index f6a4c28..abe7fbb 100644 --- a/tools/wireshark/samples/libvirt-sample.pdml +++ b/tools/wireshark/samples/libvirt-sample.pdml @@ -3,7 +3,7 @@   <pdml version="0" creator="wireshark/1.10.2" time="Thu Sep 19 18:09:24 2013" capture_file=""> -- 2.3.3

4 10

[libvirt] [PATCH 0/7] iothread api followups
by Ján Tomko 26 Mar '15

26 Mar '15

Looking at the proposed SetIOThread API, I noticed that the virsh command for printing the info is named 'iothreadsinfo'. This seemed counter-intuitive for me. Since the API has not been released yet, I propose a rename of the command to: iothreadinfo (patch 5) and the API for freeing one struct to: virDomainIOThreadInfoFree (patch 1) I don't feel as strongly about renaming the virDomainGetIOThreadsInfo API (patches 3, 4) or the internal APIs (patch 2). Looking at virVcpuInfoPtr (which might not be the best inspiration), I realized including the cpu time might be a good idea. Ján Tomko (7): Rename virDomainIOThreadsInfoFree to virDomainIOThreadInfoFree Rename qemuMonitorIOThreadsInfo* to qemuMonitorIOThreadInfo* Rename DomainGetIOThreadsInfo to DomainGetIOThreadInfo gendispatch: remove IOThreads from name fixups virsh: rename iothreadsinfo to iothreadinfo Do not use vshPrintPinInfo in iothreadinfo add cpu time to iothreadinfo daemon/remote.c | 15 +++++++------ include/libvirt/libvirt-domain.h | 5 +++-- src/driver-hypervisor.h | 4 ++-- src/libvirt-domain.c | 20 ++++++++--------- src/libvirt_public.syms | 4 ++-- src/qemu/qemu_driver.c | 24 ++++++++++++++------ src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor.h | 10 ++++----- src/qemu/qemu_monitor_json.c | 8 +++---- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_process.c | 4 ++-- src/remote/remote_driver.c | 23 ++++++++++---------- src/remote/remote_protocol.x | 11 +++++----- src/remote_protocol-structs | 7 +++--- src/rpc/gendispatch.pl | 1 - tests/qemumonitorjsontest.c | 4 ++-- tools/virsh-domain.c | 47 ++++++++++++++++++++++++++++------------ 17 files changed, 113 insertions(+), 80 deletions(-) -- 2.0.5

3 24

[libvirt] [PATCH] conf: refact virDomainHasDiskMirror and rename it to virDomainHasBlockjob
by Shanzhi Yu 26 Mar '15

26 Mar '15

Create external snapshot or migrate a vm when there is a blockpull job running should be forbidden by libvirt, otherwise qemu try to create external snapshot and failed with error "unable to execute QEMU command 'transaction': Device 'drive-virtio-disk0' is busy: block device is in use by block job: stream", and migration will succeed which will lead the blockpull job failed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1203628 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/conf/domain_conf.c | 6 +++--- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/qemu/qemu_migration.c | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d633f93..24445af 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12264,13 +12264,13 @@ virDomainDiskRemoveByName(virDomainDefPtr def, const char *name) } /* Return true if VM has at least one disk involved in a current block - * copy/commit job (that is, with a <mirror> element in the disk xml). */ + * copy/commit/pull job */ bool -virDomainHasDiskMirror(virDomainObjPtr vm) +virDomainHasBlockjob(virDomainObjPtr vm) { size_t i; for (i = 0; i < vm->def->ndisks; i++) - if (vm->def->disks[i]->mirror) + if (vm->def->disks[i]->blockjob) return true; return false; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bceb2d7..32674f3 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2645,7 +2645,7 @@ int virDomainDiskSourceParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virStorageSourcePtr src); -bool virDomainHasDiskMirror(virDomainObjPtr vm); +bool virDomainHasBlockjob(virDomainObjPtr vm); int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net); virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *device); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 33222f0..9ebaf4a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -297,7 +297,7 @@ virDomainGraphicsTypeFromString; virDomainGraphicsTypeToString; virDomainGraphicsVNCSharePolicyTypeFromString; virDomainGraphicsVNCSharePolicyTypeToString; -virDomainHasDiskMirror; +virDomainHasBlockjob; virDomainHasNet; virDomainHostdevCapsTypeToString; virDomainHostdevDefAlloc; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80a3d77..51e302f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7398,7 +7398,7 @@ static virDomainPtr qemuDomainDefineXMLFlags(virConnectPtr conn, const char *xml virObjectRef(vm); def = NULL; - if (virDomainHasDiskMirror(vm)) { + if (virDomainHasBlockjob(vm)) { virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, "%s", _("domain has active block job")); virDomainObjAssignDef(vm, NULL, false, NULL); @@ -14583,7 +14583,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, "%s", _("domain is marked for auto destroy")); goto cleanup; } - if (virDomainHasDiskMirror(vm)) { + if (virDomainHasBlockjob(vm)) { virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, "%s", _("domain has active block job")); goto cleanup; @@ -15245,7 +15245,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (virDomainHasDiskMirror(vm)) { + if (virDomainHasBlockjob(vm)) { virReportError(VIR_ERR_BLOCK_COPY_ACTIVE, "%s", _("domain has active block job")); goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d34bb02..27a76ec 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1977,7 +1977,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, } - if (virDomainHasDiskMirror(vm)) { + if (virDomainHasBlockjob(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain has an active block job")); return false; -- 2.1.0

2 2

[libvirt] [PATCH 0/7] Implement Set IOThreads Command
by John Ferlan 26 Mar '15

26 Mar '15

These patches will implement the Set IOThreads command to complete the IOThreads family of calls/settings. There are 3 patches in the middle (3, 4, & 5) which are just refactoring the SetVcpus code so that the SetIOThreads code can make use of the same functionality rather than cut-n-paste John Ferlan (7): Implement public API for virDomainIOThreadsSet remote: Plumbing for virDomainSetIOThreads qemu: qemuDomainHotplugVcpus - separate out the add cgroup qemu: qemuDomainHotplugVcpus - separate out the del cgroup and pin qemu: qemuDomainHotplugVcpus - separate out pin adjustment code qemu: Add support to set IOThreads count virsh: Add setiothreads command include/libvirt/libvirt-domain.h | 3 + src/conf/domain_audit.c | 9 + src/conf/domain_audit.h | 6 + src/driver-hypervisor.h | 6 + src/libvirt-domain.c | 60 +++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu_driver.c | 544 +++++++++++++++++++++++++++++++++------ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 16 +- src/remote_protocol-structs | 6 + tools/virsh-domain.c | 82 ++++++ tools/virsh.pod | 17 ++ 13 files changed, 676 insertions(+), 76 deletions(-) -- 2.1.0

3 14

[libvirt] [PATCH v4 0/2] network_conf: check if bridge exists on host for user created bridges
by Shivaprasad G Bhat 26 Mar '15

26 Mar '15

The patch fixes the below problem. ============================== If the bridge name is not mentioned in the <network> xml, the bridge name is auto generated from virNetworkAllocateBridge(). If the default template named bridge is created manually by a user, the bridge start will fail with "File exists". bash-4.3$ sudo brctl addbr virbr1 bash-4.3$ brctl show bridge name bridge id STP enabled interfaces br0 8000.000000000000 no virbr0 8000.525400a91d03 yes virbr0-nic virbr1 8000.000000000000 no bash-4.3$ sudo virsh net-list --all Name State Autostart Persistent ---------------------------------------------------------- default active no yes bash-4.3$ cat /tmp/isolated # Notice that the <bridge> intentionally not given. <network> <name>isolated</name> <forward/> <ip address="192.168.123.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.123.2" end="192.168.123.254"/> </dhcp> </ip> </network> bash-4.3$ sudo virsh net-create /tmp/isolated error: Failed to create network from isolated error: Unable to create bridge virbr1: File exists =============================== --- Shivaprasad G Bhat (2): cleanup conf/device_conf.h inclusion from util/virnetdev.h network_conf: check if bridge exists on host for user created bridges src/conf/device_conf.h | 38 +------------------------------------- src/conf/network_conf.c | 8 +++++++- src/util/virnetdev.h | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 45 insertions(+), 39 deletions(-) -- Signature

3 5

[libvirt] [PATCH] qemu: fix cannot start a vm with memory device with address
by Luyao Huang 26 Mar '15

26 Mar '15

When start a vm which have a memory device with address, the error like this : error: Failed to start domain test3 error: internal error: early end of file from monitor: possible problem: 2015-03-26T03:45:52.338891Z qemu-kvm: -device pc-dimm,node=0,memdev=memdimm0, id=dimm0,slot=0,base=4294967296: Property '.base' not found After check the qemu code i think this 'base' should named as 'addr', you can see this mail: http://lists.gnu.org/archive/html/qemu-devel/2014-06/msg00129.html Or check the include/hw/mem/pc-dimm.h in qemu source. Also add a tests for this. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- I didn't change this parameter's name ('base'), because i am not sure if there is some special mean in it, or it is a result after discuss. src/qemu/qemu_command.c | 2 +- .../qemuxml2argv-memory-hotplug-dimm-addr.args | 9 +++++ .../qemuxml2argv-memory-hotplug-dimm-addr.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 04c8df7..2941e7d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4909,7 +4909,7 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem, if (mem->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DIMM) { virBufferAsprintf(&buf, ",slot=%d", mem->info.addr.dimm.slot); - virBufferAsprintf(&buf, ",base=%llu", mem->info.addr.dimm.base); + virBufferAsprintf(&buf, ",addr=%llu", mem->info.addr.dimm.base); } break; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args new file mode 100644 index 0000000..7c59454 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu -S -M pc -m size=219136k,slots=16,maxmem=1099511627776k -smp 2 \ +-numa node,nodeid=0,cpus=0-1,mem=214 \ +-object memory-backend-ram,id=memdimm0,size=536870912,host-nodes=1-3,\ +policy=bind \ +-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \ +-nographic -nodefaults -monitor unix:/tmp/test-monitor,server,nowait \ +-no-acpi -boot c -usb -hda /dev/HostVG/QEMUGuest1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.xml new file mode 100644 index 0000000..2e302c4 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>743423</memory> + <currentMemory unit='KiB'>743423</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + <memory model='dimm'> + <source> + <nodemask>1-3</nodemask> + <pagesize unit='KiB'>4096</pagesize> + </source> + <target> + <size unit='KiB'>524287</size> + <node>0</node> + </target> + <address type='dimm' slot='0' base='0x100000000'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 08f374e..a4cb887 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1548,6 +1548,8 @@ mymain(void) DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_RAM); + DO_TEST("memory-hotplug-dimm-addr", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, + QEMU_CAPS_DEVICE, QEMU_CAPS_OBJECT_MEMORY_RAM); virObjectUnref(driver.config); virObjectUnref(driver.caps); -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: Give hint about -noTSX CPU model
by Jiri Denemark 26 Mar '15

26 Mar '15

Because of the microcode update to Haswell/Broadwell CPUs, existing domains using these CPUs may fail to start even though they used to run just fine. To help users solve this issue we try to suggest switching to -noTSX variant of the CPU model: virsh # start cd error: Failed to start domain cd error: unsupported configuration: guest and host CPU are not compatible: Host CPU does not provide required features: rtm, hle; try using 'Haswell-noTSX' CPU model Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- This patch depends on the previous patch which introduces the new *-noTSX models. src/qemu/qemu_command.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 7e6b95c..cabb8b2 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6807,6 +6807,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, size_t ncpus = 0; char **cpus = NULL; virCPUDataPtr data = NULL; + virCPUDataPtr hostData = NULL; char *compare_msg = NULL; virCPUCompareResult cmp; const char *preferred; @@ -6838,16 +6839,42 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, /* For non-KVM, CPU features are emulated, so host compat doesn't matter */ if (compareAgainstHost) { + bool noTSX = false; + cmp = cpuGuestData(host, cpu, &data, &compare_msg); switch (cmp) { case VIR_CPU_COMPARE_INCOMPATIBLE: + if (cpuEncode(host->arch, host, NULL, &hostData, + NULL, NULL, NULL, NULL) == 0 && + (!cpuHasFeature(hostData, "hle") || + !cpuHasFeature(hostData, "rtm")) && + (STREQ_NULLABLE(cpu->model, "Haswell") || + STREQ_NULLABLE(cpu->model, "Broadwell"))) + noTSX = true; + if (compare_msg) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("guest and host CPU are not compatible: %s"), - compare_msg); + if (noTSX) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("guest and host CPU are not compatible: " + "%s; try using '%s-noTSX' CPU model"), + compare_msg, cpu->model); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("guest and host CPU are not compatible: " + "%s"), + compare_msg); + } } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("guest CPU is not compatible with host CPU")); + if (noTSX) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("guest CPU is not compatible with host " + "CPU; try using '%s-noTSX' CPU model"), + cpu->model); + } else { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("guest CPU is not compatible with host " + "CPU")); + } } /* fall through */ case VIR_CPU_COMPARE_ERROR: @@ -6941,6 +6968,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, virObjectUnref(caps); VIR_FREE(compare_msg); cpuDataFree(data); + cpuDataFree(hostData); virCPUDefFree(guest); virCPUDefFree(cpu); return ret; -- 2.3.3

2 2

[libvirt] [PATCH 0/2] Fix "unknown error" when starting qemu VM with empty network cdrom
by Peter Krempa 26 Mar '15

26 Mar '15

Peter Krempa (2): qemu: command: Report error when formatting network source with protocol _NONE qemu: command: Check for empty network source when formatting drive cmd src/qemu/qemu_command.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.2.2

2 5

[libvirt] [libvirt-test-API][PATCH 0/2] network event callback testing
by Jincheng Miao 26 Mar '15

26 Mar '15

Here is the network event callback testing, the case employed native libvirt eventLoop, and multi-thread for event trigger. Jincheng Miao (2): Add test case for network event callback Add cases to basic_network.conf cases/basic_network.conf | 24 ++++ repos/network/event_callback.py | 245 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 269 insertions(+), 0 deletions(-) create mode 100644 repos/network/event_callback.py

2 3

[libvirt] [PATCH] compile failure 'src/cpu/cpu_map.xml': No such file or directory'
by Amy Fong 25 Mar '15

25 Mar '15

>From 73172eeed1fcffcfae088a3059fbca0689b7437f Mon Sep 17 00:00:00 2001 From: Amy Fong <amy.fong(a)windriver.com> Date: Mon, 23 Mar 2015 13:44:03 -0400 Subject: [PATCH] libvirt: 'src/cpu/cpu_map.xml': No such file or directory' In some circumstances where the build tree differs from the source, libvirt's compile will try to create the symlink for cpu_map.xml before creating the directory $(abs_builddir)/cpu. Add a test to create this directory if it hasn't already been created. Signed-off-by: Amy Fong <amy.fong(a)windriver.com> --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index 00b47e7..2e4a520 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1039,6 +1039,7 @@ libvirt_cpu_la_SOURCES = $(CPU_SOURCES) libvirt_cpu_la_DEPENDENCIES = $(abs_builddir)/cpu/cpu_map.xml $(abs_builddir)/cpu/cpu_map.xml: + if [ ! -d $(abs_builddir)/cpu ]; then $(MKDIR_P) $(abs_builddir)/cpu/; fi $(AM_V_GEN)ln -s $(abs_srcdir)/cpu/cpu_map.xml $@ if WITH_VMX -- 2.1.4

2 3

[libvirt] [PATCH] cpu: Add {Haswell,Broadwell}-noTSX CPU models
by Jiri Denemark 25 Mar '15

25 Mar '15

QEMU 2.3 adds these new models to cover Haswell and Broadwell CPUs with updated microcode. Luckily, they also reverted former the machine type specific changes to existing models. And since these changes were never released, we don't need to hack around them in libvirt. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_map.xml | 18 ++- tests/cputest.c | 15 ++- tests/cputestdata/x86-Haswell-noTSX-nofallback.xml | 4 + tests/cputestdata/x86-Haswell-noTSX.xml | 4 + tests/cputestdata/x86-Haswell.xml | 6 + tests/cputestdata/x86-baseline-7-result.xml | 4 + tests/cputestdata/x86-baseline-7.xml | 24 ++++ tests/cputestdata/x86-baseline-8-result.xml | 4 + tests/cputestdata/x86-baseline-8.xml | 28 +++++ ...aswell-noTSX+Haswell,haswell,Haswell-result.xml | 6 + ...ll-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml | 4 + ...+Haswell-noTSX,haswell,Haswell-noTSX-result.xml | 6 + tests/cputestdata/x86-host-Haswell-noTSX.xml | 6 + .../qemuxml2argv-cpu-Haswell-noTSX.args | 4 + .../qemuxml2argv-cpu-Haswell-noTSX.xml | 21 ++++ .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml | 21 ++++ .../qemuxml2argv-cpu-Haswell2.args | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml | 23 ++++ .../qemuxml2argv-cpu-Haswell3.args | 4 + .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml | 23 ++++ tests/qemuxml2argvtest.c | 8 ++ tests/testutilsqemu.c | 124 +++++++++++++++------ tests/testutilsqemu.h | 6 + 24 files changed, 331 insertions(+), 40 deletions(-) create mode 100644 tests/cputestdata/x86-Haswell-noTSX-nofallback.xml create mode 100644 tests/cputestdata/x86-Haswell-noTSX.xml create mode 100644 tests/cputestdata/x86-Haswell.xml create mode 100644 tests/cputestdata/x86-baseline-7-result.xml create mode 100644 tests/cputestdata/x86-baseline-7.xml create mode 100644 tests/cputestdata/x86-baseline-8-result.xml create mode 100644 tests/cputestdata/x86-baseline-8.xml create mode 100644 tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml create mode 100644 tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml create mode 100644 tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml create mode 100644 tests/cputestdata/x86-host-Haswell-noTSX.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 413148f..2110c0b 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -500,30 +500,40 @@ <feature name='rdtscp'/> </model> - <model name='Haswell'> + <model name='Haswell-noTSX'> <model name='SandyBridge'/> <feature name='fma'/> <feature name='pcid'/> <feature name='movbe'/> <feature name='fsgsbase'/> <feature name='bmi1'/> - <feature name='hle'/> <feature name='avx2'/> <feature name='smep'/> <feature name='bmi2'/> <feature name='erms'/> <feature name='invpcid'/> + </model> + + <model name='Haswell'> + <model name='Haswell-noTSX'/> + <feature name='hle'/> <feature name='rtm'/> </model> - <model name='Broadwell'> - <model name='Haswell'/> + <model name='Broadwell-noTSX'> + <model name='Haswell-noTSX'/> <feature name='3dnowprefetch'/> <feature name='rdseed'/> <feature name='adx'/> <feature name='smap'/> </model> + <model name='Broadwell'> + <model name='Broadwell-noTSX'/> + <feature name='hle'/> + <feature name='rtm'/> + </model> +  <model name='athlon'> <model name='pentiumpro'/> diff --git a/tests/cputest.c b/tests/cputest.c index 449b7d1..bf7a48f 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -122,8 +122,10 @@ cpuTestLoadMultiXML(const char *arch, goto cleanup; n = virXPathNodeSet("/cpuTest/cpu", ctxt, &nodes); - if (n <= 0 || (VIR_ALLOC_N(cpus, n) < 0)) + if (n <= 0 || (VIR_ALLOC_N(cpus, n) < 0)) { + fprintf(stderr, "\nNo /cpuTest/cpu elements found in %s\n", xml); goto cleanup; + } for (i = 0; i < n; i++) { ctxt->node = nodes[i]; @@ -497,6 +499,7 @@ cpuTestRun(const char *name, const struct data *data) static const char *model486[] = { "486" }; static const char *nomodel[] = { "nomodel" }; static const char *models[] = { "qemu64", "core2duo", "Nehalem" }; +static const char *haswell[] = { "SandyBridge", "Haswell" }; static const char *ppc_models[] = { "POWER7", "POWER7_v2.1", "POWER8_v1.0"}; static int @@ -618,6 +621,8 @@ mymain(void) DO_TEST_BASELINE("x86", "5", VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, 0); DO_TEST_BASELINE("x86", "6", 0, 0); DO_TEST_BASELINE("x86", "6", VIR_CONNECT_BASELINE_CPU_MIGRATABLE, 0); + DO_TEST_BASELINE("x86", "7", 0, 0); + DO_TEST_BASELINE("x86", "8", 0, 0); DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1); DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0); @@ -646,6 +651,14 @@ mymain(void) DO_TEST_GUESTDATA("x86", "host", "host+host-model", models, "Penryn", 0); DO_TEST_GUESTDATA("x86", "host", "host+host-model-nofallback", models, "Penryn", -1); + DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell", + haswell, "Haswell", 0); + DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX", + haswell, "Haswell-noTSX", 0); + DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX-nofallback", + haswell, "Haswell-noTSX", -1); + DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX", + NULL, "Haswell-noTSX", 0); DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0); DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER7_v2.1", -1); diff --git a/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml b/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml new file mode 100644 index 0000000..c23c3f3 --- /dev/null +++ b/tests/cputestdata/x86-Haswell-noTSX-nofallback.xml @@ -0,0 +1,4 @@ +<cpu mode='custom' match='exact'> + <model fallback='forbid'>Haswell-noTSX</model> + <topology sockets='1' cores='2' threads='2'/> +</cpu> diff --git a/tests/cputestdata/x86-Haswell-noTSX.xml b/tests/cputestdata/x86-Haswell-noTSX.xml new file mode 100644 index 0000000..3b74089 --- /dev/null +++ b/tests/cputestdata/x86-Haswell-noTSX.xml @@ -0,0 +1,4 @@ +<cpu mode='custom' match='exact'> + <model fallback='allow'>Haswell-noTSX</model> + <topology sockets='1' cores='2' threads='2'/> +</cpu> diff --git a/tests/cputestdata/x86-Haswell.xml b/tests/cputestdata/x86-Haswell.xml new file mode 100644 index 0000000..630cb99 --- /dev/null +++ b/tests/cputestdata/x86-Haswell.xml @@ -0,0 +1,6 @@ +<cpu match='exact'> + <model fallback='allow'>Haswell</model> + <topology sockets='1' cores='2' threads='2'/> + <feature name='rtm' policy='disable'/> + <feature name='hle' policy='disable'/> +</cpu> diff --git a/tests/cputestdata/x86-baseline-7-result.xml b/tests/cputestdata/x86-baseline-7-result.xml new file mode 100644 index 0000000..2af549e --- /dev/null +++ b/tests/cputestdata/x86-baseline-7-result.xml @@ -0,0 +1,4 @@ +<cpu mode='custom' match='exact'> + <model fallback='allow'>Haswell-noTSX</model> + <vendor>Intel</vendor> +</cpu> diff --git a/tests/cputestdata/x86-baseline-7.xml b/tests/cputestdata/x86-baseline-7.xml new file mode 100644 index 0000000..b7e61b1 --- /dev/null +++ b/tests/cputestdata/x86-baseline-7.xml @@ -0,0 +1,24 @@ +<cpuTest> + <cpu> + <arch>x86_64</arch> + <model>SandyBridge</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> + <feature name='invpcid'/> + <feature name='erms'/> + <feature name='bmi2'/> + <feature name='smep'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='fsgsbase'/> + <feature name='movbe'/> + <feature name='pcid'/> + <feature name='fma'/> + </cpu> + <cpu> + <arch>x86_64</arch> + <model>Haswell-noTSX</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> + </cpu> +</cpuTest> diff --git a/tests/cputestdata/x86-baseline-8-result.xml b/tests/cputestdata/x86-baseline-8-result.xml new file mode 100644 index 0000000..88226b3 --- /dev/null +++ b/tests/cputestdata/x86-baseline-8-result.xml @@ -0,0 +1,4 @@ +<cpu mode='custom' match='exact'> + <model fallback='allow'>Broadwell-noTSX</model> + <vendor>Intel</vendor> +</cpu> diff --git a/tests/cputestdata/x86-baseline-8.xml b/tests/cputestdata/x86-baseline-8.xml new file mode 100644 index 0000000..f1ee67d --- /dev/null +++ b/tests/cputestdata/x86-baseline-8.xml @@ -0,0 +1,28 @@ +<cpuTest> + <cpu> + <arch>x86_64</arch> + <model>SandyBridge</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> + <feature name='invpcid'/> + <feature name='erms'/> + <feature name='bmi2'/> + <feature name='smep'/> + <feature name='avx2'/> + <feature name='bmi1'/> + <feature name='fsgsbase'/> + <feature name='movbe'/> + <feature name='pcid'/> + <feature name='fma'/> + <feature name='3dnowprefetch'/> + <feature name='rdseed'/> + <feature name='adx'/> + <feature name='smap'/> + </cpu> + <cpu> + <arch>x86_64</arch> + <model>Broadwell-noTSX</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> + </cpu> +</cpuTest> diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml new file mode 100644 index 0000000..087aa7d --- /dev/null +++ b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml @@ -0,0 +1,6 @@ +<cpu mode='custom' match='exact'> + <arch>x86_64</arch> + <model fallback='allow'>Haswell</model> + <feature policy='disable' name='rtm'/> + <feature policy='disable' name='hle'/> +</cpu> diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml new file mode 100644 index 0000000..f5a67fb --- /dev/null +++ b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml @@ -0,0 +1,4 @@ +<cpu mode='custom' match='exact'> + <arch>x86_64</arch> + <model fallback='allow'>Haswell-noTSX</model> +</cpu> diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml new file mode 100644 index 0000000..087aa7d --- /dev/null +++ b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml @@ -0,0 +1,6 @@ +<cpu mode='custom' match='exact'> + <arch>x86_64</arch> + <model fallback='allow'>Haswell</model> + <feature policy='disable' name='rtm'/> + <feature policy='disable' name='hle'/> +</cpu> diff --git a/tests/cputestdata/x86-host-Haswell-noTSX.xml b/tests/cputestdata/x86-host-Haswell-noTSX.xml new file mode 100644 index 0000000..c003085 --- /dev/null +++ b/tests/cputestdata/x86-host-Haswell-noTSX.xml @@ -0,0 +1,6 @@ +<cpu> + <arch>x86_64</arch> + <model>Haswell-noTSX</model> + <vendor>Intel</vendor> + <topology sockets='1' cores='2' threads='2'/> +</cpu> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args new file mode 100644 index 0000000..d64cc83 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm -S -M pc -cpu Haswell-noTSX -m 214 -smp 6 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ +none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml new file mode 100644 index 0000000..9ef24cd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu mode='custom' match='exact'> + <model fallback='forbid'>Haswell-noTSX</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args new file mode 100644 index 0000000..f9bea62 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm -S -M pc -cpu Haswell -m 214 -smp 6 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ +none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml new file mode 100644 index 0000000..3af49f9 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.xml @@ -0,0 +1,21 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu mode='custom' match='exact'> + <model fallback='forbid'>Haswell</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args new file mode 100644 index 0000000..a398ab8 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm -S -M pc -cpu Haswell,-rtm,-hle -m 214 -smp 6 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ +none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml new file mode 100644 index 0000000..0d4efa1 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.xml @@ -0,0 +1,23 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu mode='custom' match='exact'> + <model fallback='forbid'>Haswell</model> + <feature policy='disable' name='rtm'/> + <feature policy='disable' name='hle'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args new file mode 100644 index 0000000..f9bea62 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-kvm -S -M pc -cpu Haswell -m 214 -smp 6 \ +-nographic -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot n -usb -net \ +none -serial none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml new file mode 100644 index 0000000..00617eb --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.xml @@ -0,0 +1,23 @@ +<domain type='kvm'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <cpu mode='custom' match='exact'> + <model fallback='forbid'>Haswell</model> + <feature policy='require' name='rtm'/> + <feature policy='force' name='hle'/> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-kvm</emulator> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 08f374e..43e00ea 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -454,6 +454,7 @@ testAddCPUModels(virQEMUCapsPtr caps, bool skipLegacy) const char *newModels[] = { "Opteron_G3", "Opteron_G2", "Opteron_G1", "Nehalem", "Penryn", "Conroe", + "Haswell-noTSX", "Haswell", }; const char *legacyModels[] = { "n270", "athlon", "pentium3", "pentium2", "pentium", @@ -1253,6 +1254,13 @@ mymain(void) DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM, QEMU_CAPS_CPU_HOST); + driver.caps->host.cpu = cpuHaswell; + DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); + DO_TEST("cpu-Haswell2", QEMU_CAPS_KVM); + DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM); + DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); + driver.caps->host.cpu = cpuDefault; + DO_TEST("memtune", QEMU_CAPS_NAME); DO_TEST("memtune-unlimited", QEMU_CAPS_NAME); DO_TEST("blkiotune", QEMU_CAPS_NAME); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index d72e7d8..7c581a1 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -12,6 +12,83 @@ # define VIR_FROM_THIS VIR_FROM_QEMU +virCPUDefPtr cpuDefault; +virCPUDefPtr cpuHaswell; + +static virCPUFeatureDef cpuDefaultFeatures[] = { + { (char *) "lahf_lm", -1 }, + { (char *) "xtpr", -1 }, + { (char *) "cx16", -1 }, + { (char *) "tm2", -1 }, + { (char *) "est", -1 }, + { (char *) "vmx", -1 }, + { (char *) "ds_cpl", -1 }, + { (char *) "pbe", -1 }, + { (char *) "tm", -1 }, + { (char *) "ht", -1 }, + { (char *) "ss", -1 }, + { (char *) "acpi", -1 }, + { (char *) "ds", -1 } +}; +static virCPUDef cpuDefaultData = { + VIR_CPU_TYPE_HOST, /* type */ + 0, /* mode */ + 0, /* match */ + VIR_ARCH_X86_64, /* arch */ + (char *) "core2duo", /* model */ + NULL, /* vendor_id */ + 0, /* fallback */ + (char *) "Intel", /* vendor */ + 1, /* sockets */ + 2, /* cores */ + 1, /* threads */ + ARRAY_CARDINALITY(cpuDefaultFeatures), /* nfeatures */ + ARRAY_CARDINALITY(cpuDefaultFeatures), /* nfeatures_max */ + cpuDefaultFeatures, /* features */ +}; + +static virCPUFeatureDef cpuHaswellFeatures[] = { + { (char *) "lahf_lm", -1 }, + { (char *) "invtsc", -1 }, + { (char *) "abm", -1 }, + { (char *) "pdpe1gb", -1 }, + { (char *) "rdrand", -1 }, + { (char *) "f16c", -1 }, + { (char *) "osxsave", -1 }, + { (char *) "pdcm", -1 }, + { (char *) "xtpr", -1 }, + { (char *) "tm2", -1 }, + { (char *) "est", -1 }, + { (char *) "smx", -1 }, + { (char *) "vmx", -1 }, + { (char *) "ds_cpl", -1 }, + { (char *) "monitor", -1 }, + { (char *) "dtes64", -1 }, + { (char *) "pbe", -1 }, + { (char *) "tm", -1 }, + { (char *) "ht", -1 }, + { (char *) "ss", -1 }, + { (char *) "acpi", -1 }, + { (char *) "ds", -1 }, + { (char *) "vme", -1 }, +}; +static virCPUDef cpuHaswellData = { + VIR_CPU_TYPE_HOST, /* type */ + 0, /* mode */ + 0, /* match */ + VIR_ARCH_X86_64, /* arch */ + (char *) "Haswell", /* model */ + NULL, /* vendor_id */ + 0, /* fallback */ + (char *) "Intel", /* vendor */ + 1, /* sockets */ + 2, /* cores */ + 2, /* threads */ + ARRAY_CARDINALITY(cpuHaswellFeatures), /* nfeatures */ + ARRAY_CARDINALITY(cpuHaswellFeatures), /* nfeatures_max */ + cpuHaswellFeatures, /* features */ +}; + static virCapsGuestMachinePtr *testQemuAllocMachines(int *nmachines) { virCapsGuestMachinePtr *machines; @@ -239,40 +316,8 @@ virCapsPtr testQemuCapsInit(void) static const char *const xen_machines[] = { "xenner" }; - static virCPUFeatureDef host_cpu_features[] = { - { (char *) "lahf_lm", -1 }, - { (char *) "xtpr", -1 }, - { (char *) "cx16", -1 }, - { (char *) "tm2", -1 }, - { (char *) "est", -1 }, - { (char *) "vmx", -1 }, - { (char *) "ds_cpl", -1 }, - { (char *) "pbe", -1 }, - { (char *) "tm", -1 }, - { (char *) "ht", -1 }, - { (char *) "ss", -1 }, - { (char *) "acpi", -1 }, - { (char *) "ds", -1 } - }; - static virCPUDef host_cpu = { - VIR_CPU_TYPE_HOST, /* type */ - 0, /* mode */ - 0, /* match */ - VIR_ARCH_X86_64, /* arch */ - (char *) "core2duo", /* model */ - NULL, /* vendor_id */ - 0, /* fallback */ - (char *) "Intel", /* vendor */ - 1, /* sockets */ - 2, /* cores */ - 1, /* threads */ - ARRAY_CARDINALITY(host_cpu_features), /* nfeatures */ - ARRAY_CARDINALITY(host_cpu_features), /* nfeatures_max */ - host_cpu_features, /* features */ - }; - if ((caps = virCapabilitiesNew(host_cpu.arch, - false, false)) == NULL) + if (!(caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false))) return NULL; /* Add dummy 'none' security_driver. This is equal to setting @@ -285,8 +330,13 @@ virCapsPtr testQemuCapsInit(void) VIR_STRDUP(caps->host.secModels[0].doi, "0") < 0) goto cleanup; - if ((caps->host.cpu = virCPUDefCopy(&host_cpu)) == NULL || - (machines = testQemuAllocMachines(&nmachines)) == NULL) + if (!(cpuDefault = virCPUDefCopy(&cpuDefaultData)) || + !(cpuHaswell = virCPUDefCopy(&cpuHaswellData))) + goto cleanup; + + caps->host.cpu = cpuDefault; + + if ((machines = testQemuAllocMachines(&nmachines)) == NULL) goto cleanup; if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686, @@ -386,6 +436,10 @@ virCapsPtr testQemuCapsInit(void) cleanup: virCapabilitiesFreeMachines(machines, nmachines); + if (caps->host.cpu != cpuDefault) + virCPUDefFree(cpuDefault); + if (caps->host.cpu != cpuHaswell) + virCPUDefFree(cpuHaswell); virObjectUnref(caps); return NULL; } diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 79ee143..0ec5dad 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -10,4 +10,10 @@ virDomainXMLOptionPtr testQemuXMLConfInit(void); extern qemuBuildCommandLineCallbacks testCallbacks; virQEMUCapsPtr qemuTestParseCapabilities(const char *capsFile); + +extern virCPUDefPtr cpuDefault; +extern virCPUDefPtr cpuHaswell; +void testQemuCapsSetCPU(virCapsPtr caps, + virCPUDefPtr hostCPU); + #endif -- 2.3.3

2 1

[libvirt] [PATCH] hostdev: fix two bugs in virHostdevReAttachPCIDevices
by Huanle Han 25 Mar '15

25 Mar '15

Bug 1: The the next element in the pcidevs is skipped after we virPCIDeviceListDel the previous element. Bug 2: virHostdevNetConfigRestore is called for store the hostdevs which may be used by other domain. Signed-off-by: Huanle Han <hanxueluo(a)gmail.com> --- src/util/virhostdev.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c index 9678e2b..ecbe5d8 100644 --- a/src/util/virhostdev.c +++ b/src/util/virhostdev.c @@ -785,7 +785,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr, * them and reset all the devices before re-attach. * Attach mac and port profile parameters to devices */ - for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { + for (i = 0; i < virPCIDeviceListCount(pcidevs);) { virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); virPCIDevicePtr activeDev = NULL; @@ -806,6 +806,7 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr, } virPCIDeviceListDel(hostdev_mgr->activePCIHostdevs, dev); + i++; } /* At this point, any device that had been used by the guest is in @@ -816,9 +817,25 @@ virHostdevReAttachPCIDevices(virHostdevManagerPtr hostdev_mgr, * For SRIOV net host devices, unset mac and port profile before * reset and reattach device */ - for (i = 0; i < nhostdevs; i++) - virHostdevNetConfigRestore(hostdevs[i], hostdev_mgr->stateDir, - oldStateDir); + for (i = 0; i < nhostdevs; i++) { + virPCIDevicePtr dev; + virDomainHostdevDefPtr hostdev = hostdevs[i]; + virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; + + if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS || + hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI || + hostdev->parent.type != VIR_DOMAIN_DEVICE_NET || + !hostdev->parent.data.net) + continue; + + dev = virPCIDeviceNew(pcisrc->addr.domain, pcisrc->addr.bus, + pcisrc->addr.slot, pcisrc->addr.function); + if (virPCIDeviceListFind(pcidevs, dev)) { + virHostdevNetConfigRestore(hostdev, hostdev_mgr->stateDir, + oldStateDir); + } + virPCIDeviceFree(dev); + } for (i = 0; i < virPCIDeviceListCount(pcidevs); i++) { virPCIDevicePtr dev = virPCIDeviceListGet(pcidevs, i); -- 2.1.0

2 2

[libvirt] [PATCHv2 0/2] Test status XML formatting and parsing
by Peter Krempa 25 Mar '15

25 Mar '15

Peter Krempa (2): util: buffer: Add support for adding text blocks with indentation tests: qemuxml2xml: Test status XML formatting and parsing src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 9 ++++ src/libvirt_private.syms | 3 ++ src/util/virbuffer.c | 29 +++++++++++++ src/util/virbuffer.h | 1 + tests/qemuxml2xmltest.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ tests/virbuftest.c | 49 +++++++++++++++++++++ 7 files changed, 204 insertions(+), 2 deletions(-) -- 2.2.2

2 4

[libvirt] [PATCH] Relax filesystem target type
by Guido Günther 25 Mar '15

25 Mar '15

When using QEMU's 9pfs the target "dir" element is not necessarily an absolute path. If it is not validation currently fails with the misleaading $ virt-xml-validate /tmp/test.xml Relax-NG validity error : Extra element devices in interleave /tmp/test.xml:24: element devices: Relax-NG validity error : Element domain failed to validate content /tmp/test.xml fails to validate --- docs/schemas/domaincommon.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ebd9299..c6b1a05 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2010,7 +2010,7 @@ <interleave> <element name="target"> <attribute name="dir"> - <ref name="absDirPath"/> + <ref name="dirPath"/> </attribute> <empty/> </element> -- 2.1.4

3 4

[libvirt] [PATCH v3 0/2] network_conf: check if bridge exists on host for user created bridges
by Shivaprasad G Bhat 25 Mar '15

25 Mar '15

The patch fixes the below problem. ============================== If the bridge name is not mentioned in the <network> xml, the bridge name is auto generated from virNetworkAllocateBridge(). If the default template named bridge is created manually by a user, the bridge start will fail with "File exists". bash-4.3$ sudo brctl addbr virbr1 bash-4.3$ brctl show bridge name bridge id STP enabled interfaces br0 8000.000000000000 no virbr0 8000.525400a91d03 yes virbr0-nic virbr1 8000.000000000000 no bash-4.3$ sudo virsh net-list --all Name State Autostart Persistent ---------------------------------------------------------- default active no yes bash-4.3$ cat /tmp/isolated # Notice that the <bridge> intentionally not given. <network> <name>isolated</name> <forward/> <ip address="192.168.123.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.123.2" end="192.168.123.254"/> </dhcp> </ip> </network> bash-4.3$ sudo virsh net-create /tmp/isolated error: Failed to create network from isolated error: Unable to create bridge virbr1: File exists =============================== --- Shivaprasad G Bhat (2): cleanup conf/device_conf.h inclusion from util/virnetdev.h network_conf: check if bridge exists on host for user created bridges src/conf/device_conf.h | 38 +------------------------------------- src/conf/network_conf.c | 15 ++++++++++++--- src/util/virnetdev.h | 38 +++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 41 deletions(-) -- Signature

3 7

[libvirt] [PATCH 0/3] Fix crash when relaying objects and closing connection at the same time
by Peter Krempa 25 Mar '15

25 Mar '15

Fix the crash and clean up two related places. Peter Krempa (3): util: identity: Harden virIdentitySetCurrent() daemon: Clear fake domain def object that is used to check ACL prior to use rpc: Don't unref identity object while callbacks still can be executed daemon/remote.c | 1 + src/rpc/virnetserverclient.c | 4 ++-- src/util/viridentity.c | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) -- 2.2.2

2 5

[libvirt] [PATCH 0/4] Test status XML formatting and parsing
by Peter Krempa 25 Mar '15

25 Mar '15

A recent bug showed that the status XML parsing is not tested. Add test cases based on existing tests in the XML-2-XML test to excercise the parser. Additionally this series fixes also a memleak of the domain device alias list. Peter Krempa (4): qemu: domain: Don't leak device alias list util: buffer: Add support for adding text blocks with indentation tests: xml2xml: Refactor the qemu xml 2 xml test test: qemuxml2xml: Test status XML formatting and parsing src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 9 ++ src/libvirt_private.syms | 3 + src/qemu/qemu_domain.c | 1 + src/util/virbuffer.c | 38 ++++++ src/util/virbuffer.h | 1 + tests/qemuxml2xmltest.c | 309 ++++++++++++++++++++++++++++++++++++----------- tests/virbuftest.c | 50 ++++++++ 8 files changed, 345 insertions(+), 70 deletions(-) -- 2.2.2

2 13

[libvirt] [PATCH 1/2] util: NUMA: Change error code in virNumaNodesetIsAvailable()
by Peter Krempa 25 Mar '15

25 Mar '15

An invalid nodeset is a configuration problem rather than an internal error. --- Pushed as trivial. src/util/virnuma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index e986c71..669192a 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -977,7 +977,7 @@ virNumaNodesetIsAvailable(virBitmapPtr nodeset) if (virNumaNodeIsAvailable(bit)) continue; - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("NUMA node %zd is unavailable"), bit); return false; } -- 2.2.2

1 1

[libvirt] Plans for next release
by Daniel Veillard 25 Mar '15

25 Mar '15

So we already have around 300 commits made since 1.2.13, and the end of the month is coming, so I guess we should enter freeze soon. I would suggest to do this friday to try to shoot for a 1.2.14 release by April 1st - always a great date to ship a release ! any opposition to this plan ? BTW as was pointed earlier by pkrempa we just went over 19,000 commits for libvirt. At the current rate we should hit 20k around july :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] Makefile: fix typo
by Pavel Hrdina 25 Mar '15

25 Mar '15

Commit 95695388 introduced new util/virthreadjob.c/h files but the makefile has type that breaks rpm build. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index ec62ab4..97e060a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -160,7 +160,7 @@ UTIL_SOURCES = \ util/virsysinfo.c util/virsysinfo.h \ util/virsystemd.c util/virsystemd.h \ util/virthread.c util/virthread.h \ - util/virthreadjob.c utils/virthreadjob.h \ + util/virthreadjob.c util/virthreadjob.h \ util/virthreadpool.c util/virthreadpool.h \ util/virtime.h util/virtime.c \ util/virtpm.h util/virtpm.c \ -- 2.0.5

1 0

[libvirt] [PATCH] qemu: fix can use setmaxmem to change the maximum memory biger than max memory
by Luyao Huang 25 Mar '15

25 Mar '15

When call qemuDomainSetMemoryFlags() to change maximum memory size, we do not check if the maximum memory is biger than the max memory, this will make vm disappear after libvirtd restart if we set a big maximum memory. Add a check for this, also fix a typos issue. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/qemu/qemu_driver.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d633f93..0d4b165 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -16646,7 +16646,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, if (src->mem.memory_slots != dst->mem.memory_slots) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain memory slots count '%u' doesn't match source '%u"), + _("Target domain memory slots count '%u' doesn't match source '%u'"), dst->mem.memory_slots, src->mem.memory_slots); goto error; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3518dec..86b87af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2324,6 +2324,13 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, "nodes cannot be modified with this API")); goto endjob; } + if (persistentDef->mem.max_memory && + persistentDef->mem.max_memory < newmem) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot set maximum memory size biger than " + "the max memory size")); + goto endjob; + } virDomainDefSetMemoryInitial(persistentDef, newmem); -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] fix domain documentation error
by Chen Fan 25 Mar '15

25 Mar '15

Chen Fan (2): docs: no 'via' attribute in route element docs: route element must specify network address docs/formatdomain.html.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.9.3

2 3

[libvirt] [PATCH 0/8] Make debugging of "cannot acquire state change lock" easier
by Jiri Denemark 25 Mar '15

25 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=853839 Jiri Denemark (8): POTFILES.in: Sort Add support for tracking thread jobs Force usage of virThreadCreate virThread: Set thread job virThreadPool: Set thread worker name Set thread job for every RPC call qemu: Track the API which started the current job qemu: Add timing to domain jobs cfg.mk | 9 +++ daemon/remote.c | 1 + include/libvirt/virterror.h | 1 + po/POTFILES.in | 5 +- src/Makefile.am | 2 + src/libvirt_private.syms | 11 +++- src/locking/lock_daemon_dispatch.c | 1 + src/nwfilter/nwfilter_learnipaddr.c | 15 ++--- src/nwfilter/nwfilter_learnipaddr.h | 1 - src/qemu/qemu_domain.c | 60 ++++++++++++++--- src/qemu/qemu_domain.h | 4 ++ src/rpc/gendispatch.pl | 6 +- src/util/virerror.c | 1 + src/util/virthread.c | 25 +++++-- src/util/virthread.h | 13 ++-- src/util/virthreadjob.c | 126 ++++++++++++++++++++++++++++++++++++ src/util/virthreadjob.h | 33 ++++++++++ src/util/virthreadpool.c | 44 ++++++++----- src/util/virthreadpool.h | 14 ++-- 19 files changed, 317 insertions(+), 55 deletions(-) create mode 100644 src/util/virthreadjob.c create mode 100644 src/util/virthreadjob.h -- 2.3.3

2 10

[libvirt] [PATCH] qemu: add a check for node set when build memory device cmd
by Luyao Huang 25 Mar '15

25 Mar '15

When we set a host not exist nodemask in memory device and then start the vm, qemu will report error. # virsh start test3 error: Failed to start domain test3 error: internal error: process exited while connecting to monitor: 2015-03-25T01:12:17.205913Z qemu-kvm: -object memory-backend-ram,id=memdimm0 ,size=536870912,host-nodes=1-3,policy=bind: cannot bind memory to host NUMA nodes: Invalid argument We have some function to check this, and add a check when build memory cmd line will report error more early and clearly. And the check will be done when we start a vm have memory device and hotplug a memory device. The error will be: # virsh start test3 error: Failed to start domain test3 error: internal error: NUMA node 1 is unavailable Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_command.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 99a19d6..04c8df7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4757,6 +4757,8 @@ qemuBuildMemoryBackendStr(unsigned long long size, } if (nodemask) { + if (!virNumaNodesetIsAvailable(nodemask)) + goto cleanup; if (virJSONValueObjectAdd(props, "m:host-nodes", nodemask, "S:policy", qemuNumaPolicyTypeToString(mode), -- 1.8.3.1

2 1

[libvirt] [PATCH] Document that USB hostdevs do not need nodeDettach
by Ján Tomko 25 Mar '15

25 Mar '15

The virNodeDeviceDettach API only works on PCI devices. Originally added by commit 10d3272e, but the API never supported USB devices. Reported by: Martin Polednik <mpolednik(a)redhat.com> --- docs/formatdomain.html.in | 19 +++++++++---------- tools/virsh.pod | 17 ++++++++--------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 82aa14f..d6abe17 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3114,21 +3114,20 @@ with additional attributes noted. <dl> <dt>usb</dt> - <dd>For USB devices, the user is responsible to call - <code>virNodeDeviceDettach</code> (or - <code>virsh nodedev-detach</code>) before starting the guest - or hot-plugging the device and <code>virNodeDeviceReAttach</code> - (or <code>virsh nodedev-reattach</code>) after hot-unplug or - stopping the guest. + <dd>USB devices are detached from the host on guest startup + and reattached after the guest exits or the device is + hot-unplugged. </dd> <dt>pci</dt> <dd>For PCI devices, when <code>managed</code> is "yes" it is detached from the host before being passed on to the guest and reattached to the host after the guest exits. If - <code>managed</code> is omitted or "no", follow the steps - described for a USB device to detach before starting the - guest or hot-plugging and reattach after stopping the guest - or hot-unplug. + <code>managed</code> is omitted or "no", the user is + responsible to call <code>virNodeDeviceDettach</code> + (or <code>virsh nodedev-detach</code> before starting the guest + or hot-plugging the device and <code>virNodeDeviceReAttach</code> + (or <code>virsh nodedev-reattach</code>) after hot-unplug or + stopping the guest. </dd> <dt>scsi</dt> <dd>For SCSI devices, user is responsible to make sure the device diff --git a/tools/virsh.pod b/tools/virsh.pod index 8262a45..4d825c1 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2385,7 +2385,7 @@ attach taking effect the next time libvirt starts the domain. For cdrom and floppy devices, this command only replaces the media within an existing device; consider using B<update-device> for this usage. For passthrough host devices, see also B<nodedev-detach>, -needed if the device does not use managed mode. +needed if the PCI device does not use managed mode. If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. @@ -2646,15 +2646,14 @@ L<http://libvirt.org/formatnode.html>. Passthrough devices cannot be simultaneously used by the host and its guest domains, nor by multiple active guests at once. If the -<hostdev> description includes the attribute B<managed='yes'>, and the -hypervisor driver supports it, then the device is in managed mode, and +<hostdev> description of a PCI device includes the attribute B<managed='yes'>, +and the hypervisor driver supports it, then the device is in managed mode, and attempts to use that passthrough device in an active guest will automatically behave as if B<nodedev-detach> (guest start, device hot-plug) and B<nodedev-reattach> (guest stop, device hot-unplug) were -called at the right points (currently, qemu does this for PCI devices, -but not USB). If a device is not marked as managed, then it must -manually be detached before guests can use it, and manually reattached -to be returned to the host. Also, if a device is manually detached, +called at the right points. If a PCI device is not marked as managed, +then it must manually be detached before guests can use it, and manually +reattached to be returned to the host. Also, if a device is manually detached, then the host does not regain control of the device without a matching reattach, even if the guests use the device in managed mode. @@ -2712,8 +2711,8 @@ I<cap> and I<--tree> are mutually exclusive. Declare that I<nodedev> is no longer in use by any guests, and that the host can resume normal use of the device. This is done -automatically for devices in managed mode, but must be done explicitly -to match any explicit B<nodedev-detach>. +automatically for PCI devices in managed mode and USB devices, but +must be done explicitly to match any explicit B<nodedev-detach>. =item B<nodedev-reset> I<nodedev> -- 2.0.5

2 2

[libvirt] [PATCH] rpc: serverclient: Clear pointer with NULL instead of 0
by Peter Krempa 25 Mar '15

25 Mar '15

--- Notes: Pushed as trivial. src/rpc/virnetserverclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index f5259c2..d36e80c 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -721,7 +721,7 @@ virNetServerClientCreateIdentity(virNetServerClientPtr client) error: virObjectUnref(ret); - ret = 0; + ret = NULL; goto cleanup; } -- 2.2.2

1 0

[libvirt] [PATCH 00/10] libxl: switch driver to use a single libxl_ctx
by Jim Fehlig 24 Mar '15

24 Mar '15

This series is a follow up to https://www.redhat.com/archives/libvir-list/2015-February/msg00024.html It goes a step further and changes the libxl driver to use one, driver-wide libxl_ctx. Currently the libxl driver has one driver-wide ctx for operations that are not domain-specific and a ctx for each domain. This approach was necessary back in the old Xen4.1 libxl days, but with the newer libxl it is more of a hinderance than benefit. Ian Jackson suggested moving to a single ctx while discussing some deadlocks and assertions encountered in the libxl driver when under load from tests such as OpenStack Tempest. Making such a change involves quite a bit of code movement. I've tried to split that up into a reviewable series, the result of which are the 9 patches that follow. I've ran this through all of my automated tests as well as some hacky tests I created to reproduce failures revealed by Tempest. One downside of moving to a single ctx is losing the per-domain log files. Currently, a single log stream can be associated with ctx, hence all logging from libxl will go to a single file. Ian is going to investigate possibilities to accommodate per-domain log files in libxl, but in the meantime folks using Xen are accustomed to a single log file from the xend days. I've been testing this series on xen-unstable and Xen 4.4.1 + commits 2ffeb5d7, 4b9143e4, 5a968257, 60ce518a, 66bff9fd, 77a1bf37, f49f9b41, 6b5a5bba, 93699882d, f1335f0d, and 8bc64413. Results are much better than before applying the series, but I do notice a stuck hypercall after many (hundreds) concurrent domain create/destroy operations. The single libxl_ctx is locked in the callpath, essentially deadlocking the driver. Thread 1 (Thread 0x7f0649a198c0 (LWP 2235)): 0 0x00007f0645272397 in ioctl () from /lib64/libc.so.6 1 0x00007f0645d8e353 in linux_privcmd_hypercall (xch=<optimized out>, h=<optimized out>, hypercall=<optimized out>) at xc_linux_osdep.c:134 2 0x00007f0645d854b8 in do_xen_hypercall (xch=xch@entry=0x7f0630039390, hypercall=hypercall@entry=0x7fffd53f80e0) at xc_private.c:249 3 0x00007f0645d86aa4 in do_sysctl (sysctl=sysctl@entry=0x7fffd53f8080, xch=xch@entry=0x7f0630039390) at xc_private.h:281 4 xc_sysctl (xch=xch@entry=0x7f0630039390, sysctl=sysctl@entry=0x7fffd53f8170) at xc_private.c:656 5 0x00007f0645d7bfbf in xc_domain_getinfolist (xch=0x7f0630039390, first_domain=first_domain@entry=119, max_domains=max_domains@entry=1, info=info@entry=0x7fffd53f8260) at xc_domain.c:382 6 0x00007f0645fabca6 in domain_death_xswatch_callback (egc=0x7fffd53f83f0, w=<optimized out>, wpath=<optimized out>, epath=<optimized out>) at libxl.c:1041 7 0x00007f0645fd75a8 in watchfd_callback (egc=0x7fffd53f83f0, ev=<optimized out>, fd=<optimized out>, events=<optimized out>, revents=<optimized out>) at libxl_event.c:515 8 0x00007f0645fd8ac3 in libxl_osevent_occurred_fd (ctx=<optimized out>, for_libxl=<optimized out>, fd=<optimized out>, events_ign=<optimized out>, revents_ign=<optimized out>) at libxl_event.c:1259 9 0x00007f063a23402c in libxlFDEventCallback (watch=454, fd=33, vir_events=1, fd_info=0x7f0608007e70) at libxl/libxl_driver.c:123 There is no hint in any logs or dmesg suggesting a cause for the stuck hypercall. Any suggestions for further debugging tips appreciated. Jim Fehlig (10): libxl: remove redundant calls to libxl_evdisable_domain_death libxl: use libxl_ctx passed to libxlConsoleCallback libxl: use driver-wide ctx in fd and timer event handling libxl: Move setup of child processing code to driver initialization libxl: move event registration to driver initialization libxl: use global libxl_ctx in event handler libxl: remove unnecessary libxlDomainEventsRegister libxl: make libxlDomainFreeMem static libxl: remove per-domain libxl_ctx libxl: change libxl log stream to ERROR log level src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_domain.c | 438 ++++++--------------------------------- src/libxl/libxl_domain.h | 27 +-- src/libxl/libxl_driver.c | 484 +++++++++++++++++++++++++++++++------------- src/libxl/libxl_migration.c | 17 +- 5 files changed, 426 insertions(+), 542 deletions(-) -- 1.8.4.5

2 12

[libvirt] [PATCH] libxl: fix dom0 balloon logic
by Jim Fehlig 24 Mar '15

24 Mar '15

Recent testing on large memory systems revealed a bug in the Xen xl tool's freemem() function. When autoballooning is enabled, freemem() is used to ensure enough memory is available to start a domain, ballooning dom0 if necessary. When ballooning large amounts of memory from dom0, freemem() would exceed its self-imposed wait time and return an error. Meanwhile, dom0 continued to balloon. Starting the domain later, after sufficient memory was ballooned from dom0, would succeed. The libvirt implementation in libxlDomainFreeMem() suffers the same bug since it is modeled after freemem(). In the end, the best place to fix the bug on the Xen side was to slightly change the behavior of libxl_wait_for_memory_target(). Instead of failing after caller-provided wait_sec, the function now blocks as long as dom0 memory ballooning is progressing. It will return failure only when more memory is needed to reach the target and wait_sec have expired with no progress being made. See xen.git commit fd3aa246. There was a dicussion on how this would affect other libxl apps like libvirt http://lists.xen.org/archives/html/xen-devel/2015-03/msg00739.html If libvirt containing this patch was build against a Xen containing the old libxl_wait_for_memory_target() behavior, libxlDomainFreeMem() will fail after 30 sec and domain creation will be terminated. Without this patch and with old libxl_wait_for_memory_target() behavior, libxlDomainFreeMem() does not succeed after 30 sec, but returns success anyway. Domain creation continues resulting in all sorts of fun stuff like cpu soft lockups in the guest OS. It was decided to properly fix libxl_wait_for_memory_target(), and if anything improve the default behavior of apps using the freemem reference impl in xl. xl was patched to accommodate the change in libxl_wait_for_memory_target() with xen.git commit 883b30a0. This patch does the same in the libxl driver. While at it, I changed the logic to essentially match freemem() in $xensrc/tools/libxl/xl_cmdimpl.c. It was a bit cleaner IMO and will make it easier to spot future, potentially interesting divergences. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 57 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 407a9bd..ff78133 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -1121,38 +1121,41 @@ libxlDomainFreeMem(libxlDomainObjPrivatePtr priv, libxl_domain_config *d_config) { uint32_t needed_mem; uint32_t free_mem; - size_t i; - int ret = -1; + int ret; int tries = 3; int wait_secs = 10; - if ((ret = libxl_domain_need_memory(priv->ctx, &d_config->b_info, - &needed_mem)) >= 0) { - for (i = 0; i < tries; ++i) { - if ((ret = libxl_get_free_memory(priv->ctx, &free_mem)) < 0) - break; + ret = libxl_domain_need_memory(priv->ctx, &d_config->b_info, + &needed_mem); + if (ret < 0) + goto error; - if (free_mem >= needed_mem) { - ret = 0; - break; - } + do { + ret = libxl_get_free_memory(priv->ctx, &free_mem); + if (ret < 0) + goto error; - if ((ret = libxl_set_memory_target(priv->ctx, 0, - free_mem - needed_mem, - /* relative */ 1, 0)) < 0) - break; + if (free_mem >= needed_mem) + return 0; - ret = libxl_wait_for_free_memory(priv->ctx, 0, needed_mem, - wait_secs); - if (ret == 0 || ret != ERROR_NOMEM) - break; + ret = libxl_set_memory_target(priv->ctx, 0, + free_mem - needed_mem, + /* relative */ 1, 0); + if (ret < 0) + goto error; - if ((ret = libxl_wait_for_memory_target(priv->ctx, 0, 1)) < 0) - break; - } - } + ret = libxl_wait_for_free_memory(priv->ctx, 0, needed_mem, + wait_secs); + if (ret < 0) + goto error; - return ret; + tries--; + } while (tries > 0); + + error: + virReportSystemError(ret, "%s", + _("Failed to balloon domain0 memory")); + return -1; } static void @@ -1271,12 +1274,8 @@ libxlDomainStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, priv->ctx, &d_config) < 0) goto endjob; - if (cfg->autoballoon && libxlDomainFreeMem(priv, &d_config) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("libxenlight failed to get free memory for domain '%s'"), - d_config.c_info.name); + if (cfg->autoballoon && libxlDomainFreeMem(priv, &d_config) < 0) goto endjob; - } if (virHostdevPrepareDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, VIR_HOSTDEV_SP_PCI) < 0) -- 1.8.4.5

3 3

[libvirt] [PATCH 0/6] Some cleanups, improvements and bug fixes of flags usage
by Pavel Hrdina 24 Mar '15

24 Mar '15

Two bugs has been filed about wrong usage of api flags and virsh commands. After investigation of the core issue I've decide to introduce same helper macros as we have in virsh code to check mutually exclusive flags. This patch series also includes the bug fixes and some other cleanups in setvcpus code. Luyao Huang (2): qemu: check if domain is really active when do setvcpus with --live tools: fix the wrong check when use virsh setvcpus --maximum Pavel Hrdina (4): internal: introduce macro helpers to reject exclusive flags use new macro helpers to check exclusive flags qemu: cleanup setvcpus qemu: fix set vcpus on host without NUMA src/internal.h | 80 +++++++++++ src/libvirt-domain-snapshot.c | 45 ++---- src/libvirt-domain.c | 288 +++++++++++-------------------------- src/qemu/qemu_driver.c | 42 +++--- src/storage/storage_backend_disk.c | 10 +- src/storage/storage_backend_fs.c | 11 +- tools/virsh-domain.c | 30 +--- 7 files changed, 208 insertions(+), 298 deletions(-) -- 2.0.5

4 25

[libvirt] [PATCH] Document behavior of compat when creating qcow2 volumes
by Ján Tomko 24 Mar '15

24 Mar '15

Commit bab2eda changed the behavior for missing compat attribute, but failed to update the documentation. Before, the option was omitted from qemu-img command line and the qemu-img default was used. Now we always specify the compat value and the default is 0.10. Reported by Christophe Fergeau https://bugzilla.gnome.org/show_bug.cgi?id=746660#c4 --- docs/formatstorage.html.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index d2e2bb8..9c7b1bd 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -588,8 +588,9 @@ <code>type='qcow2'</code> volumes. Valid values are <code>0.10</code> and <code>1.1</code> so far, specifying QEMU version the images should be compatible with. If the <code>feature</code> element is present, - 1.1 is used. If omitted, qemu-img default is used. - Since 1.1.0 + 1.1 is used. + Since 1.1.0 If omitted, 0.10 is used. + Since 1.1.2 </dd> <dt><code>nocow</code></dt> <dd>Turn off COW of the newly created volume. So far, this is only valid -- 2.0.5

2 2

[libvirt] [PATCH 0/2] Support core file limit settings for QEMU
by Daniel P. Berrange 24 Mar '15

24 Mar '15

Currently QEMU inherits core size limits from libvirtd which is rather inconvenient Daniel P. Berrange (2): conf: parse integers into long long, instead of long qemu: add a max_core setting to qemu.conf for core dump size daemon/libvirtd-config.c | 6 +-- src/libvirt_private.syms | 2 + src/locking/lock_daemon_config.c | 4 +- src/locking/lock_driver_lockd.c | 4 +- src/locking/lock_driver_sanlock.c | 6 +-- src/lxc/lxc_conf.c | 6 +-- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 12 +++++ src/qemu/qemu_conf.c | 9 ++-- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_process.c | 2 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircommand.c | 14 +++++ src/util/vircommand.h | 1 + src/util/virconf.c | 22 ++++---- src/util/virconf.h | 6 +-- src/util/virprocess.c | 35 +++++++++++++ src/util/virprocess.h | 1 + src/xenconfig/xen_common.c | 8 +-- tests/Makefile.am | 5 ++ tests/libvirtdconftest.c | 4 +- tests/virconftest.c | 105 +++++++++++++++++++++++++++++++++++++ 22 files changed, 220 insertions(+), 36 deletions(-) create mode 100644 tests/virconftest.c -- 2.1.0

4 6

[libvirt] [PATCH] qemu: change accidental VIR_WARNING back to VIR_DEBUG
by Laine Stump 24 Mar '15

24 Mar '15

While debugging the support for responding to qemu RX_FILTER_CHANGED events, I had changed the "ignoring this event" log message from VIR_DEBUG to VIR_WARN, but forgot to change it back before pushing. Since many guest OSes make enough changes to multicast lists and/or promiscuous mode settings to trigger this message, it's starting to show up as a red herring in bug reports. --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d9217b..2bac4a9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4340,7 +4340,7 @@ processNicRxFilterChangedEvent(virQEMUDriverPtr driver, def = dev.data.net; if (!virDomainNetGetActualTrustGuestRxFilters(def)) { - VIR_WARN("ignore NIC_RX_FILTER_CHANGED event for network " + VIR_DEBUG("ignore NIC_RX_FILTER_CHANGED event for network " "device %s in domain %s", def->info.alias, vm->def->name); /* not sending "query-rx-filter" will also suppress any -- 2.1.0

2 2

[libvirt] [PATCH] qemucaps2xmltest: fix the test to correspond to new domain formatting
by Pavel Hrdina 24 Mar '15

24 Mar '15

Commit 2360fe5d updated formating of <domain> element but forget to update qemucaps2xmldata xml files. In addition the test code was broken too. Update the xml files and return -1 if testCompareXMLToXML fails together with indentation fix. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- tests/qemucaps2xmldata/all_1.6.0-1.xml | 3 +-- tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 3 +-- tests/qemucaps2xmltest.c | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/qemucaps2xmldata/all_1.6.0-1.xml b/tests/qemucaps2xmldata/all_1.6.0-1.xml index 425b22e..2489f49 100644 --- a/tests/qemucaps2xmldata/all_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/all_1.6.0-1.xml @@ -12,8 +12,7 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-i386</emulator> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-system-i386</emulator> </domain> diff --git a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml index cd19814..281fab0 100644 --- a/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml +++ b/tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml @@ -12,8 +12,7 @@ <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/bin/qemu-system-i386</emulator> - <domain type='qemu'> - </domain> + <domain type='qemu'/> <domain type='kvm'> <emulator>/usr/bin/qemu-system-i386</emulator> </domain> diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c index 3529acb..b3975b4 100644 --- a/tests/qemucaps2xmltest.c +++ b/tests/qemucaps2xmltest.c @@ -31,7 +31,7 @@ static int testCompareXMLToXML(const char *inxmldata, const char *outxmldata) { - int ret = 1; + int ret = -1; if (STRNEQ(outxmldata, inxmldata)) { virtTestDifference(stderr, outxmldata, inxmldata); @@ -143,7 +143,7 @@ testQemuCapsXML(const void *opaque) char *capsXml = NULL; virCapsPtr capsProvided = NULL; - if (virAsprintf(&xmlFile, "%s/qemucaps2xmldata/%s.xml", + if (virAsprintf(&xmlFile, "%s/qemucaps2xmldata/%s.xml", abs_srcdir, data->base) < 0) goto cleanup; -- 2.0.5

2 2

[libvirt] [PATCHv2 0/5] Allocate virtio-serial addresses
by Ján Tomko 24 Mar '15

24 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=890606 https://bugzilla.redhat.com/show_bug.cgi?id=1076708 Ján Tomko (5): Add test for virtio serial port assignment Add functions to track virtio-serial addresses Allocate virtio-serial addresses when starting a domain Expand the address set when attaching a virtio-serial controller Assign an address when hotplugging a virtio-serial device src/conf/domain_addr.c | 348 +++++++++++++++++++++ src/conf/domain_addr.h | 56 ++++ src/conf/domain_conf.c | 29 -- src/libvirt_private.syms | 9 + src/qemu/qemu_command.c | 63 ++++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_hotplug.c | 31 +- src/qemu/qemu_process.c | 2 + tests/qemuhotplugtest.c | 2 +- .../qemuxml2argv-channel-virtio-auto.args | 8 +- .../qemuxml2argv-channel-virtio-autoassign.args | 20 ++ .../qemuxml2argv-channel-virtio-autoassign.xml | 50 +++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-channel-virtio-auto.xml | 10 +- 15 files changed, 591 insertions(+), 41 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.xml -- 2.0.5

2 10

[libvirt] [libvirt-glib] build-sys: Fix libtoolize detection in autogen.sh
by Christophe Fergeau 24 Mar '15

24 Mar '15

autogen.sh is currently checking for the libtool binary, but it's libtoolize which is needed by autoreconf, not libtool. These binaries are packaged separately on Debian/Ubuntu so this can cause actual issues on some systems. Bug reported by Frederic Peters --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index 8030ab1..4f7135f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,7 +10,7 @@ cd $srcdir DIE=0 -for prog in intltoolize autoreconf automake autoconf libtool +for prog in intltoolize autoreconf automake autoconf libtoolize do ($prog --version) < /dev/null > /dev/null 2>&1 || { echo -- 2.3.3

2 2

[libvirt] [PATCH] conf: fix running vm numa settings disappear after restart libvirtd
by Luyao Huang 24 Mar '15

24 Mar '15

5bba61f introduce a issue : when start a vm with <numa> settings and restart libvirtd, numa settings will disappear. Because when parse the vm states file, there is no node in "/domain/cpu/numa" this place. Change to use ./cpu/numa instead of /domain/cpu/numa. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/numa_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index b92cb44..c34ba5f 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -663,10 +663,10 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def, int ret = -1; /* check if NUMA definition is present */ - if (!virXPathNode("/domain/cpu/numa[1]", ctxt)) + if (!virXPathNode("./cpu/numa[1]", ctxt)) return 0; - if ((n = virXPathNodeSet("/domain/cpu/numa[1]/cell", ctxt, &nodes)) <= 0) { + if ((n = virXPathNodeSet("./cpu/numa[1]/cell", ctxt, &nodes)) <= 0) { virReportError(VIR_ERR_XML_ERROR, "%s", _("NUMA topology defined without NUMA cells")); goto cleanup; -- 1.8.3.1

2 3

[libvirt] [PATCH] RFC: Add domain vmport attribute
by Marc-André Lureau 24 Mar '15

24 Mar '15

The QEMU machine vmport option allows to set the VMWare IO port emulation. This emulation is useful for absolute pointer input when the guest has vmware input drivers, and is enabled by default for kvm. However it is unnecessary for Spice-enabled VM, since the agent already handles absolute pointer and multi-monitors. Furthermore, it prevents Spice from switching to relative input since the regular ps/2 pointer driver is replaced by the vmware driver. It is thus advised to disable vmport when using a Spice VM. This will permit the Spice client to switch from absolute to relative pointer, as it may be required for certain games or applications. --- PS: the patch could be split in domain+docs+qemu+test docs/formatdomain.html.in | 7 +++++- docs/schemas/domaincommon.rng | 8 +++++++ src/conf/domain_conf.c | 9 ++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 6 ++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +++++++++++ .../qemuxml2argv-machine-vmport-opt.args | 6 ++++++ .../qemuxml2argv-machine-vmport-opt.xml | 25 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 10 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index be35c82..51d74d1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -124,7 +124,12 @@ and <code>machine</code> referring to the machine type. The <a href="formatcaps.html">Capabilities XML</a> provides details on allowed values for - these. Since 0.0.1</dd> + these. Since 0.0.1 + The optional <code>vmport</code> attribute (accepted values + are <code>yes</code> and <code>no</code>), sets the + emulation of VMWare IO port, for vmmouse etc. Since 1.2.14 + </dd> <dt><code>loader</code></dt> <dd>The optional <code>loader</code> tag refers to a firmware blob used to assist the domain creation process. It is used by Xen diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index ebd9299..da3c8c0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -339,6 +339,14 @@ <ref name="hvmaarch64"/> </choice> </optional> + <optional> + <attribute name="vmport"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> <value>hvm</value> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ae7d8df..d12598b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14218,6 +14218,15 @@ virDomainDefParseXML(xmlDocPtr xml, goto error; } + tmp = virXPathString("string(./os/type[1]/@vmport)", ctxt); + if (tmp && + (def->os.vmport = virTristateBoolTypeFromString(tmp)) <= 0) { + virReportError(VIR_ERR_OS_TYPE, + _("unknown vmport value: %s"), tmp); + goto error; + } + VIR_FREE(tmp); + /* * Booting options for different OS types.... * diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9d314fa..4cc2ff7 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1767,6 +1767,7 @@ struct _virDomainOSDef { char *bootloader; char *bootloaderArgs; int smbios_mode; + int vmport; /* enum virTristateBool */ virDomainBIOSDef bios; }; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ccf22f0..f5481d3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -279,6 +279,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "qxl.vgamem_mb", "qxl-vga.vgamem_mb", "pc-dimm", + + "machine-vmport-opt", /* 185 */ ); @@ -3239,6 +3241,10 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (qemuCaps->version >= 1003000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); + /* vmport option is supported v2.2.0 onwards */ + if (qemuCaps->version >= 2002000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT); + /* WebSockets were introduced between 1.3.0 and 1.3.1 */ if (qemuCaps->version >= 1003001) virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC_WEBSOCKET); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c7b1ac7..48c8f96 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -224,6 +224,7 @@ typedef enum { QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ + QEMU_CAPS_MACHINE_VMPORT_OPT = 185, /* -machine xxx,vmport=on/off/auto */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63d43d4..6410bf9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7129,6 +7129,19 @@ qemuBuildMachineArgStr(virCommandPtr cmd, if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT)) virBufferAddLit(&buf, ",usb=off"); + if (def->os.vmport) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vmport is not available " + "with this QEMU binary")); + virBufferFreeAndReset(&buf); + return -1; + } + + virBufferAsprintf(&buf, ",vmport=%s", + virTristateSwitchTypeToString(def->os.vmport)); + } + if (def->mem.dump_core) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DUMP_GUEST_CORE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args new file mode 100644 index 0000000..ea1a11f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ +/usr/bin/qemu \ +-S -machine pc,accel=tcg,vmport=off -m 214 -smp 1 -nographic \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml new file mode 100644 index 0000000..ee796f6 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.xml @@ -0,0 +1,25 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc' vmport='no'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fcf5218..dbd55a4 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -607,6 +607,8 @@ mymain(void) DO_TEST_FAILURE("machine-core-on", QEMU_CAPS_MACHINE_OPT); DO_TEST("machine-usb-opt", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_USB_OPT); + DO_TEST("machine-vmport-opt", QEMU_CAPS_MACHINE_OPT, + QEMU_CAPS_MACHINE_VMPORT_OPT); DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); DO_TEST("boot-cdrom", NONE); DO_TEST("boot-network", NONE); -- 2.1.0

2 2

[libvirt] GSOC 2015: Libvirt Projects
by Richa Sehgal 24 Mar '15

24 Mar '15

Dear Mentors, I am currently pursuing Master's in University of Illinois at Urbana Champaign, USA and completed by B.Tech from Indian Institute of Technology - Delhi (IIT- Delhi). I am interested in contributing to Libvirt community through GSOC 2015. I am using VirtualBox to run Ubuntu and have used VMware Player in the past. Actually I am very interested in understanding virtualization at a more practical level and do not want to limit myself to theoretical knowledge. I have played with QEMU during the OS class, but I am new to Libvirt, and thus would like to start with beginner level projects. There are two that I found: 1. Enhancing libvirt-designer 2. Abstracting device address allocation Are these projects still open, or students have already applied to them? Are there any other projects that I can start with? I am really excited about contributing to the libvirt project. Please let me know of a suitable way of starting with these. I look forward for a useful engagement with the community this summer. My irc name is: richashi. Thanks Richa

3 2

[libvirt] [RFC PATCH v2 00/12] qemu: add support to hot-plug/unplug cpu device
by Zhu Guihua 24 Mar '15

24 Mar '15

If you apply the folowing patchset in order [PATCH v3 0/7] cpu: add device_add foo-x86_64-cpu support https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01552.html, [PATCH v2 0/5] Common unplug and unplug request cb for memory and CPU hot-unplug https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg03929.html and [PATCH v2 00/11] cpu: add i386 cpu hot remove support https://lists.nongnu.org/archive/html/qemu-devel/2015-01/msg01557.html, qemu can support hotplug and hot-unplug cpu device. So this patch series will make libvirt support hotplug and hot-unplug cpu device for qemu driver. This patch series add a new API to support cpu hot-plug/unplug, and leave the existing API by invoking qemu command 'cpu-add' as a legacy. This patch series realize cpu hot-plug/unplug by libvirt command 'attach-device' and 'detach-device', and invoke qemu command 'device_add' and 'device_del' to support this feature. v2: - update cpu device's definition, and cpu's apic_id is hidded to users. - add check for compatibility between host cpu and hot added cpu - add a capability for *-x86_64-cpu Zhu Guihua (12): domain_conf: add support for cpu device configuration in XML domain_conf: introduce cpu def helpers domain_conf: introduce cpu device hotplug helpers qemu_driver: implement cpu device hotplug on config level qemu_command: introduce a func for cpu device alias assignment domain_conf: allocate cpu's apic id dynamically qemu: add a capability for x86_64-cpu qemu: introduce qemuBuildCPUDeviceStr qemu: implement cpu device hotplug on live level qemu: implement cpu device hotunplug on live level qemu_monitor_json: sort JSON array of cpu info qemu_driver: detect threads corresponding to Vcpus docs/formatdomain.html.in | 28 ++++ docs/schemas/domaincommon.rng | 3 + src/conf/domain_conf.c | 189 +++++++++++++++++++++++++- src/conf/domain_conf.h | 33 +++++ src/libvirt_private.syms | 6 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 120 +++++++++++++++++ src/qemu/qemu_command.h | 10 ++ src/qemu/qemu_driver.c | 299 ++++++++++++++++++++++++------------------ src/qemu/qemu_driver.h | 8 ++ src/qemu/qemu_hotplug.c | 140 ++++++++++++++++++++ src/qemu/qemu_hotplug.h | 12 ++ src/qemu/qemu_monitor_json.c | 31 ++++- src/util/virbitmap.c | 2 +- src/util/virbitmap.h | 2 + 16 files changed, 753 insertions(+), 134 deletions(-) -- 1.9.3

4 20

[libvirt] libvirt/libxl implemetation of get_online_cpu / virNodeGetCPUMap?
by Anthony PERARD 24 Mar '15

24 Mar '15

Hi, A recent OpenStack nova commit make use of virNodeGetCPUMap to get the list of online cpu of a host. But this API is not implemented for the libvirt xen driver. The commit: Add handling for offlined CPUs to the nova libvirt driver. https://review.openstack.org/gitweb?p=openstack/nova.git;a=commitdiff;h=069… Is there a need to use this under Xen? (Is it possible to have offline CPU?). What libxl API those provide this information, if it exist? I found libxl_get_online_cpus() but that not enough. They want a bitmap. Thanks, -- Anthony PERARD

5 13

Re: [libvirt] Windows 7 guest installer does not detect drive if physical partition used instead of disk file.
by Stefan Hajnoczi 23 Mar '15

23 Mar '15

On Sat, Mar 21, 2015 at 01:50:46AM +0800, Emmanuel Noobadmin wrote: > Running > 3.18.9-200.fc21.x86_64 > qemu 2:2.1.3-3.fc21 > libvirt 1.2.9.2-1.fc21 > System is a Thinkpad X250 with Intel i7-5600u Broadwell GT2 > > I'm trying to replace the Win7 installation on my laptop with Fedora > 21 and virtualizing Windows 7 for work purposes. I'd prefer to give > the guest its own NTFS partition instead of using a file for both > performance and ease of potential recovery. > > So I've set aside unpartitioned space on the hard disk and added > /dev/sda to the virt-manager storage pool, created a new volume and > assigned it to the guest as an IDE drive. Unfortunately, the Windows 7 > installer does not see this drive despite being "IDE" and not virtio. > If I use a qcow2 file as the drive, the installer has no problems > detecting it. > > To eliminate virt-manager from the equation, I've also tried to do a > very basic install using virt-install with similar results, the > physical partition cannot be detected regardless of bus type > (IDE/SATA/virtio) even with the signed Redhat virtio drivers loaded by > the installer. > > I was unable to find any similar issues or solutions online except a 2 > year old thread on linuxquestions which quoted that we must specify > the whole disk instead of a partition. However, I cannot find the > source of that quote. > http://www.linuxquestions.org/questions/linux-virtualization-and-cloud-90/q… > > Is this really the case and the reason why Windows 7 cannot see the > physical partition or there is something else I am doing wrong? I have CCed the libvirt mailing list, since KVM is a component here but your question seems to be mainly about libvirt, virt-manager, virt-install, etc. It sounds like you want an NTFS partition on /dev/sda. That requires passing the whole /dev/sda drive to the guest - and the Windows installer might overwrite your GRUB Master Boot Record. Be careful when trying to do this. Also keep in mind that the virtual machine's hardware and your physical hardware are probably quiet different (different chipsets, PCI devices, etc). Windows might not be happy booting on the physical host if it was installed under KVM, and vice versa. This is known as physical-to-virtual (p2v) migration and means some tweaks or driver installs may be necessary to make Windows run after switching. Stefan

2 1

[libvirt] [PATCHv3 00/12] Add support for memory hotplug
by Peter Krempa 23 Mar '15

23 Mar '15

This version includes review feedback changes from John and also fixes the <memory> element documentation and code that calculates it to support possible non-NUMA configs with memory hotplug if any hypervisor would support that in the future. Peter Krempa (12): qemu: monitor: Don't leak @props with non-JSON in qemuMonitorAddObject libxl: Refactor logic in domain post parse callback conf: Add support for parsing and formatting max memory and slot count qemu: Implement setup of memory hotplug parameters conf: Add device address type for dimm devices conf: Add interface to parse and format memory device information qemu: memdev: Add infrastructure to load memory device information qemu: migration: Forbid migration with memory modules lacking info qemu: add support for memory devices qemu: conf: Add support for memory device cold(un)plug qemu: Implement memory device hotplug qemu: Implement memory device hotunplug docs/formatdomain.html.in | 112 +++- docs/schemas/domaincommon.rng | 76 +++ src/bhyve/bhyve_domain.c | 9 +- src/conf/domain_conf.c | 576 ++++++++++++++++++++- src/conf/domain_conf.h | 59 +++ src/libvirt_private.syms | 7 + src/libxl/libxl_domain.c | 15 +- src/lxc/lxc_domain.c | 8 + src/openvz/openvz_driver.c | 14 +- src/parallels/parallels_driver.c | 6 +- src/phyp/phyp_driver.c | 6 +- src/qemu/qemu_command.c | 166 +++++- src/qemu/qemu_command.h | 15 + src/qemu/qemu_domain.c | 80 +++ src/qemu/qemu_domain.h | 5 + src/qemu/qemu_driver.c | 29 ++ src/qemu/qemu_hotplug.c | 187 +++++++ src/qemu/qemu_hotplug.h | 6 + src/qemu/qemu_migration.c | 14 + src/qemu/qemu_monitor.c | 48 +- src/qemu/qemu_monitor.h | 14 + src/qemu/qemu_monitor_json.c | 122 +++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 4 + src/uml/uml_driver.c | 9 +- src/vbox/vbox_common.c | 6 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 6 +- src/xen/xen_driver.c | 7 + src/xenapi/xenapi_driver.c | 9 +- tests/domainschemadata/maxMemory.xml | 19 + .../qemuxml2argv-memory-hotplug-dimm.args | 11 + .../qemuxml2argv-memory-hotplug-dimm.xml | 50 ++ .../qemuxml2argv-memory-hotplug-nonuma.xml | 22 + .../qemuxml2argv-memory-hotplug.args | 6 + .../qemuxml2argv-memory-hotplug.xml | 34 ++ tests/qemuxml2argvtest.c | 6 + tests/qemuxml2xmltest.c | 4 + 38 files changed, 1747 insertions(+), 31 deletions(-) create mode 100644 tests/domainschemadata/maxMemory.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.xml -- 2.2.2

3 22

[libvirt] [PATCH] qemu: Don't return memory device config on error in qemuBuildMemoryBackendStr
by Peter Krempa 23 Mar '15

23 Mar '15

In the last section if the function determines that the config is invalid when QEMU doesn't support the memory device the JSON config object would be returned even if it doesn't make sense. Assign the object to be returned only on success. --- src/qemu/qemu_command.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63d43d4..04e7bcc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4750,9 +4750,6 @@ qemuBuildMemoryBackendStr(unsigned long long size, goto cleanup; } - *backendProps = props; - props = NULL; - if (!hugepage) { bool nodeSpecified = virDomainNumatuneNodeSpecified(def->numa, guestNode); @@ -4767,11 +4764,15 @@ qemuBuildMemoryBackendStr(unsigned long long size, /* report back that using the new backend is not necessary to achieve * the desired configuration */ if (!userNodeset && !nodeSpecified) { + *backendProps = props; + props = NULL; ret = 1; goto cleanup; } } + *backendProps = props; + props = NULL; ret = 0; cleanup: -- 2.2.2

2 2

[libvirt] [PATCH] Fix typo in error message
by Ján Tomko 23 Mar '15

23 Mar '15

by rewriting it completely from: error: unsupported configuration: virtio only support device address type 'PCI' to: error: unsupported configuration: virtio disk cannot have an address of type drive Since we now support CCW addresses as well. --- src/qemu/qemu_command.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63d43d4..a747eb4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2423,8 +2423,9 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, continue; if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio only support device address type 'PCI'")); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("virtio disk cannot have an address of type %s"), + virDomainDeviceAddressTypeToString(def->disks[i]->info.type)); goto error; } -- 2.0.5

3 2

[libvirt] [PATCH] qemu: Set default SCSI controller model for S390 arch
by Boris Fiuczynski 23 Mar '15

23 Mar '15

When no model is specified in the domain definition for a scsi controller and the architectur is s390 than virtio-scsi is set as default model. Signed-off-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Reviewed-by: Daniel Hansel <daniel.hansel(a)linux.vnet.ibm.com> Reviewed-by: Stefan Zimmermann <stzi(a)linux.vnet.ibm.com> --- src/qemu/qemu_domain.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 41d1263..949bf8b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1148,6 +1148,13 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, ARCH_IS_S390(def->os.arch)) dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE; + /* set the default SCSI controller model for S390 arches */ + if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER && + dev->data.controller->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI && + dev->data.controller->model == -1 && + ARCH_IS_S390(def->os.arch)) + dev->data.controller->model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI; + /* auto generate unix socket path */ if (dev->type == VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && -- 2.3.0

3 2

[libvirt] lifecycle: shutdown: should it have timeout when using qemu-agent?
by zhang bo 23 Mar '15

23 Mar '15

The problem we encountered is: 1) use qemu-agent to shutdown a domain. 2) libvirt will block in "qemuAgentShutdown()", if the domain itself got stucked when it powers-off. It's the *guest domain*'s fault that it stucks when shutdown. However, we could not handle the domain in libvirt anymore, except for the jobs such as DESTROY or QUERY. So, here comes the question: What's the normal solution to this problem? shall we: 1) use DESTROY to forcelly poweroff the domain, in openstack or other applications that uses libvirt. or 2) leave it to the administrator users, if they find this problem, let them manually DESTROY the domain. or 3) let SHUTDOWN timeout in libvirt when the guest domain got stucked. Looking forward to your reply, thanks in advance.

2 1

[libvirt] [PATCH v4 0/9] A bunch of extensions to libxl driver
by Marek Marczykowski-Górecki 23 Mar '15

23 Mar '15

This are some additional features to libxl driver. Some of them require change in domain config structures/syntax. Details described with each patch. I've dropped patches already applied in this version. Patches for stubdom support in xenconfig and some more tests will be later. Marek Marczykowski-Górecki (8): libxl: add tablet/mouse input device support xenconfig: add support for multiple USB devices syntax tests: xenconfig: test for multiple USB devices and other HVM options conf: add virDomainHasNet libxl: prevent attaching multiple netdevs with the same MAC libxl: support domain config modification in virDomainRestoreFlags libxl: Stubdom emulator type libxl: pass cmdline to HVM guests tests: add some simple libxl XML->XML tests docs/formatdomain.html.in | 13 ++ docs/schemas/domaincommon.rng | 10 ++ src/conf/domain_conf.c | 35 ++++ src/conf/domain_conf.h | 4 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 60 +++++++ src/libxl/libxl_driver.c | 32 +++- src/xenconfig/xen_common.c | 66 ------- src/xenconfig/xen_xl.c | 127 ++++++++++++++ src/xenconfig/xen_xm.c | 72 ++++++++ tests/Makefile.am | 9 +- tests/domainschematest | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 29 ++++ tests/xlconfigdata/test-fullvirt-multiusb.xml | 48 ++++++ tests/xlconfigtest.c | 1 + tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml | 42 +++++ tests/xlxml2xmldata/xlxml2xml-hvm.xml | 40 +++++ tests/xlxml2xmldata/xlxml2xml-network-bridged.xml | 38 +++++ .../xlxml2xml-network-driver-domain.xml | 39 +++++ tests/xlxml2xmldata/xlxml2xml-network-routed.xml | 39 +++++ tests/xlxml2xmldata/xlxml2xml-pv.xml | 38 +++++ tests/xlxml2xmltest.c | 189 +++++++++++++++++++++ tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 4 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 4 +- 24 files changed, 863 insertions(+), 79 deletions(-) create mode 100755 tests/xlconfigdata/test-fullvirt-multiusb.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-multiusb.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm-stubdom.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-hvm.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-bridged.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-driver-domain.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-network-routed.xml create mode 100644 tests/xlxml2xmldata/xlxml2xml-pv.xml create mode 100644 tests/xlxml2xmltest.c -- 2.1.0

4 26

[libvirt] [PATCH] Fix underlinking of libvirt_driver_interface.so
by Natanael Copa 23 Mar '15

23 Mar '15

Always add udev linker flags when WITH_UDEV is enabled to avoid underlinking. See commit 43dbcb15 (interface: always build all available backends) Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 956d9ce..00b47e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1457,12 +1457,11 @@ libvirt_driver_interface_la_LIBADD = if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) -else ! WITH_NETCF +endif WITH_NETCF if WITH_UDEV libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) endif WITH_UDEV -endif ! WITH_NETCF if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la libvirt_driver_interface_la_LDFLAGS += -module -avoid-version -- 2.3.3

2 1

[libvirt] [PATCH] qemu: skip precreation of network disks
by Michael Chapman 23 Mar '15

23 Mar '15

Commit cf54c60699833b3791a5d0eb3eb5a1948c267f6b introduced the ability to create missing storage volumes during migration. For network disks, however, we may not necessarily be able to detect whether they already exist -- there is no straight-forward way to map the disk to a storage volume, and even if there were it's possible no configured storage pool actually contains the disk. It is better to assume the network disk exists in this case, rather than aborting the migration completely. If the volume really is missing, QEMU will generate an appropriate error later in the migration. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/qemu/qemu_migration.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 83be435..ebe8af5 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1507,9 +1507,13 @@ qemuMigrationPrecreateDisk(virConnectPtr conn, flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; break; + case VIR_STORAGE_TYPE_NETWORK: + VIR_DEBUG("Skipping creation of network disk '%s'", + disk->dst); + return 0; + case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_DIR: - case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NONE: case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.1.0

2 2

[libvirt] [PATCH 0/3] Yet a couple of network cleanups
by Michal Privoznik 23 Mar '15

23 Mar '15

I've noticed these while testing the code. Michal Privoznik (3): networkStateInitialize: Don't lock network driver objecteventtest: Check for virNetwork* return values network_conf: Drop virNetworkObjIsDuplicate src/conf/network_conf.c | 171 ++++++++++++++++++-------------------- src/conf/network_conf.h | 10 +-- src/libvirt_private.syms | 1 - src/network/bridge_driver.c | 20 ++--- src/parallels/parallels_network.c | 4 +- src/test/test_driver.c | 10 ++- tests/objecteventtest.c | 29 ++++--- 7 files changed, 117 insertions(+), 128 deletions(-) -- 2.0.5

2 7

[libvirt] [libvirt-designer][PATCH] Changes for code consistency
by Jayashree Deshpande 23 Mar '15

23 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 194 ++++++++++++++++----------- libvirt-designer/libvirt-designer-domain.h | 41 ++++-- libvirt-designer/libvirt-designer-internal.c | 3 +- libvirt-designer/libvirt-designer-internal.h | 4 +- libvirt-designer/libvirt-designer-main.c | 21 +-- libvirt-designer/libvirt-designer-main.h | 7 +- 6 files changed, 168 insertions(+), 102 deletions(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..adca733 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -66,7 +66,8 @@ gvir_designer_domain_error_quark(void) return g_quark_from_static_string("gvir-designer-domain"); } -static gboolean error_is_set(GError **error) +static gboolean +error_is_set(GError **error) { return ((error != NULL) && (*error != NULL)); } @@ -84,10 +85,11 @@ enum { PROP_OSINFO_DB, }; -static void gvir_designer_domain_get_property(GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +static void +gvir_designer_domain_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { g_return_if_fail(GVIR_DESIGNER_IS_DOMAIN(object)); @@ -121,10 +123,11 @@ static void gvir_designer_domain_get_property(GObject *object, } -static void gvir_designer_domain_set_property(GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +static void +gvir_designer_domain_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { g_return_if_fail(GVIR_DESIGNER_IS_DOMAIN(object)); @@ -161,7 +164,8 @@ static void gvir_designer_domain_set_property(GObject *object, } -static void gvir_designer_domain_finalize(GObject *object) +static void +gvir_designer_domain_finalize(GObject *object) { GVirDesignerDomain *conn = GVIR_DESIGNER_DOMAIN(object); GVirDesignerDomainPrivate *priv = conn->priv; @@ -181,7 +185,8 @@ static void gvir_designer_domain_finalize(GObject *object) } -static void gvir_designer_domain_class_init(GVirDesignerDomainClass *klass) +static void +gvir_designer_domain_class_init(GVirDesignerDomainClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); @@ -319,7 +324,8 @@ end: static GList * -gvir_designer_domain_get_device_by_type(GVirDesignerDomain *design, GType type) +gvir_designer_domain_get_device_by_type(GVirDesignerDomain *design, + GType type) { GList *devices; GList *it; @@ -341,7 +347,8 @@ gvir_designer_domain_get_device_by_type(GVirDesignerDomain *design, GType type) } -static void gvir_designer_domain_add_clock(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_clock(GVirDesignerDomain *design) { GVirConfigDomainClock *clock; GVirConfigDomainTimer *timer; @@ -441,8 +448,9 @@ gvir_designer_domain_supports_spice_channel(GVirDesignerDomain *design) } -static gboolean gvir_designer_domain_add_spice_channel(GVirDesignerDomain *design, - GError **error) +static gboolean +gvir_designer_domain_add_spice_channel(GVirDesignerDomain *design, + GError **error) { GVirConfigDomainChannel *channel; GVirConfigDomainChardevSourceSpiceVmc *vmc; @@ -674,7 +682,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used @@ -717,7 +726,8 @@ gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) * Returns: (transfer full): the pointer to the new smartcard device */ GVirConfigDomainSmartcard * -gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support smartcard, might need * libosinfo improvements @@ -742,7 +752,8 @@ gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, GError **error) } -static void gvir_designer_domain_add_power_management(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_power_management(GVirDesignerDomain *design) { GVirConfigDomainPowerManagement *pm; @@ -754,7 +765,8 @@ static void gvir_designer_domain_add_power_management(GVirDesignerDomain *design g_object_unref(G_OBJECT(pm)); } -static void gvir_designer_domain_set_lifecycle(GVirDesignerDomain *design) +static void +gvir_designer_domain_set_lifecycle(GVirDesignerDomain *design) { gvir_config_domain_set_lifecycle(design->priv->config, GVIR_CONFIG_DOMAIN_LIFECYCLE_ON_POWEROFF, @@ -767,7 +779,8 @@ static void gvir_designer_domain_set_lifecycle(GVirDesignerDomain *design) GVIR_CONFIG_DOMAIN_LIFECYCLE_DESTROY); } -static void gvir_designer_domain_add_console(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_console(GVirDesignerDomain *design) { GVirConfigDomainConsole *console; GVirConfigDomainChardevSourcePty *pty; @@ -784,7 +797,8 @@ static void gvir_designer_domain_add_console(GVirDesignerDomain *design) } -static void gvir_designer_domain_add_input(GVirDesignerDomain *design) +static void +gvir_designer_domain_add_input(GVirDesignerDomain *design) { GVirConfigDomainInput *input; @@ -798,7 +812,8 @@ static void gvir_designer_domain_add_input(GVirDesignerDomain *design) } -static void gvir_designer_domain_init(GVirDesignerDomain *design) +static void +gvir_designer_domain_init(GVirDesignerDomain *design) { GVirDesignerDomainPrivate *priv; g_debug("Init GVirDesignerDomain=%p", design); @@ -809,10 +824,11 @@ static void gvir_designer_domain_init(GVirDesignerDomain *design) } -GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *db, - OsinfoOs *os, - OsinfoPlatform *platform, - GVirConfigCapabilities *caps) +GVirDesignerDomain * +gvir_designer_domain_new(OsinfoDb *db, + OsinfoOs *os, + OsinfoPlatform *platform, + GVirConfigCapabilities *caps) { return GVIR_DESIGNER_DOMAIN(g_object_new(GVIR_DESIGNER_TYPE_DOMAIN, "osinfo-db", db, @@ -832,7 +848,8 @@ GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *db, * * Returns: (transfer none): the operating system */ -OsinfoOs *gvir_designer_domain_get_os(GVirDesignerDomain *design) +OsinfoOs * +gvir_designer_domain_get_os(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -850,7 +867,8 @@ OsinfoOs *gvir_designer_domain_get_os(GVirDesignerDomain *design) * * Returns: (transfer none): the virtualization platform */ -OsinfoPlatform *gvir_designer_domain_get_platform(GVirDesignerDomain *design) +OsinfoPlatform * +gvir_designer_domain_get_platform(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -868,7 +886,8 @@ OsinfoPlatform *gvir_designer_domain_get_platform(GVirDesignerDomain *design) * * Returns: (transfer none): the capabilities */ -GVirConfigCapabilities *gvir_designer_domain_get_capabilities(GVirDesignerDomain *design) +GVirConfigCapabilities * +gvir_designer_domain_get_capabilities(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -887,7 +906,8 @@ GVirConfigCapabilities *gvir_designer_domain_get_capabilities(GVirDesignerDomain * * Returns: (transfer none): the domain config */ -GVirConfigDomain *gvir_designer_domain_get_config(GVirDesignerDomain *design) +GVirConfigDomain * +gvir_designer_domain_get_config(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1015,7 +1035,8 @@ cleanup: } -gboolean gvir_designer_domain_supports_machine(GVirDesignerDomain *design) +gboolean +gvir_designer_domain_supports_machine(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1033,9 +1054,10 @@ gboolean gvir_designer_domain_supports_machine(GVirDesignerDomain *design) } -gboolean gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, - const char *arch, - GVirConfigDomainOsType ostype) +gboolean +gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, + const char *arch, + GVirConfigDomainOsType ostype) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1050,7 +1072,8 @@ gboolean gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, return FALSE; } -gboolean gvir_designer_domain_supports_container(GVirDesignerDomain *design) +gboolean +gvir_designer_domain_supports_container(GVirDesignerDomain *design) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1068,8 +1091,9 @@ gboolean gvir_designer_domain_supports_container(GVirDesignerDomain *design) return FALSE; } -gboolean gvir_designer_domain_supports_container_full(GVirDesignerDomain *design, - const char *arch) +gboolean +gvir_designer_domain_supports_container_full(GVirDesignerDomain *design, + const char *arch) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1174,8 +1198,9 @@ cleanup: } -gboolean gvir_designer_domain_setup_machine(GVirDesignerDomain *design, - GError **error) +gboolean +gvir_designer_domain_setup_machine(GVirDesignerDomain *design, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1203,10 +1228,11 @@ cleanup: } -gboolean gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, - const char *arch, - GVirConfigDomainOsType ostype, - GError **error) +gboolean +gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, + const char *arch, + GVirConfigDomainOsType ostype, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1232,8 +1258,9 @@ cleanup: } -gboolean gvir_designer_domain_setup_container(GVirDesignerDomain *design, - GError **error) +gboolean +gvir_designer_domain_setup_container(GVirDesignerDomain *design, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1262,9 +1289,10 @@ cleanup: } -gboolean gvir_designer_domain_setup_container_full(GVirDesignerDomain *design, - const char *arch, - GError **error) +gboolean +gvir_designer_domain_setup_container_full(GVirDesignerDomain *design, + const char *arch, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); @@ -1682,10 +1710,11 @@ error: * Returns: (transfer full): the pointer to new disk. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_disk_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_disk_file(GVirDesignerDomain *design, + const char *filepath, + const char *format, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1713,9 +1742,10 @@ GVirConfigDomainDisk *gvir_designer_domain_add_disk_file(GVirDesignerDomain *des * Returns: (transfer full): the pointer to the new disk. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *design, - const char *devpath, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_disk_device(GVirDesignerDomain *design, + const char *devpath, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1743,10 +1773,11 @@ GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *d * Returns: (transfer full): the pointer to new cdrom. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *design, + const char *filepath, + const char *format, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1774,9 +1805,10 @@ GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *de * Returns: (transfer full): the pointer to the new cdrom. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_device(GVirDesignerDomain *design, - const char *devpath, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_cdrom_device(GVirDesignerDomain *design, + const char *devpath, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1805,10 +1837,11 @@ GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_device(GVirDesignerDomain * * Returns: (transfer full): the pointer to new floppy. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_floppy_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_floppy_file(GVirDesignerDomain *design, + const char *filepath, + const char *format, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -1836,9 +1869,10 @@ GVirConfigDomainDisk *gvir_designer_domain_add_floppy_file(GVirDesignerDomain *d * Returns: (transfer full): the pointer to the new floppy. * If something fails NULL is returned and @error is set. */ -GVirConfigDomainDisk *gvir_designer_domain_add_floppy_device(GVirDesignerDomain *design, - const char *devpath, - GError **error) +GVirConfigDomainDisk * +gvir_designer_domain_add_floppy_device(GVirDesignerDomain *design, + const char *devpath, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), NULL); @@ -2146,7 +2180,8 @@ end: * Returns: (transfer full): the pointer to the new video device. */ GVirConfigDomainVideo * -gvir_designer_domain_add_video(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_video(GVirDesignerDomain *design, + GError **error) { GVirConfigDomainVideo *video; const gchar *model_str = NULL; @@ -2221,9 +2256,10 @@ gvir_designer_domain_get_resources(OsinfoResourcesList *res_list, * * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. */ -gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, - GVirDesignerDomainResources req, - GError **error) +gboolean +gvir_designer_domain_setup_resources(GVirDesignerDomain *design, + GVirDesignerDomainResources req, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); gboolean ret = FALSE; @@ -2285,9 +2321,10 @@ cleanup: * * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. */ -gboolean gvir_designer_domain_add_driver(GVirDesignerDomain *design, - const char *driver_id, - GError **error) +gboolean +gvir_designer_domain_add_driver(GVirDesignerDomain *design, + const char *driver_id, + GError **error) { OsinfoEntity *driver; OsinfoDeviceDriverList *drivers; @@ -2330,8 +2367,9 @@ end: * Returns: (transfer none): TRUE when successfully set, FALSE otherwise. * @see_also gvir_designer_domain_add_driver() */ -gboolean gvir_designer_domain_remove_all_drivers(GVirDesignerDomain *design, - GError **error) +gboolean +gvir_designer_domain_remove_all_drivers(GVirDesignerDomain *design, + GError **error) { g_return_val_if_fail(GVIR_DESIGNER_IS_DOMAIN(design), FALSE); g_return_val_if_fail(!error_is_set(error), FALSE); diff --git a/libvirt-designer/libvirt-designer-domain.h b/libvirt-designer/libvirt-designer-domain.h index 41aae66..e645f92 100644 --- a/libvirt-designer/libvirt-designer-domain.h +++ b/libvirt-designer/libvirt-designer-domain.h @@ -79,22 +79,27 @@ GVirDesignerDomain *gvir_designer_domain_new(OsinfoDb *osinfo_db, GVirConfigCapabilities *caps); OsinfoOs *gvir_designer_domain_get_os(GVirDesignerDomain *design); + OsinfoPlatform *gvir_designer_domain_get_platform(GVirDesignerDomain *design); + GVirConfigCapabilities *gvir_designer_domain_get_capabilities(GVirDesignerDomain *design); -GVirConfigDomain *gvir_designer_domain_get_config(GVirDesignerDomain *design); +GVirConfigDomain *gvir_designer_domain_get_config(GVirDesignerDomain *design); gboolean gvir_designer_domain_supports_machine(GVirDesignerDomain *design); + gboolean gvir_designer_domain_supports_machine_full(GVirDesignerDomain *design, const char *arch, GVirConfigDomainOsType ostype); + gboolean gvir_designer_domain_supports_container(GVirDesignerDomain *design); + gboolean gvir_designer_domain_supports_container_full(GVirDesignerDomain *design, const char *arch); - gboolean gvir_designer_domain_setup_machine(GVirDesignerDomain *design, GError **error); + gboolean gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, const char *arch, GVirConfigDomainOsType ostype, @@ -102,28 +107,34 @@ gboolean gvir_designer_domain_setup_machine_full(GVirDesignerDomain *design, gboolean gvir_designer_domain_setup_container(GVirDesignerDomain *design, GError **error); + gboolean gvir_designer_domain_setup_container_full(GVirDesignerDomain *design, const char *arch, GError **error); GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_file(GVirDesignerDomain *design, - const char *filepath, - const char *format, - GError **error); + const char *filepath, + const char *format, + GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_cdrom_device(GVirDesignerDomain *design, - const char *devpath, - GError **error); + const char *devpath, + GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_disk_file(GVirDesignerDomain *design, const char *filepath, const char *format, GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_disk_device(GVirDesignerDomain *design, const char *devpath, GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_floppy_file(GVirDesignerDomain *design, const char *filepath, const char *format, GError **error); + GVirConfigDomainDisk *gvir_designer_domain_add_floppy_device(GVirDesignerDomain *design, const char *devpath, GError **error); @@ -131,18 +142,27 @@ GVirConfigDomainDisk *gvir_designer_domain_add_floppy_device(GVirDesignerDomain GVirConfigDomainInterface *gvir_designer_domain_add_interface_bridge(GVirDesignerDomain *design, const char *bridge, GError **error); + GVirConfigDomainInterface *gvir_designer_domain_add_interface_network(GVirDesignerDomain *design, const char *network, GError **error); + GVirConfigDomainInterface *gvir_designer_domain_add_interface_user(GVirDesignerDomain *design, GError **error); GVirConfigDomainGraphics *gvir_designer_domain_add_graphics(GVirDesignerDomain *design, GVirDesignerDomainGraphics type, GError **error); -GVirConfigDomainSmartcard *gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, GError **error); -GVirConfigDomainSound *gvir_designer_domain_add_sound(GVirDesignerDomain *design, GError **error); -GVirConfigDomainRedirdev *gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error); + +GVirConfigDomainSmartcard *gvir_designer_domain_add_smartcard(GVirDesignerDomain *design, + GError **error); + +GVirConfigDomainSound *gvir_designer_domain_add_sound(GVirDesignerDomain *design, + GError **error); + +GVirConfigDomainRedirdev *gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error); + GVirConfigDomainVideo *gvir_designer_domain_add_video(GVirDesignerDomain *design, GError **error); @@ -152,6 +172,7 @@ gboolean gvir_designer_domain_setup_resources(GVirDesignerDomain *design, gboolean gvir_designer_domain_remove_all_drivers(GVirDesignerDomain *design, GError **error); + gboolean gvir_designer_domain_add_driver(GVirDesignerDomain *design, const char *driver_id, GError **error); diff --git a/libvirt-designer/libvirt-designer-internal.c b/libvirt-designer/libvirt-designer-internal.c index bdfa5d1..89e8d1e 100644 --- a/libvirt-designer/libvirt-designer-internal.c +++ b/libvirt-designer/libvirt-designer-internal.c @@ -26,7 +26,8 @@ #include "libvirt-designer/libvirt-designer-internal.h" G_GNUC_INTERNAL int -gvir_designer_genum_get_value(GType enum_type, const char *nick, +gvir_designer_genum_get_value(GType enum_type, + const char *nick, gint default_value) { GEnumClass *enum_class; diff --git a/libvirt-designer/libvirt-designer-internal.h b/libvirt-designer/libvirt-designer-internal.h index fd3db2c..92c27a6 100644 --- a/libvirt-designer/libvirt-designer-internal.h +++ b/libvirt-designer/libvirt-designer-internal.h @@ -24,6 +24,8 @@ #ifndef __LIBVIRT_DESIGNER_INTERNAL_H__ #define __LIBVIRT_DESIGNER_INTERNAL_H__ -int gvir_designer_genum_get_value(GType enum_type, const char *nick, gint default_value); +int gvir_designer_genum_get_value(GType enum_type, + const char *nick, + gint default_value); #endif /* __LIBVIRT_DESIGNER_INTERNAL_H__ */ diff --git a/libvirt-designer/libvirt-designer-main.c b/libvirt-designer/libvirt-designer-main.c index 07de8c1..0ef1bab 100644 --- a/libvirt-designer/libvirt-designer-main.c +++ b/libvirt-designer/libvirt-designer-main.c @@ -37,8 +37,9 @@ * <parameter>argv</parameter> parameter of main(), or %NULL. Any options * understood by GTK+ are stripped before return. */ -void gvir_designer_init(int *argc, - char ***argv) +void +gvir_designer_init(int *argc, + char ***argv) { GError *err = NULL; if (!gvir_designer_init_check(argc, argv, &err)) { @@ -47,10 +48,11 @@ void gvir_designer_init(int *argc, } } -static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, - GLogLevelFlags log_level G_GNUC_UNUSED, - const gchar *message, - gpointer user_data) +static void +gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, + GLogLevelFlags log_level G_GNUC_UNUSED, + const gchar *message, + gpointer user_data) { if (user_data) fprintf(stderr, "%s\n", message); @@ -64,9 +66,10 @@ static void gvir_log_handler(const gchar *log_domain G_GNUC_UNUSED, * understood by GTK+ are stripped before return. * @err: pointer to a #GError to which a message will be posted on error */ -gboolean gvir_designer_init_check(int *argc, - char ***argv, - GError **err) +gboolean +gvir_designer_init_check(int *argc, + char ***argv, + GError **err) { if (!gvir_config_init_check(argc, argv, err)) return FALSE; diff --git a/libvirt-designer/libvirt-designer-main.h b/libvirt-designer/libvirt-designer-main.h index 9341754..3e904bc 100644 --- a/libvirt-designer/libvirt-designer-main.h +++ b/libvirt-designer/libvirt-designer-main.h @@ -32,10 +32,11 @@ G_BEGIN_DECLS void gvir_designer_init(int *argc, - char ***argv); + char ***argv); + gboolean gvir_designer_init_check(int *argc, - char ***argv, - GError **err); + char ***argv, + GError **err); G_END_DECLS -- 1.9.1

2 1

[libvirt] [PATCH] LXC: make sure netns been enabled when trying to enable userns
by Chen Hanxiao 23 Mar '15

23 Mar '15

This patch revert commit: 7dc5dbc879bd0779924b5132a48b731a0bc04a1e Discussed at: http://www.redhat.com/archives/libvir-list/2015-March/msg01023.html Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index cc20b6d..69a8f2f 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -934,8 +934,6 @@ static int lxcContainerMountBasicFS(bool userns_enabled, { size_t i; int rc = -1; - char* mnt_src = NULL; - int mnt_mflags; VIR_DEBUG("Mounting basic filesystems"); @@ -944,22 +942,17 @@ static int lxcContainerMountBasicFS(bool userns_enabled, virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; /* When enable userns but disable netns, kernel will - * forbid us doing a new fresh mount for sysfs. - * So we had to do a bind mount for sysfs instead. + * forbid us doing a new fresh mount for sysfs for security reason. + * So we should not allow this. */ - if (userns_enabled && netns_disabled && - STREQ(mnt->src, "sysfs")) { - if (VIR_STRDUP(mnt_src, "/sys") < 0) - goto cleanup; - mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; - } else { - if (VIR_STRDUP(mnt_src, mnt->src) < 0) - goto cleanup; - mnt_mflags = mnt->mflags; + if (userns_enabled && netns_disabled) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Userns could not be enabled without netns")); + goto cleanup; } VIR_DEBUG("Processing %s -> %s", - mnt_src, mnt->dst); + mnt->src, mnt->dst); if (mnt->skipUnmounted) { char *hostdir; @@ -976,28 +969,24 @@ static int lxcContainerMountBasicFS(bool userns_enabled, if (ret == 0) { VIR_DEBUG("Skipping '%s' which isn't mounted in host", mnt->dst); - VIR_FREE(mnt_src); continue; } } if (mnt->skipUserNS && userns_enabled) { VIR_DEBUG("Skipping due to user ns enablement"); - VIR_FREE(mnt_src); continue; } /* Skip mounts with missing source without shouting: it may be a * missing folder in /proc due to the absence of a kernel feature */ - if (STRPREFIX(mnt_src, "/") && !virFileExists(mnt_src)) { - VIR_DEBUG("Skipping due to missing source: %s", mnt_src); - VIR_FREE(mnt_src); + if (STRPREFIX(mnt->src, "/") && !virFileExists(mnt->src)) { + VIR_DEBUG("Skipping due to missing source: %s", mnt->src); continue; } if (mnt->skipNoNetns && netns_disabled) { VIR_DEBUG("Skipping due to absence of network namespace"); - VIR_FREE(mnt_src); continue; } @@ -1015,35 +1004,33 @@ static int lxcContainerMountBasicFS(bool userns_enabled, * we mount the filesystem in read-write mode initially, and then do a * separate read-only bind mount on top of that. */ - bindOverReadonly = !!(mnt_mflags & MS_RDONLY); + bindOverReadonly = !!(mnt->mflags & MS_RDONLY); VIR_DEBUG("Mount %s on %s type=%s flags=%x", - mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); - if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { + mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY); + if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), - mnt_src, mnt->dst, NULLSTR(mnt->type), - mnt_mflags & ~MS_RDONLY); + mnt->src, mnt->dst, NULLSTR(mnt->type), + mnt->mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && - mount(mnt_src, mnt->dst, NULL, + mount(mnt->src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), - mnt_src, mnt->dst, + mnt->src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } - VIR_FREE(mnt_src); } rc = 0; cleanup: - VIR_FREE(mnt_src); VIR_DEBUG("rc=%d", rc); return rc; } -- 2.1.0

3 2

[libvirt] [PATCH v2] util: don't fail if no PortData is found while getting migrateData
by zhang bo 23 Mar '15

23 Mar '15

--- V1 here: https://www.redhat.com/archives/libvir-list/2015-February/msg00388.html V2: Add "--if-exists" option to ovs-vsctl cmd, making ovs-vsctl not raise error if there's no portData available. Suggested by Martin. We Tested the patch, it works. --- Introduced by f6a2f97e Problem description: After multiple times of migrating a domain, which has an ovs interface with no portData set, with non-shared disk, nbd ports got overflowed. The steps to reproduce the problem: 1 define and start a domain with its network configured as: <interface type='bridge'> <source bridge='br0'/> <virtualport type='openvswitch'> </virtualport> <model type='virtio'/> <driver name='vhost' queues='4'/> </interface> 2 do not set the network's portData. 3 migrate(ToURI2) it with flag 91(1011011), which means: VIR_MIGRATE_LIVE VIR_MIGRATE_PEER2PEER VIR_MIGRATE_PERSIST_DEST VIR_MIGRATE_UNDEFINE_SOURCE VIR_MIGRATE_NON_SHARED_DISK 4 migrate success, but we got an error log in libvirtd.log: error : virCommandWait:2423 : internal error: Child process (ovs-vsctl --timeout=5 get Interface vnet1 external_ids:PortData) unexpected exit status 1: ovs-vsctl: no key "PortData" in Interface record "vnet1" column external_ids 5 migrate it back, migrate it , migrate it back, ....... 6 nbd port got overflowed. The reasons for the problem is : 1 virNetDevOpenvswitchGetMigrateData() takes it as wrong if no portData is available for the ovs interface of a domain. (We think it's not appropriate, as portData is just OPTIONAL) 2 in func qemuMigrationBakeCookie(), it fails in qemuMigrationCookieAddNetwork(), and returns with -1. qemuMigrationCookieAddNBD() is not called thereafter, and mig->nbd is still NULL. 3 However, qemuMigrationRun() just *WARN* if qemuMigrationBakeCookie() fails, migration still successes. cookie is NULL, it's not baked on the src side. 4 On the destination side, it would alloc a port first and then free the nbd port in COOKIE. But the cookie is NULL due to qemuMigrationCookieAddNetwork() failure at src side. thus the nbd port is not freed. In this patch, we add "--if-exists" option to make ovs-vsctl not raise error if there's no portData available. Further more, because portData may be NULL in the cookie at the dest side, check it before setting portData. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- src/util/virnetdevopenvswitch.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index e5c87bb..722d0dd 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -30,9 +30,12 @@ #include "virerror.h" #include "virmacaddr.h" #include "virstring.h" +#include "virlog.h" #define VIR_FROM_THIS VIR_FROM_NONE +VIR_LOG_INIT("util.netdevopenvswitch"); + /** * virNetDevOpenvswitchAddPort: * @brname: the bridge name @@ -206,7 +209,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) virCommandPtr cmd = NULL; int ret = -1; - cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "get", "Interface", + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); virCommandSetOutputBuffer(cmd, migrate); @@ -241,6 +244,12 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) virCommandPtr cmd = NULL; int ret = -1; + if (!migrate) { + VIR_DEBUG("No port data for interface %s", ifname); + return 0; + } + cmd = virCommandNewArgList(OVSVSCTL, "--timeout=5", "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); -- 1.7.12.4

2 2

[libvirt] [PATCH] qemu: check if domain is really active when do setvcpus with --live
by Luyao Huang 23 Mar '15

23 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1204006 Commit e105dc9 fix setting vcpus for offline domain, but forget check if vm is active when pass VIR_DOMAIN_AFFECT_LIVE flags. # virsh setvcpus test3 4 --live error: Failed to create controller cpu for group: No such file or directory add a check if we pass VIR_DOMAIN_AFFECT_LIVE flags. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d9217b..40d2776 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4888,6 +4888,12 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, unsigned int nvcpus, goto cleanup; if (flags & VIR_DOMAIN_AFFECT_LIVE && !(flags & VIR_DOMAIN_VCPU_GUEST)) { + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + if (virCgroupNewEmulator(priv->cgroup, false, &cgroup_temp) < 0) goto endjob; -- 1.8.3.1

3 2

[libvirt] [PATCH] tools: fix the wrong check when use virsh setvcpus --maximum
by Luyao Huang 23 Mar '15

23 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1204033 We will ignore --maximum option when only use setvcpus with this option, like this (this error is another issue): # virsh setvcpus test3 --maximum 10 error: Failed to create controller cpu for group: No such file or directory this is because we do not set it in flags before we check if there is a flags set. Refactor these code and fix the logic. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1d8225c..6ab7b05 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6742,9 +6742,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) flags |= VIR_DOMAIN_AFFECT_LIVE; if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; - /* none of the options were specified */ - if (!current && flags == 0) - flags = -1; + if (maximum) + flags |= VIR_DOMAIN_VCPU_MAXIMUM; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -6754,27 +6753,19 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (flags == -1) { + /* none of the options were specified */ + if (!current && flags == 0) { if (virDomainSetVcpus(dom, count) != 0) goto cleanup; } else { - /* If the --maximum flag was given, we need to ensure only the - --config flag is in effect as well */ - if (maximum) { - vshDebug(ctl, VSH_ERR_DEBUG, "--maximum flag was given\n"); - - flags |= VIR_DOMAIN_VCPU_MAXIMUM; - - /* If neither the --config nor --live flags were given, OR - if just the --live flag was given, we need to error out - warning the user that the --maximum flag can only be used - with the --config flag */ - if (live || !config) { - - /* Warn the user about the invalid flag combination */ - vshError(ctl, _("--maximum must be used with --config only")); - goto cleanup; - } + /* If neither the --config nor --live flags were given, OR + if just the --live flag was given, we need to error out + warning the user that the --maximum flag can only be used + with the --config flag */ + if (maximum && (live || !config)) { + /* Warn the user about the invalid flag combination */ + vshError(ctl, _("--maximum must be used with --config only")); + goto cleanup; } /* Apply the virtual cpu changes */ -- 1.8.3.1

3 2

[libvirt] [libvirt-designer][PATCH 1/2] trivial changes for code consistency
by Jayashree Deshpande 20 Mar '15

20 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..8703884 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -674,7 +674,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used -- 1.9.1

2 2

Re: [libvirt] [Qemu-devel] [PATCH RFC for-2.3 1/1] block: New command line option --no-format-probing
by Eric Blake 20 Mar '15

20 Mar '15

On 03/20/2015 08:19 AM, Markus Armbruster wrote: >> If (a working version of) this makes it in 2.3, libvirt WILL use it in >> the next release. It will take me less than 5 minutes to write up the >> libvirt patch, as long as the new option is advertised via >> query-command-line-options (which means that QMP introspection of the >> new option is a must for v2 :) The real libvirt requirement is that the new option is accessible via _some_ QMP command (doesn't have to be query-command-line-options, but that is the most obvious). > > query-command-line-options covers only options using QemuOpts. Fixing > that defect isn't in the cards for 2.3, which means I'll have to > implement it with QemuOpts. Makes sense, and is certainly easier than figuring out an alternative QMP probing mechanism. > > Ways to do that: > > * Stick it into an existing QemuOpts option. Is there one that fits? > --machine doesn't really fit. Mostly agree; --machine is more for what the guest sees, while this has no impact on the guest ABI. On the other hand, things like -machine accel=[tcg|kvm] aren't necessarily guest visible either, so -machine has tended to be a catch-all for other things. But that doesn't mean it should continue to be one. > > * Create a new QemuOpts option for miscellaneous settings. Would --misc > format-probing=off be too ugly? Got a better name than --misc? The only clients using the new option will be machine generated, so I don't think ugly appearance is a show-stopper. And -misc really does sound like it is the most amenable to adding other random flags in the future, so I can live with that name. Unless anyone else has a better idea, '-misc format-probing=off' has my vote and works for libvirt; it is only a two-line change to my libvirt RFC patch: diff --git i/src/qemu/qemu_capabilities.c w/src/qemu/qemu_capabilities.c index b452a75..f7a46c1 100644 --- i/src/qemu/qemu_capabilities.c +++ w/src/qemu/qemu_capabilities.c @@ -2517,7 +2517,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, { "numa", NULL, QEMU_CAPS_NUMA }, { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX }, - { "no-format-probing", NULL, QEMU_CAPS_NO_FORMAT_PROBING }, + { "misc", "format-probing", QEMU_CAPS_NO_FORMAT_PROBING }, }; static int diff --git i/src/qemu/qemu_command.c w/src/qemu/qemu_command.c index 1085639..08f6560 100644 --- i/src/qemu/qemu_command.c +++ w/src/qemu/qemu_command.c @@ -8674,7 +8674,7 @@ qemuBuildCommandLine(virConnectPtr conn, } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_FORMAT_PROBING) && !cfg->allowDiskFormatProbing) - virCommandAddArg(cmd, "-no-format-probing"); + virCommandAddArgList(cmd, "-misc", "format-probing=off", NULL); /* Serial graphics adapter */ if (def->os.bios.useserial == VIR_TRISTATE_BOOL_YES) { > > Existing miscellaneous non-QemeOpts options could then (in 2.4!) > become sugar for something in this option group, thus become available > with -readconfig. Nice way to plan for future cleanups. I also agree that while this one option about format-probing is reasonable to get into 2.3, that any other sugar cleanups are better deferred until after the freeze. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [RFC PATCH] qemu: enforce no format probing when possible
by Eric Blake 20 Mar '15

20 Mar '15

qemu 2.3 added an option, with this documentation: | Probing is convenient, but probing untrusted raw images is insecure | (CVE-2008-2004). To avoid it, users should always specify raw format | explicitly. This isn't trivial, and even sophisticated users have | gotten it wrong (libvirt CVE-2010-2237, CVE-2010-2238, CVE-2010-2239, | plus more recent variations of the theme that didn't get CVEs because | they were caught before they could hurt users). | | Disabling probing entirely is a (hamfisted) way to ensure you always | specify the format. Use it when libvirt is configured to avoid probing, to ensure we catch libvirt failures on avoiding probing before such bugs can escalate into another CVE. * src/qemu/qemu_capabilities.h (QEMU_CAPS_NO_FORMAT_PROBING): New capability bit. * src/qemu/qemu_capabilities.c (virQEMUCapsCommandLine): Set it. * src/qemu/qemu_command.c (qemuBuildCommandLine): Use it. Signed-off-by: Eric Blake <eblake(a)redhat.com> CC: qemu-devel(a)nongnu.org --- RFC because I need to enhance the libvirt testsuite to prove we set the option, and because the qemu side has not been committed yet (and may therefore change the final spelling for the new option). src/qemu/qemu_capabilities.c | 7 +++++-- src/qemu/qemu_capabilities.h | 3 ++- src/qemu/qemu_command.c | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ccf22f0..b452a75 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1,7 +1,7 @@ /* * qemu_capabilities.c: QEMU capabilities generation * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -279,6 +279,8 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "qxl.vgamem_mb", "qxl-vga.vgamem_mb", "pc-dimm", + + "no-format-probing", /* 185 */ ); @@ -2514,7 +2516,8 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = { { "spice", "disable-agent-file-xfer", QEMU_CAPS_SPICE_FILE_XFER_DISABLE }, { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP }, { "numa", NULL, QEMU_CAPS_NUMA }, - { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX}, + { "drive", "throttling.bps-total-max", QEMU_CAPS_DRIVE_IOTUNE_MAX }, + { "no-format-probing", NULL, QEMU_CAPS_NO_FORMAT_PROBING }, }; static int diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c7b1ac7..2cdcd81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -1,7 +1,7 @@ /* * qemu_capabilities.h: QEMU capabilities generation * - * Copyright (C) 2006-2014 Red Hat, Inc. + * Copyright (C) 2006-2015 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -224,6 +224,7 @@ typedef enum { QEMU_CAPS_QXL_VGAMEM = 182, /* -device qxl.vgamem_mb */ QEMU_CAPS_QXL_VGA_VGAMEM = 183, /* -device qxl-vga.vgamem_mb */ QEMU_CAPS_DEVICE_PC_DIMM = 184, /* pc-dimm device */ + QEMU_CAPS_NO_FORMAT_PROBING = 185, /* -no-format-probing */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 63d43d4..1085639 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8672,6 +8672,9 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, "-nodefconfig"); virCommandAddArg(cmd, "-nodefaults"); } + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_FORMAT_PROBING) && + !cfg->allowDiskFormatProbing) + virCommandAddArg(cmd, "-no-format-probing"); /* Serial graphics adapter */ if (def->os.bios.useserial == VIR_TRISTATE_BOOL_YES) { -- 2.1.0

1 0

[libvirt] [libvirt-designer][PATCH] trivial changes for code consistency
by Jayashree Deshpande 20 Mar '15

20 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..8703884 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -674,7 +674,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used -- 1.9.1

2 1

[libvirt] [PATCH v4] Automaticly create tap device for VIR_DOMAIN_NET_TYPE_ETHERNET
by Vasiliy Tolstov 20 Mar '15

20 Mar '15

If a user specify ehernet device create it via libvirt and run script if it provided. After this commit user does not need to run external script to create tap device or add root to qemu process. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/qemu/qemu_command.c | 135 +++++++++++++++++++++++++++++------------------- src/qemu/qemu_hotplug.c | 13 ++--- src/qemu/qemu_process.c | 6 +++ 3 files changed, 93 insertions(+), 61 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24b2ad9..284a97c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -278,10 +278,41 @@ static int qemuCreateInBridgePortWithHelper(virQEMUDriverConfigPtr cfg, return *tapfd < 0 ? -1 : 0; } +/** + * qemuExecuteEthernetScript: + * @ifname: the interface name + * @script: the script name + * This function executes script for new tap device created by libvirt. + * Returns 0 in case of success or -1 on failure + */ +static int qemuExecuteEthernetScript(const char *ifname, const char *script) +{ + virCommandPtr cmd; + int ret; + + cmd = virCommandNew(script); + virCommandAddArgFormat(cmd, "%s", ifname); + virCommandClearCaps(cmd); +#ifdef CAP_NET_ADMIN + virCommandAllowCap(cmd, CAP_NET_ADMIN); +#endif + virCommandAddEnvPassCommon(cmd); + + if (virCommandRun(cmd, NULL) < 0) { + ret = -1; + } else { + ret = 0; + } + + virCommandFree(cmd); + return ret; +} + /* qemuNetworkIfaceConnect - *only* called if actualType is - * VIR_DOMAIN_NET_TYPE_NETWORK or VIR_DOMAIN_NET_TYPE_BRIDGE (i.e. if - * the connection is made with a tap device connecting to a bridge - * device) + * VIR_DOMAIN_NET_TYPE_NETWORK, VIR_DOMAIN_NET_TYPE_BRIDGE or + * VIR_DOMAIN_NET_TYPE_ETHERNET (i.e. if the connection is + * made with a tap device connecting to a bridge device or + * used ethernet tap device) */ int qemuNetworkIfaceConnect(virDomainDefPtr def, @@ -307,11 +338,6 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, } } - if (!(brname = virDomainNetGetActualBridgeName(net))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); - goto cleanup; - } - if (!net->ifname || STRPREFIX(net->ifname, VIR_NET_GENERATED_PREFIX) || strchr(net->ifname, '%')) { @@ -327,45 +353,61 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, tap_create_flags |= VIR_NETDEV_TAP_CREATE_VNET_HDR; } - if (cfg->privileged) { - if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, - def->uuid, tunpath, tapfd, *tapfdSize, - virDomainNetGetActualVirtPortProfile(net), - virDomainNetGetActualVlan(net), - tap_create_flags) < 0) { + if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { + if (virNetDevTapCreate(&net->ifname, tunpath, tapfd, *tapfdSize, + tap_create_flags) < 0) { virDomainAuditNetDevice(def, net, tunpath, false); goto cleanup; } - if (virDomainNetGetActualBridgeMACTableManager(net) - == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { - /* libvirt is managing the FDB of the bridge this device - * is attaching to, so we need to turn off learning and - * unicast_flood on the device to prevent the kernel from - * adding any FDB entries for it. We will add add an fdb - * entry ourselves (during qemuInterfaceStartDevices(), - * using the MAC address from the interface config. - */ - if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) - goto cleanup; - if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + if (net->script) { + if (qemuExecuteEthernetScript(net->ifname, net->script) < 0) goto cleanup; } } else { - if (qemuCreateInBridgePortWithHelper(cfg, brname, - &net->ifname, - tapfd, tap_create_flags) < 0) { - virDomainAuditNetDevice(def, net, tunpath, false); + if (!(brname = virDomainNetGetActualBridgeName(net))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Missing bridge name")); goto cleanup; } - /* qemuCreateInBridgePortWithHelper can only create a single FD */ - if (*tapfdSize > 1) { - VIR_WARN("Ignoring multiqueue network request"); - *tapfdSize = 1; + + if (cfg->privileged) { + if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, + def->uuid, tunpath, tapfd, *tapfdSize, + virDomainNetGetActualVirtPortProfile(net), + virDomainNetGetActualVlan(net), + tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + if (virDomainNetGetActualBridgeMACTableManager(net) + == VIR_NETWORK_BRIDGE_MAC_TABLE_MANAGER_LIBVIRT) { + /* libvirt is managing the FDB of the bridge this device + * is attaching to, so we need to turn off learning and + * unicast_flood on the device to prevent the kernel from + * adding any FDB entries for it. We will add add an fdb + * entry ourselves (during qemuInterfaceStartDevices(), + * using the MAC address from the interface config. + */ + if (virNetDevBridgePortSetLearning(brname, net->ifname, false) < 0) + goto cleanup; + if (virNetDevBridgePortSetUnicastFlood(brname, net->ifname, false) < 0) + goto cleanup; + } + } else { + if (qemuCreateInBridgePortWithHelper(cfg, brname, + &net->ifname, + tapfd, tap_create_flags) < 0) { + virDomainAuditNetDevice(def, net, tunpath, false); + goto cleanup; + } + /* qemuCreateInBridgePortWithHelper can only create a single FD */ + if (*tapfdSize > 1) { + VIR_WARN("Ignoring multiqueue network request"); + *tapfdSize = 1; + } } + virDomainAuditNetDevice(def, net, tunpath, true); } - virDomainAuditNetDevice(def, net, tunpath, true); - if (cfg->macFilter && ebtablesAddForwardAllowIn(driver->ebtables, net->ifname, @@ -4959,6 +5001,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: + case VIR_DOMAIN_NET_TYPE_ETHERNET: virBufferAsprintf(&buf, "tap%c", type_sep); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ @@ -4976,20 +5019,6 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, is_tap = true; break; - case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAddLit(&buf, "tap"); - if (net->ifname) { - virBufferAsprintf(&buf, "%cifname=%s", type_sep, net->ifname); - type_sep = ','; - } - if (net->script) { - virBufferAsprintf(&buf, "%cscript=%s", type_sep, - net->script); - type_sep = ','; - } - is_tap = true; - break; - case VIR_DOMAIN_NET_TYPE_CLIENT: virBufferAsprintf(&buf, "socket%cconnect=%s:%d", type_sep, @@ -7785,7 +7814,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -7802,7 +7832,8 @@ qemuBuildInterfaceCommandLine(virCommandPtr cmd, } if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = 1; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 08047ce..c34486a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -896,7 +896,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, /* Currently nothing besides TAP devices supports multiqueue. */ if (net->driver.virtio.queues > 0 && !(actualType == VIR_DOMAIN_NET_TYPE_NETWORK || - actualType == VIR_DOMAIN_NET_TYPE_BRIDGE)) { + actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Multiqueue network is not supported for: %s"), virDomainNetTypeToString(actualType)); @@ -904,7 +905,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, } if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE || - actualType == VIR_DOMAIN_NET_TYPE_NETWORK) { + actualType == VIR_DOMAIN_NET_TYPE_NETWORK || + actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { tapfdSize = vhostfdSize = net->driver.virtio.queues; if (!tapfdSize) tapfdSize = vhostfdSize = 1; @@ -935,13 +937,6 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, iface_connected = true; if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) goto cleanup; - } else if (actualType == VIR_DOMAIN_NET_TYPE_ETHERNET) { - vhostfdSize = 1; - if (VIR_ALLOC(vhostfd) < 0) - goto cleanup; - *vhostfd = -1; - if (qemuOpenVhostNet(vm->def, net, priv->qemuCaps, vhostfd, &vhostfdSize) < 0) - goto cleanup; } /* Set device online immediately */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 515402e..468e509 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5288,6 +5288,12 @@ void qemuProcessStop(virQEMUDriverPtr driver, cfg->stateDir)); VIR_FREE(net->ifname); break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (net->ifname) { + ignore_value(virNetDevTapDelete(net->ifname, net->backend.tap)); + VIR_FREE(net->ifname); + } + break; case VIR_DOMAIN_NET_TYPE_BRIDGE: case VIR_DOMAIN_NET_TYPE_NETWORK: #ifdef VIR_NETDEV_TAP_REQUIRE_MANUAL_CLEANUP -- 2.2.2

2 3

[libvirt] [PATCH 0/2] qemu/cgroup: Make live numatune setting usable
by Martin Kletzander 20 Mar '15

20 Mar '15

We didn't set the migrating memory flag to 1 and consequently any changes to numa memory tuning didn't take effect. Let's fix that. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1198497 Martin Kletzander (2): cgroup: Add accessors for cpuset.memory_migrate qemu: Migrate memory on numatune change src/libvirt_private.syms | 2 ++ src/qemu/qemu_cgroup.c | 36 +++++++++++++++++++++++++++++++++++- src/util/vircgroup.c | 42 +++++++++++++++++++++++++++++++++++++++++- src/util/vircgroup.h | 5 ++++- 4 files changed, 82 insertions(+), 3 deletions(-) -- 2.3.1

3 10

[libvirt] [PATCH] PowerPC : Do not allow an empty model spec for 'host-model'
by Prerna Saxena 20 Mar '15

20 Mar '15

[PATCH] PowerPC : Do not allow an empty model spec for 'host-model' On PowerPC, a guest VM having CPU mode as 'host-model' represents a 'compat' mode VM. This cannot have a NULL CPU model. This commit forbids such a guest definition. Signed-off-by: Prerna Saxena <prerna(a)linux.vnet.ibm.com> --- src/cpu/cpu_powerpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index c77374c..62ad92b 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -549,12 +549,12 @@ ppcUpdate(virCPUDefPtr guest, const virCPUDef *host) { switch ((virCPUMode) guest->mode) { - case VIR_CPU_MODE_HOST_MODEL: case VIR_CPU_MODE_HOST_PASSTHROUGH: guest->match = VIR_CPU_MATCH_EXACT; virCPUDefFreeModel(guest); return virCPUDefCopyModel(guest, host, true); + case VIR_CPU_MODE_HOST_MODEL: case VIR_CPU_MODE_CUSTOM: return 0; -- 1.8.3.1 -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 3

[libvirt] [PATCH] LXC: create a bind mount for sysfs when enable userns but disable netns
by Chen Hanxiao 20 Mar '15

20 Mar '15

kernel commit 7dc5dbc879bd0779924b5132a48b731a0bc04a1e forbid us doing a fresh mount for sysfs when enable userns but disable netns. This patch will create a bind mount in this senario. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 4d89677..8a27215 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -815,10 +815,13 @@ static int lxcContainerSetReadOnly(void) } -static int lxcContainerMountBasicFS(bool userns_enabled) +static int lxcContainerMountBasicFS(bool userns_enabled, + bool netns_disabled) { size_t i; int rc = -1; + char* mnt_src = NULL; + int mnt_mflags; VIR_DEBUG("Mounting basic filesystems"); @@ -826,8 +829,25 @@ static int lxcContainerMountBasicFS(bool userns_enabled) bool bindOverReadonly; virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; + /* When enable userns but disable netns, kernel will + * forbid us doing a new fresh mount for sysfs. + * So we had to do a bind mount for sysfs instead. + */ + if (userns_enabled && netns_disabled && + STREQ(mnt->src, "sysfs")) { + if (VIR_STRDUP(mnt_src, "/sys") < 0) { + goto cleanup; + } + mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; + } else { + if (VIR_STRDUP(mnt_src, mnt->src) < 0) { + goto cleanup; + } + mnt_mflags = mnt->mflags; + } + VIR_DEBUG("Processing %s -> %s", - mnt->src, mnt->dst); + mnt_src, mnt->dst); if (mnt->skipUnmounted) { char *hostdir; @@ -856,7 +876,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled) if (virFileMakePath(mnt->dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), - mnt->src); + mnt_src); goto cleanup; } @@ -867,24 +887,24 @@ static int lxcContainerMountBasicFS(bool userns_enabled) * we mount the filesystem in read-write mode initially, and then do a * separate read-only bind mount on top of that. */ - bindOverReadonly = !!(mnt->mflags & MS_RDONLY); + bindOverReadonly = !!(mnt_mflags & MS_RDONLY); VIR_DEBUG("Mount %s on %s type=%s flags=%x", - mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY); - if (mount(mnt->src, mnt->dst, mnt->type, mnt->mflags & ~MS_RDONLY, NULL) < 0) { + mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); + if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), - mnt->src, mnt->dst, NULLSTR(mnt->type), - mnt->mflags & ~MS_RDONLY); + mnt_src, mnt->dst, NULLSTR(mnt->type), + mnt_mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && - mount(mnt->src, mnt->dst, NULL, + mount(mnt_src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), - mnt->src, mnt->dst, + mnt_src, mnt->dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } @@ -893,6 +913,7 @@ static int lxcContainerMountBasicFS(bool userns_enabled) rc = 0; cleanup: + VIR_FREE(mnt_src); VIR_DEBUG("rc=%d", rc); return rc; } @@ -1643,7 +1664,8 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) + if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap, + !vmDef->nnets) < 0) goto cleanup; /* Ensure entire root filesystem (except /.oldroot) is readonly */ -- 1.9.0

7 13

[libvirt] [PATCH][libvirt-ruby] Rakefile: Build on Mac OS-X cleanly
by Michal Privoznik 20 Mar '15

20 Mar '15

https://bugzilla.redhat.com/show_bug.cgi?id=1161338 There's this bug report, which suggests using '-arch x86_64' on Macs. Otherwise one gets unclear error messages when building. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Rakefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Rakefile b/Rakefile index 5ea1f41..e73eaee 100644 --- a/Rakefile +++ b/Rakefile @@ -148,6 +148,10 @@ SPEC = Gem::Specification.new do |s| s.license = "LGPLv2" end +if RUBY_PLATFORM =~ /universal.x86_64-darwin/ + ENV['ARCHFLAGS'] = '-arch x86_64' +end + Gem::PackageTask.new(SPEC) do |pkg| pkg.need_tar = true pkg.need_zip = true -- 2.0.5

2 2

[libvirt] [PATCH] trivial changes for code consistency
by Jayashree Deshpande 20 Mar '15

20 Mar '15

--- libvirt-designer/libvirt-designer-domain.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-designer/libvirt-designer-domain.c b/libvirt-designer/libvirt-designer-domain.c index cefefea..8703884 100644 --- a/libvirt-designer/libvirt-designer-domain.c +++ b/libvirt-designer/libvirt-designer-domain.c @@ -674,7 +674,8 @@ gvir_designer_domain_add_usb_controllers(GVirDesignerDomain *design) * Returns: (transfer full): the pointer to the new USB redir channel */ GVirConfigDomainRedirdev * -gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, GError **error) +gvir_designer_domain_add_usb_redir(GVirDesignerDomain *design, + GError **error) { /* FIXME: check if OS/hypervisor support USB * check if SPICE is being used -- 1.9.1

1 0

[libvirt] [PATCH] qemu_command.c: allow hostdev to be attached to PCIe bus
by Steven Walter 20 Mar '15

20 Mar '15

Presently attaching a host device to the pcie-root controller fails, even if the host device is actually a PCIe device. With this change, the attachment succeeds, QEMU is happy, and the guest correctly sees the host device as a child of the PCIe root. --- src/qemu/qemu_command.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 4d1590c..1de89e3 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1377,6 +1377,13 @@ qemuCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, */ flags = VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE; break; + + case VIR_DOMAIN_DEVICE_HOSTDEV: + /* hostdev aren't hot-plugged, and can be put in either a + * PCI or PCIe slot + */ + flags = VIR_PCI_CONNECT_TYPE_PCI | VIR_PCI_CONNECT_TYPE_PCIE; + break; } /* Ignore implicit controllers on slot 0:0:1.0: -- 2.1.0

2 1