- Devel - libvirt List Archives

[libvirt] [PATCH 0/8] Fix some issues with rng grammar for output XML's
by John Ferlan 21 May '18

21 May '18

The storagevol, capability, and nodedev output grammar files had some issues. Details noted in each patch. John Ferlan (8): schema: Add physical sizing grammer for storagevol grammar schema: Remove xenmigr from host migrate transport capability schema,tests: Use vpxmigr for host migrate transport capability schema: Add rdma for host migrate transport capability schema: Add vzmigr for host migrate transport capability schema: Add microcode to capability grammar schema: Fix capability grammar for pagesElem schema: Add missing block data for nodedev docs/schemas/capability.rng | 42 +++++++++++++++++++++++++++++------------- docs/schemas/nodedev.rng | 13 +++++++++++++ docs/schemas/storagevol.rng | 5 +++++ tests/vmx2xmltest.c | 2 +- 4 files changed, 48 insertions(+), 14 deletions(-) -- 2.14.3

2 9

[libvirt] [PATCH] spec: Fix build without QEMU
by Jiri Denemark 21 May '18

21 May '18

libvirt_qemu_probes.stp is only generated when QEMU driver is enabled. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 9ea5e6b32a..0e4a84c98c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1412,8 +1412,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} libvirt-docs %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp + + %if %{with_qemu} mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp + %endif %endif %check @@ -1994,8 +1997,10 @@ exit 0 %{_bindir}/virt-host-validate %{_datadir}/systemtap/tapset/libvirt_probes*.stp -%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp %{_datadir}/systemtap/tapset/libvirt_functions.stp +%if %{with_qemu} +%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp +%endif %if %{with_bash_completion} %{_datadir}/bash-completion/completions/virsh -- 2.17.0

2 1

[libvirt] [PATCH] Remove type_sep parameter from qemuBuildHostNetStr
by Ján Tomko 18 May '18

18 May '18

The last caller not passing a comma was removed by: commit ad8a7c4f8599bd58608500a72cdfec18a6bf2318 Author: Ján Tomko <jtomko(a)redhat.com> CommitDate: 2018-04-12 17:17:16 +0200 qemu: deprecate QEMU_CAPS_NETDEV Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_command.c | 28 +++++++++++----------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f3724a766b..9da2d609e8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3546,7 +3546,6 @@ qemuBuildNicDevStr(virDomainDefPtr def, char * qemuBuildHostNetStr(virDomainNetDefPtr net, virQEMUDriverPtr driver, - char type_sep, int vlan, char **tapfd, size_t tapfdSize, @@ -3578,7 +3577,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_ETHERNET: - virBufferAsprintf(&buf, "tap%c", type_sep); + virBufferAddLit(&buf, "tap,"); /* for one tapfd 'fd=' shall be used, * for more than one 'fds=' is the right choice */ if (tapfdSize == 1) { @@ -3596,30 +3595,26 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "socket%cconnect=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,connect=%s:%d,", net->data.socket.address, net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_SERVER: - virBufferAsprintf(&buf, "socket%clisten=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,listen=%s:%d,", net->data.socket.address ? net->data.socket.address : "", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_MCAST: - virBufferAsprintf(&buf, "socket%cmcast=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,mcast=%s:%d,", net->data.socket.address, net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_UDP: - virBufferAsprintf(&buf, "socket%cudp=%s:%d,localaddr=%s:%d,", - type_sep, + virBufferAsprintf(&buf, "socket,udp=%s:%d,localaddr=%s:%d,", net->data.socket.address, net->data.socket.port, net->data.socket.localaddr, @@ -3627,7 +3622,7 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_USER: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); for (i = 0; i < net->guestIP.nips; i++) { const virNetDevIPAddr *ip = net->guestIP.ips[i]; const char *prefix = ""; @@ -3649,12 +3644,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_INTERNAL: - virBufferAsprintf(&buf, "user%c", type_sep); + virBufferAddLit(&buf, "user,"); break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: - virBufferAsprintf(&buf, "vhost-user%cchardev=char%s,", - type_sep, + virBufferAsprintf(&buf, "vhost-user,chardev=char%s,", net->info.alias); if (net->driver.virtio.queues > 1) virBufferAsprintf(&buf, "queues=%u,", @@ -8086,7 +8080,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, } if (!(netdev = qemuBuildHostNetStr(net, driver, - ',', -1, + -1, NULL, 0, NULL, 0))) goto error; @@ -8387,7 +8381,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, if (qemuDomainSupportsNicdev(def, net)) { if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; @@ -8403,7 +8397,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-net", nic, NULL); if (!(host = qemuBuildHostNetStr(net, driver, - ',', vlan, + vlan, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 28bc33558b..bbbf152660 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -80,7 +80,6 @@ qemuBuildChrDeviceStr(char **deviceStr, /* With vlan == -1, use netdev syntax, else old hostnet */ char *qemuBuildHostNetStr(virDomainNetDefPtr net, virQEMUDriverPtr driver, - char type_sep, int vlan, char **tapfd, size_t tapfdSize, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 1933a966e5..b35594be5f 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1120,7 +1120,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } if (!(netstr = qemuBuildHostNetStr(net, driver, - ',', -1, + -1, tapfdName, tapfdSize, vhostfdName, vhostfdSize))) goto cleanup; -- 2.16.1

2 1

[libvirt] [PATCH] qemu: include kernel version in QEMU log file
by Daniel P. Berrangé 18 May '18

18 May '18

We currently print the libvirt and qemu version strings into the per-guest logfile. It would be useful to know what kernel is running too, so add that. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_process.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5b73a61962..174d932ae7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -32,6 +32,8 @@ # include <sys/cpuset.h> #endif +#include <sys/utsname.h> + #include "qemu_process.h" #include "qemu_processpriv.h" #include "qemu_alias.h" @@ -4283,17 +4285,21 @@ qemuLogOperation(virDomainObjPtr vm, int qemuVersion = virQEMUCapsGetVersion(priv->qemuCaps); const char *package = virQEMUCapsGetPackage(priv->qemuCaps); char *hostname = virGetHostname(); + struct utsname uts; + + uname(&uts); if ((timestamp = virTimeStringNow()) == NULL) goto cleanup; if (qemuDomainLogContextWrite(logCtxt, - "%s: %s %s, qemu version: %d.%d.%d%s, hostname: %s\n", + "%s: %s %s, qemu version: %d.%d.%d%s, kernel: %s, hostname: %s\n", timestamp, msg, VIR_LOG_VERSION_STRING, (qemuVersion / 1000000) % 1000, (qemuVersion / 1000) % 1000, qemuVersion % 1000, package ? package : "", + uts.release, hostname ? hostname : "") < 0) goto cleanup; -- 2.17.0

3 3

[libvirt] [PATCH] set default seccompSandbox as 0 for qemu
by zhenwei pi 18 May '18

18 May '18

start qemu fail : qemu-system-x86_64: -sandbox on,obsolete=deny, elevateprivileges=deny,spawn=deny,resourcecontrol=deny: seccomp support is disabled libvirt version : 4.3 qemu version : 2.12 reproducer : recompile qemu with ./configure --disable-seccomp, or remove libseccomp package. with default seccompSandbox -1, libvirt try to get config from qemu cmdline. if qemu disables seccomp (or misses seccomp package), qemu still reports sandbox help message. libvirt mistakens about qemu real capability. set default seccompSandbox as 0 in code, and still get user conf from qemu.conf. if user wants to enable seccomp, he should check qemu firstly, then use the right qemu.conf. Signed-off-by: zhenwei pi <zhenwei.pi(a)youruncloud.com> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 277ab83..d17b4b1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -313,7 +313,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->keepAliveInterval = 5; cfg->keepAliveCount = 5; - cfg->seccompSandbox = -1; + cfg->seccompSandbox = 0; cfg->logTimestamp = true; cfg->glusterDebugLevel = 4; -- 2.7.4

2 2

[libvirt] [PATCH v1] Loop through all resolved addresses in virNetSocketNewListenTCP
by Olaf Hering 18 May '18

18 May '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 addreses 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> --- 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..0ee5e3604f 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 3

[libvirt] [PATCH] qemu: Add support for -device hda-output (disable line-in)
by Filip Alac 17 May '18

17 May '18

Add support for hda 'output' codec for ich6 and ich9 sound devices, which allow us to disable line-in for guest. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1126641 Signed-off-by: Filip Alac <filipalac(a)gmail.com> --- docs/formatdomain.html.in | 5 +++-- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 5 ++++- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.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.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.7.0.x86_64.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.x86_64.xml | 1 + tests/qemustatusxml2xmldata/migration-in-params-in.xml | 1 + tests/qemustatusxml2xmldata/migration-out-nbd-in.xml | 1 + tests/qemustatusxml2xmldata/migration-out-nbd-out.xml | 1 + tests/qemustatusxml2xmldata/migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 1 + tests/qemuxml2argvdata/sound-device.args | 2 ++ tests/qemuxml2argvdata/sound-device.xml | 2 ++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 2 ++ 35 files changed, 45 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d0fd3b9..8ab45e1c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -7388,8 +7388,9 @@ qemu-kvm -net nic,model=? /dev/null sub-elements <code><codec></code> to attach various audio codecs to the audio device. If not specified, a default codec will be attached to allow playback and recording. Valid values - are 'duplex' (advertise a line-in and a line-out) and 'micro' - (advertise a speaker and a microphone). + are 'duplex' (advertise a line-in and a line-out), 'micro' + (advertise a speaker and a microphone) and 'output' + (advertise a speaker). </p> <pre> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 71ac3d07..f16e1573 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3824,6 +3824,7 @@ <choice> <value>duplex</value> <value>micro</value> + <value>output</value> </choice> </attribute> </element> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3689ac0a..f12c87d2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -529,7 +529,8 @@ VIR_ENUM_IMPL(virDomainSmartcard, VIR_DOMAIN_SMARTCARD_TYPE_LAST, VIR_ENUM_IMPL(virDomainSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "duplex", - "micro") + "micro", + "output") VIR_ENUM_IMPL(virDomainSoundModel, VIR_DOMAIN_SOUND_MODEL_LAST, "sb16", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a78fdee4..ee3285a9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1335,6 +1335,7 @@ struct _virDomainInputDef { typedef enum { VIR_DOMAIN_SOUND_CODEC_TYPE_DUPLEX, VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO, + VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST } virDomainSoundCodecType; diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a5cb24fe..ba085a9e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -486,6 +486,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 300 */ "sdl-gl", + "hda-output", ); @@ -1015,6 +1016,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, + { "hda-output", QEMU_CAPS_HDA_OUTPUT}, { "ccid-card-emulated", QEMU_CAPS_CCID_EMULATED }, { "ccid-card-passthru", QEMU_CAPS_CCID_PASSTHRU }, { "piix3-usb-uhci", QEMU_CAPS_PIIX3_USB_UHCI }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index d23c34c2..3e9a8b30 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -470,6 +470,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 300 */ QEMU_CAPS_SDL_GL, /* -sdl gl */ + QEMU_CAPS_HDA_OUTPUT, /* -device hda-output*/ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c4237339..aee5bde5 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -139,7 +139,8 @@ VIR_ENUM_DECL(qemuSoundCodec) VIR_ENUM_IMPL(qemuSoundCodec, VIR_DOMAIN_SOUND_CODEC_TYPE_LAST, "hda-duplex", - "hda-micro"); + "hda-micro", + "hda-output"); VIR_ENUM_DECL(qemuControllerModelUSB) @@ -4172,6 +4173,8 @@ qemuSoundCodecTypeToCaps(int type) return QEMU_CAPS_HDA_DUPLEX; case VIR_DOMAIN_SOUND_CODEC_TYPE_MICRO: return QEMU_CAPS_HDA_MICRO; + case VIR_DOMAIN_SOUND_CODEC_TYPE_OUTPUT: + return QEMU_CAPS_HDA_OUTPUT; default: return -1; } diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index e7c2e9a1..2b13ebc1 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -105,6 +105,7 @@ <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>1005003</version> <kvmVersion>0</kvmVersion> <microcodeVersion>46523</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index e57dec32..ecd31293 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -110,6 +110,7 @@ <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>1006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>44752</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index 39ec8f9b..c31a9721 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -112,6 +112,7 @@ <flag name='query-cpu-definitions'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>1007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>50196</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index afe0882d..07cb2a37 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -128,6 +128,7 @@ <flag name='query-named-block-nodes'/> <flag name='kernel-irqchip'/> <flag name='isa-serial'/> + <flag name='hda-output'/> <version>2001001</version> <kvmVersion>0</kvmVersion> <microcodeVersion>58992</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 59043068..e11c1122 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -155,6 +155,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>303541</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 2912c8d6..21d91c8d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -154,6 +154,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>382824</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 77ca3013..7821144e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -197,6 +197,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2010000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>344938</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index cabe4f2f..e4f22684 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -162,6 +162,7 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>343099</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index bffe3b3b..3e393633 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -159,6 +159,7 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>419968</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4247afeb..35eadc18 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -200,6 +200,7 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2011090</version> <kvmVersion>0</kvmVersion> <microcodeVersion>390813</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index 871eb5e4..56861723 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -154,6 +154,7 @@ <flag name='virtio-gpu.max_outputs'/> <flag name='isa-serial'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2004000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>75406</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 90dce5a7..e86fce9f 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -160,6 +160,7 @@ <flag name='virtio-gpu.max_outputs'/> <flag name='isa-serial'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2005000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>216528</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 42985489..e5268eda 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -142,6 +142,7 @@ <flag name='dump-completed'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>228241</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 07cdc49b..7e514be6 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -137,6 +137,7 @@ <flag name='dump-completed'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>263005</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 4c6371a6..0d542b87 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -172,6 +172,7 @@ <flag name='dump-completed'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2006000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>227332</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index c322d18d..5795bc95 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -177,6 +177,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2007000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>239029</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 7c329ad4..bd467d27 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -179,6 +179,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2008000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>255684</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index cfc94050..1e6d0cc3 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -146,6 +146,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>346538</microcodeVersion> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 0701c244..7e45b311 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -192,6 +192,7 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='sdl-gl'/> + <flag name='hda-output'/> <version>2009000</version> <kvmVersion>0</kvmVersion> <microcodeVersion>320947</microcodeVersion> diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml index b0caa34e..03f18b4f 100644 --- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml @@ -236,6 +236,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration in' phase='prepare' flags='0x900'> <migParams> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml index 6d87c1ec..636accf0 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-in.xml @@ -229,6 +229,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3'> <disk dev='vdb' migrating='yes'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml index 05da1f81..315d8e4c 100644 --- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml +++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml @@ -229,6 +229,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3' flags='0x0'> <disk dev='vdb' migrating='yes'/> diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml index 17649796..ae206483 100644 --- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml +++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml @@ -236,6 +236,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <job type='none' async='migration out' phase='perform3' flags='0x802'> <disk dev='vda' migrating='no'/> diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml index d63fcf79..5b7e2a34 100644 --- a/tests/qemustatusxml2xmldata/modern-in.xml +++ b/tests/qemustatusxml2xmldata/modern-in.xml @@ -232,6 +232,7 @@ <flag name='iscsi.password-secret'/> <flag name='isa-serial'/> <flag name='dump-completed'/> + <flag name='hda-output'/> </qemuCaps> <devices> <device alias='rng0'/> diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args index ee8313bf..f97050a0 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -33,10 +33,12 @@ server,nowait \ -device intel-hda,id=sound5,bus=pci.0,addr=0x6 \ -device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \ -device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \ +-device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \ -device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x7 \ -device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \ -device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x8 \ -device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \ -device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \ +-device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \ -device usb-audio,id=sound8,bus=usb.0,port=1 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x9 diff --git a/tests/qemuxml2argvdata/sound-device.xml b/tests/qemuxml2argvdata/sound-device.xml index bceb9d1f..c544e931 100644 --- a/tests/qemuxml2argvdata/sound-device.xml +++ b/tests/qemuxml2argvdata/sound-device.xml @@ -32,11 +32,13 @@ <sound model='ich6'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> </sound> <sound model='ich9'/> <sound model='ich9'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> </sound> <sound model='usb'/> <memballoon model='virtio'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 07e5ba1d..ff32347f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1515,6 +1515,7 @@ mymain(void) DO_TEST("sound", NONE); DO_TEST("sound-device", QEMU_CAPS_HDA_DUPLEX, QEMU_CAPS_HDA_MICRO, + QEMU_CAPS_HDA_OUTPUT, QEMU_CAPS_DEVICE_ICH9_INTEL_HDA, QEMU_CAPS_OBJECT_USB_AUDIO); DO_TEST("fs9p", NONE); diff --git a/tests/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml index 62336a8c..cbf4d179 100644 --- a/tests/qemuxml2xmloutdata/sound-device.xml +++ b/tests/qemuxml2xmloutdata/sound-device.xml @@ -43,6 +43,7 @@ <sound model='ich6'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </sound> <sound model='ich9'> @@ -51,6 +52,7 @@ <sound model='ich9'> <codec type='micro'/> <codec type='duplex'/> + <codec type='output'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </sound> <sound model='usb'/> -- 2.17.0

4 3

[libvirt] [PATCH 0/2] qemu: Enable multihead screendumps
by Michal Privoznik 17 May '18

17 May '18

There's one small problem. QEMU might crash: https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg04113.html But apart from that, works like charm. Michal Privoznik (2): qemu: Introduce QEMU_CAPS_SCREENDUMP_DEVICE qemu: Implement multiple screen support for virDomainScreenshot src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 38 ++++++++++++++++++---- src/qemu/qemu_monitor.c | 4 ++- src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 4 +++ src/qemu/qemu_monitor_json.h | 2 ++ 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/qemumonitorjsontest.c | 2 +- 12 files changed, 50 insertions(+), 9 deletions(-) -- 2.16.1

2 4

[libvirt] [PATCH 0/4] qemu: TLS cleanup and fix of path escaping
by Peter Krempa 17 May '18

17 May '18

Clean up some code and fix wrong escaping of TLS certificate path. Peter Krempa (4): qemu: command: Optimize formatting of 'passwordid' in qemuBuildTLSx509BackendProps tests: qemuxml2argv: Test TLS certificate path containing a comma qemu: command: Fix formatting of TLS backend properties qemu: command: Remove qemuBuildHasMasterKey src/qemu/qemu_command.c | 40 +++------------------- .../disk-drive-network-tlsx509-vxhs.args | 8 ++--- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 10 insertions(+), 40 deletions(-) -- 2.16.2

2 5

[libvirt] [jenkins-ci PATCH] lcitool: Use Perl to generate password hashes
by Andrea Bolognani 17 May '18

17 May '18

We claim to be using Python 2 at the moment: however, we rely on crypt.mksalt(), which was introduced in Python 3 and has only been backported to Python 2 in RHEL and Fedora, so the script will only work on those operating systems. We could move to Python 3, but the CI nodes are running on a CentOS 7 machine, where it can't be installed without pulling in third-party repositories and dealing with awkward naming; moreover, Ansible itself is still tied to Python 2, so we would be requiring both to be available. Perl to the rescue! The script ends up being only marginally more verbose and obscure as a result, the indentation is significantly better, and it should finally run on pretty much any platform. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/lcitool | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/guests/lcitool b/guests/lcitool index 5b2efb9..568e52c 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -18,11 +18,11 @@ die() { hash_file() { PASS_FILE="$1" - python2 -c " -import crypt -password = open('$PASS_FILE', 'r').read().strip() -print(crypt.crypt(password, - crypt.mksalt(crypt.METHOD_SHA512)))" + perl -le ' + my @chars = ("A".."Z", "a".."z", "0".."9"); + my $salt; $salt .= $chars[rand @chars] for 1..16; + open(my $handle, "'"$PASS_FILE"'"); my $pass = <$handle>; chomp $pass; + print crypt("$pass", "\$6\$$salt\$");' } # yaml_var FILE VAR -- 2.17.0

2 5