- Devel - libvirt List Archives

Re: [libvirt] [PATCH] qemu: Introduce VIRTIO_NET_F_STANDBY feature bit to virtio_net
by Samudrala, Sridhar 07 Jun '18

07 Jun '18

On 6/4/2018 7:06 PM, Jason Wang wrote: > > > On 2018年06月05日 09:41, Samudrala, Sridhar wrote: >> Ping on this patch now that the kernel patches are accepted into >> davem's net-next tree. >> https://patchwork.ozlabs.org/cover/920005/ >> >> >> On 5/7/2018 4:09 PM, Sridhar Samudrala wrote: >>> This feature bit can be used by hypervisor to indicate virtio_net >>> device to >>> act as a standby for another device with the same MAC address. >>> >>> I tested this with a small change to the patch to mark the STANDBY >>> feature 'true' >>> by default as i am using libvirt to start the VMs. >>> Is there a way to pass the newly added feature bit 'standby' to qemu >>> via libvirt >>> XML file? >>> > > Maybe you can try qemu command line passthrough: > > https://libvirt.org/drvqemu.html#qemucommand It looks like this can be used to pass command line arguments to qemu. Is it possible to specify a virtio specific attribute via this method? For ex: to say mrg_rxbuf is off we can add the following line to virtio section of the domain xml file. <host mrg_rxbuf='off'/> I think libvirt needs to be extended to to support the new 'standby' attribute via this mechanism. Adding Liane Stump and libvirt to the CC list. Michael, Can we start with getting this patch into Qemu and an update to libvirt to support the 'standby' feature so that this feature can be enabled via some scripts/orchestration layer for now. We could improve this solution by enhancing Qemu to do automatic management of the addition/deletion of the primary device based on feature negotiation as a later patch. > > The patch looks good to me. Let's see if Michael have any comment. > > Thanks > >>> Signed-off-by: Sridhar Samudrala <sridhar.samudrala(a)intel.com> >>> --- >>> hw/net/virtio-net.c | 2 ++ >>> include/standard-headers/linux/virtio_net.h | 3 +++ >>> 2 files changed, 5 insertions(+) >>> >>> diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c >>> index 90502fca7c..38b3140670 100644 >>> --- a/hw/net/virtio-net.c >>> +++ b/hw/net/virtio-net.c >>> @@ -2198,6 +2198,8 @@ static Property virtio_net_properties[] = { >>> true), >>> DEFINE_PROP_INT32("speed", VirtIONet, net_conf.speed, >>> SPEED_UNKNOWN), >>> DEFINE_PROP_STRING("duplex", VirtIONet, net_conf.duplex_str), >>> + DEFINE_PROP_BIT64("standby", VirtIONet, host_features, >>> VIRTIO_NET_F_STANDBY, >>> + false), >>> DEFINE_PROP_END_OF_LIST(), >>> }; >>> diff --git a/include/standard-headers/linux/virtio_net.h >>> b/include/standard-headers/linux/virtio_net.h >>> index e9f255ea3f..01ec09684c 100644 >>> --- a/include/standard-headers/linux/virtio_net.h >>> +++ b/include/standard-headers/linux/virtio_net.h >>> @@ -57,6 +57,9 @@ >>> * Steering */ >>> #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ >>> +#define VIRTIO_NET_F_STANDBY 62 /* Act as standby for >>> another device >>> + * with the same MAC. >>> + */ >>> #define VIRTIO_NET_F_SPEED_DUPLEX 63 /* Device set linkspeed >>> and duplex */ >>> #ifndef VIRTIO_NET_NO_LEGACY >> >

3 3

[libvirt] [PATCH v1 00/18] use VIR_AUTOFREE in src/util
by Sukrit Bhatnagar 07 Jun '18

07 Jun '18

This series of patches modifies some files in src/util to use VIR_AUTOFREE for automatic freeing of memory and get rid of some VIR_FREE macro invocations. Sukrit Bhatnagar (18): add macros for implementing automatic cleanup functionality use VIR_AUTOFREE in src/util/virarptable.c use VIR_AUTOFREE in src/util/virauth.c use VIR_AUTOFREE in src/util/virauthconfig.c use VIR_AUTOFREE in src/util/iohelper.c use VIR_AUTOFREE in src/util/viraudit.c use VIR_AUTOFREE in src/util/virbuffer.c use VIR_AUTOFREE in src/util/vircgroup.c use VIR_AUTOFREE in src/util/virfcp.c use VIR_AUTOFREE in src/util/virdnsmasq.c use VIR_AUTOFREE in src/util/vireventpoll.c use VIR_AUTOFREE in src/util/virdbus.c use VIR_AUTOFREE in src/util/virfdstream.c use VIR_AUTOFREE in src/util/virfile.c use VIR_AUTOFREE in src/util/virconf.c use VIR_AUTOFREE in src/util/virfilecache.c use VIR_AUTOFREE in src/util/virfirewall.c use VIR_AUTOFREE in src/util/virhook.c src/util/iohelper.c | 4 +- src/util/viralloc.h | 69 +++++++ src/util/virarptable.c | 9 +- src/util/viraudit.c | 3 +- src/util/virauth.c | 60 ++---- src/util/virauthconfig.c | 34 ++- src/util/virbuffer.c | 33 ++- src/util/vircgroup.c | 526 ++++++++++++++++------------------------------- src/util/virconf.c | 42 ++-- src/util/virdbus.c | 28 +-- src/util/virdnsmasq.c | 116 ++++------- src/util/vireventpoll.c | 7 +- src/util/virfcp.c | 20 +- src/util/virfdstream.c | 3 +- src/util/virfile.c | 303 +++++++++------------------ src/util/virfilecache.c | 35 +--- src/util/virfirewall.c | 13 +- src/util/virhook.c | 16 +- 18 files changed, 487 insertions(+), 834 deletions(-) -- 1.8.3.1

2 29

[libvirt] [PATCH 0/2] cmdDomblkinfo: introduce --all to show all
by Chen Hanxiao 07 Jun '18

07 Jun '18

This series introduce --all to cmdDomblkinfo to show all block devices info in one cmd. Likes a combination of domblklist and domblkinfo. Chen Hanxiao (2): cmdDomblkinfo: introduce --all to show all block devices info news: add cmdDomblkinfo --all option docs/news.xml | 8 ++++ tools/virsh-domain-monitor.c | 82 +++++++++++++++++++++++++++--------- tools/virsh.pod | 5 ++- 3 files changed, 75 insertions(+), 20 deletions(-) -- 2.17.0

1 2

[libvirt] [perl PATCH] Blacklist virGetLastError{Code,Domain}
by Daniel P. Berrangé 07 Jun '18

07 Jun '18

These methods will not be exposed to apps, since we auto raise all errors. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- t/030-api-coverage.t | 2 ++ 1 file changed, 2 insertions(+) Pushed as a trivial build fix diff --git a/t/030-api-coverage.t b/t/030-api-coverage.t index 39d6146..15d4a77 100644 --- a/t/030-api-coverage.t +++ b/t/030-api-coverage.t @@ -69,6 +69,8 @@ virFreeError virResetLastError virSaveLastError virGetLastErrorMessage +virGetLastErrorCode +virGetLastErrorDomain virConnectAuthCallbackPtr virConnectOpen -- 2.17.0

1 0

[libvirt] [go PATCH] Blacklist virGetLastError{Code,Domain}
by Daniel P. Berrangé 07 Jun '18

07 Jun '18

These methods will not be exposed to apps, since we always return all errors. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- api_test.go | 2 ++ 1 file changed, 2 insertions(+) Pushed as a trivial build fix diff --git a/api_test.go b/api_test.go index 27f77dd..53632df 100644 --- a/api_test.go +++ b/api_test.go @@ -69,6 +69,8 @@ var ( "virCopyLastError", "virFreeError", "virGetLastErrorMessage", + "virGetLastErrorCode", + "virGetLastErrorDomain", "virResetLastError", "virSaveLastError", "virDefaultErrorFunc", -- 2.17.0

1 0

[libvirt] [python PATCH] Blacklist virGetLastError{Code,Domain}
by Daniel P. Berrangé 07 Jun '18

07 Jun '18

These methods will not be exposed to apps, since we auto raise all errors. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- sanitytest.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Pushed as a trivial build fix diff --git a/sanitytest.py b/sanitytest.py index 190d32b..d5c23dc 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -234,7 +234,9 @@ for name in sorted(basicklassmap): "ErrorFunc", "FreeError", "SaveLastError", "ResetError"]: continue - elif func in ["GetLastError", "GetLastErrorMessage", "ResetLastError", "Initialize"]: + elif func in ["GetLastError", "GetLastErrorMessage", + "GetLastErrorCode", "GetLastErrorDomain", + "ResetLastError", "Initialize"]: func = "vir" + func elif func == "SetErrorFunc": func = "RegisterErrorHandler" -- 2.17.0

1 0

[libvirt] [PATCH v7 0/9] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 07 Jun '18

07 Jun '18

This patch series provides support for launching an encrypted guest using AMD's new Secure Encrypted Virtualization (SEV) feature. SEV is an extension to the AMD-V architecture which supports running multiple VMs under the control of a hypervisor. When enabled, SEV feature allows the memory contents of a virtual machine (VM) to be transparently encrypted with a key unique to the guest VM. At very high level the flow looks this: 1. mgmt tool calls virConnectGetDomainCapabilities. This returns an XML document that includes the following <feature> ... <sev supported='yes'> <cbitpos> </cbitpos> <reduced-phys-bits> </reduced-phys-bits> </sev> </feature> If <sev> is provided then we indicate that hypervisor is capable of launching SEV guest. mgmt tool can call virNodeGetSEVCapabilities() to get the additional informations like PDH and certificate chain etc. 2. (optional) mgmt tool can provide the PDH and Cert-chain to guest owner in case if guest owner wish to establish a secure connection with SEV firmware to negotiate a key used for validating the measurement. 3. mgmt tool requests to start a guest calling virCreateXML(), passing \ VIR_DOMAIN_START_PAUSED. The xml would include <launch-security type='sev'> <cbitpos>47</cbitpos> <reduced-phys-bits>1</reduced-phys-bits> <policy>0x1</policy> (optional) <dh-cert> </dh-cert> /* Guest owners Diffie-Hellman key */ <session> </session> /* Guest owners Session blob */ </launch-security> 4. Libvirt generate the QEMU cli arg to enable the SEV feature, a typical args looks like this: # $QEMU .. -machine memory-encryption=sev0 \ -object sev-guest,id=sev0,dh-cert-file=<file>.... 5. Libvirt generates lifecycle VIR_DOMAIN_EVENT_SUSPENDED_PAUSED event 6. mgmt tool gets the VIR_DOMAIN_EVENT_SUSPENDED_PAUSED and calls virDomainGetLaunchSecretInfo() to retrieve the measurement of encrypted memory. 7. (optional) mgmt tool can provide the measurement value to guest owner, which can validate the measurement and gives GO/NO-GO answer. If mgmt tool gets GO then it resumes the guest otherwise it calls destroy() to kill the guest. 8. mgmt tool resumes the guest TODO: * SEV guest require to use DMA apis for the virtio devices. In order to use the DMA apis the virtio devices must have this tag <driver iommu=on ats=on> It is a bit unclear to me where these changes need to go. Do we need to modify the libvirt to automatically add these when SEV is enabled or we ask mgmt tool to make sure that it creates XML with right tag to enable the DMA APIs for virtio devices. I am looking for some suggestions. Using these patches we have succesfully booted and tested a guest both with and without SEV enabled. SEV Firmware API spec is available at: https://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf Changes since v6: * add API to get SEV PDH and Certificate chain data * drop virsh command changes. We can revisit this later when we have more visibility on setter. Change since v5: * drop the seperate test patch and merge the code with other patches. * rename the xml from sev -> launch-security-sev * make policy field mandatory * address multiple feedback from previous reviews. Changes since v4: * add /dev/sev in shared device list Changes since v3: * rename QEMU_CAPS_SEV -> QEMU_CAPS_SEV_GUEST * update caps_2.12.0.x86_64.replies to include query-sev-capabilities data Changes since v2: * make cbitpos, policy and reduced-phys-bits as unsigned int * update virDomainGetLaunchSecurityInfo to accept virTypedParameterPtr *params instead of virTypedParameterPtr params. Changes since v1: * rename <sev> -> <launch-security> for domain * add more information about policy and other fields in domaincaps.html * split the domain_conf support in two patches * add virDomainGetLaunchInfo() to retrieve the SEV measurement * extend virsh command to show the domain's launch security information * add test cases to validate newly added <launch-security> element * fix issues reported with 'make check' and 'make syntax-check' The complete git tree is available at: https://github.com/codomania/libvirt/tree/v7 Brijesh Singh (9): qemu: provide support to query the SEV capability conf: expose SEV feature in domain capabilities libvirt-host: expose virNodeGetSEVCapability API conf: introduce launch-security element in domain qemu/cgroup: add /dev/sev in shared devices list qemu: add support to launch SEV guest libvirt: add new public API to get launch security info remote: implement the remote protocol for launch security qemu: Add support to launch security info docs/drvqemu.html.in | 1 + docs/formatdomain.html.in | 115 +++++++++++++++ docs/formatdomaincaps.html.in | 30 ++++ docs/schemas/domaincaps.rng | 14 ++ docs/schemas/domaincommon.rng | 37 +++++ include/libvirt/libvirt-domain.h | 17 +++ include/libvirt/libvirt-host.h | 42 ++++++ src/conf/domain_capabilities.c | 31 +++- src/conf/domain_capabilities.h | 17 +++ src/conf/domain_conf.c | 133 +++++++++++++++++ src/conf/domain_conf.h | 27 ++++ src/driver-hypervisor.h | 14 ++ src/libvirt-domain.c | 48 +++++++ src/libvirt-host.c | 48 +++++++ src/libvirt_private.syms | 2 +- src/libvirt_public.syms | 6 + src/qemu/qemu.conf | 2 +- src/qemu/qemu_capabilities.c | 90 +++++++++++- src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 4 + src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 41 ++++++ src/qemu/qemu_driver.c | 160 +++++++++++++++++++++ src/qemu/qemu_monitor.c | 18 +++ src/qemu/qemu_monitor.h | 6 + src/qemu/qemu_monitor_json.c | 121 ++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 62 ++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/remote/remote_daemon_dispatch.c | 91 ++++++++++++ src/remote/remote_driver.c | 81 +++++++++++ src/remote/remote_protocol.x | 39 ++++- src/remote_protocol-structs | 24 ++++ tests/genericxml2xmlindata/launch-security-sev.xml | 24 ++++ tests/genericxml2xmltest.c | 2 + .../caps_2.12.0.x86_64.replies | 10 ++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- tests/qemuxml2argvdata/launch-security-sev.args | 29 ++++ tests/qemuxml2argvdata/launch-security-sev.xml | 37 +++++ tests/qemuxml2argvtest.c | 4 + 40 files changed, 1435 insertions(+), 7 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-sev.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sev.args create mode 100644 tests/qemuxml2argvdata/launch-security-sev.xml -- 2.7.4

2 13

[libvirt] [PATCH] fdstream: Report error from the I/O thread
by John Ferlan 07 Jun '18

07 Jun '18

https://bugzilla.redhat.com/show_bug.cgi?id=1529059 Commit id 0fe4aa14 added the thread specific error message reporting (or save) to virFDStreamEvent; however, as processing goes via virStream{Send|SendHole|Recv} via calls from daemonStreamHandle{WriteData|Hole|Read} the last error gets reset in the main libvirt API's thus, whatever error may have been set as last error will be cleared prior to the error paths using it resulting in the generic error on the client side. For each of the paths that check threadQuit or threadErr, check if threadErr was set and set it agian if there isn't a last error (e.g. some other failure) set so that the message can be provided back to the client. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virfdstream.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index e4973a2bd0..8189559964 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -795,8 +795,13 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) char *buf; if (fdst->threadQuit || fdst->threadErr) { - virReportSystemError(EBADF, "%s", - _("cannot write to stream")); + + /* virStreamSend will virResetLastError possibly set + * by virFDStreamEvent */ + if (fdst->threadErr && !virGetLastError()) + virSetError(fdst->threadErr); + else + virReportSystemError(EBADF, "%s", _("cannot write to stream")); goto cleanup; } @@ -875,8 +880,13 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes) while (!(msg = fdst->msg)) { if (fdst->threadQuit || fdst->threadErr) { if (nbytes) { - virReportSystemError(EBADF, "%s", - _("stream is not open")); + /* virStreamRecv will virResetLastError possibly set + * by virFDStreamEvent */ + if (fdst->threadErr && !virGetLastError()) + virSetError(fdst->threadErr); + else + virReportSystemError(EBADF, "%s", + _("stream is not open")); } else { ret = 0; } @@ -976,8 +986,12 @@ virFDStreamSendHole(virStreamPtr st, * might mess up file position for the thread. */ if (fdst->threadQuit || fdst->threadErr) { - virReportSystemError(EBADF, "%s", - _("stream is not open")); + /* virStreamSendHole will virResetLastError possibly set + * by virFDStreamEvent */ + if (fdst->threadErr && !virGetLastError()) + virSetError(fdst->threadErr); + else + virReportSystemError(EBADF, "%s", _("stream is not open")); goto cleanup; } -- 2.14.4

2 1

[libvirt] [PATCH 0/2] qemu: Fix memleak in qemuBuildNumaArgStr
by Michal Privoznik 06 Jun '18

06 Jun '18

*** BLURB HERE *** Michal Privoznik (2): qemu: Fix memleak in qemuBuildNumaArgStr qemuBuildNumaArgStr: Simplify @nodeBackends src/qemu/qemu_command.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) -- 2.16.4

2 3

[libvirt] [PATCH] virQEMUCapsFreeHostCPUModel: Don't always free host cpuData
by Michal Privoznik 06 Jun '18

06 Jun '18

This function exists because of 5276ec712a44b36. But it is missing initial check just like virQEMUCapsInitHostCPUModel() has. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capspriv.h | 1 + tests/qemuxml2argvtest.c | 6 ++++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 26969ed3dc..949c32ddd2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2846,10 +2846,14 @@ virQEMUCapsNewHostCPUModel(void) void virQEMUCapsFreeHostCPUModel(virQEMUCapsPtr qemuCaps, + virArch hostArch, virDomainVirtType type) { virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type); + if (!virQEMUCapsGuestIsNative(hostArch, qemuCaps->arch)) + return; + virQEMUCapsHostCPUDataClearModels(cpuData); } diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index fea039ef3a..989d183c6c 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -58,6 +58,7 @@ virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps, void virQEMUCapsFreeHostCPUModel(virQEMUCapsPtr qemuCaps, + virArch hostArch, virDomainVirtType type); void diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 14a994523f..4984028d38 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -388,8 +388,10 @@ testUpdateQEMUCaps(const struct testInfo *info, if (testAddCPUModels(info->qemuCaps, info->skipLegacyCPUs) < 0) goto cleanup; - virQEMUCapsFreeHostCPUModel(info->qemuCaps, VIR_DOMAIN_VIRT_KVM); - virQEMUCapsFreeHostCPUModel(info->qemuCaps, VIR_DOMAIN_VIRT_QEMU); + virQEMUCapsFreeHostCPUModel(info->qemuCaps, caps->host.arch, + VIR_DOMAIN_VIRT_KVM); + virQEMUCapsFreeHostCPUModel(info->qemuCaps, caps->host.arch, + VIR_DOMAIN_VIRT_QEMU); virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, VIR_DOMAIN_VIRT_KVM); -- 2.16.4

2 1

[libvirt] [ v3 0/4] Introduce network-backed loader & NVRAM.
by Prerna Saxena 06 Jun '18

06 Jun '18

Libvirt domain XML allows only local filepaths to specify a loader element or its matching NVRAM. Given that VMs may themselves move across hypervisor hosts, it should be possible to allocate loaders/NVRAM disks on network storage for uninterrupted access. This series extends the loader & NVRAM disk elements to be described as virStorageSource* elements, as discussed in : https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html Sample XML with new annotation: <loader readonly='yes' type='pflash' backing='file'> <source file='/usr/share/OVMF/OVMF_CODE.fd'/> </loader> <nvram backing='network'> <source protocol='iscsi' name='iqn.2013-07.com.example:iscsi-nopool/0'> <host name='example.com' port='6000'/> </source> </nvram> References: ---------- v0/ Proposal: https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html.v1 v1: https://www.redhat.com/archives/libvir-list/2018-April/msg02024.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg00948.html Changelog: --------- Changes since v2: - Consolidated patches with related data structures to avoid build breakage. - Passes make check & make syntax-check. Prerna Saxena (4): Schema: Introduce XML schema for network-backed loader and nvram elements. Loader: Add a more elaborate definition. Test: Add a test snippet to evaluate command line generation for loader/nvram specified via virStorageSource Documentation: Add a blurb for the newly added XML snippets for loader and nvram. docs/formatdomain.html.in | 36 +++- docs/schemas/domaincommon.rng | 108 +++++++++-- src/bhyve/bhyve_command.c | 6 +- src/conf/domain_conf.c | 250 +++++++++++++++++++++++-- src/conf/domain_conf.h | 11 +- src/qemu/qemu_cgroup.c | 13 +- src/qemu/qemu_command.c | 21 ++- src/qemu/qemu_domain.c | 31 ++- src/qemu/qemu_driver.c | 7 +- src/qemu/qemu_parse_command.c | 30 ++- src/qemu/qemu_process.c | 54 ++++-- src/security/security_dac.c | 6 +- src/security/security_selinux.c | 6 +- src/security/virt-aa-helper.c | 14 +- src/vbox/vbox_common.c | 11 +- src/xenapi/xenapi_driver.c | 4 +- src/xenconfig/xen_sxpr.c | 19 +- src/xenconfig/xen_xm.c | 9 +- tests/qemuxml2argvdata/bios-nvram-network.args | 31 +++ tests/qemuxml2argvdata/bios-nvram-network.xml | 42 +++++ tests/qemuxml2argvtest.c | 1 + 21 files changed, 606 insertions(+), 104 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.xml -- 1.8.1.2

3 8

[libvirt] [PATCH] qemu: Honour <on_reboot/>
by Michal Privoznik 06 Jun '18

06 Jun '18

https://bugzilla.redhat.com/show_bug.cgi?id=1476866 For some reason, we completely ignore <on_reboot/> setting for domains. The implementation is simply not there. It never was. However, things are slightly more complicated. QEMU sends us two RESET events on domain reboot. Fortunately, the event contains this 'guest' field telling us who initiated the reboot. And since we don't want to destroy the domain if the reset is initiated by a user, we have to ignore those events. Whatever, just look at the code. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 8 +++++++- src/qemu/qemu_process.c | 34 ++++++++++++++++++++++++++++++---- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 4c9050aff..d865e67c7 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -233,6 +233,7 @@ struct _qemuDomainObjPrivate { bool agentError; bool gotShutdown; + bool gotReset; bool beingDestroyed; char *pidfile; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 19082d8bf..8f81a2b28 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1344,12 +1344,12 @@ qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) int -qemuMonitorEmitReset(qemuMonitorPtr mon) +qemuMonitorEmitReset(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; VIR_DEBUG("mon=%p", mon); - QEMU_MONITOR_CALLBACK(mon, ret, domainReset, mon->vm); + QEMU_MONITOR_CALLBACK(mon, ret, domainReset, mon->vm, guest); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 31f7e97ba..8c33f6783 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -134,6 +134,7 @@ typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitorPtr mon, void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, + virTristateBool guest, void *opaque); typedef int (*qemuMonitorDomainPowerdownCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -346,7 +347,7 @@ int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); int qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest); -int qemuMonitorEmitReset(qemuMonitorPtr mon); +int qemuMonitorEmitReset(qemuMonitorPtr mon, virTristateBool guest); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); int qemuMonitorEmitResume(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index b8a68154a..8a1501ced 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -536,7 +536,13 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) { - qemuMonitorEmitReset(mon); + bool guest = false; + virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; + + if (data && virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + + qemuMonitorEmitReset(mon, guest_initiated); } static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0aecce3b1..889efc7f0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -478,27 +478,51 @@ qemuProcessFindVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + virTristateBool guest_initiated, void *opaque) { virQEMUDriverPtr driver = opaque; - virObjectEventPtr event; + virObjectEventPtr event = NULL; qemuDomainObjPrivatePtr priv; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + bool callOnReboot = false; virObjectLock(vm); + priv = vm->privateData; + + /* This is a bit tricky. When a guest does 'reboot' we receive RESET event + * twice, both times it's guest initiated. However, if users call 'virsh + * reset' we still receive two events but the first one is guest_initiated + * = no, the second one is guest_initiated = yes. Therefore, to avoid + * executing onReboot action in the latter case we need this complicated + * construction. */ + if (guest_initiated == VIR_TRISTATE_BOOL_NO) { + VIR_DEBUG("Ignoring not guest initiated RESET event from domain %s", + vm->def->name); + priv->gotReset = true; + } else if (priv->gotReset && guest_initiated == VIR_TRISTATE_BOOL_YES) { + VIR_DEBUG("Ignoring second RESET event from domain %s", + vm->def->name); + priv->gotReset = false; + } else { + callOnReboot = true; + } + event = virDomainEventRebootNewFromObj(vm); - priv = vm->privateData; if (priv->agent) qemuAgentNotifyEvent(priv->agent, QEMU_AGENT_EVENT_RESET); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); + if (callOnReboot && + guest_initiated == VIR_TRISTATE_BOOL_YES && + vm->def->onReboot == VIR_DOMAIN_LIFECYCLE_DESTROY) + qemuProcessShutdownOrReboot(driver, vm); + virObjectUnlock(vm); - qemuDomainEventQueue(driver, event); - virObjectUnref(cfg); return 0; } @@ -555,6 +579,7 @@ qemuProcessFakeReboot(void *opaque) goto endjob; } priv->gotShutdown = false; + priv->gotReset = false; event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); @@ -5320,6 +5345,7 @@ qemuProcessPrepareDomain(virConnectPtr conn, priv->monError = false; priv->monStart = 0; priv->gotShutdown = false; + priv->gotReset = false; VIR_DEBUG("Updating guest CPU definition"); if (qemuProcessUpdateGuestCPU(vm->def, priv->qemuCaps, caps, flags) < 0) -- 2.13.0

4 6

[libvirt] [RFC PATCH 0/6] qemu: Support pagesize tuning for pSeries guests
by Andrea Bolognani 06 Jun '18

06 Jun '18

The QEMU part, which is RFC as well, can be found at http://lists.nongnu.org/archive/html/qemu-devel/2018-04/msg02818.html Applies cleanly on top of c49013f26c6b40b741f4d5fc61269898f7fd25b8. Andrea Bolognani (6): conf: Reintroduce virDomainDef::hpt_resizing conf: Tweak HPT parsing and formatting qemu: Introduce QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MPS tests: Pretend we have pseries.cap-hpt-mps in 2.12 conf: Parse and format HPT maxpagesize qemu: Format pseries.cap-hpt-mps on the command line docs/schemas/domaincommon.rng | 21 +- src/conf/domain_conf.c | 72 ++++++- src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 8 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 57 ++++-- src/qemu/qemu_domain.c | 2 +- .../caps_2.12.0.aarch64.replies | 24 ++- .../caps_2.12.0.aarch64.xml | 2 +- .../caps_2.12.0.ppc64.replies | 180 +++++++++++++++++- .../caps_2.12.0.ppc64.xml | 3 +- .../caps_2.12.0.s390x.replies | 26 ++- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 30 +-- .../caps_2.12.0.x86_64.xml | 2 +- tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 18 +- tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/pseries-features.xml | 31 ++- tests/qemuxml2xmltest.c | 1 + 20 files changed, 401 insertions(+), 85 deletions(-) mode change 120000 => 100644 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.17.0

3 22

[libvirt] [PATCH] qemu: fix msg could be a wild pointer in qemuMonitorIOProcess()
by Shannon Zhao 06 Jun '18

06 Jun '18

From: Weilun Zhu <zhuweilun(a)huawei.com> As qemuMonitorJSONIOProcess() will unlock the qemu monitor, there is some extreme situation, eg qemu send message to monitor twice in a short time, where the local viriable 'msg' of qemuMonitorIOProcess() could be a wild point: 1. qemuMonitorSend() assign mon->msg to parameter 'msg', which is alse a local variable of its caller qemuMonitorJSONCommandWithFd(), cause eventloop to send message to monitor, then wait condition. 2. qemu send message to monitor for the first time immediately. 3. qemuMonitorIOProcess() is called, then wake up the qemuMonitorSend() thread, but the qemuMonitorSend() thread stuck for a while, which means the qemu monitor is still unlocked. 4. qemu send message to monitor for the second time, such as RTC_CHANGE event 5. qemuMonitorIOProcess() is called, the local viriable 'msg' is assigned to mon->msg. 6. qemuMonitorIOProcess() call qemuMonitorJSONIOProcess() to deal with the message 7. qemuMonitorJSONIOProcess() unlock the qemu monitor, qemuMonitorSend() thread get the lock and free the mon->msg, assign mon->msg to NULL. so the local viriable 'msg' of qemuMonitorIOProcess() is a wild pointer now. AFAIK, it is not harmful to call again virCondBroadcast() while msg is a wild pointer, but just in case, we fix it in this patch. --- src/qemu/qemu_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 43f1d2f..464f200 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -454,7 +454,7 @@ qemuMonitorIOProcess(qemuMonitorPtr mon) #if DEBUG_IO VIR_DEBUG("Process done %d used %d", (int)mon->bufferOffset, len); #endif - if (msg && msg->finished) + if (msg && msg == mon->msg && msg->finished) virCondBroadcast(&mon->notify); return len; } -- 1.8.3.1

3 3

[libvirt] [PATCH] docs: document mandatory signoffs in governance.html
by Ján Tomko 06 Jun '18

06 Jun '18

Amend the paragraphs about no CLAs and implicit license agreements to mention mandatory Signed-off-by tags. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- This is duplicating information, but I did not find a reasonable way to link the numbered list in hacking.html without making it look ugly. Very probably due to my lack of trying. docs/governance.html.in | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/governance.html.in b/docs/governance.html.in index df5999c0f2..e9608f673c 100644 --- a/docs/governance.html.in +++ b/docs/governance.html.in @@ -141,13 +141,17 @@ than having the interest and ability to provide a contribution. The libvirt project <strong>does not require</strong> any <em>"Contributor License Agreement"</em> - to be signed prior to engagement with the community. + to be signed prior to engagement with the community. However for + contributing patches, providing a 'Signed-off-by' line with the + author's legal name and e-mail address to demonstrate agreement + and compliance with the <a href="https://developercertificate.org/"> + Developer Certificate of Origin</a> is required. </p> <p> - In making a contribution to the project, the community member is - implicitly stating that they accept the terms of the license under - which the work they are contributing to is distributed. They are + In making a non-patch contribution to the project, the community + member is implicitly stating that they accept the terms of the license + under which the work they are contributing to is distributed. They are also implicitly stating that they have the legal right to make the contribution, if doing so on behalf of a broader organization / company. Most of the project's code is distributed under the GNU -- 2.13.6

2 1

[libvirt] [PATCH] qemu: Fix double free in qemuDomainSecretAESClear
by John Ferlan 06 Jun '18

06 Jun '18

Commit id 02b031a4 added a secondary path from which the incoming @secinfo would not be free'd until the private data was freed in qemuDomainStorageSourcePrivateDispose. However, by doing this the original intention to free @*secinfo afterwards is lost and thus the pass by value of the secinfo->s.aes (or secinfo->s.plain for its method) results in not keeping the NULL setting in the various secret.{username|iv|ciphertext} fields upon return to qemuDomainSecretInfoClear and eventually will result in a double free at domain destroy: raise () abort () __libc_message () malloc_printerr () _int_free () virFree qemuDomainSecretAESClear qemuDomainSecretInfoClear qemuDomainSecretInfoFree qemuDomainStorageSourcePrivateDispose virObjectUnref virStorageSourceClear virStorageSourceFree virDomainDiskDefFree virDomainDefFree virDomainObjRemoveTransientDef qemuProcessStop qemuDomainDestroyFlags virDomainDestroy Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_domain.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) Domains w/ secrets weren't very happy when I went to destroy them today during testing... Fortunately issue is not in 4.4.0... I modified both Plain and AES just because it's probably best to avoid something like this in the future. diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f135117a95..1fb1ef1deb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -945,23 +945,23 @@ qemuDomainMasterKeyCreate(virDomainObjPtr vm) static void -qemuDomainSecretPlainClear(qemuDomainSecretPlain secret) +qemuDomainSecretPlainClear(qemuDomainSecretPlainPtr secret) { - VIR_FREE(secret.username); - VIR_DISPOSE_N(secret.secret, secret.secretlen); + VIR_FREE(secret->username); + VIR_DISPOSE_N(secret->secret, secret->secretlen); } static void -qemuDomainSecretAESClear(qemuDomainSecretAES secret, +qemuDomainSecretAESClear(qemuDomainSecretAESPtr secret, bool keepAlias) { if (!keepAlias) - VIR_FREE(secret.alias); + VIR_FREE(secret->alias); - VIR_FREE(secret.username); - VIR_FREE(secret.iv); - VIR_FREE(secret.ciphertext); + VIR_FREE(secret->username); + VIR_FREE(secret->iv); + VIR_FREE(secret->ciphertext); } @@ -974,11 +974,11 @@ qemuDomainSecretInfoClear(qemuDomainSecretInfoPtr secinfo, switch ((qemuDomainSecretInfoType) secinfo->type) { case VIR_DOMAIN_SECRET_INFO_TYPE_PLAIN: - qemuDomainSecretPlainClear(secinfo->s.plain); + qemuDomainSecretPlainClear(&secinfo->s.plain); break; case VIR_DOMAIN_SECRET_INFO_TYPE_AES: - qemuDomainSecretAESClear(secinfo->s.aes, keepAlias); + qemuDomainSecretAESClear(&secinfo->s.aes, keepAlias); break; case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: -- 2.14.4

2 1

[libvirt] [PATCH v2 0/2] nwfilter: fix IP address learning
by Daniel P. Berrangé 06 Jun '18

06 Jun '18

Changed in v2: - Use if() instead of switch() Daniel P. Berrangé (2): nwfilter: fix IP address learning nwfilter: directly use poll to wait for packets instead of pcap_next src/nwfilter/nwfilter_learnipaddr.c | 55 ++++++++++++++++++++++------- src/nwfilter/nwfilter_learnipaddr.h | 2 +- 2 files changed, 43 insertions(+), 14 deletions(-) -- 2.17.0

2 3

[libvirt] [perl PATCH 0/6] Update RPM spec to match latest Fedora
by Daniel P. Berrangé 06 Jun '18

06 Jun '18

Syncing changes back from Fedora to follow best practice Daniel P. Berrangé (6): Remove obsolete RPM group tag Replace search.cpan.org with metacpan.org Remove commented out cruft leftover from Module::Build conversion Remove obsolete %defattr statement Use %license for LICENSE file instead of %doc Modernize list of build deps to match actual required packages perl-Sys-Virt.spec.PL | 45 ++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) -- 2.17.0

2 12

[libvirt] [PATCH v2 0/3] adding virGetLastErrorCode/Domain to paritally replace virGetLastError
by ramyelkest 06 Jun '18

06 Jun '18

Changes from v1[1]: * removed virHasLastError() and s/virHasLastError/virGetLastErrorCode/g * replaced in missed files: virmodule.c and virnetlibsshsession.c * better split of patches [1] https://www.redhat.com/archives/libvir-list/2018-May/msg00259.html ramyelkest (3): util: cleanup: using virGetLastErrorMessage instead of err->message util: added virGetLastErrorCode/Domain all: replacing virGetLastError with virGetLastErrorCode where we can include/libvirt/virterror.h | 2 ++ src/libvirt_public.syms | 6 ++++++ src/locking/lock_driver_lockd.c | 3 +-- src/lxc/lxc_controller.c | 4 +--- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_conf.c | 3 +-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 12 ++++++------ src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_monitor.c | 5 ++--- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 4 ++-- src/remote/remote_driver.c | 3 +-- src/rpc/virnetclient.c | 2 +- src/rpc/virnetlibsshsession.c | 4 +--- src/util/virerror.c | 42 +++++++++++++++++++++++++++++++++++++++++ src/util/virfilecache.c | 3 +-- src/util/virmodule.c | 3 +-- src/util/virxml.c | 4 ++-- tests/commandtest.c | 2 +- tests/testutils.c | 6 ++---- tests/virhostcputest.c | 2 +- tests/virstoragetest.c | 8 ++++---- tools/virsh-domain-monitor.c | 7 +++---- tools/virsh-domain.c | 4 +--- tools/virsh-util.c | 3 +-- tools/vsh.c | 2 +- 28 files changed, 90 insertions(+), 57 deletions(-) -- 2.7.4

3 8

[libvirt] [PATCH] tests: use a fixed NBD TLS certificate path
by Daniel P. Berrangé 06 Jun '18

06 Jun '18

The default NBD TLS certificate path varies based on prefix given to configure, causing tests to fail depending on build options. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for CI tests/qemuxml2argvdata/disk-drive-network-tlsx509.args | 4 ++-- tests/qemuxml2argvtest.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args index 970b8a32a6..e25f45742c 100644 --- a/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args +++ b/tests/qemuxml2argvdata/disk-drive-network-tlsx509.args @@ -44,8 +44,8 @@ file.server.host=192.168.0.3,file.server.port=9999,format=raw,if=none,\ id=drive-virtio-disk2,serial=eb90327c-8302-4725-9e1b-4e85ed4dc252,cache=none \ -device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk2,\ id=virtio-disk2 \ --object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/qemu,\ -endpoint=client,verify-peer=yes \ +-object tls-creds-x509,id=objvirtio-disk3_tls0,dir=/etc/pki/libvirt-nbd/dummy,,\ +path,endpoint=client,verify-peer=yes \ -drive file.driver=nbd,file.server.type=inet,file.server.host=example.com,\ file.server.port=1234,file.tls-creds=objvirtio-disk3_tls0,format=raw,if=none,\ id=drive-virtio-disk3,cache=none \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 36bff26d33..8e5504f845 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -655,6 +655,9 @@ mymain(void) VIR_FREE(driver.config->vxhsTLSx509certdir); if (VIR_STRDUP_QUIET(driver.config->vxhsTLSx509certdir, "/etc/pki/libvirt-vxhs/dummy,path") < 0) return EXIT_FAILURE; + VIR_FREE(driver.config->nbdTLSx509certdir); + if (VIR_STRDUP_QUIET(driver.config->nbdTLSx509certdir, "/etc/pki/libvirt-nbd/dummy,path") < 0) + return EXIT_FAILURE; VIR_FREE(driver.config->hugetlbfs); if (VIR_ALLOC_N(driver.config->hugetlbfs, 2) < 0) @@ -2860,6 +2863,7 @@ mymain(void) if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); + VIR_FREE(driver.config->nbdTLSx509certdir); qemuTestDriverFree(&driver); VIR_FREE(fakerootdir); VIR_FREE(capslatest_x86_64); -- 2.17.0

1 0

[libvirt] libvirt default machine-type guarantees? (was Re: [Qemu-devel] [PATCH RFC] hw/pc: set q35 as the default x86 machine)
by Eduardo Habkost 06 Jun '18

06 Jun '18

(CCing libvir-list) On Tue, Jun 05, 2018 at 09:43:00AM +0100, Daniel P. Berrangé wrote: > On Tue, Jun 05, 2018 at 09:27:46AM +0200, Gerd Hoffmann wrote: > > Hi, > > > > > > Add to that shortcuts like -cdrom > > > > stop working, > > > > > > Maybe is fixable. > > > > Already fixed for ages. > > > > > I see marking Q35 as the default machine a first step. > > > > Maybe the better option is to go the arm route: Just don't define a > > default, so users have to specify pc or q35. That will make them notice > > there is a world beside 'pc', and we also avoid breaking things > > silently. > > If QEMU removes the default, then libvirt will have to hardcode > 'pc' as the default to maintain back compatibility, so I don't > think that ends up as a net win Is there an actual promise to never change the default machine-type documented in the libvirt API, or is this just fear of breaking existing code? -- Eduardo

4 10

[libvirt] [PATCH v3 0/4] qemu: use FD passing for chardev UNIX sockets
by Daniel P. Berrangé 06 Jun '18

06 Jun '18

This series makes use of the chardev fd passing arriving in QEMU 2.12 to get rid of the startup race wrt opening the QEMU monitor. It is actually enabled in all chardev UNIX sockets for sake of having the same codepath everywhere, but is only important for the monitor socket. Changed in v3: - Refactor UNIX socket opening code to allow it to be mocked in the unit tests to avoid creating real UNIX sockets Daniel P. Berrangé (4): qemu: probe for -chardev 'fd' parameter for FD passing qemu: support passing pre-opened UNIX socket listen FD qemu: don't retry connect() if doing FD passing qemu: remove pointless connect retry logic in agent src/qemu/qemu_agent.c | 84 ++----------------- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 64 +++++++++++++- src/qemu/qemu_command.h | 4 + src/qemu/qemu_monitor.c | 54 +++++++----- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_process.c | 27 ++++-- .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.s390x.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + tests/qemumonitortestutils.c | 1 + .../disk-drive-write-cache.x86_64-latest.args | 3 +- ...irtio-scsi-reservations.x86_64-latest.args | 3 +- tests/qemuxml2argvmock.c | 16 ++++ 16 files changed, 153 insertions(+), 113 deletions(-) -- 2.17.0

3 7

[libvirt] [PATCH 0/3] travis: Stop performing Ubuntu builds
by Andrea Bolognani 06 Jun '18

06 Jun '18

They're all failing at the moment anyway. We'll get the Ubuntu coverage back as soon as we add Ubuntu builders to the CentOS CI environment. Andrea Bolognani (3): travis: Stop performing Ubuntu builds travis: Remove matrix travis: Minor style tweaks .travis.yml | 118 ++++++++-------------------------------------------- 1 file changed, 17 insertions(+), 101 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] qemu: Fix detaching from persistent def in qemuDomainDetachDeviceAliasLiveAndConfig
by Peter Krempa 06 Jun '18

06 Jun '18

The code that detaches the device from persistent definition copies the persistent definition first so that it can easily be rolled back. The actual detaching is then made in the copy which is assigned back on success (if the live operation succeeded as well). This is not the case in qemuDomainDetachDeviceAliasLiveAndConfig where the definition was copied and put back, but the detaching happened from the other object which was overwritten. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c200c5a63d..b7b318896f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -8822,14 +8822,13 @@ qemuDomainDetachDeviceAliasLiveAndConfig(virQEMUDriverPtr driver, if (persistentDef) { virDomainDeviceDef dev; - vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt); - if (!vmdef) + if (!(vmdef = virDomainObjCopyPersistentDef(vm, caps, driver->xmlopt))) goto cleanup; - if (virDomainDefFindDevice(persistentDef, alias, &dev, true) < 0) + if (virDomainDefFindDevice(vmdef, alias, &dev, true) < 0) goto cleanup; - if (qemuDomainDetachDeviceConfig(persistentDef, &dev, caps, + if (qemuDomainDetachDeviceConfig(vmdef, &dev, caps, parse_flags, driver->xmlopt) < 0) goto cleanup; } -- 2.16.2

2 1

[libvirt] [PATCH] qemu: add entry for balloon stat stat-disk-caches
by Tomáš Golembiovský 05 Jun '18

05 Jun '18

Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com> --- include/libvirt/libvirt-domain.h | 9 ++++++++- src/qemu/qemu_monitor_json.c | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index da773b76cb..b96c018a90 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -628,11 +628,18 @@ typedef enum { /* Timestamp of the last update of statistics, in seconds. */ VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE = 9, + /* + * The amount of memory, in bytes, that can be quickly reclaimed without + * additional I/O. Typically these pages are used for caching files from + * disk. + */ + VIR_DOMAIN_MEMORY_STAT_DISK_CACHES = 10, + /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 10, + VIR_DOMAIN_MEMORY_STAT_NR = 11, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_MEMORY_STAT_LAST = VIR_DOMAIN_MEMORY_STAT_NR diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 42d7b9c5e9..b0a65d8af9 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2069,6 +2069,8 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 1024); GET_BALLOON_STATS(statsdata, "stat-available-memory", VIR_DOMAIN_MEMORY_STAT_USABLE, 1024); + GET_BALLOON_STATS(statsdata, "stat-disk-caches", + VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, 1024); GET_BALLOON_STATS(data, "last-update", VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 1); ret = got; -- 2.17.0

3 4

[libvirt] [PATCH v8 00/18] Add support for TPM emulator (for 4.5)
by Stefan Berger 05 Jun '18

05 Jun '18

This series of patches adds support for the TPM emulator backend that is available in QEMU and based on swtpm + libtpms. It allows to attach a TPM 1.2 or 2 to a QEMU VM. sVirt labels are used for labeling the swtpm process, its Unix socket, and log file with the same label that the QEMU process gets. Besides that swtpm is added to the emulator cgroup to restrict its CPU usage. The device XML can be changed from a TPM 1.2 to a TPM 2 and back to a TPM 1.2. The device state is not removed during those changes but only when the domain is undefined. The swtpm needs persistent storage to store its state. For that I am using the uuid of the VM as part of the path since the name of the VM can be changed. Logfiles, PID files, and socket names are based on the name of the VM, though. Stefan v7->v8: - Delaying this series for 4.5; adjusted references to 4.4 - Fixed a test case since version='1.2' is now formatted as well - Appended patches for AppArmor and auditing - Appended patches that improve / fix existing code - patch for validating the TPM configuration rather than overwriting it; a particular case is the CRB interface does not work with a TPM 1.2 - swtpm_setup can be run for a TPM 2 in unprivileged mode as well v6->v7: - followed Jan Tomko's suggestion with resulting changing to patch 10/12. - re-added missing parts related to swtpm_setup and TPM that got lost in v4 v5->v6: - Addressed John Ferlan's comments - rebased on latest tip - Added patch 12. v4->v5: - Addressed John Ferlan's, Boris Fiuczysnki's and Marc Hartmayer's comments - rebased on latest tip v3->v4: - Addressed John Ferlan's comments - Fixed bugs I found while testing - rebased on latest tip Stefan Berger (18): conf: Add support for external swtpm TPM emulator to domain XML qemu: Extend QEMU capabilities with 'tpm-emulator' util: Implement virFileChownFiles() security: Add DAC and SELinux security for tpm-emulator qemu: Extend qemu_conf with tpm-emulator support qemu: Extend QEMU with external TPM support qemu: Add support for external swtpm TPM emulator tests: Add test cases for external swtpm TPM emulator security: Label the external swtpm with SELinux labels conf: Add support for choosing emulation of a TPM 2 qemu: Add swtpm to emulator cgroup news: Update news with new TPM emulator feature security: Add swtpm paths to the domain's AppArmor profile qemu: Run swtpm_setup in unprivileged mode for a TPM 2 qemu: Validate chosen TPM model rather than overwriting it conf: Audit TPM emulator device at domain startup conf: Use resrc=tpm in case of TPM passthrough following docs conf: Use virDomainChrSourceDefClear() rather than VIR_FREE() docs/auditlog.html.in | 2 +- docs/formatdomain.html.in | 43 + docs/news.xml | 13 + docs/schemas/domaincommon.rng | 17 + examples/apparmor/libvirt-qemu | 3 + libvirt.spec.in | 2 + src/conf/domain_audit.c | 20 +- src/conf/domain_conf.c | 49 +- src/conf/domain_conf.h | 15 + src/libvirt_private.syms | 3 + src/qemu/Makefile.inc.am | 10 + src/qemu/libvirtd_qemu.aug | 5 + src/qemu/qemu.conf | 8 + src/qemu/qemu_capabilities.c | 5 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_cgroup.c | 36 + src/qemu/qemu_cgroup.h | 2 + src/qemu/qemu_command.c | 34 +- src/qemu/qemu_conf.c | 43 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 31 +- src/qemu/qemu_extdevice.c | 180 ++++ src/qemu/qemu_extdevice.h | 59 ++ src/qemu/qemu_process.c | 16 + src/qemu/qemu_security.c | 69 ++ src/qemu/qemu_security.h | 11 + src/qemu/qemu_tpm.c | 922 +++++++++++++++++++++ src/qemu/qemu_tpm.h | 56 ++ src/qemu/test_libvirtd_qemu.aug.in | 2 + src/security/security_dac.c | 7 + src/security/security_driver.h | 7 + src/security/security_manager.c | 36 + src/security/security_manager.h | 6 + src/security/security_selinux.c | 172 ++++ src/security/security_stack.c | 40 + src/security/virt-aa-helper.c | 24 + src/util/virfile.c | 55 ++ src/util/virfile.h | 3 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + .../tpm-emulator-tpm2.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 30 + .../tpm-emulator.x86_64-latest.args | 33 + tests/qemuxml2argvdata/tpm-emulator.xml | 30 + tests/qemuxml2argvtest.c | 16 +- tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml | 34 + tests/qemuxml2xmloutdata/tpm-emulator.xml | 34 + tests/qemuxml2xmltest.c | 1 + 51 files changed, 2212 insertions(+), 17 deletions(-) create mode 100644 src/qemu/qemu_extdevice.c create mode 100644 src/qemu/qemu_extdevice.h create mode 100644 src/qemu/qemu_tpm.c create mode 100644 src/qemu/qemu_tpm.h create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator.xml -- 2.14.3

3 44

[libvirt] [PATCH 0/8] vsock hotplug
by Ján Tomko 05 Jun '18

05 Jun '18

Followup for: https://bugzilla.redhat.com/show_bug.cgi?id=1291851 Ján Tomko (8): qemu: split out qemuBuildVsockDevStr qemuBuildVsockDevStr: allow passing a fdprefix export virDomainVsockDefFree qemu: export vsock-related functions qemu: implement vsock hotplug conf: introduce virDomainVsockDefEquals qemu: implement vsock hotunplug qemu: implement vsock coldplug/coldunplug src/conf/domain_conf.c | 18 +++++++ src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_alias.h | 2 + src/qemu/qemu_command.c | 39 ++++++++++---- src/qemu/qemu_command.h | 8 +++ src/qemu/qemu_driver.c | 36 +++++++++++-- src/qemu/qemu_hotplug.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 7 +++ src/qemu/qemu_process.c | 2 +- src/qemu/qemu_process.h | 2 + 12 files changed, 241 insertions(+), 18 deletions(-) -- 2.16.1

2 20

[libvirt] [PATCH 0/3] Require GnuTLS
by Michal Privoznik 05 Jun '18

05 Jun '18

As mentioned in discussion to my PRNG patches [1] we use GnuTLS functions widely. Therefore, make GnuTLS required at build time. This enables us to drop most of #ifdef WITH_GNULS we have. Not all of them though because we still want libvirt-setuid-rpc-client.la to build without GnuTLS. I should also mention that surprisingly this breaks travis. This time, it's Ubuntu that lacks new enough GnuTLS and not OSX. But after Peter's patches travis is broken anyway (on GnuTLS). Michal Privoznik (3): configure: Require GnuTLS build: Build gnutls related sources unconditionally src: Drop most of #ifdef WITH_GNUTLS configure.ac | 2 -- m4/virt-gnutls.m4 | 4 --- src/Makefile.am | 7 +---- src/locking/lock_daemon.c | 4 --- src/logging/log_daemon.c | 4 --- src/lxc/lxc_controller.c | 2 -- src/qemu/qemu_migration_cookie.c | 12 +++----- src/remote/remote_daemon.c | 23 --------------- src/remote/remote_daemon_dispatch.c | 2 -- src/rpc/Makefile.inc.am | 14 ++------- src/rpc/virnetdaemon.h | 4 +-- src/rpc/virnetserver.c | 6 ---- src/rpc/virnetserver.h | 6 +--- src/rpc/virnetserverclient.c | 57 +++---------------------------------- src/rpc/virnetserverclient.h | 8 ------ src/rpc/virnetserverservice.c | 24 ---------------- src/rpc/virnetserverservice.h | 10 ------- src/util/vircrypto.c | 43 ++-------------------------- tests/Makefile.am | 12 ++------ tests/qemuxml2argvtest.c | 15 ---------- tests/vircryptotest.c | 24 +++++----------- tests/virfilecachetest.c | 18 +++--------- tests/virnetdaemontest.c | 8 ------ tests/virnetserverclienttest.c | 2 -- tests/virrandommock.c | 8 ++---- 25 files changed, 32 insertions(+), 287 deletions(-) -- 2.16.4

4 10

[libvirt] [jenkins-ci PATCH 0/5] guests: Make Perl and Python paths dynamic
by Andrea Bolognani 05 Jun '18

05 Jun '18

Plus other cleanups. See patches 3/5 and 4/5 for the good stuff. Andrea Bolognani (5): guests: Add .j2 extension to existing templates guests: Remove distinction between files and templates guests: Make PERL5LIB dynamic guests: Make PYTHONPATH dynamic guests: Move remaining paths out of the inventory guests/group_vars/all/main.yml | 13 -------- guests/host_vars/libvirt-centos-6/main.yml | 3 -- guests/host_vars/libvirt-centos-7/main.yml | 3 -- guests/host_vars/libvirt-debian-8/main.yml | 3 -- guests/host_vars/libvirt-debian-9/main.yml | 3 -- guests/host_vars/libvirt-debian-sid/main.yml | 3 -- guests/host_vars/libvirt-fedora-27/main.yml | 3 -- guests/host_vars/libvirt-fedora-28/main.yml | 3 -- .../host_vars/libvirt-fedora-rawhide/main.yml | 3 -- guests/host_vars/libvirt-freebsd-10/main.yml | 3 -- guests/host_vars/libvirt-freebsd-11/main.yml | 3 -- .../libvirt-freebsd-current/main.yml | 3 -- guests/host_vars/libvirt-ubuntu-14/main.yml | 3 -- guests/host_vars/libvirt-ubuntu-16/main.yml | 3 -- guests/host_vars/libvirt-ubuntu-18/main.yml | 3 -- guests/tasks/base.yml | 12 +++---- guests/tasks/users.yml | 6 ++-- .../{bash_profile => bash_profile.j2} | 0 guests/templates/bashrc | 20 ------------ guests/templates/bashrc.j2 | 32 +++++++++++++++++++ .../ccache.conf => templates/ccache.conf.j2} | 0 .../fedora-rawhide-kernel-nodebug.repo.j2} | 0 .../jessie-backports.preferences.j2} | 0 .../jessie-backports.sources.j2} | 0 24 files changed, 41 insertions(+), 84 deletions(-) rename guests/templates/{bash_profile => bash_profile.j2} (100%) delete mode 100644 guests/templates/bashrc create mode 100644 guests/templates/bashrc.j2 rename guests/{files/ccache.conf => templates/ccache.conf.j2} (100%) rename guests/{files/fedora-rawhide-kernel-nodebug.repo => templates/fedora-rawhide-kernel-nodebug.repo.j2} (100%) rename guests/{files/jessie-backports.preferences => templates/jessie-backports.preferences.j2} (100%) rename guests/{files/jessie-backports.sources => templates/jessie-backports.sources.j2} (100%) -- 2.17.0

2 13

[libvirt] [RFC PATCH] travis: require libgnutls28-dev
by Ján Tomko 05 Jun '18

05 Jun '18

Since commit <eee8c85> we require GnuTLS >= 3.2.0. Install the aptly-named libgnutls28-dev package instead of plain libgnutls-dev. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- RFC, since I haven't even started to figure out how to test it. Exposed by commit 3bf1959 which led to virCryptoHaveCipher(VIR_CRYPTO_CIPHER_AES256CBC) being called from the test suite, in qemuDomainSupportsEncryptedSecret. The proper fix for non-GnuTLS user is probably disabling the build of QEMU driver without GnuTLS, since capabilities caching won't work properly anyway without the hash functions. .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f4dd0427a9..3f7c67398a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,7 +60,7 @@ addons: - libdbus-1-dev - libdevmapper-dev - libfuse-dev - - libgnutls-dev + - libgnutls28-dev - libnetcf-dev - libnl-3-dev - libnl-route-3-dev -- 2.13.6

4 3

[libvirt] [jenkins-ci PATCH] guests: Fix os_version for development branches
by Andrea Bolognani 05 Jun '18

05 Jun '18

We currently know about three development branches: Fedora Rawhide, Debian sid and FreeBSD -CURRENT. For all three, we use the name of the development branch in the guest name; however, the value of os_version is not set consistently, making it awkward to create package mappings specific to these development branches. As an added bonus, this makes the code setting os_name and os_version more straightforward by simplifying conditionals and removing regexp-based string replacement. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/base.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 70d5abc..9f27470 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -2,25 +2,33 @@ - name: Set additional facts (OS) set_fact: os_name: '{{ ansible_distribution }}' + +- name: Set additional facts (OS) + set_fact: os_version: '{{ ansible_distribution_major_version }}' when: - - ansible_distribution != 'FreeBSD' - - ansible_distribution_release != 'Rawhide' + - ansible_distribution_major_version is defined - name: Set additional facts (OS) set_fact: - os_name: '{{ ansible_distribution }}' os_version: Rawhide when: - - ansible_distribution != 'FreeBSD' + - os_name == 'Fedora' - ansible_distribution_release == 'Rawhide' - name: Set additional facts (OS) set_fact: - os_name: '{{ ansible_distribution }}' - os_version: '{{ ansible_distribution_release|regex_replace("^(\d+)\.\d+-.*$", "\1") }}' + os_version: Sid + when: + - os_name == 'Debian' + - '{{ ansible_distribution_major_version|match("^.*/sid$") }}' + +- name: Set additional facts (OS) + set_fact: + os_version: Current when: - ansible_distribution == 'FreeBSD' + - '{{ ansible_distribution_release|match("^.*-CURRENT$") }}' - name: Set additional facts (package format) set_fact: -- 2.17.0

2 3

[libvirt] [PATCHv2] virFileAccessibleAs: Remove redundant forkRet
by Radostin Stoyanov 05 Jun '18

05 Jun '18

The variable forkRet is not used after commit 25f8781 Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/util/virfile.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 523241f64f..a2c4cebb56 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2117,7 +2117,6 @@ virFileAccessibleAs(const char *path, int mode, { pid_t pid = 0; int status, ret = 0; - int forkRet = 0; gid_t *groups; int ngroups; @@ -2152,15 +2151,6 @@ virFileAccessibleAs(const char *path, int mode, return 0; } - /* child. - * Return positive value here. Parent - * will change it to negative one. */ - - if (forkRet < 0) { - ret = errno; - goto childerror; - } - if (virSetUIDGID(uid, gid, groups, ngroups) < 0) { ret = errno; goto childerror; -- 2.17.1

2 1

[libvirt] [PATCH] virFork: Remove redundant forkRet variable
by Radostin Stoyanov 05 Jun '18

05 Jun '18

The variable forkRest is not used after commit 25f8781 https://github.com/libvirt/libvirt/commit/25f8781#diff-d2023c1ac4f688aa2021… Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/util/virfile.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 523241f64f..a2c4cebb56 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2117,7 +2117,6 @@ virFileAccessibleAs(const char *path, int mode, { pid_t pid = 0; int status, ret = 0; - int forkRet = 0; gid_t *groups; int ngroups; @@ -2152,15 +2151,6 @@ virFileAccessibleAs(const char *path, int mode, return 0; } - /* child. - * Return positive value here. Parent - * will change it to negative one. */ - - if (forkRet < 0) { - ret = errno; - goto childerror; - } - if (virSetUIDGID(uid, gid, groups, ngroups) < 0) { ret = errno; goto childerror; -- 2.17.1

2 3

[libvirt] [PATCH] virFileAccessibleAs: Remove redundant forkRet
by Radostin Stoyanov 05 Jun '18

05 Jun '18

The variable forkRet is not used after commit 25f8781 https://github.com/libvirt/libvirt/commit/25f8781#diff-d2023c1ac4f688aa2021… Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/util/virfile.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 523241f64f..a2c4cebb56 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2117,7 +2117,6 @@ virFileAccessibleAs(const char *path, int mode, { pid_t pid = 0; int status, ret = 0; - int forkRet = 0; gid_t *groups; int ngroups; @@ -2152,15 +2151,6 @@ virFileAccessibleAs(const char *path, int mode, return 0; } - /* child. - * Return positive value here. Parent - * will change it to negative one. */ - - if (forkRet < 0) { - ret = errno; - goto childerror; - } - if (virSetUIDGID(uid, gid, groups, ngroups) < 0) { ret = errno; goto childerror; -- 2.17.1

1 0

[libvirt] [PATCH] virFileAccessibleAs: Remove redundant forkRet
by Radostin Stoyanov 05 Jun '18

05 Jun '18

The variable forkRest is not used after commit 25f8781 https://github.com/libvirt/libvirt/commit/25f8781#diff-d2023c1ac4f688aa2021… Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/util/virfile.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 523241f64f..a2c4cebb56 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2117,7 +2117,6 @@ virFileAccessibleAs(const char *path, int mode, { pid_t pid = 0; int status, ret = 0; - int forkRet = 0; gid_t *groups; int ngroups; @@ -2152,15 +2151,6 @@ virFileAccessibleAs(const char *path, int mode, return 0; } - /* child. - * Return positive value here. Parent - * will change it to negative one. */ - - if (forkRet < 0) { - ret = errno; - goto childerror; - } - if (virSetUIDGID(uid, gid, groups, ngroups) < 0) { ret = errno; goto childerror; -- 2.17.1

1 0

[libvirt] [PATCH] build: Don't install sysconfig files as scripts
by Jiri Denemark 05 Jun '18

05 Jun '18

The files are not scripts and should not be executable. Broken by v4.0.0-294-g5f998681df. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 0c380780c3..b2db1e9db9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -768,7 +768,7 @@ install-sysconfig: for f in $(SYSCONF_FILES:%.sysconf=%) ; \ do \ tgt=`basename $$f`; \ - $(INSTALL_SCRIPT) $(srcdir)/$$f.sysconf \ + $(INSTALL_DATA) $(srcdir)/$$f.sysconf \ $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \ done -- 2.17.1

2 1

[libvirt] [PATCH V2] tests: xmconfigtest: add tests for cmdline formating
by Jim Fehlig 05 Jun '18

05 Jun '18

Commit 656151bf fixed formatting of the <cmdline> element. Perhaps it would have been noticed and fixed earlier if we had a test. With this change, all possible cases of formating <cmdline> from xmconfig are covered 1. no 'extra=' or 'root=' in xm.cfg 2. 'extra=' but no 'root=' in xm.cfg 3. 'root=' but no 'extra=' in xm.cfg 4. both 'root=' and 'extra=' in xm.cfg Case 1 is covered by all existing paravirt tests since they have no 'extra=' or 'root='. Case 2 is covered by adding 'extra=' to a few of the existing paravirt tests. Cases 3 and 4 are covered by new tests that only test conversion of xm.cfg to xml. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- tests/xmconfigdata/test-paravirt-extra-root.cfg | 13 ++++++++++ tests/xmconfigdata/test-paravirt-extra-root.xml | 34 +++++++++++++++++++++++++ tests/xmconfigdata/test-paravirt-maxvcpus.cfg | 1 + tests/xmconfigdata/test-paravirt-maxvcpus.xml | 1 + tests/xmconfigdata/test-paravirt-root.cfg | 12 +++++++++ tests/xmconfigdata/test-paravirt-root.xml | 34 +++++++++++++++++++++++++ tests/xmconfigdata/test-paravirt-vcpu.cfg | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 1 + tests/xmconfigtest.c | 2 ++ 9 files changed, 99 insertions(+) create mode 100644 tests/xmconfigdata/test-paravirt-extra-root.cfg create mode 100644 tests/xmconfigdata/test-paravirt-extra-root.xml create mode 100644 tests/xmconfigdata/test-paravirt-root.cfg create mode 100644 tests/xmconfigdata/test-paravirt-root.xml diff --git a/tests/xmconfigdata/test-paravirt-extra-root.cfg b/tests/xmconfigdata/test-paravirt-extra-root.cfg new file mode 100644 index 0000000000..2569f2f22c --- /dev/null +++ b/tests/xmconfigdata/test-paravirt-extra-root.cfg @@ -0,0 +1,13 @@ +name = "XenGuest1" +uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" +memory = 512 +vcpus = 2 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] +bootloader = "/usr/bin/pygrub" +root = "/dev/xvda2" +extra = "console=hvc0" +disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-extra-root.xml b/tests/xmconfigdata/test-paravirt-extra-root.xml new file mode 100644 index 0000000000..325b07d8e1 --- /dev/null +++ b/tests/xmconfigdata/test-paravirt-extra-root.xml @@ -0,0 +1,34 @@ +<domain type='xen'> + <name>XenGuest1</name> + <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <bootloader>/usr/bin/pygrub</bootloader> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <cmdline>root=/dev/xvda2 console=hvc0</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest1'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + <input type='mouse' bus='xen'/> + <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> + </devices> +</domain> diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.cfg b/tests/xmconfigdata/test-paravirt-maxvcpus.cfg index 8d1ac4d786..f06db61171 100644 --- a/tests/xmconfigdata/test-paravirt-maxvcpus.cfg +++ b/tests/xmconfigdata/test-paravirt-maxvcpus.cfg @@ -10,4 +10,5 @@ on_reboot = "restart" on_crash = "restart" vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] bootloader = "/usr/bin/pygrub" +extra = "console=hvc0" disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.xml b/tests/xmconfigdata/test-paravirt-maxvcpus.xml index ce66503dc5..3012821ad4 100644 --- a/tests/xmconfigdata/test-paravirt-maxvcpus.xml +++ b/tests/xmconfigdata/test-paravirt-maxvcpus.xml @@ -7,6 +7,7 @@ <bootloader>/usr/bin/pygrub</bootloader> <os> <type arch='x86_64' machine='xenpv'>linux</type> + <cmdline>console=hvc0</cmdline> </os> <clock offset='utc' adjustment='reset'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/xmconfigdata/test-paravirt-root.cfg b/tests/xmconfigdata/test-paravirt-root.cfg new file mode 100644 index 0000000000..8cdfbd9384 --- /dev/null +++ b/tests/xmconfigdata/test-paravirt-root.cfg @@ -0,0 +1,12 @@ +name = "XenGuest1" +uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" +memory = 512 +vcpus = 2 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] +bootloader = "/usr/bin/pygrub" +root = "/dev/xvda2" +disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-root.xml b/tests/xmconfigdata/test-paravirt-root.xml new file mode 100644 index 0000000000..12d1e3bdbd --- /dev/null +++ b/tests/xmconfigdata/test-paravirt-root.xml @@ -0,0 +1,34 @@ +<domain type='xen'> + <name>XenGuest1</name> + <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>2</vcpu> + <bootloader>/usr/bin/pygrub</bootloader> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + <cmdline>root=/dev/xvda2</cmdline> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='phy' type='raw'/> + <source dev='/dev/HostVG/XenGuest1'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + <input type='mouse' bus='xen'/> + <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> + </devices> +</domain> diff --git a/tests/xmconfigdata/test-paravirt-vcpu.cfg b/tests/xmconfigdata/test-paravirt-vcpu.cfg index 8d1ac4d786..f06db61171 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.cfg +++ b/tests/xmconfigdata/test-paravirt-vcpu.cfg @@ -10,4 +10,5 @@ on_reboot = "restart" on_crash = "restart" vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] bootloader = "/usr/bin/pygrub" +extra = "console=hvc0" disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml index ce66503dc5..3012821ad4 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.xml +++ b/tests/xmconfigdata/test-paravirt-vcpu.xml @@ -7,6 +7,7 @@ <bootloader>/usr/bin/pygrub</bootloader> <os> <type arch='x86_64' machine='xenpv'>linux</type> + <cmdline>console=hvc0</cmdline> </os> <clock offset='utc' adjustment='reset'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 6851fa73cd..eaec7c3a5c 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -200,6 +200,8 @@ mymain(void) DO_TEST("paravirt-net-vifname"); DO_TEST("paravirt-vcpu"); DO_TEST("paravirt-maxvcpus"); + DO_TEST_FORMAT("paravirt-root"); + DO_TEST_FORMAT("paravirt-extra-root"); DO_TEST("fullvirt-new-cdrom"); DO_TEST("fullvirt-utc"); DO_TEST("fullvirt-localtime"); -- 2.16.3

2 2

[libvirt] [PATCH] Post-release version bump to 4.5.0
by Jiri Denemark 05 Jun '18

05 Jun '18

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Pushed as "should really be done as part of the release process" :-) configure.ac | 2 +- docs/news.xml | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b869a17afe..5378e49c0b 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [4.4.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] +AC_INIT([libvirt], [4.5.0], [libvir-list(a)redhat.com] [], [https://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/news.xml b/docs/news.xml index 74f3ea1638..18f3897b3b 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -33,6 +33,14 @@ --> <libvirt> + <release version="v4.5.0" date="unreleased"> + <section title="New features"> + </section> + <section title="Improvements"> + </section> + <section title="Bug fixes"> + </section> + </release> <release version="v4.4.0" date="2018-06-04"> <section title="New features"> <change> -- 2.17.1

1 0

[libvirt] [PATCH] nwfilter: directly use poll to wait for packets instead of pcap_next
by Daniel P. Berrangé 05 Jun '18

05 Jun '18

When a QEMU VM shuts down its TAP device gets deleted while nwfilter IP address learning thread is still capturing packets. It is seen that with TPACKET_V3 support in libcap, the pcap_next() call will not always exit its poll() when the NIC is removed. This prevents the learning thread from exiting which blocks the rest of libvirtd waiting on mutex acquisition. By switching to do poll() in libvirt code, we can ensure that we always exit the poll() at a time that is right for libvirt. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/nwfilter/nwfilter_learnipaddr.c | 37 +++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 061b39d72b..e117be9ce2 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -31,6 +31,7 @@ #include <fcntl.h> #include <sys/ioctl.h> +#include <poll.h> #include <arpa/inet.h> #include <net/ethernet.h> @@ -414,6 +415,7 @@ learnIPAddressThread(void *arg) bool showError = true; enum howDetect howDetected = 0; virNWFilterTechDriverPtr techdriver = req->techdriver; + struct pollfd fds[1]; if (virNWFilterLockIface(req->ifname) < 0) goto err_no_lock; @@ -435,6 +437,9 @@ learnIPAddressThread(void *arg) goto done; } + fds[0].fd = pcap_fileno(handle); + fds[0].events = POLLIN | POLLERR; + virMacAddrFormat(&req->macaddr, macaddr); switch (req->howDetect) { @@ -483,17 +488,45 @@ learnIPAddressThread(void *arg) pcap_freecode(&fp); while (req->status == 0 && vmaddr == 0) { + int n = poll(fds, ARRAY_CARDINALITY(fds), PKT_TIMEOUT_MS); + + if (n < 0) { + if (errno == EAGAIN || errno == EINTR) + continue; + + req->status = errno; + showError = true; + break; + } + + if (n == 0) { + if (threadsTerminate || req->terminate) { + VIR_DEBUG("Terminate request seen, cancelling pcap"); + req->status = ECANCELED; + showError = false; + break; + } + continue; + } + + if (fds[0].revents & (POLLHUP | POLLERR)) { + VIR_DEBUG("Error from FD probably dev deleted"); + req->status = ENODEV; + showError = false; + break; + } + packet = pcap_next(handle, &header); if (!packet) { - + /* Already handled with poll, but lets be sure */ if (threadsTerminate || req->terminate) { req->status = ECANCELED; showError = false; break; } - /* check whether VM's dev is still there */ + /* Again, already handled above, but lets be sure */ if (virNetDevValidateConfig(req->ifname, NULL, req->ifindex) <= 0) { virResetLastError(); req->status = ENODEV; -- 2.17.0

2 4

[libvirt] Release of libvirt-4.4.0
by Daniel Veillard 05 Jun '18

05 Jun '18

It's finally out, tagged in git, with signed tarball and rpms at the usual place: ftp://libvirt.org/libvirt/ I also made a 4.4.0 release for the python bindings that one can find at ftp://libvirt.org/libvirt/python/ There is apparently more new features than improvements, and no bug fix in this release, I would just guess that people don't feel like updating news.xml on bug fixes, rather than no bug needing fixes for a full month. It may still be a good idea to update to this release and not just for the fun of testing new features ! New features: bhyve: Support locking guest memory Bhyve's guest memory may be wired using the <memoryBacking><locked/></memoryBacking> element. qemu: Provide VFIO channel I/O passthrough support Support passthrough devices that use channel I/O based mechanism in a QEMU virtual machine. qemu: Add support for migration of VMs with non-shared storage over TLS It's now possible to use the VIR_MIGRATE_TLS flag together with VIR_MIGRATE_NON_SHARED_DISK. The connection is then secured using the TLS environment which is setup for the migration connection. Add support for VM Generation ID The VM Generatation ID exposes a 128-bit, cryptographically random, integer value identifier, referred to as a Globally Unique Identifier (GUID) to the guest in order to notify the guest operating system when the virtual machine is executed with a different configuration. Add a new domain XML processing and a domain capabilities feature. Introduce virDomainDetachDeviceAlias This new API enables users to detach device using only its alias. Introduce new virConnectCompareHypervisorCPU and virConnectBaselineHypervisorCPU APIs Unlike the old virConnectCompareCPU and virConnectBaselineCPU APIs, both new APIs consider capabilities of a specific hypervisor. Introduce SCSI persistent reservations support The QEMU driver gained support for qemu-pr-helper which enables guests to issue SCSI commands for persistent reservation. qemu: Implement multiple screen support for virDomainScreenshot While the virDomainScreenshot API supported multihead video cards, the implementation was missing. But now that QEMU implemented it libvirt has done as well. qemu: add support for vhost-vsock-device A new vsock device was introduced, allowing communication between the guest and the host via the AF_VSOCK family. Improvements: qemu: Add suport for OpenGL rendering with SDL Domains using SDL as a graphics backend will now be able to use OpenGL accelerated rendering. qemu: Add support for 'output' audio codec Support QEMU's 'hda-output' codec advertising only a line-out for ich6 and ich9 sound devices. virsh: Enhance event name completion Implement event name completion for some commands (e.g. event, secret-event, pool-event and nodedev-event) Thanks for everybody who contributed to that feature rich release, be it with code, ideas, reviews etc ... Hopefully it won't crash and burn, Enjoy and Banzai ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] conf: Introduce align for hostmem-file
by Jie Wang 05 Jun '18

05 Jun '18

QEMU has add the 'align' option to 'memory-backend-file'. Expose this option to users by new element align. Signed-off-by: Jie Wang <wangjie88(a)huawei.com> --- docs/formatdomain.html.in | 18 +++++++ docs/schemas/domaincommon.rng | 7 +++ src/conf/domain_conf.c | 14 +++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 4 ++ .../memory-hotplug-nvdimm-align.args | 31 +++++++++++ .../memory-hotplug-nvdimm-align.xml | 63 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../memory-hotplug-nvdimm-align.xml | 1 + tests/qemuxml2xmltest.c | 1 + 10 files changed, 143 insertions(+) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.args create mode 100644 tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d0fd3b..29fe145 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7932,6 +7932,9 @@ qemu-kvm -net nic,model=? /dev/null </target> </memory> <memory model='nvdimm'> + <align> + <sieze unit='KiB'>2048</size> + </align> <source> <path>/tmp/nvdimm</path> </source> @@ -7983,6 +7986,21 @@ qemu-kvm -net nic,model=? /dev/null </p> </dd> + <dt><code>align</code></dt> + <dd> + <p> + For NVDIMM type devices one can optionally use + <code>align</code> and its subelement <code>size</code> + to configure the size of alignment within the NVDIMM module. + The <code>size</code> element has usual meaning described + <a href="#elementsMemoryAllocation">here</a>. + For QEMU domains the following restrictions apply: + </p> + <ol> + <li>the alignment must be multiples of page size 4KiB,</li> + </ol> + </dd> + <dt><code>source</code></dt> <dd> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 71ac3d0..9e994b1 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5145,6 +5145,13 @@ <ref name="virYesNo"/> </attribute> </optional> + <optional> + <element name="align"> + <element name="size"> + <ref name="scaledInteger"/> + </element> + </element> + </optional> <interleave> <optional> <ref name="memorydev-source"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3689ac0..bf91167 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15739,6 +15739,12 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr xmlopt, } VIR_FREE(tmp); + if ((node = virXPathNode("./align", ctxt))) { + if (virDomainParseMemory("./align/size", "./align/size/@unit", ctxt, + &def->align, true, false) < 0) + goto error; + } + /* source */ if ((node = virXPathNode("./source", ctxt)) && virDomainMemorySourceDefParseXML(node, ctxt, def) < 0) @@ -25334,6 +25340,14 @@ virDomainMemoryDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + if (def->align) { + virBufferAddLit(buf, "<align>\n"); + virBufferAdjustIndent(buf, 2); + virBufferAsprintf(buf, "<size unit='KiB'>%llu</size>\n", def->align); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</align>\n"); + } + if (virDomainMemorySourceDefFormat(buf, def) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a78fdee..1155c84 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2107,6 +2107,7 @@ typedef enum { struct _virDomainMemoryDef { virDomainMemoryAccess access; virTristateBool discard; + unsigned long long align; /* source */ virBitmapPtr sourceNodes; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c423733..5862457 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3186,6 +3186,10 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, if (virJSONValueObjectAdd(props, "U:size", mem->size * 1024, NULL) < 0) goto cleanup; + if (mem->align && + virJSONValueObjectAdd(props, "u:align", mem->align * 1024, NULL) < 0) + goto cleanup; + if (mem->sourceNodes) { nodemask = mem->sourceNodes; } else { diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.args new file mode 100644 index 0000000..e6fcf58 --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.args @@ -0,0 +1,31 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \ +-m size=219136k,slots=16,maxmem=1099511627776k \ +-smp 2,sockets=2,cores=1,threads=1 \ +-numa node,nodeid=0,cpus=0-1,mem=214 \ +-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ +share=no,size=536870912,align=2097152 \ +-device nvdimm,node=0,label-size=131072,memdev=memnvdimm0,id=nvdimm0,slot=0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml new file mode 100644 index 0000000..aa9e99b --- /dev/null +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml @@ -0,0 +1,63 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <idmap> + <uid start='0' target='1000' count='10'/> + <gid start='0' target='1000' count='10'/> + </idmap> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='219136' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <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'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm' access='private'> + <align> + <size unit='KiB'>2048</size> + </align> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + <label> + <size unit='KiB'>128</size> + </label> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 07e5ba1..4674ded 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2588,6 +2588,9 @@ mymain(void) DO_TEST("memory-hotplug-nvdimm-label", QEMU_CAPS_DEVICE_NVDIMM, QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); + DO_TEST("memory-hotplug-nvdimm-align", + QEMU_CAPS_DEVICE_NVDIMM, + QEMU_CAPS_NUMA, QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST("machine-aeskeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml new file mode 100644 index 0000000..9fc6001 --- /dev/null +++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/memory-hotplug-nvdimm-align.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7cedc2b..822e98a 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1098,6 +1098,7 @@ mymain(void) DO_TEST("memory-hotplug-nvdimm", NONE); DO_TEST("memory-hotplug-nvdimm-access", NONE); DO_TEST("memory-hotplug-nvdimm-label", NONE); + DO_TEST("memory-hotplug-nvdimm-align", NONE); DO_TEST("net-udp", NONE); DO_TEST("video-virtio-gpu-device", NONE); -- 1.8.3.1

4 3

[libvirt] [PATCH] qemu: check for QEMU_CAPS_DEVICE_VHOST_VSOCK
by Ján Tomko 05 Jun '18

05 Jun '18

My commit b8b42ca added support for formatting the vsock command line without actually checking if it's supported. Add it to the per-device validation function. https://bugzilla.redhat.com/show_bug.cgi?id=1291851 Reported-by: John Ferlan <jferlan(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_domain.c | 20 +++++++++++++++++++- tests/qemuxml2xmltest.c | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 2c51e4c0d8..474bef0ec9 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5283,6 +5283,21 @@ qemuDomainDeviceDefValidateMemory(const virDomainMemoryDef *memory ATTRIBUTE_UNU } +static int +qemuDomainDeviceDefValidateVsock(const virDomainVsockDef *vsock ATTRIBUTE_UNUSED, + virQEMUCapsPtr qemuCaps) +{ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_VSOCK)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vsock device is not supported " + "with this QEMU binary")); + return -1; + } + + return 0; +} + + static int qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, const virDomainDef *def, @@ -5342,6 +5357,10 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, ret = qemuDomainDeviceDefValidateMemory(dev->data.memory, def); break; + case VIR_DOMAIN_DEVICE_VSOCK: + ret = qemuDomainDeviceDefValidateVsock(dev->data.vsock, qemuCaps); + break; + case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_INPUT: @@ -5354,7 +5373,6 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_VSOCK: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5671114de0..fdb3d2946b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1212,8 +1212,8 @@ mymain(void) DO_TEST_STATUS("migration-out-params"); DO_TEST_STATUS("migration-out-nbd-tls"); - DO_TEST("vhost-vsock", NONE); - DO_TEST("vhost-vsock-auto", NONE); + DO_TEST("vhost-vsock", QEMU_CAPS_DEVICE_VHOST_VSOCK); + DO_TEST("vhost-vsock-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); -- 2.16.1

2 1

[libvirt] [PATCH] Add Virtlyst web application to apps.html
by Daniel Nicoletti 05 Jun '18

05 Jun '18

--- docs/apps.html.in | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/apps.html.in b/docs/apps.html.in index 863be4ff23..0aa3568eed 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -466,6 +466,21 @@ minutes. The only requirements for the users are a Web browser and a lightweight remote viewer. </dd> + <dt><a href="https://github.com/cutelyst/Virtlyst">Virtlyst</a></dt> + <dd> + Virtlyst is an open source web application built with C++11, Cutelyst and Qt. + It features: + <ul> + <li>Low memory usage (around 5 MiB of RAM)</li> + <li>Look and feel easily customized with HTML templates that use the Django syntax</li> + <li>VNC/Spice console pages</li> + <li>Host and Domain stats graphs (CPU, Memory, IO, Network)</li> + <li>Connect to multiple libvirtd intances (over local unix socket, SSH, TCP and TLS)</li> + <li>Manage Storages, Networks, Interfaces and Secrets</li> + <li>Create and launch VMs</li> + <li>Configure VMs with easy pannels or go pro and edit it's XML</li> + </ul> + </dd> </dl> <h2><a id="mobile">Mobile applications</a></h2> -- 2.17.0

2 2

[libvirt] [tck PATCH] Don't assume the domain's network interface tap device is named "vnet0"
by Laine Stump 05 Jun '18

05 Jun '18

Some of the tests perform operations on the tap device of the test domain's network interface. They mostly assume that this tap device is named "vnet0", which is the case if there is no other domain running on the host, but isn't true if some other domain was running. This patch adds a utility function NetworkHelpers::get_first_interface_target_dev($dom), which learns the name of the tap device for the first interface in the domain, and uses the result of that function instead of "vnet0". It's an ugly name, but follows the pattern of other function names in that file. It also is very specific (it could have been parameterized to get the tap device name of other interfaces, but we only ever need the first). On the other hand, it causes the tests in question to succeed on my host when they previously failed. (If anyone wants the function to be named differently or be more flexible, I'd be happy to do that). Signed-off-by: Laine Stump <laine(a)laine.org> --- lib/Sys/Virt/TCK.pm | 3 ++- lib/Sys/Virt/TCK/NetworkHelpers.pm | 6 ++++++ scripts/domain/180-interface-parameters.t | 6 ++++-- scripts/nwfilter/100-ping-still-working.t | 3 ++- scripts/nwfilter/210-no-mac-spoofing.t | 3 ++- scripts/nwfilter/230-no-mac-broadcast.t | 3 ++- scripts/nwfilter/240-no-arp-spoofing.t | 3 ++- 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index ac9c125..29280f6 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -821,11 +821,12 @@ sub generic_machine_domain { $dom->create(); # Wait for the first boot to reach network setting + my $iface = get_first_interface_target_dev($dom); my $stats; my $tries = 0; do { sleep(10); - $stats = $dom->interface_stats("vnet0"); + $stats = $dom->interface_stats($iface); $tries++; } while ($stats->{"tx_packets"} < 10 && $tries < 10); diff --git a/lib/Sys/Virt/TCK/NetworkHelpers.pm b/lib/Sys/Virt/TCK/NetworkHelpers.pm index 7bbce62..50ade0f 100644 --- a/lib/Sys/Virt/TCK/NetworkHelpers.pm +++ b/lib/Sys/Virt/TCK/NetworkHelpers.pm @@ -10,6 +10,12 @@ sub get_first_macaddress { return $mac; } +sub get_first_interface_target_dev { + my $dom = shift; + my $targetdev = xpath($dom, "string(/domain/devices/interface[1]/target/\@dev)"); + return $targetdev; +} + sub get_network_ip { my $conn = shift; my $netname = shift; diff --git a/scripts/domain/180-interface-parameters.t b/scripts/domain/180-interface-parameters.t index d7866c0..66c7ed6 100644 --- a/scripts/domain/180-interface-parameters.t +++ b/scripts/domain/180-interface-parameters.t @@ -33,6 +33,7 @@ use warnings; use Test::More tests => 10; use Sys::Virt::TCK; +use Sys::Virt::TCK::NetworkHelpers; use Test::Exception; use File::stat; @@ -59,12 +60,13 @@ diag "Set/Get interface parameters"; my %params = (Sys::Virt::Domain::BANDWIDTH_IN_AVERAGE=>1000, Sys::Virt::Domain::BANDWIDTH_IN_PEAK=>1001, Sys::Virt::Domain::BANDWIDTH_IN_BURST=>1002, Sys::Virt::Domain::BANDWIDTH_OUT_AVERAGE=>1003, Sys::Virt::Domain::BANDWIDTH_OUT_PEAK=>1004, Sys::Virt::Domain::BANDWIDTH_OUT_BURST=>1005); -lives_ok(sub {$dom->set_interface_parameters("vnet0", \%params)}, "Set vnet0 parameters"); +my $iface = get_first_interface_target_dev($dom); +lives_ok(sub {$dom->set_interface_parameters($iface, \%params)}, "Set $iface parameters"); for my $key (sort keys %params) { diag "Set $key => $params{$key} "; } -my $param = $dom->get_interface_parameters("vnet0", 0); +my $param = $dom->get_interface_parameters($iface, 0); my $in_average = $param->{Sys::Virt::Domain::BANDWIDTH_IN_AVERAGE}; my $in_burst = $param->{Sys::Virt::Domain::BANDWIDTH_IN_BURST}; my $in_peak = $param->{Sys::Virt::Domain::BANDWIDTH_IN_PEAK}; diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 1bbd7c5..12f2c7c 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -55,11 +55,12 @@ $dom->create; ok($dom->get_id() > 0, "running domain has an ID > 0"); diag "Waiting for guest to finish booting"; +my $iface = get_first_interface_target_dev($dom); my $stats; my $tries = 0; do { sleep(10); - $stats = $dom->interface_stats("vnet0"); + $stats = $dom->interface_stats($iface); $tries++; } while ($stats->{"tx_packets"} < 10 && $tries < 10); diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index 7b74f94..99c5058 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -59,11 +59,12 @@ $dom->create; ok($dom->get_id() > 0, "running domain has an ID > 0"); diag "Waiting for guest to finish booting"; +my $iface = get_first_interface_target_dev($dom); my $stats; my $tries = 0; do { sleep(10); - $stats = $dom->interface_stats("vnet0"); + $stats = $dom->interface_stats($iface); $tries++; } while ($stats->{"tx_packets"} < 10 && $tries < 10); diff --git a/scripts/nwfilter/230-no-mac-broadcast.t b/scripts/nwfilter/230-no-mac-broadcast.t index ee2d43f..b65b3fc 100644 --- a/scripts/nwfilter/230-no-mac-broadcast.t +++ b/scripts/nwfilter/230-no-mac-broadcast.t @@ -85,11 +85,12 @@ $dom->create; ok($dom->get_id() > 0, "running domain has an ID > 0"); diag "Waiting for guest to finish booting"; +my $iface = get_first_interface_target_dev($dom); my $stats; my $tries = 0; do { sleep(10); - $stats = $dom->interface_stats("vnet0"); + $stats = $dom->interface_stats($iface); $tries++; } while ($stats->{"tx_packets"} < 10 && $tries < 10); diff --git a/scripts/nwfilter/240-no-arp-spoofing.t b/scripts/nwfilter/240-no-arp-spoofing.t index 350b604..69851b6 100644 --- a/scripts/nwfilter/240-no-arp-spoofing.t +++ b/scripts/nwfilter/240-no-arp-spoofing.t @@ -58,11 +58,12 @@ $dom->create; ok($dom->get_id() > 0, "running domain has an ID > 0"); diag "Waiting for guest to finish booting"; +my $iface = get_first_interface_target_dev($dom); my $stats; my $tries = 0; do { sleep(10); - $stats = $dom->interface_stats("vnet0"); + $stats = $dom->interface_stats($iface); $tries++; } while ($stats->{"tx_packets"} < 10 && $tries < 10); -- 2.14.4

2 1

[libvirt] [tck PATCH v2 00/13] Make sure all tests pass
by Daniel P. Berrangé 05 Jun '18

05 Jun '18

I went through and fixed every single broken test, so everything should now pass when run against latest git master. Daniel P. Berrangé (13): scripts: avoid using multicast MAC addresses scripts: strip quotes from URI before checking it scripts: fix block info test conditions scripts: remove testing of 'cow' format scripts: portability fixes in checking command output scripts: cope with multiple seclabels in live XML scripts: switch to using luks encryption with QEMU scripts: skip luks test entirely for now scripts: fix the various hotplug tests scripts: don't abort the entire test harness when libvirtd isn't running scripts: re-enable save/restore test lib: don't re-assign $_ lib: allow marking the scratch disk as shareable lib/Sys/Virt/TCK.pm | 6 +++++- lib/Sys/Virt/TCK/DomainBuilder.pm | 7 +++++-- lib/Sys/Virt/TCK/Hooks.pm | 5 ++--- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 18 +++++++++++++----- scripts/domain/081-unique-id-create.t | 4 ++-- scripts/domain/102-broken-save-restore.t | 3 +-- scripts/domain/121-block-info.t | 5 ++--- scripts/domain/200-disk-hotplug.t | 4 +++- scripts/domain/205-disk-hotplug-ordering.t | 5 ++++- scripts/domain/210-nic-hotplug.t | 5 ++++- scripts/domain/215-nic-hotplug-many.t | 11 +++++++---- scripts/hooks/051-daemon-hook.t | 2 +- scripts/hooks/052-domain-hook.t | 14 +++++++++----- scripts/networks/networkApplyTest.sh | 2 +- .../networkxml2hostout/tck-testnet-1.dat | 2 +- .../networkxml2hostout/tck-testnet-2.dat | 2 +- .../networkxml2hostout/tck-testnet-3.dat | 4 ++-- scripts/nwfilter/nwfilter2vmtest.sh | 2 +- scripts/nwfilter/nwfilter_concurrent.sh | 2 +- scripts/qemu/100-disk-encryption.t | 3 +++ scripts/selinux/100-static-relabel-no.t | 4 ++-- scripts/selinux/110-static-relabel-yes.t | 6 +++--- scripts/storage/100-create-vol-dir.t | 19 +------------------ scripts/storage/200-clone-vol-dir.t | 4 ++-- 24 files changed, 76 insertions(+), 63 deletions(-) -- 2.17.0

2 29

[libvirt] [PATCH v6 0/9] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 05 Jun '18

05 Jun '18

This patch series provides support for launching an encrypted guest using AMD's new Secure Encrypted Virtualization (SEV) feature. SEV is an extension to the AMD-V architecture which supports running multiple VMs under the control of a hypervisor. When enabled, SEV feature allows the memory contents of a virtual machine (VM) to be transparently encrypted with a key unique to the guest VM. At very high level the flow looks this: 1. mgmt tool calls virConnectGetDomainCapabilities. This returns an XML document that includes the following <feature> ... <sev supported='yes'> <cbitpos> </cbitpos> <reduced-phys-bits> </reduced-phys-bits> <pdh> </pdh> <cert-chain> </cert-chain> </feature> If <sev> is provided then we indicate that hypervisor is capable of launching SEV guest. 2. (optional) mgmt tool can provide the PDH and Cert-chain to guest owner in case if guest owner wish to establish a secure connection with SEV firmware to negotiate a key used for validating the measurement. 3. mgmt tool requests to start a guest calling virCreateXML(), passing VIR_DOMAIN_START_PAUSED. The xml would include <launch-security type='sev'> <cbitpos> </cbitpos> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <reduced-phys-bits> </reduced-phys-bits> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <dh-cert> .. </dh> /* guest owners diffie-hellman key */ (optional) <session> ..</session> /* guest owners session blob */ (optional) <policy> ..</policy> /* guest policy */ (optional) </launch-security> 4. Libvirt generate the QEMU cli arg to enable the SEV feature, a typical args looks like this: # $QEMU .. -machine memory-encryption=sev0 \ -object sev-guest,id=sev0,dh-cert-file=<file>.... 5. Libvirt generates lifecycle VIR_DOMAIN_EVENT_SUSPENDED_PAUSED event 6. mgmt tool gets the VIR_DOMAIN_EVENT_SUSPENDED_PAUSED and calls virDomainGetLaunchSecretInfo() to retrieve the measurement of encrypted memory. 7. (optional) mgmt tool can provide the measurement value to guest owner, which can validate the measurement and gives GO/NO-GO answer. If mgmt tool gets GO then it resumes the guest otherwise it calls destroy() to kill the guest. 8. mgmt tool resumes the guest TODO: * SEV guest require to use DMA apis for the virtio devices. In order to use the DMA apis the virtio devices must have this tag <driver iommu=on ats=on> It is a bit unclear to me where these changes need to go. Do we need to modify the libvirt to automatically add these when SEV is enabled or we ask mgmt tool to make sure that it creates XML with right tag to enable the DMA APIs for virtio devices. I am looking for some suggestions. Using these patches we have succesfully booted and tested a guest both with and without SEV enabled. SEV Firmware API spec is available at: https://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf Change since v5: * drop the seperate test patch and merge the code with other patches. * rename the xml from sev -> launch-security-sev * make policy field mandatory * address multiple feedback from previous reviews. Changes since v4: * add /dev/sev in shared device list Changes since v3: * rename QEMU_CAPS_SEV -> QEMU_CAPS_SEV_GUEST * update caps_2.12.0.x86_64.replies to include query-sev-capabilities data Changes since v2: * make cbitpos, policy and reduced-phys-bits as unsigned int * update virDomainGetLaunchSecurityInfo to accept virTypedParameterPtr *params instead of virTypedParameterPtr params. Changes since v1: * rename <sev> -> <launch-security> for domain * add more information about policy and other fields in domaincaps.html * split the domain_conf support in two patches * add virDomainGetLaunchInfo() to retrieve the SEV measurement * extend virsh command to show the domain's launch security information * add test cases to validate newly added <launch-security> element * fix issues reported with 'make check' and 'make syntax-check' The complete git tree is available at: https://github.com/codomania/libvirt/tree/v6 Brijesh Singh (9): qemu: provide support to query the SEV capability qemu: introduce SEV feature in hypervisor capabilities conf: introduce launch-security element in domain qemu/cgroup: add /dev/sev in shared devices list qemu: add support to launch SEV guest libvirt: add new public API to get launch security info remote: implement the remote protocol for launch security qemu: Add support to launch security info virsh: implement new command for launch security docs/drvqemu.html.in | 1 + docs/formatdomain.html.in | 115 ++++++++++++++++++ docs/formatdomaincaps.html.in | 40 +++++++ docs/schemas/domaincaps.rng | 20 ++++ docs/schemas/domaincommon.rng | 39 ++++++ include/libvirt/libvirt-domain.h | 17 +++ src/conf/domain_capabilities.c | 20 ++++ src/conf/domain_capabilities.h | 14 +++ src/conf/domain_conf.c | 133 +++++++++++++++++++++ src/conf/domain_conf.h | 27 +++++ src/driver-hypervisor.h | 7 ++ src/libvirt-domain.c | 48 ++++++++ src/libvirt_public.syms | 5 + src/qemu/qemu.conf | 2 +- src/qemu/qemu_capabilities.c | 49 ++++++++ src/qemu/qemu_capabilities.h | 4 + src/qemu/qemu_capspriv.h | 4 + src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_command.c | 41 +++++++ src/qemu/qemu_driver.c | 68 +++++++++++ src/qemu/qemu_monitor.c | 17 +++ src/qemu/qemu_monitor.h | 6 + src/qemu/qemu_monitor_json.c | 116 ++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 + src/qemu/qemu_process.c | 62 ++++++++++ src/qemu/test_libvirtd_qemu.aug.in | 1 + src/remote/remote_daemon_dispatch.c | 47 ++++++++ src/remote/remote_driver.c | 42 ++++++- src/remote/remote_protocol.x | 20 +++- src/remote_protocol-structs | 11 ++ tests/genericxml2xmlindata/launch-security-sev.xml | 24 ++++ tests/genericxml2xmltest.c | 2 + .../caps_2.12.0.x86_64.replies | 10 ++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 +- tests/qemuxml2argvdata/launch-security-sev.args | 29 +++++ tests/qemuxml2argvdata/launch-security-sev.xml | 37 ++++++ tests/qemuxml2argvtest.c | 4 + tools/virsh-domain.c | 81 +++++++++++++ tools/virsh.pod | 5 + 39 files changed, 1173 insertions(+), 5 deletions(-) create mode 100644 tests/genericxml2xmlindata/launch-security-sev.xml create mode 100644 tests/qemuxml2argvdata/launch-security-sev.args create mode 100644 tests/qemuxml2argvdata/launch-security-sev.xml -- 2.14.3

3 29

[libvirt] [PATCH] virDomainDefCopy: Skip ostype checks
by Michal Privoznik 04 Jun '18

04 Jun '18

When parsing domain XML the virCapsDomainData lookup is performed in order to fill in missing def->os.arch and def->os.machine strings. Well, when doing copy of already existing virDomainDef we don't want any automagic fill in of defaults (and those two strings are going to be provided at this point anyway by first parse of the domain XML). What is even worse is that we do not look up capabilities for parsed emulator path rather than some generic capabilities for parsed arch. Therefore, if emulator points to qemu under non-default path (say $HOME/qemu-system-arm) but there's no such qemu under the default path (say /usr/bin/qemu-system-arm) the capabilities lookup fails and creating the copy is denied. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 86814d5f64..f36a1bfe79 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28397,7 +28397,8 @@ virDomainDefCopy(virDomainDefPtr src, virDomainDefPtr ret; unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE; unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; + VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE | + VIR_DOMAIN_DEF_PARSE_SKIP_OSTYPE_CHECKS; if (migratable) format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_MIGRATABLE; -- 2.16.4

2 3

[libvirt] [PATCH] tests: qemuxml2argv: Make tests based on DO_TEST_CAPS_INTERNAL stable
by Peter Krempa 04 Jun '18

04 Jun '18

To avoid problems with test cases specifying an alias machine type which would change once capabilities for a newer version are added strip all alias machine types for the DO_TEST_CAPS_INTERNAL based tests. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_capabilities.c | 17 +++++++++++++++++ src/qemu/qemu_capspriv.h | 3 +++ .../disk-virtio-scsi-reservations.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/genid-auto.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/genid.x86_64-latest.args | 2 +- tests/qemuxml2argvtest.c | 1 + 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b8764eacd8..a4a89cedfd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5156,3 +5156,20 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps, { qemuCaps->microcodeVersion = microcodeVersion; } + + +/** + * virQEMUCapsStripMachineAliases: + * @qemuCaps: capabilities object to process + * + * Remove all aliases so that the tests depending on the latest capabilities + * file can be stable when new files are added. + */ +void +virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps) +{ + size_t i; + + for (i = 0; i < qemuCaps->nmachineTypes; i++) + VIR_FREE(qemuCaps->machineTypes[i].alias); +} diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index fea039ef3a..021260de2f 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -97,4 +97,7 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps, void virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps, unsigned int microcodeVersion); + +void +virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps); #endif diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args index 768bc22f9f..927173fa03 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args @@ -13,7 +13,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \ -object pr-manager-helper,id=pr-helper-scsi0-0-0-1,\ path=/path/to/qemu-pr-helper.sock \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 8,sockets=8,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args index ce163020b9..7412651479 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args index 54e00f4bdb..dbffa7e1d2 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \ -S \ -object secret,id=masterKey0,format=raw,\ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off \ -m 214 \ -realtime mlock=off \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 61c7ae59aa..ab7a50817a 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -705,6 +705,7 @@ mymain(void) if (!(info.qemuCaps = qemuTestParseCapabilitiesArch(virArchFromString(arch), \ capsfile))) \ return EXIT_FAILURE; \ + virQEMUCapsStripMachineAliases(info.qemuCaps); \ if (virTestRun("QEMU XML-2-ARGV " name "." suffix, \ testCompareXMLToArgv, &info) < 0) \ ret = -1; \ -- 2.16.2

1 1

[libvirt] [PATCH] docs: Use proper article in formatdomain.html.in
by Martin Kletzander 04 Jun '18

04 Jun '18

It's "a hard_limit", not "an hard_limit". Probably that was just a typo. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. I was *so* tempted to write "Fix an typo in a article...". I'm glad I was because that made me triple check the commit message. Otherwise I would have a typo like that somewhere there. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8bb6636ea9f9..22ef81052d6b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1085,7 +1085,7 @@ of memory, which means a malicious guest allocating large amounts of locked memory could cause a denial-of-service attack on the host. Because of this, using this option is discouraged unless your workload - demands it; even then, it's highly recommended to set an + demands it; even then, it's highly recommended to set a <code>hard_limit</code> (see <a href="#elementsMemoryTuning">memory tuning</a>) on memory allocation suitable for the specific environment at the same time to mitigate -- 2.17.1

1 0

[libvirt] [dbus PATCH] gdbus: Don't report libvirt errors for GetAll method on properties
by Pavel Hrdina 04 Jun '18

04 Jun '18

According to D-Bus specification if some property is not accessible it may be omitted in the returned list of properties. However, such error needs to be reported for Get method on that property. In libvirt-dbus this can happen for Domain.SchedulerType property for QEMU session connection. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/gdbus.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gdbus.c b/src/gdbus.c index 2cce6ff..4e35477 100644 --- a/src/gdbus.c +++ b/src/gdbus.c @@ -163,20 +163,19 @@ virtDBusGDBusHandlePropertyGetAll(GDBusMethodInvocation *invocation, { GVariant *value; g_auto(GVariantBuilder) builder; - g_autoptr(GError) error = NULL; g_variant_builder_init(&builder, G_VARIANT_TYPE("(a{sv})")); g_variant_builder_open(&builder, G_VARIANT_TYPE("a{sv}")); for (gint i = 0; data->properties[i].name; i++) { + g_autoptr(GError) error = NULL; + data->properties[i].getFunc(objectPath, data->userData, &value, &error); - if (error) { - g_dbus_method_invocation_return_gerror(invocation, error); - return; - } + if (error) + continue; g_return_if_fail(value); -- 2.17.1

2 1

[libvirt] [PATCH 0/9] qemu: Refactor and simplify handling of disk hotplug and commandline
by Peter Krempa 04 Jun '18

04 Jun '18

This refactor unifies setup of data for disk hotplug and command line generation. This applies on top of 'qemu: Handle managed persisten reservations separately' as that applies on top of the staging branch for my ACKed refactors which moved now, you can fetch everything at: git fetch git://pipo.sk/pipo/libvirt.git disk-hotplug-refactor Peter Krempa (9): qemu: hotplug: Remove qemuDomainDelDiskSrcTLSObject qemu: alias: Rename qemuAliasFromDisk to qemuAliasDiskDriveFromDisk qemu: Reuse qemuBlockStorageSourceAttachApply in disk hotplug qemu: hotplug: Extract hotplug of PR into qemuBlockStorageSourceAttachApply qemu: hotplug: Extract hotplug of secrets into qemuBlockStorageSourceAttachApply qemu: hotplug: Extract hotplug of TLS into qemuBlockStorageSourceAttachApply qemu: command: Rename qemuBuildDiskDriveCommandLine qemu: command: Extract setup of one disk's command line qemu: command: Refactor disk commandline formatting src/qemu/qemu_alias.c | 4 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_block.c | 58 +++++++++++- src/qemu/qemu_block.h | 16 ++++ src/qemu/qemu_command.c | 232 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_command.h | 13 ++- src/qemu/qemu_driver.c | 18 ++-- src/qemu/qemu_hotplug.c | 121 +++--------------------- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_process.c | 2 +- 10 files changed, 257 insertions(+), 215 deletions(-) -- 2.16.2

2 19

[libvirt] [PATCH] bhyve: add support for passing stdin to loader
by Fabian Freyer 03 Jun '18

03 Jun '18

This commit adds the <bootloader_stdin> node to the domain definition, with the following semantics: To pass standard input verbatim to the bootloader, set <bootloader_stdin>some stdin</bootloader_stdin> Multiline standard input can be set using a CDATA tag: <bootloader_stdin><![CDATA[ this standard input will be passed in with newlines and indentation. ]]></bootloader_stdin> Standard input can be read from a file as follows: <bootloader_stdin file="/path/to/some/file"/> Signed-off-by: Fabian Freyer <fabian.freyer(a)physik.tu-berlin.de> --- docs/formatdomain.html.in | 19 ++++++ docs/schemas/domaincommon.rng | 10 ++++ src/bhyve/bhyve_driver.c | 10 ++++ src/bhyve/bhyve_parse_command.c | 70 ++++++++++++++++++++++ src/bhyve/bhyve_process.c | 22 +++++++ src/conf/domain_conf.c | 41 +++++++++++++ src/conf/domain_conf.h | 11 ++++ .../bhyveargv2xml-loader-stdin-file.args | 9 +++ .../bhyveargv2xml-loader-stdin-file.xml | 19 ++++++ .../bhyveargv2xml-loader-stdin-multiline.args | 13 ++++ .../bhyveargv2xml-loader-stdin-multiline.xml | 21 +++++++ .../bhyveargv2xml-loader-stdin-oneline.args | 11 ++++ .../bhyveargv2xml-loader-stdin-oneline.xml | 19 ++++++ tests/bhyveargv2xmltest.c | 3 + .../bhyvexml2argv-grub-stdin-file.args | 9 +++ .../bhyvexml2argv-grub-stdin-file.devmap | 1 + .../bhyvexml2argv-grub-stdin-file.ldargs | 4 ++ .../bhyvexml2argv-grub-stdin-file.xml | 25 ++++++++ .../bhyvexml2argv-grub-stdin-multiline.args | 9 +++ .../bhyvexml2argv-grub-stdin-multiline.devmap | 1 + .../bhyvexml2argv-grub-stdin-multiline.ldargs | 4 ++ .../bhyvexml2argv-grub-stdin-multiline.xml | 30 ++++++++++ .../bhyvexml2argv-grub-stdin-oneline.args | 9 +++ .../bhyvexml2argv-grub-stdin-oneline.devmap | 1 + .../bhyvexml2argv-grub-stdin-oneline.ldargs | 4 ++ .../bhyvexml2argv-grub-stdin-oneline.xml | 25 ++++++++ tests/bhyvexml2argvtest.c | 3 + .../bhyvexml2xmlout-grub-stdin-file.xml | 34 +++++++++++ .../bhyvexml2xmlout-grub-stdin-multiline.xml | 39 ++++++++++++ .../bhyvexml2xmlout-grub-stdin-oneline.xml | 34 +++++++++++ tests/bhyvexml2xmltest.c | 3 + 31 files changed, 513 insertions(+) create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.xml create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.args create mode 100644 tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-file.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-multiline.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-oneline.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5e99884dc..cea024235 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -245,6 +245,11 @@ ... <bootloader>/usr/bin/pygrub</bootloader> <bootloader_args>--append single</bootloader_args> +<bootloader_stdin><![CDATA[ +kernel (hd)/path/to/kernel +initrd (host)/path/to/initrd +boot +]]> ...</pre> <dl> @@ -259,6 +264,20 @@ command line arguments to be passed to the bootloader. <span class="since">Since 0.2.3</span> </dd> + <dt><code>bootloader_stdin</code></dt> + <dd>The optional <code>bootloader_stdin</code> element specifies + standard input to be passed to the bootloader. To pass multiple + lines of standard input to the bootloader, wrap the content in + a CDATA tag. Instead of specifying the standard input in the + domain XML, the path to a file to be read may be given using the + <code>file</code> attribute: +<pre> +... +<bootloader_stdin file="/path/to/some/file"/> +... +</pre> + <span class="since">Since 4.3.0 (bhyve only)</span> + </dd> </dl> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4cab55f05..a44d88ef3 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1211,6 +1211,16 @@ <text/> </element> </optional> + <optional> + <choice> + <element name="bootloader_stdin"> + <text/> + </element> + <element name="bootloader_stdin"> + <attribute name="file"/> + </element> + </choice> + </optional> </interleave> </define> <define name="osbootkernel"> diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 24c4a9c80..7ac3ad3f0 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -743,6 +743,16 @@ bhyveConnectDomainXMLToNative(virConnectPtr conn, goto cleanup; virBufferAdd(&buf, virCommandToString(loadcmd), -1); + + if (def->os.bootloaderStdinSource == VIR_DOMAIN_BOOTLOADER_STDIN_FILE) + virBufferEscapeString(&buf, " < %s", def->os.bootloaderStdin); + else if (def->os.bootloaderStdinSource + == VIR_DOMAIN_BOOTLOADER_STDIN_LITERAL) { + virBufferEscapeString(&buf, " << END_LOADER_STDIN\n" + "%s\nEND_LOADER_STDIN", + def->os.bootloaderStdin); + } + virBufferAddChar(&buf, '\n'); } diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c index fcaaed275..ef51a75f1 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -124,6 +124,8 @@ static int bhyveCommandLineToArgv(const char *nativeConfig, int *loader_argc, char ***loader_argv, + char **loader_stdin_buffer, + char **loader_stdin_file, int *bhyve_argc, char ***bhyve_argv) { @@ -139,6 +141,10 @@ bhyveCommandLineToArgv(const char *nativeConfig, char **_bhyve_argv = NULL; char **_loader_argv = NULL; + virBuffer heredoc = VIR_BUFFER_INITIALIZER; + int in_heredoc = 0; + char *heredoc_delim = NULL; + nativeConfig_unescaped = bhyveParseCommandLineUnescape(nativeConfig); if (nativeConfig_unescaped == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -178,6 +184,52 @@ bhyveCommandLineToArgv(const char *nativeConfig, char **arglist = NULL; size_t args_count = 0; size_t args_alloc = 0; + char *stdin_redir = NULL; + + /* are we in a heredoc? */ + if ( in_heredoc ) { + if (STRPREFIX(curr, heredoc_delim)) { + in_heredoc = 0; + *loader_stdin_buffer = virBufferContentAndReset(&heredoc); + continue; + } + + if (in_heredoc++ == 1) + virBufferAsprintf(&heredoc, "%s", curr); + else + virBufferAsprintf(&heredoc, "\n%s", curr); + + continue; + } + + /* check if this line contains standard input redirection. */ + if ( (stdin_redir = strchr(curr, '<')) ) { + if (STREQLEN(stdin_redir, "<<", 2)) { + *stdin_redir = '\0'; + in_heredoc = 1; + heredoc_delim = stdin_redir + 2; + + /* skip non-alphanumeric chars */ + while (*heredoc_delim && !c_isalnum(*heredoc_delim)) + heredoc_delim ++; + + if (!*heredoc_delim) + goto error; + + virBufferFreeAndReset(&heredoc); + } else { + /* file redirection */ + *stdin_redir = '\0'; + stdin_redir ++; + + /* skip non-alphanumeric chars */ + while (*stdin_redir && !c_isalnum(*stdin_redir)) + stdin_redir ++; + + if (VIR_STRDUP(*loader_stdin_file, stdin_redir) != 1) + goto error; + } + } /* iterate over each line, splitting on sequences of ' '. This code is * adapted from qemu/qemu_parse_command.c. */ @@ -254,12 +306,16 @@ bhyveCommandLineToArgv(const char *nativeConfig, if (!(*bhyve_argv = _bhyve_argv)) goto error; + if (in_heredoc) + goto error; + virStringListFree(lines); return 0; error: VIR_FREE(_loader_argv); VIR_FREE(_bhyve_argv); + virBufferFreeAndReset(&heredoc); virStringListFree(lines); return -1; } @@ -869,6 +925,8 @@ bhyveParseCommandLineString(const char* nativeConfig, char **bhyve_argv = NULL; int loader_argc = 0; char **loader_argv = NULL; + char *loader_stdin_file = NULL; + char *loader_stdin_buffer = NULL; if (!(def = virDomainDefNew())) goto cleanup; @@ -887,12 +945,21 @@ bhyveParseCommandLineString(const char* nativeConfig, if (bhyveCommandLineToArgv(nativeConfig, &loader_argc, &loader_argv, + &loader_stdin_buffer, &loader_stdin_file, &bhyve_argc, &bhyve_argv)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failed to convert the command string to argv-lists")); goto error; } + if (loader_stdin_file && !loader_stdin_buffer) { + def->os.bootloaderStdinSource = VIR_DOMAIN_BOOTLOADER_STDIN_FILE; + def->os.bootloaderStdin = loader_stdin_file; + } else if (loader_stdin_buffer && !loader_stdin_file) { + def->os.bootloaderStdinSource = VIR_DOMAIN_BOOTLOADER_STDIN_LITERAL, + def->os.bootloaderStdin = loader_stdin_buffer; + } + if (bhyveParseBhyveCommandLine(def, xmlopt, caps, bhyve_argc, bhyve_argv)) goto error; if (loader_argv && STREQ(loader_argv[0], "/usr/sbin/bhyveload")) { @@ -906,9 +973,12 @@ bhyveParseCommandLineString(const char* nativeConfig, cleanup: virStringListFree(loader_argv); virStringListFree(bhyve_argv); + return def; error: virDomainDefFree(def); + VIR_FREE(loader_stdin_buffer); + VIR_FREE(loader_stdin_file); def = NULL; goto cleanup; } diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 9276d7d36..1a6f783d7 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -113,6 +113,7 @@ virBhyveProcessStart(virConnectPtr conn, bhyveDomainObjPrivatePtr priv = vm->privateData; int ret = -1, rc; virCapsPtr caps = NULL; + int stdinfd = -1; if (virAsprintf(&logfile, "%s/%s.log", BHYVE_LOG_DIR, vm->def->name) < 0) @@ -173,6 +174,26 @@ virBhyveProcessStart(virConnectPtr conn, if (!(load_cmd = virBhyveProcessBuildLoadCmd(conn, vm->def, devmap_file, &devicemap))) goto cleanup; + + switch (vm->def->os.bootloaderStdinSource) { + case VIR_DOMAIN_BOOTLOADER_STDIN_NONE: + break; + case VIR_DOMAIN_BOOTLOADER_STDIN_FILE: + if ((stdinfd = open(vm->def->os.bootloaderStdin, O_RDONLY)) < 0) { + virReportSystemError(errno, _("Failed to open '%s'"), + vm->def->os.bootloaderStdin); + goto cleanup; + } + virCommandSetInputFD(load_cmd, stdinfd); + break; + case VIR_DOMAIN_BOOTLOADER_STDIN_LITERAL: + virCommandSetInputBuffer(load_cmd, vm->def->os.bootloaderStdin); + break; + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_BOOTLOADER_STDIN_LAST: + break; + } + virCommandSetOutputFD(load_cmd, &logfd); virCommandSetErrorFD(load_cmd, &logfd); @@ -252,6 +273,7 @@ virBhyveProcessStart(virConnectPtr conn, virCommandFree(load_cmd); virCommandFree(cmd); VIR_FREE(logfile); + VIR_FORCE_CLOSE(stdinfd); VIR_FORCE_CLOSE(logfd); return ret; } diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d23182f18..d99ecf9f7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3037,6 +3037,8 @@ void virDomainDefFree(virDomainDefPtr def) VIR_FREE(def->os.bootloader); VIR_FREE(def->os.bootloaderArgs); + VIR_FREE(def->os.bootloaderStdin); + virDomainClockDefClear(&def->clock); VIR_FREE(def->name); @@ -18700,6 +18702,16 @@ virDomainDefParseXML(xmlDocPtr xml, def->os.bootloader = virXPathString("string(./bootloader)", ctxt); def->os.bootloaderArgs = virXPathString("string(./bootloader_args)", ctxt); + if ((def->os.bootloaderStdin = virXPathString("string(./bootloader_stdin/" + "@file)", ctxt))) + def->os.bootloaderStdinSource = VIR_DOMAIN_BOOTLOADER_STDIN_FILE; + else if ((def->os.bootloaderStdin = virXPathString("string(" + "./bootloader_stdin)", + ctxt))) + def->os.bootloaderStdinSource = VIR_DOMAIN_BOOTLOADER_STDIN_LITERAL; + else + def->os.bootloaderStdinSource = VIR_DOMAIN_BOOTLOADER_STDIN_NONE; + tmp = virXPathString("string(./os/type[1])", ctxt); if (!tmp) { if (def->os.bootloader) { @@ -26717,6 +26729,35 @@ virDomainDefFormatInternal(virDomainDefPtr def, virBufferEscapeString(buf, "<bootloader_args>%s</bootloader_args>\n", def->os.bootloaderArgs); + + switch (def->os.bootloaderStdinSource) { + case VIR_DOMAIN_BOOTLOADER_STDIN_NONE: + break; + case VIR_DOMAIN_BOOTLOADER_STDIN_FILE: + virBufferEscapeString(buf, "<bootloader_stdin file=\"%s\"/>\n", + def->os.bootloaderStdin); + break; + case VIR_DOMAIN_BOOTLOADER_STDIN_LITERAL: + if (strchr(def->os.bootloaderStdin, '\n') + || strchr(def->os.bootloaderStdin, '<') + || strchr(def->os.bootloaderStdin, '>') + || strchr(def->os.bootloaderStdin, '&')) + { + virBufferEscapeString(buf, + "<bootloader_stdin><![CDATA[%s]]>" + "</bootloader_stdin>\n", + def->os.bootloaderStdin); + } else { + virBufferEscapeString(buf, + "<bootloader_stdin>%s" + "</bootloader_stdin>\n", + def->os.bootloaderStdin); + } + break; + /* coverity[dead_error_begin] */ + case VIR_DOMAIN_BOOTLOADER_STDIN_LAST: + break; + } } virBufferAddLit(buf, "<os>\n"); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bbaa24137..41af6cc8a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1897,6 +1897,15 @@ struct _virDomainOSEnv { char *value; }; +/* Bootloader standard input source */ +typedef enum { + VIR_DOMAIN_BOOTLOADER_STDIN_NONE = 0, + VIR_DOMAIN_BOOTLOADER_STDIN_FILE, + VIR_DOMAIN_BOOTLOADER_STDIN_LITERAL, + + VIR_DOMAIN_BOOTLOADER_STDIN_LAST +} virDomainBootloaderStdinSource; + typedef struct _virDomainOSDef virDomainOSDef; typedef virDomainOSDef *virDomainOSDefPtr; struct _virDomainOSDef { @@ -1923,6 +1932,8 @@ struct _virDomainOSDef { virDomainLoaderDefPtr loader; char *bootloader; char *bootloaderArgs; + virDomainBootloaderStdinSource bootloaderStdinSource; + char *bootloaderStdin; int smbios_mode; virDomainBIOSDef bios; diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.args b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.args new file mode 100644 index 000000000..ca51f2f04 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.args @@ -0,0 +1,9 @@ +/usr/bin/custom-loader \ +-s ome \ +--args < path/to/some/file +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-s 0:0,hostbridge bhyve diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.xml new file mode 100644 index 000000000..a56a4c451 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-file.xml @@ -0,0 +1,19 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <bootloader>/usr/bin/custom-loader</bootloader> + <bootloader_args>-s ome --args</bootloader_args> + <bootloader_stdin file="path/to/some/file"/> + <os> + <type>hvm</type> + </os> + <clock offset='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + </devices> +</domain> diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.args b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.args new file mode 100644 index 000000000..050ddf442 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.args @@ -0,0 +1,13 @@ +/usr/bin/custom-loader \ +-s ome \ +--args << END_OF_THIS_HEREDOC +some +standard input +here +END_OF_THIS_HEREDOC +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-s 0:0,hostbridge bhyve diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.xml new file mode 100644 index 000000000..496b5ea87 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-multiline.xml @@ -0,0 +1,21 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <bootloader>/usr/bin/custom-loader</bootloader> + <bootloader_args>-s ome --args</bootloader_args> + <bootloader_stdin><![CDATA[some +standard input +here]]></bootloader_stdin> + <os> + <type>hvm</type> + </os> + <clock offset='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + </devices> +</domain> diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.args b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.args new file mode 100644 index 000000000..f8bcdcddd --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.args @@ -0,0 +1,11 @@ +/usr/bin/custom-loader \ +-s ome \ +--args << END_OF_THIS_HEREDOC +some standard input here +END_OF_THIS_HEREDOC +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-H \ +-P \ +-s 0:0,hostbridge bhyve diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.xml new file mode 100644 index 000000000..17c9da664 --- /dev/null +++ b/tests/bhyveargv2xmldata/bhyveargv2xml-loader-stdin-oneline.xml @@ -0,0 +1,19 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <bootloader>/usr/bin/custom-loader</bootloader> + <bootloader_args>-s ome --args</bootloader_args> + <bootloader_stdin>some standard input here</bootloader_stdin> + <os> + <type>hvm</type> + </os> + <clock offset='localtime'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>destroy</on_reboot> + <on_crash>destroy</on_crash> + <devices> + </devices> +</domain> diff --git a/tests/bhyveargv2xmltest.c b/tests/bhyveargv2xmltest.c index e5d78530c..fef01d7da 100644 --- a/tests/bhyveargv2xmltest.c +++ b/tests/bhyveargv2xmltest.c @@ -187,6 +187,9 @@ mymain(void) DO_TEST("memsize-human"); DO_TEST_FAIL("memsize-fail"); DO_TEST("custom-loader"); + DO_TEST("loader-stdin-file"); + DO_TEST("loader-stdin-oneline"); + DO_TEST("loader-stdin-multiline"); DO_TEST("bhyveload-custom"); DO_TEST("bhyveload-vda"); DO_TEST_FAIL("bhyveload-name-mismatch"); diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.args new file mode 100644 index 000000000..3ba5c1160 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.args @@ -0,0 +1,9 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.devmap b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.devmap new file mode 100644 index 000000000..b312bfdaf --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.devmap @@ -0,0 +1 @@ +(hd0) /tmp/freebsd.img \ No newline at end of file diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.ldargs new file mode 100644 index 000000000..7d9a5155a --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.ldargs @@ -0,0 +1,4 @@ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '<device.map>' \ +--memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.xml new file mode 100644 index 000000000..f804da0db --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-file.xml @@ -0,0 +1,25 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <bootloader_stdin file="/path/to/some/file"/> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:ee:f5:79'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.args new file mode 100644 index 000000000..3ba5c1160 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.args @@ -0,0 +1,9 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.devmap b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.devmap new file mode 100644 index 000000000..b312bfdaf --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.devmap @@ -0,0 +1 @@ +(hd0) /tmp/freebsd.img \ No newline at end of file diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.ldargs new file mode 100644 index 000000000..7d9a5155a --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.ldargs @@ -0,0 +1,4 @@ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '<device.map>' \ +--memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.xml new file mode 100644 index 000000000..456ab0443 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-multiline.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <bootloader_stdin><![CDATA[ +multiple +boot +loader +commands +]]></bootloader_stdin> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:ee:f5:79'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.args new file mode 100644 index 000000000..3ba5c1160 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.args @@ -0,0 +1,9 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 2:0,ahci,hd:/tmp/freebsd.img \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.devmap b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.devmap new file mode 100644 index 000000000..b312bfdaf --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.devmap @@ -0,0 +1 @@ +(hd0) /tmp/freebsd.img \ No newline at end of file diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.ldargs new file mode 100644 index 000000000..7d9a5155a --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.ldargs @@ -0,0 +1,4 @@ +/usr/local/sbin/grub-bhyve \ +--root hd0,msdos1 \ +--device-map '<device.map>' \ +--memory 214 bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.xml new file mode 100644 index 000000000..03b6987fd --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-stdin-oneline.xml @@ -0,0 +1,25 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <bootloader_stdin>some input commands</bootloader_stdin> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <interface type='bridge'> + <mac address='52:54:00:ee:f5:79'/> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 6f3b0c2eb..e4cb0592e 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -188,6 +188,9 @@ mymain(void) DO_TEST("grub-defaults"); DO_TEST("grub-bootorder"); DO_TEST("grub-bootorder2"); + DO_TEST("grub-stdin-file"); + DO_TEST("grub-stdin-oneline"); + DO_TEST("grub-stdin-multiline"); DO_TEST("bhyveload-bootorder"); DO_TEST("bhyveload-bootorder1"); DO_TEST_FAILURE("bhyveload-bootorder2"); diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-file.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-file.xml new file mode 100644 index 000000000..f07368d01 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-file.xml @@ -0,0 +1,34 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <bootloader_stdin file="/path/to/some/file"/> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:ee:f5:79'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-multiline.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-multiline.xml new file mode 100644 index 000000000..eae6df4b4 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-multiline.xml @@ -0,0 +1,39 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <bootloader_stdin><![CDATA[ +multiple +boot +loader +commands +]]></bootloader_stdin> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:ee:f5:79'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-oneline.xml b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-oneline.xml new file mode 100644 index 000000000..b038a9065 --- /dev/null +++ b/tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-stdin-oneline.xml @@ -0,0 +1,34 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <bootloader>/usr/local/sbin/grub-bhyve</bootloader> + <bootloader_stdin>some input commands</bootloader_stdin> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='drive' controller='0' bus='0' target='2' unit='0'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </controller> + <interface type='bridge'> + <mac address='52:54:00:ee:f5:79'/> + <source bridge='virbr0'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index 4d9c1681d..fd386b504 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -98,6 +98,9 @@ mymain(void) DO_TEST_DIFFERENT("grub-bootorder"); DO_TEST_DIFFERENT("grub-bootorder2"); DO_TEST_DIFFERENT("grub-defaults"); + DO_TEST_DIFFERENT("grub-stdin-file"); + DO_TEST_DIFFERENT("grub-stdin-oneline"); + DO_TEST_DIFFERENT("grub-stdin-multiline"); DO_TEST_DIFFERENT("localtime"); DO_TEST_DIFFERENT("macaddr"); DO_TEST_DIFFERENT("metadata"); -- 2.11.0

3 3

[libvirt] [PATCH 0/5] Add support for extended TSEG
by Martin Kletzander 03 Jun '18

03 Jun '18

QEMU enabled setting the value in 2.10 and it also chose some value secretly that we need to keep so that the guest works as it should've before. Also to be sure nothing changes in case QEMU changes its default, since it's visible from the guest. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1469338 If you are interested in lot of juicy info how the stuff is related to everything in the observable universe, I recommend reading through the comments of the BZ. In his unlimited knowledge, Laszlo was so kind to explain all the underlying plumbing into details. Thanks Laszlo! Laszlo FTW! ;-) Martin Kletzander (5): docs: Tiny fix for the SMM description qemu: Move checks for SMM from command-line creation into validation phase conf, schema, docs: Add support for TSEG size setting qemu: Add capability flag for setting the extended tseg size qemu: Add support for setting the TSEG size docs/formatdomain.html.in | 45 ++++++++- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 60 +++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 31 ++++-- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 30 ++++-- src/qemu/qemu_domain.c | 96 ++++++++++++++++++- tests/genericxml2xmlindata/tseg.xml | 23 +++++ tests/genericxml2xmltest.c | 2 + .../caps_1.5.3.x86_64.replies | 38 ++++++-- .../caps_1.5.3.x86_64.xml | 3 +- .../caps_1.6.0.x86_64.replies | 38 ++++++-- .../caps_1.6.0.x86_64.xml | 3 +- .../caps_1.7.0.x86_64.replies | 38 ++++++-- .../caps_1.7.0.x86_64.xml | 3 +- .../caps_2.1.1.x86_64.replies | 38 ++++++-- .../caps_2.1.1.x86_64.xml | 3 +- .../caps_2.10.0.x86_64.replies | 48 +++++++--- .../caps_2.10.0.x86_64.xml | 3 +- .../caps_2.12.0.x86_64.replies | 67 ++++++++++--- .../caps_2.12.0.x86_64.xml | 4 +- .../caps_2.4.0.x86_64.replies | 38 ++++++-- .../caps_2.4.0.x86_64.xml | 3 +- .../caps_2.5.0.x86_64.replies | 40 ++++++-- .../caps_2.5.0.x86_64.xml | 3 +- .../caps_2.6.0.x86_64.replies | 40 ++++++-- .../caps_2.6.0.x86_64.xml | 3 +- .../caps_2.7.0.x86_64.replies | 40 ++++++-- .../caps_2.7.0.x86_64.xml | 3 +- .../caps_2.8.0.x86_64.replies | 40 ++++++-- .../caps_2.8.0.x86_64.xml | 3 +- .../caps_2.9.0.x86_64.replies | 48 +++++++--- .../caps_2.9.0.x86_64.xml | 3 +- .../qemuxml2argvdata/tseg-explicit-size.args | 28 ++++++ tests/qemuxml2argvdata/tseg-explicit-size.xml | 23 +++++ tests/qemuxml2argvdata/tseg-i440fx.xml | 23 +++++ tests/qemuxml2argvdata/tseg-invalid-size.xml | 23 +++++ .../tseg-old-machine-type.args | 27 ++++++ .../tseg-old-machine-type.xml | 21 ++++ tests/qemuxml2argvdata/tseg.args | 28 ++++++ tests/qemuxml2argvdata/tseg.xml | 21 ++++ tests/qemuxml2argvtest.c | 48 ++++++++++ .../qemuxml2xmloutdata/tseg-explicit-size.xml | 46 +++++++++ .../tseg-old-machine-type.xml | 44 +++++++++ tests/qemuxml2xmloutdata/tseg.xml | 46 +++++++++ tests/qemuxml2xmltest.c | 25 +++++ 47 files changed, 1123 insertions(+), 129 deletions(-) create mode 100644 tests/genericxml2xmlindata/tseg.xml create mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.args create mode 100644 tests/qemuxml2argvdata/tseg-explicit-size.xml create mode 100644 tests/qemuxml2argvdata/tseg-i440fx.xml create mode 100644 tests/qemuxml2argvdata/tseg-invalid-size.xml create mode 100644 tests/qemuxml2argvdata/tseg-old-machine-type.args create mode 100644 tests/qemuxml2argvdata/tseg-old-machine-type.xml create mode 100644 tests/qemuxml2argvdata/tseg.args create mode 100644 tests/qemuxml2argvdata/tseg.xml create mode 100644 tests/qemuxml2xmloutdata/tseg-explicit-size.xml create mode 100644 tests/qemuxml2xmloutdata/tseg-old-machine-type.xml create mode 100644 tests/qemuxml2xmloutdata/tseg.xml -- 2.17.0

6 34

[libvirt] [PATCH v2 0/2] qemu: Forbid qcow/qcow2 native encryption
by Peter Krempa 03 Jun '18

03 Jun '18

v2: - add entries to formatdomain.html and formatstorageencryption.html saying that the encryption should not be used. This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging Peter Krempa (2): qemu: domain: Forbid storage with old QCOW2 encryption qemu: Remove code for setting up disk passphrases docs/formatdomain.html.in | 4 + docs/formatstorageencryption.html.in | 5 +- src/qemu/qemu_domain.c | 10 +++ src/qemu/qemu_monitor.c | 13 --- src/qemu/qemu_monitor.h | 4 - src/qemu/qemu_monitor_json.c | 28 ------ src/qemu/qemu_monitor_json.h | 4 - src/qemu/qemu_process.c | 103 ----------------------- tests/qemumonitorjsontest.c | 2 - tests/qemuxml2argvdata/encrypted-disk-usage.args | 8 +- tests/qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk.args | 8 +- tests/qemuxml2argvdata/encrypted-disk.xml | 2 +- tests/qemuxml2argvtest.c | 4 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- tests/qemuxml2xmltest.c | 4 +- 16 files changed, 37 insertions(+), 166 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH 0/4] qemu: Handle managed persisten reservations separately
by Peter Krempa 03 Jun '18

03 Jun '18

Keep the handling of the singleton managed pr-manager-helper object separate from the unmanaged ones which are instantiated one-per-disk-source. This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging Peter Krempa (4): util: storage: Add helper for determining whether a backing chain requires PR qemu: command: Pass in 'src' rather than 'disk' to qemuBuildPRManagerInfoProps qemu: command: Return props as return value in qemuBuildPRManagerInfoProps qemu: Split handling of managed and unmanaged persistent reservations src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 123 ++++++++++++++------- src/qemu/qemu_command.h | 4 +- src/qemu/qemu_hotplug.c | 101 ++++++++--------- src/util/virstoragefile.c | 14 +++ src/util/virstoragefile.h | 3 + ...isk-virtio-scsi-reservations.x86_64-latest.args | 4 +- 8 files changed, 154 insertions(+), 98 deletions(-) -- 2.16.2

2 9

[libvirt] [PATCH v2 0/3] qemu: Add TLS transport for NBD
by Peter Krempa 03 Jun '18

03 Jun '18

v2: - added qemu.conf knobs - added docs - fixed test case for changes in ACKed patches This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging Peter Krempa (3): qemu: conf: Add qemu.conf knobs for setting up TLS for NBD qemu: domain: Add support for TLS for NBD tests: qemublock: Test NBD with TLS in the JSON generator docs/formatdomain.html.in | 8 ++++- docs/schemas/domaincommon.rng | 5 +++ src/qemu/libvirtd_qemu.aug | 4 +++ src/qemu/qemu.conf | 34 +++++++++++++++++++ src/qemu/qemu_command.c | 5 +++ src/qemu/qemu_conf.c | 15 +++++++++ src/qemu/qemu_conf.h | 3 ++ src/qemu/qemu_domain.c | 38 ++++++++++++++++++++-- src/qemu/test_libvirtd_qemu.aug.in | 2 ++ tests/qemublocktest.c | 1 + .../xml2json/network-nbd-tls.json | 19 +++++++++++ .../qemublocktestdata/xml2json/network-nbd-tls.xml | 18 ++++++++++ .../disk-drive-network-tlsx509.args | 9 ++++- .../disk-drive-network-tlsx509.xml | 8 +++++ tests/qemuxml2argvtest.c | 2 +- .../disk-drive-network-tlsx509.xml | 8 +++++ 16 files changed, 174 insertions(+), 5 deletions(-) create mode 100644 tests/qemublocktestdata/xml2json/network-nbd-tls.json create mode 100644 tests/qemublocktestdata/xml2json/network-nbd-tls.xml -- 2.16.2

2 6

[libvirt] [PATCH] libxl: fix leaking logfile fds
by Jim Fehlig 02 Jun '18

02 Jun '18

Per-domain log files were introduced in commit a30b08b7179. The FILE objects associated with these log files are stored in a hash table using domid as a key. When a domain is shutdown, destroyed, or otherwise powered-off, the FILE object is removed from the hash table, where the free function will close the FILE. Unfortunately the call to remove the FILE from the hash table occurs after setting domid=-1 in the libxlDomainCleanup() function. The object is never removed from the hash table, the free function is never called, and the underlying fd is leaked. Fix by removing the FILE object from the hash table before setting domid=-1. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_domain.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index d4859d6707..d12b1b1b4b 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -769,6 +769,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, VIR_WARN("Unable to release lease on %s", vm->def->name); VIR_DEBUG("Preserving lock state '%s'", NULLSTR(priv->lockState)); + libxlLoggerCloseFile(cfg->logger, vm->def->id); vm->def->id = -1; if (priv->deathW) { @@ -822,8 +823,6 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, VIR_FREE(xml); } - libxlLoggerCloseFile(cfg->logger, vm->def->id); - virDomainObjRemoveTransientDef(vm); virObjectUnref(cfg); } -- 2.16.3

2 1

[libvirt] [PATCH v4 0/3] capabilities: Provide info about host IOMMU
by Filip Alac 02 Jun '18

02 Jun '18

Provide information about host IOMMU support in capabilities XML. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=967231 v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01914.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg01997.html - Remove incorrect warning message v3: https://www.redhat.com/archives/libvir-list/2018-May/msg02404.html v4: - Correct ordering of patches Filip Alac (3): qemu: hostdev: Move parts of qemuHostdevHostSupportsPassthroughVFIO() into separate function capabilities: Extend capabilities with iommu_support docs: news: Explain iommu_support improvement docs/news.xml | 8 +++++ docs/schemas/capability.rng | 13 +++++++++ src/conf/capabilities.c | 9 ++++++ src/conf/capabilities.h | 3 ++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_hostdev.c | 29 +++---------------- src/test/test_driver.c | 2 ++ src/util/virutil.c | 28 ++++++++++++++++++ src/util/virutil.h | 2 ++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + .../nodisksnapshot_1.6.0-1.xml | 1 + .../vircaps2xmldata/vircaps-aarch64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-caches.xml | 1 + .../vircaps-x86_64-resctrl-cdp.xml | 1 + .../vircaps-x86_64-resctrl-skx-twocaches.xml | 1 + .../vircaps-x86_64-resctrl-skx.xml | 1 + .../vircaps-x86_64-resctrl.xml | 1 + 19 files changed, 83 insertions(+), 25 deletions(-) -- 2.17.0

3 8

[libvirt] [PATCH 0/2] qemu: Fix reporting completed migration stats on destination
by Jiri Denemark 02 Jun '18

02 Jun '18

https://bugzilla.redhat.com/show_bug.cgi?id=1584071 Jiri Denemark (2): qemu: Report error on unexpected job stats type qemu: Fix reporting completed migration stats on destination src/qemu/qemu_domain.c | 8 +++++--- src/qemu/qemu_migration.c | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) -- 2.17.1

3 8

[libvirt] [PATCH] qemu.conf: Change the example user from 'root' to 'qemu'
by Kashyap Chamarthy 02 Jun '18

02 Jun '18

Signed-off-by: Kashyap Chamarthy <kchamart(a)redhat.com> --- src/qemu/qemu.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 31738ff19c..444247cf31 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -403,13 +403,14 @@ # # user = "qemu" # A user named "qemu" # user = "+0" # Super user (uid=0) +# user = 'root' # The 'root' user # user = "100" # A user named "100" or a user with uid=100 # -#user = "root" +#user = "qemu" # The group for QEMU processes run by the system instance. It can be # specified in a similar way to user. -#group = "root" +#group = "qemu" # Whether libvirt should dynamically change file ownership # to match the configured user/group above. Defaults to 1. -- 2.17.0

4 9

[libvirt] Entering freeze for libvirt-4.4.0
by Daniel Veillard 02 Jun '18

02 Jun '18

Done, I tagged RC1 in git and pushed shigned tarball and rpms to the usual place: ftp://libvirt.org/libvirt/ This seems to work fine with my limited testing, as usual before a release it would be good to get more testing scope, especially with other OSes and platforms. ci.centos.org seems to be raising a few issues with bindings, like perl python and go, so worth a check before the release, RC2 on Thursday and then a release over the w.e. is the plan if all goes well, thanks for giving it a try ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 4

[libvirt] [PATCH] qemu: hotplug: Fix TLS setup on disk hotplug
by Peter Krempa 02 Jun '18

02 Jun '18

We need to check if TLS is enabled as the variable is a tristate. Currently we'd setup TLS even if it was explicitly turned off. Thankfully TLS for disks was only used with the vxhs protocol so hardly anybody would ever be able to hit the problem. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2f76c048aa..2b0d5df3bf 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -468,7 +468,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver, else if (rv > 0) prdStarted = true; - if (disk->src->haveTLS && + if (disk->src->haveTLS == VIR_TRISTATE_BOOL_YES && qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src) < 0) goto error; -- 2.16.2

2 1

[libvirt] [PATCH] spec: Fix requirement for "tc" on new distros
by Jiri Denemark 02 Jun '18

02 Jun '18

At least since Fedora 26 (maybe earlier, but we don't support older Fedora releases), the "tc" tool is provided by a separate iproute-tc package. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 17d5d4dff7..55057e353c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -482,8 +482,14 @@ Requires: %{name}-libs = %{version}-%{release} # for modprobe of pci devices Requires: module-init-tools + # for /sbin/ip & /sbin/tc Requires: iproute +# tc is provided by iproute-tc since at least Fedora 26 +%if 0%{?fedora} || 0%{?rhel} > 7 +Requires: iproute-tc +%endif + Requires: avahi-libs %if 0%{?fedora} || 0%{?rhel} >= 7 Requires: polkit >= 0.112 -- 2.17.1

2 1

Re: [libvirt] [libvirt-users] virRandomBits - not very random
by Eric Blake 01 Jun '18

01 Jun '18

Reviving an ancient thread: On 11/04/2014 02:18 AM, Daniel P. Berrange wrote: > On Mon, Nov 03, 2014 at 11:09:12AM -0500, Brian Rak wrote: >> I just ran into an issue where I had about 30 guests get duplicate mac >> addresses assigned. These were scattered across 30 different machines. >> >> Some debugging revealed that: >> >> 1) All the host machines were restarted within a couple seconds of each >> other >> 2) All the host machines had fairly similar libvirtd pids (within ~100 PIDs >> of each other) >> 3) Libvirt seeds the RNG using 'time(NULL) ^ getpid()' >> >> This perfectly explains why I saw so many duplicate mac addresses. >> >> Why is the RNG seed such a predictable value? Surely there has to be a >> better source of a random seed then the timestamp and the pid? >> >> The PID seems to me to be a very bad source of any randomness. I just ran a >> test across 60 of our hosts. 43 of them shared their PID with at least one >> other machine. > > We should probably seed it with data from /dev/urandom, and/or the new > Linux getrandom() syscall (or BSD equivalent). Did anyone ever open a BZ to track this? As far as I can tell, we still have a very predictable (meaning bad) seeding algorithm that permits large clusters to create collisions when their random number sequences sync up. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

6 11

[libvirt] [PATCH 0/2] last minute vsock tune-ups
by Ján Tomko 01 Jun '18

01 Jun '18

Last-minute change of the element name suggested by Dan: https://www.redhat.com/archives/libvir-list/2018-June/msg00034.html The news patch is rebased on top of Michal's addition: [PATCH for 4.4.0] news: Document two new features introduced in this release <ede7ef017a0a7621c29f01321d1ac4ca436f1ce6.1527839220.git.mprivozn(a)redhat.com> Ján Tomko (2): conf: rename <vsock><source> to <vsock><cid> news: add vsock docs/formatdomain.html.in | 6 +++--- docs/news.xml | 9 +++++++++ docs/schemas/domaincommon.rng | 4 ++-- src/conf/domain_conf.c | 20 ++++++++++---------- tests/qemuxml2argvdata/vhost-vsock-auto.xml | 2 +- tests/qemuxml2argvdata/vhost-vsock.xml | 2 +- tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 2 +- 7 files changed, 27 insertions(+), 18 deletions(-) -- 2.16.1

3 5

[libvirt] [PATCH 00/10] Use better PRNG
by Michal Privoznik 01 Jun '18

01 Jun '18

This is inspired by bug reported here [1]. Even though Eric suggested calling this Linux syscall when building without gnutls [2] I've decided to not implement it. Firstly, we build with gnuls everywhere (even Windows), secondly I see no appealing reason to special case Linux - /dev/urandom is good for both Linux and FreeBSD. Once these are merged I'm probably going to send patch set that makes gnutls mandatory. I'm tired of all those WITH_GNUTLS if-defs (esp. in function arguments). But that is orthogonal to what I'm solving here. Also, I'm not quite sure this is a release material, so I'm fine with merging this after the release. 1: https://www.redhat.com/archives/libvirt-users/2018-May/msg00097.html 2: https://www.redhat.com/archives/libvirt-users/2018-May/msg00100.html Michal Privoznik (10): virRandomBytes: Fix return value virCryptoGenerateRandom: rename ret virCryptoGenerateRandom: Explain gnults error virCryptoGenerateRandom: Don't allocate return buffer virRandomBytes: Prefer saferead over plain read virRandomBytes: Report error virRandomBytes: Use gnutls_rnd whenever possible virrandom: Make virRandomBits better virUUIDGenerate don't fall back to virRandomBits vircrypto: Drop virCryptoGenerateRandom src/libvirt_private.syms | 1 - src/qemu/qemu_domain.c | 13 ++++-- src/util/vircrypto.c | 41 ------------------- src/util/vircrypto.h | 2 - src/util/virrandom.c | 103 ++++++++++++++++------------------------------- src/util/viruuid.c | 25 ++---------- tests/qemuxml2argvmock.c | 13 ------ tests/vircryptotest.c | 4 +- 8 files changed, 48 insertions(+), 154 deletions(-) -- 2.16.1

4 24

[libvirt] VMX parser: limitation of numvcpus
by Pino Toscano 01 Jun '18

01 Jun '18

Hi Matthias, while testing the recent improvements I did in the VMX parser for CPU topology (see https://bugzilla.redhat.com/1568148) our QE Ming Xie set a guest in ESXi 5.5 to 7 cores. The result was the error triggered by the following code: /* vmx:numvcpus -> def:vcpus */ if (virVMXGetConfigLong(conf, "numvcpus", &numvcpus, 1, true) < 0) goto cleanup; if (numvcpus <= 0 || (numvcpus % 2 != 0 && numvcpus != 1)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Expecting VMX entry 'numvcpus' to be an unsigned " "integer (1 or a multiple of 2) but found %lld"), numvcpus); goto cleanup; } Looking into the history, this check dates back to the initial addition of the esx driver, commit e2aeee6811917bc5ad28326c6a860ded39802a88. Considering the VMX format is proprietary of VMware, and officially undocumented, do you know remember why that limitation was added? Do you think removing it might break anything? Thanks, -- Pino Toscano

2 1

[libvirt] [PATCH for 4.4.0] news: Document two new features introduced in this release
by Michal Privoznik 01 Jun '18

01 Jun '18

The first feature is SCSI persistent reservation, the other is support for multihead screenshots. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/news.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index c45850f625..453ac1d02a 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -94,6 +94,25 @@ both new APIs consider capabilities of a specific hypervisor. </description> </change> + <change> + <summary> + Introduce SCSI persistent reservations support + </summary> + <description> + The QEMU driver gained support for qemu-pr-helper which enables + guests to issue SCSI commands for persistent reservation. + </description> + </change> + <change> + <summary> + qemu: Implement multiple screen support for virDomainScreenshot + </summary> + <description> + While the virDomainScreenshot API supported multihead video cards, + the implementation was missing. But now that QEMU implemented it + libvirt has done as well. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.16.4

2 1

[libvirt] [PATCH 0/2] travis: Minor macOS improvements
by Andrea Bolognani 01 Jun '18

01 Jun '18

Andrea Bolognani (2): travis: Move PATH to macOS-specific environment travis: Install and use ccache on macOS .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.17.0

2 3

[libvirt] [PATCHv2 0/7] qemu: add vhost-vsock-pci support
by Ján Tomko 01 Jun '18

01 Jun '18

v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01517.html v2: * use <vsock> instead of <interface> * use <source> for the guest address * add <source auto> attribute and auto-assign the guest CID * fixed PCI address allocation https://bugzilla.redhat.com/show_bug.cgi?id=1291851 Ján Tomko (7): Introduce virDomainVsockDef Add privateData to virDomainVsockDef conf: introduce <vsock> element qemu: add private data for vsock Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK util: create virvsock.c qemu: add support for vhost-vsock-pci configure.ac | 8 + docs/formatdomain.html.in | 20 ++ docs/schemas/domaincommon.rng | 29 +++ src/conf/domain_conf.c | 228 ++++++++++++++++++++- src/conf/domain_conf.h | 27 +++ src/libvirt_private.syms | 6 + src/qemu/qemu_alias.c | 16 ++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 45 ++++ src/qemu/qemu_domain.c | 42 ++++ src/qemu/qemu_domain.h | 9 + src/qemu/qemu_domain_address.c | 11 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 35 ++++ src/util/Makefile.inc.am | 2 + src/util/virvsock.c | 89 ++++++++ src/util/virvsock.h | 29 +++ tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../vhost-vsock-auto.x86_64-latest.args | 32 +++ tests/qemuxml2argvdata/vhost-vsock-auto.xml | 35 ++++ .../vhost-vsock.x86_64-latest.args | 32 +++ tests/qemuxml2argvdata/vhost-vsock.xml | 36 ++++ tests/qemuxml2argvtest.c | 14 ++ tests/qemuxml2xmloutdata/vhost-vsock-auto.xml | 36 ++++ tests/qemuxml2xmloutdata/vhost-vsock.xml | 1 + tests/qemuxml2xmltest.c | 3 + 41 files changed, 808 insertions(+), 1 deletion(-) create mode 100644 src/util/virvsock.c create mode 100644 src/util/virvsock.h create mode 100644 tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock-auto.xml create mode 100644 tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock.xml create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock.xml -- 2.16.1

3 21

[libvirt] [GSoC] Design ideas for implementing cleanup attribute
by Sukrit Bhatnagar 01 Jun '18

01 Jun '18

Hi, I am interested in implementing the GCC cleanup attribute for automatic resource freeing as part of GSoC'18. I have shared a proposal for the same. This mail is to discuss the code design for implementing it. Here are some of my ideas: This attribute requires a cleanup function that is called automatically when the corresponding variable goes out of scope. There are some functions whose logic can be reused: - Functions such as virCommandFree, virConfFreeList and virCgroupFree can be directly used as cleanup functions. They have parameter and return type valid for a cleanup function. - Functions such as virFileClose and virFileFclose need some additional consideration as they return a value. I think we can set some global variable in a separate source file (just like errno variable from errno.h). Then the value to be returned can be accessed globally. - Functions such as virDomainEventGraphicsDispose need an entirely new design. They are used as callbacks in object classes and passed as an argument in virClassNew. This would require making changes to virObjectUnref's code too. *This is the part I am not sure how to implement cleanup logic for.* Also, since the __attribute__((__cleanup__(anyfunc))) looks ugly, a macro like autoclean (ideas for macro name welcome!) can be used instead. As Martin pointed out in my proposal, for some types, this can be done right after typedef declarations, so that the type itself contains this attribute. Basically, at most places where VIR_FREE is used to release memory explicitly, the corresponding variable can use the attribute. The existing virFree function also can be reused as it takes void pointer as an argument and returns nothing. One of the exceptions to this will be those variables which are struct members. The cleanup of member has to be done when the enclosing struct variable is cleaned. I can create new files vircleanup.{c,h} for defining cleanup functions for types which do not have an existing cleanup/free function. This can be done separately for each driver supported. For example, cleanups pertaining to lxc driver will be in src/lxc/lxc_cleanup.c. Your suggestions are welcome. Thanks, Sukrit Bhatnagar

7 25

[libvirt] [jenkins-ci PATCH v3 0/3] Enable out-of-the-box parallel make
by Andrea Bolognani 01 Jun '18

01 Jun '18

Changes from [v2]: * now that libvirt-perl uses Module::Build and ExtUtils::MakeMaker support has been dropped, we don't need to special case any job, so revert back to [v1] and rebase on top of master because the original series doesn't apply anymore. Changes from [v1]: * turns out some versions of ExtUtils::MakeMaker output Makefiles that are not entirely compatible with parallel make, which forces us to introduce an exception in the relevant template and shuffle patches around. [v1] https://www.redhat.com/archives/libvir-list/2018-May/msg00732.html [v2] https://www.redhat.com/archives/libvir-list/2018-May/msg01070.html Andrea Bolognani (3): jobs: Enable parallel make everywhere guests: Set MAKEFLAGS for out-of-the-box parallel make jobs: Drop explicit parallel make usage guests/templates/bashrc | 2 ++ jobs/autotools.yaml | 10 +++++----- jobs/defaults.yaml | 1 - projects/libvirt.yaml | 4 ++-- projects/osinfo-db.yaml | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) -- 2.17.0

2 4

[libvirt] [PATCH v2] util: Loop through all resolved addresses in virNetSocketNewListenTCP
by Olaf Hering 01 Jun '18

01 Jun '18

Currently virNetSocketNewListenTCP bails out early under the following conditions: - the hostname resolves to at least one IPv4 and at least one IPv6 address - the local interfaces have that one IPv4 address assigned, but not any of the IPv6 addresses - the local interfaces have just IPv6 link-local addresses In this case the resolver returns not only the IPv4 addresses but also IPv6. Binding the IPv6 address will obviously fail. But this terminates the entire loop, even if binding to IPv4 succeeded. To fix this error, just keep going and loop through all returned addresses. In case none of the attempts to bind to some address succeeded, try to report the appropriate error. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- v2: whitespace fixes, as suggested by John Ferlan src/rpc/virnetsocket.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 7087abec9c..60a7187348 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -382,11 +382,8 @@ int virNetSocketNewListenTCP(const char *nodename, #endif if (bind(fd, runp->ai_addr, runp->ai_addrlen) < 0) { - if (errno != EADDRINUSE) { - virReportSystemError(errno, "%s", _("Unable to bind to port")); - goto error; - } - addrInUse = true; + if (errno == EADDRINUSE) + addrInUse = true; VIR_FORCE_CLOSE(fd); runp = runp->ai_next; continue; @@ -409,14 +406,14 @@ int virNetSocketNewListenTCP(const char *nodename, fd = -1; } - if (nsocks == 0 && familyNotSupported) { - virReportSystemError(EAFNOSUPPORT, "%s", _("Unable to bind to port")); - goto error; - } - - if (nsocks == 0 && - addrInUse) { - virReportSystemError(EADDRINUSE, "%s", _("Unable to bind to port")); + if (nsocks == 0) { + if (familyNotSupported) + errno = EAFNOSUPPORT; + else if (addrInUse) + errno = EADDRINUSE; + else + errno = EDESTADDRREQ; + virReportSystemError(errno, "%s", _("Unable to bind to port")); goto error; }

2 1

[libvirt] [RFC PATCH 0/9] qemu: add vhost-vsock-pci support
by Ján Tomko 01 Jun '18

01 Jun '18

@Stefan, please take a look at the docs/ changes in patch 6 Add <interface type='vsock'>, mapping to vhost-vsock-pci Missing: hotplug support Similar to vhost-net, we cannot apply a SELinux label on the file descriptor, so an adjustment of the policy will probably be needed to make it work in enforcing mode. https://bugzilla.redhat.com/show_bug.cgi?id=1291851 Ján Tomko (9): conf: split interface target element condition qemu: prepare for missing interface model Introduce virDomainNetDefNew Add privateData to virDomainNetDef qemu: add private data for interfaces conf: add interface type vsock Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK Introduce virNetDevVsockSetGuestCid qemu: implement vhost-vsock-pci support configure.ac | 8 ++ docs/formatdomain.html.in | 15 ++++ docs/schemas/domaincommon.rng | 14 ++++ src/bhyve/bhyve_parse_command.c | 2 +- src/conf/domain_conf.c | 85 ++++++++++++++++++---- src/conf/domain_conf.h | 8 ++ src/conf/netdev_bandwidth_conf.h | 1 + src/libvirt_private.syms | 2 + src/libxl/libxl_conf.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 + src/lxc/lxc_process.c | 1 + src/openvz/openvz_conf.c | 4 +- src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 43 +++++++++-- src/qemu/qemu_domain.c | 47 ++++++++++++ src/qemu/qemu_domain.h | 13 ++++ src/qemu/qemu_domain_address.c | 6 +- src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_interface.c | 33 +++++++++ src/qemu/qemu_interface.h | 4 + src/qemu/qemu_parse_command.c | 2 +- src/qemu/qemu_process.c | 6 ++ src/uml/uml_conf.c | 5 ++ src/util/virnetdev.c | 30 ++++++++ src/util/virnetdev.h | 4 + src/vbox/vbox_common.c | 2 +- src/vmx/vmx.c | 3 +- src/xenconfig/xen_common.c | 3 +- src/xenconfig/xen_sxpr.c | 3 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + .../vhost-vsock.x86_64-latest.args | 32 ++++++++ tests/qemuxml2argvdata/vhost-vsock.xml | 36 +++++++++ tests/qemuxml2argvtest.c | 15 ++++ tests/qemuxml2xmloutdata/vhost-vsock.xml | 1 + tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 1 + 51 files changed, 425 insertions(+), 32 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/vhost-vsock.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock.xml -- 2.16.1

2 12

[libvirt] [PATCH] util: storage: remove virStorageSource->tlsVerify
by Peter Krempa 01 Jun '18

01 Jun '18

Disks are client-only so we don't need to have this variable. We also always pass false for 'isListen' to qemuBuildTLSx509BackendProps for all disk-related code-paths. --- This applies on top of my branch collecting all ACKed postings of recent blockdev-related work. Current version can be fetched by: git fetch git://pipo.sk/pipo/libvirt.git blockdev-staging src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 -- src/qemu/qemu_hotplug.c | 3 +-- src/util/virstoragefile.c | 1 - src/util/virstoragefile.h | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 26e61f26f4..c75595ca6d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -774,7 +774,7 @@ qemuBuildDiskSrcTLSx509CommandLine(virCommandPtr cmd, return 0; return qemuBuildTLSx509CommandLine(cmd, src->tlsCertdir, - false, src->tlsVerify, + false, true, NULL, src->tlsAlias, qemuCaps); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4368e9be35..873bcec50d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9928,8 +9928,6 @@ qemuProcessPrepareStorageSourceTLSVxhs(virStorageSourcePtr src, if (src->haveTLS == VIR_TRISTATE_BOOL_YES) { if (VIR_STRDUP(src->tlsCertdir, cfg->vxhsTLSx509certdir) < 0) return -1; - - src->tlsVerify = true; } return 0; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c656409eaa..2f76c048aa 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -164,8 +164,7 @@ qemuDomainAddDiskSrcTLSObject(virQEMUDriverPtr driver, if (qemuDomainGetTLSObjects(priv->qemuCaps, NULL, src->tlsCertdir, - false, - src->tlsVerify, + false, true, src->tlsAlias, &tlsProps, NULL) < 0) goto cleanup; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 54de2c1c30..10fe0f201a 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2171,7 +2171,6 @@ virStorageSourceCopy(const virStorageSource *src, ret->shared = src->shared; ret->haveTLS = src->haveTLS; ret->tlsFromConfig = src->tlsFromConfig; - ret->tlsVerify = src->tlsVerify; ret->detected = src->detected; ret->debugLevel = src->debugLevel; ret->debug = src->debug; diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1631c4cf66..4591e6e213 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -310,7 +310,6 @@ struct _virStorageSource { * certificate directory with listen and verify bools. */ char *tlsAlias; char *tlsCertdir; - bool tlsVerify; bool detected; /* true if this entry was not provided by the user */ -- 2.16.2

2 1

[libvirt] [RFC PATCH 0/9] tests: Record commands used to gather capability replies
by Peter Krempa 01 Jun '18

01 Jun '18

De-confusify the 'replies' files for human usage by recording which commands were used for gathering given block. Additionally this tests that the commands emitted by libvirt are as recorded. This series is in RFC state, since it creates some churn in the capability files and also 'tests/qemucapsfixreplies' will no longer work. Patch 8 contains the changed files for ease of review and patch 9 contains the tool used to regenerate them from the current state. Peter Krempa (9): qemu: monitor: Add possibility to reset command sequence in tests tests: qemumonitor: Simplify handling of end of file in full file test tests: qemumonitor: Optimize control flow when concatenating replies tests: qemucapsprobemock: Simplify and extract skipping of empty lines tests: qemucapsprobemock: Fail if JSON reply from qemu can't be reformatted tests: qemucapsprobemock: Prepare 'qemucapsprobe' for the new format tests: qemucapabilities: Test commands used to query capabilities FIXUP: Tweak capability files to conform to the new approach DO_NOT_APPLY: HACK: Regenerate qemucapabilitiestest data fix-files.sh | 1 + src/qemu/qemu_monitor.c | 11 + src/qemu/qemu_monitor_priv.h | 31 + tests/Makefile.am | 1 + .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 317 +++++- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 350 +++++- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../caps_2.12.0.aarch64.replies | 328 +++++- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 331 +++++- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 358 +++++- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.replies | 1173 +++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 341 +++++- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0.aarch64.replies | 319 +++++- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 306 ++++- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 346 +++++- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 322 +++++- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 342 +++++- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 1120 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- tests/qemucapabilitiestest.c | 17 +- tests/qemucapsprobemock.c | 77 +- tests/qemumonitortestutils.c | 52 +- 57 files changed, 10564 insertions(+), 385 deletions(-) create mode 100755 fix-files.sh create mode 100644 src/qemu/qemu_monitor_priv.h -- 2.16.2

1 10

[libvirt] Why does vnc show blackscreen after using mstsc to connect to a windows vm with a nvidia gpu passtrough
by Wu Zongyong 01 Jun '18

01 Jun '18

Hi, As the title says, VNC inside a windows virtual machine doesn’t work after I try to use mstsc to access the vm with a gpu passthrough. It seems that the scenario is normal, but could someone tell me something deeply about the reason why vnc shows blackscreen? Thanks.

1 0

[libvirt] Question about using cpu mode "host-model" while providing a cpu model name
by Collin Walling 01 Jun '18

01 Jun '18

Hi I have noticed something that may be misconstrued regarding the libvirt domain xml format for defining a cpu model. There seems to be a misalignment where the libvirt documentation states something that is not supported, but libvirt itself gives no clear indication of such. This is regarding the cpu mode "host-model" and providing a cpu model name between the <model> tags. >From the libvirt docs under header "CPU model and topology" paragraph "cpu" subparagraph "host-model", the following rule is defined (bolded or between asterisks): "... The match attribute can't be used in this mode. *Specifying CPU model is not supported* either, but model's fallback attribute may still be used. ..." https://libvirt.org/formatdomain.html#elementsCPU The above rule reads as "if mode is 'host-model' (and the architecture is not PowerPC) then specifying a model name should not be allowed". However, this is not the observed behavior. For example, I can define and start a guest with the following xml snippet without any issues: <cpu mode='host-model'> <model>cpu-name</model> </cpu> Which seems to contradict what the documentation states. This issue was reported by a colleague of mine who was confused by the cpu features that were available to a guest when host-model and a model name are provided. Personally, I tend to err on the side of providing host-model and a cpu-model-name being mutually exclusive. I've attempted to find a solution to this problem myself by looking at virCPUDefParseXML, but the fact that PowerPC exists as an exception and we do not know the architecture when parsing a guest cpu xml makes minimal code changes challenging. If we want to make changes to the code, then I imagine that the ideal solution would revolve around only allowing <model>cpu-name</model> to be valid iff the cpu mode is set to "custom". Otherwise some clarity on the documentation would suffice. Something like "A CPU model specified in the domain xml will be ignored." Thoughts? Thank you for your time. -- Respectfully, - Collin Walling

5 6

[libvirt] [python PATCH] Add support for virConnectBaselineHypervisorCPU
by Jiri Denemark 01 Jun '18

01 Jun '18

The python bindings for this API cannot be generated because are generator is not capable of handling string arrays (char **) parameters. https://bugzilla.redhat.com/show_bug.cgi?id=1584676 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- generator.py | 1 + libvirt-override-api.xml | 11 ++++++++ libvirt-override.c | 60 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/generator.py b/generator.py index a0fc720..b7d96a1 100755 --- a/generator.py +++ b/generator.py @@ -488,6 +488,7 @@ skip_impl = ( 'virDomainGetPerfEvents', 'virDomainSetPerfEvents', 'virDomainGetGuestVcpus', + 'virConnectBaselineHypervisorCPU', ) lxc_skip_impl = ( diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index b63a403..36d3577 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -717,5 +717,16 @@ <arg name='flags' type='unsigned int' info='extra flags; not used yet, so callers should always pass 0'/> <return type='int' info="dictionary of vcpu data returned by the guest agent"/> </function> + <function name='virConnectBaselineHypervisorCPU' file='python'> + <info>Computes the most feature-rich CPU which is compatible with all given CPUs and can be provided by the specified hypervisor.</info> + <return type='char *' info='XML description of the computed CPU or NULL on error.'/> + <arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/> + <arg name='emulator' type='const char *' info='path to the emulator binary'/> + <arg name='arch' type='const char *' info='CPU architecture'/> + <arg name='machine' type='const char *' info='machine type'/> + <arg name='virttype' type='const char *' info='virtualization type'/> + <arg name='xmlCPUs' type='const char **' info='array of XML descriptions of CPUs'/> + <arg name='flags' type='unsigned int' info='bitwise-OR of virConnectBaselineCPUFlags'/> + </function> </symbols> </api> diff --git a/libvirt-override.c b/libvirt-override.c index b4c1529..1c95c18 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -9708,6 +9708,63 @@ libvirt_virStreamRecvFlags(PyObject *self ATTRIBUTE_UNUSED, #endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ +#if LIBVIR_CHECK_VERSION(4, 4, 0) +static PyObject * +libvirt_virConnectBaselineHypervisorCPU(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + virConnectPtr conn; + PyObject *pyobj_conn; + char *emulator; + char *arch; + char *machine; + char *virttype; + PyObject *list; + unsigned int flags; + char **xmlCPUs = NULL; + int ncpus = 0; + size_t i; + char *cpu; + PyObject *ret = NULL; + + if (!PyArg_ParseTuple(args, (char *)"OzzzzOI:virConnectBaselineHypervisorCPU", + &pyobj_conn, &emulator, &arch, &machine, &virttype, + &list, &flags)) + return NULL; + + conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); + + if (PyList_Check(list)) { + ncpus = PyList_Size(list); + if (VIR_ALLOC_N(xmlCPUs, ncpus) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < ncpus; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(list, i), + &(xmlCPUs[i])) < 0 || + !xmlCPUs[i]) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + cpu = virConnectBaselineHypervisorCPU(conn, emulator, arch, machine, virttype, + (const char **)xmlCPUs, ncpus, flags); + LIBVIRT_END_ALLOW_THREADS; + + ret = libvirt_constcharPtrWrap(cpu); + + cleanup: + for (i = 0; i < ncpus; i++) + VIR_FREE(xmlCPUs[i]); + VIR_FREE(xmlCPUs); + VIR_FREE(cpu); + + return ret; +} +#endif /* LIBVIR_CHECK_VERSION(4, 4, 0) */ + + /************************************************************************ * * * The registration stuff * @@ -9941,6 +9998,9 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virStreamSendHole", libvirt_virStreamSendHole, METH_VARARGS, NULL}, {(char *) "virStreamRecvFlags", libvirt_virStreamRecvFlags, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(3, 4, 0) */ +#if LIBVIR_CHECK_VERSION(4, 4, 0) + {(char *) "virConnectBaselineHypervisorCPU", libvirt_virConnectBaselineHypervisorCPU, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(4, 4, 0) */ {NULL, NULL, 0, NULL} }; -- 2.17.0

2 1

[libvirt] [PATCH 00/13] qemu: Refactor how we handle 'object's on the monitor
by Peter Krempa 01 Jun '18

01 Jun '18

This applies on top of the tls/secret alias refactoring series I've posted earlier today: https://www.redhat.com/archives/libvir-list/2018-May/msg02174.html The main idea is to clarify the lifecycle of the objects used on the monitor and clean up the code using it. Peter Krempa (13): qemu: command: Fix name of qemuBuildMemoryBackendStr qemu: monitor: Rename qemuMonitorAddObject to qemuMonitorAddObjectType qemu: Rename virQEMUBuildObjectCommandlineFromJSON qemu: monitor: Add better APIs for adding of objects to qemu util: qemu: Introduce helper for formatting command line from new object props qemu: hotplug: Refactor PR props formatting to use qemuMonitorCreateObjectProps qemu: hotplug: Refactor RNG props formatting to use qemuMonitorCreateObjectProps qemu: hotplug: Refactor memory props formatting to qemuMonitorCreateObjectProps qemu: hotplug: Refactor shmem props formatting to qemuMonitorCreateObjectProps qemu: hotplug: Refactor tls-credential props formatting to qemuMonitorCreateObjectProps qemu: hotplug: Refactor 'secret' props formatting to qemuMonitorCreateObjectProps qemu: Convert iothread hotplug to qemuMonitorCreateObjectProps qemu: Delete old unused code for adding objects to qemu src/qemu/qemu_command.c | 300 +++++++++++++++++---------------------- src/qemu/qemu_command.h | 18 +-- src/qemu/qemu_driver.c | 14 +- src/qemu/qemu_hotplug.c | 148 +++++++------------ src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_migration_params.c | 5 +- src/qemu/qemu_monitor.c | 98 +++++++++++-- src/qemu/qemu_monitor.h | 14 +- src/qemu/qemu_monitor_json.c | 15 +- src/qemu/qemu_monitor_json.h | 2 - src/util/virqemu.c | 40 ++++-- src/util/virqemu.h | 5 +- 12 files changed, 336 insertions(+), 326 deletions(-) -- 2.16.2

2 26

[libvirt] [PATCH v3 0/4] capabilities: Provide info about host IOMMU
by Filip Alac 01 Jun '18

01 Jun '18

Filip Alac (4): virutil: Introduce virHostHasIOMMU qemu: hostdev: Refactor code capabilities: Extend capabilities with iommu_support docs: news: Explain iommu_support improvement docs/news.xml | 8 +++++ docs/schemas/capability.rng | 13 +++++++++ src/conf/capabilities.c | 9 ++++++ src/conf/capabilities.h | 3 ++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_hostdev.c | 29 +++---------------- src/test/test_driver.c | 2 ++ src/util/virutil.c | 28 ++++++++++++++++++ src/util/virutil.h | 2 ++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 1 + .../nodisksnapshot_1.6.0-1.xml | 1 + .../vircaps2xmldata/vircaps-aarch64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-basic.xml | 1 + .../vircaps2xmldata/vircaps-x86_64-caches.xml | 1 + .../vircaps-x86_64-resctrl-cdp.xml | 1 + .../vircaps-x86_64-resctrl-skx-twocaches.xml | 1 + .../vircaps-x86_64-resctrl-skx.xml | 1 + .../vircaps-x86_64-resctrl.xml | 1 + 19 files changed, 83 insertions(+), 25 deletions(-) -- 2.17.0

2 7

[libvirt] [PATCH] qemu: hotplug: Fix detach of disk with managed persistent reservations
by Peter Krempa 31 May '18

31 May '18

In commit 8bebb2b735d I've refactored how the detach of disk with a managed persistent reservations object is handled. After the commit if any disk with a managed PR object would be removed libvirt would also attempt to remove the shared 'pr-manager-helper' object potentially used by other disks. Thankfully this should not have practical impact as qemu should reject deletion of the object if it was still used and the rest of the code is correct. Fix this by removing the disk from the definition earlier and checking if the shared/managed pr-manager-helper object is still needed. This basically splits the detach code for the managed PR object from the unmanaged ones. The same separation will follow for the attachment code as well as it greatly simplifies -blockdev support for this. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_hotplug.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b4bbe62c75..a14281203a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3839,6 +3839,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, char *drivestr; char *objAlias = NULL; char *encAlias = NULL; + bool prManaged = priv->prDaemonRunning; + bool prUsed = false; VIR_DEBUG("Removing disk %s from domain %p %s", disk->info.alias, vm, vm->def->name); @@ -3876,6 +3878,16 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, } } + for (i = 0; i < vm->def->ndisks; i++) { + if (vm->def->disks[i] == disk) { + virDomainDiskRemove(vm->def, i); + break; + } + } + + /* check if the last disk with managed PR was just removed */ + prUsed = virDomainDefHasManagedPR(vm->def); + qemuDomainObjEnterMonitor(driver, vm); qemuMonitorDriveDel(priv->mon, drivestr); @@ -3892,12 +3904,16 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, VIR_FREE(encAlias); /* If it fails, then so be it - it was a best shot */ - if (disk->src->pr) + if (disk->src->pr && + !virStoragePRDefIsManaged(disk->src->pr)) ignore_value(qemuMonitorDelObject(priv->mon, disk->src->pr->mgralias)); if (disk->src->haveTLS) ignore_value(qemuMonitorDelObject(priv->mon, disk->src->tlsAlias)); + if (prManaged && !prUsed) + ignore_value(qemuMonitorDelObject(priv->mon, qemuDomainGetManagedPRAlias())); + if (qemuDomainObjExitMonitor(driver, vm) < 0) return -1; @@ -3906,16 +3922,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, event = virDomainEventDeviceRemovedNewFromObj(vm, disk->info.alias); qemuDomainEventQueue(driver, event); - for (i = 0; i < vm->def->ndisks; i++) { - if (vm->def->disks[i] == disk) { - virDomainDiskRemove(vm->def, i); - break; - } - } - - /* check if the last disk with managed PR was just removed */ - if (priv->prDaemonRunning && - !virDomainDefHasManagedPR(vm->def)) + if (prManaged && !prUsed) qemuProcessKillManagedPRDaemon(vm); qemuDomainReleaseDeviceAddress(vm, &disk->info, src); -- 2.16.2

2 1

[libvirt] [RFC 0/4] add automatic cleanup functionality in some files
by Sukrit Bhatnagar 31 May '18

31 May '18

This series of patches aim at augmenting our discussion about the design for implementing the cleanup attribute. A set of macros have been added at the end of viralloc.h A few files have been modified to use the newly created macros. Sukrit Bhatnagar (4): add macros for implementing automatic cleanup functionality add automatic cleanup support in src/util/virarptable.c add automatic cleanup support in src/util/virauthconfig.c add automatic cleanup support in src/util/virauth.c src/util/viralloc.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++ src/util/virarptable.c | 9 ++----- src/util/virauth.c | 66 +++++++++++++++++---------------------------- src/util/virauthconfig.c | 34 +++++++++--------------- src/util/virauthconfig.h | 3 +++ 5 files changed, 110 insertions(+), 71 deletions(-) -- 1.8.3.1

3 10

[libvirt] ANNOUNCE: virt-bootstrap 1.1.0 released
by Cedric Bosdonnat 31 May '18

31 May '18

I'm happy to announce the release of virt-bootstrap 1.1.0! virt-bootstrap is a tool providing an easy way to setup the root file system for libvirt-based containers. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - safe_untar: check for permissions to set attribs (Radostin Stoyanov) - docker source, support blobs without .tar extension (Radostin Stoyanov) - docker-source, preserve extended file attributes (Radostin Stoyanov) - docker-source, get list of layers without `--raw` (Radostin Stoyanov) - docker-source, void skopeo copy in cache (Radostin Stoyanov) - Show error when guestfs-python or skopeo is not installed (Radostin Stoyanov) - pylint cleanups (Radostin Stoyanov) Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, -- Cédric

1 0

[libvirt] [PATCH] testUpdateQEMUCaps: Don't leak host cpuData
by Michal Privoznik 31 May '18

31 May '18

When preparing qemuCaps for test cases the following is happening: qemuTestParseCapabilitiesArch() is called, which calls virQEMUCapsLoadCache() which in turn calls virQEMUCapsInitHostCPUModel() which sets qemuCaps->kvmCPU and qemuCaps->tcgCPU. But then the code tries to update the capabilities: testCompareXMLToArgv() calls testUpdateQEMUCaps() which calls virQEMUCapsInitHostCPUModel() again overwriting previously allocated memory. The solution is to free host cpuData in testUpdateQEMUCaps(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Technically this is v2 of [1] but since it implements completely different approach I'm sending it as v1. 1: https://www.redhat.com/archives/libvir-list/2018-May/msg02260.html src/qemu/qemu_capabilities.c | 21 +++++++++++++++++++-- src/qemu/qemu_capspriv.h | 4 ++++ tests/qemuxml2argvtest.c | 3 +++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e2e76e4dd8..ea1ff520d8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1516,12 +1516,19 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst, static void -virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData) +virQEMUCapsHostCPUDataClearHostCPU(virQEMUCapsHostCPUDataPtr cpuData) { - qemuMonitorCPUModelInfoFree(cpuData->info); virCPUDefFree(cpuData->reported); virCPUDefFree(cpuData->migratable); virCPUDefFree(cpuData->full); +} + + +static void +virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData) +{ + qemuMonitorCPUModelInfoFree(cpuData->info); + virQEMUCapsHostCPUDataClearHostCPU(cpuData); memset(cpuData, 0, sizeof(*cpuData)); } @@ -2834,6 +2841,16 @@ virQEMUCapsNewHostCPUModel(void) } +void +virQEMUCapsFreeHostCPUModel(virQEMUCapsPtr qemuCaps, + virDomainVirtType type) +{ + virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type); + + virQEMUCapsHostCPUDataClearHostCPU(cpuData); +} + + void virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virArch hostArch, diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 0199501c93..fea039ef3a 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -56,6 +56,10 @@ void virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps, virArch arch); +void +virQEMUCapsFreeHostCPUModel(virQEMUCapsPtr qemuCaps, + virDomainVirtType type); + void virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virArch hostArch, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a6a40e273e..61c7ae59aa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -388,6 +388,9 @@ testUpdateQEMUCaps(const struct testInfo *info, if (testAddCPUModels(info->qemuCaps, info->skipLegacyCPUs) < 0) goto cleanup; + virQEMUCapsFreeHostCPUModel(info->qemuCaps, VIR_DOMAIN_VIRT_KVM); + virQEMUCapsFreeHostCPUModel(info->qemuCaps, VIR_DOMAIN_VIRT_QEMU); + virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, VIR_DOMAIN_VIRT_KVM); virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch, -- 2.16.4

2 1

[libvirt] [PATCH v2 0/5] qemu: Forbid old qcow/qcow2 encryption
by Peter Krempa 31 May '18

31 May '18

The old qcow/qcow2 encryption format is so broken that qemu decided to drop it completely. This series forbids the use of such images even with qemus prior to this and removes all the cruft necessary to support it. v2: - fixed check to include the qcow format too - reworded the error message slightly - split second patch into two with proper justification for the user-alias test since checking LUKS there actually makes sense Peter Krempa (5): tests: qemuxml2argv: Drop disk encryption from 'interface-server' test tests: qemuxml2argv: Verify that disk secret alias is correct with user-aliases tests: qemublock: Switch to qcow2+luks in test files qemu: domain: Forbid storage with old QCOW2 encryption qemu: Remove code for setting up disk passphrases src/qemu/qemu_domain.c | 10 ++ src/qemu/qemu_monitor.c | 13 --- src/qemu/qemu_monitor.h | 4 - src/qemu/qemu_monitor_json.c | 28 ------ src/qemu/qemu_monitor_json.h | 4 - src/qemu/qemu_process.c | 103 --------------------- .../file-qcow2-backing-chain-encryption.json | 2 +- .../file-qcow2-backing-chain-encryption.xml | 2 +- ...etwork-qcow2-backing-chain-encryption_auth.json | 2 +- ...network-qcow2-backing-chain-encryption_auth.xml | 2 +- tests/qemumonitorjsontest.c | 2 - tests/qemuxml2argvdata/encrypted-disk-usage.args | 8 +- tests/qemuxml2argvdata/encrypted-disk-usage.xml | 2 +- tests/qemuxml2argvdata/encrypted-disk.args | 8 +- tests/qemuxml2argvdata/encrypted-disk.xml | 2 +- tests/qemuxml2argvdata/interface-server.xml | 3 - tests/qemuxml2argvdata/user-aliases.args | 8 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- tests/qemuxml2argvtest.c | 7 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 2 +- tests/qemuxml2xmloutdata/interface-server.xml | 3 - tests/qemuxml2xmltest.c | 6 +- 22 files changed, 46 insertions(+), 177 deletions(-) -- 2.16.2

3 14

[libvirt] [PATCH 00/38] qemu: Refactor secret/TLS setup and add TLS for nbd
by Peter Krempa 31 May '18

31 May '18

This series consists of the following changes: 1) refactors to handling of the TLS object and secret alias 2) storage of 'secret' object aliases in the status XML 3) fix of disk-unplug with TLS after libvirtd restart 4) Adding support for TLS for NBD disks (originally used to reproduce problem with detach of TLS object after libvirtd restart) Few parts could be considered separate but since the end of the series builds up on the various pieces it would be very unpleasant to post separately. Peter Krempa (38): qemu: domain: Add helper to check if encrypted secrets can be used with a VM qemu: domain: Reuse code when preparing hostdev auth secrets qemu: domain: Rename qemuDomainSecretDiskCapable qemu: domain: Rename and fix docs for qemuDomainSecretInfoNew qemu: domain: Add new function to set up encrypted secrets only qemu: domain: Setup disk encryption password secret via new helper qemu: domain: Use qemuDomainSecretInfoNewPlain only for unencrypted secrets qemu: domain: Add helpers for partially clearing qemuDomainSecretInfoPtr qemu: domain: Don't delete aliases of secret objects associated with disks qemu: Store and parse disk authentication and encryption secret alias tests: qemustatusxml2xml: Add test data for re-generating LUKS/auth aliases qemu: domain: Regenerate auth/enc secret aliases when restoring status XML qemu: hotplug: Don't try to infer secret object alias/presence qemu: hotplug: Use 'tlsAlias' to see whether to detach the disk qemu: domain: Store and restore TLS object alias of a disk qemu: domain: Regenerate alias for the TLS x509 credential object qemu: domain: Properly setup data relevant for top disk image qemu: domain: don't loop through images in qemuDomainPrepareDiskSourceChain qemu: domain: Split validation and setup of the virStorageSource qemu: domain: aggregate setup of disk drive options for -drive qemu: domain: Separate setup of TLS for VXHS disks from qemuDomainPrepareDiskSourceTLS qemu: domain: Use switch statement in qemuDomainPrepareDiskSourceTLS qemu: domain: Process only one object in qemuDomainPrepareDiskSourceTLS qemu: domain: Forbid TLS setup for disk protocols not supporting it conf: Don't encode matrix of storage protocols supporting TLS in the parser qemu: hotplug: Don't mandate passing of 'secAlias' in qemuDomainGetTLSObjects qemu: hotplug: Allow passing in NULL 'tlsAlias' to qemuDomainGetTLSObjects qemu: domain: Set up disk TLS alias when preparing TLS setup qemu: command: Don't generate alias for TLS private key password secret qemu: command: Pass in alias for TLS object to qemuBuildTLSx509CommandLine qemu: command: Always setup TLS environment if src->haveTLS is on qemu: migration: Don't pass around secAlias qemu: hotplug: Pass around existing secret object alias from qemuDomainAddChardevTLSObjects qemu: hotplug: Remove misleading comment in qemuDomainGetTLSObjects qemu: hotplug: Drop 'secAlias' output parameter from qemuDomainGetTLSObjects qemu: hotplug: Remove TLS alias generation from qemuDomainGetTLSObjects tests: qemu: Rename disk-drive-network-tlsx509-vxhs test qemu: domain: Add support for TLS for NBD with default TLS env docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 14 +- src/qemu/qemu_command.c | 75 ++- src/qemu/qemu_domain.c | 658 +++++++++++++++------ src/qemu/qemu_domain.h | 20 +- src/qemu/qemu_hotplug.c | 95 ++- src/qemu/qemu_hotplug.h | 5 +- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_migration_params.c | 23 +- src/qemu/qemu_migration_params.h | 1 - tests/qemublocktest.c | 9 +- .../disk-secinfo-upgrade-in.xml | 517 ++++++++++++++++ .../disk-secinfo-upgrade-out.xml | 538 +++++++++++++++++ tests/qemustatusxml2xmldata/modern-in.xml | 5 + ...9-vxhs.args => disk-drive-network-tlsx509.args} | 9 +- ...509-vxhs.xml => disk-drive-network-tlsx509.xml} | 8 + tests/qemuxml2argvtest.c | 4 +- ...509-vxhs.xml => disk-drive-network-tlsx509.xml} | 8 + tests/qemuxml2xmltest.c | 3 +- 19 files changed, 1663 insertions(+), 342 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/disk-secinfo-upgrade-in.xml create mode 100644 tests/qemustatusxml2xmldata/disk-secinfo-upgrade-out.xml rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509-vxhs.args => disk-drive-network-tlsx509.args} (82%) rename tests/qemuxml2argvdata/{disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} (85%) rename tests/qemuxml2xmloutdata/{disk-drive-network-tlsx509-vxhs.xml => disk-drive-network-tlsx509.xml} (86%) -- 2.16.2

3 89

[libvirt] [PATCH] audit: Enforce enum switch type cast in virDomainAuditHostdev
by Erik Skultety 31 May '18

31 May '18

There was a missing enum for mdev causing a strange 'unknown device type' warning when hot-plugging mdev. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1583927 Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/conf/domain_audit.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 82868bca76..14138d93af 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -361,6 +361,7 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, virDomainHostdevSubsysPCIPtr pcisrc = &hostdev->source.subsys.u.pci; virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi; virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host; + virDomainHostdevSubsysMediatedDevPtr mdevsrc = &hostdev->source.subsys.u.mdev; virUUIDFormat(vm->def->uuid, uuidstr); if (!(vmname = virAuditEncode("vm", vm->def->name))) { @@ -373,9 +374,9 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, virt = "?"; } - switch (hostdev->mode) { + switch ((virDomainHostdevMode) hostdev->mode) { case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS: - switch (hostdev->source.subsys.type) { + switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) { case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: if (virAsprintfQuiet(&address, "%.4x:%.2x:%.2x.%.1x", pcisrc->addr.domain, @@ -419,6 +420,13 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, goto cleanup; } break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: + if (VIR_STRDUP_QUIET(address, mdevsrc->uuidstr) < 0) { + VIR_WARN("OOM while enconding audit message"); + goto cleanup; + } + break; + case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: default: VIR_WARN("Unexpected hostdev type while encoding audit message: %d", hostdev->source.subsys.type); @@ -470,6 +478,7 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev, } break; + case VIR_DOMAIN_HOSTDEV_MODE_LAST: default: VIR_WARN("Unexpected hostdev mode while encoding audit message: %d", hostdev->mode); -- 2.14.3

3 5

[libvirt] [PATCH 1/1] conf: fixup USB input bus check
by Xiao Feng Ren 31 May '18

31 May '18

This patch fixes the USB input bus check, the bug was introduced by commit 317badb Signed-off-by: Xiao Feng Ren <renxiaof(a)linux.vnet.ibm.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 27e2bd50eb..e4d39c06e8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -27878,7 +27878,7 @@ virDomainDeviceIsUSB(virDomainDeviceDefPtr dev) if ((t == VIR_DOMAIN_DEVICE_DISK && dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) || (t == VIR_DOMAIN_DEVICE_INPUT && - dev->data.input->type == VIR_DOMAIN_INPUT_BUS_USB) || + dev->data.input->bus == VIR_DOMAIN_INPUT_BUS_USB) || (t == VIR_DOMAIN_DEVICE_HOSTDEV && dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && dev->data.hostdev->source.subsys.type == -- 2.16.3

2 1

[libvirt] [PATCH 0/3] Fix more memory leaks
by Michal Privoznik 31 May '18

31 May '18

Ideally, these would be merged before the release. But I don't have strong opinion on that. Michal Privoznik (3): virDomainDefParseXML: Free @tmp when parsing genid qemuxml2argvtest: Don't initialize qemuCaps twice virQEMUCapsSetHostModel: Free cpuData before setting it src/conf/domain_conf.c | 1 + src/qemu/qemu_capabilities.c | 4 ++++ tests/qemuxml2argvtest.c | 2 -- 3 files changed, 5 insertions(+), 2 deletions(-) -- 2.16.1

3 13

[libvirt] [PATCH 0/1] bug: fixup USB input bus check
by Xiao Feng Ren 31 May '18

31 May '18

There's one explicit bug(introduced in commit:317badb) when checking the bus of one input device is USB. Let's fix it. Xiao Feng Ren (1): Fixup USB input bus check src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.16.3

2 3

[libvirt] What is the strategy to update the CPU Models in src/cpu/cpu_map.xml based on?
by Dou Liyang 31 May '18

31 May '18

Hi All, I am not sure about the update strategy of CPU models in libvirt. IMO, It's depend on the CPU model in qemu-kvm, if some CPU models were updated in qemu-kvm. Then, we should modify the src/cpu/cpu_map.xml of libvirt to synchronize? eg: commit cad8054ece28("cpu: Add cpu definition for Intel Sandy Bridge cpu type") in libvirt upstream. https://bugzilla.redhat.com/show_bug.cgi?id=761005 If it's right, I found this commit b3a4f0b1a072("target-i386: add VME to all CPUs") updated the VME feature in qemu upstream. But in the src/cpu /cpu_map.xml of libvirt, It didn't be updated. eg: For the SandyBridge CPU, - In QEmu, it has the 'vme' feature defined by CPUID_VME - In libvirt, it doesn't has the 'vme' in cpu_map.xml file. Why? Thanks, dou

3 9

Re: [libvirt] What is the strategy to update the CPU Models in src/cpu/cpu_map.xml based on?
by Peter Krempa 31 May '18

31 May '18

[re-adding libvir-list] On Wed, May 30, 2018 at 19:36:10 +0800, Dou Liyang wrote: > Hi Peter, > > Sorry to trouble you offline. Please keep conversations on the list, so that it does not get lost in private inboxes. > Recently, I forced on the PCID feature in CPU and > found the SandyBridge didn't include the PCID feature > in libvirt. > > commit cad8054ece285d1712880cd108e8a39f833f7e88 > Author: Peter Krempa <pkrempa(a)redhat.com> > Date: Wed Feb 8 12:43:07 2012 +0100 > > cpu: Add cpu definition for Intel Sandy Bridge cpu type > > I knew the SandyBridge CPU models in QEMU also > didn't include the PCID feature. > > I want to know: > > - If we can't make sure PCID was supported in all SandyBridge? > - If we avoided PCID definition intentionally ? > - If we forgot to add it, and need to be fixed? Qemu added it later than libvirt added the sandy-bridge cpu: commit 434acb817b8ae747f31e91ec152f9f47ac514433 Author: Mao, Junjie <junjie.mao(a)intel.com> Date: Fri Jul 20 07:08:21 2012 +0000 Recognize PCID feature This patch makes Qemu recognize the PCID feature specified from configuration or command line options. Jiri Denemark already covered why we can't/will not change existing models in cpu_map.xml > > Thanks, > dou

3 3

[libvirt] [PATCH 0/5] storage: implement a skeleton for volume events.
by Julio Faracco 31 May '18

31 May '18

The series add a skeleton for a lifecycle event (and other events in the future) for volumes to cover actions like create and delete. Others events can be added in the future, but the storage driver has some functions to support it. Related: https://bugzilla.redhat.com/show_bug.cgi?id=1578836 Julio Faracco (5): storage: adding a skeleton for libvirt volume events. driver: adding two new driver functions to support volume events. conf: implementing some functions to generate volume events. virsh: implementing 'vol-event' command. examples: adding volume events into event-test example. examples/object-events/event-test.c | 65 ++++++++++ include/libvirt/libvirt-storage.h | 86 +++++++++++++ src/conf/storage_event.c | 155 ++++++++++++++++++++++ src/conf/storage_event.h | 19 +++ src/driver-storage.h | 13 ++ src/libvirt-storage.c | 125 ++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 6 + tools/virsh-completer.c | 27 ++++ tools/virsh-completer.h | 4 + tools/virsh-volume.c | 192 ++++++++++++++++++++++++++++ tools/virsh-volume.h | 8 ++ 12 files changed, 702 insertions(+) -- 2.17.0

3 7

[libvirt] [PATCH 0/2] qemu: block: Add more tests and support for pr-manager
by Peter Krempa 31 May '18

31 May '18

Note that patch 1 can be applied only with the series adding TLS support for NBD. Patch 2 is independent. Peter Krempa (2): tests: qemublock: Test NBD with TLS qemu: block: Add support for 'pr-manager' in qemuBlockStorageSourceGetFileProps src/qemu/qemu_block.c | 5 +++++ tests/qemublocktest.c | 2 ++ .../xml2json/block-raw-reservations.json | 14 ++++++++++++++ .../xml2json/block-raw-reservations.xml | 14 ++++++++++++++ .../qemublocktestdata/xml2json/network-nbd-tls.json | 20 ++++++++++++++++++++ tests/qemublocktestdata/xml2json/network-nbd-tls.xml | 18 ++++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 tests/qemublocktestdata/xml2json/block-raw-reservations.json create mode 100644 tests/qemublocktestdata/xml2json/block-raw-reservations.xml create mode 100644 tests/qemublocktestdata/xml2json/network-nbd-tls.json create mode 100644 tests/qemublocktestdata/xml2json/network-nbd-tls.xml -- 2.16.2

2 4

[libvirt] [PATCH 0/2] Trivial memory leak fixes
by Ján Tomko 31 May '18

31 May '18

Hopefully pushed as trivial by the time you're reading this message. Ján Tomko (2): qemu: free migEvent in qemuMigrationCapsCheck conf: fix vsock memory leaks src/conf/domain_conf.c | 2 ++ src/qemu/qemu_migration_params.c | 1 + 2 files changed, 3 insertions(+) -- 2.16.1

2 4

[libvirt] [PATCH] vmx: Remove check that numvcpus has to be an even number.
by Richard W.M. Jones 30 May '18

30 May '18

This patch removes what appears to be an unnecessary check in the VMX driver which is preventing us from importing guests that have an odd number of vCPUs with virt-v2v. Unfortunately to test this it seems you need a real VMware server somewhere (substitute for ‘example.com’ below). Download the VMX file attached to https://bugzilla.redhat.com/show_bug.cgi?id=1584091 $ virsh -c 'esx://example.com' domxml-from-native vmware-vmx window2016.vmx Enter root's password for example.com: error: internal error: Expecting VMX entry 'numvcpus' to be an unsigned integer (1 or a multiple of 2) but found 7 After applying the patch: $ ~/d/libvirt/run ~/d/libvirt/tools/virsh -c 'esx://example.com' domxml-from-native vmware-vmx window2016.vmx Enter root's password for example.com: <domain type='vmware'> ... <cpu> <topology sockets='1' cores='7' threads='1'/> ... Rich.

3 3

[libvirt] [PATCH] spec: Fix permissions of nwfilter XMLs
by Jiri Denemark 30 May '18

30 May '18

The nwfilter XMLs in /etc are defined as %ghost in the spec file, which means rpm will not install them, but it will record its existence and permissions in the database. During installation the files are copied in a %post scriptlet from /usr/share/libvirt/nwfilter, but once libvirtd is restarted, it will rewrite the files to add generated UUIDs. While RPM recorded 644 mode for the XMLs, libvirt saves them with 600 and thus any future attempt to verify the libvirt-daemon-config-nwfilter package would fail. We need to tell RPM the ghost files are supposed to have 600 permissions. https://bugzilla.redhat.com/show_bug.cgi?id=1559284 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5e1e1df3f0..17d5d4dff7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1369,6 +1369,8 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \ $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/ +# libvirt saves these files with mode 600 +chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml -- 2.17.0

2 1

[libvirt] [PATCH] tests: initialize some variables
by Ján Tomko 30 May '18

30 May '18

Found by cppcheck: [tests/metadatatest.c:284]: (error) Uninitialized variable: test [tests/objecteventtest.c:855]: (error) Uninitialized variable: test Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- tests/metadatatest.c | 2 +- tests/objecteventtest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/metadatatest.c b/tests/metadatatest.c index d5a6f37119..b17a85c883 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -268,7 +268,7 @@ testTextMetadata(const void *data) static int mymain(void) { - struct metadataTest test; + struct metadataTest test = { 0 }; int ret = EXIT_SUCCESS; if (!(test.conn = virConnectOpen("test:///default"))) diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 4b12572eb4..e6de11ec39 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -835,7 +835,7 @@ timeout(int id ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) static int mymain(void) { - objecteventTest test; + objecteventTest test = { 0 }; int ret = EXIT_SUCCESS; int timer; -- 2.16.1

2 1

[libvirt] [PATCH] storage: Add specific check for LUKS encryption support
by John Ferlan 30 May '18

30 May '18

Modify virStorageBackendLogicalLVCreate to ensure if encryption is requested that only type LUKS is supported; otherwise, error. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_logical.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index edd4971f1f..67ca7f514d 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -938,6 +938,13 @@ virStorageBackendLogicalLVCreate(virStorageVolDefPtr vol, unsigned long long capacity = vol->target.capacity; virCommandPtr cmd = NULL; + if (vol->target.encryption && + vol->target.encryption->format != VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("storage pool only supports LUKS encrypted volumes")); + return -1; + } + cmd = virCommandNewArgList(LVCREATE, "--name", vol->name, NULL); @@ -953,8 +960,7 @@ virStorageBackendLogicalLVCreate(virStorageVolDefPtr vol, /* If we're going to encrypt using LUKS, then we could need up to * an extra 2MB for the LUKS header - so account for that now */ - if (vol->target.encryption && - vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) + if (vol->target.encryption) capacity += 2 * 1024 * 1024; virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(capacity, 1024)); -- 2.14.3

2 1