- Devel - libvirt List Archives

[libvirt] [PATCH 0/8] disk device="lun" related fixes
by Peter Krempa 10 May '16

10 May '16

Fix a few invalid error messages, remove code that would make certain configs vanish and reject block copy to a regular file. Peter Krempa (8): util: Replace virDomainDiskSourceIsBlockType with a new helper lxc: Fix wrong error message on disk hotplug qemu: Support <disk device='lun'> for iSCSI direct mapped volumes qemu: command: Use more appropriate checking function for block devices conf: Kill now unused virDomainDiskSourceIsBlockType qemu: command: Remove unnecessary label in qemuCheckDiskConfig qemu: Reject invalid block copy targets for <disk device='lun'> Revert "conf: Validate disk lun using correct types" src/conf/domain_conf.c | 74 ----------------------------------------------- src/conf/domain_conf.h | 3 -- src/libvirt_private.syms | 2 +- src/lxc/lxc_cgroup.c | 3 +- src/lxc/lxc_driver.c | 9 ++++-- src/qemu/qemu_command.c | 29 +++++++------------ src/qemu/qemu_conf.c | 10 +++++-- src/qemu/qemu_domain.c | 31 ++++++++++++++++++++ src/qemu/qemu_domain.h | 3 ++ src/qemu/qemu_driver.c | 4 +++ src/util/virstoragefile.c | 16 +++++++++- src/util/virstoragefile.h | 3 +- tests/qemuxml2argvtest.c | 3 +- 13 files changed, 82 insertions(+), 108 deletions(-) -- 2.8.1

4 25

[libvirt] [PATCH 0/7] Introduce APIs to get/set client processing controls
by Erik Skultety 10 May '16

10 May '16

- APIs enable retrieval of values for maximum number of clients allowed to be connected, maximum number of clients allowed to wait for authentication, as well as current (dynamic) values for both cases; expectedly, setter only allows to set the limits available through libvirtd.conf - until patch "makefile: Move include/Makefile.am to include/libvirt/Makefile.am" is reviewed an pushed, config.status must be run after after 1/7 for a successful build. Erik Skultety (7): libvirt-host: Move virTypedParam* to libvirt-common admin: Enable usage of typed parameters virnetserver: Introduce client processing controls getters admin: Introduce some public constants related to client processing controls admin: Introduce virAdmServerGetClientProcessingControls admin: Introduce virAdmServerSetClientProcessingControls virt-admin: Introduce commands srv-clients-info and srv-clients-set cfg.mk | 2 +- daemon/admin.c | 85 ++++++++++++++++ daemon/admin_server.c | 77 +++++++++++++++ daemon/admin_server.h | 10 ++ include/libvirt/libvirt-admin.h | 52 ++++++++++ include/libvirt/libvirt-common.h.in | 185 +++++++++++++++++++++++++++++++++++ include/libvirt/libvirt-host.h | 186 ------------------------------------ src/admin/admin_protocol.x | 54 ++++++++++- src/admin/admin_remote.c | 81 ++++++++++++++++ src/admin_protocol-structs | 45 +++++++++ src/libvirt-admin.c | 89 +++++++++++++++++ src/libvirt_admin_private.syms | 3 + src/libvirt_admin_public.syms | 2 + src/rpc/virnetserver.c | 82 ++++++++++++++++ src/rpc/virnetserver.h | 9 ++ tools/virt-admin.c | 182 +++++++++++++++++++++++++++++++++++ 16 files changed, 956 insertions(+), 188 deletions(-) -- 2.4.11

2 9

[libvirt] [PATCH REPOST 0/2] Admin API: Add support for client disconnect
by Erik Skultety 10 May '16

10 May '16

Rebased version of https://www.redhat.com/archives/libvir-list/2016-April/msg01987.html onto current HEAD to resolve some rebase conflicts. The original patch 1/3 was dropped, since it has already been merged with client-info series: https://www.redhat.com/archives/libvir-list/2016-April/msg01979.html, so Erik Skultety (2): admin: Introduce virAdmClientClose API virt-admin: Introduce client-disconnect command daemon/admin.c | 6 ++++ daemon/admin_server.c | 9 +++++ daemon/admin_server.h | 3 ++ include/libvirt/libvirt-admin.h | 2 ++ src/admin/admin_protocol.x | 12 ++++++- src/admin_protocol-structs | 5 +++ src/libvirt-admin.c | 30 +++++++++++++++++ src/libvirt_admin_private.syms | 1 + src/libvirt_admin_public.syms | 1 + tools/virt-admin.c | 73 +++++++++++++++++++++++++++++++++++++++++ tools/virt-admin.pod | 5 +++ 11 files changed, 146 insertions(+), 1 deletion(-) -- 2.4.11

3 9

[libvirt] [PATCH 0/2] Some trivial admin fixes
by Erik Skultety 10 May '16

10 May '16

Flags checking should be done solely on the daemon side and therefore such checks need to be removed from public APIs. Erik Skultety (2): admin: Remove flags checking from public API entry points admin: Remove flags checking from virAdmConnectOpen public API src/admin/admin_remote.c | 2 +- src/libvirt-admin.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) -- 2.4.11

3 7

[libvirt] [PATCH] storage: Fix regression cloning volume into a logical pool
by John Ferlan 10 May '16

10 May '16

https://bugzilla.redhat.com/show_bug.cgi?id=1318993 Commit id 'dd519a294' caused a regression cloning a volume into a logical pool by removing just the 'allocation' adjustment during storageVolCreateXMLFrom. Combined with the change to not require the new volume input XML to have a capacity listed (commit id 'e3f1d2a8') left the possibility that a copy from a larger volume into a smaller volume would create a thin/sparse logical volume. If a thin lv becomes fully populated, then LVM will set the partition 'inactive' and the subsequent fdatasync() would fail. In order to fix this in a backend agnostic manner, only adjust the new capacity if not provided. Likewise, if the new allocation is not provided, then use the capacity value as we document that if omitted, the volume will be fully allocated at time of creation. For a logical backend, that creation time is 'createVol', while for a file backend, creation doesn't set the size, but the 'createRaw' called during buildVolFrom will decide whether the file is sparse or not based on the provided capacity and allocation value. For volume clones that provide different allocation and capacity values to allow for sparse files, there is no change. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- NOTE: Related bz's to previous changes: https://bugzilla.redhat.com/show_bug.cgi?id=1130739 https://bugzilla.redhat.com/show_bug.cgi?id=1298065 I have tested using 'virsh vol-clone' and 'virt-clone' with and without this patch applied. Both tests have the same results for the 'qemu-img info' on the cloned file. src/storage/storage_driver.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index fcc0991..4415a4c 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2034,11 +2034,22 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } - /* Use the original volume's capacity in case the new capacity - * is less than that, or it was omitted */ - if (newvol->target.capacity < origvol->target.capacity) + /* Use the original volume's capacity if the new capacity was omitted. + * If the provided newvol capacity is less than original, we cannot just + * use the original since the subsequent createVol has "competing needs" + * for backends. A logical volume backend could then create a thin lv + * that has different characteristics when copying from the original + * volume than perhaps a raw disk file. */ + if (newvol->target.capacity == 0) newvol->target.capacity = origvol->target.capacity; + /* If the new allocation is 0, then use capacity as it's specifically + * documented "If omitted when creating a volume, the volume will be + * fully allocated at time of creation.". This is especially important + * for logical volume creation. */ + if (newvol->target.allocation == 0) + newvol->target.allocation = newvol->target.capacity; + if (!backend->buildVolFrom) { virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support" -- 2.5.5

3 5

[libvirt] [PATCH 0/4] some graphics cleanups and improvements
by Pavel Hrdina 10 May '16

10 May '16

Pavel Hrdina (4): qemu_process: separate graphics port reservation graphics: generate fake ports also for tests qemu_process: merge graphics code into qemuProcessSetupGraphics qemu_hotplug: fix checking graphics ports src/qemu/qemu_driver.c | 12 --- src/qemu/qemu_hotplug.c | 13 ++-- src/qemu/qemu_process.c | 86 +++++++++++----------- src/qemu/qemu_process.h | 8 -- .../qemuhotplug-graphics-spice-listen-network.xml | 2 +- .../qemuxml2argv-controller-order.args | 2 +- .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 2 +- 8 files changed, 51 insertions(+), 76 deletions(-) -- 2.8.2

2 9

[libvirt] [PATCH v2 0/2] uml: only build on Linux
by Roman Bogorodskiy 10 May '16

10 May '16

Changes since v1: - Add forgotten with_libvirtd check and unite it with the with_linux check - Minor code formatting fixes in m4/virt-driver-uml.m4 Roman Bogorodskiy (2): configure: split out UML driver checks uml: only build on Linux configure.ac | 28 ++------------------------ m4/virt-driver-uml.m4 | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 26 deletions(-) create mode 100644 m4/virt-driver-uml.m4 -- 2.7.4

2 4

[libvirt] [PATCH] conf: don't redefine virDomainCapsDeviceHostdev
by Roman Bogorodskiy 10 May '16

10 May '16

Commit 5ed235c6 added unnecessary redifinition of virDomainCapsDeviceHostdev in conf/domain_capabilities.h. This breaks build with clang 3.4: In file included from conf/domain_capabilities.c:25: conf/domain_capabilities.h:88:44: error: redefinition of typedef 'virDomainCapsDeviceHostdev' is a C11 feature [-Werror,-Wtypedef-redefinition] typedef struct _virDomainCapsDeviceHostdev virDomainCapsDeviceHostdev; ^ conf/domain_capabilities.h:86:44: note: previous definition is here typedef struct _virDomainCapsDeviceHostdev virDomainCapsDeviceHostdev; So drop one of those. Pushed under the build breaker fix rule. --- src/conf/domain_capabilities.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index d0ca009..492a9cf 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -84,8 +84,6 @@ struct _virDomainCapsDeviceVideo { }; typedef struct _virDomainCapsDeviceHostdev virDomainCapsDeviceHostdev; - -typedef struct _virDomainCapsDeviceHostdev virDomainCapsDeviceHostdev; typedef virDomainCapsDeviceHostdev *virDomainCapsDeviceHostdevPtr; struct _virDomainCapsDeviceHostdev { bool supported; -- 2.7.4

1 0

[libvirt] (no subject)
by Lovely K. 10 May '16

10 May '16

plz added me ...i need a some application for development

2 1

[libvirt] [PATCHv2] virsh: blkdeviotune: accept human readable values for bytes
by Nishith Shah 10 May '16

10 May '16

Use vshCommandOptScaledInt instead of vshCommandOptULongLong so that values with suffixes can be passed when bytes are being passed along. Values for the iops parameters still need to be given in the absolute form as they are not bytes but numbers. Please refer to the bug link https://bugzilla.redhat.com/show_bug.cgi?id=885380 which can be closed. Signed-off-by: Nishith Shah <nishithshah.2211(a)gmail.com> --- tools/virsh-domain.c | 24 ++++++++++++------------ tools/virsh.pod | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0a6caae..336a65f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1164,7 +1164,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = { }, {.name = "total-bytes-sec", .type = VSH_OT_INT, - .help = N_("total throughput limit in bytes per second") + .help = N_("total throughput limit, as scaled integer (default bytes)") }, {.name = "read_bytes_sec", .type = VSH_OT_ALIAS, @@ -1172,7 +1172,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = { }, {.name = "read-bytes-sec", .type = VSH_OT_INT, - .help = N_("read throughput limit in bytes per second") + .help = N_("read throughput limit, as scaled integer (default bytes)") }, {.name = "write_bytes_sec", .type = VSH_OT_ALIAS, @@ -1180,7 +1180,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = { }, {.name = "write-bytes-sec", .type = VSH_OT_INT, - .help = N_("write throughput limit in bytes per second") + .help = N_("write throughput limit, as scaled integer (default bytes)") }, {.name = "total_iops_sec", .type = VSH_OT_ALIAS, @@ -1212,7 +1212,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = { }, {.name = "total-bytes-sec-max", .type = VSH_OT_INT, - .help = N_("total max in bytes") + .help = N_("total max, as scaled integer (default bytes)") }, {.name = "read_bytes_sec_max", .type = VSH_OT_ALIAS, @@ -1220,7 +1220,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = { }, {.name = "read-bytes-sec-max", .type = VSH_OT_INT, - .help = N_("read max in bytes") + .help = N_("read max, as scaled integer (default bytes)") }, {.name = "write_bytes_sec_max", .type = VSH_OT_ALIAS, @@ -1228,7 +1228,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = { }, {.name = "write-bytes-sec-max", .type = VSH_OT_INT, - .help = N_("write max in bytes") + .help = N_("write max, as scaled integer (default bytes)") }, {.name = "total_iops_sec_max", .type = VSH_OT_ALIAS, @@ -1299,7 +1299,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "device", &disk) < 0) goto cleanup; - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1308,7 +1308,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1317,7 +1317,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-bytes-sec", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1326,7 +1326,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "total-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1335,7 +1335,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "read-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, @@ -1344,7 +1344,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec-max", &value)) < 0) { + if ((rv = vshCommandOptScaledInt(ctl, cmd, "write-bytes-sec-max", &value, 1, ULLONG_MAX)) < 0) { goto interror; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, diff --git a/tools/virsh.pod b/tools/virsh.pod index 2a95df7..6844823 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1097,15 +1097,21 @@ I<domain> (see also B<domblklist> for listing these names). If no limit is specified, it will query current I/O limits setting. Otherwise, alter the limits with these flags: -I<--total-bytes-sec> specifies total throughput limit in bytes per second. -I<--read-bytes-sec> specifies read throughput limit in bytes per second. -I<--write-bytes-sec> specifies write throughput limit in bytes per second. +I<--total-bytes-sec> specifies total throughput limit as a scaled integer, the +default being bytes per second if no suffix is specified. +I<--read-bytes-sec> specifies read throughput limit as a scaled integer, the +default being bytes per second if no suffix is specified. +I<--write-bytes-sec> specifies write throughput limit as a scaled integer, the +default being bytes per second if no suffix is specified. I<--total-iops-sec> specifies total I/O operations limit per second. I<--read-iops-sec> specifies read I/O operations limit per second. I<--write-iops-sec> specifies write I/O operations limit per second. -I<--total-bytes-sec-max> specifies maximum total throughput limit in bytes per second. -I<--read-bytes-sec-max> specifies maximum read throughput limit in bytes per second. -I<--write-bytes-sec-max> specifies maximum write throughput limit in bytes per second. +I<--total-bytes-sec-max> specifies maximum total throughput limit as a scaled +integer, the default being bytes per second if no suffix is specified +I<--read-bytes-sec-max> specifies maximum read throughput limit as a scaled +integer, the default being bytes per second if no suffix is specified. +I<--write-bytes-sec-max> specifies maximum write throughput limit as a scaled +integer, the default being bytes per second if no suffix is specified. I<--total-iops-sec-max> specifies maximum total I/O operations limit per second. I<--read-iops-sec-max> specifies maximum read I/O operations limit per second. I<--write-iops-sec-max> specifies maximum write I/O operations limit per second. -- 2.1.4

2 2

[libvirt] [PATCH] qemu: add default pci-root device to mips*/malta guests
by Aurelien Jarno 09 May '16

09 May '16

The MIPS Malta board has a root PCI controller. It is not sent during migration, so it needs to be added by default. Signed-off-by: Aurelien Jarno <aurelien(a)aurel32.net> --- src/qemu/qemu_domain.c | 15 ++++++++++++++- src/qemu/qemu_domain.h | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 173f82c..75b0545 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1763,6 +1763,14 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def, addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX); break; + case VIR_ARCH_MIPS: + case VIR_ARCH_MIPSEL: + case VIR_ARCH_MIPS64: + case VIR_ARCH_MIPS64EL: + if (qemuDomainMachineIsMalta(def)) + addPCIRoot = true; + break; + case VIR_ARCH_PPC64: case VIR_ARCH_PPC64LE: addPCIRoot = true; @@ -4654,6 +4662,11 @@ qemuDomainMachineIsVirt(const virDomainDef *def) STRPREFIX(def->os.machine, "virt-"); } +bool +qemuDomainMachineIsMalta(const virDomainDef *def) +{ + return STRPREFIX(def->os.machine, "malta"); +} static bool qemuCheckMemoryDimmConflict(const virDomainDef *def, @@ -4830,7 +4843,7 @@ bool qemuDomainMachineHasBuiltinIDE(const virDomainDef *def) { return qemuDomainMachineIsI440FX(def) || - STREQ(def->os.machine, "malta") || + qemuDomainMachineIsMalta(def) || STREQ(def->os.machine, "sun4u") || STREQ(def->os.machine, "g3beige"); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 95f821c..adba5fa 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -585,6 +585,7 @@ bool qemuDomainMachineIsI440FX(const virDomainDef *def); bool qemuDomainMachineNeedsFDC(const virDomainDef *def); bool qemuDomainMachineIsS390CCW(const virDomainDef *def); bool qemuDomainMachineIsVirt(const virDomainDef *def); +bool qemuDomainMachineIsMalta(const virDomainDef *def); bool qemuDomainMachineHasBuiltinIDE(const virDomainDef *def); int qemuDomainUpdateCurrentMemorySize(virQEMUDriverPtr driver, -- 2.8.1

2 3

[libvirt] Introducing myself (GSoC 2016 student)
by Katerina Koukiou 09 May '16

09 May '16

Hi, my name is Katerina Koukiou and I got selected as a GSoC student this year to work on libvirt. My project is to add libvirt support for migration of lxc containers using a tool called CRIU. For the time, I am in my final year of undergraduate studies in Electrical and Computer Engineering, at NTUA university, Greece. Looking forward to share some patches here! Katerina

2 1

[libvirt] [PATCH 00/27] Introduce sparse streams
by Michal Privoznik 09 May '16

09 May '16

So, after couple of sleepless nights and headaches I'm proud to announce that finally got this working. What? Our regular streams that are can be used to transfer disk images for domains are unaware of any sparseness. Therefore they have two limitations: a) transferring big but sparse image can take ages as all the holes (interpreted by kernel as '\0') have to go through our event loop. b) resulting volume is not sparse even if the source was. How? I went by verified approach that linux kernel has. One way to look at our streams is just like read() and write() with a different names: virStreamRecv() and virStreamSend(). They even have the same prototype (if 'int fd' is substituted with 'virStreamPtr'). Now, holes in files are created and detected via third API: lseek(). Therefore I'm introducing new virStreamSkip() API that mimics the missing primitive. Now, because our streams do not necessarily have to work over files (they are for generic data transfer), I had to let users register a callback that is called whenever the other side calls virStreamSkip(). So now that we have all three primitives, we can focus on making life easier for our users. Nobody is actually using bare virStreamSend() and virStreamRecv() rather than our wrappers: virStreamSendAll() and virStreamRecvAll(). With my approach described above just virStreamSendAll() needs to be adjusted so that it's 'sparse file' aware. The virStreamRecvAll() will only get the data to write (just like it is now) with skip callback called automatically whenever needed. In order for virStreamSendAll() to skip holes I'm introducing yet another callback: virStreamInDataFunc(). This callback will help us to create a map of a file: before each virStreamSend() it checks whether we are in a data section or a hole and calls virStreamSend() or virStreamSkip() respectively. Do not worry - it will all become clear once you see the code. Now question is - how will users enable this feature? I mean, we have take into account that we might be talking to an older daemon that does not know how to skip a hole. Or vice versa - older client. The solution I came up with is to introduce flags to APIs where sparse streams make sense. I guess it makes sense for volume upload and download, but almost certainly makes no sense for virDomainOpenConsole(). Code? >From users POV they just need to pass correct argument to 'vol-upload' or 'vol-download' virsh commands. One layer down, on programming level they need to merely: st = virStreamNew(conn, 0); virStreamRegisterSkip(st, skipFunc, &fd); virStorageVolDownload(st, ...); virStreamRecvAll(st, sinkFunc, &fd); where: int skipFunc(virStreamPtr st, unsigned long long offset, void *opaque) { int *fd = opaque; return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; } And for uploading it's slightly more verbose - see patch 24. Limitations? While testing this on my machine with XFS, I've noticed that the resulting map of a transferred file is not exactly the same as the source's. Checksums are the same though. After digging deeper I found this commit in the kernel: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=0… Thing is, as we transfer the file, we are practically just seeking at EOF and thus creating holes. But if the hole size is small enough, XFS will use some speculative file allocation algorithm and eventually fully allocate the blocks even if we intended to create a hole. This does not occur when punching a hole into a file though. Well, I guess XFS devels have some reasons to do that. This behaviour has not been observed on EXT4. Notes? Oh, patches 01-03 have been ACKed already, but are not pushed yet because of the freeze. But since this feature build on the top of them, I'm sending them too. Also the whole patch set is accessible at my github: https://github.com/zippy2/libvirt/tree/sparse_streams4 Michal Privoznik (27): Revert "rpc: Fix slow volume download (virsh vol-download)" virnetclientstream: Process stream messages later virStream{Recv,Send}All: Increase client buffer Introduce virStreamSkip Introduce virStreamRegisterSkip and virStreamSkipCallback Introduce virStreamInData and virStreamRegisterInData virNetClientStreamNew: Track origin stream Track if stream is seekable RPC: Introduce virNetStreamSkip Introduce VIR_NET_STREAM_SKIP message type Teach wireshark plugin about VIR_NET_STREAM_SKIP daemon: Implement VIR_NET_STREAM_SKIP handling daemon: Introduce virNetServerProgramSendStreamSkip virnetclientstream: Introduce virNetClientStreamSendSkip virnetclientstream: Introduce virNetClientStreamHandleSkip remote_driver: Implement virStreamSkip daemonStreamHandleRead: Wire up seekable stream virNetClientStream: Wire up VIR_NET_STREAM_SKIP virStreamSendAll: Wire up sparse streams fdstream: Implement seek gendispatch: Introduce @sparseflag for our calls Introduce virStorageVol{Download,Upload}Flags virsh: Implement sparse stream to vol-download virsh: Implement sparse stream to vol-upload fdstream: Suppress use of IO helper for sparse streams daemon: Don't call virStreamInData so often storage: Enable sparse streams for virStorageVol{Download,Upload} daemon/remote.c | 2 +- daemon/stream.c | 134 +++++++++++++-- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 47 ++++++ src/datatypes.h | 8 + src/driver-stream.h | 5 + src/fdstream.c | 156 +++++++++++++++--- src/fdstream.h | 3 +- src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 238 ++++++++++++++++++++++++++- src/libvirt_internal.h | 7 + src/libvirt_private.syms | 2 + src/libvirt_public.syms | 7 + src/libvirt_remote.syms | 2 + src/remote/remote_driver.c | 41 ++++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 ++- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 308 ++++++++++++++++++++++++----------- src/rpc/virnetclientstream.h | 10 +- src/rpc/virnetprotocol.x | 16 +- src/rpc/virnetserverprogram.c | 33 ++++ src/rpc/virnetserverprogram.h | 7 + src/storage/storage_backend.c | 12 +- src/storage/storage_driver.c | 4 +- src/virnetprotocol-structs | 4 + tools/virsh-volume.c | 40 ++++- tools/virsh.c | 79 +++++++++ tools/virsh.h | 12 ++ tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 40 +++++ tools/wireshark/src/packet-libvirt.h | 2 + 33 files changed, 1104 insertions(+), 161 deletions(-) -- 2.8.1

4 45

[libvirt] [PATCH] util: polkit: Fix polkit agent startup
by Peter Krempa 09 May '16

09 May '16

Commit 0b36b0e9 broke polkit agent startup when attempting to fix a coverity warning. Refactor it properly so that we don't need the 'cmd' intermediate variable. --- src/util/virpolkit.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 2038744..e7e46b8 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -167,7 +167,6 @@ virPolkitAgentPtr virPolkitAgentCreate(void) { virPolkitAgentPtr agent = NULL; - virCommandPtr cmd = virCommandNewArgList(PKTTYAGENT, "--process", NULL); int pipe_fd[2] = {-1, -1}; struct pollfd pollfd; int outfd = STDOUT_FILENO; @@ -181,18 +180,18 @@ virPolkitAgentCreate(void) if (VIR_ALLOC(agent) < 0) goto error; - agent->cmd = cmd; - cmd = NULL; - - virCommandAddArgFormat(cmd, "%lld", (long long int) getpid()); - virCommandAddArg(cmd, "--notify-fd"); - virCommandAddArgFormat(cmd, "%d", pipe_fd[1]); - virCommandAddArg(cmd, "--fallback"); - virCommandSetInputFD(cmd, STDIN_FILENO); - virCommandSetOutputFD(cmd, &outfd); - virCommandSetErrorFD(cmd, &errfd); - virCommandPassFD(cmd, pipe_fd[1], VIR_COMMAND_PASS_FD_CLOSE_PARENT); - if (virCommandRunAsync(cmd, NULL) < 0) + + agent->cmd = virCommandNewArgList(PKTTYAGENT, "--process", NULL); + + virCommandAddArgFormat(agent->cmd, "%lld", (long long int) getpid()); + virCommandAddArg(agent->cmd, "--notify-fd"); + virCommandAddArgFormat(agent->cmd, "%d", pipe_fd[1]); + virCommandAddArg(agent->cmd, "--fallback"); + virCommandSetInputFD(agent->cmd, STDIN_FILENO); + virCommandSetOutputFD(agent->cmd, &outfd); + virCommandSetErrorFD(agent->cmd, &errfd); + virCommandPassFD(agent->cmd, pipe_fd[1], VIR_COMMAND_PASS_FD_CLOSE_PARENT); + if (virCommandRunAsync(agent->cmd, NULL) < 0) goto error; pollfd.fd = pipe_fd[0]; @@ -207,7 +206,6 @@ virPolkitAgentCreate(void) VIR_FORCE_CLOSE(pipe_fd[0]); VIR_FORCE_CLOSE(pipe_fd[1]); virPolkitAgentDestroy(agent); - virCommandFree(cmd); return NULL; } -- 2.8.2

2 1

[libvirt] [PATCH v2 0/8] Add support for fetching statistics of completed jobs
by Jiri Denemark 09 May '16

09 May '16

Using virDomainGetJobStats, we can monitor running jobs but sometimes it may be useful to get statistics about a job that already finished, for example, to get the final amount of data transferred during migration or to get an idea about total downtime. This is what the following patches are about. Version 2: - changed according to John's review (see individual patches for details) Jiri Denemark (8): Refactor job statistics qemu: Avoid incrementing jobs_queued if virTimeMillisNow fails Add support for fetching statistics of completed jobs qemu: Silence coverity on optional migration stats virsh: Add support for completed job stats qemu: Transfer migration statistics to destination qemu: Recompute downtime and total time when migration completes qemu: Transfer recomputed stats back to source include/libvirt/libvirt.h.in | 11 ++ src/libvirt.c | 11 +- src/qemu/qemu_domain.c | 189 ++++++++++++++++++++++++++- src/qemu/qemu_domain.h | 32 ++++- src/qemu/qemu_driver.c | 130 ++++-------------- src/qemu/qemu_migration.c | 304 ++++++++++++++++++++++++++++++++++++------- src/qemu/qemu_monitor_json.c | 10 +- src/qemu/qemu_process.c | 9 +- tools/virsh-domain.c | 27 +++- tools/virsh.pod | 10 +- 10 files changed, 557 insertions(+), 176 deletions(-) -- 2.1.0

3 12

[libvirt] [PATCH 0/4] qemu_monitor_json: Refactor even more
by Michal Privoznik 09 May '16

09 May '16

All these patches will be squashed into one, but I've split them into multiple because of easier review. Michal Privoznik (4): qemu_monitor_json: Follow refactor qemu_monitor_json: Follow refactor qemu_monitor_json: Follow refactor qemu_monitor_json: Follow refactor src/qemu/qemu_monitor_json.c | 673 ++++++++++++++++++++++--------------------- 1 file changed, 349 insertions(+), 324 deletions(-) -- 2.8.1

2 6

[libvirt] [PATCH] qemu: domain: Don't treat unknown storage type as not having backing chain
by Peter Krempa 09 May '16

09 May '16

qemuDomainCheckDiskPresence has short-circuit code to skip the determination of the disk backing chain for storage formats that can't have backing volumes. The code treats VIR_STORAGE_FILE_NONE as not having backing chain and skips the call to qemuDomainDetermineDiskChain. This is wrong as qemuDomainDetermineDiskChain is responsible for storage format detection and has logic to determine the default type if format detection is disabled. This allows to storage passed via <disk type="volume"> to circumvent the enforcement to have correct storage format or that we shall default to format='raw', since we don't set the default type via the post parse callback for "volume" backed disks as the translation code could come up with a better guess. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1328003 --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cae356c..78a717a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3817,7 +3817,7 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, * without backing support, the fact that the file exists is * more than enough */ if (virStorageSourceIsLocalStorage(disk->src) && - format >= VIR_STORAGE_FILE_NONE && + format > VIR_STORAGE_FILE_NONE && format < VIR_STORAGE_FILE_BACKING && virFileExists(virDomainDiskGetSource(disk))) continue; -- 2.8.2

2 2

[libvirt] [PATCH] cpu: add ABM to Haswell* and Broadwell* CPU models
by Eli Qiao 09 May '16

09 May '16

Corresponding QEMU commits: becb66673ec30cb604926d247ab9449a60ad8b11 Signed-off-by: Eli Qiao <liyong.qiao(a)intel.com> --- src/cpu/cpu_map.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..d9eb729 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -919,6 +919,7 @@ <model name='Haswell-noTSX'> <vendor name='Intel'/> + <feature name='abm'/> <feature name='aes'/> <feature name='apic'/> <feature name='avx'/> @@ -971,6 +972,7 @@ <model name='Haswell'> <vendor name='Intel'/> + <feature name='abm'/> <feature name='aes'/> <feature name='apic'/> <feature name='avx'/> @@ -1026,6 +1028,7 @@ <model name='Broadwell-noTSX'> <vendor name='Intel'/> <feature name='3dnowprefetch'/> + <feature name='abm'/> <feature name='adx'/> <feature name='aes'/> <feature name='apic'/> @@ -1082,6 +1085,7 @@ <model name='Broadwell'> <vendor name='Intel'/> <feature name='3dnowprefetch'/> + <feature name='abm'/> <feature name='adx'/> <feature name='aes'/> <feature name='apic'/> -- 1.9.1

3 2

[libvirt] [PATCH 0/3] Couple of patches to resolve recent Coverity issues
by John Ferlan 07 May '16

07 May '16

Recent changes have tripped my Coverity checker. John Ferlan (3): Use virGetLastErrorMessage to avoid Coverity message admin: Clean up error path in adminServerListClients conf: Fix error path in virNodeDevPCICapabilityParseXML daemon/admin_server.c | 3 +-- src/conf/node_device_conf.c | 5 ++++- src/network/bridge_driver.c | 3 +-- src/node_device/node_device_hal.c | 3 +-- 4 files changed, 7 insertions(+), 7 deletions(-) -- 2.5.5

3 9

[libvirt] [PATCH 00/17] improve graphics listen configuration
by Pavel Hrdina 06 May '16

06 May '16

This patch series improves the way how different listen types can be specified and also introduce a new listen types for graphics devices. First improvement is to move ports auto of graphics element into listen element with type address or network. This is a first step to make the code listen-driven. Second step is to create a new listen type socket to improve the current vnc configuration and to print only socket path witout any other listen types. With the new socket type now we can add support also to spice graphics. The last improvement is to introduce new listen type none for spice graphics to specify that the spice graphics shouldn't listen anywhere by default. In case of spice graphics the new listen types socket or none are required to start a guest with OpenGL support. Pavel Hrdina (17): graphics: use enums instead of int qemu_process: move listen code out of qemuProcessSetupGraphics qemu_process: handle port allocation for VNC the same way as for Spice graphics: generate fake ports also for tests qemu_hotplug: cleanup qemuDomainChangeGraphics genericxml2xml: add several graphics tests qemu_hotplug: fix checking graphics ports graphics: don't parse listens if socket attribute is present domain_conf: parse listen attr from graphics while parsing listen elements graphics: make address attribute for listen type='address' optional domain_conf: cleanup virDomainGraphicsListenDefParseXML graphics: move port definition to listen element qemu.conf: remove vnc_auto_unix_socket vnc: use listen type=socket instead of socket attribute qemu_capabilites: add QEMU_CAPS_SPICE_UNIX spice: add support for listen type socket spice: introduce listen type none docs/formatdomain.html.in | 138 +++-- docs/schemas/domaincommon.rng | 63 ++- src/conf/domain_conf.c | 604 ++++++++++++++------- src/conf/domain_conf.h | 45 +- src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 61 ++- src/libxl/libxl_domain.c | 17 +- src/qemu/libvirtd_qemu.aug | 1 - src/qemu/qemu.conf | 10 - src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 239 ++++---- src/qemu/qemu_conf.c | 1 - src/qemu/qemu_conf.h | 1 - src/qemu/qemu_domain.c | 19 +- src/qemu/qemu_driver.c | 12 - src/qemu/qemu_hotplug.c | 76 +-- src/qemu/qemu_migration.c | 41 +- src/qemu/qemu_parse_command.c | 41 +- src/qemu/qemu_process.c | 386 ++++++++----- src/qemu/qemu_process.h | 3 + src/qemu/test_libvirtd_qemu.aug.in | 1 - src/security/virt-aa-helper.c | 15 +- src/vbox/vbox_common.c | 30 +- src/vbox/vbox_tmpl.c | 34 +- src/vbox/vbox_uniformed_api.h | 4 +- src/vmx/vmx.c | 54 +- src/vz/vz_sdk.c | 30 +- src/xenconfig/xen_common.c | 74 +-- src/xenconfig/xen_sxpr.c | 71 +-- src/xenconfig/xen_xl.c | 45 +- .../generic-graphics-listen-back-compat-ports.xml | 30 + .../generic-graphics-vnc-listen-attr-only.xml | 28 + ...generic-graphics-vnc-listen-element-minimal.xml | 30 + ...aphics-vnc-listen-element-with-address-port.xml | 30 + ...ic-graphics-vnc-listen-element-with-address.xml | 30 + .../generic-graphics-vnc-manual-port.xml | 28 + .../generic-graphics-vnc-minimal.xml | 28 + .../generic-graphics-vnc-socket-listen.xml | 30 + .../generic-graphics-vnc-socket.xml | 28 + .../generic-graphics-listen-back-compat-ports.xml | 30 + .../generic-graphics-listen-back-compat.xml | 2 +- .../generic-graphics-vnc-listen-attr-only.xml | 30 + ...generic-graphics-vnc-listen-element-minimal.xml | 30 + ...aphics-vnc-listen-element-with-address-port.xml | 30 + ...ic-graphics-vnc-listen-element-with-address.xml | 30 + .../generic-graphics-vnc-manual-port.xml | 30 + .../generic-graphics-vnc-minimal.xml | 30 + .../generic-graphics-vnc-socket-listen.xml | 30 + .../generic-graphics-vnc-socket.xml | 30 + tests/genericxml2xmltest.c | 10 + .../qemuargv2xml-graphics-vnc-policy.xml | 2 +- .../qemuargv2xml-graphics-vnc-sasl.xml | 2 +- .../qemuargv2xml-graphics-vnc-socket.xml | 4 +- .../qemuargv2xml-graphics-vnc-tls.xml | 2 +- .../qemuargv2xml-graphics-vnc-websocket.xml | 2 +- .../qemuargv2xmldata/qemuargv2xml-graphics-vnc.xml | 2 +- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuhotplug-graphics-spice-listen-network.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-controller-order.args | 2 +- ...muxml2argv-graphics-spice-auto-unix-socket.args | 21 + ...emuxml2argv-graphics-spice-auto-unix-socket.xml | 30 + .../qemuxml2argv-graphics-spice-unix-socket.args | 20 + .../qemuxml2argv-graphics-spice-unix-socket.xml | 30 + ...qemuxml2argv-graphics-vnc-auto-unix-socket.args | 20 + .../qemuxml2argv-graphics-vnc-auto-unix-socket.xml | 30 + .../qemuxml2argv-graphics-vnc-autosocket.args | 22 - .../qemuxml2argv-graphics-vnc-autosocket.xml | 34 -- .../qemuxml2argv-graphics-vnc-unix-socket.args | 20 + .../qemuxml2argv-graphics-vnc-unix-socket.xml | 30 + .../qemuxml2argv-hugepages-numa.args | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 2 +- .../qemuxml2argv-video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvtest.c | 8 + .../qemuxml2xmlout-graphics-listen-network.xml | 2 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 4 +- ...uxml2xmlout-graphics-spice-auto-unix-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-spice-compression.xml | 2 +- .../qemuxml2xmlout-graphics-spice-qxl-vga.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 4 +- .../qemuxml2xmlout-graphics-spice-unix-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-spice.xml | 2 +- ...emuxml2xmlout-graphics-vnc-auto-unix-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-vnc-autosocket.xml | 39 -- .../qemuxml2xmlout-graphics-vnc-no-listen-attr.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-sasl.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-tls.xml | 2 +- .../qemuxml2xmlout-graphics-vnc-unix-socket.xml | 35 ++ .../qemuxml2xmlout-graphics-vnc-websocket.xml | 2 +- .../qemuxml2xmlout-graphics-vnc.xml | 2 +- .../qemuxml2xmlout-interface-server.xml | 4 +- .../qemuxml2xmlout-net-bandwidth.xml | 4 +- .../qemuxml2xmlout-net-bandwidth2.xml | 4 +- .../qemuxml2xmlout-pci-bridge.xml | 2 +- ...emuxml2xmlout-seclabel-dynamic-none-relabel.xml | 2 +- .../qemuxml2xmlout-serial-spiceport.xml | 2 +- .../qemuxml2xmlout-video-virtio-gpu-spice-gl.xml | 3 +- tests/qemuxml2xmltest.c | 11 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 4 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 4 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 4 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 4 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 2 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 4 +- tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 4 +- .../test-disk-positional-parms-full.xml | 2 +- .../test-disk-positional-parms-partial.xml | 2 +- ...est-fullvirt-direct-kernel-boot-bogus-extra.xml | 2 +- .../test-fullvirt-direct-kernel-boot-extra.xml | 2 +- .../test-fullvirt-direct-kernel-boot.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-rbd-multihost-noauth.xml | 2 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigdata/test-vif-rate.xml | 2 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- .../xmconfigdata/test-fullvirt-default-feature.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 2 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.xml | 4 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 2 +- .../test-paravirt-new-pvfb-vncdisplay.xml | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 2 +- tests/xmconfigdata/test-pci-devs.xml | 4 +- 173 files changed, 2392 insertions(+), 1014 deletions(-) create mode 100644 tests/genericxml2xmlindata/generic-graphics-listen-back-compat-ports.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-listen-attr-only.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-minimal.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address-port.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-listen-element-with-address.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-manual-port.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-minimal.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket-listen.xml create mode 100644 tests/genericxml2xmlindata/generic-graphics-vnc-socket.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-listen-back-compat-ports.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-listen-attr-only.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-minimal.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address-port.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-listen-element-with-address.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-manual-port.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-minimal.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-socket-listen.xml create mode 100644 tests/genericxml2xmloutdata/generic-graphics-vnc-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-unix-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-unix-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-unix-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-unix-socket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-unix-socket.xml delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.args delete mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-unix-socket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-unix-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-auto-unix-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-unix-socket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-auto-unix-socket.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-autosocket.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-vnc-unix-socket.xml -- 2.8.2

4 33

[libvirt] [PATCH v2 0/4] qemu: handle ',' and '=' in VM name
by Cole Robinson 06 May '16

06 May '16

This series adds qemu cli comma escaping to several places that are dependent on the VM name, to enable names with embedded commas. Patch 4 makes use of qemu -name guest=X value to allow names with '=' in them. https://bugzilla.redhat.com/show_bug.cgi?id=639926 https://bugzilla.redhat.com/show_bug.cgi?id=1276485 Note: There's likely other places that are VM name dependent that need comma escaping too, but this hits the mandatory ones. I've listed some more on the BiteSizedTasks page: http://wiki.libvirt.org/page/BiteSizedTasks#qemu:_Use_comma_escaping_for_mo… v2: Rebase to master Cole Robinson (4): qemu: command: escape commas in VM name qemu: command: escape commas in secret master path qemu: command: escape commas in chardev socket path qemu: command: Use -name guest= if available src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 ++++++++++++-------- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + .../qemuxml2argvdata/qemuxml2argv-name-escape.args | 24 ++++++++++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-name-escape.xml | 18 ++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 10 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-name-escape.xml -- 2.7.4

2 10

[libvirt] [PATCH] domain_conf: fix migration/managedsave with usb keyboad
by Pavel Hrdina 06 May '16

06 May '16

Commint 36785c7e refactored the code for input devices but introduced a bug that we removed all keyboard from migratable XML. We have to remove only implicit keyboards like PS2 or XEN. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2c97bc1..b90c2b6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -21193,8 +21193,10 @@ virDomainInputDefFormat(virBufferPtr buf, const char *bus = virDomainInputBusTypeToString(def->bus); /* don't format keyboard into migratable XML for backward compatibility */ - if (def->type == VIR_DOMAIN_INPUT_TYPE_KBD && - flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) + if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && + def->type == VIR_DOMAIN_INPUT_TYPE_KBD && + (def->bus == VIR_DOMAIN_INPUT_BUS_PS2 || + def->bus == VIR_DOMAIN_INPUT_BUS_XEN)) return 0; if (!type) { -- 2.8.2

2 1

[libvirt] [PATCH] virCgroupValidateMachineGroup: Reflect change in CGroup struct naming
by Michal Privoznik 06 May '16

06 May '16

Fron c3bd0019c0e on instead of creating the following path for cgroups: /sys/fs/cgroupX/$name.libvirt-$driver we generate rather more verbose one: /sys/fs/cgroupX/$driver-$id-$name.libvirt-$driver where $name is optional and included iff contains allowed chars. See original commit for more reasoning. Now, problem with the original commit is that we are unable to start any LXC domain after it. Because when starting LXC container, the CGroup layout is created by our lxc_controller process and then detected and validated by libvirtd. The validation is done by trying to match detected layout against all the possible patterns for cgroup paths that we've ever had. And the commit in question forgot to update this part of the code. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I am really surprised how long this bug went unnoticed. Is anybody using LXC? When pushed, it should be backported to 1.3.2+. src/util/vircgroup.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index da5ccff..add6c5f 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -261,12 +261,17 @@ virCgroupValidateMachineGroup(virCgroupPtr group, char *scopename_new = NULL; char *machinename = virSystemdMakeMachineName(drivername, id, name, privileged); + char *partmachinename = NULL; if (virAsprintf(&partname, "%s.libvirt-%s", - name, drivername) < 0) + name, drivername) < 0 || + (machinename && + virAsprintf(&partmachinename, "%s.libvirt-%s", + machinename, drivername) < 0)) goto cleanup; - if (virCgroupPartitionEscape(&partname) < 0) + if (virCgroupPartitionEscape(&partname) < 0 || + (machinename && virCgroupPartitionEscape(&partmachinename) < 0)) goto cleanup; if (!(scopename_old = virSystemdMakeScopeName(name, drivername, true))) @@ -315,6 +320,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, if (STRNEQ(tmp, name) && STRNEQ_NULLABLE(tmp, machinename) && STRNEQ(tmp, partname) && + STRNEQ_NULLABLE(tmp, partmachinename) && STRNEQ(tmp, scopename_old) && STRNEQ_NULLABLE(tmp, scopename_new)) { VIR_DEBUG("Name '%s' for controller '%s' does not match " @@ -329,6 +335,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, valid = true; cleanup: + VIR_FREE(partmachinename); VIR_FREE(partname); VIR_FREE(scopename_old); VIR_FREE(scopename_new); -- 2.8.1

3 2

[libvirt] [PATCH 00/12] Enhance QEMU/domain capabilities tests
by Jiri Denemark 06 May '16

06 May '16

Jiri Denemark (12): tests: Refactor domaincapstest qemucapabilitiestest: Prepare for testing non-x86_64 archs qemu: Separate formatting from saving into caps cache qemu: Export caps cache APIs for tests qemucapabilitiestest: Uses consistent names qemucapabilitiestest: Reindent *.caps files qemucapabilitiestest: Reorder flags in caps files qemucapabilitiestest: Test all capabilities qemucapabilitiestest: Rename *.caps to *.xml domaincapstest: Use default machine type qemucapabilitiestest: Add tests for aarch64 and ppc64le domaincapstest: Add tests for QEMU 2.6 src/qemu/qemu_capabilities.c | 34 +- src/qemu/qemu_capspriv.h | 9 + .../domaincaps-qemu_1.6.50-1.xml | 3 +- .../domaincaps-qemu_2.6.0-1.xml | 63 + .../domaincaps-qemu_2.6.0-2.xml | 63 + .../domaincaps-qemu_2.6.0-3.xml | 67 + .../domaincaps-qemu_2.6.0-4.xml | 67 + .../domaincaps-qemu_2.6.0-5.xml | 61 + tests/domaincapstest.c | 209 +- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 117 - ...1.2.2-1.replies => caps_1.2.2-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml | 159 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 133 - ...1.3.1-1.replies => caps_1.3.1-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml | 179 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 134 - ...1.4.2-1.replies => caps_1.4.2-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml | 181 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 143 - ...1.5.3-1.replies => caps_1.5.3-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml | 190 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 149 - ...1.6.0-1.replies => caps_1.6.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml | 200 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 149 - ...6.50-1.replies => caps_1.6.50-1.x86_64.replies} | 0 .../qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml | 202 + tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 167 - ...2.1.1-1.replies => caps_2.1.1-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml | 225 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 180 - ...2.4.0-1.replies => caps_2.4.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml | 245 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 181 - ...2.5.0-1.replies => caps_2.5.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml | 246 + .../caps_2.6.0-1.aarch64.replies | 4940 ++++++++++++++++ .../qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml | 238 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 186 - .../caps_2.6.0-1.ppc64le.replies | 6163 ++++++++++++++++++++ .../qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml | 604 ++ ...2.6.0-1.replies => caps_2.6.0-1.x86_64.replies} | 0 tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml | 251 + .../caps_2.6.0-2.aarch64.replies | 4940 ++++++++++++++++ .../qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml | 238 + tests/qemucapabilitiestest.c | 92 +- tests/testutilsqemu.c | 41 +- 47 files changed, 19740 insertions(+), 1709 deletions(-) create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-1.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-2.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-3.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-4.xml create mode 100644 tests/domaincapsschemadata/domaincaps-qemu_2.6.0-5.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.caps rename tests/qemucapabilitiesdata/{caps_1.2.2-1.replies => caps_1.2.2-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.2.2-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.3.1-1.caps rename tests/qemucapabilitiesdata/{caps_1.3.1-1.replies => caps_1.3.1-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.3.1-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.4.2-1.caps rename tests/qemucapabilitiesdata/{caps_1.4.2-1.replies => caps_1.4.2-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.4.2-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.5.3-1.caps rename tests/qemucapabilitiesdata/{caps_1.5.3-1.replies => caps_1.5.3-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.5.3-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.0-1.caps rename tests/qemucapabilitiesdata/{caps_1.6.0-1.replies => caps_1.6.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.6.0-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_1.6.50-1.caps rename tests/qemucapabilitiesdata/{caps_1.6.50-1.replies => caps_1.6.50-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_1.6.50-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.1.1-1.caps rename tests/qemucapabilitiesdata/{caps_2.1.1-1.replies => caps_2.1.1-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.1.1-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.4.0-1.caps rename tests/qemucapabilitiesdata/{caps_2.4.0-1.replies => caps_2.4.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.4.0-1.x86_64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.caps rename tests/qemucapabilitiesdata/{caps_2.5.0-1.replies => caps_2.5.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.5.0-1.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.aarch64.xml delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.ppc64le.xml rename tests/qemucapabilitiesdata/{caps_2.6.0-1.replies => caps_2.6.0-1.x86_64.replies} (100%) create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.x86_64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-2.aarch64.xml -- 2.8.2

3 29

[libvirt] [PATCH] conf: Skip generating random MAC in DetachDevice xml
by Kothapally Madhu Pavan 06 May '16

06 May '16

When we try to detach a network device without specifying the mac address, random mac address is generated. As the generated mac address will not be available in the running vm, detaching device will fail erroring out "error: operation failed: no device matching mac address xx:xx:xx:xx:xx:xx found". Signed-off-by: Kothapally Madhu Pavan <kmp(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 4 ++++ src/conf/domain_conf.h | 3 +++ src/libxl/libxl_driver.c | 12 ++++++------ src/lxc/lxc_driver.c | 7 ++++--- src/qemu/qemu_driver.c | 2 ++ src/uml/uml_driver.c | 6 ++++-- src/vbox/vbox_common.c | 6 ++++-- src/vz/vz_driver.c | 4 +++- src/xen/xend_internal.c | 6 ++++-- src/xen/xm_internal.c | 8 ++++---- 10 files changed, 38 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 28248c8..512d877 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8784,6 +8784,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, (const char *)macaddr); goto error; } + } else if (flags & VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("mac address not specified in the device xml")); + goto error; } else { virDomainNetGenerateMAC(xmlopt, &def->mac); } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 1986f53..74692f1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2679,6 +2679,9 @@ typedef enum { VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS = 1 << 8, /* allow updates in post parse callback that would break ABI otherwise */ VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9, + /* don't generate random mac address when a network device without mac address + * is detached */ + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR = 1 << 10, } virDomainDefParseFlags; typedef enum { diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bf97c9c..507edcf 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3726,6 +3726,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_DEVICE_MODIFY_LIVE | VIR_DOMAIN_DEVICE_MODIFY_CONFIG, -1); @@ -3743,9 +3745,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, goto endjob; if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) { - if (!(dev = virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, vm->def, cfg->caps, + driver->xmlopt, parse_flags))) goto endjob; /* Make a copy for updated domain. */ @@ -3760,9 +3761,8 @@ libxlDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) { /* If dev exists it was created to modify the domain config. Free it. */ virDomainDeviceDefFree(dev); - if (!(dev = virDomainDeviceDefParse(xml, vm->def, - cfg->caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, vm->def, cfg->caps, + driver->xmlopt, parse_flags))) goto endjob; if (libxlDomainDetachDeviceLive(driver, vm, dev) < 0) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index ef48812..23f0d80 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5196,6 +5196,8 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, virDomainDefPtr vmdef = NULL; virDomainDeviceDefPtr dev = NULL, dev_copy = NULL; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virLXCDriverConfigPtr cfg = virLXCDriverGetConfig(driver); virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | @@ -5213,9 +5215,8 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr dom, if (!(caps = virLXCDriverGetCapabilities(driver, false))) goto cleanup; - dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, - caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); + dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, + driver->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 862c44c..df85fd5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8486,6 +8486,8 @@ static int qemuDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, !(flags & VIR_DOMAIN_AFFECT_LIVE)) parse_flags |= VIR_DOMAIN_DEF_PARSE_INACTIVE; + parse_flags |= VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; + dev = dev_copy = virDomainDeviceDefParse(xml, vm->def, caps, driver->xmlopt, parse_flags); diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 84e1df8..c232435 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2346,6 +2346,8 @@ static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) virDomainObjPtr vm; virDomainDeviceDefPtr dev = NULL; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; umlDriverLock(driver); vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); @@ -2366,8 +2368,8 @@ static int umlDomainDetachDevice(virDomainPtr dom, const char *xml) goto cleanup; } - dev = virDomainDeviceDefParse(xml, vm->def, driver->caps, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); + dev = virDomainDeviceDefParse(xml, vm->def, driver->caps, + driver->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 0cead10..4c539ef 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -4228,6 +4228,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) virDomainDeviceDefPtr dev = NULL; nsresult rc; int ret = -1; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; if (!data->vboxObj) return ret; @@ -4238,8 +4240,8 @@ static int vboxDomainDetachDevice(virDomainPtr dom, const char *xml) def->os.type = VIR_DOMAIN_OSTYPE_HVM; - dev = virDomainDeviceDefParse(xml, def, data->caps, data->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE); + dev = virDomainDeviceDefParse(xml, def, data->caps, + data->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index ffa6f45..f5f5395 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1172,6 +1172,8 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, vzConnPtr privconn = dom->conn->privateData; virDomainDeviceDefPtr dev = NULL; virDomainObjPtr privdom = NULL; + unsigned int parse_flags = VIR_DOMAIN_XML_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -1184,7 +1186,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr dom, const char *xml, goto cleanup; dev = virDomainDeviceDefParse(xml, privdom->def, privconn->driver->caps, - privconn->driver->xmlopt, VIR_DOMAIN_XML_INACTIVE); + privconn->driver->xmlopt, parse_flags); if (dev == NULL) goto cleanup; diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index cf7cdd0..216c4f4 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2327,6 +2327,8 @@ xenDaemonDetachDeviceFlags(virConnectPtr conn, int ret = -1; char *xendev = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -2354,8 +2356,8 @@ xenDaemonDetachDeviceFlags(virConnectPtr conn, NULL))) goto cleanup; - if (!(dev = virDomainDeviceDefParse(xml, def, priv->caps, priv->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, def, priv->caps, + priv->xmlopt, parse_flags); goto cleanup; if (virDomainXMLDevID(conn, minidef, dev, class, ref, sizeof(ref))) diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index ef1a460..ae142a3 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -1322,6 +1322,8 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn, int ret = -1; size_t i; xenUnifiedPrivatePtr priv = conn->privateData; + unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | + VIR_DOMAIN_DEF_PARSE_SKIP_GENERATE_MACADDR; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_AFFECT_CONFIG, -1); @@ -1340,10 +1342,8 @@ xenXMDomainDetachDeviceFlags(virConnectPtr conn, goto cleanup; def = entry->def; - if (!(dev = virDomainDeviceDefParse(xml, entry->def, - priv->caps, - priv->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE))) + if (!(dev = virDomainDeviceDefParse(xml, entry->def, priv->caps, + priv->xmlopt, parse_flags))) goto cleanup; switch (dev->type) {

2 1