- Devel - libvirt List Archives

[libvirt] [PATCH] nodedev: mdev: Fix build caused by symbol shadowing
by Erik Skultety 18 May '17

18 May '17

GCC 4.6 complains about a local declaration shadowing a global symbol. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed as build breaker. src/node_device/node_device_udev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 8288be1cb..4ecb0b18f 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1076,16 +1076,16 @@ udevProcessMediatedDevice(struct udev_device *dev, const char *uuidstr = NULL; int iommugrp = -1; char *linkpath = NULL; - char *realpath = NULL; + char *canonicalpath = NULL; virNodeDevCapMdevPtr data = &def->caps->data.mdev; if (virAsprintf(&linkpath, "%s/mdev_type", udev_device_get_syspath(dev)) < 0) goto cleanup; - if (virFileResolveLink(linkpath, &realpath) < 0) + if (virFileResolveLink(linkpath, &canonicalpath) < 0) goto cleanup; - if (VIR_STRDUP(data->type, last_component(realpath)) < 0) + if (VIR_STRDUP(data->type, last_component(canonicalpath)) < 0) goto cleanup; uuidstr = udev_device_get_sysname(dev); @@ -1100,7 +1100,7 @@ udevProcessMediatedDevice(struct udev_device *dev, ret = 0; cleanup: VIR_FREE(linkpath); - VIR_FREE(realpath); + VIR_FREE(canonicalpath); return ret; } -- 2.13.0

1 0

[libvirt] [PATCH] qemu: monitor: Don't bother extracting vCPU halted state in text monitor
by Peter Krempa 18 May '17

18 May '17

The code causes the 'offset' variable to be overwritten (possibly with NULL if neither of the vCPUs is halted) which causes a crash since the variable is still used after that part. Additionally there's a bug, since strstr() would look up the '(halted)' string in the whole string rather than just the currently processed line the returned data is completely bogus. Rather than switching to single line parsing let's remove the code altogether since it has a commonly used JSON monitor alternative and the data itself is not very useful to report. The code was introduced in commit cc5e695bde Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1452106 --- src/qemu/qemu_monitor_text.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 9c9eeea01..66c94fbcd 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -552,12 +552,6 @@ qemuMonitorTextQueryCPUs(qemuMonitorPtr mon, cpu.qemu_id = cpuid; cpu.tid = tid; - /* Extract halted indicator */ - if ((offset = strstr(line, "(halted)")) != NULL) - cpu.halted = true; - else - cpu.halted = false; - if (VIR_APPEND_ELEMENT_COPY(cpus, ncpus, cpu) < 0) { ret = -1; goto cleanup; -- 2.12.2

2 2

[libvirt] [PATCH 0/2] Couple of sparse streams improvements
by Michal Privoznik 18 May '17

18 May '17

News entry & one simple fix. Michal Privoznik (2): news: Document sparse streams virStream: Forbid negative seeks docs/news.xml | 10 ++++++++++ src/internal.h | 7 +++++++ src/rpc/virnetclientstream.c | 1 + src/util/virfdstream.c | 1 + 4 files changed, 19 insertions(+) -- 2.13.0

2 3

[libvirt] [PATCH v2 1/2] util: Deduplicate code in virNetlinkEventServiceStopAll
by Wang King 18 May '17

18 May '17

Commit 15a71e60 introduced the virNetlinkEventServiceStopAll function, and the code in virNetlinkEventServiceStop is copied to this function. can use virNetlinkEventServiceStop instead. --- src/util/virnetlink.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 92ecf77..fad1e8e 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -775,32 +775,13 @@ virNetlinkEventServiceStop(unsigned int protocol) int virNetlinkEventServiceStopAll(void) { - size_t i, j; + size_t i; virNetlinkEventSrvPrivatePtr srv = NULL; VIR_INFO("stopping all netlink event services"); - for (i = 0; i < MAX_LINKS; i++) { - srv = server[i]; - if (!srv) - continue; - - virNetlinkEventServerLock(srv); - nl_close(srv->netlinknh); - virNetlinkFree(srv->netlinknh); - virEventRemoveHandle(srv->eventwatch); - - for (j = 0; j < srv->handlesCount; j++) { - if (srv->handles[j].deleted == VIR_NETLINK_HANDLE_VALID) - virNetlinkEventRemoveClientPrimitive(j, i); - } - - server[i] = NULL; - virNetlinkEventServerUnlock(srv); - - virMutexDestroy(&srv->lock); - VIR_FREE(srv); - } + for (i = 0; i < MAX_LINKS; i++) + virNetlinkEventServiceStop(i); return 0; } -- 2.8.3

2 3

[libvirt] [PATCH v4 0/6] Add mdev reporting capability to the nodedev driver
by Erik Skultety 18 May '17

18 May '17

since v1: - dropped the <description> element from the parent device nested capability - added missing RNG schema and tests - updated the documentation to describe the MDEV elements in both the parent and the child since v2: - I further split our PCI sub-capability parser into more blocks as suggested - instead of one capability 'mdev' for both mdev device and physical parent I introduced 2, so we can do virsh nodedev-list --cap 'mdev_types' | 'mdev' to see either parent devices or the mediated devices themselves - other minor adjustments pointed out during review. since v3: - fixed nits - updated virsh man page to include mdev and mdev_types within the list of supported capabilities Erik Skultety (6): mdev: Pass a uuidstr rather than an mdev object to some util functions nodedev: conf: Split PCI sub-capability parsing to separate methods nodedev: Introduce new mdev_types and mdev nodedev capabilities nodedev: Introduce the mdev capability to a PCI parent device nodedev: Introduce mdev capability for mediated devices docs: Document the mediated devices within the nodedev driver docs/drvnodedev.html.in | 168 +++++++++++- docs/schemas/nodedev.rng | 43 +++ include/libvirt/libvirt-nodedev.h | 2 + src/conf/node_device_conf.c | 290 ++++++++++++++++----- src/conf/node_device_conf.h | 29 ++- src/conf/virnodedeviceobj.c | 11 +- src/libvirt-nodedev.c | 2 + src/libvirt_private.syms | 1 + src/node_device/node_device_driver.c | 2 + src/node_device/node_device_udev.c | 165 +++++++++++- src/qemu/qemu_domain.c | 8 +- src/security/security_apparmor.c | 10 +- src/security/security_dac.c | 20 +- src/security/security_selinux.c | 20 +- src/util/virmdev.c | 21 +- src/util/virmdev.h | 4 +- .../mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml | 8 + .../pci_0000_02_10_7_mdev_types.xml | 32 +++ tests/nodedevxml2xmltest.c | 2 + tools/virsh-nodedev.c | 6 + tools/virsh.pod | 7 +- 21 files changed, 722 insertions(+), 129 deletions(-) create mode 100644 tests/nodedevschemadata/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml create mode 100644 tests/nodedevschemadata/pci_0000_02_10_7_mdev_types.xml -- 2.13.0

2 15

[libvirt] [PATCH] pci: fix link maximum speed detection
by Marek Marczykowski-Górecki 18 May '17

18 May '17

Commit 8e09663 "pci: recognize/report GEN4 (PCIe 4.0) card 16GT/s Link speed" introduced another speed into enum, but mistakenly also altered field width, so one bit of link width was included there. Signed-off-by: Marek Marczykowski-Górecki <marmarek(a)invisiblethingslab.com> --- src/util/virpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index 83c7e74..2c1b758 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -147,7 +147,7 @@ struct _virPCIDeviceList { #define PCI_EXP_DEVCAP 0x4 /* Device capabilities */ #define PCI_EXP_DEVCAP_FLR (1<<28) /* Function Level Reset */ #define PCI_EXP_LNKCAP 0xc /* Link Capabilities */ -#define PCI_EXP_LNKCAP_SPEED 0x0001f /* Maximum Link Speed */ +#define PCI_EXP_LNKCAP_SPEED 0x0000f /* Maximum Link Speed */ #define PCI_EXP_LNKCAP_WIDTH 0x003f0 /* Maximum Link Width */ #define PCI_EXP_LNKSTA 0x12 /* Link Status */ #define PCI_EXP_LNKSTA_SPEED 0x000f /* Negotiated Link Speed */ -- 2.7.4

2 1

[libvirt] [PATCH] virDomainDefCheckABIStabilityFlags: Check for memoryBacking
by Michal Privoznik 18 May '17

18 May '17

https://bugzilla.redhat.com/show_bug.cgi?id=1450349 Problem is, memoryBacking is part of guest ABI. Therefore changing it on migration/restore from an image can lead qemu/guest to rejecting the image. At the same time, move other partial checks of virDomainMemtune into the same function: virDomainMemtuneCheckABIStability. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 101 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 75 insertions(+), 26 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9eba70a95..89b93f4ad 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19786,6 +19786,80 @@ virDomainTPMDefCheckABIStability(virDomainTPMDefPtr src, return virDomainDeviceInfoCheckABIStability(&src->info, &dst->info); } + +static bool +virDomainMemtuneCheckABIStability(const virDomainDef *src, + const virDomainDef *dst, + unsigned int flags) +{ + if (virDomainDefGetMemoryInitial(src) != virDomainDefGetMemoryInitial(dst)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain max memory %lld " + "does not match source %lld"), + virDomainDefGetMemoryInitial(dst), + virDomainDefGetMemoryInitial(src)); + return false; + } + + if (!(flags & VIR_DOMAIN_DEF_ABI_CHECK_SKIP_VOLATILE) && + src->mem.cur_balloon != dst->mem.cur_balloon) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain current memory %lld " + "does not match source %lld"), + dst->mem.cur_balloon, + src->mem.cur_balloon); + return false; + } + + if (src->mem.max_memory != dst->mem.max_memory) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target maximum memory size '%llu' " + "doesn't match source '%llu'"), + dst->mem.max_memory, + src->mem.max_memory); + return false; + } + + if (src->mem.memory_slots != dst->mem.memory_slots) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain memory slots " + "count '%u' doesn't match source '%u'"), + dst->mem.memory_slots, + src->mem.memory_slots); + return false; + } + + if (src->mem.source != dst->mem.source) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memoryBacking source '%s' doesn't " + "match source memoryBacking source'%s'"), + virDomainMemorySourceTypeToString(dst->mem.source), + virDomainMemorySourceTypeToString(src->mem.source)); + return false; + } + + if (src->mem.access != dst->mem.access) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memoryBacking access '%s' doesn't " + "match access memoryBacking access'%s'"), + virDomainMemoryAccessTypeToString(dst->mem.access), + virDomainMemoryAccessTypeToString(src->mem.access)); + return false; + } + + if (src->mem.allocation != dst->mem.allocation) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target memoryBacking allocation '%s' doesn't " + "match allocation memoryBacking allocation'%s'"), + virDomainMemoryAllocationTypeToString(dst->mem.allocation), + virDomainMemoryAllocationTypeToString(src->mem.allocation)); + return false; + } + + return true; +} + + static bool virDomainMemoryDefCheckABIStability(virDomainMemoryDefPtr src, virDomainMemoryDefPtr dst) @@ -19940,37 +20014,12 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, goto error; } - if (virDomainDefGetMemoryInitial(src) != virDomainDefGetMemoryInitial(dst)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain max memory %lld does not match source %lld"), - virDomainDefGetMemoryInitial(dst), - virDomainDefGetMemoryInitial(src)); + if (!virDomainMemtuneCheckABIStability(src, dst, flags)) goto error; - } - if (!(flags & VIR_DOMAIN_DEF_ABI_CHECK_SKIP_VOLATILE) && - src->mem.cur_balloon != dst->mem.cur_balloon) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain current memory %lld does not match source %lld"), - dst->mem.cur_balloon, src->mem.cur_balloon); - goto error; - } if (!virDomainNumaCheckABIStability(src->numa, dst->numa)) goto error; - if (src->mem.memory_slots != dst->mem.memory_slots) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain memory slots count '%u' doesn't match source '%u'"), - dst->mem.memory_slots, src->mem.memory_slots); - goto error; - } - if (src->mem.max_memory != dst->mem.max_memory) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target maximum memory size '%llu' doesn't match source '%llu'"), - dst->mem.max_memory, src->mem.max_memory); - goto error; - } - if (!virDomainDefVcpuCheckAbiStability(src, dst)) goto error; -- 2.13.0

2 1

[libvirt] [PATCH] docs: Update pointer to networking information
by Andrea Bolognani 17 May '17

17 May '17

Commit 6fb5dd4fd804 removed docs/archnetwork.html.in, but left behind a pointer to it in docs/formatnetwork.html.in. Update it so that it points to the wiki, which contains more detailed and recent information anyway. --- docs/formatnetwork.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 777c341..b410dd6 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -8,9 +8,9 @@ </ul> <p> - This page provides an introduction to the network XML format. For background - information on the concepts referred to here, consult the <a href="archnetwork.html">network driver architecture</a> - page. + This page provides an introduction to the network XML format. For + background information on the concepts referred to here, consult the + <a href="https://wiki.libvirt.org/page/Networking">relevant wiki page</a>. </p> <h2><a name="elements">Element and attribute overview</a></h2> -- 2.7.4

2 1

[libvirt] [PATCH v3 00/31] Implement sparse streams for libvirt
by Michal Privoznik 17 May '17

17 May '17

v3 of: https://www.redhat.com/archives/libvir-list/2017-April/msg00671.html All the patches can be found on my github: https://github.com/zippy2/libvirt/tree/sparse_streams2 diff to v2: - renamed APIs from Skip & GetHoleSize to SendHole & RecvHole - switched from 'unsigned long long len' to 'long long len' (where len is size of a hole) - introduced @flags to public APIs for future extensibility - couple of coding style fixes - couple of fixes suggested by John in review of v2 As expressed earlier, a lot of these patches should have Reviewed-by tag as John reviewed majority of them. But we don't have a clear agreement when to use the tag, so I'm not putting it in just yet. However, will do before pushing. Some patches were ACKed. However, changes described above changed them, so I'm not sure ACK still stands. Michal Privoznik (31): virfdstream: Use messages instead of pipe util: Introduce virFileInData Introduce virStreamRecvFlags Implement virStreamRecvFlags to some drivers Introduce virStreamSendHole Introduce virStreamRecvHole Introduce VIR_STREAM_RECV_STOP_AT_HOLE flag Introduce virStreamSparseRecvAll Introduce virStreamSparseSendAll Introduce virStreamInData virNetClientStreamNew: Track origin stream Add new flag to daemonCreateClientStream and virNetClientStreamNew RPC: Introduce virNetStreamHole Introduce VIR_NET_STREAM_HOLE message type Teach wireshark plugin about VIR_NET_STREAM_HOLE daemon: Introduce virNetServerProgramSendStreamHole virnetclientstream: Introduce virNetClientStreamSendHole daemon: Implement VIR_NET_STREAM_HOLE handling virnetclientstream: Introduce virNetClientStreamHandleHole remote_driver: Implement virStreamSendHole virNetClientStreamRecvPacket: Introduce @flags argument Introduce virNetClientStreamRecvHole remote: Implement virStreamRecvHole virNetClientStream: Wire up VIR_NET_STREAM_HOLE remote_driver: Implement VIR_STREAM_RECV_STOP_AT_HOLE daemonStreamHandleRead: Wire up seekable stream fdstream: Implement sparse stream 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 daemon/remote.c | 2 +- daemon/stream.c | 148 ++++++++- daemon/stream.h | 3 +- include/libvirt/libvirt-storage.h | 9 + include/libvirt/libvirt-stream.h | 115 ++++++- src/driver-stream.h | 25 ++ src/esx/esx_stream.c | 16 +- src/libvirt-storage.c | 4 +- src/libvirt-stream.c | 526 ++++++++++++++++++++++++++++++ src/libvirt_internal.h | 4 + src/libvirt_private.syms | 2 + src/libvirt_public.syms | 9 + src/libvirt_remote.syms | 3 + src/remote/remote_driver.c | 99 +++++- src/remote/remote_protocol.x | 2 + src/rpc/gendispatch.pl | 21 +- src/rpc/virnetclient.c | 1 + src/rpc/virnetclientstream.c | 238 +++++++++++++- src/rpc/virnetclientstream.h | 18 +- src/rpc/virnetprotocol.x | 17 +- src/rpc/virnetserverprogram.c | 35 ++ src/rpc/virnetserverprogram.h | 8 + src/storage/storage_driver.c | 4 +- src/storage/storage_util.c | 10 +- src/util/virfdstream.c | 609 +++++++++++++++++++++++++++++++---- src/util/virfdstream.h | 1 + src/util/virfile.c | 82 +++++ src/util/virfile.h | 4 + src/virnetprotocol-structs | 5 + tests/virfiletest.c | 203 ++++++++++++ tools/virsh-util.c | 65 ++++ tools/virsh-util.h | 29 ++ tools/virsh-volume.c | 50 ++- tools/virsh.pod | 6 +- tools/wireshark/src/packet-libvirt.c | 52 +++ tools/wireshark/src/packet-libvirt.h | 2 + 36 files changed, 2301 insertions(+), 126 deletions(-) -- 2.13.0

2 73

[libvirt] [PATCH] util: do not leak handles in stop netlink event service
by Wang King 17 May '17

17 May '17

handles stored in virNetlinkEventSrvPrivatePtr should be freed when stop netlink event service. --- src/util/virnetlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 92ecf77..b782cfa 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -758,6 +758,7 @@ virNetlinkEventServiceStop(unsigned int protocol) } server[protocol] = NULL; + VIR_FREE(srv->handles); virNetlinkEventServerUnlock(srv); virMutexDestroy(&srv->lock); @@ -796,6 +797,7 @@ virNetlinkEventServiceStopAll(void) } server[i] = NULL; + VIR_FREE(srv->handles); virNetlinkEventServerUnlock(srv); virMutexDestroy(&srv->lock); -- 2.8.3

2 1

[libvirt] [PATCH] virsh: add --io when attaching disks to guests
by Gordon Messmer 17 May '17

17 May '17

virt-install and virt-manager both default to explicitly setting "io='native'" in the disk "driver" tag. virsh, however, does not and also does not provide an option to specify that setting at all. As a result, disks use a different IO mechanism (the default, "threads") when attached post-setup using virsh. Adding this option allows users to keep disk performance consistent for disks attached at install, and those attached afterward. --- tools/virsh-domain.c | 14 +++++++++++--- tools/virsh.pod | 3 ++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e..5c42021 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -267,6 +267,10 @@ static const vshCmdOptDef opts_attach_disk[] = { .type = VSH_OT_STRING, .help = N_("cache mode of disk device") }, + {.name = "io", + .type = VSH_OT_STRING, + .help = N_("io policy of disk device") + }, {.name = "type", .type = VSH_OT_STRING, .help = N_("target device type") @@ -504,8 +508,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom = NULL; const char *source = NULL, *target = NULL, *driver = NULL, *subdriver = NULL, *type = NULL, *mode = NULL, - *iothread = NULL, *cache = NULL, *serial = NULL, - *straddr = NULL, *wwn = NULL, *targetbus = NULL; + *iothread = NULL, *cache = NULL, *io = NULL, + *serial = NULL, *straddr = NULL, *wwn = NULL, + *targetbus = NULL; struct DiskAddress diskAddr; bool isFile = false, functionReturn = false; int ret; @@ -537,6 +542,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) vshCommandOptStringReq(ctl, cmd, "mode", &mode) < 0 || vshCommandOptStringReq(ctl, cmd, "iothread", &iothread) < 0 || vshCommandOptStringReq(ctl, cmd, "cache", &cache) < 0 || + vshCommandOptStringReq(ctl, cmd, "io", &io) < 0 || vshCommandOptStringReq(ctl, cmd, "serial", &serial) < 0 || vshCommandOptStringReq(ctl, cmd, "wwn", &wwn) < 0 || vshCommandOptStringReq(ctl, cmd, "address", &straddr) < 0 || @@ -579,7 +585,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAddLit(&buf, ">\n"); virBufferAdjustIndent(&buf, 2); - if (driver || subdriver || iothread || cache) { + if (driver || subdriver || iothread || cache || io) { virBufferAddLit(&buf, "<driver"); if (driver) @@ -590,6 +596,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, " iothread='%s'", iothread); if (cache) virBufferAsprintf(&buf, " cache='%s'", cache); + if (io) + virBufferAsprintf(&buf, " io='%s'", io); virBufferAddLit(&buf, "/>\n"); } diff --git a/tools/virsh.pod b/tools/virsh.pod index 727acf6..f46fb4a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2838,7 +2838,7 @@ expected. =item B<attach-disk> I<domain> I<source> I<target> [[[I<--live>] [I<--config>] | [I<--current>]] | [I<--persistent>]] [I<--targetbus bus>] [I<--driver driver>] [I<--subdriver subdriver>] [I<--iothread iothread>] -[I<--cache cache>] [I<--type type>] +[I<--cache cache>] [I<--io io>] [I<--type type>] [I<--mode mode>] [I<--sourcetype sourcetype>] [I<--serial serial>] [I<--wwn wwn>] [I<--rawio>] [I<--address address>] [I<--multifunction>] [I<--print-xml>] @@ -2865,6 +2865,7 @@ I<mode> can specify the two specific mode I<readonly> or I<shareable>. I<sourcetype> can indicate the type of source (block|file) I<cache> can be one of "default", "none", "writethrough", "writeback", "directsync" or "unsafe". +I<io> controls specific policies on I/O; qemu guests support "threads" and "native". I<iothread> is the number within the range of domain IOThreads to which this disk may be attached (QEMU only). I<serial> is the serial of disk device. I<wwn> is the wwn of disk device. -- 2.9.3

2 3

[libvirt] [PATCH v2] qemu: Adding 'downscript' feature for QEMU network interfaces.
by Julio Faracco 17 May '17

17 May '17

This commit adds the support for 'downscript' feature: - For QEMU command line with the option: '-net downscript=/etc/qemu-ifdown,...'. - For Domains with a network interface description: '<interface type='ethernet'> ... <downscript path='/etc/qemu-ifdown'/> ... </interface>' The options 'script' and 'downscript' accept the argument 'no' to disable the script executions. The way that the code was implemented, the XML file accepts '<[down]script path='no'>' to solve this problem. This commit updates the tests and documentation too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=825939 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/formatdomain.html.in | 1 + docs/schemas/domaincommon.rng | 8 ++++++++ src/conf/domain_conf.c | 13 +++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_parse_command.c | 4 ++++ tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml | 1 + tests/qemuargv2xmldata/qemuargv2xml-net-eth.args | 2 +- tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml | 1 + tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml | 1 + 13 files changed, 35 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8c884f4..89fe86d 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4663,6 +4663,7 @@ <interface type='ethernet'> <target dev='vnet7'/> <script path='/etc/qemu-ifup-mynet'/> + <downscript path='/etc/qemu-ifdown-mynet'/> </interface> </devices> ...</pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 281309e..2f88dda 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2609,6 +2609,14 @@ </element> </optional> <optional> + <element name="downscript"> + <attribute name="path"> + <ref name="filePath"/> + </attribute> + <empty/> + </element> + </optional> + <optional> <element name="backenddomain"> <attribute name="name"> <ref name="domainName"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0ff216e..32d5720 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1935,6 +1935,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) VIR_FREE(def->backend.vhost); VIR_FREE(def->virtPortProfile); VIR_FREE(def->script); + VIR_FREE(def->downscript); VIR_FREE(def->domain_name); VIR_FREE(def->ifname); VIR_FREE(def->ifname_guest); @@ -9589,6 +9590,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, char *ifname_guest = NULL; char *ifname_guest_actual = NULL; char *script = NULL; + char *downscript = NULL; char *address = NULL; char *port = NULL; char *localaddr = NULL; @@ -9761,6 +9763,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } else if (!script && xmlStrEqual(cur->name, BAD_CAST "script")) { script = virXMLPropString(cur, "path"); + } else if (!downscript && + xmlStrEqual(cur->name, BAD_CAST "downscript")) { + downscript = virXMLPropString(cur, "path"); } else if (!domain_name && xmlStrEqual(cur->name, BAD_CAST "backenddomain")) { domain_name = virXMLPropString(cur, "name"); @@ -10074,6 +10079,10 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, def->script = script; script = NULL; } + if (downscript != NULL) { + def->downscript = downscript; + downscript = NULL; + } if (domain_name != NULL) { def->domain_name = domain_name; domain_name = NULL; @@ -10356,6 +10365,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, VIR_FREE(dev); virDomainActualNetDefFree(actual); VIR_FREE(script); + VIR_FREE(downscript); VIR_FREE(bridge); VIR_FREE(model); VIR_FREE(backend); @@ -22158,6 +22168,9 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferEscapeString(buf, "<script path='%s'/>\n", def->script); + if (def->downscript) + virBufferEscapeString(buf, "<downscript path='%s'/>\n", + def->downscript); virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name); if (def->ifname && diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09fb7aa..9deca76 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1024,6 +1024,7 @@ struct _virDomainNetDef { unsigned long sndbuf; } tune; char *script; + char *downscript; char *domain_name; /* backend domain name */ char *ifname; /* interface name on the host (<target dev='x'/>) */ virNetDevIPInfo hostIP; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index af9063c..d773917 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1060,6 +1060,10 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, def->script = values[i]; values[i] = NULL; } else if (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && + STREQ(keywords[i], "downscript") && STRNEQ(values[i], "")) { + def->downscript = values[i]; + values[i] = NULL; + } else if (def->type == VIR_DOMAIN_NET_TYPE_ETHERNET && STREQ(keywords[i], "ifname")) { def->ifname = values[i]; values[i] = NULL; diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args index 4d74ae4..5d7129c 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ --net tap,ifname=nic02,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,ifname=nic02,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml index fa9a892..8e04efb 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth-ifname.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args index 89eb4c1..0e3fa21 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.args @@ -18,6 +18,6 @@ QEMU_AUDIO_DRV=none \ -usb \ -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=ide,bus=0,unit=0 \ -net nic,macaddr=00:11:22:33:44:55,vlan=0,model=rtl8139,name=net0 \ --net tap,script=/etc/qemu-ifup,vlan=0,name=hostnet0 \ +-net tap,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown,vlan=0,name=hostnet0 \ -serial none \ -parallel none diff --git a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml index 57c4be8..d177ca8 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-net-eth.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index dd0d752..21d8259 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -26,6 +26,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> </interface> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 48acadf..9f40122 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -26,6 +26,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> </interface> <input type='mouse' bus='ps2'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml index c36baa0..b71fd5a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth-ifname.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <target dev='nic02'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml index 898bda6..c55cd68 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-net-eth.xml @@ -30,6 +30,7 @@ <interface type='ethernet'> <mac address='00:11:22:33:44:55'/> <script path='/etc/qemu-ifup'/> + <downscript path='/etc/qemu-ifdown'/> <model type='rtl8139'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> -- 2.7.4

3 6

[libvirt] [PATCH] qemu: driver: Allow passing disk target as top image with block commit
by Peter Krempa 17 May '17

17 May '17

Since we allow active layer block commit the users are allowed to commit the top of the chain (e.g. vda) into the backing image. The API would not accept that parameter, as it tried to look up the image in the backing chain. Add the ability to use the top level image target name explicitly as the top image of the block commit operation. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1451394 --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1c4873e48..36d8a701a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16942,7 +16942,7 @@ qemuDomainBlockCommit(virDomainPtr dom, if (qemuDomainDiskBlockJobIsActive(disk)) goto endjob; - if (!top) + if (!top || STREQ(top, disk->dst)) topSource = disk->src; else if (virStorageFileParseChainIndex(disk->dst, top, &topIndex) < 0 || !(topSource = virStorageFileChainLookup(disk->src, NULL, -- 2.12.2

2 2

Re: [libvirt] [PATCH v3 08/31] Introduce virStreamSparseRecvAll
by Michal Privoznik 17 May '17

17 May '17

On 05/16/2017 11:34 PM, John Ferlan wrote: > > > On 05/16/2017 10:03 AM, Michal Privoznik wrote: >> This is just a wrapper over new functions that have been just >> introduced: virStreamRecvFlags(), virStreamRecvHole(). It's very >> similar to virStreamRecvAll() except it handles sparse streams >> well. >> >> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> >> --- >> include/libvirt/libvirt-stream.h | 33 ++++++++++- >> src/libvirt-stream.c | 123 +++++++++++++++++++++++++++++++++++++++ >> src/libvirt_public.syms | 1 + >> 3 files changed, 154 insertions(+), 3 deletions(-) >> > > [...] > >> diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c >> index bedb6159a..6bf4c4f29 100644 >> --- a/src/libvirt-stream.c >> +++ b/src/libvirt-stream.c >> @@ -668,6 +668,129 @@ virStreamRecvAll(virStreamPtr stream, >> } >> >> >> +/** >> + * virStreamSparseRecvAll: >> + * @stream: pointer to the stream object >> + * @handler: sink callback for writing data to application >> + * @holeHandler: stream hole callback for skipping holes >> + * @opaque: application defined data >> + * >> + * Receive the entire data stream, sending the data to the >> + * requested data sink @handler and calling the skip @holeHandler >> + * to generate holes for sparse stream targets. This is simply a >> + * convenient alternative to virStreamRecvFlags, for apps that do >> + * blocking-I/O. >> + * >> + * An example using this with a hypothetical file download >> + * API looks like: >> + * >> + * int mysink(virStreamPtr st, const char *buf, int nbytes, void *opaque) { >> + * int *fd = opaque; >> + * >> + * return write(*fd, buf, nbytes); >> + * } >> + * >> + * int myskip(virStreamPtr st, long long offset, void *opaque) { >> + * int *fd = opaque; >> + * > > I think this is where perhaps the example of lseek in "off_t" chunks of > "long long offset" would be applicable... Perhaps why I ended up in the > off_t rathole before. Not sure what you mean. long long is the same size as off_t for any application that enables large file support (libvirt does that) or is compiled on 64bits. Any 32bit virt mgmt application should really enable large file support, otherwise is pretty useless. > >> + * return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; >> + * } >> + * >> + * virStreamPtr st = virStreamNew(conn, 0); >> + * int fd = open("demo.iso", O_WRONLY); >> + * >> + * virConnectDownloadSparseFile(conn, st); > > ^^ This API doesn't exist... Of course neither did > virConnectDownloadFile from whence you copied the example. Maybe both > should be 'adjusted'. Maybe. One day. For now I'm happy with this example as-is. The example should show how to set up virStreamSparseRecvAll. Michal

2 1

[libvirt] [PATCH python] Fix virStream.sendAll for Python 3
by Xavier Fernandez 17 May '17

17 May '17

In Python 3, if the file is open in binary mode, ``got`` will end up being equal to b"" and b"" != "" in Python 3. --- libvirt-override-virStream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-override-virStream.py b/libvirt-override-virStream.py index c328154..2e77cc7 100644 --- a/libvirt-override-virStream.py +++ b/libvirt-override-virStream.py @@ -83,7 +83,7 @@ pass raise e - if got == "": + if not got: break ret = self.send(got) -- 2.12.2

2 2

[libvirt] [PATCH 0/1] Enable Travis build status icon
by Claudio André 17 May '17

17 May '17

Follow up of the recent 'work in progress' announced in "Enable CI build testing with Travis" mailing message. Claudio André (1): Enable Travis CI build status icon README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 README.md -- 2.11.0

3 6

Re: [libvirt] [PATCH v3 08/31] Introduce virStreamSparseRecvAll
by John Ferlan 17 May '17

17 May '17

I was wondering why this never made it to the list - seems I just sent it to Michal... So here's what I sent... John On 05/16/2017 05:34 PM, John Ferlan wrote: > > > On 05/16/2017 10:03 AM, Michal Privoznik wrote: >> This is just a wrapper over new functions that have been just >> introduced: virStreamRecvFlags(), virStreamRecvHole(). It's very >> similar to virStreamRecvAll() except it handles sparse streams >> well. >> >> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> >> --- >> include/libvirt/libvirt-stream.h | 33 ++++++++++- >> src/libvirt-stream.c | 123 +++++++++++++++++++++++++++++++++++++++ >> src/libvirt_public.syms | 1 + >> 3 files changed, 154 insertions(+), 3 deletions(-) >> > > [...] > >> diff --git a/src/libvirt-stream.c b/src/libvirt-stream.c >> index bedb6159a..6bf4c4f29 100644 >> --- a/src/libvirt-stream.c >> +++ b/src/libvirt-stream.c >> @@ -668,6 +668,129 @@ virStreamRecvAll(virStreamPtr stream, >> } >> >> >> +/** >> + * virStreamSparseRecvAll: >> + * @stream: pointer to the stream object >> + * @handler: sink callback for writing data to application >> + * @holeHandler: stream hole callback for skipping holes >> + * @opaque: application defined data >> + * >> + * Receive the entire data stream, sending the data to the >> + * requested data sink @handler and calling the skip @holeHandler >> + * to generate holes for sparse stream targets. This is simply a >> + * convenient alternative to virStreamRecvFlags, for apps that do >> + * blocking-I/O. >> + * >> + * An example using this with a hypothetical file download >> + * API looks like: >> + * >> + * int mysink(virStreamPtr st, const char *buf, int nbytes, void *opaque) { >> + * int *fd = opaque; >> + * >> + * return write(*fd, buf, nbytes); >> + * } >> + * >> + * int myskip(virStreamPtr st, long long offset, void *opaque) { >> + * int *fd = opaque; >> + * > > I think this is where perhaps the example of lseek in "off_t" chunks of > "long long offset" would be applicable... Perhaps why I ended up in the > off_t rathole before. > >> + * return lseek(*fd, offset, SEEK_CUR) == (off_t) -1 ? -1 : 0; >> + * } >> + * >> + * virStreamPtr st = virStreamNew(conn, 0); >> + * int fd = open("demo.iso", O_WRONLY); >> + * >> + * virConnectDownloadSparseFile(conn, st); > > ^^ This API doesn't exist... Of course neither did > virConnectDownloadFile from whence you copied the example. Maybe both > should be 'adjusted'. > > > Reviewed-by: John Ferlan <jferlan(a)redhat.com> > > John > >> + * if (virStreamSparseRecvAll(st, mysink, myskip, &fd) < 0) { >> + * ...report an error ... >> + * goto done; >> + * } >> + * if (virStreamFinish(st) < 0) >> + * ...report an error... >> + * virStreamFree(st); >> + * close(fd); >> + * >> + * Note that @opaque data is shared between both @handler and >> + * @holeHandler callbacks. >> + * >> + * Returns 0 if all the data was successfully received. The caller >> + * should invoke virStreamFinish(st) to flush the stream upon >> + * success and then virStreamFree(st). >> + * >> + * Returns -1 upon any error, with virStreamAbort() already >> + * having been called, so the caller need only call virStreamFree(). >> + */ > > > [...] >

1 0

[libvirt] set link state for ethernet network devices
by Vasiliy Tolstov 16 May '17

16 May '17

Hi! Sometimes ago i'm write patch for setting link state of network interface for ethernet type (tap). Now i'm try libvirt 3.3.0 and see, that tap interfaces is up but in xml i'm try to specify <link state='down'> also i'm try <source><link state='down'></source> Nothing changed. Laine says, that link state is only for internal representation, and to modify link state on host side i need to specify <source><link state='down'></source>. For history please check email thread "qemu: remove unnecessary setting of tap device online state" So does this bug or it my mistake? Thanks! -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 2

[libvirt] [PATCH v3] qemu: Report shutdown event details
by Martin Kletzander 16 May '17

16 May '17

QEMU will likely report the details of it shutting down, particularly whether the shutdown was initiated by the guest or host. We should forward that information along, at least for shutdown events. Reset has that as well, however that is not a lifecycle event and would add extra constants that might not be used. It can be added later on. Since the only way we can extend information provided to the user is adding event details, we might as well emit multiple events (one with the reason for the shutdown and keep the one for the shutdown being finished for clarity and compatibility). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1384007 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v3: - don't send two events, just change the detail for the existing one v2: - adapt to newer patches This is not in qemu master yet; if ACKed it will not be pushed before the appropriate patches hit qemu master. examples/object-events/event-test.c | 6 ++++++ include/libvirt/libvirt-domain.h | 11 ++++++++++- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 10 ++++++++-- src/qemu/qemu_process.c | 21 +++++++++++++++++++-- tools/virsh-domain.c | 4 +++- 7 files changed, 51 insertions(+), 10 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 12690cac09ce..78d200806601 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -240,6 +240,12 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: return "Finished"; + case VIR_DOMAIN_EVENT_SHUTDOWN_GUEST: + return "Guest request"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_HOST: + return "Host request"; + case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index c9e96a6c90bc..720db32f7663 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2983,7 +2983,16 @@ typedef enum { * Details on the cause of a 'shutdown' lifecycle event */ typedef enum { - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ + /* Guest finished shutdown sequence */ + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, + + /* Domain finished shutting down after request from the guest itself + * (e.g. hardware-specific action) */ + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST = 1, + + /* Domain finished shutting down after request from the host (e.g. killed by + * a signal) */ + VIR_DOMAIN_EVENT_SHUTDOWN_HOST = 2, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_SHUTDOWN_LAST diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2148d483ed6a..a2de1a6c5bad 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1326,13 +1326,13 @@ qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, int -qemuMonitorEmitShutdown(qemuMonitorPtr mon) +qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; - VIR_DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p guest=%u", mon, guest); mon->willhangup = 1; - QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm); + QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 12f98beba763..8956bf929aaa 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -130,6 +130,7 @@ typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon, void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, + virTristateBool guest, void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -344,7 +345,7 @@ int qemuMonitorGetDiskSecret(qemuMonitorPtr mon, int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); -int qemuMonitorEmitShutdown(qemuMonitorPtr mon); +int qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 083729003ba3..757595dd7472 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -523,9 +523,15 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) } -static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorEmitShutdown(mon); + bool guest = false; + virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; + + if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + + qemuMonitorEmitShutdown(mon, guest_initiated); } static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c19bd292596a..e9c4e38abfb2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -634,12 +634,14 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + virTristateBool guest_initiated, void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + int detail = 0; VIR_DEBUG("vm=%p", vm); @@ -662,9 +664,24 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_UNKNOWN); + + switch (guest_initiated) { + case VIR_TRISTATE_BOOL_YES: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_GUEST; + break; + + case VIR_TRISTATE_BOOL_NO: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_HOST; + break; + + default: + detail = VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED; + break; + } + event = virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SHUTDOWN, - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); + VIR_DOMAIN_EVENT_SHUTDOWN, + detail); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) { VIR_WARN("Unable to save status on vm %s after state change", diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e0126e..0e5d8e3c242c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12249,7 +12249,9 @@ VIR_ENUM_IMPL(virshDomainEventStopped, VIR_ENUM_DECL(virshDomainEventShutdown) VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, - N_("Finished")) + N_("Finished"), + N_("Finished after guest request"), + N_("Finished after host request")) VIR_ENUM_DECL(virshDomainEventPMSuspended) VIR_ENUM_IMPL(virshDomainEventPMSuspended, -- 2.13.0

2 1

[libvirt] [PATCH v2] qemu: Report shutdown event details
by Martin Kletzander 16 May '17

16 May '17

QEMU will likely report the details of it shutting down, particularly whether the shutdown was initiated by the guest or host. We should forward that information along, at least for shutdown events. Reset has that as well, however that is not a lifecycle event and would add extra constants that might not be used. It can be added later on. Since the only way we can extend information provided to the user is adding event details, we might as well emit multiple events (one with the reason for the shutdown and keep the one for the shutdown being finished for clarity and compatibility). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1384007 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Adapt to new message format Patch in QEMU: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03624.html Applied to qapi-next: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03742.html examples/object-events/event-test.c | 6 ++++++ include/libvirt/libvirt-domain.h | 11 ++++++++++- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 10 ++++++++-- src/qemu/qemu_process.c | 22 ++++++++++++++++++++++ tools/virsh-domain.c | 5 ++++- 7 files changed, 55 insertions(+), 8 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 12690cac09ce..d3a81eb4a559 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -240,6 +240,12 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: return "Finished"; + case VIR_DOMAIN_EVENT_SHUTDOWN_GUEST: + return "Killed on a guest request"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_HOST: + return "Killed on a host request"; + case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index c9e96a6c90bc..de391a9214d1 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2983,7 +2983,16 @@ typedef enum { * Details on the cause of a 'shutdown' lifecycle event */ typedef enum { - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ + /* Guest finished shutdown sequence */ + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, + + /* Guest is shutting down due to request from guest (e.g. hardware-specific + * action) */ + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST = 1, + + /* Guest is shutting down due to request from host (e.g. killed by a + * signal) */ + VIR_DOMAIN_EVENT_SHUTDOWN_HOST = 2, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_SHUTDOWN_LAST diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2148d483ed6a..a2de1a6c5bad 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1326,13 +1326,13 @@ qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, int -qemuMonitorEmitShutdown(qemuMonitorPtr mon) +qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; - VIR_DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p guest=%u", mon, guest); mon->willhangup = 1; - QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm); + QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 12f98beba763..8956bf929aaa 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -130,6 +130,7 @@ typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon, void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, + virTristateBool guest, void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -344,7 +345,7 @@ int qemuMonitorGetDiskSecret(qemuMonitorPtr mon, int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); -int qemuMonitorEmitShutdown(qemuMonitorPtr mon); +int qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 083729003ba3..757595dd7472 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -523,9 +523,15 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) } -static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorEmitShutdown(mon); + bool guest = false; + virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; + + if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + + qemuMonitorEmitShutdown(mon, guest_initiated); } static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c19bd292596a..f7248dac9b89 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -634,10 +634,12 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + virTristateBool guest_initiated, void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv; + virObjectEventPtr pre_event = NULL; virObjectEventPtr event = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -662,6 +664,25 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_UNKNOWN); + + switch (guest_initiated) { + case VIR_TRISTATE_BOOL_YES: + pre_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST); + break; + + case VIR_TRISTATE_BOOL_NO: + pre_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + VIR_DOMAIN_EVENT_SHUTDOWN_HOST); + break; + + case VIR_TRISTATE_BOOL_ABSENT: + case VIR_TRISTATE_BOOL_LAST: + break; + } + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SHUTDOWN, VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); @@ -678,6 +699,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, unlock: virObjectUnlock(vm); + qemuDomainEventQueue(driver, pre_event); qemuDomainEventQueue(driver, event); virObjectUnref(cfg); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e0126e..f05dcbdac5bc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12249,7 +12249,10 @@ VIR_ENUM_IMPL(virshDomainEventStopped, VIR_ENUM_DECL(virshDomainEventShutdown) VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, - N_("Finished")) + N_("Finished"), + N_("Shutting down on a guest request"), + N_("Shutting down on a host request"), + ) VIR_ENUM_DECL(virshDomainEventPMSuspended) VIR_ENUM_IMPL(virshDomainEventPMSuspended, -- 2.13.0

3 4

[libvirt] [PATCH v3 0/5] Hyper-V method invocation
by Sri Ramanujam 16 May '17

16 May '17

Changes from v2: * Correctly manage and free invocation parameters * Fixed a couple of other memory leaks found while fixing the above issue * Minor code changes from review I also forgot to mention previously that we have test servers available for reviewers as we introduce new functionality to the driver. Let me know if you want access to them :) Sri Ramanujam (5): hyperv: Functions to work with invocation parameters. hyperv: Generate object property type information. hyperv: add hypervInvokeMethod hyperv: support virDomainSendKey hyperv: Add support for virDomainSetMemory src/hyperv/hyperv_driver.c | 181 +++++++ src/hyperv/hyperv_wmi.c | 891 ++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_wmi.h | 93 +++- src/hyperv/hyperv_wmi_classes.h | 19 + src/hyperv/hyperv_wmi_generator.input | 116 +++++ src/hyperv/hyperv_wmi_generator.py | 15 +- src/hyperv/openwsman.h | 4 + 7 files changed, 1317 insertions(+), 2 deletions(-) -- 2.9.3

3 12

[libvirt] [PATCH v2 0/5] qemu: Unbreak aarch64/virt TCG guests
by Andrea Bolognani 16 May '17

16 May '17

Changes from v1: * address review comments in 3/5; * all other patches are unchanged. Andrea Bolognani (5): qemu: Use qemuDomainMachineIsVirt() more tests: Check default GIC version for aarch64/virt TCG guests qemu: Use GICv2 for aarch64/virt TCG guests gic: Remove VIR_GIC_VERSION_DEFAULT news: Update for GIC version on TCG changes docs/news.xml | 11 +++++++++ src/qemu/qemu_capabilities.c | 7 +----- src/qemu/qemu_command.c | 6 ++--- src/qemu/qemu_domain.c | 26 +++++++++++++++++++--- src/util/virgic.h | 3 --- .../qemuxml2argv-aarch64-gic-none-tcg.args | 19 ++++++++++++++++ .../qemuxml2argv-aarch64-gic-none-tcg.xml | 17 ++++++++++++++ tests/qemuxml2argvtest.c | 3 +++ .../qemuxml2xmlout-aarch64-gic-none-tcg.xml | 25 +++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 10 files changed, 103 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-none-tcg.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-aarch64-gic-none-tcg.xml -- 2.7.4

2 6

[libvirt] limit pps via bandwidth
by Vasiliy Tolstov 16 May '17

16 May '17

Hi. I have a problem that some vps generate very big pps (500000). I want to limit it for some reasonable value. iptables does not support by default limit by pps more that 10000, i can use nft... but Why not use tc for this ? http://www.lartc.org/manpages/tc-pbfifo.html http://man7.org/linux/man-pages/man8/tc-sfb.8.html As i understand firstly we can limit by pps and secondly via bandwidth... What do you think? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

2 1

[libvirt] [PATCH] Provide a useful README file
by Daniel P. Berrange 16 May '17

16 May '17

The current README file contents has almost no useful info, and that which does exist is very outdated. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- README | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 10 deletions(-) diff --git a/README b/README index 3d5167d..7103ae9 100644 --- a/README +++ b/README @@ -1,13 +1,74 @@ + Libvirt API for virtualization + ============================== - LibVirt : simple API for virtualization +Libvirt provides a portable, long term stable C API for managing the +virtualization technologies provided by many operating systems. It +includes support for QEMU, KVM, Xen, LXC, BHyve, Virtuozzo, VMWare +vCenter and ESX, VMWare Desktop, Hyper-V, VirtualBox and PowerHyp. - Libvirt is a C toolkit to interact with the virtualization capabilities -of recent versions of Linux (and other OSes). It is free software -available under the GNU Lesser General Public License. Virtualization of -the Linux Operating System means the ability to run multiple instances of -Operating Systems concurrently on a single hardware system where the basic -resources are driven by a Linux instance. The library aim at providing -long term stable C API initially for the Xen paravirtualization but -should be able to integrate other virtualization mechanisms if needed. +For some of these hypervisors, it provides a stateful management +daemon runs on the virtualization host allowing access to the API +both by non-privileged local users and remote users. -Daniel Veillard <veillard(a)redhat.com> +Layered packages provide bindings of the Libvirt C API into other +languages including Python, Perl, Php, Go, Java, OCaml, as well as +mappings into object systems such as GObject, CIM and SNMP. + +Further information about the libvirt project can be found on the +website: + + https://libvirt.org + +License +======= + +The libvirt C API is distributed under the terms of GNU Lesser General +Public License, version 2.1 (or later). Some parts of the code that are +not part of the C library, may have the more restricted GNU General +Public License, version 2.1 (or later). See the files COPYING.LESSER +and COPYING for full license terms & conditions. + +Installation +============ + +Libvirt uses the GNU Autotools build system, so in general can be built +and installed with the normal commands. For example, to build in a manner +that is suitable for installing as root, use: + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make + sudo make install + +While to build & install as an unprivileged user + + ./configure --prefix=$HOME/usr + make + make install + +The libvirt code relies on a large number of 3rd party libraries. These will +be detected during execution of the configure script and a summary printed +which lists any missing (optional) dependancies. + +Contributing +============ + +The libvirt project welcomes contributors from all. For most components +the best way to contributor is to send patches to the primary development +mailing list, using the 'git send-email' command. Further guidance on this +can be found in the HACKING file, or the project website + + https://libvirt.org/contribute.html + +Contact +======= + +The libvirt project has two primary mailing lists: + + * libvir-list(a)redhat.com (for development) + * libvirt-users(a)redhat.com (for users) + +Further details on contacting the project are available on the website + + https://libvirt.org/contact.html + +-- End -- 2.9.3

2 2

[libvirt] [PATCH v3] qemu: improve detection of UNIX path generated by libvirt
by Pavel Hrdina 16 May '17

16 May '17

Currently we consider all UNIX paths with specific prefix as generated by libvirt, but that's a wrong assumption. Let's make the detection better by actually checking whether the whole path matches one of the paths that we generate or generated in the past. The UNIX path isn't stored in config XML since libvirt-1.3.1. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1446980 Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/qemu/qemu_domain.c | 66 +++++++++++++++++----- .../qemuxml2argv-channel-unix-source-path.xml | 29 ++++++++++ .../qemuxml2xmlout-channel-unix-source-path.xml | 45 +++++++++++++++ tests/qemuxml2xmltest.c | 2 + 4 files changed, 128 insertions(+), 14 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-unix-source-path.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cc02c801e1..8b7d1b5e41 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3154,24 +3154,58 @@ qemuDomainDefaultNetModel(const virDomainDef *def, /* - * Clear auto generated unix socket path, i.e., the one which starts with our - * channel directory. + * Clear auto generated unix socket paths: + * + * libvirt 1.2.18 and older: + * {cfg->channelTargetDir}/{dom-name}.{target-name} + * + * libvirt 1.2.19 - 1.3.2: + * {cfg->channelTargetDir}/domain-{dom-name}/{target-name} + * + * libvirt 1.3.3 and newer: + * {cfg->channelTargetDir}/domain-{dom-id}-{short-dom-name}/{target-name} + * + * The unix socket path was stored in config XML until libvirt 1.3.0. + * If someone specifies the same path as we generate, they shouldn't do it. + * + * This function clears the path for migration as well, so we need to clear + * the path even if we are not storing it in the XML. */ -static void +static int qemuDomainChrDefDropDefaultPath(virDomainChrDefPtr chr, virQEMUDriverPtr driver) { - virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + virQEMUDriverConfigPtr cfg; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *regexp = NULL; + int ret = -1; - if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL && - chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO && - chr->source->type == VIR_DOMAIN_CHR_TYPE_UNIX && - chr->source->data.nix.path && - STRPREFIX(chr->source->data.nix.path, cfg->channelTargetDir)) { + if (chr->deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL || + chr->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO || + chr->source->type != VIR_DOMAIN_CHR_TYPE_UNIX || + !chr->source->data.nix.path) { + return 0; + } + + cfg = virQEMUDriverGetConfig(driver); + + virBufferEscapeRegex(&buf, "^%s", cfg->channelTargetDir); + virBufferAddLit(&buf, "/([^/]+\\.)|(domain-[^/]+/)"); + virBufferEscapeRegex(&buf, "%s$", chr->target.name); + + if (virBufferCheckError(&buf) < 0) + goto cleanup; + + regexp = virBufferContentAndReset(&buf); + + if (virStringMatch(chr->source->data.nix.path, regexp)) VIR_FREE(chr->source->data.nix.path); - } + ret = 0; + cleanup: + VIR_FREE(regexp); virObjectUnref(cfg); + return ret; } @@ -3439,8 +3473,10 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, /* clear auto generated unix socket path for inactive definitions */ if ((parseFlags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && - dev->type == VIR_DOMAIN_DEVICE_CHR) - qemuDomainChrDefDropDefaultPath(dev->data.chr, driver); + dev->type == VIR_DOMAIN_DEVICE_CHR) { + if (qemuDomainChrDefDropDefaultPath(dev->data.chr, driver) < 0) + goto cleanup; + } /* forbid capabilities mode hostdev in this kind of hypervisor */ if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && @@ -4226,8 +4262,10 @@ qemuDomainDefFormatBuf(virQEMUDriverPtr driver, } } - for (i = 0; i < def->nchannels; i++) - qemuDomainChrDefDropDefaultPath(def->channels[i], driver); + for (i = 0; i < def->nchannels; i++) { + if (qemuDomainChrDefDropDefaultPath(def->channels[i], driver) < 0) + goto cleanup; + } } format: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-unix-source-path.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-unix-source-path.xml new file mode 100644 index 0000000000..42cb3c387c --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-unix-source-path.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <channel type='unix'> + <source mode='bind' path='/tmp/channel/QEMUGuest1.org.qemu.guest_agent.0'/> + <target type='virtio' name='org.qemu.guest_agent.0'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/channel/domain-QEMUGuest1/org.qemu.guest_agent.1'/> + <target type='virtio' name='org.qemu.guest_agent.1'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/channel/domain-1-QEMUGuest1/org.qemu.guest_agent.2'/> + <target type='virtio' name='org.qemu.guest_agent.2'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/channel/QEMUGuest1/org.qemu.guest_agent.3'/> + <target type='virtio' name='org.qemu.guest_agent.3'/> + </channel> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml new file mode 100644 index 0000000000..2d8fa1e3ac --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-unix-source-path.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </controller> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.1'/> + <address type='virtio-serial' controller='0' bus='0' port='2'/> + </channel> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.2'/> + <address type='virtio-serial' controller='0' bus='0' port='3'/> + </channel> + <channel type='unix'> + <source mode='bind' path='/tmp/channel/QEMUGuest1/org.qemu.guest_agent.3'/> + <target type='virtio' name='org.qemu.guest_agent.3'/> + <address type='virtio-serial' controller='0' bus='0' port='4'/> + </channel> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2dccde746e..6e3544e4b7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -551,6 +551,8 @@ mymain(void) DO_TEST("channel-virtio", NONE); DO_TEST("channel-virtio-state", NONE); + DO_TEST_FULL("channel-unix-source-path", WHEN_INACTIVE, GIC_NONE, NONE); + DO_TEST("hostdev-usb-address", NONE); DO_TEST("hostdev-pci-address", NONE); DO_TEST("hostdev-vfio", NONE); -- 2.13.0

2 1