- Devel - libvirt List Archives

[libvirt] [PATCH v2] qemu: return -1 on error paths in qemuDomainSaveImageStartVM
by Nikolay Shirokovskiy 01 Feb '16

01 Feb '16

Error paths after sending the event that domain is started written as if ret = -1 which is set at the beginning of the function. It's common idioma to keep 'ret' equal to -1 until the end of function where it is set to 0. But here we use ret to keep result of restore operation too and thus breaks the idioma and its users :) Let's use different variable to hold restore result. Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/qemu/qemu_driver.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 351e529..ced105b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6732,6 +6732,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, qemuDomainAsyncJob asyncJob) { int ret = -1; + bool restored; virObjectEventPtr event; int intermediatefd = -1; virCommandPtr cmd = NULL; @@ -6758,13 +6759,13 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } /* Set the migration source and start it up. */ - ret = qemuProcessStart(conn, driver, vm, asyncJob, - "stdio", *fd, path, NULL, - VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, - VIR_QEMU_PROCESS_START_PAUSED); + restored = qemuProcessStart(conn, driver, vm, asyncJob, + "stdio", *fd, path, NULL, + VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, + VIR_QEMU_PROCESS_START_PAUSED) >= 0; if (intermediatefd != -1) { - if (ret < 0) { + if (!restored) { /* if there was an error setting up qemu, the intermediate * process will wait forever to write to stdout, so we * must manually kill it. @@ -6775,7 +6776,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, if (virCommandWait(cmd, NULL) < 0) { qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0); - ret = -1; + restored = false; } VIR_DEBUG("Decompression binary stderr: %s", NULLSTR(errbuf)); } @@ -6783,18 +6784,16 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, if (VIR_CLOSE(*fd) < 0) { virReportSystemError(errno, _("cannot close file: %s"), path); - ret = -1; + restored = false; } - if (ret < 0) { - virDomainAuditStart(vm, "restored", false); + virDomainAuditStart(vm, "restored", restored); + if (!restored) goto cleanup; - } event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, VIR_DOMAIN_EVENT_STARTED_RESTORED); - virDomainAuditStart(vm, "restored", true); qemuDomainEventQueue(driver, event); -- 1.8.3.1

3 3

[libvirt] [libvirt-perl][PATCH] Add VIR_STORAGE_VOL_WIPE_ALG_TRIM constant
by Michal Privoznik 01 Feb '16

01 Feb '16

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 1 + Virt.xs | 1 + lib/Sys/Virt/StorageVol.pm | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/Changes b/Changes index cfcc640..cb57a4d 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,7 @@ Revision history for perl module Sys::Virt 1.3.2 2016-02-00 + - Add VIR_STORAGE_VOL_WIPE_ALG_TRIM constant - Add VIR_FROM_XENXL constant - Add VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION event handling callback diff --git a/Virt.xs b/Virt.xs index e47d52e..06111b4 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8187,6 +8187,7 @@ BOOT: REGISTER_CONSTANT(VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7, WIPE_ALG_PFITZNER7); REGISTER_CONSTANT(VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33, WIPE_ALG_PFITZNER33); REGISTER_CONSTANT(VIR_STORAGE_VOL_WIPE_ALG_RANDOM, WIPE_ALG_RANDOM); + REGISTER_CONSTANT(VIR_STORAGE_VOL_WIPE_ALG_TRIM, WIPE_ALG_TRIM); REGISTER_CONSTANT(VIR_STORAGE_VOL_RESIZE_ALLOCATE, RESIZE_ALLOCATE); REGISTER_CONSTANT(VIR_STORAGE_VOL_RESIZE_DELTA, RESIZE_DELTA); diff --git a/lib/Sys/Virt/StorageVol.pm b/lib/Sys/Virt/StorageVol.pm index 84ba4e0..461a9fe 100644 --- a/lib/Sys/Virt/StorageVol.pm +++ b/lib/Sys/Virt/StorageVol.pm @@ -260,6 +260,10 @@ Cryptography" (1996) 1-pass, all zeroes +=item Sys::Virt::StorageVol::WIPE_ALG_TRIM + +1-pass, trim all data on the volume by using TRIM or DISCARD + =back VOLUME RESIZE CONSTANTS -- 2.4.10

2 1

[libvirt] ABI compatibility report
by Ponomarenko Andrey 01 Feb '16

01 Feb '16

Hello, I've started to maintain ABI compatibility report for the library here: http://abi-laboratory.pro/tracker/timeline/libvirt/ Seems that ABI compatibility is excellent from the beginning of time) Thank you.

2 1

[libvirt] [PATCH] includes: Install libvirt-common.h
by Michal Privoznik 01 Feb '16

01 Feb '16

The libvirt-common.h is build time generated file from .in. Obviously, it's generated into builddir and not srcdir. Problem is, the list of header files to install, virinc_HEADERS contains only $(srcdir)/*.h and this misses libvirt-common.h. This problem is pretty obvious when doing a VPATH build. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Steps to reproduce: 1) make distclean 2) mkdir _build _install 3) cd _build 4) ../configure --prefix=$(pwd)/../_install 5) make && make install 6) find ../_install -name libvirt-common.h include/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/include/Makefile.am b/include/Makefile.am index d626963..6b0b41e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -20,6 +20,7 @@ virincdir = $(includedir)/libvirt allheaders = $(wildcard $(srcdir)/libvirt/*.h) virinc_HEADERS = $(filter-out $(srcdir)/libvirt/libvirt-admin.h, $(allheaders)) +virinc_HEADERS += libvirt/libvirt-common.h EXTRA_DIST = libvirt/libvirt-common.h.in -- 2.4.10

2 1

[libvirt] [PATCH v3] qemu: qemuDomainRename and virDomainObjListNumOfDomains ABBA deadlock fix
by Nikolay Shirokovskiy 01 Feb '16

01 Feb '16

A pretty nasty deadlock occurs while trying to rename a VM in parallel with virDomainObjListNumOfDomains. The short description of the problem is as follows: Thread #1: qemuDomainRename: ------> aquires domain lock by qemuDomObjFromDomain ---------> waits for domain list lock in any of the listed functions: - virDomainObjListFindByName - virDomainObjListRenameAddNew - virDomainObjListRenameRemove Thread #2: virDomainObjListNumOfDomains: ------> aquires domain list lock ---------> waits for domain lock in virDomainObjListCount Introduce generic virDomainObjListRename function for renaming domains. It aquires list lock in right order to avoid deadlock. Callback is used to make driver specific domain updates. --- src/conf/virdomainobjlist.c | 98 +++++++++++++++++++----------- src/conf/virdomainobjlist.h | 16 +++-- src/libvirt_private.syms | 3 +- src/qemu/qemu_driver.c | 142 ++++++++++++++++++++------------------------ 4 files changed, 142 insertions(+), 117 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 7568f93..6c0be62 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -313,40 +313,6 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, } -int -virDomainObjListRenameAddNew(virDomainObjListPtr doms, - virDomainObjPtr vm, - const char *name) -{ - int ret = -1; - virObjectLock(doms); - - /* Add new name into the hash table of domain names. */ - if (virHashAddEntry(doms->objsName, name, vm) < 0) - goto cleanup; - - /* Okay, this is crazy. virHashAddEntry() does not increment - * the refcounter of @vm, but virHashRemoveEntry() does - * decrement it. We need to work around it. */ - virObjectRef(vm); - - ret = 0; - cleanup: - virObjectUnlock(doms); - return ret; -} - - -int -virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name) -{ - virObjectLock(doms); - virHashRemoveEntry(doms->objsName, name); - virObjectUnlock(doms); - return 0; -} - - /* * The caller must hold a lock on the driver owning 'doms', * and must also have locked 'dom', to ensure no one else @@ -372,6 +338,70 @@ void virDomainObjListRemove(virDomainObjListPtr doms, } +/* + * The caller must hold a lock on dom. Callbacks should not sleep/wait othewise + * operations on all domains will be blocked as the callback is called with + * domains lock hold. Domain lock is dropped/reaquired during this operation + * thus domain consistency must not rely on this lock solely. + */ + +int +virDomainObjListRename(virDomainObjListPtr doms, + virDomainObjPtr dom, + const char *new_name, + unsigned int flags, + virDomainObjListRenameCallback callback, + void *opaque) +{ + int ret = -1; + char *old_name = NULL; + int rc; + + /* doms and dom locks must be attained in right order thus relock dom. */ + /* dom reference is touched for the benefit of those callers that + * hold a lock on dom but not refcount it. */ + virObjectRef(dom); + virObjectUnlock(dom); + virObjectLock(doms); + virObjectLock(dom); + virObjectUnref(dom); + + if (STREQ(dom->def->name, new_name)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Can't rename domain to itself")); + goto cleanup; + } + + if (virHashLookup(doms->objsName, new_name) != NULL) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain with name '%s' already exists"), + new_name); + goto cleanup; + } + + if (virHashAddEntry(doms->objsName, new_name, dom) < 0) + goto cleanup; + + /* Okay, this is crazy. virHashAddEntry() does not increment + * the refcounter of @dom, but virHashRemoveEntry() does + * decrement it. We need to work around it. */ + virObjectRef(dom); + + if (VIR_STRDUP(old_name, dom->def->name) < 0) + goto cleanup; + + rc = callback(dom, new_name, flags, opaque); + virHashRemoveEntry(doms->objsName, rc < 0 ? new_name : old_name); + if (rc < 0) + goto cleanup; + + ret = 0; + cleanup: + virObjectUnlock(doms); + VIR_FREE(old_name); + return ret; +} + /* The caller must hold lock on 'doms' in addition to 'virDomainObjListRemove' * requirements * diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index f479598..c0f856c 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -51,11 +51,17 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, unsigned int flags, virDomainDefPtr *oldDef); -int virDomainObjListRenameAddNew(virDomainObjListPtr doms, - virDomainObjPtr vm, - const char *name); -int virDomainObjListRenameRemove(virDomainObjListPtr doms, - const char *name); +typedef int (*virDomainObjListRenameCallback)(virDomainObjPtr dom, + const char *new_name, + unsigned int flags, + void *opaque); +int virDomainObjListRename(virDomainObjListPtr doms, + virDomainObjPtr dom, + const char *new_name, + unsigned int flags, + virDomainObjListRenameCallback callback, + void *opaque); + void virDomainObjListRemove(virDomainObjListPtr doms, virDomainObjPtr dom); void virDomainObjListRemoveLocked(virDomainObjListPtr doms, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3d0ec9d..3ef3468 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -893,8 +893,7 @@ virDomainObjListNew; virDomainObjListNumOfDomains; virDomainObjListRemove; virDomainObjListRemoveLocked; -virDomainObjListRenameAddNew; -virDomainObjListRenameRemove; +virDomainObjListRename; # cpu/cpu.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abcdbe6..c0e750d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19976,14 +19976,14 @@ qemuDomainSetUserPassword(virDomainPtr dom, } -static int qemuDomainRename(virDomainPtr dom, - const char *new_name, - unsigned int flags) +static int +qemuDomainRenameCallback(virDomainObjPtr vm, + const char *new_name, + unsigned int flags, + void *opaque) { - virQEMUDriverPtr driver = dom->conn->privateData; + virQEMUDriverPtr driver = opaque; virQEMUDriverConfigPtr cfg = NULL; - virDomainObjPtr vm = NULL; - virDomainObjPtr tmp_dom = NULL; virObjectEventPtr event_new = NULL; virObjectEventPtr event_old = NULL; int ret = -1; @@ -19993,73 +19993,16 @@ static int qemuDomainRename(virDomainPtr dom, virCheckFlags(0, ret); - if (!(vm = qemuDomObjFromDomain(dom))) - goto cleanup; - - if (virDomainRenameEnsureACL(dom->conn, vm->def) < 0) - goto cleanup; - cfg = virQEMUDriverGetConfig(driver); - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - - if (virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot rename active domain")); - goto endjob; - } - - if (!vm->persistent) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot rename a transient domain")); - goto endjob; - } - - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_SHUTOFF) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain has to be shutoff before renaming")); - goto endjob; - } - - if (virDomainSnapshotObjListNum(vm->snapshots, NULL, 0) > 0) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("cannot rename domain with snapshots")); - goto endjob; - } - - if (STREQ(vm->def->name, new_name)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("Can't rename domain to itself")); - goto endjob; - } - - /* - * This is a rather racy check, but still better than reporting - * internal error. And since new_name != name here, there's no - * deadlock imminent. - */ - tmp_dom = virDomainObjListFindByName(driver->domains, new_name); - if (tmp_dom) { - virObjectUnlock(tmp_dom); - virObjectUnref(tmp_dom); - virReportError(VIR_ERR_OPERATION_INVALID, - _("domain with name '%s' already exists"), - new_name); - goto endjob; - } - if (VIR_STRDUP(new_dom_name, new_name) < 0) - goto endjob; + goto cleanup; if (!(old_dom_cfg_file = virDomainConfigFile(cfg->configDir, vm->def->name))) { - goto endjob; + goto cleanup; } - if (virDomainObjListRenameAddNew(driver->domains, vm, new_name) < 0) - goto endjob; - event_old = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_UNDEFINED, VIR_DOMAIN_EVENT_UNDEFINED_RENAMED); @@ -20080,21 +20023,12 @@ static int qemuDomainRename(virDomainPtr dom, goto rollback; } - /* Remove old domain name from table. */ - virDomainObjListRenameRemove(driver->domains, old_dom_name); - event_new = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, VIR_DOMAIN_EVENT_DEFINED_RENAMED); - - /* Success, domain has been renamed. */ ret = 0; - endjob: - qemuDomainObjEndJob(driver, vm); - cleanup: - virDomainObjEndAPI(&vm); VIR_FREE(old_dom_cfg_file); VIR_FREE(old_dom_name); VIR_FREE(new_dom_name); @@ -20109,9 +20043,65 @@ static int qemuDomainRename(virDomainPtr dom, vm->def->name = old_dom_name; old_dom_name = NULL; } + goto cleanup; +} - virDomainObjListRenameRemove(driver->domains, new_name); - goto endjob; +static int qemuDomainRename(virDomainPtr dom, + const char *new_name, + unsigned int flags) +{ + virQEMUDriverPtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, ret); + + if (!(vm = qemuDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainRenameEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot rename active domain")); + goto endjob; + } + + if (!vm->persistent) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("cannot rename a transient domain")); + goto endjob; + } + + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_SHUTOFF) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain has to be shutoff before renaming")); + goto endjob; + } + + if (virDomainSnapshotObjListNum(vm->snapshots, NULL, 0) > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot rename domain with snapshots")); + goto endjob; + } + + if (virDomainObjListRename(driver->domains, vm, new_name, flags, + qemuDomainRenameCallback, driver) < 0) + goto endjob; + + /* Success, domain has been renamed. */ + ret = 0; + + endjob: + qemuDomainObjEndJob(driver, vm); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; } static virHypervisorDriver qemuHypervisorDriver = { -- 1.8.3.1

1 1

[libvirt] [libvirt-php] add flags support to virStorageVolCreateXML
by Vasiliy Tolstov 31 Jan '16

31 Jan '16

Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/libvirt-php.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index f3b3f9f81e6d..a0c960957edc 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -1238,6 +1238,8 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_ALLOCATE", 1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_DELTA", 2, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_RESIZE_SHRINK", 4, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA", VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_STORAGE_VOL_CREATE_REFLINK", VIR_STORAGE_VOL_CREATE_REFLINK, CONST_CS | CONST_PERSISTENT); /* Domain vCPU flags */ REGISTER_LONG_CONSTANT("VIR_DOMAIN_VCPU_CONFIG", VIR_DOMAIN_VCPU_CONFIG, CONST_CS | CONST_PERSISTENT); @@ -7105,6 +7107,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_xml_desc) * Description: Function is used to create the new storage pool and return the handle to new storage pool * Arguments: @res [resource]: libvirt storagepool resource * @xml [string]: XML string to create the storage volume in the storage pool + * @flags [int]: virStorageVolCreateXML flags * Returns: libvirt storagevolume resource */ PHP_FUNCTION(libvirt_storagevolume_create_xml) @@ -7114,11 +7117,12 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml) zval *zpool; virStorageVolPtr volume=NULL; char *xml; + long flags = 0; int xml_len; - GET_STORAGEPOOL_FROM_ARGS("rs",&zpool,&xml,&xml_len); + GET_STORAGEPOOL_FROM_ARGS("rs|l",&zpool,&xml,&xml_len, &flags); - volume=virStorageVolCreateXML(pool->pool,xml,0); + volume=virStorageVolCreateXML(pool->pool, xml, flags); DPRINTF("%s: virStorageVolCreateXML(%p, <xml>, 0) returned %p\n", PHPFUNC, pool->pool, volume); if (volume==NULL) RETURN_FALSE; -- 2.7.0

2 1

[libvirt] [PATCH v2] qemu: qemuDomainRename and virDomainObjListNumOfDomains ABBA deadlock fix
by Nikolay Shirokovskiy 30 Jan '16

30 Jan '16

A pretty nasty deadlock occurs while trying to rename a VM in parallel with virDomainObjListNumOfDomains. The short description of the problem is as follows: Thread #1: qemuDomainRename: ------> aquires domain lock by qemuDomObjFromDomain ---------> waits for domain list lock in any of the listed functions: - virDomainObjListFindByName - virDomainObjListRenameAddNew - virDomainObjListRenameRemove Thread #2: virDomainObjListNumOfDomains: ------> aquires domain list lock ---------> waits for domain lock in virDomainObjListCount Consider another solution for the deadlock besides those proposed by Maxim and Michael. Simply unlock before calling any function that internally grabs domains list lock. First it looks correct. We use qemuDomainObjBeginJob/qemuDomainObjEndJob to wrap the operation so no one will run another operation on that domain in parallel. In THREADS.txt this unlocking/locking is described explicitly for the cases when we need to wait/sleep. Here we use same means just to different purpose. Also called functions do not use domain internals in any way. Second I find approach proposed by Michael difficult to implement correctly. Imagine we write such a generic rename function with callbacks. Then it would look like this: lock domains list ... add new name to list unlock domain list call callback to change driver state lock domain list remove old or new name (depends on callback result) unlock domain list We need to unlock domain list or we block operations on all domains while we wait for job conditions in the callback. But now we are in potential trouble as we leaving list in an inconsistent state. We can't move remove operation before calling callback or we will be in trouble on callback failures - we would need to add the old name back and this is not always possible. Current rename implementation leaves config with new name on disk in worst case on rollback but does not break the list. --- src/qemu/qemu_driver.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abcdbe6..26a8fb0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -19987,6 +19987,7 @@ static int qemuDomainRename(virDomainPtr dom, virObjectEventPtr event_new = NULL; virObjectEventPtr event_old = NULL; int ret = -1; + int rc; char *new_dom_name = NULL; char *old_dom_name = NULL; char *old_dom_cfg_file = NULL; @@ -20036,10 +20037,11 @@ static int qemuDomainRename(virDomainPtr dom, /* * This is a rather racy check, but still better than reporting - * internal error. And since new_name != name here, there's no - * deadlock imminent. + * internal error. */ + virObjectUnlock(vm); tmp_dom = virDomainObjListFindByName(driver->domains, new_name); + virObjectLock(vm); if (tmp_dom) { virObjectUnlock(tmp_dom); virObjectUnref(tmp_dom); @@ -20057,7 +20059,10 @@ static int qemuDomainRename(virDomainPtr dom, goto endjob; } - if (virDomainObjListRenameAddNew(driver->domains, vm, new_name) < 0) + virObjectUnlock(vm); + rc = virDomainObjListRenameAddNew(driver->domains, vm, new_name); + virObjectLock(vm); + if (rc < 0) goto endjob; event_old = virDomainEventLifecycleNewFromObj(vm, @@ -20081,7 +20086,9 @@ static int qemuDomainRename(virDomainPtr dom, } /* Remove old domain name from table. */ + virObjectUnlock(vm); virDomainObjListRenameRemove(driver->domains, old_dom_name); + virObjectLock(vm); event_new = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, @@ -20110,7 +20117,9 @@ static int qemuDomainRename(virDomainPtr dom, old_dom_name = NULL; } + virObjectUnlock(vm); virDomainObjListRenameRemove(driver->domains, new_name); + virObjectLock(vm); goto endjob; } -- 1.8.3.1

1 1

[libvirt] [PATCH v3 0/8] add close callback for drivers with persistent connection
by Nikolay Shirokovskiy 30 Jan '16

30 Jan '16

Currently close callback API can only inform us of closing the connection between remote driver and daemon. But what if a driver running in the daemon itself can have another persistent connection? In this case we want to be informed of that connection changes state too. This patch series extends meaning of current close callback API so that now it notifies of closing of any internal persistent connection. The overall approach is to move close callback support to drivers. Changes from v2: Split patches further to make it more comprehensible. Nikolay Shirokovskiy (8): factor out virConnectCloseCallbackDataPtr methods virConnectCloseCallbackData: fix connection object refcount virConnectCloseCallbackData: factor out callback disarming close callback API: remove unnecessary locks virConnectCloseCallbackDataDispose: remove unnecessary locks close callback: move it to driver daemon: add connection close rpc vz: implement connection close notification daemon/libvirtd.h | 1 + daemon/remote.c | 84 ++++++++++++++++++++++++++++++++ po/POTFILES.in | 1 + src/datatypes.c | 113 +++++++++++++++++++++++++++++++++---------- src/datatypes.h | 11 +++++ src/driver-hypervisor.h | 12 +++++ src/libvirt-host.c | 46 ++---------------- src/remote/remote_driver.c | 106 ++++++++++++++++++++++++++++++++-------- src/remote/remote_protocol.x | 24 ++++++++- src/remote_protocol-structs | 6 +++ src/vz/vz_driver.c | 39 +++++++++++++++ src/vz/vz_sdk.c | 4 ++ src/vz/vz_utils.h | 3 ++ 13 files changed, 363 insertions(+), 87 deletions(-) -- 1.8.3.1

2 9

[libvirt] [PATCH] rbd: Open in Read-Only mode when refreshing a volume
by Wido den Hollander 30 Jan '16

30 Jan '16

By opening a RBD volume in Read-Only we do not register a watcher on the header object inside the Ceph cluster. Refreshing a volume only calls rbd_stat() which is a operation which does not write to a RBD image. This allows us to use a cephx user which has no write permissions if we would want to use the libvirt storage pool for informational purposes only. It also saves us a write into the Ceph cluster which should speed up refreshing a RBD pool. rbd_open_read_only() is available in all librbd versions which also support rbd_open(). Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/storage/storage_backend_rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 8c7a80d..3ab7912 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -283,7 +283,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, int r = 0; rbd_image_t image = NULL; - r = rbd_open(ptr->ioctx, vol->name, &image, NULL); + r = rbd_open_read_only(ptr->ioctx, vol->name, &image, NULL); if (r < 0) { ret = -r; virReportSystemError(-r, _("failed to open the RBD image '%s'"), -- 1.9.1

2 1

[libvirt] [PATCH] Simplify virDomainParseMemory
by Ján Tomko 30 Jan '16

30 Jan '16

Do not store the return value of virDomainParseScaledValue, it was overwritten anyway. Delete the cleanup label, there is nothing to clean up. --- src/conf/domain_conf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1ea74a6..f663969 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7547,28 +7547,22 @@ virDomainParseMemory(const char *xpath, bool required, bool capped) { - int ret = -1; unsigned long long bytes, max; max = virMemoryMaxValue(capped); - ret = virDomainParseScaledValue(xpath, units_xpath, ctxt, - &bytes, 1024, max, required); - if (ret < 0) - goto cleanup; + if (virDomainParseScaledValue(xpath, units_xpath, ctxt, + &bytes, 1024, max, required) < 0) + return -1; /* Yes, we really do use kibibytes for our internal sizing. */ *mem = VIR_DIV_UP(bytes, 1024); if (*mem >= VIR_DIV_UP(max, 1024)) { virReportError(VIR_ERR_OVERFLOW, "%s", _("size value too large")); - ret = -1; - goto cleanup; + return -1; } - - ret = 0; - cleanup: - return ret; + return 0; } -- 2.4.10

2 1

[libvirt] [PATCH 0/4 v2] vz: rework domain creation
by Mikhail Feoktistov 30 Jan '16

30 Jan '16

Patches 1 and 2 make preparation for patch 4 Patch 3 fixes notification subscription To get domain info we should receive and handle notification from hypervisor Patch 4 fixes race condition when adding domain to domains list Race condition: User calls defineXML to create new instance. The main thread from vzDomainDefineXMLFlags() creates new instance by prlsdkCreateVm. Then this thread calls prlsdkAddDomain to add new domain to domains list. The second thread receives notification from hypervisor that new VM was created. It calls prlsdkHandleVmAddedEvent() and also tries to add new domain to domains list. These two threads call virDomainObjListFindByUUID() from prlsdkAddDomain() and don't find new domain. So they add two domains with the same uuid to domains list. Mikhail Feoktistov (4): vz: make output arguments in prlsdkGetDomainIds as optional vz: remove unused struct field vz: fix notification subscription vz: fix race condition when adding domain to domains list src/vz/vz_driver.c | 13 ++- src/vz/vz_sdk.c | 293 +++++++++++++++++++++++++++-------------------------- src/vz/vz_sdk.h | 9 +- src/vz/vz_utils.h | 1 - 4 files changed, 165 insertions(+), 151 deletions(-) -- 1.8.3.1

3 15

[libvirt] [PATCH 00/34] vcpu info storage refactors - part 2
by Peter Krempa 29 Jan '16

29 Jan '16

This is a continuation of the previous patches that change how we store info related to vcpus. In this series the vcpupin and vcpusched info is moved to the vcpu structure which makes for a much simpler storage and handling of the data. This series also fixes numerous bugs in the vcpu code. Peter Krempa (34): qemu: process: refactor and rename qemuValidateCpuMax to qemuValidateCpuCount qemu: process: Disallow VMs with 0 vcpus vz: Fix invalid iteration of def->cputune.vcpupin qemu: don't iterate vcpus using priv->nvcpupids in qemuProcessSetSchedParams (qemu|lxc)DomainGetCPUStats: Clean up cgroup: Clean up virCgroupGetPercpuStats conf: Add helper to retrieve bitmap of active vcpus for a definition virsh: cpu-stats: Extract common printing code into a function virsh: cpu-stats: Remove unneeded flags qemu: Don't use priv->ncpus to iterate cgroup setting cgroup: Prepare for sparse vCPU topologies in virCgroupGetPercpuStats qemu: cpu hotplug: Set vcpu state directly in the new structure qemu: Move and rename qemuProcessDetectVcpuPIDs to qemuDomainDetectVcpuPids qemu: domain: Prepare qemuDomainDetectVcpuPids for reuse qemu: Reuse qemuDomainDetectVcpuPids in cpu hot(un)plug conf: Don't copy def->cpumask into cpu pinning info tests: qemuxml2xml: Order pinning information numerically conf: Split out logic to determine whether cpupin was provided test: Touch up error message when attempting to pin invalid vCPU conf: Store cpu pinning data in def->vcpus conf: remove unused cpu pinning helpers and data structures conf: disallow empty cpusets for vcpu pinning when parsing XML conf: disallow empty cpuset for emulatorpin conf: Extract code that formats <cputune> util: buffer: Sanitize comment for virBufferAddBuffer util: bitmap: Introduce bitmap subtraction conf: Add helper to return a bitmap of active iothread ids conf: Extract code for parsing thread resource scheduler info conf: Don't store vcpusched orthogonally to other vcpu info conf: Fix how iothread scheduler info is stored qemu: vcpu: Aggregate code to set vCPU tuning qemu: vcpu: Reuse qemuProcessSetupVcpu in vcpu hotplug qemu: iothread: Aggregate code to set IOTrhead tuning qemu: iothread: Reuse qemuProcessSetupIOThread in iothread hotplug src/conf/domain_conf.c | 948 +++++++++++---------- src/conf/domain_conf.h | 48 +- src/libvirt_private.syms | 10 +- src/libxl/libxl_domain.c | 20 +- src/libxl/libxl_driver.c | 41 +- src/lxc/lxc_driver.c | 5 +- src/qemu/qemu_cgroup.c | 198 ----- src/qemu/qemu_cgroup.h | 2 - src/qemu/qemu_domain.c | 81 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 417 +++------ src/qemu/qemu_process.c | 479 ++++++----- src/qemu/qemu_process.h | 6 + src/test/test_driver.c | 50 +- src/util/virbitmap.c | 21 + src/util/virbitmap.h | 3 + src/util/virbuffer.c | 3 +- src/util/vircgroup.c | 52 +- src/util/vircgroup.h | 3 +- src/vz/vz_sdk.c | 6 +- .../qemuxml2argv-cputune-iothreads.xml | 2 +- .../qemuxml2xmlout-cputune-iothreads.xml | 2 +- .../qemuxml2xmlout-cputune-iothreadsched.xml | 3 +- tests/vcpupin | 2 +- tests/virbitmaptest.c | 55 ++ tests/vircgrouptest.c | 2 +- tools/virsh-domain.c | 66 +- 27 files changed, 1165 insertions(+), 1362 deletions(-) -- 2.6.2

4 79

[libvirt] [PATCH v4 0/8] Add perf and Intel CMT feature support
by Qiaowei Ren 29 Jan '16

29 Jan '16

Add perf and Intel CMT feature support The series mainly adds Intel CMT feature support into libvirt. CMT is new introduced PQos (Platform Qos) feature to monitor the usage of cache by applications running on the platform. Currently CMT patches has been merged into Linux kernel mainline. The CMT implementation in Linux kernel is based on perf mechanism and there is no support for perf in libvirt, and so this series firstly add perf support into libvirt, including two public API and a set of util interfaces. And based on these APIs and interfaces, thie series implements CMT perf event support. Current state: * 1/8 - perf: add new public APIs for perf event - ACKed by Daniel * 2/8 - perf: implement the remote protocol for perf event - ACKed by Daniel * 3/8 - perf: implement a set of util functions for perf event - ACKed by Daniel * 4/8 - qemu_driver: add support to perf event - restart perf in qemuProcessReconnect and qemuProcessAttach in patch 6/8 * 5/8 - perf: add new xml element - ACKed by Daniel * 6/8 - perf: reenable perf events when libvirtd restart - add qemuDomainPerfRestart() into qemuProcessReconnect() and qemuProcessAttach() * 7/8 - virsh: implement new command to support perf - ACKed by Daniel * 8/8 - virsh: extend domstats command - ACKed by Daniel TODO: 1. add support for new APIs into libvirt-python library. Changes since v1: * change perf APIs implementation to match new style of the API. * add new xml element * reenable all perf events previously enabled when libvirtd daemon restart. * redesign perf util functions. Changes since v2: * add an example XML file to the test suite. * add virPerfReadEvent(). * change 'perf' xml element to new style. * change 'perf' command to new stype. Changes since v3: * move qemuDomainPerfRestart() into qemuProcessReconnect() and qemuProcessAttach(). Qiaowei Ren (8): perf: add new public APIs for perf event perf: implement the remote protocol for perf event perf: implement a set of util functions for perf event qemu_driver: add support to perf event perf: add new xml element perf: reenable perf events when libvirtd restart virsh: implement new command to support perf virsh: extend domstats command daemon/remote.c | 47 ++++ docs/schemas/domaincommon.rng | 27 +++ include/libvirt/libvirt-domain.h | 19 ++ include/libvirt/virterror.h | 2 + src/Makefile.am | 1 + src/conf/domain_conf.c | 111 ++++++++++ src/conf/domain_conf.h | 10 + src/driver-hypervisor.h | 12 + src/libvirt-domain.c | 93 ++++++++ src/libvirt_private.syms | 12 + src/libvirt_public.syms | 6 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 159 +++++++++++++ src/qemu/qemu_process.c | 44 ++++ src/remote/remote_driver.c | 39 ++++ src/remote/remote_protocol.x | 30 ++- src/remote_protocol-structs | 18 ++ src/util/virerror.c | 2 + src/util/virperf.c | 307 ++++++++++++++++++++++++++ src/util/virperf.h | 63 ++++++ tests/domainschemadata/domain-perf-simple.xml | 20 ++ tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 128 +++++++++++ tools/virsh.pod | 27 ++- 24 files changed, 1184 insertions(+), 3 deletions(-) create mode 100644 src/util/virperf.c create mode 100644 src/util/virperf.h create mode 100644 tests/domainschemadata/domain-perf-simple.xml -- 1.9.1

1 8

[libvirt] [PATCH 0/8] Add perf and Intel CMT feature support
by Qiaowei Ren 29 Jan '16

29 Jan '16

The series mainly adds Intel CMT feature support into libvirt. CMT is new introduced PQos (Platform Qos) feature to monitor the usage of cache by applications running on the platform. Currently CMT patches has been merged into Linux kernel mainline. The CMT implementation in Linux kernel is based on perf mechanism and there is no support for perf in libvirt, and so this series firstly add perf support into libvirt, including two public API and a set of util interfaces. And based on these APIs and interfaces, thie series implements CMT perf event support. TODO: 1. add support for new APIs into libvirt-python library. Changes since v1: * change perf APIs implementation to match new style of the API. * add new xml element * reenable all perf events previously enabled when libvirtd daemon restart. * redesign perf util functions. Changes since v2: * add an example XML file to the test suite. * add virPerfReadEvent(). * change 'perf' xml element to new style. * change 'perf' command to new stype. Qiaowei Ren (8): perf: add new public APIs for perf event perf: implement the remote protocol for perf event perf: implement a set of util functions for perf event qemu_driver: add support to perf event perf: add new xml element perf: reenable perf events when libvirtd restart virsh: implement new command to support perf virsh: extend domstats command daemon/remote.c | 47 ++++ docs/schemas/domaincommon.rng | 27 +++ include/libvirt/libvirt-domain.h | 19 ++ include/libvirt/virterror.h | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 111 ++++++++++ src/conf/domain_conf.h | 10 + src/driver-hypervisor.h | 12 + src/libvirt-domain.c | 93 ++++++++ src/libvirt_private.syms | 12 + src/libvirt_public.syms | 6 + src/qemu/qemu_domain.h | 3 + src/qemu/qemu_driver.c | 195 +++++++++++++++++ src/qemu/qemu_process.c | 10 + src/remote/remote_driver.c | 39 ++++ src/remote/remote_protocol.x | 30 ++- src/remote_protocol-structs | 18 ++ src/util/virerror.c | 1 + src/util/virperf.c | 303 ++++++++++++++++++++++++++ src/util/virperf.h | 63 ++++++ tests/domainschemadata/domain-perf-simple.xml | 20 ++ tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 128 +++++++++++ tools/virsh.pod | 27 ++- 24 files changed, 1180 insertions(+), 3 deletions(-) create mode 100644 src/util/virperf.c create mode 100644 src/util/virperf.h create mode 100644 tests/domainschemadata/domain-perf-simple.xml -- 1.9.1

3 18

[libvirt] [PATCH v2 0/8] qemu: Drop QEMU_CAPS_DEVICE part 1
by Cole Robinson 29 Jan '16

29 Jan '16

libvirt only supports qemu 0.12.0+ nowadays, which means that the qemu binary always provides the -device/QEMU_CAPS_DEVICE option. This patch series is a step towards dropping support for that flag. Patch #1 is a test suite improvement, not strictly related Patch #2-5 adjust the test suite for -device always being present Remaining patches drop a bunch of qemu driver code. After this the only real remaining uses are in qemu_command.c which deserve a closer inspection, so that will be a separate series. v2: Rebased onto current master Cole Robinson (8): tests: Run test-wrap-argv with REGENERATE_OUTPUT tests: qemuxml2xml: Always use different output file tests: qemuargv2xml: separate from qemuxml2argv data tests: qemuxml2argv: remove some QEMU_CAPS_DEVICE problem cases tests: qemuxml2argv: Unconditionally enable QEMU_CAPS_DEVICE qemu: process: Drop !QEMU_CAPS_DEVICE code qemu: hotplug: Drop !QEMU_CAPS_DEVICE code qemu: monitor: drop now unused hmp monitor commands src/qemu/qemu_hotplug.c | 480 +++++----------- src/qemu/qemu_monitor.c | 161 ------ src/qemu/qemu_monitor.h | 49 -- src/qemu/qemu_monitor_json.c | 88 --- src/qemu/qemu_monitor_json.h | 33 -- src/qemu/qemu_monitor_text.c | 601 --------------------- src/qemu/qemu_monitor_text.h | 39 -- src/qemu/qemu_process.c | 471 +--------------- tests/Makefile.am | 1 + tests/domainschematest | 2 +- .../qemuargv2xmldata/qemuargv2xml-boot-cdrom.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml | 29 + .../qemuargv2xmldata/qemuargv2xml-boot-floppy.args | 23 + .../qemuargv2xmldata/qemuargv2xml-boot-floppy.xml | 35 ++ .../qemuargv2xml-boot-network.args | 22 + .../qemuargv2xmldata/qemuargv2xml-boot-network.xml | 28 + .../qemuargv2xml-clock-localtime.args | 23 + .../qemuargv2xml-clock-localtime.xml | 28 + .../qemuargv2xml-clock-utc.args} | 5 +- tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml | 28 + .../qemuargv2xml-console-compat.args | 22 + .../qemuargv2xml-console-compat.xml | 34 ++ .../qemuargv2xml-disk-cdrom-empty.args | 23 + .../qemuargv2xml-disk-cdrom-empty.xml | 34 ++ .../qemuargv2xmldata/qemuargv2xml-disk-cdrom.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml | 35 ++ .../qemuargv2xml-disk-drive-boot-cdrom.args | 23 + .../qemuargv2xml-disk-drive-boot-cdrom.xml | 34 ++ .../qemuargv2xml-disk-drive-boot-disk.args | 23 + .../qemuargv2xml-disk-drive-boot-disk.xml | 34 ++ .../qemuargv2xml-disk-drive-cache-directsync.args | 24 + .../qemuargv2xml-disk-drive-cache-directsync.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-unsafe.args | 23 + .../qemuargv2xml-disk-drive-cache-unsafe.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-v2-none.args | 23 + .../qemuargv2xml-disk-drive-cache-v2-none.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-v2-wb.args | 24 + .../qemuargv2xml-disk-drive-cache-v2-wb.xml | 35 ++ .../qemuargv2xml-disk-drive-cache-v2-wt.args | 24 + .../qemuargv2xml-disk-drive-cache-v2-wt.xml | 35 ++ ...uargv2xml-disk-drive-error-policy-enospace.args | 24 + ...muargv2xml-disk-drive-error-policy-enospace.xml | 35 ++ .../qemuargv2xml-disk-drive-error-policy-stop.args | 24 + .../qemuargv2xml-disk-drive-error-policy-stop.xml | 35 ++ ...ml-disk-drive-error-policy-wreport-rignore.args | 24 + ...xml-disk-drive-error-policy-wreport-rignore.xml | 35 ++ .../qemuargv2xml-disk-drive-fmt-qcow.args | 23 + .../qemuargv2xml-disk-drive-fmt-qcow.xml | 35 ++ .../qemuargv2xml-disk-drive-network-gluster.args | 24 + .../qemuargv2xml-disk-drive-network-gluster.xml | 35 ++ ...qemuargv2xml-disk-drive-network-iscsi-auth.args | 25 + .../qemuargv2xml-disk-drive-network-iscsi-auth.xml | 38 ++ .../qemuargv2xml-disk-drive-network-iscsi.args | 25 + .../qemuargv2xml-disk-drive-network-iscsi.xml | 35 ++ ...qemuargv2xml-disk-drive-network-nbd-export.args | 23 + .../qemuargv2xml-disk-drive-network-nbd-export.xml | 35 ++ ...rgv2xml-disk-drive-network-nbd-ipv6-export.args | 23 + ...argv2xml-disk-drive-network-nbd-ipv6-export.xml | 35 ++ .../qemuargv2xml-disk-drive-network-nbd-ipv6.args | 23 + .../qemuargv2xml-disk-drive-network-nbd-ipv6.xml | 35 ++ .../qemuargv2xml-disk-drive-network-nbd-unix.args | 23 + .../qemuargv2xml-disk-drive-network-nbd-unix.xml | 35 ++ .../qemuargv2xml-disk-drive-network-nbd.args | 23 + .../qemuargv2xml-disk-drive-network-nbd.xml | 35 ++ .../qemuargv2xml-disk-drive-network-rbd-auth.args | 26 + .../qemuargv2xml-disk-drive-network-rbd-auth.xml | 40 ++ ...muargv2xml-disk-drive-network-rbd-ceph-env.args | 25 + ...emuargv2xml-disk-drive-network-rbd-ceph-env.xml | 37 ++ .../qemuargv2xml-disk-drive-network-rbd-ipv6.args | 25 + .../qemuargv2xml-disk-drive-network-rbd-ipv6.xml | 38 ++ .../qemuargv2xml-disk-drive-network-rbd.args | 29 + .../qemuargv2xml-disk-drive-network-rbd.xml | 62 +++ .../qemuargv2xml-disk-drive-network-sheepdog.args | 23 + .../qemuargv2xml-disk-drive-network-sheepdog.xml | 35 ++ .../qemuargv2xmldata/qemuargv2xml-disk-floppy.args | 24 + .../qemuargv2xmldata/qemuargv2xml-disk-floppy.xml | 41 ++ tests/qemuargv2xmldata/qemuargv2xml-disk-many.args | 25 + tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml | 46 ++ .../qemuargv2xml-disk-usb.args} | 0 .../qemuargv2xml-disk-usb.xml} | 0 .../qemuargv2xmldata/qemuargv2xml-disk-virtio.args | 25 + .../qemuargv2xmldata/qemuargv2xml-disk-virtio.xml | 45 ++ .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 + .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 45 ++ .../qemuargv2xml-graphics-sdl-fullscreen.args | 25 + .../qemuargv2xml-graphics-sdl-fullscreen.xml | 34 ++ .../qemuargv2xml-graphics-sdl.args | 24 + .../qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml | 34 ++ .../qemuargv2xml-graphics-vnc-policy.args | 23 + .../qemuargv2xml-graphics-vnc-policy.xml | 36 ++ .../qemuargv2xml-graphics-vnc-sasl.args | 24 + .../qemuargv2xml-graphics-vnc-sasl.xml | 36 ++ .../qemuargv2xml-graphics-vnc-socket.args | 23 + .../qemuargv2xml-graphics-vnc-socket.xml | 34 ++ .../qemuargv2xml-graphics-vnc-tls.args | 24 + .../qemuargv2xml-graphics-vnc-tls.xml | 36 ++ .../qemuargv2xml-graphics-vnc-websocket.args | 22 + .../qemuargv2xml-graphics-vnc-websocket.xml | 29 + .../qemuargv2xml-graphics-vnc.args | 23 + .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 36 ++ .../qemuargv2xml-hostdev-pci-address.args | 23 + .../qemuargv2xml-hostdev-pci-address.xml | 33 ++ .../qemuargv2xml-hostdev-usb-address.args | 23 + .../qemuargv2xml-hostdev-usb-address.xml | 33 ++ .../qemuargv2xml-hyperv-panic.args | 21 + .../qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml | 25 + tests/qemuargv2xmldata/qemuargv2xml-hyperv.args | 21 + tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml | 29 + .../qemuargv2xml-input-usbmouse.args | 23 + .../qemuargv2xml-input-usbmouse.xml | 29 + .../qemuargv2xml-input-usbtablet.args | 23 + .../qemuargv2xml-input-usbtablet.xml | 29 + .../qemuargv2xml-kvm-features.args | 21 + .../qemuargv2xmldata/qemuargv2xml-kvm-features.xml | 27 + tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml | 26 + .../qemuargv2xml-machine-aeskeywrap-off-argv.args | 20 + .../qemuargv2xml-machine-aeskeywrap-off-argv.xml | 27 + .../qemuargv2xml-machine-aeskeywrap-on-argv.args | 20 + .../qemuargv2xml-machine-aeskeywrap-on-argv.xml | 27 + .../qemuargv2xml-machine-core-off.args | 22 + .../qemuargv2xml-machine-core-off.xml | 28 + .../qemuargv2xml-machine-core-on.args | 22 + .../qemuargv2xml-machine-core-on.xml | 28 + .../qemuargv2xml-machine-deakeywrap-off-argv.args | 20 + .../qemuargv2xml-machine-deakeywrap-off-argv.xml | 27 + .../qemuargv2xml-machine-deakeywrap-on-argv.args | 20 + .../qemuargv2xml-machine-deakeywrap-on-argv.xml | 27 + .../qemuargv2xml-machine-keywrap-none-argv.args | 20 + .../qemuargv2xml-machine-keywrap-none-argv.xml} | 13 +- tests/qemuargv2xmldata/qemuargv2xml-migrate.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-migrate.xml | 28 + tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args | 21 + tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml | 31 ++ .../qemuargv2xml-misc-disable-s3.args | 23 + .../qemuargv2xml-misc-disable-s3.xml | 31 ++ .../qemuargv2xml-misc-disable-suspends.args | 24 + .../qemuargv2xml-misc-disable-suspends.xml | 32 ++ .../qemuargv2xml-misc-enable-s4.args | 23 + .../qemuargv2xml-misc-enable-s4.xml | 31 ++ .../qemuargv2xml-misc-no-reboot.args | 23 + .../qemuargv2xml-misc-no-reboot.xml | 28 + tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args | 21 + tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml | 31 ++ .../qemuargv2xml-net-eth-ifname.args | 23 + .../qemuargv2xml-net-eth-ifname.xml | 34 ++ tests/qemuargv2xmldata/qemuargv2xml-net-eth.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 33 ++ tests/qemuargv2xmldata/qemuargv2xml-net-user.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-net-user.xml | 32 ++ .../qemuargv2xmldata/qemuargv2xml-net-virtio.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml | 32 ++ .../qemuargv2xml-nographics-vga.args | 23 + .../qemuargv2xml-nographics-vga.xml | 28 + .../qemuargv2xml-nosharepages.args | 22 + .../qemuargv2xmldata/qemuargv2xml-nosharepages.xml | 31 ++ .../qemuargv2xml-parallel-tcp.args | 22 + .../qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml | 33 ++ .../qemuargv2xml-pseries-disk.args | 18 + .../qemuargv2xmldata/qemuargv2xml-pseries-disk.xml | 42 ++ .../qemuargv2xml-pseries-nvram.args | 22 + .../qemuargv2xml-pseries-nvram.xml | 25 + .../qemuargv2xml-qemu-ns-no-env.args | 23 + .../qemuargv2xml-qemu-ns-no-env.xml | 32 ++ .../qemuargv2xml-reboot-timeout-disabled.args | 21 + .../qemuargv2xml-reboot-timeout-disabled.xml | 22 + .../qemuargv2xml-reboot-timeout-enabled.args | 21 + .../qemuargv2xml-reboot-timeout-enabled.xml | 22 + .../qemuargv2xmldata/qemuargv2xml-restore-v2.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml | 28 + .../qemuargv2xmldata/qemuargv2xml-serial-dev.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml | 36 ++ .../qemuargv2xmldata/qemuargv2xml-serial-file.args | 22 + .../qemuargv2xmldata/qemuargv2xml-serial-file.xml | 36 ++ .../qemuargv2xmldata/qemuargv2xml-serial-many.args | 23 + .../qemuargv2xmldata/qemuargv2xml-serial-many.xml | 38 ++ .../qemuargv2xmldata/qemuargv2xml-serial-pty.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml | 34 ++ .../qemuargv2xml-serial-tcp-telnet.args | 22 + .../qemuargv2xml-serial-tcp-telnet.xml | 38 ++ .../qemuargv2xmldata/qemuargv2xml-serial-tcp.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml | 38 ++ .../qemuargv2xmldata/qemuargv2xml-serial-udp.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml | 42 ++ .../qemuargv2xmldata/qemuargv2xml-serial-unix.args | 22 + .../qemuargv2xmldata/qemuargv2xml-serial-unix.xml | 36 ++ tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml | 34 ++ tests/qemuargv2xmldata/qemuargv2xml-smp.args | 22 + tests/qemuargv2xmldata/qemuargv2xml-smp.xml | 31 ++ tests/qemuargv2xmldata/qemuargv2xml-sound.args | 23 + tests/qemuargv2xmldata/qemuargv2xml-sound.xml | 32 ++ tests/qemuargv2xmldata/qemuargv2xml-watchdog.args | 24 + tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml | 29 + tests/qemuargv2xmltest.c | 4 +- .../qemuxml2argv-blkiotune-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-cdrom.args | 7 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.args | 10 +- .../qemuxml2argv-boot-menu-disable.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-boot-multi.args | 8 +- .../qemuxml2argv-boot-network.args | 7 +- .../qemuxml2argv-clock-catchup.args | 8 +- .../qemuxml2argv-clock-france.args | 8 +- .../qemuxml2argv-clock-hpet-off.args | 8 +- ...muxml2argv-clock-localtime-basis-localtime.args | 8 +- .../qemuxml2argv-clock-localtime.args | 7 +- .../qemuxml2argv-clock-timer-hyperv-rtc.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args | 8 +- .../qemuxml2argv-clock-variable.args | 8 +- .../qemuxml2argv-console-compat-auto.args | 7 +- .../qemuxml2argv-console-compat.args | 8 +- .../qemuxml2argv-cpu-Haswell-noTSX.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args | 5 +- .../qemuxml2argv-cpu-Haswell2.args | 5 +- .../qemuxml2argv-cpu-Haswell3.args | 5 +- .../qemuxml2argv-cpu-eoi-disabled.args | 5 +- .../qemuxml2argv-cpu-eoi-enabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact1.args | 5 +- .../qemuxml2argv-cpu-exact2-nofallback.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-exact2.args | 5 +- .../qemuxml2argv-cpu-fallback.args | 5 +- .../qemuxml2argv-cpu-host-kvmclock.args | 5 +- .../qemuxml2argv-cpu-host-model-fallback.args | 5 +- .../qemuxml2argv-cpu-host-model-vendor.args | 5 +- .../qemuxml2argv-cpu-host-model.args | 5 +- ...qemuxml2argv-cpu-host-passthrough-features.args | 8 +- .../qemuxml2argv-cpu-host-passthrough.args | 5 +- .../qemuxml2argv-cpu-kvmclock.args | 5 +- .../qemuxml2argv-cpu-minimum1.args | 5 +- .../qemuxml2argv-cpu-minimum2.args | 5 +- .../qemuxml2argv-cpu-numa-disjoint.args | 5 +- .../qemuxml2argv-cpu-numa-no-memory-element.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-cpu-strict1.args | 5 +- .../qemuxml2argv-cpu-topology1.args | 5 +- .../qemuxml2argv-cpu-topology2.args | 5 +- .../qemuxml2argv-cpu-topology3.args | 5 +- .../qemuxml2argv-cputune-numatune.args | 7 +- .../qemuxml2argv-cputune-numatune.xml | 12 +- .../qemuxml2argv-cputune-zero-shares.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-cputune.args | 8 +- .../qemuxml2argv-default-kvm-host-arch.args | 5 +- .../qemuxml2argv-default-qemu-host-arch.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args | 15 +- .../qemuxml2argv-disk-cdrom-empty.args | 10 +- ...qemuxml2argv-disk-cdrom-tray-no-device-cap.args | 11 +- .../qemuxml2argvdata/qemuxml2argv-disk-cdrom.args | 10 +- .../qemuxml2argv-disk-drive-boot-cdrom.args | 11 +- .../qemuxml2argv-disk-drive-boot-disk.args | 11 +- .../qemuxml2argv-disk-drive-cache-directsync.args | 11 +- .../qemuxml2argv-disk-drive-cache-unsafe.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-none.args | 12 +- .../qemuxml2argv-disk-drive-cache-v2-wb.args | 11 +- .../qemuxml2argv-disk-drive-cache-v2-wt.args | 11 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 8 +- ...uxml2argv-disk-drive-error-policy-enospace.args | 13 +- .../qemuxml2argv-disk-drive-error-policy-stop.args | 13 +- ...gv-disk-drive-error-policy-wreport-rignore.args | 13 +- .../qemuxml2argv-disk-drive-fat.args | 8 +- .../qemuxml2argv-disk-drive-fmt-qcow.args | 11 +- .../qemuxml2argv-disk-drive-network-gluster.args | 13 +- ...qemuxml2argv-disk-drive-network-iscsi-auth.args | 12 +- .../qemuxml2argv-disk-drive-network-iscsi.args | 14 +- ...qemuxml2argv-disk-drive-network-nbd-export.args | 12 +- ...ml2argv-disk-drive-network-nbd-ipv6-export.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-nbd-unix.args | 12 +- .../qemuxml2argv-disk-drive-network-nbd.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-auth.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd-ipv6.args | 11 +- .../qemuxml2argv-disk-drive-network-rbd.args | 26 +- .../qemuxml2argv-disk-drive-network-sheepdog.args | 12 +- ...qemuxml2argv-disk-drive-readonly-no-device.args | 13 +- .../qemuxml2argv-disk-drive-shared.args | 12 +- ...emuxml2argv-disk-floppy-tray-no-device-cap.args | 14 +- .../qemuxml2argvdata/qemuxml2argv-disk-floppy.args | 13 +- .../qemuxml2argv-disk-geometry.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-disk-iscsi.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args | 16 +- .../qemuxml2argv-disk-snapshot.args | 17 +- .../qemuxml2argv-disk-usb-nosupport.xml | 33 ++ .../qemuxml2argvdata/qemuxml2argv-disk-virtio.args | 19 +- .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 13 +- .../qemuxml2argv-eoi-disabled.args | 5 +- .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.args | 5 +- .../qemuxml2argv-fips-enabled.args | 8 +- .../qemuxml2argv-floppy-drive-fat.args | 8 +- .../qemuxml2argv-graphics-sdl-fullscreen.args | 7 +- .../qemuxml2argv-graphics-sdl.args | 7 +- .../qemuxml2argv-graphics-vnc-policy.args | 7 +- .../qemuxml2argv-graphics-vnc-sasl.args | 7 +- .../qemuxml2argv-graphics-vnc-socket.args | 7 +- .../qemuxml2argv-graphics-vnc-tls.args | 7 +- .../qemuxml2argv-graphics-vnc-websocket.args | 4 +- .../qemuxml2argv-graphics-vnc.args | 7 +- .../qemuxml2argv-hostdev-pci-address.args | 9 +- .../qemuxml2argv-hostdev-usb-address.args | 9 +- .../qemuxml2argv-hugepages-pages.args | 8 +- .../qemuxml2argv-hugepages-pages2.args | 8 +- .../qemuxml2argv-hugepages-pages3.args | 8 +- .../qemuxml2argv-hugepages-pages5.args | 8 +- .../qemuxml2argv-hugepages-pages6.args | 8 +- .../qemuxml2argv-hugepages-shared.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-hugepages.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-hyperv-off.args | 5 +- .../qemuxml2argv-hyperv-panic.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.args | 6 +- .../qemuxml2argv-input-usbmouse.args | 9 +- .../qemuxml2argv-input-usbtablet.args | 9 +- .../qemuxml2argv-iothreads-ids-partial.args | 7 +- .../qemuxml2argv-iothreads-ids.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-iothreads.args | 7 +- .../qemuxml2argv-kvm-features-off.args | 5 +- .../qemuxml2argv-kvm-features.args | 6 +- .../qemuxml2argv-kvm-pit-delay.args | 8 +- .../qemuxml2argv-kvm-pit-device.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-kvm.args | 6 +- .../qemuxml2argv-kvmclock+eoi-disabled.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args | 6 +- .../qemuxml2argv-machine-aliases1.args | 8 +- .../qemuxml2argv-machine-aliases2.args | 8 +- .../qemuxml2argv-machine-core-off.args | 7 +- .../qemuxml2argv-machine-core-on.args | 7 +- .../qemuxml2argv-machine-usb-opt.args | 8 +- .../qemuxml2argv-machine-vmport-opt.args | 8 +- .../qemuxml2argv-memory-hotplug.args | 8 +- .../qemuxml2argv-memtune-unlimited.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-memtune.args | 8 +- .../qemuxml2argv-migrate-numa-unaligned.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-migrate.args | 7 +- .../qemuxml2argv-minimal-msg-timestamp.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-minimal.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args | 7 +- .../qemuxml2argv-misc-disable-s3.args | 7 +- .../qemuxml2argv-misc-disable-suspends.args | 7 +- .../qemuxml2argv-misc-enable-s4.args | 7 +- .../qemuxml2argv-misc-no-reboot.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args | 6 +- .../qemuxml2argv-mlock-unsupported.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-net-client.args | 9 +- .../qemuxml2argv-net-eth-ifname.args | 10 +- .../qemuxml2argv-net-eth-names.args | 11 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 10 +- tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 9 +- .../qemuxml2argvdata/qemuxml2argv-net-server.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-udp.args | 9 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-net-virtio.args | 10 +- .../qemuxml2argv-nographics-vga.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-nographics.args | 8 +- .../qemuxml2argv-nosharepages.args | 7 +- ...qemuxml2argv-numad-auto-memory-vcpu-cpuset.args | 8 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 8 +- ...muxml2argv-numad-auto-vcpu-static-numatune.args | 8 +- ...qemuxml2argv-numad-static-memory-auto-vcpu.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-numad.args | 8 +- ...qemuxml2argv-numatune-auto-nodeset-invalid.args | 8 +- .../qemuxml2argv-numatune-auto-prefer.args | 5 +- .../qemuxml2argv-numatune-memnode-no-memory.args | 5 +- .../qemuxml2argv-numatune-memnode.args | 5 +- .../qemuxml2argv-numatune-memory.args | 8 +- .../qemuxml2argv-parallel-tcp.args | 6 +- .../qemuxml2argv-pmu-feature-off.args | 6 +- .../qemuxml2argvdata/qemuxml2argv-pmu-feature.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args | 4 +- .../qemuxml2argv-pseries-nvram.args | 4 +- .../qemuxml2argv-pv-spinlock-disabled.args | 5 +- .../qemuxml2argv-pv-spinlock-enabled.args | 5 +- .../qemuxml2argv-qemu-ns-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-commandline-ns1.args | 8 +- .../qemuxml2argv-qemu-ns-commandline.args | 8 +- ...emuxml2argv-qemu-ns-domain-commandline-ns0.args | 8 +- .../qemuxml2argv-qemu-ns-domain-commandline.args | 8 +- .../qemuxml2argv-qemu-ns-domain-ns0.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args | 8 +- .../qemuxml2argv-reboot-timeout-disabled.args | 6 +- .../qemuxml2argv-reboot-timeout-enabled.args | 6 +- .../qemuxml2argv-restore-v2-fd.args | 10 +- .../qemuxml2argvdata/qemuxml2argv-restore-v2.args | 7 +- .../qemuxml2argv-seclabel-dac-none.args | 8 +- .../qemuxml2argv-seclabel-dynamic-baselabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic-labelskip.args | 8 +- .../qemuxml2argv-seclabel-dynamic-override.args | 11 +- .../qemuxml2argv-seclabel-dynamic-relabel.args | 8 +- .../qemuxml2argv-seclabel-dynamic.args | 8 +- .../qemuxml2argv-seclabel-none.args | 8 +- .../qemuxml2argv-seclabel-static-labelskip.args | 8 +- .../qemuxml2argv-seclabel-static-relabel.args | 8 +- .../qemuxml2argv-seclabel-static.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-dev.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-many.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-pty.args | 8 +- .../qemuxml2argv-serial-spiceport-nospice.args | 8 +- .../qemuxml2argv-serial-tcp-telnet.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-tcp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-udp.args | 8 +- .../qemuxml2argvdata/qemuxml2argv-serial-unix.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smbios.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-smp.args | 7 +- tests/qemuxml2argvdata/qemuxml2argv-sound.args | 12 +- .../qemuxml2argv-video-qxl-nodevice.args | 14 +- .../qemuxml2argv-video-vga-nodevice.args | 12 +- .../qemuxml2argv-watchdog-dump.args | 12 +- .../qemuxml2argv-watchdog-injectnmi.args | 12 +- tests/qemuxml2argvdata/qemuxml2argv-watchdog.args | 9 +- tests/qemuxml2argvtest.c | 571 ++++++++++---------- .../qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml | 49 ++ .../qemuxml2xmlout-aarch64-gic.xml | 32 ++ .../qemuxml2xmlout-aarch64-gicv3.xml | 32 ++ .../qemuxml2xmlout-bios-nvram.xml | 40 ++ .../qemuxml2xmlout-blkdeviotune.xml | 43 ++ .../qemuxml2xmlout-blkiotune-device.xml | 46 ++ .../qemuxml2xmlout-blkiotune.xml | 30 + .../qemuxml2xmlout-boot-cdrom.xml | 29 + .../qemuxml2xmlout-boot-floppy.xml | 35 ++ .../qemuxml2xmlout-boot-menu-disable.xml | 29 + ...emuxml2xmlout-boot-menu-enable-with-timeout.xml | 29 + .../qemuxml2xmlout-boot-multi.xml | 32 ++ .../qemuxml2xmlout-boot-network.xml | 28 + .../qemuxml2xmlout-boot-order.xml | 54 ++ .../qemuxml2xmlout-channel-guestfwd.xml | 31 ++ .../qemuxml2xmlout-channel-virtio.xml | 34 ++ .../qemuxml2xmlout-chardev-label.xml | 45 ++ .../qemuxml2xmlout-clock-catchup.xml | 37 ++ .../qemuxml2xmlout-clock-localtime.xml | 28 + .../qemuxml2xmlout-clock-timer-hyperv-rtc.xml | 26 + .../qemuxml2xmlout-clock-utc.xml | 28 + .../qemuxml2xmlout-console-compat.xml | 34 ++ .../qemuxml2xmlout-console-virtio-many.xml | 43 ++ .../qemuxml2xmlout-cpu-eoi-disabled.xml | 29 + .../qemuxml2xmlout-cpu-eoi-enabled.xml | 29 + .../qemuxml2xmlout-cpu-host-kvmclock.xml | 24 + .../qemuxml2xmlout-cpu-host-model-features.xml | 33 ++ ...emuxml2xmlout-cpu-host-passthrough-features.xml | 37 ++ .../qemuxml2xmlout-cpu-kvmclock.xml | 26 + .../qemuxml2xmlout-cpu-numa-disjoint.xml | 28 + .../qemuxml2xmlout-cpu-numa-memshared.xml | 28 + ...l2xmlout-cputune-iothreadsched-zeropriority.xml | 38 ++ .../qemuxml2xmlout-cputune-numatune.xml | 29 + .../qemuxml2xmlout-cputune-zero-shares.xml | 35 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml | 35 ++ .../qemuxml2xmlout-disk-active-commit.xml | 37 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml | 35 ++ .../qemuxml2xmlout-disk-cdrom.xml | 35 ++ .../qemuxml2xmlout-disk-copy_on_read.xml | 51 ++ .../qemuxml2xmlout-disk-drive-copy-on-read.xml | 28 + .../qemuxml2xmlout-disk-drive-fat.xml | 29 + .../qemuxml2xmlout-disk-drive-fmt-qcow.xml | 35 ++ ...emuxml2xmlout-disk-drive-network-iscsi-auth.xml | 38 ++ .../qemuxml2xmlout-disk-drive-network-iscsi.xml | 35 ++ ...emuxml2xmlout-disk-drive-network-nbd-export.xml | 35 ++ ...l2xmlout-disk-drive-network-nbd-ipv6-export.xml | 35 ++ .../qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml | 35 ++ .../qemuxml2xmlout-disk-drive-network-nbd-unix.xml | 35 ++ .../qemuxml2xmlout-disk-drive-network-nbd.xml | 35 ++ .../qemuxml2xmlout-disk-floppy.xml | 41 ++ .../qemuxml2xmlout-disk-many.xml | 46 ++ .../qemuxml2xmlout-disk-mirror-active.xml | 56 ++ ...xml => qemuxml2xmlout-disk-mirror-inactive.xml} | 0 .../qemuxml2xmlout-disk-scsi-device.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-disk-vpd.xml | 39 ++ ...muxml2xmlout-disk-scsi-lun-passthrough-sgio.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-megasas.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-virtio-scsi.xml | 33 ++ .../qemuxml2xmlout-disk-scsi-vscsi.xml | 33 ++ .../qemuxml2xmlout-disk-source-pool-mode.xml | 47 ++ .../qemuxml2xmlout-disk-usb-device.xml | 31 ++ ...qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml | 29 + .../qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml | 29 + ...qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml | 29 + .../qemuxml2xmlout-disk-virtio-scsi-num_queues.xml | 29 + .../qemuxml2xmlout-disk-virtio.xml | 45 ++ .../qemuxml2xmlout-disk-xenvbd.xml | 45 ++ .../qemuxml2xmlout-encrypted-disk.xml | 30 + .../qemuxml2xmlout-eoi-disabled.xml | 26 + .../qemuxml2xmlout-eoi-enabled.xml | 26 + .../qemuxml2xmlout-event_idx.xml | 51 ++ .../qemuxml2xmlout-floppy-drive-fat.xml | 30 + .../qemuxml2xmlout-graphics-listen-network.xml | 35 ++ .../qemuxml2xmlout-graphics-sdl-fullscreen.xml | 34 ++ .../qemuxml2xmlout-graphics-sdl.xml | 34 ++ .../qemuxml2xmlout-graphics-spice-compression.xml | 43 ++ .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 40 ++ .../qemuxml2xmlout-graphics-spice.xml | 47 ++ .../qemuxml2xmlout-graphics-vnc-sasl.xml | 36 ++ .../qemuxml2xmlout-graphics-vnc-tls.xml | 36 ++ .../qemuxml2xmlout-graphics-vnc-websocket.xml | 29 + .../qemuxml2xmlout-graphics-vnc.xml | 36 ++ .../qemuxml2xmlout-hostdev-pci-address.xml | 33 ++ .../qemuxml2xmlout-hostdev-scsi-large-unit.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml | 46 ++ .../qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml | 40 ++ .../qemuxml2xmlout-hostdev-scsi-lsi.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-rawio.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-readonly.xml | 36 ++ .../qemuxml2xmlout-hostdev-scsi-sgio.xml | 35 ++ .../qemuxml2xmlout-hostdev-scsi-shareable.xml | 36 ++ ...muxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml | 46 ++ .../qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml | 40 ++ .../qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml | 35 ++ .../qemuxml2xmlout-hostdev-usb-address.xml | 33 ++ .../qemuxml2xmlout-hostdev-vfio.xml | 33 ++ .../qemuxml2xmlout-hugepages-pages.xml | 45 ++ .../qemuxml2xmlout-hugepages-pages2.xml | 38 ++ .../qemuxml2xmlout-hugepages-pages3.xml | 38 ++ .../qemuxml2xmlout-hugepages-shared.xml | 45 ++ .../qemuxml2xmlout-hugepages.xml | 30 + .../qemuxml2xmlout-hyperv-off.xml | 29 + .../qemuxml2xmlout-hyperv-panic.xml | 25 + tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml | 29 + .../qemuxml2xmlout-input-usbmouse.xml | 29 + .../qemuxml2xmlout-input-usbtablet.xml | 29 + .../qemuxml2xmlout-interface-driver.xml | 52 ++ .../qemuxml2xmlout-interface-server.xml | 134 +++++ .../qemuxml2xmlout-iothreads-disk-virtio-ccw.xml | 34 ++ .../qemuxml2xmlout-iothreads-disk.xml | 40 ++ .../qemuxml2xmlout-iothreads-ids-partial.xml | 33 ++ .../qemuxml2xmlout-iothreads-ids.xml | 33 ++ .../qemuxml2xmlout-iothreads.xml | 29 + .../qemuxml2xmlout-kvm-features-off.xml | 27 + .../qemuxml2xmlout-kvm-features.xml | 27 + .../qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml | 26 + tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml | 38 ++ .../qemuxml2xmlout-machine-core-off.xml | 28 + .../qemuxml2xmlout-machine-core-on.xml | 28 + .../qemuxml2xmlout-memory-hotplug-dimm.xml | 54 ++ .../qemuxml2xmlout-memory-hotplug-nonuma.xml | 22 + .../qemuxml2xmlout-memory-hotplug.xml | 34 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml | 32 ++ .../qemuxml2xmlout-misc-acpi.xml | 31 ++ .../qemuxml2xmlout-misc-disable-s3.xml | 31 ++ .../qemuxml2xmlout-misc-disable-suspends.xml | 32 ++ .../qemuxml2xmlout-misc-enable-s4.xml | 31 ++ .../qemuxml2xmlout-misc-no-reboot.xml | 28 + .../qemuxml2xmlout-net-bandwidth.xml | 76 +++ .../qemuxml2xmlout-net-bandwidth2.xml | 65 +++ .../qemuxml2xmlout-net-eth-ifname.xml | 34 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 33 ++ .../qemuxml2xmlout-net-hostdev-vfio.xml | 41 ++ .../qemuxml2xmlout-net-hostdev.xml | 40 ++ .../qemuxml2xmlout-net-midonet.xml | 35 ++ .../qemuxml2xmlout-net-openvswitch.xml | 40 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml | 34 ++ .../qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml | 32 ++ .../qemuxml2xmlout-net-vhostuser.xml | 43 ++ .../qemuxml2xmlout-net-virtio-device.xml | 32 ++ .../qemuxml2xmlout-net-virtio-disable-offloads.xml | 35 ++ ...qemuxml2xmlout-net-virtio-network-portgroup.xml | 54 ++ .../qemuxml2xmlout-net-virtio.xml | 32 ++ .../qemuxml2xmlout-nosharepages.xml | 31 ++ ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 30 + .../qemuxml2xmlout-numatune-memnode-no-memory.xml | 30 + .../qemuxml2xmlout-panic-double.xml | 28 + .../qemuxml2xmlout-panic-isa.xml | 31 ++ .../qemuxml2xmlout-panic-no-address.xml | 29 + .../qemuxml2xmlout-panic-pseries.xml | 30 + .../qemuxml2xmlout-parallel-tcp.xml | 33 ++ .../qemuxml2xmlout-pci-bridge.xml | 211 ++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml | 49 ++ .../qemuxml2xmlout-pci-serial-dev-chardev.xml | 37 ++ .../qemuxml2xmlout-pcie-root-port-too-many.xml | 60 ++ .../qemuxml2xmlout-pcie-root-port.xml | 36 ++ .../qemuxml2xmlout-pcie-switch-downstream-port.xml | 44 ++ .../qemuxml2xmlout-pcie-switch-upstream-port.xml | 37 ++ .../qemuxml2xmlout-pcihole64-none.xml | 23 + .../qemuxml2xmlout-pcihole64-q35.xml | 33 ++ .../qemuxml2xmlout-pcihole64.xml | 23 + .../qemuxml2xmlout-pmu-feature-off.xml | 25 + .../qemuxml2xmlout-pseries-nvram.xml | 25 + .../qemuxml2xmlout-pv-spinlock-disabled.xml | 26 + .../qemuxml2xmlout-pv-spinlock-enabled.xml | 26 + .../qemuxml2xmlout-reboot-timeout-disabled.xml | 22 + .../qemuxml2xmlout-reboot-timeout-enabled.xml | 22 + .../qemuxml2xmlout-seclabel-dac-none.xml | 28 + .../qemuxml2xmlout-seclabel-device-multiple.xml | 32 ++ .../qemuxml2xmlout-seclabel-dynamic-baselabel.xml | 30 + .../qemuxml2xmlout-seclabel-dynamic-none.xml | 28 + .../qemuxml2xmlout-seclabel-dynamic-override.xml | 42 ++ .../qemuxml2xmlout-seclabel-static-labelskip.xml | 34 ++ .../qemuxml2xmlout-seclabel-static.xml | 30 + .../qemuxml2xmlout-serial-dev.xml | 36 ++ .../qemuxml2xmlout-serial-file.xml | 36 ++ .../qemuxml2xmlout-serial-many.xml | 38 ++ .../qemuxml2xmlout-serial-pty.xml | 34 ++ .../qemuxml2xmlout-serial-spiceport-nospice.xml | 35 ++ .../qemuxml2xmlout-serial-spiceport.xml | 44 ++ .../qemuxml2xmlout-serial-tcp-telnet.xml | 38 ++ .../qemuxml2xmlout-serial-tcp.xml | 38 ++ .../qemuxml2xmlout-serial-udp.xml | 42 ++ .../qemuxml2xmlout-serial-unix.xml | 36 ++ .../qemuxml2xmlout-serial-vc.xml | 34 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml | 52 ++ .../qemuxml2xmlout-smbios-multiple-type2.xml | 58 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml | 51 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml | 31 ++ .../qemuxml2xmlout-sound-device.xml | 42 ++ tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml | 32 ++ .../qemuxml2xmlout-tap-vhost.xml | 52 ++ .../qemuxml2xmlout-tpm-passthrough.xml | 30 + .../qemuxml2xmlout-usb-redir.xml | 42 ++ .../qemuxml2xmlout-vcpu-placement-static.xml | 37 ++ .../qemuxml2xmlout-vhost_queues.xml | 51 ++ .../qemuxml2xmlout-video-virtio-gpu-device.xml | 31 ++ .../qemuxml2xmlout-video-virtio-gpu-virgl.xml | 33 ++ .../qemuxml2xmlout-virtio-input-passthrough.xml | 24 + .../qemuxml2xmlout-virtio-input.xml | 26 + .../qemuxml2xmlout-virtio-lun.xml | 50 ++ .../qemuxml2xmlout-virtio-rng-egd.xml | 27 + .../qemuxml2xmlout-virtio-rng-random.xml | 25 + tests/qemuxml2xmltest.c | 191 +++---- tests/testutils.c | 38 +- 617 files changed, 13963 insertions(+), 3060 deletions(-) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-cdrom.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-floppy.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-network.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-boot-network.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-clock-localtime.xml rename tests/{qemuxml2argvdata/qemuxml2argv-minimal-s390.args => qemuargv2xmldata/qemuargv2xml-clock-utc.args} (79%) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-clock-utc.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-console-compat.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-console-compat.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom-empty.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-cdrom.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-cdrom.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-boot-disk.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-directsync.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-unsafe.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-none.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wb.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-cache-v2-wt.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-enospace.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-stop.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-error-policy-wreport-rignore.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-fmt-qcow.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-gluster.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-export.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6-export.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-ipv6.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd-unix.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-nbd.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-auth.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ceph-env.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd-ipv6.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-rbd.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-sheepdog.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-floppy.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-many.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-many.xml rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.args => qemuargv2xmldata/qemuargv2xml-disk-usb.args} (100%) rename tests/{qemuxml2argvdata/qemuxml2argv-disk-usb.xml => qemuargv2xmldata/qemuargv2xml-disk-usb.xml} (100%) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-virtio.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl-fullscreen.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-sdl.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-policy.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-socket.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-websocket.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-pci-address.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hostdev-usb-address.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv-panic.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-hyperv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbmouse.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-input-usbtablet.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvm-features.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvm-features.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvmclock.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-kvmclock.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-off.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-core-on.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args rename tests/{qemuxml2argvdata/qemuxml2argv-minimal-s390.xml => qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml} (53%) create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-migrate.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-migrate.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-acpi.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-s3.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-disable-suspends.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-enable-s4.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-no-reboot.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-misc-uuid.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-user.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-user.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-virtio.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-net-virtio.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nographics-vga.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nosharepages.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-nosharepages.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-parallel-tcp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-disk.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-pseries-nvram.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-qemu-ns-no-env.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-disabled.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-reboot-timeout-enabled.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-restore-v2.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-restore-v2.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-dev.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-dev.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-file.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-file.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-many.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-many.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-pty.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-pty.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp-telnet.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-tcp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-udp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-udp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-unix.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-unix.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-vc.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-serial-vc.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-smp.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-smp.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-sound.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-sound.xml create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-watchdog.args create mode 100644 tests/qemuargv2xmldata/qemuargv2xml-watchdog.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-nosupport.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-aavmf-virtio-mmio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gicv3.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-bios-nvram.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkdeviotune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-blkiotune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-cdrom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-floppy.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-disable.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-menu-enable-with-timeout.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-multi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-network.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-boot-order.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-guestfwd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-chardev-label.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-catchup.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-localtime.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-timer-hyperv-rtc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-clock-utc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-eoi-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-kvmclock.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-model-features.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-host-passthrough-features.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-kvmclock.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-disjoint.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cpu-numa-memshared.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-iothreadsched-zeropriority.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune-zero-shares.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-cputune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-active-commit.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-aio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-copy_on_read.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-copy-on-read.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fat.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-fmt-qcow.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-iscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-export.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6-export.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-ipv6.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd-unix.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-nbd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-floppy.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-active.xml rename tests/qemuxml2xmloutdata/{qemuxml2xmlout-disk-mirror.xml => qemuxml2xmlout-disk-mirror-inactive.xml} (100%) create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-disk-vpd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-lun-passthrough-sgio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-megasas.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-virtio-scsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-vscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool-mode.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-usb-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-cmd_per_lun.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-ioeventfd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-max_sectors.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio-scsi-num_queues.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-eoi-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-event_idx.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-floppy-drive-fat.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl-fullscreen.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-sdl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-compression.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-qxl-vga.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-sasl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-tls.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-websocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-pci-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-large-unit.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi-iscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-lsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-rawio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-readonly.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-sgio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-shareable.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi-auth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-iscsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-scsi-virtio-scsi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-usb-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hostdev-vfio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-pages3.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages-shared.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hugepages.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv-panic.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-hyperv.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbmouse.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-input-usbtablet.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-driver.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-interface-server.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk-virtio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-disk.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids-partial.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads-ids.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-iothreads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-kvm-features.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-kvmclock.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-lease.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-machine-core-on.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-dimm.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug-nonuma.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-memory-hotplug.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-minimal.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-acpi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-s3.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-disable-suspends.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-enable-s4.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-misc-no-reboot.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-bandwidth2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev-vfio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-hostdev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-midonet.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-openvswitch.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-udp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-user.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-vhostuser.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-disable-offloads.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio-network-portgroup.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-net-virtio.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-nosharepages.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numatune-memnode-no-memory.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-double.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-isa.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-no-address.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-panic-pseries.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-parallel-tcp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-bridge.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-rom.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pci-serial-dev-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port-too-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root-port.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-downstream-port.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-switch-upstream-port.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64-q35.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pcihole64.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pmu-feature-off.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pseries-nvram.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-pv-spinlock-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-reboot-timeout-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dac-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-device-multiple.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-baselabel.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-none.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-override.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static-labelskip.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-static.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-dev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-file.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-many.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-pty.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport-nospice.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-spiceport.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-telnet.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-udp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-unix.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-vc.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-shmem.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios-multiple-type2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-smbios.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-smp.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-sound-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-sound.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-tap-vhost.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-tpm-passthrough.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-usb-redir.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vcpu-placement-static.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-vhost_queues.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-device.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-video-virtio-gpu-virgl.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input-passthrough.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-input.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-lun.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-egd.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-rng-random.xml -- 2.5.0

3 15

[libvirt] [PATCH 00/17] qemu: Drop QEMU_CAPS_DEVICE part 2
by Cole Robinson 29 Jan '16

29 Jan '16

This is the second series dropping QEMU_CAPS_DEVICE. It handles qemu_command.c and all remaining uses of QEMU_CAPS_DEVICE. Every qemu binary after v0.12.1 has the -device option, but many platforms cannot actually use it, because they are based around hardcoded machine models that cannot be extended. For these machine types, old style options work in _some_ scenarios, basically only situations where we are specifying host side config, where modern machines would use -chardev and -netdev. Those code paths are already preserved for the only scenario that's actually been tested to work (qemu-system-arm -M vexpress and some other arm pieces), so they aren't going anywhere. But all other old style command line options can be dropped AFAICT. See individual patches for descriptions. Cole Robinson (17): qemu: domain: Consistently use goto in PostParse qemu: Validate type != xen at parse time qemu: command: Drop xen disk and vga handling qemu: command: Don't unset QEMU_CAPS_DEVICE for -drive sd qemu: Drop some simple uses of QEMU_CAPS_DEVICE qemu: command: Drop QEMU_CAPS_DEVICE for device aliases qemu: command: drop QEMU_CAPS_DEVICE for PCI address assign qemu: command: drop QEMU_CAPS_DEVICE for controller cli qemu: command: drop QEMU_CAPS_DEVICE for net cli qemu: command: drop QEMU_CAPS_DEVICE for serial/parallel cli qemu: command: drop QEMU_CAPS_DEVICE for watchdog cli qemu: command: drop QEMU_CAPS_DEVICE for video cli qemu: command: Drop QEMU_CAPS_DEVICE for USB qemu: command: Drop old style -soundhw usage qemu: zap QEMU_CAPS_BALLOON qemu: zap QEMU_CAPS_PCIDEVICE qemu: zap QEMU_CAPS_DEVICE src/qemu/qemu_capabilities.c | 20 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 1137 ++++++++------------ src/qemu/qemu_domain.c | 20 +- src/qemu/qemu_hostdev.c | 4 +- .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args | 25 - .../qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml | 45 - tests/qemuargv2xmltest.c | 1 - tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 - tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 - tests/qemuhelptest.c | 45 +- tests/qemuhotplugtest.c | 1 - .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args | 26 - tests/qemuxml2argvtest.c | 34 +- .../qemuxml2xmlout-disk-xenvbd.xml | 45 - tests/qemuxml2xmltest.c | 1 - 24 files changed, 476 insertions(+), 954 deletions(-) delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.args delete mode 100644 tests/qemuargv2xmldata/qemuargv2xml-disk-xenvbd.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.args delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-xenvbd.xml -- 2.5.0

1 24

[libvirt] [PATCH] pci: Use bool return type for some virPCIDeviceGet*() functions
by Andrea Bolognani 29 Jan '16

29 Jan '16

The affected functions are: virPCIDeviceGetManaged() virPCIDeviceGetUnbindFromStub() virPCIDeviceGetRemoveSlot() virPCIDeviceGetReprobe() Change their return type from unsigned int to bool: the corresponding members in struct _virPCIDevice are defined as bool, and even the corresponding virPCIDeviceSet*() functions take a bool value as input so there's no point in these functions having unsigned int as return type. Suggested-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virpci.c | 8 ++++---- src/util/virpci.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 505c1f3..6554351 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1693,7 +1693,7 @@ void virPCIDeviceSetManaged(virPCIDevicePtr dev, bool managed) dev->managed = managed; } -unsigned int +bool virPCIDeviceGetManaged(virPCIDevicePtr dev) { return dev->managed; @@ -1711,7 +1711,7 @@ virPCIDeviceGetStubDriver(virPCIDevicePtr dev) return dev->stubDriver; } -unsigned int +bool virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev) { return dev->unbind_from_stub; @@ -1723,7 +1723,7 @@ virPCIDeviceSetUnbindFromStub(virPCIDevicePtr dev, bool unbind) dev->unbind_from_stub = unbind; } -unsigned int +bool virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev) { return dev->remove_slot; @@ -1735,7 +1735,7 @@ virPCIDeviceSetRemoveSlot(virPCIDevicePtr dev, bool remove_slot) dev->remove_slot = remove_slot; } -unsigned int +bool virPCIDeviceGetReprobe(virPCIDevicePtr dev) { return dev->reprobe; diff --git a/src/util/virpci.h b/src/util/virpci.h index d1ac942..5529b24 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -99,7 +99,7 @@ int virPCIDeviceReset(virPCIDevicePtr dev, void virPCIDeviceSetManaged(virPCIDevice *dev, bool managed); -unsigned int virPCIDeviceGetManaged(virPCIDevice *dev); +bool virPCIDeviceGetManaged(virPCIDevice *dev); void virPCIDeviceSetStubDriver(virPCIDevicePtr dev, virPCIStubDriver driver); virPCIStubDriver virPCIDeviceGetStubDriver(virPCIDevicePtr dev); @@ -110,13 +110,13 @@ int virPCIDeviceSetUsedBy(virPCIDevice *dev, void virPCIDeviceGetUsedBy(virPCIDevice *dev, const char **drv_name, const char **dom_name); -unsigned int virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); +bool virPCIDeviceGetUnbindFromStub(virPCIDevicePtr dev); void virPCIDeviceSetUnbindFromStub(virPCIDevice *dev, bool unbind); -unsigned int virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev); +bool virPCIDeviceGetRemoveSlot(virPCIDevicePtr dev); void virPCIDeviceSetRemoveSlot(virPCIDevice *dev, bool remove_slot); -unsigned int virPCIDeviceGetReprobe(virPCIDevicePtr dev); +bool virPCIDeviceGetReprobe(virPCIDevicePtr dev); void virPCIDeviceSetReprobe(virPCIDevice *dev, bool reprobe); void virPCIDeviceReattachInit(virPCIDevice *dev); -- 2.5.0

2 2

[libvirt] [PATCH 0/4] Some logical pool/volume changes
by John Ferlan 29 Jan '16

29 Jan '16

This series is a result of looking at Joe's comments : http://www.redhat.com/archives/libvir-list/2016-January/msg00403.html To an old series I posted and has been stuck on the bottom of a todo list regarding adding/using "thin" logical volumes: http://www.redhat.com/archives/libvir-list/2014-December/msg00706.html Joe's patch is refactord into two patches to do essentially the same thing, but add a bit more context/thoughts. The first two patches have no functional changes, just some comment changes and some code motion. The result of Joe's patches is that libvirt can find a thin logical volume if the libvirt pool looking at the containing volume group has a thin logical volume pool. Still to be done is the (cap)ability to create a thin logical volume pool and the thin logical volume(s) in the pool. Just figured it'd be easier to post some patches and to let discussion happen. Joe Harvell (2): logical: Remove need for 'segtype' field logical: Adjust regex for devices John Ferlan (2): logical: Fix comment examples for virStorageBackendLogicalFindLVs logical: Create helper virStorageBackendLogicalParseVolDevice src/storage/storage_backend_logical.c | 237 +++++++++++++++++++--------------- 1 file changed, 130 insertions(+), 107 deletions(-) -- 2.5.0

2 15

[libvirt] [PATCH] vz: remove unused struct field
by Mikhail Feoktistov 28 Jan '16

28 Jan '16

In commit 7039bb3c we have removed code that saves uuid to vzDomObj.uuid So this field is no longer needed. --- src/vz/vz_sdk.c | 5 ----- src/vz/vz_utils.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index d610979..5e4c4ac 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -413,7 +413,6 @@ prlsdkDomObjFreePrivate(void *p) PrlHandle_Free(pdom->sdkdom); PrlHandle_Free(pdom->cache.stats); virCondDestroy(&pdom->cache.cond); - VIR_FREE(pdom->uuid); VIR_FREE(pdom->home); VIR_FREE(p); }; @@ -1281,10 +1280,6 @@ prlsdkLoadDomain(vzConnPtr privconn, def->id = -1; - /* we will remove this field in the near future, so let's set it - * to NULL temporarily */ - pdom->uuid = NULL; - pdom->cache.stats = PRL_INVALID_HANDLE; pdom->cache.count = -1; if (virCondInit(&pdom->cache.cond) < 0) { diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index b7a4c81..417f821 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -76,7 +76,6 @@ typedef struct _vzCountersCache vzCountersCache; struct vzDomObj { int id; - char *uuid; char *home; PRL_HANDLE sdkdom; vzCountersCache cache; -- 1.8.3.1

1 1

[libvirt] [PATCH v6 0/7] Global domain cpu.cfs_period_us and cpu.cfs_quota_us setup
by Alexander Burluka 28 Jan '16

28 Jan '16

This patchset implements an ability to specify values for domain top level cpu.cfs_period_us and cpu.cfs_quota_us cgroups. These parameters are opt-in and named "global_period" and "global_quota". Introduction of these settings gives management applications further choice of controlling CPU usage. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Changes in v4: fix little rebase error Changes in v5: rebase to version 1.3.1 Changes in v6: remove unnecessary check Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 ++++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 68 ++++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 102 ++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 10 files changed, 251 insertions(+), 16 deletions(-) -- 1.8.3.1

1 8

[libvirt] [PATCH] gendispatch: Don't output spaces on empty line
by Michal Privoznik 28 Jan '16

28 Jan '16

In our generator for some code we put empty lines in the output to separate some blocks of code. However, in some cases we put couple of spaces on the empty line too. It's not bug, it just isn't nice. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/gendispatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 5cfc512..3740130 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -677,7 +677,7 @@ elsif ($mode eq "server") { push(@prepare_ret_list, "if (VIR_ALLOC($2_p) < 0)\n" . " goto cleanup;\n" . - " \n" . + "\n" . " if (VIR_STRDUP(*$2_p, $2) < 0)\n". " goto cleanup;\n"); -- 2.4.10

2 1

[libvirt] [PATCH] qemu: return -1 on error paths in qemuDomainSaveImageStartVM
by Nikolay Shirokovskiy 28 Jan '16

28 Jan '16

The error paths after fix suppose ret == -1 as at the beginning of the function. The better fix would be not to touch 'ret' at all until the end of the function where it is set to 0. Thus we'd better introduce some 'rc' variable to hold return values of called functions. --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 351e529..dfbf846 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6790,6 +6790,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, virDomainAuditStart(vm, "restored", false); goto cleanup; } + ret = -1; event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, -- 1.8.3.1

2 2

[libvirt] Call for mentors and project ideas for Google Summer of Code 2016
by Stefan Hajnoczi 28 Jan '16

28 Jan '16

The QEMU wiki page for Google Summer of Code 2016 is now available here: http://qemu-project.org/Google_Summer_of_Code_2016 QEMU will apply for Google Summer of Code 2016 (https://g.co/gsoc/) If QEMU is accepted there will be funding for students to work on 12-week full-time open source projects remotely from May to August 2016. QEMU provides a mentor for each student who gives advice and evaluates their progress. If you have a project idea, especially if you are a regular contributor to QEMU and are willing to mentor this summer, please go to this wiki page and fill out the project idea template: http://qemu-project.org/Google_Summer_of_Code_2016 The project ideas list is part of the application so that QEMU can participate in GSoC. It's useful to have your project ideas on the wiki by February 8th 2016. If you have any questions about project ideas or QEMU applying to GSoC, please reply to this thread. Thanks, Stefan

2 4

[libvirt] [PATCH] util: fix build without macvtap
by Roman Bogorodskiy 27 Jan '16

27 Jan '16

Commit 370608b added new functions: - virNetDevMacVLanReleaseName, - virNetDevMacVLanReserveName. Add stubbed versions of them to fix build without macvtap. --- src/util/virnetdevmacvlan.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index da71eef..9293510 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1330,4 +1330,21 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UN _("Cannot create macvlan devices on this platform")); return -1; } + +int +virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED, + bool quietFail ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("The macvlan devices are not supported on this platform")); + return -1; +} + +int +virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("The macvlan devices are not supported on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ -- 2.4.6

3 3

[libvirt] [PATCH] Fix libvirtd free() segfault when migrating guest with deleted open vswitch port
by Jason J. Herne 27 Jan '16

27 Jan '16

libvirtd crashes on free()ing portData for an open vswitch port if that port was deleted. To reproduce: ovs-vsctl del-port vnet0 virsh migrate --live kvm1 qemu+ssh://dstHost/system Error message: libvirtd: *** Error in `/usr/sbin/libvirtd': free(): invalid pointer: 0x000003ff90001e20 *** The problem is that virCommandRun can return an empty string in the event that the port being queried does not exist. When this happens then we are unconditionally overwriting a newline character at position strlen()-1. When strlen is 0, we overwrite memory that does not belong to the string. The fix: Only overwrite the newline if the string is not empty. Reviewed-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> Signed-off-by: Jason J. Herne <jjherne(a)linux.vnet.ibm.com> --- src/util/virnetdevopenvswitch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 6780fb5..0f640d0 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -222,8 +222,10 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) goto cleanup; } - /* Wipeout the newline */ - (*migrate)[strlen(*migrate) - 1] = '\0'; + /* Wipeout the newline, if it exists */ + if (strlen(*migrate) > 0) { + (*migrate)[strlen(*migrate) - 1] = '\0'; + } ret = 0; cleanup: virCommandFree(cmd); -- 1.9.1

4 7

[libvirt] [PATCH] virnetdevmacvlan: Provide stubs for build without macvtap
by Michal Privoznik 27 Jan '16

27 Jan '16

In 370608b4c76f we have introduced two new internal APIs. However, there are no stubs for build without macvtap. Therefore build on systems lacking macvtap support (e.g. mingw or freebds) fails when trying to link. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/util/virnetdevmacvlan.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index da71eef..2409113 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1330,4 +1330,19 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIBUTE_UN _("Cannot create macvlan devices on this platform")); return -1; } + +int virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} + +int virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED, + bool quietFail ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Cannot create macvlan devices on this platform")); + return -1; +} #endif /* ! WITH_MACVTAP */ -- 2.4.10

1 0

[libvirt] high outage times for qemu virtio network links during live migration, trying to debug
by Chris Friesen 27 Jan '16

27 Jan '16

Hi, I'm using libvirt (1.2.12) with qemu (2.2.0) in the context of OpenStack. If I live-migrate a guest with virtio network interfaces, I see a ~1200msec delay in processing the network packets, and several hundred of them get dropped. I get the dropped packets, but I'm not sure why the delay is there. I instrumented qemu and libvirt, and the strange thing is that this delay seems to happen before qemu actually starts doing any migration-related work. (i.e. before qmp_migrate() is called) Looking at my timestamps, the start of the glitch seems to coincide with libvirtd calling qemuDomainMigratePrepareTunnel3Params(), and the end of the glitch occurs when the migration is complete and we're up and running on the destination. My question is, why doesn't qemu continue processing virtio packets while the dirty page scanning and memory transfer over the network is proceeding? Thanks, Chris (Please CC me on responses, I'm not subscribed to the lists.)

3 7

[libvirt] [PATCH] vircgroup: Finish renaming of virCgroupIsolateMount
by Michal Privoznik 27 Jan '16

27 Jan '16

In dc576025c360 we renamed virCgroupIsolateMount function to virCgroupBindMount. However, we forgot about one occurrence in section of the code which provides stubs for platforms without support for CGroups like *BSD for instance. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build-breaker and trivial rules. src/util/vircgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index d7f4065..9b56e27 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4882,9 +4882,9 @@ virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED, int -virCgroupIsolateMount(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *oldroot ATTRIBUTE_UNUSED, - const char *mountopts ATTRIBUTE_UNUSED) +virCgroupBindMount(virCgroupPtr group ATTRIBUTE_UNUSED, + const char *oldroot ATTRIBUTE_UNUSED, + const char *mountopts ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform")); -- 2.4.10

1 0

[libvirt] [PATCH v2 0/4] various test fixes and handling of input devices
by Pavel Hrdina 27 Jan '16

27 Jan '16

Some of the patches from v1 series are already pushed, only those 4 left for review. Pavel Hrdina (4): tests: use virtTestDifferenceFull in tests where we have output file tests: add some missing tests to qemuxml2xmltest device: cleanup input device code tests: update test XML files to follow input changes src/Makefile.am | 4 +- src/conf/domain_conf.c | 82 +++------------------- src/libxl/libxl_domain.c | 5 ++ src/qemu/qemu_domain.c | 23 ++++++ src/xen/xen_driver.c | 5 ++ src/xenapi/xenapi_driver.c | 5 ++ src/xenconfig/xen_common.c | 22 ++++++ src/xenconfig/xen_common.h | 2 + .../disk_snapshot_redefine.xml | 2 + .../external_vm_redefine.xml | 2 + tests/domainsnapshotxml2xmlout/full_domain.xml | 2 + tests/domainsnapshotxml2xmlout/metadata.xml | 2 + tests/domainsnapshotxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 2 +- tests/lxcconf2xmltest.c | 2 +- tests/nodedevxml2xmltest.c | 2 +- tests/qemuhotplugtest.c | 11 ++- .../qemuhotplug-hotplug-base+disk-scsi.xml | 2 + .../qemuhotplug-hotplug-base+disk-usb.xml | 2 + .../qemuhotplug-hotplug-base+disk-virtio.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 2 + .../qemuxml2argv-blkiotune-device.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 2 + .../qemuxml2argv-boot-menu-disable.xml | 2 + .../qemuxml2argv-boot-menu-enable-with-timeout.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 2 + .../qemuxml2argv-channel-guestfwd.xml | 2 + .../qemuxml2argv-channel-virtio.xml | 2 + .../qemuxml2argv-chardev-label.xml | 2 + .../qemuxml2argv-clock-catchup.xml | 2 + .../qemuxml2argv-clock-localtime.xml | 2 + .../qemuxml2argv-clock-timer-hyperv-rtc.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 2 + .../qemuxml2argv-console-compat.xml | 2 + .../qemuxml2argv-console-virtio-many.xml | 2 + .../qemuxml2argv-cpu-eoi-disabled.xml | 2 + .../qemuxml2argv-cpu-eoi-enabled.xml | 2 + .../qemuxml2argv-cpu-host-kvmclock.xml | 2 + .../qemuxml2argv-cpu-host-model-features.xml | 2 + .../qemuxml2argv-cpu-host-passthrough-features.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 2 + .../qemuxml2argv-cpu-numa-disjoint.xml | 2 + .../qemuxml2argv-cpu-numa-memshared.xml | 2 + ...xml2argv-cputune-iothreadsched-zeropriority.xml | 2 + .../qemuxml2argv-cputune-numatune.xml | 2 + .../qemuxml2argv-cputune-zero-shares.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + .../qemuxml2argv-disk-active-commit.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 2 + .../qemuxml2argv-disk-cdrom-empty.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 2 + .../qemuxml2argv-disk-copy_on_read.xml | 2 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 3 + .../qemuxml2argv-disk-drive-boot-disk.xml | 3 + .../qemuxml2argv-disk-drive-cache-directsync.xml | 2 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 + .../qemuxml2argv-disk-drive-copy-on-read.xml | 2 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 2 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 + ...rgv-disk-drive-error-policy-wreport-rignore.xml | 2 + .../qemuxml2argv-disk-drive-fat.xml | 2 + .../qemuxml2argv-disk-drive-fmt-qcow.xml | 2 + .../qemuxml2argv-disk-drive-network-gluster.xml | 2 + .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 2 + .../qemuxml2argv-disk-drive-network-iscsi.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-export.xml | 2 + ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 2 + ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd.xml | 2 + .../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 2 + .../qemuxml2argv-disk-scsi-device.xml | 2 + .../qemuxml2argv-disk-scsi-disk-vpd.xml | 2 + ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 + .../qemuxml2argv-disk-scsi-megasas.xml | 2 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 2 + .../qemuxml2argv-disk-scsi-vscsi.xml | 2 + .../qemuxml2argv-disk-source-pool-mode.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-max_sectors.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 + .../qemuxml2argv-encrypted-disk.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 + .../qemuxml2argv-floppy-drive-fat.xml | 2 + .../qemuxml2argv-hostdev-pci-address.xml | 2 + .../qemuxml2argv-hostdev-scsi-large-unit.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-rawio.xml | 2 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 2 + .../qemuxml2argv-hostdev-scsi-sgio.xml | 2 + .../qemuxml2argv-hostdev-scsi-shareable.xml | 2 + ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 2 + .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 2 + .../qemuxml2argv-hostdev-usb-address.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 2 + .../qemuxml2argv-hugepages-pages.xml | 2 + .../qemuxml2argv-hugepages-pages2.xml | 2 + .../qemuxml2argv-hugepages-pages3.xml | 2 + .../qemuxml2argv-hugepages-shared.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 2 + .../qemuxml2argv-input-usbmouse.xml | 2 + .../qemuxml2argv-input-usbtablet.xml | 2 + .../qemuxml2argv-interface-driver.xml | 2 + .../qemuxml2argv-iothreads-disk.xml | 2 + .../qemuxml2argv-iothreads-ids-partial.xml | 2 + .../qemuxml2argv-iothreads-ids.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml | 2 + .../qemuxml2argv-kvm-features-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-kvm-features.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 2 + .../qemuxml2argv-machine-core-off.xml | 2 + .../qemuxml2argv-machine-core-on.xml | 2 + .../qemuxml2argv-memory-hotplug-dimm.xml | 2 + .../qemuxml2argv-memory-hotplug-nonuma.xml | 2 + .../qemuxml2argv-memory-hotplug.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 + .../qemuxml2argv-misc-disable-s3.xml | 2 + .../qemuxml2argv-misc-disable-suspends.xml | 2 + .../qemuxml2argv-misc-enable-s4.xml | 2 + .../qemuxml2argv-misc-no-reboot.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 + .../qemuxml2argv-net-eth-ifname.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 2 + .../qemuxml2argv-net-hostdev-vfio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-net-midonet.xml | 2 + .../qemuxml2argv-net-openvswitch.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-udp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 + .../qemuxml2argv-net-vhostuser.xml | 2 + .../qemuxml2argv-net-virtio-device.xml | 2 + .../qemuxml2argv-net-virtio-disable-offloads.xml | 2 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 + .../qemuxml2argv-nographics-vga.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 2 + .../qemuxml2argv-numad-static-vcpu-no-numatune.xml | 2 + .../qemuxml2argv-numatune-memnode-no-memory.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 2 + .../qemuxml2argv-panic-no-address.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + .../qemuxml2argv-pci-serial-dev-chardev.xml | 2 + .../qemuxml2argv-pcie-root-port-too-many.xml | 2 + .../qemuxml2argv-pcie-root-port.xml | 2 + .../qemuxml2argv-pcie-switch-downstream-port.xml | 2 + .../qemuxml2argv-pcie-switch-upstream-port.xml | 2 + .../qemuxml2argv-pcihole64-none.xml | 2 + .../qemuxml2argv-pcihole64-q35.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 2 + .../qemuxml2argv-pmu-feature-off.xml | 2 + .../qemuxml2argv-pv-spinlock-disabled.xml | 2 + .../qemuxml2argv-pv-spinlock-enabled.xml | 2 + .../qemuxml2argv-qemu-ns-no-env.xml | 2 + .../qemuxml2argv-reboot-timeout-disabled.xml | 2 + .../qemuxml2argv-reboot-timeout-enabled.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 + .../qemuxml2argv-seclabel-dac-none.xml | 2 + .../qemuxml2argv-seclabel-device-multiple.xml | 2 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 + .../qemuxml2argv-seclabel-dynamic-none.xml | 2 + .../qemuxml2argv-seclabel-dynamic-override.xml | 2 + .../qemuxml2argv-seclabel-static-labelskip.xml | 2 + .../qemuxml2argv-seclabel-static.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 + .../qemuxml2argv-serial-spiceport-nospice.xml | 2 + .../qemuxml2argv-serial-tcp-telnet.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 + .../qemuxml2argv-smbios-multiple-type2.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml | 2 + .../qemuxml2argv-tpm-passthrough.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 2 + .../qemuxml2argv-vcpu-placement-static.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 2 + .../qemuxml2argv-video-virtio-gpu-device.xml | 2 + .../qemuxml2argv-video-virtio-gpu-virgl.xml | 2 + .../qemuxml2argv-virtio-input-passthrough.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-virtio-input.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 + .../qemuxml2argv-virtio-rng-egd.xml | 2 + .../qemuxml2argv-virtio-rng-random.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 2 + tests/qemuxml2argvtest.c | 1 + .../qemuxml2xmlout-balloon-device-auto.xml | 2 + .../qemuxml2xmlout-balloon-device-period.xml | 2 + .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 2 + ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 2 + .../qemuxml2xmlout-channel-virtio-auto.xml | 2 + .../qemuxml2xmlout-channel-virtio-state-active.xml | 2 + ...emuxml2xmlout-channel-virtio-state-inactive.xml | 2 + .../qemuxml2xmlout-console-compat-auto.xml | 2 + .../qemuxml2xmlout-console-compat2.xml | 2 + .../qemuxml2xmlout-console-virtio.xml | 2 + .../qemuxml2xmlout-controller-usb-order.xml | 2 + .../qemuxml2xmlout-cpu-empty.xml | 2 + .../qemuxml2xmlout-cpu-numa-disordered.xml | 2 + .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 2 + .../qemuxml2xmlout-cpu-numa1.xml | 2 + .../qemuxml2xmlout-cpu-numa2.xml | 2 + .../qemuxml2xmlout-cputune-iothreads.xml | 2 + .../qemuxml2xmlout-cputune-iothreadsched.xml | 2 + .../qemuxml2xmlout-default-kvm-host-arch.xml | 2 + .../qemuxml2xmlout-default-qemu-host-arch.xml | 2 + .../qemuxml2xmlout-disk-backing-chains-active.xml | 2 + ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 2 + .../qemuxml2xmlout-disk-drive-discard.xml | 2 + .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 2 + .../qemuxml2xmlout-disk-mirror-old.xml | 2 + .../qemuxml2xmlout-disk-mirror.xml | 2 + .../qemuxml2xmlout-disk-scsi-device-auto.xml | 2 + .../qemuxml2xmlout-disk-source-pool.xml | 2 + ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 2 + .../qemuxml2xmlout-memtune-unlimited.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 2 + .../qemuxml2xmlout-metadata-duplicate.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 + ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 2 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 2 + .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 2 + .../qemuxml2xmlout-numatune-auto-prefer.xml | 2 + .../qemuxml2xmlout-numatune-memnode.xml | 2 + tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 2 + .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 + .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 + .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 + .../qemuxml2xmlout-pcie-root.xml | 2 + .../qemuxml2xmlout-pcihole64-gib.xml | 2 + .../qemuxml2xmlout-pmu-feature.xml | 2 + tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 + .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 2 + .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 2 + .../qemuxml2xmlout-seclabel-none.xml | 2 + .../qemuxml2xmlout-serial-target-port-auto.xml | 2 + .../qemuxml2xmlout-tap-vhost-incorrect.xml | 2 + .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 2 + .../qemuxml2xmlout-usb-redir-filter-version.xml | 2 + .../qemuxml2xmlout-usb-redir-filter.xml | 2 + tests/qemuxml2xmltest.c | 23 ++++++ tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 + tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 + .../sexpr2xml-disk-block-shareable.xml | 2 + tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 + .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 + .../sexpr2xml-disk-drv-blktap-raw.xml | 2 + .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 + tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 + .../sexpr2xml-pv-bootloader-cmdline.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 + tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 2 - tests/xlconfigdata/test-paravirt-maxvcpus.xml | 2 + tests/xmconfigdata/test-paravirt-maxvcpus.xml | 2 + tests/xmconfigdata/test-paravirt-vcpu.xml | 2 + 303 files changed, 684 insertions(+), 85 deletions(-) -- 2.7.0

2 9

[libvirt] [PATCH] lxc: don't try to hide parent cgroups inside container
by Daniel P. Berrange 26 Jan '16

26 Jan '16

On the host when we start a container, it will be placed in a cgroup path of /machine.slice/machine-lxc\x2ddemo.scope under /sys/fs/cgroup/* Inside the containers' namespace we need to setup /sys/fs/cgroup mounts, and currently will bind mount /machine.slice/machine-lxc\x2ddemo.scope on the host to appear as / in the container. While this may sound nice, it confuses applications dealing with cgroups, because /proc/$PID/cgroup now does not match the directory in /sys/fs/cgroup This particularly causes problems for systems and will make it create repeated path components in the cgroup for apps run in the container eg /machine.slice/machine-lxc\x2ddemo.scope/machine.slice/machine-lxc\x2ddemo.scope/user.slice/user-0.slice/session-61.scope This also causes any systemd service that uses sd-notify to fail to start, because when systemd receives the notification it won't be able to identify the corresponding unit it came from. In particular this break rabbitmq-server startup Future kernels will provide proper cgroup namespacing which will handle this problem, but until that time we should not try to play games with hiding parent cgroups. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 2 +- src/lxc/lxc_container.c | 2 +- src/util/vircgroup.c | 9 ++++----- src/util/vircgroup.h | 6 +++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5e05a98..1732421 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1194,6 +1194,7 @@ virCgroupAllowDevice; virCgroupAllowDeviceMajor; virCgroupAllowDevicePath; virCgroupAvailable; +virCgroupBindMount; virCgroupControllerAvailable; virCgroupControllerTypeFromString; virCgroupControllerTypeToString; @@ -1231,7 +1232,6 @@ virCgroupGetMemSwapUsage; virCgroupGetPercpuStats; virCgroupHasController; virCgroupHasEmptyTasks; -virCgroupIsolateMount; virCgroupKill; virCgroupKillPainfully; virCgroupKillRecursive; diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c5a70a1..a6805ac 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1827,7 +1827,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, /* Now we can re-mount the cgroups controllers in the * same configuration as before */ - if (virCgroupIsolateMount(cgroup, "/.oldroot/", sec_mount_options) < 0) + if (virCgroupBindMount(cgroup, "/.oldroot/", sec_mount_options) < 0) goto cleanup; /* Mounts /dev */ diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 7584ee4..d7f4065 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3917,8 +3917,8 @@ virCgroupGetFreezerState(virCgroupPtr group, char **state) int -virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, - const char *mountopts) +virCgroupBindMount(virCgroupPtr group, const char *oldroot, + const char *mountopts) { int ret = -1; size_t i; @@ -3954,10 +3954,9 @@ virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, if (!virFileExists(group->controllers[i].mountPoint)) { char *src; - if (virAsprintf(&src, "%s%s%s", + if (virAsprintf(&src, "%s%s", oldroot, - group->controllers[i].mountPoint, - group->controllers[i].placement) < 0) + group->controllers[i].mountPoint) < 0) goto cleanup; VIR_DEBUG("Create mount point '%s'", diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 63a9e1c..d754b1f 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -286,9 +286,9 @@ int virCgroupKill(virCgroupPtr group, int signum); int virCgroupKillRecursive(virCgroupPtr group, int signum); int virCgroupKillPainfully(virCgroupPtr group); -int virCgroupIsolateMount(virCgroupPtr group, - const char *oldroot, - const char *mountopts); +int virCgroupBindMount(virCgroupPtr group, + const char *oldroot, + const char *mountopts); bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); -- 2.5.0

2 1

[libvirt] Compiling libvirt on Cygwin
by Maarten Jacobs 26 Jan '16

26 Jan '16

Hello, I have been trying to get libvirt compiled on Cygwin but I have run into a rather perplexing issue. I am running a 32-bit installation of Cygwin on Windows 10: CYGWIN_NT-10.0-WOW dell-desktop 2.4.0(0.293/5/3) 2016-01-15 16:14 i686 Cygwin I have had to "fix" a number of problems in the Makefile that prevented the code from linking properly. I am not sure if the fixes are entirely correct - but as long as the linker was ok I pressed on. After applying those changes to the Makefile, I ran into the following issue when creating libvirtd.exe: CCLD libvirtd.exe../src/.libs/libvirt_driver_remote.a(libvirt_net_rpc_la-virnetmessage.o): In function `virNetMessageNew':/home/maart/source/libvirt/src/rpc/virnetmessage.c:39: multiple definition of `virNetMessageNew'/home/maart/source/libvirt/src/.libs/libvirt.dll.a(d002143.o):(.text+0x0): first defined here...collect2: error: ld returned 1 exit statusMakefile:2152: recipe for target 'libvirtd.exe' failedmake[3]: *** [libvirtd.exe] Error 1make[3]: Leaving directory '/cygdrive/c/cygwin64/home/maart/source/libvirt/daemon'Makefile:2050: recipe for target 'all' failedmake[2]: *** [all] Error 2make[2]: Leaving directory '/cygdrive/c/cygwin64/home/maart/source/libvirt/daemon'Makefile:1993: recipe for target 'all-recursive' failedmake[1]: *** [all-recursive] Error 1make[1]: Leaving directory '/cygdrive/c/cygwin64/home/maart/source/libvirt'Makefile:1887: recipe for target 'all' failedmake: *** [all] Error 2 It appears to me that somehow when the executable is linked together, it finds two separate definitions of the virNetMessageNew method, however I cannot figure out how that could be. If anybody has any suggestions on how to debug this I'd appreciate it. For clarity: my aim is to get the code to compile first, whether or not it will actually work under Cygwin. I do not believe there should be a specific reason why this code could not be made to compile/link - even if the end result may not work as intended... But I hope to find that out once I successfully create the resulting executables. Thanks, Maarten Jacobs

2 2

[libvirt] [PATCH] qemu: turn on virtlockd by default
by Daniel P. Berrange 26 Jan '16

26 Jan '16

We have had virtlockd available for a long time now but have always defaulted to the 'nop' lock driver which does no locking. This gives users an unsafe deployment by default unless they know to turn on lockd. virtlockd will auto-activate via systemd when guests launch, so setting it on by default will only cause upgrade pain for people on non-systemd distros. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu.conf | 3 ++- src/qemu/qemu_driver.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 4fa5e8a..73f4a0a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -421,7 +421,8 @@ # share one writable disk, libvirt offers two approaches for # locking files. The first one is sanlock, the other one, # virtlockd, is then our own implementation. Accepted values -# are "sanlock" and "lockd". +# are "sanlock", "lockd" and "nop", with "lockd" being the +# default. # #lock_manager = "lockd" diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e46404b..36fb047 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -728,7 +728,7 @@ qemuStateInitialize(bool privileged, if (!(qemu_driver->lockManager = virLockManagerPluginNew(cfg->lockManagerName ? - cfg->lockManagerName : "nop", + cfg->lockManagerName : "lockd", "qemu", cfg->configBaseDir, 0))) -- 2.5.0

4 7

[libvirt] [PATCH v2] qemu: add reporting of vCPU wait time
by Daniel P. Berrange 26 Jan '16

26 Jan '16

The VIR_DOMAIN_STATS_VCPU flag to virDomainListGetStats enables reporting of stats about vCPUs. Currently we only report the cumulative CPU running time and the execution state. This adds reporting of the wait time - time the vCPU wants to run, but the host schedular has something else running ahead of it. The data is reported per-vCPU eg $ virsh domstats --vcpu demo Domain: 'demo' vcpu.current=4 vcpu.maximum=4 vcpu.0.state=1 vcpu.0.time=1420000000 vcpu.0.wait=18403928 vcpu.1.state=1 vcpu.1.time=130000000 vcpu.1.wait=10612111 vcpu.2.state=1 vcpu.2.time=110000000 vcpu.2.wait=12759501 vcpu.3.state=1 vcpu.3.time=90000000 vcpu.3.wait=21825087 In implementing this I notice our reporting of CPU execute time has very poor granularity, since we are getting it from /proc/$PID/stat. As a future enhancement we should prefer to get CPU execute time from /proc/$PID/schedstat or /proc/$PID/sched (if either exist on the running kernel) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 96 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 36fb047..40c52d4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1361,6 +1361,80 @@ static char *qemuConnectGetCapabilities(virConnectPtr conn) { static int +qemuGetSchedInfo(unsigned long long *cpuWait, + pid_t pid, pid_t tid) +{ + char *proc = NULL; + char *data = NULL; + char **lines = NULL; + size_t i; + int ret = -1; + double val; + + *cpuWait = 0; + + /* In general, we cannot assume pid_t fits in int; but /proc parsing + * is specific to Linux where int works fine. */ + if (tid) + ret = virAsprintf(&proc, "/proc/%d/task/%d/sched", (int)pid, (int)tid); + else + ret = virAsprintf(&proc, "/proc/%d/sched", (int)pid); + if (ret < 0) + goto cleanup; + ret = -1; + + /* The file is not guaranteed to exist (needs CONFIG_SCHED_DEBUG) */ + if (access(proc, R_OK) < 0) + return 0; + + if (virFileReadAll(proc, (1<<16), &data) < 0) + goto cleanup; + + lines = virStringSplit(data, "\n", 0); + if (!lines) + goto cleanup; + + for (i = 0; lines[i] != NULL; i++) { + const char *line = lines[i]; + + /* Needs CONFIG_SCHEDSTATS. The second check + * is the old name the kernel used in past */ + if (STRPREFIX(line, "se.statistics.wait_sum") || + STRPREFIX(line, "se.wait_sum")) { + line = strchr(line, ':'); + if (!line) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Missing separate in sched info '%s'"), + lines[i]); + goto cleanup; + } + line++; + while (*line == ' ') + line++; + + if (virStrToDouble(line, NULL, &val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to parse sched info value '%s'"), + line); + goto cleanup; + } + + *cpuWait = (unsigned long long)(val * 1000000); + break; + } + } + + ret = 0; + + cleanup: + VIR_FREE(data); + VIR_FREE(proc); + VIR_FREE(lines); + return ret; +} + + +static int qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, pid_t pid, int tid) { @@ -1424,6 +1498,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, + unsigned long long *cpuwait, int maxinfo, unsigned char *cpumaps, int maplen) @@ -1476,6 +1551,11 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virBitmapFree(map); } + if (cpuwait) { + if (qemuGetSchedInfo(&(cpuwait[i]), vm->pid, vcpupid) < 0) + return -1; + } + ncpuinfo++; } @@ -5490,7 +5570,7 @@ qemuDomainGetVcpus(virDomainPtr dom, goto cleanup; } - ret = qemuDomainHelperGetVcpus(vm, info, maxinfo, cpumaps, maplen); + ret = qemuDomainHelperGetVcpus(vm, info, NULL, maxinfo, cpumaps, maplen); cleanup: virDomainObjEndAPI(&vm); @@ -19036,6 +19116,7 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int ret = -1; char param_name[VIR_TYPED_PARAM_FIELD_LENGTH]; virVcpuInfoPtr cpuinfo = NULL; + unsigned long long *cpuwait = NULL; if (virTypedParamsAddUInt(&record->params, &record->nparams, @@ -19051,10 +19132,12 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, virDomainDefGetVcpusMax(dom->def)) < 0) return -1; - if (VIR_ALLOC_N(cpuinfo, virDomainDefGetVcpus(dom->def)) < 0) - return -1; + if (VIR_ALLOC_N(cpuinfo, virDomainDefGetVcpus(dom->def)) < 0 || + VIR_ALLOC_N(cpuwait, virDomainDefGetVcpus(dom->def)) < 0) + goto cleanup; - if (qemuDomainHelperGetVcpus(dom, cpuinfo, virDomainDefGetVcpus(dom->def), + if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait, + virDomainDefGetVcpus(dom->def), NULL, 0) < 0) { virResetLastError(); ret = 0; /* it's ok to be silent and go ahead */ @@ -19083,12 +19166,21 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, param_name, cpuinfo[i].cpuTime) < 0) goto cleanup; + snprintf(param_name, VIR_TYPED_PARAM_FIELD_LENGTH, + "vcpu.%zu.wait", i); + if (virTypedParamsAddULLong(&record->params, + &record->nparams, + maxparams, + param_name, + cpuwait[i]) < 0) + goto cleanup; } ret = 0; cleanup: VIR_FREE(cpuinfo); + VIR_FREE(cpuwait); return ret; } -- 2.5.0

2 1

[libvirt] [PATCH] qemu: qemuDomainRename and virDomainObjListNumOfDomains ABBA deadlock fix
by Maxim Nestratov 26 Jan '16

26 Jan '16

A pretty nasty deadlock occurs while trying to rename a VM in parallel with virDomainObjListNumOfDomains. The short description of the problem is as follows: Thread #1: qemuDomainRename: ------> aquires domain lock by qemuDomObjFromDomain ---------> waits for domain list lock in any of the listed functions: - virDomainObjListFindByName - virDomainObjListRenameAddNew - virDomainObjListRenameRemove Thread #2: virDomainObjListNumOfDomains: ------> aquires domain list lock ---------> waits for domain lock in virDomainObjListCount The patch establishes a single order of taking locks: driver->domains list first, then a particular VM. This is done by implementing a set of virDomainObjListXxxLocked functions working with driver->domains that assume that list lock is already aquired by calling functions. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/conf/virdomainobjlist.c | 74 +++++++++++++++++++++++++++++++++++++-------- src/conf/virdomainobjlist.h | 9 ++++++ src/libvirt_private.syms | 4 +++ src/qemu/qemu_driver.c | 40 +++++++++++++++++++++--- 4 files changed, 110 insertions(+), 17 deletions(-) diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 7568f93..89e28a8 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -132,21 +132,19 @@ virDomainObjPtr virDomainObjListFindByID(virDomainObjListPtr doms, static virDomainObjPtr -virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, +virDomainObjListFindByUUIDInternalLocked(virDomainObjListPtr doms, const unsigned char *uuid, bool ref) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObjPtr obj; - virObjectLock(doms); virUUIDFormat(uuid, uuidstr); obj = virHashLookup(doms->objs, uuidstr); - if (ref) { + if (ref) virObjectRef(obj); - virObjectUnlock(doms); - } + if (obj) { virObjectLock(obj); if (obj->removing) { @@ -156,8 +154,19 @@ virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, obj = NULL; } } - if (!ref) - virObjectUnlock(doms); + return obj; +} + +static virDomainObjPtr +virDomainObjListFindByUUIDInternal(virDomainObjListPtr doms, + const unsigned char *uuid, + bool ref) +{ + virDomainObjPtr obj; + + virObjectLock(doms); + obj = virDomainObjListFindByUUIDInternalLocked(doms, uuid, ref); + virObjectUnlock(doms); return obj; } @@ -169,6 +178,13 @@ virDomainObjListFindByUUID(virDomainObjListPtr doms, return virDomainObjListFindByUUIDInternal(doms, uuid, false); } +virDomainObjPtr +virDomainObjListFindByUUIDRefLocked(virDomainObjListPtr doms, + const unsigned char *uuid) +{ + return virDomainObjListFindByUUIDInternalLocked(doms, uuid, true); +} + virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, @@ -177,6 +193,23 @@ virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, return virDomainObjListFindByUUIDInternal(doms, uuid, true); } +virDomainObjPtr virDomainObjListFindByNameLocked(virDomainObjListPtr doms, + const char *name) +{ + virDomainObjPtr obj; + + obj = virHashLookup(doms->objsName, name); + virObjectRef(obj); + if (obj) { + virObjectLock(obj); + if (obj->removing) { + virObjectUnlock(obj); + virObjectUnref(obj); + obj = NULL; + } + } + return obj; +} virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, const char *name) @@ -312,14 +345,12 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, return ret; } - int -virDomainObjListRenameAddNew(virDomainObjListPtr doms, +virDomainObjListRenameAddNewLocked(virDomainObjListPtr doms, virDomainObjPtr vm, const char *name) { int ret = -1; - virObjectLock(doms); /* Add new name into the hash table of domain names. */ if (virHashAddEntry(doms->objsName, name, vm) < 0) @@ -332,21 +363,38 @@ virDomainObjListRenameAddNew(virDomainObjListPtr doms, ret = 0; cleanup: + return ret; +} + +int +virDomainObjListRenameAddNew(virDomainObjListPtr doms, + virDomainObjPtr vm, + const char *name) +{ + int ret = -1; + virObjectLock(doms); + ret = virDomainObjListRenameAddNewLocked(doms, vm, name); virObjectUnlock(doms); return ret; } +int +virDomainObjListRenameRemoveLocked(virDomainObjListPtr doms, const char *name) +{ + virHashRemoveEntry(doms->objsName, name); + return 0; +} int virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name) { + int ret; virObjectLock(doms); - virHashRemoveEntry(doms->objsName, name); + ret = virDomainObjListRenameRemoveLocked(doms, name); virObjectUnlock(doms); - return 0; + return ret; } - /* * The caller must hold a lock on the driver owning 'doms', * and must also have locked 'dom', to ensure no one else diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index f479598..bca31cf 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -38,8 +38,12 @@ virDomainObjPtr virDomainObjListFindByUUID(virDomainObjListPtr doms, const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByUUIDRef(virDomainObjListPtr doms, const unsigned char *uuid); +virDomainObjPtr virDomainObjListFindByUUIDRefLocked(virDomainObjListPtr doms, + const unsigned char *uuid); virDomainObjPtr virDomainObjListFindByName(virDomainObjListPtr doms, const char *name); +virDomainObjPtr virDomainObjListFindByNameLocked(virDomainObjListPtr doms, + const char *name); enum { VIR_DOMAIN_OBJ_LIST_ADD_LIVE = (1 << 0), @@ -54,8 +58,13 @@ virDomainObjPtr virDomainObjListAdd(virDomainObjListPtr doms, int virDomainObjListRenameAddNew(virDomainObjListPtr doms, virDomainObjPtr vm, const char *name); +int virDomainObjListRenameAddNewLocked(virDomainObjListPtr doms, + virDomainObjPtr vm, + const char *name); int virDomainObjListRenameRemove(virDomainObjListPtr doms, const char *name); +int virDomainObjListRenameRemoveLocked(virDomainObjListPtr doms, + const char *name); void virDomainObjListRemove(virDomainObjListPtr doms, virDomainObjPtr dom); void virDomainObjListRemoveLocked(virDomainObjListPtr doms, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5e05a98..b05d6cc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -881,8 +881,10 @@ virDomainObjListConvert; virDomainObjListExport; virDomainObjListFindByID; virDomainObjListFindByName; +virDomainObjListFindByNameLocked; virDomainObjListFindByUUID; virDomainObjListFindByUUIDRef; +virDomainObjListFindByUUIDRefLocked; virDomainObjListForEach; virDomainObjListGetActiveIDs; virDomainObjListGetInactiveNames; @@ -892,7 +894,9 @@ virDomainObjListNumOfDomains; virDomainObjListRemove; virDomainObjListRemoveLocked; virDomainObjListRenameAddNew; +virDomainObjListRenameAddNewLocked; virDomainObjListRenameRemove; +virDomainObjListRenameRemoveLocked; # cpu/cpu.h diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e46404b..b012516 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -206,6 +206,36 @@ struct qemuAutostartData { virConnectPtr conn; }; +/** + * qemuDomObjFromDomainLocked: + * @domain: Domain pointer that has to be looked up + * + * This function looks up @domain and returns the appropriate virDomainObjPtr + * that has to be released by calling virDomainObjEndAPI(). + * It assumes that driver->domains list is locked already, thus it uses Locked + * variant of virDomainObjListFindByUUIDRef function. + * + * Returns the domain object with incremented reference counter which is locked + * on success, NULL otherwise. + */ +static virDomainObjPtr +qemuDomObjFromDomainLocked(virDomainPtr domain) +{ + virDomainObjPtr vm; + virQEMUDriverPtr driver = domain->conn->privateData; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + vm = virDomainObjListFindByUUIDRefLocked(driver->domains, domain->uuid); + if (!vm) { + virUUIDFormat(domain->uuid, uuidstr); + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s' (%s)"), + uuidstr, domain->name); + return NULL; + } + + return vm; +} /** * qemuDomObjFromDomain: @@ -19892,7 +19922,8 @@ static int qemuDomainRename(virDomainPtr dom, virCheckFlags(0, ret); - if (!(vm = qemuDomObjFromDomain(dom))) + virObjectLock(driver->domains); + if (!(vm = qemuDomObjFromDomainLocked(dom))) goto cleanup; if (virDomainRenameEnsureACL(dom->conn, vm->def) < 0) @@ -19938,7 +19969,7 @@ static int qemuDomainRename(virDomainPtr dom, * internal error. And since new_name != name here, there's no * deadlock imminent. */ - tmp_dom = virDomainObjListFindByName(driver->domains, new_name); + tmp_dom = virDomainObjListFindByNameLocked(driver->domains, new_name); if (tmp_dom) { virObjectUnlock(tmp_dom); virObjectUnref(tmp_dom); @@ -19956,7 +19987,7 @@ static int qemuDomainRename(virDomainPtr dom, goto endjob; } - if (virDomainObjListRenameAddNew(driver->domains, vm, new_name) < 0) + if (virDomainObjListRenameAddNewLocked(driver->domains, vm, new_name) < 0) goto endjob; event_old = virDomainEventLifecycleNewFromObj(vm, @@ -19980,7 +20011,7 @@ static int qemuDomainRename(virDomainPtr dom, } /* Remove old domain name from table. */ - virDomainObjListRenameRemove(driver->domains, old_dom_name); + virDomainObjListRenameRemoveLocked(driver->domains, old_dom_name); event_new = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED, @@ -20000,6 +20031,7 @@ static int qemuDomainRename(virDomainPtr dom, qemuDomainEventQueue(driver, event_old); qemuDomainEventQueue(driver, event_new); virObjectUnref(cfg); + virObjectUnlock(driver->domains); return ret; rollback: -- 1.8.3.1

4 7

[libvirt] Ability to add arbitrary data to snapshots
by Alexander Burluka 26 Jan '16

26 Jan '16

Hello! Currently our Virtuozzo company is working on some kind of management tool for libvirt. We encountered some problems with snapshots while development. So I would like to ask community a few questions: 1) Would you mind if I extend current libvirt snapshot with ability to add arbitrary data (blob or some config files)? 2) Would this feature be useful for your users? I see it as something like: virsh snapshot-create VM1 --blob /path/to/some-file virsh snapshot-revert VM1 <number> and /path/to/some-file appeared again. Looking forward for your comments and help. Thanks! -- Regards, Alexander Burluka

3 7

[libvirt] [PATCH v2] virsh: improve waiting for block job readiness
by Michael Chapman 26 Jan '16

26 Jan '16

After a block job hits 100%, we only need to apply a timeout waiting for a block job event if exactly one of the BLOCK_JOB or BLOCK_JOB_2 callbacks were able to be registered. If neither callback could be registered, there's clearly no need for a timeout. If both callbacks were registered, then we're guaranteed to eventually get one of the events. The path being used by virsh must be exactly the source path or target device in the domain's disk definition, and these are the respective strings sent back in these two events. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- v1 discussion at: http://www.redhat.com/archives/libvir-list/2016-January/msg00031.html Changes since v1: - Fixed bugs in cb_id/cb_id2 conditionals - Consistently used break to exit loop, dropped cleanup label - Clarified the logic and behaviour in comments - Improved commit message tools/virsh-domain.c | 60 ++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index edbbc34..853416c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1875,14 +1875,17 @@ virshBlockJobWaitFree(virshBlockJobWaitDataPtr data) * virshBlockJobWait: * @data: private data initialized by virshBlockJobWaitInit * - * Waits for the block job to complete. This function prefers to get an event - * from libvirt but still has fallback means if the device name can't be matched + * Waits for the block job to complete. This function prefers to wait for a + * matching VIR_DOMAIN_EVENT_ID_BLOCK_JOB or VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 + * event from libvirt, however it has a fallback mode should either of these + * events not be available. * - * This function returns values from the virConnectDomainEventBlockJobStatus enum - * or -1 in case of a internal error. Fallback states if a block job vanishes - * without triggering the event is VIR_DOMAIN_BLOCK_JOB_COMPLETED. For two phase - * jobs after the retry count for waiting for the event expires is - * VIR_DOMAIN_BLOCK_JOB_READY. + * This function returns values from the virConnectDomainEventBlockJobStatus + * enum or -1 in case of a internal error. + * + * If the fallback mode is activated the returned event is + * VIR_DOMAIN_BLOCK_JOB_COMPLETED if the block job vanishes, or + * VIR_DOMAIN_BLOCK_JOB_READY if the block job reaches 100%. */ static int virshBlockJobWait(virshBlockJobWaitDataPtr data) @@ -1932,28 +1935,32 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (result < 0) { vshError(data->ctl, _("failed to query job for disk %s"), data->dev); - goto cleanup; + break; } - /* if we've got an event for the device we are waiting for we can end - * the waiting loop */ + /* If either callback could be registered and we've got an event, we can + * can end the waiting loop */ if ((data->cb_id >= 0 || data->cb_id2 >= 0) && data->status != -1) { ret = data->status; - goto cleanup; + break; } - /* since virsh can't guarantee that the path provided by the user will - * later be matched in the event we will need to keep the fallback - * approach and claim success if the block job finishes or vanishes. */ - if (result == 0) - break; + /* Fallback behaviour is only needed if one or both callbacks could not + * be registered */ + if (data->cb_id < 0 || data->cb_id2 < 0) { + /* If the block job vanishes, synthesize a COMPLETED event */ + if (result == 0) { + ret = VIR_DOMAIN_BLOCK_JOB_COMPLETED; + break; + } - /* for two-phase jobs we will try to wait in the synchronized phase - * for event arrival since 100% completion doesn't necessarily mean that - * the block job has finished and can be terminated with success */ - if (info.end == info.cur && --retries == 0) { - ret = VIR_DOMAIN_BLOCK_JOB_READY; - goto cleanup; + /* If the block job hits 100%, wait a little while for a possible + * event from libvirt, else synthesize our own READY event */ + if (info.end == info.cur && + ((data->cb_id < 0 && data->cb_id2 < 0) || --retries == 0)) { + ret = VIR_DOMAIN_BLOCK_JOB_READY; + break; + } } if (data->verbose) @@ -1962,26 +1969,23 @@ virshBlockJobWait(virshBlockJobWaitDataPtr data) if (data->timeout && virTimeMillisNow(&curr) < 0) { vshSaveLibvirtError(); - goto cleanup; + break; } if (intCaught || (data->timeout && (curr - start > data->timeout))) { if (virDomainBlockJobAbort(data->dom, data->dev, abort_flags) < 0) { vshError(data->ctl, _("failed to abort job for disk '%s'"), data->dev); - goto cleanup; + break; } ret = VIR_DOMAIN_BLOCK_JOB_CANCELED; - goto cleanup; + break; } usleep(500 * 1000); } - ret = VIR_DOMAIN_BLOCK_JOB_COMPLETED; - - cleanup: /* print 100% completed */ if (data->verbose && (ret == VIR_DOMAIN_BLOCK_JOB_COMPLETED || -- 2.4.3

2 2

[libvirt] [PATCH] virsh: fix cpu-stats command output format issue
by Luyao Huang 26 Jan '16

26 Jan '16

After commit 57177f1, the cpu-stats command format change to: CPU0: cpu_time 14401.507878990 seconds vcpu_time 14378732785511 vcpu_time is not user friendly. After this patch, it will change back: CPU0: cpu_time 14401.507878990 seconds vcpu_time 14378.732785511 seconds https://bugzilla.redhat.com/show_bug.cgi?id=1301807 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-domain.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 1089a4d..c2146d2 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7243,6 +7243,7 @@ vshCPUStatsPrintField(vshControl *ctl, { vshPrint(ctl, "\t%-12s ", param->field); if ((STREQ(param->field, VIR_DOMAIN_CPU_STATS_CPUTIME) || + STREQ(param->field, VIR_DOMAIN_CPU_STATS_VCPUTIME) || STREQ(param->field, VIR_DOMAIN_CPU_STATS_USERTIME) || STREQ(param->field, VIR_DOMAIN_CPU_STATS_SYSTEMTIME)) && param->type == VIR_TYPED_PARAM_ULLONG) { -- 1.8.3.1

3 2

[libvirt] [PATCHv2] util: keep/use a bitmap of in-use macvtap devices
by Laine Stump 26 Jan '16

26 Jan '16

This patch creates two bitmaps, one for macvlan devicenames and one for macvtap. The bitmap position is used to indicate that libvirt is currently using a device with the name macvtap%d/macvlan%d, where %d is the position in the bitmap. When requested to create a new macvtap/macvlan device, libvirt will now look for the first clear bit in the appropriate bitmap and derive the device name from that rather than just starting at 0 and counting up until one works. When libvirtd is restarted, qemu calls the appropriate function to "re-reserve" the device names as it is scanning the status of running domains. Note that it may seem strange that the retry counter now starts at 8192 instead of 5. This is because we now don't do a "pre-check" for the existence of a device once we've reserved it in the bitmap - we move straight to creating it; although very unlikely, it's possible that someone has a running system where they have a large number of network devices *created outside libvirt* named "macvtap%d" or "macvlan%d" - such a setup would still allow creating more devices with the old code, while a low retry max in the new code would cause a failure. Since the objective of the retry max is just to prevent an infinite loop, and it's highly unlikely to do more than 1 iteration anyway, having a high max is a reasonable concession in order to prevent lots of new failures. --- Changes from V1: * combine virNetDevMacVLanReserveNextFreeID() and virNetDevMacVLanReserveID() * put "macvlan" or "macvtap" into the "unable to create [blah] device "%s" as appropriate * eliminate redundant message when all device names are in use. (Background info that doesn't need to be in commit log: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> had pointed out here: https://www.redhat.com/archives/libvir-list/2015-October/msg00877.html that libvirt takes a *very long time* to creat macvtap/macvlan devices when there are a lot of them already in use. This is because the algorithm simply starts at macvtap0 and iterates calling virNetDevExists() for each possible name until it finds a free one. He had said at the time that he had tried keeping track of in-use macvtap/macvlan numbers in a bitmap, and had returns start time for a domain by 1m46s (from 2m to 14s) when there were 82 macvtap devices already in use. There was also an implication that he would post some patches for this to the list but, like all of us, apparently got busy with something else. Last week I ran into a situation where libvirt had created a macvtap device for a domain, and the domain was still using it, but for some reason the kernel (2.6.32-something on RHEL6) had lost track of that macvtap device, so when libvirt was asked to create a new macvtap device for another domain, it found that name to be "unused", and created a new device. The device creation was successful, but 802.1Qbh negotion failed. This failure was possibly because of the re-use of the macvtap name, possibly not, but the only way to find out was to not re-use the name. So lacking Tony's patches, I made my own and am posting them here. ) src/libvirt_private.syms | 2 + src/qemu/qemu_process.c | 10 +- src/util/virnetdevmacvlan.c | 380 ++++++++++++++++++++++++++++++++++++-------- src/util/virnetdevmacvlan.h | 5 +- 4 files changed, 332 insertions(+), 65 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5e05a98..f08bd8c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1851,6 +1851,8 @@ virNetDevMacVLanCreate; virNetDevMacVLanCreateWithVPortProfile; virNetDevMacVLanDelete; virNetDevMacVLanDeleteWithVPortProfile; +virNetDevMacVLanReleaseName; +virNetDevMacVLanReserveName; virNetDevMacVLanRestartWithVPortProfile; virNetDevMacVLanVPortProfileRegisterCallback; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d465b4f..31812f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1,7 +1,7 @@ /* * qemu_process.c: QEMU process management * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -3161,6 +3161,14 @@ qemuProcessNotifyNets(virDomainDefPtr def) for (i = 0; i < def->nnets; i++) { virDomainNetDefPtr net = def->nets[i]; + /* keep others from trying to use the macvtap device name, but + * don't return error if this happens, since that causes the + * domain to be unceremoniously killed, which would be *very* + * impolite. + */ + if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_DIRECT) + ignore_value(virNetDevMacVLanReserveName(net->ifname, false)); + if (networkNotifyActualDevice(def, net) < 0) return -1; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 98da009..fd168b7 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2015 Red Hat, Inc. + * Copyright (C) 2010-2016 Red Hat, Inc. * Copyright (C) 2010-2012 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -64,6 +64,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST, # include "virnetlink.h" # include "virnetdev.h" # include "virpidfile.h" +# include "virbitmap.h" VIR_LOG_INIT("util.netdevmacvlan"); @@ -73,7 +74,225 @@ VIR_LOG_INIT("util.netdevmacvlan"); # define MACVLAN_NAME_PREFIX "macvlan" # define MACVLAN_NAME_PATTERN "macvlan%d" +# define MACVLAN_MAX_ID 8191 + virMutex virNetDevMacVLanCreateMutex = VIR_MUTEX_INITIALIZER; +virBitmapPtr macvtapIDs = NULL; +virBitmapPtr macvlanIDs = NULL; + +static int +virNetDevMacVLanOnceInit(void) +{ + + if (!macvtapIDs && + !(macvtapIDs = virBitmapNew(MACVLAN_MAX_ID + 1))) + return -1; + if (!macvlanIDs && + !(macvlanIDs = virBitmapNew(MACVLAN_MAX_ID + 1))) + return -1; + return 0; +} + +VIR_ONCE_GLOBAL_INIT(virNetDevMacVLan); + + +/** + * virNetDevMacVLanReserveID: + * + * @id: id 0 - MACVLAN_MAX_ID+1 to reserve (or -1 for "first free") + * @flags: set VIR_NETDEV_MACVLAN_CREATE_WITH_TAP for macvtapN else macvlanN + * @quietFail: don't log an error if this name is already in-use + * @nextFree: reserve the next free ID *after* @id rather than @id itself + * + * Reserve the indicated ID in the appropriate bitmap, or find the + * first free ID if @id is -1. + * + * returns id or -1 to indicate failure + */ +static int +virNetDevMacVLanReserveID(int id, unsigned int flags, + bool quietFail, bool nextFree) +{ + virBitmapPtr bitmap; + + if (virNetDevMacVLanInitialize() < 0) + return -1; + + bitmap = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + macvtapIDs : macvlanIDs; + + if (id > MACVLAN_MAX_ID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("can't use name %s%d - out of range 0-%d"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, + id, MACVLAN_MAX_ID); + return -1; + } + + if ((id < 0 || nextFree) && + (id = virBitmapNextClearBit(bitmap, 0)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("no unused %s names available"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX); + return -1; + } + + if (virBitmapIsBitSet(bitmap, id)) { + if (quietFail) { + VIR_INFO("couldn't reserve name %s%d - already in use", + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't reserve name %s%d - already in use"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + } + return -1; + } + + if (virBitmapSetBit(bitmap, id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't mark %s%d as used"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + return -1; + } + + VIR_INFO("reserving device %s%d", + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + return id; +} + + +/** + * virNetDevMacVLanReleaseID: + * @id: id 0 - MACVLAN_MAX_ID+1 to release + * + * returns 0 for success or -1 for failure + */ +static int +virNetDevMacVLanReleaseID(int id, unsigned int flags) +{ + virBitmapPtr bitmap; + + if (virNetDevMacVLanInitialize() < 0) + return 0; + + bitmap = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + macvtapIDs : macvlanIDs; + + if (id > MACVLAN_MAX_ID) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("can't free name %s%d - out of range 0-%d"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, + id, MACVLAN_MAX_ID); + return -1; + } + + if (id < 0) + return 0; + + VIR_INFO("releasing %sdevice %s%d", + virBitmapIsBitSet(bitmap, id) ? "" : "unreserved", + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + + if (virBitmapClearBit(bitmap, id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't mark %s%d as unused"), + (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? + MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX, id); + return -1; + } + return 0; +} + + +/** + * virNetDevMacVLanReserveName: + * + * @name: already-known name of device + * @quietFail: don't log an error if this name is already in-use + * + * Extract the device type and id from a macvtap/macvlan device name + * and mark the appropriate position as in-use in the appropriate + * bitmap. + * + * returns 0 on success, -1 on failure, -2 if the name doesn't fit the auto-pattern + */ +int +virNetDevMacVLanReserveName(const char *name, bool quietFail) +{ + unsigned int id; + unsigned int flags = 0; + const char *idstr = NULL; + + if (virNetDevMacVLanInitialize() < 0) + return -1; + + if (STRPREFIX(name, MACVTAP_NAME_PREFIX)) { + idstr = name + strlen(MACVTAP_NAME_PREFIX); + flags |= VIR_NETDEV_MACVLAN_CREATE_WITH_TAP; + } else if (STRPREFIX(name, MACVLAN_NAME_PREFIX)) { + idstr = name + strlen(MACVLAN_NAME_PREFIX); + } else { + return -2; + } + + if (virStrToLong_ui(idstr, NULL, 10, &id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't get id value from macvtap device name %s"), + name); + return -1; + } + return virNetDevMacVLanReserveID(id, flags, quietFail, false); +} + + +/** + * virNetDevMacVLanReleaseName: + * + * @name: already-known name of device + * + * Extract the device type and id from a macvtap/macvlan device name + * and mark the appropriate position as in-use in the appropriate + * bitmap. + * + * returns 0 on success, -1 on failure + */ +int +virNetDevMacVLanReleaseName(const char *name) +{ + unsigned int id; + unsigned int flags = 0; + const char *idstr = NULL; + + if (virNetDevMacVLanInitialize() < 0) + return -1; + + if (STRPREFIX(name, MACVTAP_NAME_PREFIX)) { + idstr = name + strlen(MACVTAP_NAME_PREFIX); + flags |= VIR_NETDEV_MACVLAN_CREATE_WITH_TAP; + } else if (STRPREFIX(name, MACVLAN_NAME_PREFIX)) { + idstr = name + strlen(MACVLAN_NAME_PREFIX); + } else { + return 0; + } + + if (virStrToLong_ui(idstr, NULL, 10, &id) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("couldn't get id value from macvtap device name %s"), + name); + return -1; + } + return virNetDevMacVLanReleaseID(id, flags); +} + /** * virNetDevMacVLanCreate: @@ -724,14 +943,20 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, * virNetDevMacVLanCreateWithVPortProfile: * Create an instance of a macvtap device and open its tap character * device. - * @tgifname: Interface name that the macvtap is supposed to have. May - * be NULL if this function is supposed to choose a name + + * @ifnameRequested: Interface name that the caller wants the macvtap + * device to have, or NULL to pick the first available name + * appropriate for the type (macvlan%d or macvtap%d). If the + * suggested name fits one of those patterns, but is already in + * use, we will fallback to finding the first available. If the + * suggested name *doesn't* fit a pattern and the name is in use, + * we will fail. * @macaddress: The MAC address for the macvtap device * @linkdev: The interface name of the NIC to connect to the external bridge - * @mode: int describing the mode for 'bridge', 'vepa', 'private' or 'passthru'. + * @mode: macvtap mode (VIR_NETDEV_MACVLAN_MODE_(BRIDGE|VEPA|PRIVATE|PASSTHRU) * @vmuuid: The UUID of the VM the macvtap belongs to * @virtPortProfile: pointer to object holding the virtual port profile data - * @res_ifname: Pointer to a string pointer where the actual name of the + * @ifnameResult: Pointer to a string pointer where the actual name of the * interface will be stored into if everything succeeded. It is up * to the caller to free the string. * @tapfd: array of file descriptor return value for the new tap device @@ -744,39 +969,36 @@ virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, * * Return 0 on success, -1 on error. */ -int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, - const virMacAddr *macaddress, - const char *linkdev, - virNetDevMacVLanMode mode, - const unsigned char *vmuuid, - virNetDevVPortProfilePtr virtPortProfile, - char **res_ifname, - virNetDevVPortProfileOp vmOp, - char *stateDir, - int *tapfd, - size_t tapfdSize, - unsigned int flags) +int +virNetDevMacVLanCreateWithVPortProfile(const char *ifnameRequested, + const virMacAddr *macaddress, + const char *linkdev, + virNetDevMacVLanMode mode, + const unsigned char *vmuuid, + virNetDevVPortProfilePtr virtPortProfile, + char **ifnameResult, + virNetDevVPortProfileOp vmOp, + char *stateDir, + int *tapfd, + size_t tapfdSize, + unsigned int flags) { const char *type = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? "macvtap" : "macvlan"; - const char *prefix = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? - MACVTAP_NAME_PREFIX : MACVLAN_NAME_PREFIX; const char *pattern = (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) ? MACVTAP_NAME_PATTERN : MACVLAN_NAME_PATTERN; - int c, rc; + int rc, reservedID = -1; char ifname[IFNAMSIZ]; int retries, do_retry = 0; uint32_t macvtapMode; - const char *cr_ifname = NULL; + const char *ifnameCreated = NULL; int ret; int vf = -1; bool vnet_hdr = flags & VIR_NETDEV_MACVLAN_VNET_HDR; macvtapMode = modeMap[mode]; - *res_ifname = NULL; - - VIR_DEBUG("%s: VM OPERATION: %s", __FUNCTION__, virNetDevVPortProfileOpTypeToString(vmOp)); + *ifnameResult = NULL; /** Note: When using PASSTHROUGH mode with MACVTAP devices the link * device's MAC address must be set to the VMs MAC address. In @@ -803,52 +1025,82 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, } } - if (tgifname) { - if ((ret = virNetDevExists(tgifname)) < 0) - return -1; + if (ifnameRequested) { + bool isAutoName + = (STRPREFIX(ifnameRequested, MACVTAP_NAME_PREFIX) || + STRPREFIX(ifnameRequested, MACVLAN_NAME_PREFIX)); + + VIR_INFO("Requested macvtap device name: %s", ifnameRequested); + virMutexLock(&virNetDevMacVLanCreateMutex); + if ((ret = virNetDevExists(ifnameRequested)) < 0) { + virMutexUnlock(&virNetDevMacVLanCreateMutex); + return -1; + } if (ret) { - if (STRPREFIX(tgifname, prefix)) + if (isAutoName) goto create_name; virReportSystemError(EEXIST, - _("Unable to create macvlan device %s"), tgifname); + _("Unable to create %s device %s"), + type, ifnameRequested); + virMutexUnlock(&virNetDevMacVLanCreateMutex); return -1; } - cr_ifname = tgifname; - rc = virNetDevMacVLanCreate(tgifname, type, macaddress, linkdev, - macvtapMode, &do_retry); - if (rc < 0) + if (isAutoName && + (reservedID = virNetDevMacVLanReserveName(ifnameRequested, true)) < 0) { + reservedID = -1; + goto create_name; + } + + if (virNetDevMacVLanCreate(ifnameRequested, type, macaddress, + linkdev, macvtapMode, &do_retry) < 0) { + if (isAutoName) { + virNetDevMacVLanReleaseName(ifnameRequested); + reservedID = -1; + goto create_name; + } + virMutexUnlock(&virNetDevMacVLanCreateMutex); return -1; - } else { + } + /* virNetDevMacVLanCreate() was successful - use this name */ + ifnameCreated = ifnameRequested; create_name: - retries = 5; + virMutexUnlock(&virNetDevMacVLanCreateMutex); + } + + retries = MACVLAN_MAX_ID + 1; + while (!ifnameCreated && retries) { virMutexLock(&virNetDevMacVLanCreateMutex); - for (c = 0; c < 8192; c++) { - snprintf(ifname, sizeof(ifname), pattern, c); - if ((ret = virNetDevExists(ifname)) < 0) { - virMutexUnlock(&virNetDevMacVLanCreateMutex); + reservedID = virNetDevMacVLanReserveID(reservedID, flags, false, true); + if (reservedID < 0) { + virMutexUnlock(&virNetDevMacVLanCreateMutex); + return -1; + } + snprintf(ifname, sizeof(ifname), pattern, reservedID); + rc = virNetDevMacVLanCreate(ifname, type, macaddress, linkdev, + macvtapMode, &do_retry); + if (rc < 0) { + virNetDevMacVLanReleaseID(reservedID, flags); + virMutexUnlock(&virNetDevMacVLanCreateMutex); + if (!do_retry) return -1; - } - if (!ret) { - rc = virNetDevMacVLanCreate(ifname, type, macaddress, linkdev, - macvtapMode, &do_retry); - if (rc == 0) { - cr_ifname = ifname; - break; - } - - if (do_retry && --retries) - continue; - break; - } + VIR_INFO("Device %s wasn't reserved but already existed, skipping", + ifname); + retries--; + continue; } - + ifnameCreated = ifname; virMutexUnlock(&virNetDevMacVLanCreateMutex); - if (!cr_ifname) - return -1; } - if (virNetDevVPortProfileAssociate(cr_ifname, + if (!ifnameCreated) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Too many unreserved %s devices in use"), + type); + return -1; + } + + if (virNetDevVPortProfileAssociate(ifnameCreated, virtPortProfile, macaddress, linkdev, @@ -859,26 +1111,26 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, } if (flags & VIR_NETDEV_MACVLAN_CREATE_IFUP) { - if (virNetDevSetOnline(cr_ifname, true) < 0) { + if (virNetDevSetOnline(ifnameCreated, true) < 0) { rc = -1; goto disassociate_exit; } } if (flags & VIR_NETDEV_MACVLAN_CREATE_WITH_TAP) { - if (virNetDevMacVLanTapOpen(cr_ifname, tapfd, tapfdSize, 10) < 0) + if (virNetDevMacVLanTapOpen(ifnameCreated, tapfd, tapfdSize, 10) < 0) goto disassociate_exit; if (virNetDevMacVLanTapSetup(tapfd, tapfdSize, vnet_hdr) < 0) { VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ goto disassociate_exit; } - if (VIR_STRDUP(*res_ifname, cr_ifname) < 0) { + if (VIR_STRDUP(*ifnameResult, ifnameCreated) < 0) { VIR_FORCE_CLOSE(rc); /* sets rc to -1 */ goto disassociate_exit; } } else { - if (VIR_STRDUP(*res_ifname, cr_ifname) < 0) + if (VIR_STRDUP(*ifnameResult, ifnameCreated) < 0) goto disassociate_exit; rc = 0; } @@ -889,7 +1141,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, * a saved image) - migration and libvirtd restart are handled * elsewhere. */ - if (virNetDevMacVLanVPortProfileRegisterCallback(cr_ifname, macaddress, + if (virNetDevMacVLanVPortProfileRegisterCallback(ifnameCreated, macaddress, linkdev, vmuuid, virtPortProfile, vmOp) < 0) @@ -899,7 +1151,7 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, return rc; disassociate_exit: - ignore_value(virNetDevVPortProfileDisassociate(cr_ifname, + ignore_value(virNetDevVPortProfileDisassociate(ifnameCreated, virtPortProfile, macaddress, linkdev, @@ -909,7 +1161,8 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, VIR_FORCE_CLOSE(tapfd[tapfdSize]); link_del_exit: - ignore_value(virNetDevMacVLanDelete(cr_ifname)); + ignore_value(virNetDevMacVLanDelete(ifnameCreated)); + virNetDevMacVLanReleaseName(ifnameCreated); return rc; } @@ -945,6 +1198,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, ret = -1; if (virNetDevMacVLanDelete(ifname) < 0) ret = -1; + virNetDevMacVLanReleaseName(ifname); } if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) { diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 70e3b01..560593e 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2013 Red Hat, Inc. + * Copyright (C) 2011, 2013, 2016 Red Hat, Inc. * Copyright (C) 2010 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -50,6 +50,9 @@ typedef enum { VIR_NETDEV_MACVLAN_VNET_HDR = 1 << 2, } virNetDevMacVLanCreateFlags; +int virNetDevMacVLanReserveName(const char *name, bool quietfail); +int virNetDevMacVLanReleaseName(const char *name); + int virNetDevMacVLanCreate(const char *ifname, const char *type, const virMacAddr *macaddress, -- 2.5.0

2 3

[libvirt] [PATCH v5 0/7] Per domain bandwidth settings
by Alexander Burluka 26 Jan '16

26 Jan '16

We decide to make a global per domain bandwidth setting as were discussed in mailing list earlier. This patchset implements hierarchy top level cpu.cfs_period_us and cpu.cfs_quota_us control knob. I've named this parameters as global_period and global_quota. Changes in v2: add XML validation test Changes in v3: remove unneccessary cgroup copying Changes in v4: fix little rebase error Changes in v5: rebase to version 1.3.1 Alexander Burluka (7): Add global period definitions Add global quota parameter necessary definitions Add error checking on global quota and period Add global_period and global_quota XML validation test Rename qemuSetupCgroupVcpuBW to qemuSetupBandwidthCgroup Implement qemuSetupGlobalCpuCgroup Implement handling of per-domain bandwidth settings docs/schemas/domaincommon.rng | 10 +++ include/libvirt/libvirt-domain.h | 32 ++++++++ src/conf/domain_conf.c | 37 +++++++++ src/conf/domain_conf.h | 2 + src/qemu/qemu_cgroup.c | 68 ++++++++++++++-- src/qemu/qemu_cgroup.h | 7 +- src/qemu/qemu_command.c | 3 +- src/qemu/qemu_driver.c | 102 ++++++++++++++++++++++-- src/qemu/qemu_process.c | 4 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + 10 files changed, 251 insertions(+), 16 deletions(-) -- 1.8.3.1

3 11

[libvirt] [PATCH] Dont set ABI update flag during migration cookie parsing for persistent copy
by Shivaprasad G Bhat 26 Jan '16

26 Jan '16

The migration would fail if the checks in virDomainDefPostParseMemory() fail after ABI update. The ABI update normally done during the guest start and not during define. If someone is using --persistent with the virsh migrate it should be treated equivalent to domain define and not start. The furture restart would/should anyway do the ABI updates and flag correct errors. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 51e7125..39e259a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1284,8 +1284,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, } mig->persistent = virDomainDefParseNode(doc, nodes[0], caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_ABI_UPDATE); + VIR_DOMAIN_DEF_PARSE_INACTIVE); if (!mig->persistent) { /* virDomainDefParseNode already reported * an error for us */

2 1

[libvirt] [PATCH 0/2] Couple of virt-host-validate fixes
by Michal Privoznik 26 Jan '16

26 Jan '16

While preparing my talk for DevConf, where I want to present this awesome tool I've found couple of bugs in it. Michal Privoznik (2): virt-host-validate: Check those CGroups that we actually use virt-host-validate: Fix error level for user namespace check tools/virt-host-validate-lxc.c | 18 +++++++++--------- tools/virt-host-validate-qemu.c | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) -- 2.4.10

3 5

[libvirt] [PATCH] virsh: Correctly detect inserted media in change-media command
by Michal Privoznik 25 Jan '16

25 Jan '16

https://bugzilla.redhat.com/show_bug.cgi?id=1250331 It all works like this. The change-media command dumps domain XML, finds the corresponding cdrom device we want to change media in and returns it in the xmlNodePtr form. This way we don't have to bother with keeping all the subelements or attributes that we don't care about in the XML that is fed back to libvirt for the update API. Now, the problem is we try to be clever here and detect if disk already has a source (indicated by <source/> subelement). However, bare fact that the element is there does not mean disk has source. The element has some attributes and only if @file or @dev is within them disk has source. Any other attribute is meaningless for our purpose now. Make our clever check better. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-domain.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d239ba8..8fb4204 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11055,6 +11055,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, char *device_type = NULL; char *ret = NULL; char *startupPolicy = NULL; + char *source_path = NULL; if (!disk_node) return NULL; @@ -11111,7 +11112,10 @@ virshUpdateDiskXML(xmlNodePtr disk_node, } if (source) { - if (type == VIRSH_UPDATE_DISK_XML_INSERT) { + if (!(source_path = virXMLPropString(source, "file"))) + source_path = virXMLPropString(source, "dev"); + + if (source_path && type == VIRSH_UPDATE_DISK_XML_INSERT) { vshError(NULL, _("The disk device '%s' already has media"), target); goto cleanup; } @@ -11170,6 +11174,7 @@ virshUpdateDiskXML(xmlNodePtr disk_node, cleanup: VIR_FREE(device_type); VIR_FREE(startupPolicy); + VIR_FREE(source_path); return ret; } -- 2.4.10

2 6

[libvirt] [PATCH 0/4] vz: rework domain creation
by Mikhail Feoktistov 25 Jan '16

25 Jan '16

Patch 1 and 2: Fix race condition when adding domain to domains list Race condition: User calls defineXML to create new instance. The main thread from vzDomainDefineXMLFlags() creates new instance by prlsdkCreateVm. Then this thread calls prlsdkAddDomain to add new domain to domains list. The second thread receives notification from hypervisor that new VM was created. It calls prlsdkHandleVmAddedEvent() and also tries to add new domain to domains list. These two threads call virDomainObjListFindByUUID() from prlsdkAddDomain() and don't find new domain. So they add two domains with the same uuid to domains list. This fix splits logic of prlsdkAddDomain() into two new functions. 1. prlsdkNewDomain() creates new empty domain in domains list with the specific uuid. 2. prlsdkSetDomainInstance() add data from VM to domain object. Patch 3 fixes notification subscription. To get domain info we should receive and handle notification from hypervisor. Mikhail Feoktistov (4): vz: Split logic of prlsdkAddDomain() into two functions vz: Remove prlsdkAddDomain() and use new functions vz: remove code duplication from LoadDomain() vz: fix notification subscription src/vz/vz_driver.c | 14 ++++- src/vz/vz_sdk.c | 156 ++++++++++++++++++++++++++++++----------------------- src/vz/vz_sdk.h | 8 ++- 3 files changed, 107 insertions(+), 71 deletions(-) -- 1.8.3.1

2 7

[libvirt] [PATCH v2 1/2] conf: expose virDomainBootType(From|To)String
by Roman Bogorodskiy 25 Jan '16

25 Jan '16

These functions are going to be used by the Bhyve driver. --- src/libvirt_private.syms | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 1e51dcf..50f0b3f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -152,6 +152,8 @@ virDiskNameToIndex; virDomainActualNetDefFree; virDomainBlockedReasonTypeFromString; virDomainBlockedReasonTypeToString; +virDomainBootTypeFromString; +virDomainBootTypeToString; virDomainCapabilitiesPolicyTypeToString; virDomainCapsFeatureTypeToString; virDomainChrConsoleTargetTypeFromString; -- 2.4.6

2 5

[libvirt] [PATCH v2] vmx: Adapt to emptyBackingString for cdrom-image
by Michal Privoznik 24 Jan '16

24 Jan '16

https://bugzilla.redhat.com/show_bug.cgi?id=1266088 We are missing this value for cdrom-image device. Honestly, I have no idea whether it can happen for other disk devices too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -extened support for scsi CDROM too -added formatting code -added couple of tests src/vmx/vmx.c | 38 +++++++++++++++++++++----- tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx | 5 ++++ tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml | 23 ++++++++++++++++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx | 6 ++++ tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml | 23 ++++++++++++++++ tests/vmx2xmltest.c | 3 ++ tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx | 13 +++++++++ tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml | 13 +++++++++ tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx | 14 ++++++++++ tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml | 13 +++++++++ tests/xml2vmxtest.c | 2 ++ 11 files changed, 146 insertions(+), 7 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d1cdad3..10fec74 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2246,6 +2246,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con * call to this function to parse a CDROM device may handle it. */ goto ignore; + } else if (STREQ(fileName, "emptyBackingString")) { + if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'cdrom-image' " + "but found '%s'"), deviceType_name, deviceType); + goto cleanup; + } + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); + ignore_value(virDomainDiskSetSource(*def, NULL)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -2319,6 +2329,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con */ goto ignore; } + } else if (STREQ(fileName, "emptyBackingString")) { + if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'cdrom-image' " + "but found '%s'"), deviceType_name, deviceType); + goto cleanup; + } + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); + ignore_value(virDomainDiskSetSource(*def, NULL)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -3526,15 +3546,19 @@ virVMXFormatDisk(virVMXContext *ctx, virDomainDiskDefPtr def, if (type == VIR_STORAGE_TYPE_FILE) { const char *src = virDomainDiskGetSource(def); - if (src && ! virFileHasSuffix(src, fileExt)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for %s %s '%s' has " - "unsupported suffix, expecting '%s'"), - busType, deviceType, def->dst, fileExt); + if (src) { + if (!virFileHasSuffix(src, fileExt)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Image file for %s %s '%s' has " + "unsupported suffix, expecting '%s'"), + busType, deviceType, def->dst, fileExt); return -1; - } + } - fileName = ctx->formatFileName(src, ctx->opaque); + fileName = ctx->formatFileName(src, ctx->opaque); + } else { + ignore_value(VIR_STRDUP(fileName, "emptyBackingString")); + } if (fileName == NULL) return -1; diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx new file mode 100644 index 0000000..62fdb3d --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.vmx @@ -0,0 +1,5 @@ +config.version = "8" +virtualHW.version = "4" +ide0:0.present = "true" +ide0:0.deviceType = "cdrom-image" +ide0:0.fileName = "emptyBackingString" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml new file mode 100644 index 0000000..232200b --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-empty.xml @@ -0,0 +1,23 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx new file mode 100644 index 0000000..3c6036a --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.vmx @@ -0,0 +1,6 @@ +config.version = "8" +virtualHW.version = "4" +scsi0.present = "true" +scsi0:0.present = "true" +scsi0:0.deviceType = "cdrom-image" +scsi0:0.fileName = "emptyBackingString" diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml new file mode 100644 index 0000000..f2e4c75 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-empty.xml @@ -0,0 +1,23 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 0bbf055..a22af75 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -219,14 +219,17 @@ mymain(void) DO_TEST("harddisk-transient", "harddisk-transient"); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file"); + DO_TEST("cdrom-scsi-empty", "cdrom-scsi-empty"); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device"); DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device"); DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect"); DO_TEST("cdrom-scsi-passthru", "cdrom-scsi-passthru"); DO_TEST("cdrom-ide-file", "cdrom-ide-file"); + DO_TEST("cdrom-ide-empty", "cdrom-ide-empty"); DO_TEST("cdrom-ide-device", "cdrom-ide-device"); DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device"); DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); + DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect"); DO_TEST("floppy-file", "floppy-file"); DO_TEST("floppy-device", "floppy-device"); diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx new file mode 100644 index 0000000..45c7950 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.vmx @@ -0,0 +1,13 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "cdrom-ide-file" +memsize = "4" +numvcpus = "1" +ide0:0.present = "true" +ide0:0.deviceType = "cdrom-image" +ide0:0.fileName = "emptyBackingString" +floppy0.present = "false" +floppy1.present = "false" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml new file mode 100644 index 0000000..219603e --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-empty.xml @@ -0,0 +1,13 @@ +<domain type='vmware'> + <name>cdrom-ide-file</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory unit='KiB'>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='cdrom'> + <target dev='hda' bus='ide'/> + </disk> + </devices> +</domain> diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx new file mode 100644 index 0000000..1097cb1 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.vmx @@ -0,0 +1,14 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "4" +guestOS = "other" +uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" +displayName = "cdrom-scsi-empty" +memsize = "4" +numvcpus = "1" +scsi0.present = "true" +scsi0:0.present = "true" +scsi0:0.deviceType = "cdrom-image" +scsi0:0.fileName = "emptyBackingString" +floppy0.present = "false" +floppy1.present = "false" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml new file mode 100644 index 0000000..a5a6d80 --- /dev/null +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-empty.xml @@ -0,0 +1,13 @@ +<domain type='vmware'> + <name>cdrom-scsi-empty</name> + <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> + <memory unit='KiB'>4096</memory> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='cdrom'> + <target dev='sda' bus='scsi'/> + </disk> + </devices> +</domain> diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 32bad5f..d970240 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -235,11 +235,13 @@ mymain(void) DO_TEST("harddisk-ide-file", "harddisk-ide-file", 4); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", 4); + DO_TEST("cdrom-scsi-empty", "cdrom-scsi-empty", 4); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", 4); DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device", 4); DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect", 4); DO_TEST("cdrom-scsi-passthru", "cdrom-scsi-passthru", 4); DO_TEST("cdrom-ide-file", "cdrom-ide-file", 4); + DO_TEST("cdrom-ide-empty", "cdrom-ide-empty", 4); DO_TEST("cdrom-ide-device", "cdrom-ide-device", 4); DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device", 4); DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect", 4); -- 2.4.10

2 1

[libvirt] [PATCH v4] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 23 Jan '16

23 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch sets the socket buffer size to 128K and turns on message peeking on new function virNetlinkAlloc,as this would solve this problem totally and permanetly. Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> CC: Laine Stump <laine(a)laine.org> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 42 ++++++++++++++++++++++++++++++++++++++---- src/util/virnetlink.h | 7 +++++++ 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..02f5215 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -64,13 +64,11 @@ struct virNetlinkEventHandle { }; # ifdef HAVE_LIBNL1 -# define virNetlinkAlloc nl_handle_alloc +# define virSocketSetBufferSize nl_set_buffer_size # define virNetlinkFree nl_handle_destroy -typedef struct nl_handle virNetlinkHandle; # else -# define virNetlinkAlloc nl_socket_alloc +# define virSocketSetBufferSize nl_socket_set_buffer_size # define virNetlinkFree nl_socket_free -typedef struct nl_sock virNetlinkHandle; # endif typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate; @@ -108,6 +106,42 @@ static virNetlinkHandle *placeholder_nlhandle; /* Function definitions */ /** + * virNetlinkAlloc + * + * Perform netlink allocation which was defined differently for libnl3 + * vs libnl-1, and did all of three in one function + * 1) create socket + * 2) set larger buffer size + * 3) turn on message peeking + * + * see the following email message: + * https://www.redhat.com/archives/libvir-list/2016-January/msg00536.html + * + * Returns virNetlinkHandle + */ +virNetlinkHandle *virNetlinkAlloc(void) +{ + virNetlinkHandle *netlinknh; + #ifdef HAVE_LIBNL1 + netlinknh = nl_handle_alloc(); + #else + netlinknh = nl_socket_alloc(); + #endif + + if (virSocketSetBufferSize(netlinknh,131702,0) >= 0) { + nl_socket_enable_msg_peek(netlinknh); + return netlinknh; + } + + virReportSystemError(errno, + "%s",_("can not set socket buffer size to 128k")); + + virNetlinkFree(netlinknh); + + return NULL; +} + +/** * virNetlinkStartup: * * Perform any initialization that needs to take place before the diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 0664a7a..b4a2010 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -44,6 +44,13 @@ struct nlmsghdr; # endif /* __linux__ */ +# ifdef HAVE_LIBNL1 +typedef struct nl_handle virNetlinkHandle; +# else +typedef struct nl_sock virNetlinkHandle; +# endif +virNetlinkHandle *virNetlinkAlloc(void); + int virNetlinkStartup(void); void virNetlinkShutdown(void); -- 1.9.1

2 2

Re: [libvirt] Accessing libvirtd remotely as non-root user
by Warren Usui 23 Jan '16

23 Jan '16

I joined this mailing list after I googled and found this thread. https://www.redhat.com/archives/libvir-list/2015-June/msg00583.html Part of this thread read: >So, further digging led me to [2], which in essence was the section of the libvirtd wiki page that the page claimed >was obsolete. Creating the .pkla authorization file finally enabled non-root privileged user management of a remote > >KVM host. I was having this same problem, and I believe that what was needed was just the last usermod that added the non-root user to the libvirt group. I did just that one line and things seemed to be much happier.

1 0

Re: [libvirt] [PATCH 1/2] logical: Use correct syntax for thin/sparse pool creation
by Joe Harvell 23 Jan '16

23 Jan '16

John/Jan: I actually made a patch similar to this and was about to submit it for review. Now I see there is a more thorough version here already submitted just over a year ago. I don't see any evidence of this in the git repo. Are there any plans to commit it? --- Joe Harvell

2 4

[libvirt] [PATCH 0/7] PCI hostdev refactoring
by Andrea Bolognani 23 Jan '16

23 Jan '16

This series is part of my ongoing quest to fix Bug 1272300[1]. I had previously posted a mostly complete solution[2], which did however fail to handle devices detached / reattached using virsh's nodedev-* commands. Part of that series has already been merged. This series refactors the PCI hostdev code so that all detach / reattach operations go through a single function, which means that once the previous code is reimplemented on top of it, all cases will be handled correctly. One problem with the previous code is that bookkeeping was performed all over the place, making it very easy to introduce subtle bugs. After this refactoring it's hopefully easier to follow along. Despite this being a refactoring, it introduces some changes in behaviour. These changes do, in fact, improve consistency, and should not cause any issue AFAICT, but they're still worth mentioning and thinking over. Basically, every time a device is detached from the host, its original status will be restored once it's reattached, which means that if it was not bound to any driver when 'virsh nodedev-detach' is called, it will not be bound to any driver after 'virsh nodedev-reattach' is called. This is the same thing that used to happen, and still happens, when such a managed PCI hostdev is attached and then detached from a guest. One more thing worth mentioning is that the code now relies heavily on libvirt's internal state, ie. the list of active and inactive PCI hostdevs. These lists do not currently survive daemon restarts, so the series is unfit for merge until that detail is sorted out. It's unclear to me how I could go about that, any suggestion? Cheers. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1272300 [2] https://www.redhat.com/archives/libvir-list/2015-December/msg00070.html Andrea Bolognani (7): hostdev: Add reattachPCIDevices() hostdev: Use common reattach code to rollback prepare errors hostdev: Use common reattach code in virHostdevPCINodeDeviceReAttach() hostdev: Add detachPCIDevices() hostdev: Use common detach code in virHostdevPCINodeDeviceDetach() pci: Phase out virPCIDeviceReattachInit() pci: Add debug messages when unbinding from stub driver src/libvirt_private.syms | 1 - src/util/virhostdev.c | 389 +++++++++++++++++++++++++++++------------------ src/util/virpci.c | 30 ++-- src/util/virpci.h | 1 - tests/virpcitest.c | 5 +- 5 files changed, 267 insertions(+), 159 deletions(-) -- 2.5.0

2 15

[libvirt] [PATCH 0/2] macvtap/802.1Qbh fixes
by Laine Stump 22 Jan '16

22 Jan '16

The first patch generally improves performance when creating a lot of macvtap devices. It was inspired by Tony Krowiak's email back in November. The 2nd patch eliminates a bogus error when destroying a macvtap passthrough device that is using 802.1Qbh. Laine Stump (2): util: keep/use a bitmap of in-use macvtap devices util: reset MAC address of macvtap passthrough physdev after disassociate src/libvirt_private.syms | 2 + src/qemu/qemu_process.c | 10 +- src/util/virnetdevmacvlan.c | 454 +++++++++++++++++++++++++++++++++++++------- src/util/virnetdevmacvlan.h | 5 +- 4 files changed, 398 insertions(+), 73 deletions(-) -- 2.5.0

2 5