- Devel - libvirt List Archives

[libvirt] nwfilter deadlock with libpcap and TPACKET_V3
by Daniel P. Berrangé 21 May '18

21 May '18

I've just found a deadlock in nwfilter caused by something in libpcap. There are 2 VMs running with the nwfilter stress test, but the deadlock in fact only involves VM VM. Three threads in libvirtd Thread 1 (Thread 0x7f3a26f726c0 (LWP 15384)): #0 __lll_lock_wait () at ../sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007f3a22ae1cc4 in __GI___pthread_mutex_lock (mutex=0x7f39fc023de0) at ../nptl/pthread_mutex_lock.c:78 #2 0x00007f3a264817f5 in virMutexLock (m=<optimized out>) at util/virthread.c:89 #3 0x00007f3a2645c34b in virObjectLock (anyobj=anyobj@entry=0x7f39fc023dd0) at util/virobject.c:429 #4 0x00007f39deca2b93 in qemuProcessHandleEvent (mon=<optimized out>, vm=0x7f39fc023dd0, eventName=0x5601c3940500 "SHUTDOWN", seconds=1526658178, micros=453867, details=0x5601c3a468b0 "{\"guest\":false}", opaque=0x7f39ac11ba20) at qemu/qemu_process.c:630 #5 0x00007f39decc2686 in qemuMonitorEmitEvent (mon=mon@entry=0x7f39fc049d70, event=event@entry=0x5601c3940500 "SHUTDOWN", seconds=1526658178, micros=453867, details=0x5601c3a468b0 "{\"guest\":false}") at qemu/qemu_monitor.c:1336 #6 0x00007f39decd6cce in qemuMonitorJSONIOProcessEvent (obj=0x5601c391fcc0, mon=0x7f39fc049d70) at qemu/qemu_monitor_json.c:174 #7 qemuMonitorJSONIOProcessLine (mon=mon@entry=0x7f39fc049d70, line=<optimized out>, msg=msg@entry=0x0) at qemu/qemu_monitor_json.c:211 #8 0x00007f39decd6f59 in qemuMonitorJSONIOProcess (mon=mon@entry=0x7f39fc049d70, data=0x5601c3964670 "{\"timestamp\": {\"seconds\": 1526658178, \"microseconds\": 453867}, \"event\": \"SHUTDOWN\", \"data\": {\"guest\": false}}\r\n", len=111, msg=msg@entry=0x0) at qemu/qemu_monitor_json.c:253 #9 0x00007f39decc11fc in qemuMonitorIOProcess (mon=0x7f39fc049d70) at qemu/qemu_monitor.c:446 #10 qemuMonitorIO (watch=watch@entry=323, fd=<optimized out>, events=0, events@entry=1, opaque=opaque@entry=0x7f39fc049d70) at qemu/qemu_monitor.c:706 #11 0x00007f3a26425743 in virEventPollDispatchHandles (fds=0x5601c39a3410, nfds=<optimized out>) at util/vireventpoll.c:508 #12 virEventPollRunOnce () at util/vireventpoll.c:657 #13 0x00007f3a26423e71 in virEventRunDefaultImpl () at util/virevent.c:327 #14 0x00007f3a26549ff5 in virNetDaemonRun (dmn=0x5601c38cd1b0) at rpc/virnetdaemon.c:850 #15 0x00005601c281544a in main (argc=<optimized out>, argv=<optimized out>) at remote/remote_daemon.c:1483 Thread 4 (Thread 0x7f3a0e011700 (LWP 15400)): #0 __lll_lock_wait () at ../sysdeps/unix/sysv/linux/x86_64/lowlevellock.S:135 #1 0x00007f3a22ae1d64 in __GI___pthread_mutex_lock (mutex=0x7f39ac1cb3e0) at ../nptl/pthread_mutex_lock.c:113 #2 0x00007f3a264817f5 in virMutexLock (m=<optimized out>) at util/virthread.c:89 ---Type <return> to continue, or q <return> to quit--- #3 0x00007f39f518653f in virNWFilterLockIface (ifname=ifname@entry=0x7f39fc025b60 "tck-vm2-if0") at nwfilter/nwfilter_learnipaddr.c:197 #4 0x00007f39f517aae5 in _virNWFilterTeardownFilter (ifname=0x7f39fc025b60 "tck-vm2-if0") at nwfilter/nwfilter_gentech_driver.c:1021 #5 0x00007f39f517b5fc in virNWFilterTeardownFilter (net=0x7f39fc044f80) at nwfilter/nwfilter_gentech_driver.c:1039 #6 0x00007f3a264da77c in virDomainConfVMNWFilterTeardown (vm=vm@entry=0x7f39fc023dd0) at conf/domain_nwfilter.c:65 #7 0x00007f39decab77a in qemuProcessStop (driver=driver@entry=0x7f39ac11ba20, vm=0x7f39fc023dd0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_DESTROYED, asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=0) at qemu/qemu_process.c:6767 #8 0x00007f39decfd47e in qemuDomainDestroyFlags (dom=<optimized out>, flags=<optimized out>) at qemu/qemu_driver.c:2237 #9 0x00007f3a2661c593 in virDomainDestroy (domain=domain@entry=0x7f39f00191e0) at libvirt-domain.c:475 #10 0x00005601c284052a in remoteDispatchDomainDestroy (server=0x5601c38cd240, msg=0x5601c3a189e0, args=<optimized out>, rerr=0x7f3a0e010b60, client=0x5601c393d9f0) at remote/remote_daemon_dispatch_stubs.h:4615 #11 remoteDispatchDomainDestroyHelper (server=0x5601c38cd240, client=0x5601c393d9f0, msg=0x5601c3a189e0, rerr=0x7f3a0e010b60, args=<optimized out>, ret=0x7f39f0004970) at remote/remote_daemon_dispatch_stubs.h:4591 #12 0x00007f3a265443f4 in virNetServerProgramDispatchCall (msg=0x5601c3a189e0, client=0x5601c393d9f0, server=0x5601c38cd240, prog=0x5601c3938d70) at rpc/virnetserverprogram.c:437 #13 virNetServerProgramDispatch (prog=0x5601c3938d70, server=server@entry=0x5601c38cd240, client=0x5601c393d9f0, msg=0x5601c3a189e0) at rpc/virnetserverprogram.c:304 #14 0x00007f3a2654a778 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x5601c38cd240) at rpc/virnetserver.c:145 #15 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x5601c38cd240) at rpc/virnetserver.c:166 #16 0x00007f3a264822f0 in virThreadPoolWorker (opaque=opaque@entry=0x5601c38d9da0) at util/virthreadpool.c:167 #17 0x00007f3a26481678 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #18 0x00007f3a22adf564 in start_thread (arg=<optimized out>) at pthread_create.c:463 #19 0x00007f3a2281331f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 Thread 19 (Thread 0x7f39ceacb700 (LWP 17216)): #0 0x00007f3a22808929 in __GI___poll (fds=fds@entry=0x7f39ceaca930, nfds=nfds@entry=1, timeout=-1) at ../sysdeps/unix/sysv/linux/poll.c:29 #1 0x00007f39f4f3409d in poll (__timeout=<optimized out>, __nfds=1, __fds=0x7f39ceaca930) at /usr/include/bits/poll2.h:46 #2 pcap_wait_for_frames_mmap (handle=handle@entry=0x7f39ac1a7260) at ./pcap-linux.c:4561 #3 0x00007f39f4f38b98 in pcap_read_linux_mmap_v3 (handle=0x7f39ac1a7260, max_packets=1, callback=0x7f39f4f339f0 <pcap_oneshot_mmap>, user=0x7f39ceaca9d0 "@\252\254\316\071\177") at ./pcap-linux.c:5059 #4 0x00007f39f4f3d632 in pcap_next (p=p@entry=0x7f39ac1a7260, h=h@entry=0x7f39ceacaa40) at ./pcap.c:243 #5 0x00007f39f5186ace in learnIPAddressThread (arg=0x7f39fc058f10) at nwfilter/nwfilter_learnipaddr.c:486 #6 0x00007f3a264816a2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 #7 0x00007f3a22adf564 in start_thread (arg=<optimized out>) at pthread_create.c:463 #8 0x00007f3a2281331f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 So in summary: Thread 1 is responding to QEMU SHUTDOWN event Waiting on lock VM mutex due to thread 4 Thread 4 is responding to virDomainDestroy Holds lock on VM mutex Holds lock on nwfilter update mutex Waiting on lock interface mutex due to thread 19 Thread 19 is doing nwfilter address learning Holds lock on interface mutex Thread 19 is using libpcap to capture packets, and has told it to use a 500ms timeout. So it is in pcap_next() while holding the interface lock waiting in poll(). The code is written such that pcap_next() is expected to return on hitting the 500ms timeout and check for a request for learning to terminate. Whereupon it would release the interface lock allowing thread 4 to continnue. As we can see from the stack trace though, pcap_next() is not honouring our 500ms timeout, and has done poll() with an infinite timeout. This seems to be intentional behaviour from libpcap to ignore our requested timeout.... } else if (handlep->timeout > 0) { #ifdef HAVE_TPACKET3 /* * For TPACKET_V3, the timeout is handled by the kernel, * so block forever; that way, we don't get extra timeouts. * Don't do that if we have a broken TPACKET_V3, though. */ if (handlep->tp_version == TPACKET_V3 && !broken_tpacket_v3) handlep->poll_timeout = -1; /* block forever, let TPACKET_V3 wake us up */ else #endif handlep->poll_timeout = handlep->timeout; /* block for that amount of time */ We've taken the path tp_version == TPACKET_V3 && !broken_tpacket_v3. This is the case for anything with kernel >= 3.19 /* * OK, that was a valid minor version. * Is this 3.19 or newer? */ if (major >= 4 || (major == 3 && minor >= 19)) { /* Yes. TPACKET_V3 works correctly. */ broken_tpacket_v3 = 0; } I've no clue what it is about TPACKET_V3 that is supposed to wake us up from poll, but it clearly isn't happening :-( Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 2

[libvirt] [PATCH] qemu: clarify message about block peek format restriction
by Daniel P. Berrangé 21 May '18

21 May '18

Include the actual disk format in the error message to help the user see what is wrong. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e61af23870..3a328e5d46 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11544,8 +11544,9 @@ qemuDomainBlockPeek(virDomainPtr dom, } if (disk->src->format != VIR_STORAGE_FILE_RAW) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("peeking is supported only for RAW disks")); + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, + _("peeking is only supported for disk with 'raw' format not '%s'"), + virStorageFileFormatTypeToString(disk->src->format)); goto cleanup; } -- 2.17.0

2 1

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

21 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 v1: https://www.redhat.com/archives/libvir-list/2018-May/msg01311.html v2: - Split patch into series of patches - Add description of feature in docs/news.xml - Improve the documentation in docs/formatdomain.html.in - Fixes coding standard errors/inconsistencies Filip Alac (4): Add 'output' codec in docs, conf and xml2xmltest qemu: Extend qemu_capabilities with 'hda-output' qemu: Extend qemu_command with 'hda-output' docs: news: Describe the 'output' codec docs/formatdomain.html.in | 15 ++++++++++++--- docs/news.xml | 8 ++++++++ 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 + .../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 + .../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 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../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 ++ 36 files changed, 62 insertions(+), 5 deletions(-) -- 2.17.0

2 7

[libvirt] [PATCH 00/12][v2] Introduce network-backed loader & nvram.
by Prerna Saxena 21 May '18

21 May '18

Libvirt domain XML today only allows local filepaths that can be used to specify a loader element or its matching NVRAM disk. 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 firmware loader & NVRAM disks to be hosted over network-backed disks, for high availability. It achieves this by embedding virStorageSource elements for loader & nvram into _virDomainLoaderDef, as discussed in https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html. Currently, the source type is annotated by introducing a new attribute "backing" for both 'loader' and 'nvram' elements. Hence, a sample XML with new annotation looks like this: <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> References: ---------- v0 / Proposal: https://www.redhat.com/archives/libvir-list/2018-March/msg01721.html. v1 : https://www.redhat.com/archives/libvir-list/2018-April/msg02024.html Changelog: --------- Changes since v1: 1. Split up the patch into smaller units. 2. Added doc snippet & tests. 3. Changed the formatting code in patch 4 to format a domain's XML in the style that was read. I found that encryption seems to be a property of the storage volume. I didnt include that in this series since it does not use backing type as volume. Will include that later once the basic network support patches get done. Looking forward to feedback, Prerna Prerna Saxena (12): Schema: Introduce XML schema for network-backed loader and nvram elements. Loader: Add a more elaborate definition. Parse domain XML to generate virDomainLoaderDef & virDomainNvramDef. Format the loader source appropriately. Plumb the loader source into generation of QEMU command line. Fix the domain def inference logic to correctly account for network-backed pflash devices. Bhyve: Fix command line generation to correctly pick up local loader path. virt-aa-helper: Adjust references to loader & nvram elements to correctly parse the virStorageSource types. Vbox: Adjust references to 'loader' and 'nvram' elements given that these are now represented by virStorageSourcePtr. Xen: Adjust all references to loader & nvram elements given that they are now backed by virStorageSourcePtr 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 | 215 +++++++++++++++++++++++-- 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 | 42 +++-- 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, 562 insertions(+), 101 deletions(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-network.xml -- 1.8.1.2

5 16

[libvirt] Fwd: Abandoning php-virt-control project
by Michal Novotny 21 May '18

21 May '18

>On Mon, May 21, 2018 at 11:05:13AM +0200, Michal Novotny wrote: >> Hi Dan, >> thanks and I completely understand. I was funding the domain name from my >> own resources for several years already. If somebody is interested in >> taking over the domain it would be great however if nobody is interested >> the domain will expire and cease to exist. As already said I'm willing to >> prolong the domain by 1 years till June 27 2019 but it would be nice if >> somebody can take over the domain ownership and the funding. As far as I >> know the project php-virt-control.org is basically an alias for the same >> server hosting libvirt.org so just the domain cease to exist but the git >> will still be available at [1]. > > Yes, that's correct the git will always be available there, and it also > gets auto-mirrored to both github and gitlab, so essentially it will > exist forever. > Ok, I'm glad to hear that :-) >> Is it worth it prolonging the domain by 1 year as mentioned above or should >> I let the domain expire if nobody is interested in taking it over >> considering the fact it will still remain on the server? > I'm terrible at making decisions like this - I still keep renewing domains > for personal project's I've long since abandoned, because I hate the idea > of domain squatters grabbing them and extorting money :-( > > Since I've not seen anyone actively sending patches for php-virt-control, > I fear you're unlikely to see anyone volunteer to take the domain name. > I guess you've got a month still you can wait though for anyone to take > interest until you need to decide. You are most likely right about that. Maybe it' s better to let the domain expire in one month if nobody takes it over because the project will still exist on the libvirt.org site. That said I won't prolong the domain name anymore and I'll let it expire if nobody is interested in taking over the domain. Regards, Michal > > > Regards, > Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

1 0

[libvirt] Abandoning php-virt-control project
by Michal Novotny 21 May '18

21 May '18

Hi, since I'm pretty busy last few months and I didn't do any commit to the php-virt-control project [1] for a pretty long time it's time to hand over this project to somebody that is interested in continuing the project so please if anyone is interested please tell me. It's essentially the PHP binding to the libvirt virtualization API so you can check the php-virt-control website however I no longer have access to the site and I think Dan P. Berrange (CC'ed) owns this server so he can grant access to the server hosting the project. It would be a pitty if this project dies entirely when I'm no longer having any time for the project as I've been receiving many replies of people liking the project. Also I'm the owner of the domain ([1]) and it expires on June 27 2018. Although I'm willing to prolong the domain by 1 year (till June 27 2019) it would be nice if I can also hand over the domain to somebody else. Please tell me if you're interested in taking over the project and/or the domain so we could faciliate the change (usually by domain ownership transfer done by link going to my mailbox). Thanks, Michal [1] http://php-virt-control.org/

2 1

[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

[libvirt] [tck PATCH] Stop deleting MANIFEST file when making release dists
by Daniel P. Berrangé 17 May '18

17 May '18

The MANIFEST file is now pre-created rather than auto-generated Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial + build fix prepare-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare-release.sh b/prepare-release.sh index ad29f16..ef5d7b8 100755 --- a/prepare-release.sh +++ b/prepare-release.sh @@ -16,7 +16,7 @@ NAME=Sys-Virt-TCK set -e -rm -rf MANIFEST blib _build Build +rm -rf blib _build Build perl Build.PL install_base=$HOME/builder -- 2.17.0

1 0

[libvirt] [PATCH 0/9] RISC-V Guest Support
by Lubomir Rintel 17 May '18

17 May '18

Hello, here's patches I've used in order to be able to run RISC-V guests with libvirtd. In case you're interested in having RISC-V support you may want to have a look. There are some problems I am aware of, though not really able to address. I might be wrong about some points -- whoever is more familiar with QEMU, RISC-V or libvirt please correct me: * Essentially only the "virt" machine is useful, because others don't seem to support storage or network (as of qemu-2.12). It is not default though, so creating a reasonable guest configuration is not intuitive. * The serial port used by the "virt" machine is NS16550A connected to the platform bus, but it doesn't seem to appear in the QEMU device model. I hardcoded it in qemuChrIsPlatformDevice() and qemuDomainChrDefPostParse() so that we end up defaulting to the correct one for the virt machine. * The tests were in a large part cargo-culted. I made some effort to cover what I thought was important, but it likely needs a better pair of eyes than mine. More in the idividual patches. In any case, I am able to boot Fedora and things seem to work well in general. I'll be thankful for feedback (and even more thankful if anyone more familiar with libvirtd picks up the patchset :). Hope this is useful, Lubo Diffstat follows. Lubomir Rintel (9): conf: add an option to specify a NS16550A serial port qemu: enable GIC only on AArch64 qemu: rename qemuDomainAssignARMVirtioMMIOAddresses() util: add RISC-V support tests/capabilitiestest: add RISC-V capability tests tests/util: add RISC-V capabilities tests/captest: check RISC-V capabilities lookup tests/qemuxml2argvtest: test RISC-V virt machine arguments tests/virschematest: add RISC-V to capabilityschemadata/caps-qemu-kvm docs/schemas/basictypes.rng | 2 + docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 17 +- src/qemu/qemu_domain.c | 24 +- src/qemu/qemu_domain_address.c | 27 +- src/util/virarch.c | 3 + src/util/virarch.h | 6 + tests/capabilityschemadata/caps-qemu-kvm.xml | 36 + .../caps_2.12.0.riscv32.replies | 14420 ++++++++++++++++ .../caps_2.12.0.riscv32.xml | 119 + .../caps_2.12.0.riscv64.replies | 14420 ++++++++++++++++ .../caps_2.12.0.riscv64.xml | 119 + tests/qemucapabilitiestest.c | 2 + tests/qemuxml2argvdata/riscv64-virt.args | 29 + tests/qemuxml2argvdata/riscv64-virt.xml | 34 + tests/qemuxml2argvtest.c | 2 + .../riscv64-virt.xml | 37 + tests/testutilsqemu.c | 72 + tests/vircapstest.c | 6 + 21 files changed, 29354 insertions(+), 24 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv32.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.riscv64.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2startupxmloutdata/riscv64-virt.xml -- 2.17.0

2 13

[libvirt] [jenkins-ci PATCH] projects: set TEST_MAINTAINER for libvirt-perl build job too
by Daniel P. Berrangé 17 May '18

17 May '18

The TEST_MAINTAINER=1 env variable will effect running of Build.PL, causing it to turn on many more GCC warning flags to validate the build. So we need to set it for build job as well as test job. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- projects/libvirt-perl.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 5cbe04c..28288e8 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -6,6 +6,8 @@ jobs: - perl-modulebuild-build-job: parent_jobs: 'libvirt-master-build' + local_env: | + export TEST_MAINTAINER=1 - perl-modulebuild-check-job: parent_jobs: 'libvirt-perl-master-build' local_env: | -- 2.17.0

2 1

[libvirt] [PATCH] docs: Fix copy-paste error in formatdomaincaps
by Martin Kletzander 17 May '18

17 May '18

Reported-instead-of-fixing-immediately-by: Jiri Denemark <jdenemar(a)redhat.com> Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomaincaps.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomaincaps.html.in b/docs/formatdomaincaps.html.in index 86c9ce8c5c23..b68ae4b4f1f3 100644 --- a/docs/formatdomaincaps.html.in +++ b/docs/formatdomaincaps.html.in @@ -208,7 +208,7 @@ </dd> </dl> - <h3><a id="elementsIothread">CPU configuration</a></h3> + <h3><a id="elementsIothreads">I/O Threads</a></h3> <p> The <code>iothread</code> elements indicates whether or not -- 2.17.0

2 1

[libvirt] [PATCH REBASE 0/5] qemu: fix domain object wait to handle monitor errors
by Nikolay Shirokovskiy 17 May '18

17 May '18

Main patch is 4th, others are misc. Nikolay Shirokovskiy (5): qemu: erase synchronous block job cancel mentions in comments qemu: monitor: set error flag even in OOM conditions utils: export virCopyError qemu: fix domain object wait to handle monitor errors qemu: fix races in beingDestroyed usage src/conf/domain_conf.c | 43 --------------------------------------- src/conf/domain_conf.h | 3 --- src/libvirt_private.syms | 3 +-- src/qemu/qemu_domain.c | 45 +++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 7 +++++-- src/qemu/qemu_driver.c | 27 +++++++++++++++---------- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_migration.c | 12 +++++------ src/qemu/qemu_monitor.c | 5 +++++ src/qemu/qemu_process.c | 51 +++++++++++++++++++++++++++++++---------------- src/util/virerror.c | 12 ++++++++--- src/util/virerror.h | 1 + 12 files changed, 124 insertions(+), 89 deletions(-) -- 1.8.3.1

2 24

[libvirt] [PATCHv3 00/13] Switch from yajl to Jansson
by Ján Tomko 17 May '18

17 May '18

Per the discussion here: https://www.redhat.com/archives/libvir-list/2017-November/msg00225.html Switch from using yajl to Jansson. v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01781.html v2: https://www.redhat.com/archives/libvir-list/2018-May/msg00695.html Patches 3-9 are meant to be squashed together before pushing, but are posted separately here in hope it will make reviewing them easier. v3: separated the removal of yajl functions, also removed WITH_YAJL from config-post.h and split the virt-driver-qemu.m4 changes into two patches, now with AC_REQUIRE for the CHECK_JANSSON dependency Ján Tomko (13): build: add --with-jansson build: undef WITH_JANSSON for SETUID_RPC_CLIENT Switch from yajl to Jansson FIXUP: fix tests FIXUP: Deprecate building --with-yajl FIXUP: make nss depend on Jansson instead of yajl FIXUP: compile and link with Jansson instead of yajl FIXUP: s/WITH_YAJL/WITH_JANSSON/ FIXUP: libvirt.spec: use jansson instead of yajl Remove functions using yajl build: remove references to WITH_YAJL for SETUID_RPC_CLIENT build: switch --with-qemu default from yes to check build: require Jansson if QEMU driver is enabled config-post.h | 3 +- configure.ac | 3 + libvirt.spec.in | 4 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 29 ++ m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 8 +- src/qemu/qemu_driver.c | 2 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 597 ++++++++----------------------- tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemublocktest.c | 1 + tests/qemucapabilitiestest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucommandutiltest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 2 +- tests/virstoragetest.c | 4 +- 28 files changed, 227 insertions(+), 532 deletions(-) create mode 100644 m4/virt-jansson.m4 -- 2.16.1

4 42

[libvirt] [jenkins-ci PATCH 0/3] Various fixes to Perl jobs
by Andrea Bolognani 17 May '18

17 May '18

Andrea Bolognani (3): jobs: Run commands after loading environments jobs: Use local_env for Perl test arguments jobs: Use *-check for Perl jobs too jobs/perl-makemaker.yaml | 11 +++++------ jobs/perl-modulebuild.yaml | 6 +++--- projects/libvirt-perl.yaml | 7 ++++--- projects/libvirt-tck.yaml | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) -- 2.17.0

2 7

[libvirt] [jenkins-ci PATCH] projects: switch libvirt-perl over to using Module::Build
by Daniel P. Berrangé 17 May '18

17 May '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- jobs/perl-makemaker.yaml | 136 ------------------------------------- projects/libvirt-perl.yaml | 6 +- 2 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 jobs/perl-makemaker.yaml diff --git a/jobs/perl-makemaker.yaml b/jobs/perl-makemaker.yaml deleted file mode 100644 index 84b368e..0000000 --- a/jobs/perl-makemaker.yaml +++ /dev/null @@ -1,136 +0,0 @@ - -- job-template: - id: perl-makemaker-build-job - name: '{name}-{branch}-build{variant}' - project-type: matrix - description: '{title} Build' - autogen_args: '' - workspace: '{name}-{branch}{variant}' - child-workspace: '.' - block-downstream: true - block-upstream: true - wrappers: - - timeout: - abort: true - type: absolute - timeout: 90 - write-description: 'Aborted build after 90 minutes' - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - scm: - - git: - url: git://n64.pufty.ci.centos.org/{name}.git - branches: - - origin/{branch} - clean: - after: true - skip-tag: true - wipe-workspace: false - triggers: - - reverse: - jobs: '{obj:parent_jobs}' - - pollscm: - cron: "H/20 * * * *" - axes: - - axis: - name: systems - type: slave - values: '{obj:machines}' - builders: - - shell: | - perl Makefile.PL PREFIX="$VIRT_PREFIX" - {global_env} - {local_env} - $MAKE - $MAKE -j{smp} install - $MAKE -j{smp} manifest - publishers: - - email: - recipients: '{obj:spam}' - notify-every-unstable-build: true - send-to-individuals: false - - -- job-template: - id: perl-makemaker-test-job - name: '{name}-{branch}-test{variant}' - project-type: matrix - description: '{title} Test' - test_args: '' - workspace: '{name}-{branch}{variant}' - child-workspace: '.' - block-downstream: true - block-upstream: true - wrappers: - - timeout: - abort: true - type: absolute - timeout: 90 - write-description: 'Aborted build after 90 minutes' - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - triggers: - - reverse: - jobs: '{obj:parent_jobs}' - axes: - - axis: - name: systems - type: slave - values: '{obj:machines}' - builders: - - shell: | - {global_env} - {local_env} - $MAKE -j{smp} test {test_args} - publishers: - - email: - recipients: '{obj:spam}' - notify-every-unstable-build: true - send-to-individuals: false - -- job-template: - id: perl-makemaker-rpm-job - name: '{name}-{branch}-rpm{variant}' - project-type: matrix - description: '{title} RPM' - archive_format: gz - workspace: '{name}-{branch}{variant}' - child-workspace: '.' - block-downstream: true - block-upstream: true - wrappers: - - timeout: - abort: true - type: absolute - timeout: 90 - write-description: 'Aborted build after 90 minutes' - properties: - - build-discarder: - days-to-keep: 30 - num-to-keep: 1000 - triggers: - - reverse: - jobs: '{obj:parent_jobs}' - axes: - - axis: - name: systems - type: slave - values: '{obj:machines}' - builders: - - shell: | - {global_env} - {local_env} - sed -i -e 's/BuildRequires: *perl-Sys-Virt.*//' *.spec - sed -i -e 's/BuildRequires: *libvirt.*devel.*//' *.spec - rm -f *.tar.{archive_format} - $MAKE -j{smp} dist - rpmbuild --define "_topdir `pwd`/rpmbuild" -ta *.tar.{archive_format} - publishers: - - email: - recipients: '{obj:spam}' - notify-every-unstable-build: true - send-to-individuals: false diff --git a/projects/libvirt-perl.yaml b/projects/libvirt-perl.yaml index 0a6f648..37b48ff 100644 --- a/projects/libvirt-perl.yaml +++ b/projects/libvirt-perl.yaml @@ -4,11 +4,11 @@ machines: '{all_machines}' title: Libvirt Perl jobs: - - perl-makemaker-build-job: + - perl-modulebuild-build-job: parent_jobs: 'libvirt-master-build' - - perl-makemaker-test-job: + - perl-modulebuild-test-job: parent_jobs: 'libvirt-perl-master-build' test_args: 'TEST_MAINTAINER=1' - - perl-makemaker-rpm-job: + - perl-modulebuild-rpm-job: parent_jobs: 'libvirt-perl-master-test' machines: '{rpm_machines}' -- 2.17.0

2 2

[libvirt] [REPOST PATCH] tests: Update x86_64 replies, caps to QEMU 2.12
by John Ferlan 17 May '18

17 May '18

Using a QEMU 2.12 tagged tree build and full build, used: tests/qemucapsprobe /home/qemu/x86_64-softmmu/qemu-system-x86_64 > \ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiestest VIR_TEST_REGENERATE_OUTPUT=1 tests/domaincapstest Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Reposting : https://www.redhat.com/archives/libvir-list/2018-May/msg00738.html with recent updates through commit id fe8a0679 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 14 +- .../caps_2.12.0.x86_64.replies | 328 +++++++++++++-------- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 57 ++-- 3 files changed, 235 insertions(+), 164 deletions(-) diff --git a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml index d0e2866c49..9d752a0146 100644 --- a/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml +++ b/tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml @@ -23,10 +23,11 @@ <cpu> <mode name='host-passthrough' supported='yes'/> <mode name='host-model' supported='yes'> - <model fallback='forbid'>Haswell-noTSX</model> + <model fallback='forbid'>Haswell-noTSX-IBRS</model> <vendor>Intel</vendor> <feature policy='require' name='vme'/> <feature policy='require' name='ss'/> + <feature policy='require' name='vmx'/> <feature policy='require' name='f16c'/> <feature policy='require' name='rdrand'/> <feature policy='require' name='hypervisor'/> @@ -36,6 +37,7 @@ <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='abm'/> <feature policy='require' name='invtsc'/> + <feature policy='require' name='ibpb'/> </mode> <mode name='custom' supported='yes'> <model usable='yes'>qemu64</model> @@ -51,13 +53,13 @@ <model usable='yes'>core2duo</model> <model usable='no'>athlon</model> <model usable='yes'>Westmere</model> - <model usable='no'>Westmere-IBRS</model> + <model usable='yes'>Westmere-IBRS</model> <model usable='no'>Skylake-Server</model> <model usable='no'>Skylake-Server-IBRS</model> <model usable='no'>Skylake-Client</model> <model usable='no'>Skylake-Client-IBRS</model> <model usable='yes'>SandyBridge</model> - <model usable='no'>SandyBridge-IBRS</model> + <model usable='yes'>SandyBridge-IBRS</model> <model usable='yes'>Penryn</model> <model usable='no'>Opteron_G5</model> <model usable='no'>Opteron_G4</model> @@ -65,12 +67,12 @@ <model usable='yes'>Opteron_G2</model> <model usable='yes'>Opteron_G1</model> <model usable='yes'>Nehalem</model> - <model usable='no'>Nehalem-IBRS</model> + <model usable='yes'>Nehalem-IBRS</model> <model usable='yes'>IvyBridge</model> - <model usable='no'>IvyBridge-IBRS</model> + <model usable='yes'>IvyBridge-IBRS</model> <model usable='no'>Haswell</model> <model usable='yes'>Haswell-noTSX</model> - <model usable='no'>Haswell-noTSX-IBRS</model> + <model usable='yes'>Haswell-noTSX-IBRS</model> <model usable='no'>Haswell-IBRS</model> <model usable='no'>EPYC</model> <model usable='no'>EPYC-IBPB</model> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index c40046beef..eb45f23cb8 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -2,14 +2,13 @@ "QMP": { "version": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "v2.12.0" }, "capabilities": [ - "oob" ] } } @@ -23,11 +22,11 @@ { "return": { "qemu": { - "micro": 90, - "minor": 11, + "micro": 0, + "minor": 12, "major": 2 }, - "package": "v2.12.0-rc0" + "package": "v2.12.0" }, "id": "libvirt-2" } @@ -536,7 +535,7 @@ { "return": { - "fd": 19, + "fd": 17, "fdset-id": 0 }, "id": "libvirt-5" @@ -735,6 +734,10 @@ "name": "virtio-keyboard-pci", "parent": "virtio-input-hid-pci" }, + { + "name": "xen-sysbus", + "parent": "bus" + }, { "name": "i440FX", "parent": "pci-device" @@ -767,6 +770,10 @@ "name": "chardev-pty", "parent": "chardev" }, + { + "name": "xen-apic", + "parent": "apic-common" + }, { "name": "SUNW,fdtwo", "parent": "base-sysbus-fdc" @@ -1023,6 +1030,10 @@ "name": "pc-testdev", "parent": "isa-device" }, + { + "name": "xen-backend", + "parent": "xen-sysdev" + }, { "name": "Haswell-noTSX-IBRS-x86_64-cpu", "parent": "x86_64-cpu" @@ -1063,6 +1074,10 @@ "name": "virtio-balloon-pci", "parent": "virtio-pci" }, + { + "name": "chardev-socket", + "parent": "chardev" + }, { "name": "iothread", "parent": "object" @@ -1072,13 +1087,9 @@ "parent": "isa-device" }, { - "name": "chardev-socket", + "name": "chardev-mux", "parent": "chardev" }, - { - "name": "486-x86_64-cpu", - "parent": "x86_64-cpu" - }, { "name": "pc-q35-2.7-machine", "parent": "generic-pc-machine" @@ -1088,8 +1099,8 @@ "parent": "generic-pc-machine" }, { - "name": "chardev-mux", - "parent": "chardev" + "name": "486-x86_64-cpu", + "parent": "x86_64-cpu" }, { "name": "filter-redirector", @@ -1223,14 +1234,14 @@ "name": "chardev-msmouse", "parent": "chardev" }, - { - "name": "pc-q35-2.9-machine", - "parent": "generic-pc-machine" - }, { "name": "chardev-pipe", "parent": "chardev-fd" }, + { + "name": "pc-q35-2.9-machine", + "parent": "generic-pc-machine" + }, { "name": "pc-i440fx-1.7-machine", "parent": "generic-pc-machine" @@ -1419,6 +1430,10 @@ "name": "chardev-file", "parent": "chardev-fd" }, + { + "name": "xen-sysdev", + "parent": "sys-bus-device" + }, { "name": "intel-iommu", "parent": "x86-iommu" @@ -1483,6 +1498,10 @@ "name": "ccid-bus", "parent": "bus" }, + { + "name": "xenpv-machine", + "parent": "machine" + }, { "name": "EPYC-IBPB-x86_64-cpu", "parent": "x86_64-cpu" @@ -1815,6 +1834,10 @@ "name": "pc-i440fx-2.2-machine", "parent": "generic-pc-machine" }, + { + "name": "xen-pci-passthrough", + "parent": "pci-device" + }, { "name": "cryptodev-backend", "parent": "object" @@ -1947,10 +1970,18 @@ "name": "virtio-scsi-pci", "parent": "virtio-pci" }, + { + "name": "piix3-ide", + "parent": "pci-ide" + }, { "name": "ES1370", "parent": "pci-device" }, + { + "name": "xen-pvdevice", + "parent": "pci-device" + }, { "name": "virtio-pci-bus", "parent": "virtio-bus" @@ -1960,8 +1991,8 @@ "parent": "pcie-port" }, { - "name": "piix3-ide", - "parent": "pci-ide" + "name": "xenfv-machine", + "parent": "generic-pc-machine" }, { "name": "pci-testdev", @@ -2015,6 +2046,10 @@ "name": "pc-i440fx-2.6-machine", "parent": "generic-pc-machine" }, + { + "name": "xen-platform", + "parent": "pci-device" + }, { "name": "chardev-serial", "parent": "chardev-fd" @@ -2111,6 +2146,10 @@ "name": "isa-applesmc", "parent": "isa-device" }, + { + "name": "xen-accel", + "parent": "accel" + }, { "name": "secret", "parent": "object" @@ -3192,102 +3231,93 @@ { "return": [ { - "name": "serial", - "type": "str" - }, - { - "name": "port_index", + "name": "min_io_size", "type": "uint16" }, { - "name": "dpofua", + "name": "removable", "description": "on/off", "type": "bool" }, { - "name": "bootindex", - "type": "int32" - }, - { - "name": "logical_block_size", - "description": "A power of two between 512 and 32768", - "type": "uint16" + "name": "channel", + "type": "uint32" }, { - "name": "discard_granularity", - "type": "uint32" + "name": "serial", + "type": "str" }, { "name": "lun", "type": "uint32" }, { - "name": "max_unmap_size", - "type": "uint64" + "name": "dpofua", + "description": "on/off", + "type": "bool" }, { - "name": "drive", - "description": "Node name or ID of a block device to use as a backend", + "name": "ver", "type": "str" }, { - "name": "port_wwn", - "type": "uint64" - }, - { - "name": "write-cache", - "description": "on/off/auto", - "type": "OnOffAuto" - }, - { - "name": "share-rw", - "type": "bool" - }, - { - "name": "opt_io_size", + "name": "scsi-id", "type": "uint32" }, { - "name": "min_io_size", + "name": "logical_block_size", + "description": "A power of two between 512 and 32768", "type": "uint16" }, { - "name": "product", + "name": "drive", + "description": "Node name or ID of a block device to use as a backend", "type": "str" }, { - "name": "scsi-id", - "type": "uint32" + "name": "scsi_version", + "type": "int32" }, { - "name": "channel", + "name": "werror", + "description": "Error handling policy, report/ignore/enospc/stop/auto", + "type": "BlockdevOnError" + }, + { + "name": "discard_granularity", "type": "uint32" }, { - "name": "vendor", - "type": "str" + "name": "port_wwn", + "type": "uint64" }, { - "name": "wwn", + "name": "max_unmap_size", "type": "uint64" }, { - "name": "werror", + "name": "rerror", "description": "Error handling policy, report/ignore/enospc/stop/auto", "type": "BlockdevOnError" }, { - "name": "removable", - "description": "on/off", + "name": "max_io_size", + "type": "uint64" + }, + { + "name": "wwn", + "type": "uint64" + }, + { + "name": "share-rw", "type": "bool" }, { - "name": "rerror", - "description": "Error handling policy, report/ignore/enospc/stop/auto", - "type": "BlockdevOnError" + "name": "product", + "type": "str" }, { - "name": "ver", + "name": "vendor", "type": "str" }, { @@ -3296,8 +3326,21 @@ "type": "uint16" }, { - "name": "max_io_size", - "type": "uint64" + "name": "port_index", + "type": "uint16" + }, + { + "name": "bootindex", + "type": "int32" + }, + { + "name": "write-cache", + "description": "on/off/auto", + "type": "OnOffAuto" + }, + { + "name": "opt_io_size", + "type": "uint32" } ], "id": "libvirt-19" @@ -4103,6 +4146,11 @@ "name": "vectors", "type": "uint32" }, + { + "name": "iommu_platform", + "description": "on/off", + "type": "bool" + }, { "name": "x-pcie-extcap-init", "description": "on/off", @@ -4120,13 +4168,18 @@ "name": "x-ignore-backend-features", "type": "bool" }, + { + "name": "stats", + "description": "on/off", + "type": "bool" + }, { "name": "notify_on_empty", "description": "on/off", "type": "bool" }, { - "name": "iommu_platform", + "name": "virtio-pci-bus-master-bug-migration", "description": "on/off", "type": "bool" }, @@ -4136,7 +4189,7 @@ "type": "bool" }, { - "name": "virtio-pci-bus-master-bug-migration", + "name": "virgl", "description": "on/off", "type": "bool" }, @@ -4174,19 +4227,29 @@ "name": "yres", "type": "uint32" }, + { + "name": "stats", + "description": "on/off", + "type": "bool" + }, { "name": "iommu_platform", "description": "on/off", "type": "bool" }, { - "name": "max_outputs", + "name": "xres", "type": "uint32" }, { - "name": "xres", + "name": "max_outputs", "type": "uint32" }, + { + "name": "virgl", + "description": "on/off", + "type": "bool" + }, { "name": "max_hostmem", "type": "size" @@ -4711,6 +4774,11 @@ "name": "pc-i440fx-2.7", "cpu-max": 255 }, + { + "hotpluggable-cpus": true, + "name": "xenfv", + "cpu-max": 128 + }, { "hotpluggable-cpus": true, "name": "pc-i440fx-2.3", @@ -4752,6 +4820,11 @@ "cpu-max": 288, "alias": "q35" }, + { + "hotpluggable-cpus": false, + "name": "xenpv", + "cpu-max": 1 + }, { "hotpluggable-cpus": true, "name": "pc-q35-2.10", @@ -5001,7 +5074,6 @@ "name": "Westmere-IBRS", "typename": "Westmere-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5051,7 +5123,6 @@ "avx512cd", "avx512bw", "avx512vl", - "spec-ctrl", "3dnowprefetch", "xsavec", "xgetbv1", @@ -5093,7 +5164,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch", "xsavec", "xgetbv1", @@ -5115,7 +5185,6 @@ "name": "SandyBridge-IBRS", "typename": "SandyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5193,7 +5262,6 @@ "name": "Nehalem-IBRS", "typename": "Nehalem-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5210,7 +5278,6 @@ "name": "IvyBridge-IBRS", "typename": "IvyBridge-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5237,7 +5304,6 @@ "name": "Haswell-noTSX-IBRS", "typename": "Haswell-noTSX-IBRS-x86_64-cpu", "unavailable-features": [ - "spec-ctrl" ], "static": false, "migration-safe": true @@ -5247,8 +5313,7 @@ "typename": "Haswell-IBRS-x86_64-cpu", "unavailable-features": [ "hle", - "rtm", - "spec-ctrl" + "rtm" ], "static": false, "migration-safe": true @@ -5291,7 +5356,6 @@ "misalignsse", "3dnowprefetch", "osvw", - "ibpb", "xsavec", "xgetbv1" ], @@ -5339,7 +5403,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch" ], "static": false, @@ -5354,7 +5417,6 @@ "rdseed", "adx", "smap", - "spec-ctrl", "3dnowprefetch" ], "static": false, @@ -5516,6 +5578,14 @@ }, { "parameters": [ + { + "name": "rendernode", + "type": "string" + }, + { + "name": "gl", + "type": "boolean" + }, { "name": "head", "type": "number" @@ -6217,6 +6287,10 @@ }, { "parameters": [ + { + "name": "x-oob", + "type": "boolean" + }, { "name": "pretty", "type": "boolean" @@ -14363,9 +14437,9 @@ "type": "int" }, { - "name": "static", + "name": "preallocation", "default": null, - "type": "bool" + "type": "356" } ], "meta-type": "object" @@ -18199,7 +18273,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 63, + "model": 60, "movbe": true, "nrip-save": false, "ssse3": true, @@ -18210,7 +18284,7 @@ "fma": true, "cx16": true, "de": true, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18224,13 +18298,13 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, "lwp": false, "xop": false, - "ibpb": false, + "ibpb": true, "avx": true, "ospke": false, "acpi": false, @@ -18245,7 +18319,7 @@ "vaes": false, "xsaves": false, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18269,22 +18343,22 @@ "fxsr-opt": false, "xstore": false, "rtm": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "lmce": true, "perfctr-nb": false, "rdrand": true, "rdseed": false, "avx512-4vnniw": false, "vme": true, - "vmx": false, + "vmx": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -18314,6 +18388,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -18426,7 +18501,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 63, + "model": 60, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -18439,7 +18514,7 @@ "cx16": true, "de": true, "enforce": false, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18458,7 +18533,7 @@ "pmu": false, "pmm": false, "apic": true, - "spec-ctrl": false, + "spec-ctrl": true, "min-xlevel2": 0, "tsc-adjust": true, "tsc_adjust": true, @@ -18467,7 +18542,7 @@ "kvmclock": true, "l3-cache": true, "lwp": false, - "ibpb": false, + "ibpb": true, "xop": false, "avx": true, "ospke": false, @@ -18485,7 +18560,7 @@ "xsaves": false, "tcg-cpuid": true, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18519,7 +18594,7 @@ "hv-synic": false, "xstore": false, "fxsr_opt": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "rtm": false, "lmce": true, "hv-time": false, @@ -18529,18 +18604,18 @@ "rdrand": true, "rdseed": false, "avx512-4vnniw": false, - "vmx": false, + "vmx": true, "vme": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -18644,7 +18719,7 @@ "pge": true, "avx512bitalg": false, "pdcm": false, - "model": 63, + "model": 60, "movbe": true, "nrip-save": false, "ssse3": true, @@ -18655,7 +18730,7 @@ "fma": true, "cx16": true, "de": true, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18669,13 +18744,13 @@ "osvw": false, "apic": true, "pmm": false, - "spec-ctrl": false, + "spec-ctrl": true, "tsc-adjust": true, "kvm-steal-time": true, "kvmclock": true, "lwp": false, "xop": false, - "ibpb": false, + "ibpb": true, "avx": true, "ospke": false, "acpi": false, @@ -18690,7 +18765,7 @@ "vaes": false, "xsaves": false, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18714,22 +18789,22 @@ "fxsr-opt": false, "xstore": false, "rtm": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "lmce": true, "perfctr-nb": false, "rdrand": true, "rdseed": false, "avx512-4vnniw": false, "vme": true, - "vmx": false, + "vmx": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "sha-ni": false, "abm": true, "avx512pf": false, @@ -18759,6 +18834,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -18871,7 +18947,7 @@ "nodeid_msr": false, "pdcm": false, "movbe": true, - "model": 63, + "model": 60, "nrip_save": false, "nrip-save": false, "kvm_pv_unhalt": true, @@ -18884,7 +18960,7 @@ "cx16": true, "de": true, "enforce": false, - "stepping": 2, + "stepping": 3, "xsave": true, "clflush": true, "skinit": false, @@ -18903,7 +18979,7 @@ "pmu": false, "pmm": false, "apic": true, - "spec-ctrl": false, + "spec-ctrl": true, "min-xlevel2": 0, "tsc-adjust": true, "tsc_adjust": true, @@ -18912,7 +18988,7 @@ "kvmclock": true, "l3-cache": true, "lwp": false, - "ibpb": false, + "ibpb": true, "xop": false, "avx": true, "ospke": false, @@ -18930,7 +19006,7 @@ "xsaves": false, "tcg-cpuid": true, "lm": true, - "umip": false, + "umip": true, "pse": true, "avx2": true, "sep": true, @@ -18964,7 +19040,7 @@ "hv-synic": false, "xstore": false, "fxsr_opt": false, - "kvm-hint-dedicated": true, + "kvm-hint-dedicated": false, "rtm": false, "lmce": true, "hv-time": false, @@ -18974,18 +19050,18 @@ "rdrand": true, "rdseed": false, "avx512-4vnniw": false, - "vmx": false, + "vmx": true, "vme": true, "dtes64": false, "mtrr": true, "rdtscp": true, "pse36": true, - "kvm-pv-tlb-flush": false, + "kvm-pv-tlb-flush": true, "tbm": false, "wdt": false, "pause_filter": false, "sha-ni": false, - "model-id": "Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz", + "model-id": "Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz", "abm": true, "avx512pf": false, "xstore-en": false @@ -19798,6 +19874,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", @@ -20243,6 +20320,7 @@ "xsavec": false, "intel-pt": false, "osxsave": false, + "hv-frequencies": false, "tsc-frequency": 0, "xd": true, "hv-vendor-id": "", diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 4247afeb31..060aad6152 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -122,6 +122,7 @@ <flag name='gic-version'/> <flag name='incoming-defer'/> <flag name='virtio-gpu'/> + <flag name='virtio-gpu.virgl'/> <flag name='virtio-keyboard'/> <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> @@ -132,6 +133,7 @@ <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> + <flag name='spice-gl'/> <flag name='qxl.vram64_size_mb'/> <flag name='chardev-logfile'/> <flag name='debug-threads'/> @@ -161,6 +163,7 @@ <flag name='drive-iotune-group'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> + <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> @@ -200,10 +203,10 @@ <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> <flag name='sdl-gl'/> - <version>2011090</version> + <version>2012000</version> <kvmVersion>0</kvmVersion> - <microcodeVersion>390813</microcodeVersion> - <package>v2.12.0-rc0</package> + <microcodeVersion>392232</microcodeVersion> + <package>v2.12.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='phys-bits' type='number' value='0'/> @@ -220,6 +223,7 @@ <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> <property name='osxsave' type='boolean' value='false'/> + <property name='hv-frequencies' type='boolean' value='false'/> <property name='tsc-frequency' type='number' value='0'/> <property name='xd' type='boolean' value='true' migratable='yes'/> <property name='hv-vendor-id' type='string' value=''/> @@ -332,7 +336,7 @@ <property name='nodeid_msr' type='boolean' value='false'/> <property name='pdcm' type='boolean' value='false'/> <property name='movbe' type='boolean' value='true' migratable='yes'/> - <property name='model' type='number' value='63'/> + <property name='model' type='number' value='60'/> <property name='nrip_save' type='boolean' value='false'/> <property name='nrip-save' type='boolean' value='false'/> <property name='kvm_pv_unhalt' type='boolean' value='true' migratable='yes'/> @@ -345,7 +349,7 @@ <property name='cx16' type='boolean' value='true' migratable='yes'/> <property name='de' type='boolean' value='true' migratable='yes'/> <property name='enforce' type='boolean' value='false'/> - <property name='stepping' type='number' value='2'/> + <property name='stepping' type='number' value='3'/> <property name='xsave' type='boolean' value='true' migratable='yes'/> <property name='clflush' type='boolean' value='true' migratable='yes'/> <property name='skinit' type='boolean' value='false'/> @@ -364,7 +368,7 @@ <property name='pmu' type='boolean' value='false'/> <property name='pmm' type='boolean' value='false'/> <property name='apic' type='boolean' value='true' migratable='yes'/> - <property name='spec-ctrl' type='boolean' value='false'/> + <property name='spec-ctrl' type='boolean' value='true' migratable='yes'/> <property name='min-xlevel2' type='number' value='0'/> <property name='tsc-adjust' type='boolean' value='true' migratable='yes'/> <property name='tsc_adjust' type='boolean' value='true' migratable='yes'/> @@ -373,7 +377,7 @@ <property name='kvmclock' type='boolean' value='true' migratable='yes'/> <property name='l3-cache' type='boolean' value='true' migratable='yes'/> <property name='lwp' type='boolean' value='false'/> - <property name='ibpb' type='boolean' value='false'/> + <property name='ibpb' type='boolean' value='true' migratable='yes'/> <property name='xop' type='boolean' value='false'/> <property name='avx' type='boolean' value='true' migratable='yes'/> <property name='ospke' type='boolean' value='false'/> @@ -391,7 +395,7 @@ <property name='xsaves' type='boolean' value='false'/> <property name='tcg-cpuid' type='boolean' value='true' migratable='yes'/> <property name='lm' type='boolean' value='true' migratable='yes'/> - <property name='umip' type='boolean' value='false'/> + <property name='umip' type='boolean' value='true' migratable='yes'/> <property name='pse' type='boolean' value='true' migratable='yes'/> <property name='avx2' type='boolean' value='true' migratable='yes'/> <property name='sep' type='boolean' value='true' migratable='yes'/> @@ -425,7 +429,7 @@ <property name='hv-synic' type='boolean' value='false'/> <property name='xstore' type='boolean' value='false'/> <property name='fxsr_opt' type='boolean' value='false'/> - <property name='kvm-hint-dedicated' type='boolean' value='true' migratable='yes'/> + <property name='kvm-hint-dedicated' type='boolean' value='false'/> <property name='rtm' type='boolean' value='false'/> <property name='lmce' type='boolean' value='true' migratable='yes'/> <property name='hv-time' type='boolean' value='false'/> @@ -435,18 +439,18 @@ <property name='rdrand' type='boolean' value='true' migratable='yes'/> <property name='rdseed' type='boolean' value='false'/> <property name='avx512-4vnniw' type='boolean' value='false'/> - <property name='vmx' type='boolean' value='false'/> + <property name='vmx' type='boolean' value='true' migratable='yes'/> <property name='vme' type='boolean' value='true' migratable='yes'/> <property name='dtes64' type='boolean' value='false'/> <property name='mtrr' type='boolean' value='true' migratable='yes'/> <property name='rdtscp' type='boolean' value='true' migratable='yes'/> <property name='pse36' type='boolean' value='true' migratable='yes'/> - <property name='kvm-pv-tlb-flush' type='boolean' value='false'/> + <property name='kvm-pv-tlb-flush' type='boolean' value='true' migratable='yes'/> <property name='tbm' type='boolean' value='false'/> <property name='wdt' type='boolean' value='false'/> <property name='pause_filter' type='boolean' value='false'/> <property name='sha-ni' type='boolean' value='false'/> - <property name='model-id' type='string' value='Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz'/> + <property name='model-id' type='string' value='Intel(R) Core(TM) i7-4810MQ CPU @ 2.80GHz'/> <property name='abm' type='boolean' value='true' migratable='yes'/> <property name='avx512pf' type='boolean' value='false'/> <property name='xstore-en' type='boolean' value='false'/> @@ -466,6 +470,7 @@ <property name='xsavec' type='boolean' value='false'/> <property name='intel-pt' type='boolean' value='false'/> <property name='osxsave' type='boolean' value='false'/> + <property name='hv-frequencies' type='boolean' value='false'/> <property name='tsc-frequency' type='number' value='0'/> <property name='xd' type='boolean' value='true' migratable='yes'/> <property name='hv-vendor-id' type='string' value=''/> @@ -724,9 +729,7 @@ <blocker name='3dnow'/> </cpu> <cpu type='kvm' name='Westmere' usable='yes'/> - <cpu type='kvm' name='Westmere-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Westmere-IBRS' usable='yes'/> <cpu type='kvm' name='Skylake-Server' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> @@ -763,7 +766,6 @@ <blocker name='avx512cd'/> <blocker name='avx512bw'/> <blocker name='avx512vl'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> @@ -793,7 +795,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> @@ -801,9 +802,7 @@ <blocker name='mpx'/> </cpu> <cpu type='kvm' name='SandyBridge' usable='yes'/> - <cpu type='kvm' name='SandyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='SandyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='Penryn' usable='yes'/> <cpu type='kvm' name='Opteron_G5' usable='no'> <blocker name='sse4a'/> @@ -827,25 +826,18 @@ <cpu type='kvm' name='Opteron_G2' usable='yes'/> <cpu type='kvm' name='Opteron_G1' usable='yes'/> <cpu type='kvm' name='Nehalem' usable='yes'/> - <cpu type='kvm' name='Nehalem-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Nehalem-IBRS' usable='yes'/> <cpu type='kvm' name='IvyBridge' usable='yes'/> - <cpu type='kvm' name='IvyBridge-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='IvyBridge-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> </cpu> <cpu type='kvm' name='Haswell-noTSX' usable='yes'/> - <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='no'> - <blocker name='spec-ctrl'/> - </cpu> + <cpu type='kvm' name='Haswell-noTSX-IBRS' usable='yes'/> <cpu type='kvm' name='Haswell-IBRS' usable='no'> <blocker name='hle'/> <blocker name='rtm'/> - <blocker name='spec-ctrl'/> </cpu> <cpu type='kvm' name='EPYC' usable='no'> <blocker name='rdseed'/> @@ -876,7 +868,6 @@ <blocker name='misalignsse'/> <blocker name='3dnowprefetch'/> <blocker name='osvw'/> - <blocker name='ibpb'/> <blocker name='xsavec'/> <blocker name='xgetbv1'/> </cpu> @@ -899,7 +890,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='Broadwell-IBRS' usable='no'> @@ -908,7 +898,6 @@ <blocker name='rdseed'/> <blocker name='adx'/> <blocker name='smap'/> - <blocker name='spec-ctrl'/> <blocker name='3dnowprefetch'/> </cpu> <cpu type='kvm' name='486' usable='yes'/> @@ -1214,6 +1203,7 @@ <machine name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/> + <machine name='xenfv' hotplugCpus='yes' maxCpus='128'/> <machine name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/> @@ -1222,6 +1212,7 @@ <machine name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/> + <machine name='xenpv' maxCpus='1'/> <machine name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/> <machine name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/> <machine name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/> -- 2.14.3

4 6