- Devel - libvirt List Archives

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

27 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 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 6

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

27 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 27 Mar '15

27 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 26 Mar '15

26 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 26 Mar '15

26 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 26 Mar '15

26 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 25 Mar '15

25 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 25 Mar '15

25 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 25 Mar '15

25 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 25 Mar '15

25 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 25 Mar '15

25 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 25 Mar '15

25 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 24 Mar '15

24 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