- Devel - libvirt List Archives

[libvirt] [PATCH] tests: remove FLAG_JSON from xml2argvtest
by Ján Tomko 12 Apr '18

12 Apr '18

Unused as of commit <1e9a083>. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial. tests/qemuxml2argvtest.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3a328e02a2..472f7b28fe 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -265,8 +265,7 @@ static virStorageDriver fakeStorageDriver = { typedef enum { FLAG_EXPECT_FAILURE = 1 << 0, FLAG_EXPECT_PARSE_ERROR = 1 << 1, - FLAG_JSON = 1 << 2, - FLAG_FIPS = 1 << 3, + FLAG_FIPS = 1 << 2, } virQemuXML2ArgvTestFlags; struct testInfo { @@ -462,9 +461,6 @@ testCompareXMLToArgv(const void *data) virSetConnectSecret(conn); virSetConnectStorage(conn); - if (virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_MONITOR_JSON)) - flags |= FLAG_JSON; - if (virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_ENABLE_FIPS)) flags |= FLAG_FIPS; -- 2.16.1

1 0

[libvirt] [PATCH 0/8] Simplify & standarize more parts of driver URI handling
by Daniel P. Berrangé 12 Apr '18

12 Apr '18

The motivating goal of this series was/is to make it possible to answer whether there is any driver registered to handle a given URI scheme without having to call into the drivers. Ultimately this ended up being a nice simplification and cleanup of driver URI opening code, removing repetative logic from all drivers. Daniel P. Berrangé (8): xen: encourage use of xen:///system URI as preferred format lxc: allow use of lxc:///system URI as preferred format driver: introduce a driver method for probing default URIs driver: allow drivers to indicate if they permit remote connections driver: declare supported URI schemes in virConnectDriver struct driver: ensure NULL URI isn't passed to drivers with whitelisted URIs driver: enforce a non-NULL URI scheme driver: ensure URI path is non-NULL to simplify drivers docs/drvlxc.html.in | 34 ++++++------- docs/drvxen.html.in | 14 +++--- docs/hvsupport.pl | 6 +-- docs/remote.html.in | 6 +-- docs/uri.html.in | 16 +++---- examples/lxcconvert/virt-lxc-convert | 2 +- src/bhyve/bhyve_driver.c | 48 +++++++++---------- src/driver-hypervisor.h | 4 ++ src/driver.h | 8 ++++ src/esx/esx_driver.c | 31 +----------- src/hyperv/hyperv_driver.c | 24 +--------- src/interface/interface_backend_netcf.c | 47 +++++++----------- src/interface/interface_backend_udev.c | 47 +++++++----------- src/libvirt.c | 69 +++++++++++++++++++++++--- src/libxl/libxl_driver.c | 58 +++++++++++----------- src/lxc/lxc_driver.c | 56 ++++++++++------------ src/lxc/lxc_process.c | 4 +- src/network/bridge_driver.c | 47 +++++++----------- src/node_device/node_device_driver.c | 45 +++++++---------- src/node_device/node_device_hal.c | 2 + src/node_device/node_device_udev.c | 2 + src/nwfilter/nwfilter_driver.c | 35 +++++--------- src/openvz/openvz_driver.c | 70 +++++++++++++-------------- src/phyp/phyp_driver.c | 9 +--- src/qemu/qemu_driver.c | 85 +++++++++++++++------------------ src/remote/remote_driver.c | 74 +++++++++++++--------------- src/secret/secret_driver.c | 47 +++++++----------- src/storage/storage_driver.c | 47 +++++++----------- src/test/test_driver.c | 18 ++----- src/uml/uml_driver.c | 71 +++++++++++++-------------- src/vbox/vbox_common.c | 26 ++++------ src/vbox/vbox_driver.c | 18 ++----- src/vmware/vmware_driver.c | 29 ++++------- src/vz/vz_driver.c | 25 ++-------- src/xenapi/xenapi_driver.c | 6 +-- tools/libvirt-guests.sysconf | 2 +- tools/virsh.pod | 4 +- tools/virt-login-shell.c | 2 +- 38 files changed, 489 insertions(+), 649 deletions(-) -- 2.14.3

2 13

[libvirt] CfP for VHPC ‘18 - Papers due May 15 (extended) for the 13th Virtualization in High-Performance Cloud Computing Workshop
by VHPC 18 12 Apr '18

12 Apr '18

*Please accept our apologies if you receive multiple copies of this Call for Papers====================================================================CALL FOR PAPERS 13th Workshop on Virtualization in High-Performance Cloud Computing (VHPC '18)held in conjunction with the International Supercomputing Conference - High Performance,June 24-28, 2018, Frankfurt, Germany.(Springer LNCS Proceedings) ====================================================================Date: June 28, 2018Workshop URL: http://vhpc.org <http://vhpc.org>Paper Submission Deadline: May 15, 2018 (extended)Springer LNCS, rolling abstract submissionAbstract/Paper Submission Link: https://edas.info/newPaper.php?c=24355 <https://edas.info/newPaper.php?c=24355>Special Track: GPU - Accelerator Virtualization Call for PapersVirtualization technologies constitute a key enabling factor for flexible resource managementin modern data centers, and particularly in cloud environments. Cloud providers need tomanage complex infrastructures in a seamless fashion to support the highly dynamic andheterogeneous workloads and hosted applications customers deploy. Similarly, HPCenvironments have been increasingly adopting techniques that enable flexible managementof vast computing and networking resources, close to marginal provisioning cost, which isunprecedented in the history of scientific and commercial computing.Various virtualization technologies contribute to the overall picture in different ways: machinevirtualization, with its capability to enable consolidation of multiple underutilized servers withheterogeneous software and operating systems (OSes), and its capability to live-migrate afully operating virtual machine (VM) with a very short downtime, enables novel and dynamicways to manage physical servers; OS-level virtualization (i.e., containerization), with itscapability to isolate multiple user-space environments and to allow for their coexistencewithin the same OS kernel, promises to provide many of the advantages of machine virtualization with high levels of responsiveness and performance; I/O Virtualization allows physical network interfaces to take traffic from multiple VMs or containers; network virtualization, with its capability to create logical network overlays that are independent of theunderlying physical topology is furthermore enabling virtualization of HPC infrastructures. PublicationAccepted papers will be published in a Springer LNCS proceedings volume.Topics of InterestThe VHPC program committee solicits original, high-quality submissions related tovirtualization across the entire software stack with a special focus on the intersection of HPCand the cloud.Major Topics- Virtualization in supercomputing environments, HPC clusters, HPC in the cloud and grids- OS-level virtualization and containers (LXC, Docker, rkt, Singularity, Shifter, i.a.)- Lightweight/specialized operating systems in conjunction with virtual machines- Novel unikernels and use cases for virtualized HPC environments- Performance improvements for or driven by unikernels- Tool support for unikernels: configuration/build environments, debuggers, profilers- Hypervisor extensions to mitigate side-channel attacks ([micro-]architectural timing attacks, privilege escalation)- VM & Container trust and security- Containers inside VMs with hypervisor isolation- GPU virtualization operationalization- Approaches to GPGPU virtualization including API remoting and hypervisor abstraction- Optimizations of virtual machine monitor platforms and hypervisors- Hypervisor support for heterogeneous resources (GPUs, co-processors, FPGAs, etc.)- Virtualization support for emerging memory technologies- Virtualization in enterprise HPC and microvisors- Software defined networks and network virtualization- Management, deployment of virtualized environments and orchestration (Kubernetes i.a.)- Workflow-pipeline container-based composability - Checkpointing facilitation utilizing containers and VMs - Emerging topics including multi-kernel approaches and NUMA in hypervisors- Operating MPI in containers/VMs and Unikernels - Virtualization in data intensive computing (big data) - HPC convergence- Adaptation of HPC technologies in the cloud (high performance networks, RDMA, etc.)- Performance measurement, modelling and monitoring of virtualized/cloud workloads- Latency-and jitter sensitive workloads in virtualized/containerized environments- I/O virtualization (including applications, SR-IOV, i.a.) - Hybrid local facility + cloud compute and based storage systems, cloudbursting- FPGA and many-core accelerator virtualization- Job scheduling/control/policy and container placement in virtualized environments- Cloud reliability, fault-tolerance and high-availability- QoS and SLA in virtualized environments- IaaS platforms, cloud frameworks and APIs- Energy-efficient and power-aware virtualization- Configuration management tools for containers (including in OpenStack, Ansible, i.a.)- ARM-based hypervisors, ARM virtualization extensionsSpecial Track: GPU - Accelerator VirtualizationGPU virtualization technologies, performance and benchmarking, integration withworkflow scheduling systems, integration to cluster managers.GPUs are taking on many HPC workload areas, especially in deep learning withinmachine learning. In addition, a lot of workload is being pushed to elastic environments utilizing various virtualization technologies on different levels like hypervisors (e.g. VMWare, Xen, KVM), kernel (Docker, Kubernetes) or on the resource managerlevel (YARN, Mesos). In this track we invite submissions addressing these problems. Suggested Themes and Topics:Technology - What technologies and best practices exist for GPU - hardware accelerator virtualization and usage of hardware accelerators in virtual environments on the hypervisor, kernel or resource manager levelDevelopers - Real-life experience when addressing HPC/ML/DL problems with GPUs or hardware accelerators in virtual environmentsPerformance - Performance comparisons between different technologies / solutionsThe Workshop on Virtualization in High-Performance Cloud Computing (VHPC) aims tobring together researchers and industrial practitioners facing the challenges posed by virtualization in order to foster discussion, collaboration, mutual exchangeof knowledge and experience, enabling research to ultimately provide novelsolutions for virtualized computing systems of tomorrow.The workshop will be one day in length, composed of 20 min paper presentations, eachfollowed by 10 min discussion sections, plus lightning talks that are limited to 5 minutes.Presentations may be accompanied by interactive demonstrations.KeynotesGregory M. Kurtzer, CEO Syslabs Inc. Singularity: Application containers using operating system environment virtualization.Josh Simons, HPC Chief Technologist, VMWare, Inc. Practical Aspects of On-Premises Virtualized High Performance Computing.Important DatesMay 15, 2018 (extended) - Paper submission deadline (Springer LNCS)May 30, 2018 - Acceptance notification June 28, 2018 - Workshop DayJuly 12, 2018 - Camera-ready version dueChairMichael Alexander (chair), Institute of Science and Technology, AustriaAnastassios Nanos (co-chair), OnApp, UKRomeo Kienzler (co-chair), IBM, SwitzerlandProgram committeeStergios Anastasiadis, University of Ioannina, Greece Jakob Blomer, CERN, Europe Eduardo César, Universidad Autonoma de Barcelona, SpainStephen Crago, USC ISI, USATommaso Cucinotta, St. Anna School of Advanced Studies, ItalyChristoffer Dall, Columbia University, USAFrançois Diakhaté, CEA, FrancePatrick Dreher, MIT, USA Kyle Hale, Northwestern University, USA Brian Kocoloski, University of Pittsburgh, USAUday Kurkure, VMware, USAJohn Lange, University of Pittsburgh, USAGiuseppe Lettieri, University of Pisa, ItalyQing Liu, Oak Ridge National Laboratory, USANikos Parlavantzas, IRISA, FranceKevin Pedretti, Sandia National Laboratories, USAAmer Qouneh, Western New England University, USA Carlos Reaño, Technical University of Valencia, SpainBorja Sotomayor, University of Chicago, USA Anata Tiwari, San Diego Supercomputer Center, USAKurt Tutschku, Blekinge Institute of Technology, Sweden Yasuhiro Watashiba, Osaka University, JapanChao-Tung Yang, Tunghai University, Taiwan Andrew Younge, Sandia National Laboratory, USANa Zhang, VMware, USAPaper Submission-PublicationPapers submitted to the workshop will be reviewed by at least twomembers of the program committee and external reviewers. Submissionsshould include abstract, keywords, the e-mail address of thecorresponding author, and must not exceed 10 pages, including tablesand figures at a main font size no smaller than 11 point. Submissionof a paper should be regarded as a commitment that, should the paperbe accepted, at least one of the authors will register and attend theconference to present the work. Accepted papers will be published in aSpringer LNCS volume.The format must be according to the Springer LNCS Style. Initialsubmissions are in PDF; authors of accepted papers will be requestedto provide source files.Format Guidelines:ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip <ftp://ftp.springer.de/pub/tex/latex/llncs/latex2e/llncs2e.zip>Abstract, Paper Submission Link:https://edas.info/newPaper.php?c=24355 <https://edas.info/newPaper.php?c=24355>Lightning Talks Lightning Talks are non-paper track, synoptical in nature and are strictly limited to 5 minutes.They can be used to gain early feedback on ongoing research, for demonstrations, to present research results, early research ideas, perspectives and positions of interest to the community. Submit abstract via the main submission link. General InformationThe workshop is one day in length and will be held in conjunction with the InternationalSupercomputing Conference - High Performance (ISC) 2018, June 24-28, Frankfurt, Germany.*

1 0

[libvirt] [jenkins-ci PATCH] jobs: Unset $CC for Go and MinGW jobs
by Andrea Bolognani 12 Apr '18

12 Apr '18

We want $CC to be set so that ccache is used by default, but some jobs (Go and MinGW) don't like that very much. Later on, we might consider building a link farm so that we can use ccache without having to set $CC; for the time being, work around the issue at the job level. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- jobs/autotools.yaml | 7 +++++++ jobs/go.yaml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/jobs/autotools.yaml b/jobs/autotools.yaml index 98bb1b0..b882803 100644 --- a/jobs/autotools.yaml +++ b/jobs/autotools.yaml @@ -223,6 +223,10 @@ - shell: | {global_env} {local_env} + # The way we perform MinGW builds doesn't play well with the $CC + # variable containing whitespace, so we have to unset it here. + export CC= + mkdir -p build32 cd build32 @@ -235,6 +239,9 @@ - shell: | {global_env} {local_env} + # See above + export CC= + mkdir -p build64 cd build64 diff --git a/jobs/go.yaml b/jobs/go.yaml index 29a9f51..2634cb2 100644 --- a/jobs/go.yaml +++ b/jobs/go.yaml @@ -42,6 +42,11 @@ - shell: | {global_env} {local_env} + # go doesn't handle the $CC variable containing whitespace + # correctly, so we have to make sure it's unset when building. + # See https://github.com/golang/go/issues/11685 + export CC= + go build -v publishers: - email: @@ -80,6 +85,9 @@ - shell: | {global_env} {local_env} + # See above + export CC= + go test $TEST_ARGS publishers: - email: -- 2.14.3

2 1

[libvirt] [PATCH] qemu: use target.port for isa-serial
by Thilo Cestonaro 12 Apr '18

12 Apr '18

A configured target.port is currently totaly ignored, while contsructing qemu commandline, for all types of serial devices. This patch adds a -device parameter "index" for the target model isa-serial. This enables the user to specify which serial device will end in which ttySX device. Signed-off-by: Thilo Cestonaro <thilo.cestonaro(a)ts.fujitsu.com> --- Forgot to sign off! Here with Signed-off-by. src/qemu/qemu_command.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 514c3ab2e..5f770404b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10291,6 +10291,22 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrSerialTargetModelTypeToString(serial->targetModel), serial->info.alias, serial->info.alias); + switch ((virDomainChrSerialTargetModel) serial->targetModel) { + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL: + if (serial->target.port != -1) + virBufferAsprintf(&cmd, ",index=%d", serial->target.port); + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: + break; + } + if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0) goto error; -- 2.15.1

3 2

[libvirt] [jenkins-ci PATCH 00/10] guests: Improve enviroment handling
by Andrea Bolognani 12 Apr '18

12 Apr '18

The basic goal is to move all environment configuration that affects builds to a single place which is tracked along with all other changes to the CI environment. Patch 8/10 also happens to fix build of packages that depend on libvirt-perl on FreeBSD now that they've switched to Perl 5.26, though we haven't run into this specific problem yet due to other issues in the CI enviroment ;) Andrea Bolognani (10): guests: Rename compat -> kludges guests: Enable ~/.bashrc on FreeBSD guests: Add custom shell profile guests: Move ccache configuration to shell profile guests: Move make configuration to shell profile guests: Move $PATH configuration to shell profile guests: Add more enviroment variables to shell profile guests: Move Perl configuration to shell profile guests: Add Python configuration to shell profile guests: Remove per-host make variable guests/group_vars/all/main.yml | 15 ++++++++++--- guests/host_vars/libvirt-centos-6/main.yml | 3 +++ guests/host_vars/libvirt-centos-7/main.yml | 3 +++ guests/host_vars/libvirt-debian-8/main.yml | 3 +++ guests/host_vars/libvirt-debian-9/main.yml | 3 +++ guests/host_vars/libvirt-debian-sid/main.yml | 3 +++ guests/host_vars/libvirt-fedora-26/main.yml | 3 +++ guests/host_vars/libvirt-fedora-27/main.yml | 3 +++ guests/host_vars/libvirt-fedora-rawhide/main.yml | 3 +++ guests/host_vars/libvirt-freebsd-10/main.yml | 4 +++- guests/host_vars/libvirt-freebsd-11/main.yml | 4 +++- guests/host_vars/libvirt-freebsd-current/main.yml | 4 +++- guests/host_vars/libvirt-ubuntu-14/main.yml | 3 +++ guests/host_vars/libvirt-ubuntu-16/main.yml | 3 +++ guests/site.yml | 2 +- guests/tasks/{compat.yml => kludges.yml} | 18 +++++++++++++++ guests/tasks/users.yml | 27 +++++++++++------------ guests/templates/bash_profile | 1 + guests/templates/bashrc | 15 +++++++++++++ jobs/defaults.yaml | 6 ----- 20 files changed, 99 insertions(+), 27 deletions(-) rename guests/tasks/{compat.yml => kludges.yml} (59%) create mode 100644 guests/templates/bash_profile create mode 100644 guests/templates/bashrc -- 2.14.3

3 32

[libvirt] [PATCH 00/10] Add support for VM Generation ID (vmgenid)
by John Ferlan 12 Apr '18

12 Apr '18

As a result of the RFC: https://www.redhat.com/archives/libvir-list/2018-March/msg01214.html Patches to support changes for https://bugzilla.redhat.com/show_bug.cgi?id=1149445 The first patch isn't necessarily related, but since it I was looking at the all the virUUIDGenerate calls, I figured I'd include it here. It can be consider separately. I did leave in the possibility that someone can supply a GUID in the XML; however, that can be removed - requiring that just the <genid/> exists and forcing every usage to generate the GUID. The spec isn't 100% clear on whether that's a valid use. One area which I'm still a little bit fuzzy on is the snapshot functionality. The transitions while running won't work unless/until the qemu command to set the genid GUID value are accepted. It'd be tough to fail, but according to how I've read the spec it'd be required to change the GUID value and since we cannot do so, failure is the only option. John Ferlan (10): Check return status for virUUIDGenerate conf: Modify last arg to virDomainDefCopy qemu: Add flags to qemuDomainMigratableDefCheckABIStability conf: Add VM Generation ID to virDomainDef conf: Add flag to regenerate genid for virDomainDefCopy conf: Add VM Generation ID parse/format support qemu: Add VM Generation ID device capability qemu: Handle genid processing during startup/launch qemu: Add VM Generation ID to qemu command line docs: Add news article for VM Generation ID docs/formatdomain.html.in | 29 ++++++ docs/news.xml | 12 +++ docs/schemas/domaincommon.rng | 8 ++ src/conf/domain_conf.c | 81 +++++++++++++++- src/conf/domain_conf.h | 19 +++- src/conf/network_conf.c | 2 +- src/conf/secret_conf.c | 2 +- src/libxl/libxl_domain.c | 4 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 31 ++++++ src/qemu/qemu_domain.c | 23 +++-- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_driver.c | 31 ++++-- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_process.c | 110 +++++++++++++++++++++- src/qemu/qemu_process.h | 1 + src/test/test_driver.c | 6 +- src/xenconfig/xen_common.c | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + tests/qemuxml2argvdata/genid-auto.args | 21 +++++ tests/qemuxml2argvdata/genid-auto.xml | 32 +++++++ tests/qemuxml2argvdata/genid.args | 21 +++++ tests/qemuxml2argvdata/genid.xml | 32 +++++++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmloutdata/genid-active.xml | 32 +++++++ tests/qemuxml2xmloutdata/genid-auto-active.xml | 32 +++++++ tests/qemuxml2xmloutdata/genid-auto-inactive.xml | 32 +++++++ tests/qemuxml2xmloutdata/genid-inactive.xml | 32 +++++++ tests/qemuxml2xmltest.c | 5 +- 33 files changed, 585 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/genid-auto.args create mode 100644 tests/qemuxml2argvdata/genid-auto.xml create mode 100644 tests/qemuxml2argvdata/genid.args create mode 100644 tests/qemuxml2argvdata/genid.xml create mode 100644 tests/qemuxml2xmloutdata/genid-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-active.xml create mode 100644 tests/qemuxml2xmloutdata/genid-auto-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/genid-inactive.xml -- 2.13.6

3 16

[libvirt] [PATCH 0/9] Add Jansson support
by Ján Tomko 12 Apr '18

12 Apr '18

Prefer Jansson, but allow fallback/choice of yajl. Support for yajl can hopefully be dropped after we ditch CentOS 6 which has no Jansson. Ján Tomko (9): virmacmaptest: depend on yajl for 'empty' test virjsontest: Use a more stable floating point number for testing configure: rename LIBVIRT_*_YAJL to LIBVIRT_*_JSON Introduce WITH_JSON Introduce JSON_CFLAGS and JSON_LIBS virt-json.m4: generalize yajl dependency build: link setuid_rpc_client against JSON_LIBS virjson: add support for Jansson virt-json.m4: simplify QEMU check configure.ac | 10 +- m4/virt-json.m4 | 86 ++++++++++++++++ m4/virt-yajl.m4 | 55 ----------- src/Makefile.am | 9 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_driver.c | 4 +- src/util/Makefile.inc.am | 4 +- src/util/virjson.c | 219 +++++++++++++++++++++++++++++++++++++++++ tests/Makefile.am | 12 +-- tests/cputest.c | 16 +-- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 2 +- tests/qemucapabilitiestest.c | 2 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucommandutiltest.c | 2 +- tests/qemuhelptest.c | 2 +- tests/qemuhotplugtest.c | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/virjsontest.c | 2 +- tests/virmacmaptest.c | 3 + tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 2 +- tests/virstoragetest.c | 4 +- 23 files changed, 354 insertions(+), 96 deletions(-) create mode 100644 m4/virt-json.m4 delete mode 100644 m4/virt-yajl.m4 -- 2.16.1

3 22

[libvirt] [PATCH] conf: Actually make virDomainChrSourceDef an object
by Michal Privoznik 12 Apr '18

12 Apr '18

In 2ada9ef1465f we've tried to turn virDomainChrSourceDef into virObject. Well, this requires 'virObject' member to be stored on the first position of the struct. This adjustment is missing in the original commit leading to all sorts of funny memleaks and data corruptions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 89a7131fdb..1426f115ed 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -57,6 +57,7 @@ # include "virtypedparam.h" # include "virsavecookie.h" # include "virresctrl.h" +# include "virobject.h" /* forward declarations of all device types, required by * virDomainDeviceDef @@ -1180,6 +1181,7 @@ typedef virDomainChrSourceReconnectDef *virDomainChrSourceReconnectDefPtr; /* The host side information for a character device. */ struct _virDomainChrSourceDef { + virObject parent; int type; /* virDomainChrType */ virObjectPtr privateData; union { -- 2.16.1

5 5

[libvirt] [dbus PATCH 0/6] More methods for Domain interface
by Katerina Koukiou 12 Apr '18

12 Apr '18

Katerina Koukiou (6): Implement Setter for Autostart property for Domain interface Implement SchedulerType property for Domain Interface Introduce virtDBusDomainMemoryStatTypeToString helper function Implement MemoryStats for Domain Interface Implement AttachDevice method for Domain Interface Implement DetachDevice method for Domain Interface data/org.libvirt.Domain.xml | 28 +++++++- src/domain.c | 166 +++++++++++++++++++++++++++++++++++++++++++- test/test_domain.py | 10 +++ 3 files changed, 201 insertions(+), 3 deletions(-) -- 2.15.0

1 3

[libvirt] [jenkins-ci PATCH] guests: Clean up packages after update
by Andrea Bolognani 12 Apr '18

12 Apr '18

The package cache can grow to eat up a lot of disk space, and not removing unused packages can lead to upgrade issues down the line for fast moving distributions such as Fedora Rawhide. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/base.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/guests/tasks/base.yml b/guests/tasks/base.yml index 53cbd65..f419433 100644 --- a/guests/tasks/base.yml +++ b/guests/tasks/base.yml @@ -117,6 +117,25 @@ when: - package_format == 'pkg' +- name: Clean up packages after update + command: yum clean packages -y + args: + warn: no + when: + - package_format == 'rpm' + +- name: Clean up packages after update + apt: + autoclean: yes + autoremove: yes + when: + - package_format == 'deb' + +- name: Clean up packages after update + shell: pkg clean -y && pkg autoremove -y + when: + - package_format == 'pkg' + - name: Configure hostname hostname: name: '{{ inventory_hostname }}' -- 2.14.3

3 4

[libvirt] [dbus PATCH 0/6] More methods for Domain Interface
by Katerina Koukiou 12 Apr '18

12 Apr '18

Katerina Koukiou (6): Implement Setter for Autostart property for Domain interface Implement SchedulerType property for Domain Interface Introduce virtDBusDomainMemoryStatTypeToString helper function Implement MemoryStats for Domain Interface Implement AttachDevice method for Domain Interface Implement DetachDevice method for Domain Interface data/org.libvirt.Domain.xml | 28 +++++++- src/domain.c | 166 +++++++++++++++++++++++++++++++++++++++++++- test/test_domain.py | 10 +++ 3 files changed, 201 insertions(+), 3 deletions(-) -- 2.15.0

1 6

[libvirt] [jenkins-ci PATCH] guests: Fix intltool-update on FreeBSD
by Andrea Bolognani 12 Apr '18

12 Apr '18

The tool became completely unusable after the switch to Perl 5.26; workaround the issue while we wait for a proper solution. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Using regexes to match regexes: it's regexception. guests/tasks/kludges.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/guests/tasks/kludges.yml b/guests/tasks/kludges.yml index d0ff6cb..4dd06a4 100644 --- a/guests/tasks/kludges.yml +++ b/guests/tasks/kludges.yml @@ -46,3 +46,16 @@ command: cap_mkdb /etc/login.conf when: - loginconf.changed + +# FreeBSD switched to Perl 5.26, which makes a long existing warning in +# intltool-update turn into an error and causes jobs to fail. While we +# wait for the port to be fixed, we can patch things up ourselves. +# +# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227444 +- name: Fix intltool-update + replace: + path: /usr/local/bin/intltool-update + regexp: '^(.*) !~ /\\\$\{\?\$2\}\?/;$' + replace: '\1 !~ /\\$\\{?$2}?/;' + when: + - os_name == 'FreeBSD' -- 2.14.3

2 1

[libvirt] [PATCH jenkins-ci] Run "make check" for osinfo-db
by Daniel P. Berrangé 12 Apr '18

12 Apr '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- projects/osinfo-db.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/osinfo-db.yaml b/projects/osinfo-db.yaml index 0dd73b5..7f83722 100644 --- a/projects/osinfo-db.yaml +++ b/projects/osinfo-db.yaml @@ -17,8 +17,12 @@ command: | $MAKE -j{smp} all $MAKE install OSINFO_DB_TARGET="--system" - - generic-rpm-job: + - generic-check-job: parent_jobs: 'osinfo-db-master-build' + command: | + $MAKE -j{smp} check + - generic-rpm-job: + parent_jobs: 'osinfo-db-master-check' machines: - libvirt-centos-7 - libvirt-fedora-26 -- 2.14.3

3 2

[libvirt] path for user provided all-guest-read-only content
by Christian Ehrhardt 12 Apr '18

12 Apr '18

Feel free to read [1] for context, here the quote that made me poll for opinions: "it would be nice in the future to have some standardized path for user provided guest-read-only stuff" The TL;DR of their case is: - extra info they want to pass, but is not part of libvirts guest description (qemu-cmdline in their case) - apparmor blocks their access to an unknown path There are no reliable paths today to put data for a guest. Guests are names with their ID in the paths - so even knowing the guest name - they are not predictable (for example /var/lib/libvirt/qemu/domain-1-guestname/ might be different next time). Due to that I can see their use-case for "let all read from there", but OTOH "let all" always feels wrong at first from a security POV. Therefore i wanted to poll for opinions on this before suggesting any change. [1]: https://github.com/coreos/bugs/issues/2083#issuecomment-380404427 -- Christian Ehrhardt Software Engineer, Ubuntu Server Canonical Ltd

2 1

[libvirt] [PATCH] vbox: Make vboxCommonDriver static
by Michal Privoznik 12 Apr '18

12 Apr '18

This is a global variable, but it isn't accessible from outside of the file its declared in. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/vbox/vbox_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 3bcca43d32..b5f8456f8d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -7978,7 +7978,7 @@ vboxDomainSendKey(virDomainPtr dom, * Function Tables */ -virHypervisorDriver vboxCommonDriver = { +static virHypervisorDriver vboxCommonDriver = { .name = "VBOX", .connectOpen = vboxConnectOpen, /* 0.6.3 */ .connectClose = vboxConnectClose, /* 0.6.3 */ -- 2.16.1

1 0

[libvirt] virNetSocketNewListenTCP tries just one address
by Olaf Hering 11 Apr '18

11 Apr '18

To rescue this bug from the noise in a subthread: If a hostname resolves to more than one address and the host currently configured itself for just IPv4, doing a bind() to some IPv6 address will fail. As a result an error is returned instead of continuing with the next item in 'runp'. > Mär 20 09:35:52 macintyre-old libvirtd[4527]: 2018-03-20 08:35:52.521+0000: 4531: error : virNetSocketNewListenTCP:389 : Unable to bind to port: Cannot assign requested address After further debugging: 27672 16:04:46.774906 socket(PF_INET6, SOCK_STREAM, IPPROTO_TCP) = 35 27672 16:04:46.775041 setsockopt(35, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0 27672 16:04:46.775172 setsockopt(35, SOL_IPV6, IPV6_V6ONLY, [1], 4) = 0 27672 16:04:46.775302 bind(35, {sa_family=AF_INET6, sin6_port=htons(49152), inet_pton(AF_INET6, "2620:113:80c0:8000:10:161:8:197", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = -1 EADDRNOTAVAIL (Cannot assign requested address) 27672 16:04:46.775455 gettid() = 27672 27672 16:04:46.775590 write(4, "2018-03-20 15:04:46.775+0000: 27672: error : virNetSocketNewListenTCP:389 : Unable to bind to port: Cannot assign requested address\n", 132) = 132 27672 16:04:46.775742 gettid() = 27672 27672 16:04:46.775875 write(4, "2018-03-20 15:04:46.775+0000: 27672: info : virObjectUnref:350 : OBJECT_UNREF: obj=0x7fa4bc003530\n", 98) = 98 27672 16:04:46.776026 gettid() = 27672 So for some reason libvirtd tries to bind to ipv6 even if the host does not have that ipv6 address at this point, only the link-local address. Not sure if there is a way to detect that within libvirt. Perhaps it should just move on with the runp list and try the next one? Olaf

3 6

[libvirt] [PATCH] news: announce dropping of legacy Xen driver
by Jim Fehlig 11 Apr '18

11 Apr '18

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Not sure if removal of a feature is a feature, but this seems better placed under "New features" than "Improvements" or "Bug fixes". docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 798ab6da4..106979cc1 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -44,6 +44,16 @@ add this controller when traditional PCI devices are in use. </description> </change> + <change> + <summary> + Xen: Drop the legacy xend-based driver + </summary> + <description> + The xm/xend toolstack was deprecated in Xen 4.2 and removed + from the Xen sources in the 4.5 development cycle. The libvirt + driver based on xend is now removed from the libvirt sources. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.16.3

2 2

[libvirt] [PATCH] qemu: Format gic-version=2 on the command line
by Andrea Bolognani 11 Apr '18

11 Apr '18

Up until now we have only formatted non-default GIC versions on the command line, in order to maintain compatibility with older QEMU versions that didn't implement the gic-version option to begin with; however, doing so is entirely unnecessary for newer QEMU versions, where the option is available. Moreover, having the GIC version formatted on the command line at all times ensures that QEMU changing its own defaults doesn't affect the ABI of libvirt guests. A few test cases are removed to avoid extra churn. It doesn't matter for coverage, as those scenarios are already covered by other parts of the test suite. This patch is better viewed with 'git show -w'. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_command.c | 44 +++++++++++++++++------- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvtest.c | 6 ---- 4 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 682d714419..1ab1e1a285 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7299,21 +7299,39 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, goto cleanup; if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON) { - if (def->gic_version != VIR_GIC_VERSION_NONE) { - /* The default GIC version (GICv2) should not be specified on - * the QEMU commandline for backwards compatibility reasons */ - if (def->gic_version != VIR_GIC_VERSION_2) { - if (!virQEMUCapsGet(qemuCaps, - QEMU_CAPS_MACH_VIRT_GIC_VERSION)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("gic-version option is not available " - "with this QEMU binary")); - goto cleanup; - } + bool hasGICVersionOption = virQEMUCapsGet(qemuCaps, + QEMU_CAPS_MACH_VIRT_GIC_VERSION); + + switch ((virGICVersion) def->gic_version) { + case VIR_GIC_VERSION_2: + if (!hasGICVersionOption) { + /* If the gic-version option is not available, we can't + * configure the GIC; however, we know that before the + * option was introduced the guests would always get a + * GICv2, so in order to maintain compatibility with + * those old QEMU versions all we need to do is stop + * early instead of erroring out */ + break; + } + ATTRIBUTE_FALLTHROUGH; - virBufferAsprintf(&buf, ",gic-version=%s", - virGICVersionTypeToString(def->gic_version)); + case VIR_GIC_VERSION_3: + case VIR_GIC_VERSION_HOST: + if (!hasGICVersionOption) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("gic-version option is not available " + "with this QEMU binary")); + goto cleanup; } + + virBufferAsprintf(&buf, ",gic-version=%s", + virGICVersionTypeToString(def->gic_version)); + break; + + case VIR_GIC_VERSION_NONE: + case VIR_GIC_VERSION_LAST: + default: + break; } } diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args index 4e3c0eee2d..b766a821d5 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args +++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name guest \ -S \ --machine virt,accel=tcg \ +-machine virt,accel=tcg,gic-version=2 \ -cpu cortex-a57 \ -m 1024 \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args index 7e88bbde3f..eec5c4a082 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v2.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args @@ -7,7 +7,7 @@ QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-aarch64 \ -name aarch64test \ -S \ --machine virt,accel=kvm \ +-machine virt,accel=kvm,gic-version=2 \ -cpu host \ -m 1024 \ -smp 1,sockets=1,cores=1,threads=1 \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 308d71f725..dee765d3dd 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2608,8 +2608,6 @@ mymain(void) DO_TEST("aarch64-cpu-passthrough", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_KVM); - DO_TEST_GIC("aarch64-gic-none", GIC_NONE, - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST_GIC("aarch64-gic-none", GIC_NONE, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); @@ -2625,8 +2623,6 @@ mymain(void) DO_TEST_GIC("aarch64-gic-none-tcg", GIC_BOTH, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_GIC("aarch64-gic-default", GIC_NONE, - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST_GIC("aarch64-gic-default", GIC_NONE, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); @@ -2639,8 +2635,6 @@ mymain(void) DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); - DO_TEST_GIC("aarch64-gic-v2", GIC_NONE, - QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT); DO_TEST_GIC("aarch64-gic-v2", GIC_NONE, QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACH_VIRT_GIC_VERSION); -- 2.14.3

2 2

[libvirt] crash in libxlDoMigrateDstReceive in error case
by Olaf Hering 11 Apr '18

11 Apr '18

Jim, while fixing and debugging virNetSocketNewListenTCP in master, I had breakpoints in virNetSocketNewListenTCP and virNetSocketNew. After starting a migration the receiving libvirtd went into both functions. I hit continue a 4 times, but forgot to do it for the fifth call to let it proceed. libvirtd was stuck there for a long time. As a result, when leaving virNetSocketNew, I got a crash in libxlDoMigrateDstReceive -> libxlDomainStartRestore -> libxlDomainStart because args->conn->privateData is NULL. This means 'driver' becomes NULL and things fall apart. I have no checked where privateData is set. I think some place should catch the broken connection and stop the incoming migration. Olaf

1 0

[libvirt] [RFC PATCH 0/4] LXC - Implement save/restore domain state
by Radostin Stoyanov 11 Apr '18

11 Apr '18

This patch set contains rebased version of Katerina's work from GSoC 2016 [1]. It allows integrates CRIU [2] with the libvirt-lxc to enable save/resore of containers. [1] https://wiki.libvirt.org/page/Google_Summer_of_Code_2016/lxc_migration [2] https://criu.org Radostin Stoyanov (4): configure: Include support for CRIU lxc: Add save/restore helper functions lxc: Add restore mode for libvirt-lxc lxc: Add save/restore support configure.ac | 1 + m4/virt-criu.m4 | 27 +++++ po/POTFILES.in | 1 + src/lxc/Makefile.inc.am | 4 + src/lxc/lxc_container.c | 162 ++++++++++++++++++++++++++++-- src/lxc/lxc_container.h | 3 +- src/lxc/lxc_controller.c | 104 ++++++++++++++++++- src/lxc/lxc_criu.c | 253 +++++++++++++++++++++++++++++++++++++++++++++++ src/lxc/lxc_criu.h | 36 +++++++ src/lxc/lxc_driver.c | 238 +++++++++++++++++++++++++++++++++++++++++++- src/lxc/lxc_process.c | 23 ++++- src/lxc/lxc_process.h | 1 + 12 files changed, 836 insertions(+), 17 deletions(-) create mode 100644 m4/virt-criu.m4 create mode 100644 src/lxc/lxc_criu.c create mode 100644 src/lxc/lxc_criu.h -- 2.14.3

3 7

[libvirt] [PATCH 0/2] Fix lxc callers using virDomainObjListRemove
by John Ferlan 11 Apr '18

11 Apr '18

Details in each patch - being consistent for future adjustment. John Ferlan (2): lxc: Fix possible leaked @vm in lxcDomainCreateXMLWithFiles lxc: Fix object locking after virDomainObjListRemove src/lxc/lxc_driver.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- 2.13.6

2 5

[libvirt] [PATCH v2] bhyve: Use virDomainObjListFindBy{UUID|ID}Ref
by John Ferlan 11 Apr '18

11 Apr '18

For bhyveDomObjFromDomain, bhyveDomainLookupByUUID, and bhyveDomainLookupByID let's return a locked and referenced @vm object so that callers can then use the common and more consistent virDomainObjEndAPI in order to handle cleanup rather than needing to know that the returned object is locked and calling virObjectUnlock. The LookupByName already returns the ref counted and locked object, so this will make things more consistent. For bhyveDomainUndefine and bhyveDomainDestroy since the virDomainObjListRemove will return an unlocked object, we need to relock before making the EndAPI call. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Patch 1: https://www.redhat.com/archives/libvir-list/2018-March/msg00490.html of the larger series: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html Changes since v1: * From review, use virObjectLock after virDomainObjListRemove when calling in a path that would have returned a reffed and locked object since virDomainObjListRemove will return an unlocked, but reffed object. src/bhyve/bhyve_driver.c | 62 ++++++++++++++++++------------------------------ 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 849d3abcd3..38e6442db7 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -168,7 +168,7 @@ bhyveDomObjFromDomain(virDomainPtr domain) bhyveConnPtr privconn = domain->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; - vm = virDomainObjListFindByUUID(privconn->domains, domain->uuid); + vm = virDomainObjListFindByUUIDRef(privconn->domains, domain->uuid); if (!vm) { virUUIDFormat(domain->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, @@ -312,8 +312,7 @@ bhyveDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -338,8 +337,7 @@ bhyveDomainGetState(virDomainPtr domain, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -359,8 +357,7 @@ bhyveDomainGetAutostart(virDomainPtr domain, int *autostart) ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -423,8 +420,7 @@ bhyveDomainSetAutostart(virDomainPtr domain, int autostart) cleanup: VIR_FREE(configFile); VIR_FREE(autostartLink); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -443,8 +439,7 @@ bhyveDomainIsActive(virDomainPtr domain) ret = virDomainObjIsActive(obj); cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -463,8 +458,7 @@ bhyveDomainIsPersistent(virDomainPtr domain) ret = obj->persistent; cleanup: - if (obj) - virObjectUnlock(obj); + virDomainObjEndAPI(&obj); return ret; } @@ -484,8 +478,7 @@ bhyveDomainGetOSType(virDomainPtr dom) goto cleanup; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -512,8 +505,7 @@ bhyveDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) virObjectUnref(caps); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -624,14 +616,13 @@ bhyveDomainUndefine(virDomainPtr domain) vm->persistent = 0; } else { virDomainObjListRemove(privconn->domains, vm); - vm = NULL; + virObjectLock(vm); } ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(privconn->domainEventState, event); return ret; @@ -803,7 +794,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn, virDomainObjPtr vm; virDomainPtr dom = NULL; - vm = virDomainObjListFindByUUID(privconn->domains, uuid); + vm = virDomainObjListFindByUUIDRef(privconn->domains, uuid); if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; @@ -819,8 +810,7 @@ bhyveDomainLookupByUUID(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return dom; } @@ -857,7 +847,7 @@ bhyveDomainLookupByID(virConnectPtr conn, virDomainObjPtr vm; virDomainPtr dom = NULL; - vm = virDomainObjListFindByID(privconn->domains, id); + vm = virDomainObjListFindByIDRef(privconn->domains, id); if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, @@ -871,8 +861,7 @@ bhyveDomainLookupByID(virConnectPtr conn, dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return dom; } @@ -913,8 +902,7 @@ bhyveDomainCreateWithFlags(virDomainPtr dom, VIR_DOMAIN_EVENT_STARTED_BOOTED); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(privconn->domainEventState, event); return ret; @@ -1024,12 +1012,11 @@ bhyveDomainDestroy(virDomainPtr dom) if (!vm->persistent) { virDomainObjListRemove(privconn->domains, vm); - vm = NULL; + virObjectLock(vm); } cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); if (event) virObjectEventStateQueue(privconn->domainEventState, event); return ret; @@ -1056,8 +1043,7 @@ bhyveDomainShutdown(virDomainPtr dom) ret = virBhyveProcessShutdown(vm); cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1100,8 +1086,7 @@ bhyveDomainOpenConsole(virDomainPtr dom, ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1143,7 +1128,7 @@ bhyveDomainSetMetadata(virDomainPtr dom, cleanup: virObjectUnref(caps); - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1165,7 +1150,7 @@ bhyveDomainGetMetadata(virDomainPtr dom, ret = virDomainObjGetMetadata(vm, type, uri, flags); cleanup: - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } @@ -1548,8 +1533,7 @@ bhyveDomainHasManagedSaveImage(virDomainPtr domain, unsigned int flags) ret = 0; cleanup: - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); return ret; } -- 2.13.6

2 2

[libvirt] [RFC] add option to configure qcow2 cache sizes in domain xml
by Nikolay Shirokovskiy 11 Apr '18

11 Apr '18

Hi, all. I want to add option to configure qcow2 cache size in domain xml. Looks like this should be a driver option. As driver already has a lot of attributes and even qcow2 has more then one cache I suggest something like this: <driver type="qemu" type="qcow2"> <cache name="l2" size="1024" unit="KiB"/> <cache name="refcount" size="256" unit="KiB"/> </driver> This looks compact but qcow2 has entry size option for cache which don't fit nicely in this approach (you have to use same units for both values). So may be this is better: <driver type="qemu" type="qcow2"> <cache name="l2"> <size unit="KiB">1024</size> <entrysize unit="KiB">4</entrysize> </cache> <cache name="refcount"> <size unit="KiB">256</size> </cache> </driver> Or may be start specifying size and units in one attribute: <driver type="qemu" type="qcow2"> <cache name="l2" size="1MiB" entrysize="4KiB"/> <cache name="refcount" size="256KiB"/> </driver> Also qemu has a feature to specify only one value for caches so that qemu sets l2 and refcount caches in hardcoded 4:1 ratio which is good for images with default refcount_bits=16. On one hand this is nice to have in libvirt xml too so that user can specify only one memory size. On another hand "there's no strict need for both caches to cover the same amount of disk space" [1] and assuming user tuning cache sizes know what he is doing we can live without this option in libvirt xml. I tend to not to add this option to libvirt xml. [1] qemu/docs/qcow2-cache.txt Nikolay

2 1

[libvirt] [PATCH] util: don't check for parallel iteration in hash-related functions
by Vincent Bernat 11 Apr '18

11 Apr '18

This is the responsability of the caller to apply the correct lock before using these functions. Moreover, the use of a simple boolean was still racy: two threads may check the boolean and "lock" it simultaneously. Users of functions from src/util/virhash.c have to be checked for correctness. Lookups and iteration should hold a RO lock. Modifications should hold a RW lock. Most important uses seem to be covered. Callers have now a greater responsability, notably the ability to execute some operations while iterating were reliably forbidden before are now accepted. --- src/util/virhash.c | 37 ---------------------- tests/virhashtest.c | 75 --------------------------------------------- 2 files changed, 112 deletions(-) diff --git a/src/util/virhash.c b/src/util/virhash.c index 0ffbfcce2c64..475c2b0281b2 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -41,12 +41,6 @@ VIR_LOG_INIT("util.hash"); /* #define DEBUG_GROW */ -#define virHashIterationError(ret) \ - do { \ - VIR_ERROR(_("Hash operation not allowed during iteration")); \ - return ret; \ - } while (0) - /* * A single entry in the hash table */ @@ -66,10 +60,6 @@ struct _virHashTable { uint32_t seed; size_t size; size_t nbElems; - /* True iff we are iterating over hash entries. */ - bool iterating; - /* Pointer to the current entry during iteration. */ - virHashEntryPtr current; virHashDataFree dataFree; virHashKeyCode keyCode; virHashKeyEqual keyEqual; @@ -339,9 +329,6 @@ virHashAddOrUpdateEntry(virHashTablePtr table, const void *name, if ((table == NULL) || (name == NULL)) return -1; - if (table->iterating) - virHashIterationError(-1); - key = virHashComputeKey(table, name); /* Check for duplicate entry */ @@ -551,9 +538,6 @@ virHashRemoveEntry(virHashTablePtr table, const void *name) nextptr = table->table + virHashComputeKey(table, name); for (entry = *nextptr; entry; entry = entry->next) { if (table->keyEqual(entry->name, name)) { - if (table->iterating && table->current != entry) - virHashIterationError(-1); - if (table->dataFree) table->dataFree(entry->payload, entry->name); if (table->keyFree) @@ -593,18 +577,11 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) if (table == NULL || iter == NULL) return -1; - if (table->iterating) - virHashIterationError(-1); - - table->iterating = true; - table->current = NULL; for (i = 0; i < table->size; i++) { virHashEntryPtr entry = table->table[i]; while (entry) { virHashEntryPtr next = entry->next; - table->current = entry; ret = iter(entry->payload, entry->name, data); - table->current = NULL; if (ret < 0) goto cleanup; @@ -615,7 +592,6 @@ virHashForEach(virHashTablePtr table, virHashIterator iter, void *data) ret = 0; cleanup: - table->iterating = false; return ret; } @@ -643,11 +619,6 @@ virHashRemoveSet(virHashTablePtr table, if (table == NULL || iter == NULL) return -1; - if (table->iterating) - virHashIterationError(-1); - - table->iterating = true; - table->current = NULL; for (i = 0; i < table->size; i++) { virHashEntryPtr *nextptr = table->table + i; @@ -667,7 +638,6 @@ virHashRemoveSet(virHashTablePtr table, } } } - table->iterating = false; return count; } @@ -723,23 +693,16 @@ void *virHashSearch(const virHashTable *ctable, if (table == NULL || iter == NULL) return NULL; - if (table->iterating) - virHashIterationError(NULL); - - table->iterating = true; - table->current = NULL; for (i = 0; i < table->size; i++) { virHashEntryPtr entry; for (entry = table->table[i]; entry; entry = entry->next) { if (iter(entry->payload, entry->name, data)) { - table->iterating = false; if (name) *name = table->keyCopy(entry->name); return entry->payload; } } } - table->iterating = false; return NULL; } diff --git a/tests/virhashtest.c b/tests/virhashtest.c index 3b85b62c301d..a013bc716943 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -221,32 +221,6 @@ testHashRemoveForEachAll(void *payload ATTRIBUTE_UNUSED, } -const int testHashCountRemoveForEachForbidden = ARRAY_CARDINALITY(uuids); - -static int -testHashRemoveForEachForbidden(void *payload ATTRIBUTE_UNUSED, - const void *name, - void *data) -{ - virHashTablePtr hash = data; - size_t i; - - for (i = 0; i < ARRAY_CARDINALITY(uuids_subset); i++) { - if (STREQ(uuids_subset[i], name)) { - int next = (i + 1) % ARRAY_CARDINALITY(uuids_subset); - - if (virHashRemoveEntry(hash, uuids_subset[next]) == 0) { - VIR_TEST_VERBOSE( - "\nentry \"%s\" should not be allowed to be removed", - uuids_subset[next]); - } - break; - } - } - return 0; -} - - static int testHashRemoveForEach(const void *data) { @@ -311,53 +285,6 @@ testHashIter(void *payload ATTRIBUTE_UNUSED, return 0; } -static int -testHashForEachIter(void *payload ATTRIBUTE_UNUSED, - const void *name ATTRIBUTE_UNUSED, - void *data) -{ - virHashTablePtr hash = data; - - if (virHashAddEntry(hash, uuids_new[0], NULL) == 0) - VIR_TEST_VERBOSE("\nadding entries in ForEach should be forbidden"); - - if (virHashUpdateEntry(hash, uuids_new[0], NULL) == 0) - VIR_TEST_VERBOSE("\nupdating entries in ForEach should be forbidden"); - - if (virHashSteal(hash, uuids_new[0]) != NULL) - VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden"); - - if (virHashSteal(hash, uuids_new[0]) != NULL) - VIR_TEST_VERBOSE("\nstealing entries in ForEach should be forbidden"); - - if (virHashForEach(hash, testHashIter, NULL) >= 0) - VIR_TEST_VERBOSE("\niterating through hash in ForEach" - " should be forbidden"); - return 0; -} - -static int -testHashForEach(const void *data ATTRIBUTE_UNUSED) -{ - virHashTablePtr hash; - int ret = -1; - - if (!(hash = testHashInit(0))) - return -1; - - if (virHashForEach(hash, testHashForEachIter, hash)) { - VIR_TEST_VERBOSE("\nvirHashForEach didn't go through all entries"); - goto cleanup; - } - - ret = 0; - - cleanup: - virHashFree(hash); - return ret; -} - - static int testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED, const void *name, @@ -628,9 +555,7 @@ mymain(void) DO_TEST("Remove", Remove); DO_TEST_DATA("Remove in ForEach", RemoveForEach, Some); DO_TEST_DATA("Remove in ForEach", RemoveForEach, All); - DO_TEST_DATA("Remove in ForEach", RemoveForEach, Forbidden); DO_TEST("Steal", Steal); - DO_TEST("Forbidden ops in ForEach", ForEach); DO_TEST("RemoveSet", RemoveSet); DO_TEST("Search", Search); DO_TEST("GetItems", GetItems); -- 2.17.0

2 7

[libvirt] [PATCH] libxl: add support for memballoon device
by Jim Fehlig 11 Apr '18

11 Apr '18

All Xen PV and HVM with PV driver support a memory balloon device, which cannot be disabled through the toolstack. Model the device in the libxl driver, similar to the recently removed xend-based driver. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Apologies for the large amount of test file churn... src/libxl/libxl_conf.c | 26 ++++++++++++++++++++++ src/libxl/libxl_domain.c | 10 +++++++++ tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 1 + tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 1 + tests/sexpr2xmldata/sexpr2xml-curmem.xml | 1 + .../sexpr2xml-disk-block-shareable.xml | 1 + tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 1 + .../sexpr2xml-disk-drv-blktap-qcow.xml | 1 + .../sexpr2xml-disk-drv-blktap-raw.xml | 1 + .../sexpr2xml-disk-drv-blktap2-raw.xml | 1 + tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 1 + .../sexpr2xml-fv-serial-dev-2-ports.xml | 1 + .../sexpr2xml-fv-serial-dev-2nd-port.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 1 + .../sexpr2xml-fv-serial-tcp-telnet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 1 + tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 1 + .../sexpr2xml-pv-bootloader-cmdline.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 1 + .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 1 + .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv.xml | 1 + tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 1 + tests/xlconfigdata/test-channel-pty.xml | 1 + tests/xlconfigdata/test-channel-unix.xml | 1 + .../test-disk-positional-parms-full.xml | 1 + .../test-disk-positional-parms-partial.xml | 1 + tests/xlconfigdata/test-disk-qed.xml | 1 + ...est-fullvirt-direct-kernel-boot-bogus-extra.xml | 1 + .../test-fullvirt-direct-kernel-boot-extra.xml | 1 + .../test-fullvirt-direct-kernel-boot.xml | 1 + tests/xlconfigdata/test-fullvirt-hpet-timer.xml | 1 + tests/xlconfigdata/test-fullvirt-multi-timer.xml | 1 + tests/xlconfigdata/test-fullvirt-multiserial.xml | 1 + tests/xlconfigdata/test-fullvirt-multiusb.xml | 1 + .../test-fullvirt-nestedhvm-disabled.xml | 1 + tests/xlconfigdata/test-fullvirt-nestedhvm.xml | 1 + tests/xlconfigdata/test-fullvirt-nohap.xml | 1 + tests/xlconfigdata/test-fullvirt-ovmf.xml | 1 + tests/xlconfigdata/test-fullvirt-tsc-timer.xml | 1 + tests/xlconfigdata/test-fullvirt-vnuma.xml | 1 + tests/xlconfigdata/test-new-disk.xml | 1 + .../test-paravirt-cmdline-bogus-extra-root.xml | 1 + .../test-paravirt-cmdline-extra-root.xml | 1 + tests/xlconfigdata/test-paravirt-cmdline.xml | 1 + tests/xlconfigdata/test-paravirt-maxvcpus.xml | 1 + tests/xlconfigdata/test-rbd-multihost-noauth.xml | 1 + tests/xlconfigdata/test-spice-features.xml | 1 + tests/xlconfigdata/test-spice.xml | 1 + tests/xlconfigdata/test-usb.xml | 1 + tests/xlconfigdata/test-usbctrl.xml | 1 + tests/xlconfigdata/test-vif-multi-ip.xml | 1 + tests/xlconfigdata/test-vif-rate.xml | 1 + tests/xlconfigdata/test-vif-typename.xml | 1 + tests/xmconfigdata/test-disk-drv-blktap-raw.xml | 1 + tests/xmconfigdata/test-disk-drv-blktap2-raw.xml | 1 + tests/xmconfigdata/test-escape-paths.xml | 1 + .../xmconfigdata/test-fullvirt-default-feature.xml | 1 + tests/xmconfigdata/test-fullvirt-force-hpet.xml | 1 + tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 1 + tests/xmconfigdata/test-fullvirt-localtime.xml | 1 + tests/xmconfigdata/test-fullvirt-net-netfront.xml | 1 + tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 1 + tests/xmconfigdata/test-fullvirt-nohap.xml | 1 + tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-file.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-null.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-pty.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 1 + .../test-fullvirt-serial-tcp-telnet.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-udp.xml | 1 + tests/xmconfigdata/test-fullvirt-serial-unix.xml | 1 + tests/xmconfigdata/test-fullvirt-sound.xml | 1 + tests/xmconfigdata/test-fullvirt-usbmouse.xml | 1 + tests/xmconfigdata/test-fullvirt-usbtablet.xml | 1 + tests/xmconfigdata/test-fullvirt-utc.xml | 1 + tests/xmconfigdata/test-no-source-cdrom.xml | 1 + tests/xmconfigdata/test-paravirt-maxvcpus.xml | 1 + tests/xmconfigdata/test-paravirt-net-e1000.xml | 1 + tests/xmconfigdata/test-paravirt-net-vifname.xml | 1 + .../test-paravirt-new-pvfb-vncdisplay.xml | 1 + tests/xmconfigdata/test-paravirt-new-pvfb.xml | 1 + tests/xmconfigdata/test-paravirt-vcpu.xml | 1 + tests/xmconfigdata/test-pci-devs.xml | 1 + 114 files changed, 148 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0ed914e4f..ed477330d 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -626,6 +626,32 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, return -1; } + /* only the 'xen' balloon device model is supported */ + if (def->memballoon) { + int model = def->memballoon->model; + + switch ((virDomainMemballoonModel)model) { + case VIR_DOMAIN_MEMBALLOON_MODEL_XEN: + break; + case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported balloon device model '%s'"), + virDomainMemballoonModelTypeToString(model)); + return -1; + case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", + _("balloon device cannot be disabled")); + return -1; + case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unexpected balloon device model '%d'"), + model); + return -1; + } + } + return 0; } diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index e76740247..ef9a90267 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -413,6 +413,16 @@ libxlDomainDefPostParse(virDomainDefPtr def, def->features[VIR_DOMAIN_FEATURE_ACPI] = VIR_TRISTATE_SWITCH_ON; } + /* add implicit balloon device */ + if (def->memballoon == NULL) { + virDomainMemballoonDefPtr memballoon; + if (VIR_ALLOC(memballoon) < 0) + return -1; + + memballoon->model = VIR_DOMAIN_MEMBALLOON_MODEL_XEN; + def->memballoon = memballoon; + } + return 0; } diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml index 4b9f535fc..5524af8e2 100644 --- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml +++ b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml @@ -24,5 +24,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml index af43a106a..c9ab2df51 100644 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml @@ -32,5 +32,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml index 28c71e5d1..a976986a1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml @@ -38,5 +38,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml index e458b75a8..9f757efa2 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml @@ -30,5 +30,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml index 756a21124..edca58241 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml index d3781f737..80f6dd205 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml index 5952b9d9e..71e7c40b6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml index 86093272b..bd244bbc3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml index 3af99e0f6..48fee3611 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml index 04495090d..8eaacc86d 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -53,5 +53,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml index 9179cfe5b..8ed2261fc 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -46,5 +46,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml index a9e677e84..5e176bf91 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml @@ -49,5 +49,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml index d53f4a640..826301182 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml @@ -49,5 +49,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml index a4f15b654..afb903068 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml @@ -29,5 +29,6 @@ </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml index 9c162273b..2d390b52a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -46,5 +46,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml index 44289a14a..5edf0ce26 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml @@ -47,5 +47,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml index bcd5ce802..eccab787b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -51,5 +51,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml index f5cbb9d6e..79e9e69c3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml @@ -58,5 +58,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml index 35ee75679..111db35b1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml index 7e38e7f2e..40d1c6e62 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml index b5e5af9c8..60d5d8e9e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -52,5 +52,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml index 6e5cce454..55a4e9e0b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml index 66452b385..78ddea603 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -52,5 +52,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml index 1f5e0c965..112830ac7 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -52,5 +52,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml index 12334294b..ab2450469 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml index 29feada21..b6afd9b31 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml index ad3cd3dbc..cdc05bc52 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml index b7a337100..0fa40e95d 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml index b527fc29d..def03321a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -48,5 +48,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml index b527fc29d..def03321a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -48,5 +48,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml index 1a11f92fa..ded0aa853 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -47,5 +47,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml index a92b7d5fb..48ce7cebf 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -47,5 +47,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml index 1f595014f..1ae44a1d3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -46,5 +46,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml index 1f595014f..1ae44a1d3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -46,5 +46,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml index 1f595014f..1ae44a1d3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -46,5 +46,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml index b06a41280..c97eeb0a1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml @@ -31,5 +31,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml index a184c990a..ba9a0b2f1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml @@ -32,5 +32,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml index 758dde64b..db15b9ddb 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml @@ -31,5 +31,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml index 2a4e774b7..975318294 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -52,5 +52,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml index 72b7c5750..ab46fb917 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml @@ -37,5 +37,6 @@ <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/> </source> </hostdev> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml index 519d02d57..b2b63bc54 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml index b3e97c4d7..dac1f924b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml @@ -24,5 +24,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml index 31e18edc6..124bd6f37 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml index d66509a33..876a02746 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml index f45ead655..e2dbfab36 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml @@ -31,5 +31,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml index bbabc50fd..3fd66c45e 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml @@ -31,5 +31,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml index 7dd473dd4..f2d316c6f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -36,5 +36,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml index 3af99e0f6..48fee3611 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv.xml @@ -25,5 +25,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml index 5466823b9..463d3598b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml +++ b/tests/sexpr2xmldata/sexpr2xml-vif-rate.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-channel-pty.xml b/tests/xlconfigdata/test-channel-pty.xml index 17d0c6708..d1ffb86a1 100644 --- a/tests/xlconfigdata/test-channel-pty.xml +++ b/tests/xlconfigdata/test-channel-pty.xml @@ -29,5 +29,6 @@ </channel> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-channel-unix.xml b/tests/xlconfigdata/test-channel-unix.xml index 8f4eaa2b4..e7102d23b 100644 --- a/tests/xlconfigdata/test-channel-unix.xml +++ b/tests/xlconfigdata/test-channel-unix.xml @@ -30,5 +30,6 @@ </channel> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-disk-positional-parms-full.xml b/tests/xlconfigdata/test-disk-positional-parms-full.xml index 1bc5b436e..bb04ca710 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-full.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-full.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-disk-positional-parms-partial.xml b/tests/xlconfigdata/test-disk-positional-parms-partial.xml index 52b21dc59..14f4a72ae 100644 --- a/tests/xlconfigdata/test-disk-positional-parms-partial.xml +++ b/tests/xlconfigdata/test-disk-positional-parms-partial.xml @@ -60,5 +60,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-disk-qed.xml b/tests/xlconfigdata/test-disk-qed.xml index 230382dd5..90c0a97ae 100644 --- a/tests/xlconfigdata/test-disk-qed.xml +++ b/tests/xlconfigdata/test-disk-qed.xml @@ -41,5 +41,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml index 3738c8e79..8946b1d8c 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml @@ -51,5 +51,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml index 3738c8e79..8946b1d8c 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml @@ -51,5 +51,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml index 3738c8e79..8946b1d8c 100644 --- a/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml +++ b/tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml @@ -51,5 +51,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-hpet-timer.xml b/tests/xlconfigdata/test-fullvirt-hpet-timer.xml index e3d2c4c8b..7da464c0f 100644 --- a/tests/xlconfigdata/test-fullvirt-hpet-timer.xml +++ b/tests/xlconfigdata/test-fullvirt-hpet-timer.xml @@ -60,5 +60,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-multi-timer.xml b/tests/xlconfigdata/test-fullvirt-multi-timer.xml index 3e7c68caa..9f600755f 100644 --- a/tests/xlconfigdata/test-fullvirt-multi-timer.xml +++ b/tests/xlconfigdata/test-fullvirt-multi-timer.xml @@ -61,5 +61,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-multiserial.xml b/tests/xlconfigdata/test-fullvirt-multiserial.xml index 1a7cc8438..120677a46 100644 --- a/tests/xlconfigdata/test-fullvirt-multiserial.xml +++ b/tests/xlconfigdata/test-fullvirt-multiserial.xml @@ -60,5 +60,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-multiusb.xml b/tests/xlconfigdata/test-fullvirt-multiusb.xml index fcd14e975..bb7beaa1d 100644 --- a/tests/xlconfigdata/test-fullvirt-multiusb.xml +++ b/tests/xlconfigdata/test-fullvirt-multiusb.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml index 58b63384d..9a0df958e 100644 --- a/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml +++ b/tests/xlconfigdata/test-fullvirt-nestedhvm-disabled.xml @@ -57,5 +57,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-nestedhvm.xml b/tests/xlconfigdata/test-fullvirt-nestedhvm.xml index 8c02e7a20..a311314d8 100644 --- a/tests/xlconfigdata/test-fullvirt-nestedhvm.xml +++ b/tests/xlconfigdata/test-fullvirt-nestedhvm.xml @@ -55,5 +55,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-nohap.xml b/tests/xlconfigdata/test-fullvirt-nohap.xml index e57e28bc2..4f4942fcd 100644 --- a/tests/xlconfigdata/test-fullvirt-nohap.xml +++ b/tests/xlconfigdata/test-fullvirt-nohap.xml @@ -58,5 +58,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-ovmf.xml b/tests/xlconfigdata/test-fullvirt-ovmf.xml index ca902e68c..4efdac58b 100644 --- a/tests/xlconfigdata/test-fullvirt-ovmf.xml +++ b/tests/xlconfigdata/test-fullvirt-ovmf.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-tsc-timer.xml b/tests/xlconfigdata/test-fullvirt-tsc-timer.xml index 0816f96f3..6ffcf960f 100644 --- a/tests/xlconfigdata/test-fullvirt-tsc-timer.xml +++ b/tests/xlconfigdata/test-fullvirt-tsc-timer.xml @@ -60,5 +60,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-fullvirt-vnuma.xml b/tests/xlconfigdata/test-fullvirt-vnuma.xml index 5368b0d9c..fe1904e87 100644 --- a/tests/xlconfigdata/test-fullvirt-vnuma.xml +++ b/tests/xlconfigdata/test-fullvirt-vnuma.xml @@ -77,5 +77,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-new-disk.xml b/tests/xlconfigdata/test-new-disk.xml index 1bc5b436e..bb04ca710 100644 --- a/tests/xlconfigdata/test-new-disk.xml +++ b/tests/xlconfigdata/test-new-disk.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml index fdf84c37a..c5758e4bb 100644 --- a/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml +++ b/tests/xlconfigdata/test-paravirt-cmdline-bogus-extra-root.xml @@ -30,5 +30,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml index fdf84c37a..c5758e4bb 100644 --- a/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml +++ b/tests/xlconfigdata/test-paravirt-cmdline-extra-root.xml @@ -30,5 +30,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-paravirt-cmdline.xml b/tests/xlconfigdata/test-paravirt-cmdline.xml index fdf84c37a..c5758e4bb 100644 --- a/tests/xlconfigdata/test-paravirt-cmdline.xml +++ b/tests/xlconfigdata/test-paravirt-cmdline.xml @@ -30,5 +30,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-paravirt-maxvcpus.xml b/tests/xlconfigdata/test-paravirt-maxvcpus.xml index 275f47b48..ae48ae15b 100644 --- a/tests/xlconfigdata/test-paravirt-maxvcpus.xml +++ b/tests/xlconfigdata/test-paravirt-maxvcpus.xml @@ -26,5 +26,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-rbd-multihost-noauth.xml b/tests/xlconfigdata/test-rbd-multihost-noauth.xml index ef9bd178a..847c7c44b 100644 --- a/tests/xlconfigdata/test-rbd-multihost-noauth.xml +++ b/tests/xlconfigdata/test-rbd-multihost-noauth.xml @@ -51,5 +51,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-spice-features.xml b/tests/xlconfigdata/test-spice-features.xml index 81757607c..6d95afb1f 100644 --- a/tests/xlconfigdata/test-spice-features.xml +++ b/tests/xlconfigdata/test-spice-features.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-spice.xml b/tests/xlconfigdata/test-spice.xml index 32cad2721..2737698ce 100644 --- a/tests/xlconfigdata/test-spice.xml +++ b/tests/xlconfigdata/test-spice.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-usb.xml b/tests/xlconfigdata/test-usb.xml index 7b5853db1..5bac73b96 100644 --- a/tests/xlconfigdata/test-usb.xml +++ b/tests/xlconfigdata/test-usb.xml @@ -31,5 +31,6 @@ <address bus='1' device='3'/> </source> </hostdev> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-usbctrl.xml b/tests/xlconfigdata/test-usbctrl.xml index 3c03f37e7..5e0346fa5 100644 --- a/tests/xlconfigdata/test-usbctrl.xml +++ b/tests/xlconfigdata/test-usbctrl.xml @@ -27,5 +27,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-vif-multi-ip.xml b/tests/xlconfigdata/test-vif-multi-ip.xml index 7e831cf1b..2e72d9637 100644 --- a/tests/xlconfigdata/test-vif-multi-ip.xml +++ b/tests/xlconfigdata/test-vif-multi-ip.xml @@ -44,5 +44,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-vif-rate.xml b/tests/xlconfigdata/test-vif-rate.xml index 3ab74883a..73ed43f43 100644 --- a/tests/xlconfigdata/test-vif-rate.xml +++ b/tests/xlconfigdata/test-vif-rate.xml @@ -57,5 +57,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xlconfigdata/test-vif-typename.xml b/tests/xlconfigdata/test-vif-typename.xml index 8e1e98885..1c0435428 100644 --- a/tests/xlconfigdata/test-vif-typename.xml +++ b/tests/xlconfigdata/test-vif-typename.xml @@ -41,5 +41,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml b/tests/xmconfigdata/test-disk-drv-blktap-raw.xml index b8a1eafdd..fb0cdac7f 100644 --- a/tests/xmconfigdata/test-disk-drv-blktap-raw.xml +++ b/tests/xmconfigdata/test-disk-drv-blktap-raw.xml @@ -28,5 +28,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml b/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml index b47ee3eb1..8e2764aa8 100644 --- a/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml +++ b/tests/xmconfigdata/test-disk-drv-blktap2-raw.xml @@ -28,5 +28,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 91d2b7c81..712cc8679 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-default-feature.xml b/tests/xmconfigdata/test-fullvirt-default-feature.xml index e89047191..b900ee0cf 100644 --- a/tests/xmconfigdata/test-fullvirt-default-feature.xml +++ b/tests/xmconfigdata/test-fullvirt-default-feature.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml index e89047191..b900ee0cf 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml index d33a3f940..fae684f21 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index fcc7dbcc3..ccb8f1a87 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -48,5 +48,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml index 5049c05f2..cc5c6658f 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -48,5 +48,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index 6756960bf..62253645a 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -48,5 +48,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-nohap.xml b/tests/xmconfigdata/test-fullvirt-nohap.xml index a92d5c047..bbd177a11 100644 --- a/tests/xmconfigdata/test-fullvirt-nohap.xml +++ b/tests/xmconfigdata/test-fullvirt-nohap.xml @@ -49,5 +49,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index 82464449c..f99e90979 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -53,5 +53,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index 2c2573783..ccaa761d8 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index 026f8da83..0010cf100 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index d9ef787a6..a2ce6f224 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index 8a5af9331..8485ae216 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index ddb1fd89d..5163e0f54 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -54,5 +54,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index a43333b47..760e57df4 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -58,5 +58,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index 5222ea12b..517f9ddfb 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -58,5 +58,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index 9862d4ff1..eee7365ae 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -58,5 +58,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index 2ff799241..1b0f5a6e9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -56,5 +56,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index 67c762eba..f13c920a5 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -50,5 +50,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index 1ef30cf51..2c855cd35 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -49,5 +49,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index d29e8f6c1..e82ffdca1 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -49,5 +49,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index 6756960bf..62253645a 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -48,5 +48,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml index 52f7775fe..5d0f3bd68 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -53,5 +53,6 @@ <video> <model type='cirrus' vram='8192' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.xml b/tests/xmconfigdata/test-paravirt-maxvcpus.xml index 1ad652c4d..ce66503dc 100644 --- a/tests/xmconfigdata/test-paravirt-maxvcpus.xml +++ b/tests/xmconfigdata/test-paravirt-maxvcpus.xml @@ -28,5 +28,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index dd5dffdf5..7b7112dcf 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -35,5 +35,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml index 32006f967..36333c8d6 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.xml +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml @@ -36,5 +36,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml index b55cadd7c..b7fc9f723 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml @@ -34,5 +34,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index ffc00559f..60604a20a 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -34,5 +34,6 @@ <video> <model type='xen' vram='4096' heads='1' primary='yes'/> </video> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml index 1ad652c4d..ce66503dc 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.xml +++ b/tests/xmconfigdata/test-paravirt-vcpu.xml @@ -28,5 +28,6 @@ </console> <input type='mouse' bus='xen'/> <input type='keyboard' bus='xen'/> + <memballoon model='xen'/> </devices> </domain> diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml index f39b1494e..f50e1947f 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -65,5 +65,6 @@ <address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/> </source> </hostdev> + <memballoon model='xen'/> </devices> </domain> -- 2.16.3

2 1

[libvirt] [PATCH v2 0/1] Fix qcow2 fully allocated filesystem objects.
by Wim Ten Have 11 Apr '18

11 Apr '18

From: Wim ten Have <wim.ten.have(a)oracle.com> When tools like virt-install request to create a fully allocated filesystem object storage by setting the parameter sparse=no, libvirt doesn't allow that to happen for qcow2 formatted files. Regardless of its XML instuction request libvirt always targets its filesystem object storage with preallocation=metadata if format=qcow2 is in effect. This results in sparse files which could cause problems since total image storage potentially can overrun actual filesystem available space. Changes from v1: * Fix XML target sparse setting and apply for qcow2. * Bring the test change under same PATCH. Wim ten Have (1): storage: extend preallocation flags support for qemu-img src/conf/storage_conf.c | 3 +++ src/storage/storage_util.c | 10 ++++++++-- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) -- 2.14.3

2 2

[libvirt] [PATCH V2 0/8] Remove the legacy xen driver
by Jim Fehlig 10 Apr '18

10 Apr '18

Long overdue removal the old xen driver. The first 3 patches move existing tests to WITH_LIBXL since we'll want to continue supporting conversion of the various xen config formats. The remain patches remove the cruft. Patch8, new to V2, updates the Xen driver page. Jim Fehlig (8): tests: move xml2sexpr tests to WITH_LIBXL tests: move sexpr2xml tests to WITH_LIBXL tests: move xmconfig tests to WITH_LIBXL Remove xencaps tests and data files Remove the xend driver docs: remove mention of legacy Xen driver spec: remove legacy xen driver docs: update Xen driver information configure.ac | 7 +- docs/architecture.html.in | 28 +- docs/bugs.html.in | 3 +- docs/drvxen.html.in | 91 +- docs/uri.html.in | 74 - docs/windows.html.in | 2 +- libvirt.spec.in | 57 +- m4/virt-driver-xen.m4 | 142 - po/POTFILES.in | 7 - src/Makefile.am | 1 - src/xen/Makefile.inc.am | 67 - src/xen/block_stats.c | 355 --- src/xen/block_stats.h | 38 - src/xen/xen_driver.c | 2845 ----------------- src/xen/xen_driver.h | 204 -- src/xen/xen_hypervisor.c | 3125 ------------------- src/xen/xen_hypervisor.h | 142 - src/xen/xen_inotify.c | 447 --- src/xen/xen_inotify.h | 33 - src/xen/xend_internal.c | 3221 -------------------- src/xen/xend_internal.h | 213 -- src/xen/xm_internal.c | 1484 --------- src/xen/xm_internal.h | 105 - src/xen/xs_internal.c | 920 ------ src/xen/xs_internal.h | 101 - tests/Makefile.am | 59 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 1 - .../sexpr2xml-disk-block-shareable.xml | 1 - tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 3 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 1 - .../sexpr2xml-disk-drv-blktap-raw.xml | 1 - .../sexpr2xml-disk-drv-blktap2-raw.xml | 1 - tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 7 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 7 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 7 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 6 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 5 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 3 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 3 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 7 +- tests/sexpr2xmltest.c | 35 +- tests/testutilsxen.c | 64 - tests/testutilsxen.h | 2 - tests/vircapstest.c | 34 - tests/virdrivermoduletest.c | 3 - tests/virschematest.c | 3 +- tests/xencapsdata/xen-i686-pae-hvm.caps | 1 - tests/xencapsdata/xen-i686-pae-hvm.cpuinfo | 37 - tests/xencapsdata/xen-i686-pae-hvm.xml | 49 - tests/xencapsdata/xen-i686-pae.caps | 1 - tests/xencapsdata/xen-i686-pae.cpuinfo | 18 - tests/xencapsdata/xen-i686-pae.xml | 32 - tests/xencapsdata/xen-i686.caps | 1 - tests/xencapsdata/xen-i686.cpuinfo | 18 - tests/xencapsdata/xen-i686.xml | 29 - tests/xencapsdata/xen-ia64-be-hvm.caps | 1 - tests/xencapsdata/xen-ia64-be-hvm.cpuinfo | 29 - tests/xencapsdata/xen-ia64-be-hvm.xml | 45 - tests/xencapsdata/xen-ia64-be.caps | 1 - tests/xencapsdata/xen-ia64-be.cpuinfo | 29 - tests/xencapsdata/xen-ia64-be.xml | 29 - tests/xencapsdata/xen-ia64-hvm.caps | 1 - tests/xencapsdata/xen-ia64-hvm.cpuinfo | 29 - tests/xencapsdata/xen-ia64-hvm.xml | 41 - tests/xencapsdata/xen-ia64.caps | 1 - tests/xencapsdata/xen-ia64.cpuinfo | 29 - tests/xencapsdata/xen-ia64.xml | 26 - tests/xencapsdata/xen-ppc64.caps | 1 - tests/xencapsdata/xen-ppc64.cpuinfo | 0 tests/xencapsdata/xen-ppc64.xml | 26 - tests/xencapsdata/xen-x86_64-hvm.caps | 1 - tests/xencapsdata/xen-x86_64-hvm.cpuinfo | 47 - tests/xencapsdata/xen-x86_64-hvm.xml | 61 - tests/xencapsdata/xen-x86_64.caps | 1 - tests/xencapsdata/xen-x86_64.cpuinfo | 47 - tests/xencapsdata/xen-x86_64.xml | 29 - tests/xencapstest.c | 224 -- tests/xmconfigdata/test-disk-drv-blktap-raw.xml | 3 +- tests/xmconfigdata/test-disk-drv-blktap2-raw.xml | 3 +- tests/xmconfigdata/test-escape-paths.xml | 11 +- .../xmconfigdata/test-fullvirt-default-feature.xml | 9 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 9 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 9 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 9 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 9 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 9 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 9 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 9 +- .../test-fullvirt-serial-tcp-telnet.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 9 +- tests/xmconfigdata/test-fullvirt-sound.xml | 9 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 9 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 9 +- tests/xmconfigdata/test-fullvirt-utc.xml | 9 +- tests/xmconfigdata/test-no-source-cdrom.xml | 9 +- tests/xmconfigdata/test-paravirt-maxvcpus.xml | 5 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 5 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 5 +- .../test-paravirt-new-pvfb-vncdisplay.xml | 5 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 5 +- tests/xmconfigdata/test-paravirt-vcpu.xml | 5 +- tests/xmconfigdata/test-pci-devs.xml | 11 +- tests/xmconfigtest.c | 22 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 2 +- .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 2 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 2 +- .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 2 +- tests/xml2sexprtest.c | 7 +- 171 files changed, 317 insertions(+), 15060 deletions(-) delete mode 100644 m4/virt-driver-xen.m4 delete mode 100644 src/xen/Makefile.inc.am delete mode 100644 src/xen/block_stats.c delete mode 100644 src/xen/block_stats.h delete mode 100644 src/xen/xen_driver.c delete mode 100644 src/xen/xen_driver.h delete mode 100644 src/xen/xen_hypervisor.c delete mode 100644 src/xen/xen_hypervisor.h delete mode 100644 src/xen/xen_inotify.c delete mode 100644 src/xen/xen_inotify.h delete mode 100644 src/xen/xend_internal.c delete mode 100644 src/xen/xend_internal.h delete mode 100644 src/xen/xm_internal.c delete mode 100644 src/xen/xm_internal.h delete mode 100644 src/xen/xs_internal.c delete mode 100644 src/xen/xs_internal.h delete mode 100644 tests/xencapsdata/xen-i686-pae-hvm.caps delete mode 100644 tests/xencapsdata/xen-i686-pae-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-i686-pae-hvm.xml delete mode 100644 tests/xencapsdata/xen-i686-pae.caps delete mode 100644 tests/xencapsdata/xen-i686-pae.cpuinfo delete mode 100644 tests/xencapsdata/xen-i686-pae.xml delete mode 100644 tests/xencapsdata/xen-i686.caps delete mode 100644 tests/xencapsdata/xen-i686.cpuinfo delete mode 100644 tests/xencapsdata/xen-i686.xml delete mode 100644 tests/xencapsdata/xen-ia64-be-hvm.caps delete mode 100644 tests/xencapsdata/xen-ia64-be-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64-be-hvm.xml delete mode 100644 tests/xencapsdata/xen-ia64-be.caps delete mode 100644 tests/xencapsdata/xen-ia64-be.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64-be.xml delete mode 100644 tests/xencapsdata/xen-ia64-hvm.caps delete mode 100644 tests/xencapsdata/xen-ia64-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64-hvm.xml delete mode 100644 tests/xencapsdata/xen-ia64.caps delete mode 100644 tests/xencapsdata/xen-ia64.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64.xml delete mode 100644 tests/xencapsdata/xen-ppc64.caps delete mode 100644 tests/xencapsdata/xen-ppc64.cpuinfo delete mode 100644 tests/xencapsdata/xen-ppc64.xml delete mode 100644 tests/xencapsdata/xen-x86_64-hvm.caps delete mode 100644 tests/xencapsdata/xen-x86_64-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-x86_64-hvm.xml delete mode 100644 tests/xencapsdata/xen-x86_64.caps delete mode 100644 tests/xencapsdata/xen-x86_64.cpuinfo delete mode 100644 tests/xencapsdata/xen-x86_64.xml delete mode 100644 tests/xencapstest.c -- 2.16.3

2 12

[libvirt] [PATCH v6 0/9] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 10 Apr '18

10 Apr '18

Add support for CPUID setting based on <cpu> element. Since libxl format support only adjusting specific bits over host CPU, only mode='host-passthrough' is supported - other values are rejected (including default 'custom'). This will break some configurations working before (bare <cpu> element with for example NUMA configuration), but libxl driver never supported full 'custom' mode - it was silently ignored, which might lead to some unexpected effects. Since mode='host-passthrough' is now necessary to specify CPU options, do not enable nested HVM feature by mere presence of this element, require also enabling it in libxl.conf. Nested HVM is still in "preview" state, so better be explicit here. v2 of this patch series: https://www.redhat.com/archives/libvir-list/2017-July/msg00050.html v3 of this patch series: https://www.redhat.com/archives/libvir-list/2017-December/msg00314.html v4 of this patch series: https://www.redhat.com/archives/libvir-list/2018-February/msg00504.html v5 of this patch series: https://www.redhat.com/archives/libvir-list/2018-March/msg00796.html Marek Marczykowski-Górecki (9): libxl: fix libxlDriverConfigDispose for partially constructed object libxl: pass driver config to libxlMakeDomBuildInfo libxl: warn about ignored CPU mode=custom libxl: do not enable nested HVM unless global nested_hvm option enabled xenconfig: do not override def->cpu if already set elsewhere libxl: add support for CPUID features policy tests: check CPU features handling in libxl driver xenconfig: add CPUID handling to domXML <-> xl.cfg conversion tests: add test case for CPUID in xenconfig driver src/libxl/libvirtd_libxl.aug | 2 +- src/libxl/libxl.conf | 8 +- src/libxl/libxl_conf.c | 66 +++- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_domain.c | 2 +- src/libxl/test_libvirtd_libxl.aug.in | 1 +- src/xenconfig/xen_xl.c | 236 ++++++++++++++-- src/xenconfig/xen_xl.h | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 ++++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 +++- tests/libxlxml2domconfigtest.c | 27 +- tests/virmocklibxl.c | 25 ++- tests/xlconfigdata/test-fullvirt-cpuid.cfg | 25 ++- tests/xlconfigdata/test-fullvirt-cpuid.xml | 35 ++- tests/xlconfigtest.c | 1 +- 15 files changed, 492 insertions(+), 45 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.xml base-commit: 6ce3acc129bfdbe7fd02bcb8bbe8af6d13903684 -- git-series 0.9.1

3 35

[libvirt] [dbus PATCH v2 00/11] Some code move to have functions sorted
by Katerina Koukiou 10 Apr '18

10 Apr '18

Better do it now before the projects grows more. Katerina Koukiou (11): APIs should appear in alphabetical order: Move Active property APIs should appear in alphabetical order: Move Autostart property APIs should appear in alphabetical order: Move Id property APIs should appear in alphabetical order: Move UUID property APIs should appear in alphabetical order: Move Create method APIs should appear in alphabetical order: Move Destroy method APIs should appear in alphabetical order: Move GetStats method APIs should appear in alphabetical order: Move Resume method APIs should appear in alphabetical order: Move Undefine method APIs should appear in alphabetical order: Move Shutdown method APIs should appear in alphabetical order: Move ListDomains method data/org.libvirt.Connect.xml | 12 +-- data/org.libvirt.Domain.xml | 54 +++++------ src/connect.c | 82 ++++++++-------- src/domain.c | 220 +++++++++++++++++++++---------------------- test/test_connect.py | 24 ++--- test/test_domain.py | 46 ++++----- 6 files changed, 219 insertions(+), 219 deletions(-) -- 2.15.0

2 12

[libvirt] [qemu RFC] qapi: add "firmware.json"
by Laszlo Ersek 10 Apr '18

10 Apr '18

Add a schema that describes the properties of virtual machine firmware. Each firmware executable installed on a host system should come with a JSON file that conforms to this schema, and informs the management applications about the firmware's properties. In addition, a configuration directory with symlinks to the JSON files should exist, with the symlinks carefully named to reflect a priority order. Management applications can then search this directory in priority order for the first firmware executable that satisfies their search criteria. The found JSON file provides the management layer with domain configuration bits that are required to run the firmware binary. Cc: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: Alexander Graf <agraf(a)suse.de> Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: David Gibson <dgibson(a)redhat.com> Cc: Eric Blake <eblake(a)redhat.com> Cc: Gary Ching-Pang Lin <glin(a)suse.com> Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Kashyap Chamarthy <kchamart(a)redhat.com> Cc: Markus Armbruster <armbru(a)redhat.com> Cc: Michael Roth <mdroth(a)linux.vnet.ibm.com> Cc: Michal Privoznik <mprivozn(a)redhat.com> Cc: Peter Krempa <pkrempa(a)redhat.com> Cc: Peter Maydell <peter.maydell(a)linaro.org> Cc: Thomas Huth <thuth(a)redhat.com> Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> --- Notes: Folks on the CC list, please try to see if the suggested schema is flexible enough to describe the virtual firmware(s) that you are familiar with. Thanks! Makefile | 9 ++ Makefile.objs | 4 + qapi/firmware.json | 343 ++++++++++++++++++++++++++++++++++++++++++++++++++ qapi/qapi-schema.json | 1 + qmp.c | 5 + .gitignore | 4 + 6 files changed, 366 insertions(+) create mode 100644 qapi/firmware.json diff --git a/Makefile b/Makefile index 727ef118f3d9..e088e3c1b39f 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ GENERATED_FILES += qapi/qapi-types-block.h qapi/qapi-types-block.c GENERATED_FILES += qapi/qapi-types-char.h qapi/qapi-types-char.c GENERATED_FILES += qapi/qapi-types-common.h qapi/qapi-types-common.c GENERATED_FILES += qapi/qapi-types-crypto.h qapi/qapi-types-crypto.c +GENERATED_FILES += qapi/qapi-types-firmware.h qapi/qapi-types-firmware.c GENERATED_FILES += qapi/qapi-types-introspect.h qapi/qapi-types-introspect.c GENERATED_FILES += qapi/qapi-types-migration.h qapi/qapi-types-migration.c GENERATED_FILES += qapi/qapi-types-misc.h qapi/qapi-types-misc.c @@ -115,6 +116,7 @@ GENERATED_FILES += qapi/qapi-visit-block.h qapi/qapi-visit-block.c GENERATED_FILES += qapi/qapi-visit-char.h qapi/qapi-visit-char.c GENERATED_FILES += qapi/qapi-visit-common.h qapi/qapi-visit-common.c GENERATED_FILES += qapi/qapi-visit-crypto.h qapi/qapi-visit-crypto.c +GENERATED_FILES += qapi/qapi-visit-firmware.h qapi/qapi-visit-firmware.c GENERATED_FILES += qapi/qapi-visit-introspect.h qapi/qapi-visit-introspect.c GENERATED_FILES += qapi/qapi-visit-migration.h qapi/qapi-visit-migration.c GENERATED_FILES += qapi/qapi-visit-misc.h qapi/qapi-visit-misc.c @@ -132,6 +134,7 @@ GENERATED_FILES += qapi/qapi-commands-block.h qapi/qapi-commands-block.c GENERATED_FILES += qapi/qapi-commands-char.h qapi/qapi-commands-char.c GENERATED_FILES += qapi/qapi-commands-common.h qapi/qapi-commands-common.c GENERATED_FILES += qapi/qapi-commands-crypto.h qapi/qapi-commands-crypto.c +GENERATED_FILES += qapi/qapi-commands-firmware.h qapi/qapi-commands-firmware.c GENERATED_FILES += qapi/qapi-commands-introspect.h qapi/qapi-commands-introspect.c GENERATED_FILES += qapi/qapi-commands-migration.h qapi/qapi-commands-migration.c GENERATED_FILES += qapi/qapi-commands-misc.h qapi/qapi-commands-misc.c @@ -149,6 +152,7 @@ GENERATED_FILES += qapi/qapi-events-block.h qapi/qapi-events-block.c GENERATED_FILES += qapi/qapi-events-char.h qapi/qapi-events-char.c GENERATED_FILES += qapi/qapi-events-common.h qapi/qapi-events-common.c GENERATED_FILES += qapi/qapi-events-crypto.h qapi/qapi-events-crypto.c +GENERATED_FILES += qapi/qapi-events-firmware.h qapi/qapi-events-firmware.c GENERATED_FILES += qapi/qapi-events-introspect.h qapi/qapi-events-introspect.c GENERATED_FILES += qapi/qapi-events-migration.h qapi/qapi-events-migration.c GENERATED_FILES += qapi/qapi-events-misc.h qapi/qapi-events-misc.c @@ -581,6 +585,7 @@ qapi-modules = $(SRC_PATH)/qapi/qapi-schema.json $(SRC_PATH)/qapi/common.json \ $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \ $(SRC_PATH)/qapi/char.json \ $(SRC_PATH)/qapi/crypto.json \ + $(SRC_PATH)/qapi/firmware.json \ $(SRC_PATH)/qapi/introspect.json \ $(SRC_PATH)/qapi/migration.json \ $(SRC_PATH)/qapi/misc.json \ @@ -600,6 +605,7 @@ qapi/qapi-types-block.c qapi/qapi-types-block.h \ qapi/qapi-types-char.c qapi/qapi-types-char.h \ qapi/qapi-types-common.c qapi/qapi-types-common.h \ qapi/qapi-types-crypto.c qapi/qapi-types-crypto.h \ +qapi/qapi-types-firmware.c qapi/qapi-types-firmware.h \ qapi/qapi-types-introspect.c qapi/qapi-types-introspect.h \ qapi/qapi-types-migration.c qapi/qapi-types-migration.h \ qapi/qapi-types-misc.c qapi/qapi-types-misc.h \ @@ -618,6 +624,7 @@ qapi/qapi-visit-block.c qapi/qapi-visit-block.h \ qapi/qapi-visit-char.c qapi/qapi-visit-char.h \ qapi/qapi-visit-common.c qapi/qapi-visit-common.h \ qapi/qapi-visit-crypto.c qapi/qapi-visit-crypto.h \ +qapi/qapi-visit-firmware.c qapi/qapi-visit-firmware.h \ qapi/qapi-visit-introspect.c qapi/qapi-visit-introspect.h \ qapi/qapi-visit-migration.c qapi/qapi-visit-migration.h \ qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \ @@ -635,6 +642,7 @@ qapi/qapi-commands-block.c qapi/qapi-commands-block.h \ qapi/qapi-commands-char.c qapi/qapi-commands-char.h \ qapi/qapi-commands-common.c qapi/qapi-commands-common.h \ qapi/qapi-commands-crypto.c qapi/qapi-commands-crypto.h \ +qapi/qapi-commands-firmware.c qapi/qapi-commands-firmware.h \ qapi/qapi-commands-introspect.c qapi/qapi-commands-introspect.h \ qapi/qapi-commands-migration.c qapi/qapi-commands-migration.h \ qapi/qapi-commands-misc.c qapi/qapi-commands-misc.h \ @@ -652,6 +660,7 @@ qapi/qapi-events-block.c qapi/qapi-events-block.h \ qapi/qapi-events-char.c qapi/qapi-events-char.h \ qapi/qapi-events-common.c qapi/qapi-events-common.h \ qapi/qapi-events-crypto.c qapi/qapi-events-crypto.h \ +qapi/qapi-events-firmware.c qapi/qapi-events-firmware.h \ qapi/qapi-events-introspect.c qapi/qapi-events-introspect.h \ qapi/qapi-events-migration.c qapi/qapi-events-migration.h \ qapi/qapi-events-misc.c qapi/qapi-events-misc.h \ diff --git a/Makefile.objs b/Makefile.objs index c6c9b8fc2177..6ed4e0010b10 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -9,6 +9,7 @@ util-obj-y += qapi/qapi-types-block.o util-obj-y += qapi/qapi-types-char.o util-obj-y += qapi/qapi-types-common.o util-obj-y += qapi/qapi-types-crypto.o +util-obj-y += qapi/qapi-types-firmware.o util-obj-y += qapi/qapi-types-introspect.o util-obj-y += qapi/qapi-types-migration.o util-obj-y += qapi/qapi-types-misc.o @@ -27,6 +28,7 @@ util-obj-y += qapi/qapi-visit-block.o util-obj-y += qapi/qapi-visit-char.o util-obj-y += qapi/qapi-visit-common.o util-obj-y += qapi/qapi-visit-crypto.o +util-obj-y += qapi/qapi-visit-firmware.o util-obj-y += qapi/qapi-visit-introspect.o util-obj-y += qapi/qapi-visit-migration.o util-obj-y += qapi/qapi-visit-misc.o @@ -44,6 +46,7 @@ util-obj-y += qapi/qapi-events-block.o util-obj-y += qapi/qapi-events-char.o util-obj-y += qapi/qapi-events-common.o util-obj-y += qapi/qapi-events-crypto.o +util-obj-y += qapi/qapi-events-firmware.o util-obj-y += qapi/qapi-events-introspect.o util-obj-y += qapi/qapi-events-migration.o util-obj-y += qapi/qapi-events-misc.o @@ -139,6 +142,7 @@ common-obj-y += qapi/qapi-commands-block.o common-obj-y += qapi/qapi-commands-char.o common-obj-y += qapi/qapi-commands-common.o common-obj-y += qapi/qapi-commands-crypto.o +common-obj-y += qapi/qapi-commands-firmware.o common-obj-y += qapi/qapi-commands-introspect.o common-obj-y += qapi/qapi-commands-migration.o common-obj-y += qapi/qapi-commands-misc.o diff --git a/qapi/firmware.json b/qapi/firmware.json new file mode 100644 index 000000000000..f267240f44dd --- /dev/null +++ b/qapi/firmware.json @@ -0,0 +1,343 @@ +# -*- Mode: Python -*- + +## +# = Firmware +## + +## +# @FirmwareDevice: +# +# Defines the device types that a firmware file can be mapped into. +# +# @memory: The firmware file is to be mapped into memory. +# +# @kernel: The firmware file is to be loaded like a Linux kernel. This is +# similar to @memory but may imply additional processing that is +# specific to the target architecture. +# +# @flash: The firmware file is to be mapped into a pflash chip. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareDevice', + 'data' : [ 'memory', 'kernel', 'flash' ] } + +## +# @FirmwareAccess: +# +# Defines the possible permissions for a given access mode to a device that +# maps a firmware file. +# +# @denied: The access is denied. +# +# @permitted: The access is permitted. +# +# @restricted-to-secure-context: The access is permitted for guest code that +# runs in a secure context; otherwise the access +# is denied. The definition of "secure context" +# is specific to the target architecture. +# +# Since: 2.13 +## +{ 'enum' : 'FirmwareAccess', + 'data' : [ 'denied', 'permitted', 'restricted-to-secure-context' ] } + +## +# @FirmwareMapping: +# +# Collects the mapping device type and the access permissions to that device +# for system firmware and for NVRAM slots. +# +# @device: The system firmware or the NVRAM slot must reside in a device of +# this type. +# +# @read: Permission for the guest to read the device that maps the firmware +# file. If the field is missing, @permitted is assumed. +# +# @write: Permission for the guest to write the device that maps the firmware +# file. If the field is missing, @permitted is assumed. +# +# @execute: Permission for the guest to execute code from the device that maps +# the firmware file. If the field is missing, @permitted is assumed. +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareMapping', + 'data' : { 'device' : 'FirmwareDevice', + '*read' : 'FirmwareAccess', + '*write' : 'FirmwareAccess', + '*execute' : 'FirmwareAccess' } } + +## +# @FirmwareFile: +# +# Gathers the common traits of system firmware executables and NVRAM templates. +# +# @pathname: absolute pathname of the firmware file on the host filesystem +# +# @description: human-readable description of the firmware file +# +# @tags: a list of machine-readable strings providing additional information +# +# @format: If the @FirmwareDevice that this @FirmwareFile is mapped into is +# @flash, then @format describes the block format of the drive that +# backs the device. Otherwise, this field should be 'raw' or absent. +# If the field is missing, 'raw' is assumed. +# +# Since: 2.13 +## +{ 'struct' : 'FirmwareFile', + 'data' : { 'pathname' : 'str', + '*description' : 'str', + '*tags' : [ 'str' ], + '*format' : 'str' } } + +## +# @NVRAMSlot: +# +# Defines the mapping properties of an NVRAM slot, and associates compatible +# NVRAM templates with the NVRAM slot. +# +# @slot-id: The numeric identifier of the NVRAM slot. The interpretation of +# @slot-id is specific to the target architecture and the chosen +# system firmware. +# +# @nvram-map: the mapping requirements of this NVRAM slot +# +# @templates: A non-empty list of @FirmwareFile elements. Any @FirmwareFile +# identified by this list as an NVRAM template can be copied to +# create an actual NVRAM file, and the NVRAM file can be mapped +# into the NVRAM slot identified by @slot-id, subject to the +# mapping requirements in @nvram-map. +# +# Since: 2.13 +## +{ 'struct' : 'NVRAMSlot', + 'data' : { 'slot-id' : 'uint64', + 'nvram-map' : 'FirmwareMapping', + 'templates' : [ 'FirmwareFile' ] } } + +## +# @SystemFirmwareType: +# +# Lists system firmware types commonly used with QEMU virtual machines. +# +# @bios: The system firmware was built from the SeaBIOS project. +# +# @slof: The system firmware was built from the Slimline Open Firmware project. +# +# @uboot: The system firmware was built from the U-Boot project. +# +# @uefi: The system firmware was built from the edk2 (EFI Development Kit II) +# project. +# +# Since: 2.13 +## +{ 'enum' : 'SystemFirmwareType', + 'data' : [ 'bios', 'slof', 'uboot', 'uefi' ] } + +## +# @SystemFirmware: +# +# Describes a system firmware binary and any NVRAM slots that it requires. +# +# @executable: Identifies the platform firmware executable. +# +# @type: The type by which the system firmware is commonly known. This is the +# main search key by which management software looks up a system +# firmware image for a new domain. +# +# @targets: a non-empty list of target architectures that are capable of +# executing the system firmware +# +# @sysfw-map: the mapping requirements of the system firmware binary +# +# @nvram-slots: A list of NVRAM slots that are required by the system firmware. +# The @slot-id field must be unique across the list. Importantly, +# if any @FirmwareAccess is @restricted-to-secure-context in +# @sysfw-map or in any @nvram-map in @nvram-slots, then (a) the +# virtual machine configuration is required to emulate the secure +# code execution context (as defined for @targets), and (b) the +# virtual machine configuration is required to actually restrict +# the access in question to the secure execution context. +# +# @supports-uefi-secure-boot: Whether the system firmware implements the +# software interfaces for UEFI Secure Boot, as +# defined in the UEFI specification. If the field +# is missing, its assumed value is 'false'. +# +# @supports-amd-sev: Whether the system firmware supports running under AMD +# Secure Encrypted Virtualization, as specified in the AMD64 +# Architecture Programmer's Manual. If the field is missing, +# its assumed value is 'false'. +# +# @supports-acpi-s3: Whether the system firmware supports S3 sleep (suspend to +# RAM), as defined in the ACPI specification. If the field +# is missing, its assumed value is 'false'. +# +# @supports-acpi-s4: Whether the system firmware supports S4 hibernation +# (suspend to disk), as defined in the ACPI specification. +# If the field is missing, its assumed value is 'false'. +# +# Since: 2.13 +# +# Examples: +# +# { +# "executable": { +# "pathname": "/usr/share/seabios/bios-256k.bin", +# "description": "SeaBIOS", +# "tags": [ +# "CONFIG_ROM_SIZE=256" +# ] +# }, +# "type": "bios", +# "targets": [ +# "i386", +# "x86_64" +# ], +# "sysfw-map": { +# "device": "memory", +# "write": "denied" +# }, +# "supports-acpi-s3": true, +# "supports-acpi-s4": true +# } +# +# { +# "executable": { +# "pathname": "/usr/share/OVMF/OVMF_CODE.secboot.fd", +# "description": "OVMF with Secure Boot and SMM-protected varstore", +# "tags": [ +# "FD_SIZE_4MB", +# "IA32X64", +# "SECURE_BOOT_ENABLE", +# "SMM_REQUIRE" +# ] +# }, +# "type": "uefi", +# "targets": [ +# "x86_64" +# ], +# "sysfw-map": { +# "device": "flash", +# "write": "denied" +# }, +# "nvram-slots": [ +# { +# "slot-id": 1, +# "nvram-map" : { +# "device": "flash", +# "write": "restricted-to-secure-context" +# }, +# "templates": [ +# { +# "pathname": "/usr/share/OVMF/OVMF_VARS.fd", +# "description": "empty varstore template" +# }, +# { +# "pathname": "/usr/share/OVMF/OVMF_VARS.secboot.fd", +# "description": "varstore template with the Microsoft certificates enrolled for Secure Boot", +# "tags": [ +# "mscerts" +# ] +# } +# ] +# } +# ], +# "supports-uefi-secure-boot": true, +# "supports-amd-sev": true, +# "supports-acpi-s3": true +# } +# +# { +# "executable": { +# "pathname": "/usr/share/AAVMF/AAVMF_CODE.fd", +# "description": "ARM64 UEFI firmware", +# "tags": [ +# "AARCH64" +# ] +# }, +# "type": "uefi", +# "targets": [ +# "aarch64" +# ], +# "sysfw-map": { +# "device": "flash", +# "write": "denied" +# }, +# "nvram-slots": [ +# { +# "slot-id": 1, +# "nvram-map" : { +# "device": "flash" +# }, +# "templates": [ +# { +# "pathname": "/usr/share/AAVMF/AAVMF_VARS.fd", +# "description": "empty varstore template" +# } +# ] +# } +# ] +# } +# +# { +# "executable": { +# "pathname": "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd", +# "description": "32-bit OVMF with unprotected varstore and no Secure Boot", +# "tags": [ +# "FD_SIZE_2MB", +# "IA32" +# ] +# }, +# "type": "uefi", +# "targets": [ +# "i386", +# "x86_64" +# ], +# "sysfw-map": { +# "device": "flash", +# "write": "denied" +# }, +# "nvram-slots": [ +# { +# "slot-id": 1, +# "nvram-map" : { +# "device": "flash" +# }, +# "templates": [ +# { +# "pathname": "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd", +# "description": "empty varstore template" +# } +# ] +# } +# ], +# "supports-acpi-s3": true +# } +## +{ 'struct' : 'SystemFirmware', + 'data' : { 'executable' : 'FirmwareFile', + 'type' : 'SystemFirmwareType', + 'targets' : [ 'str' ], + 'sysfw-map' : 'FirmwareMapping', + '*nvram-slots' : [ 'NVRAMSlot' ], + '*supports-uefi-secure-boot' : 'bool', + '*supports-amd-sev' : 'bool', + '*supports-acpi-s3' : 'bool', + '*supports-acpi-s4' : 'bool' } } + +## +# @x-check-firmware: +# +# Accept a @SystemFirmware object and do nothing, successfully. This command +# can be used in the QMP shell to validate @SystemFirmware JSON against the +# schema, and to pretty print it. +# +# @sysfw: ignored +# +# Since: 2.13 +## +{ 'command' : 'x-check-firmware', + 'data' : { 'sysfw' : 'SystemFirmware' } } diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 25bce78352b8..2d6339ca8c99 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -92,4 +92,5 @@ { 'include': 'transaction.json' } { 'include': 'trace.json' } { 'include': 'introspect.json' } +{ 'include': 'firmware.json' } { 'include': 'misc.json' } diff --git a/qmp.c b/qmp.c index f72261667f92..fc9df5c9b05b 100644 --- a/qmp.c +++ b/qmp.c @@ -34,6 +34,7 @@ #include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-ui.h" +#include "qapi/qapi-commands-firmware.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-input-visitor.h" @@ -781,3 +782,7 @@ void qmp_x_oob_test(bool lock, Error **errp) qemu_sem_post(&x_oob_test_sem); } } + +void qmp_x_check_firmware(SystemFirmware *sysfw, Error **errp) +{ +} diff --git a/.gitignore b/.gitignore index 4055e12ee85d..1d8d1066d3d1 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ /qapi/qapi-commands-char.[ch] /qapi/qapi-commands-common.[ch] /qapi/qapi-commands-crypto.[ch] +/qapi/qapi-commands-firmware.[ch] /qapi/qapi-commands-introspect.[ch] /qapi/qapi-commands-migration.[ch] /qapi/qapi-commands-misc.[ch] @@ -52,6 +53,7 @@ /qapi/qapi-events-char.[ch] /qapi/qapi-events-common.[ch] /qapi/qapi-events-crypto.[ch] +/qapi/qapi-events-firmware.[ch] /qapi/qapi-events-introspect.[ch] /qapi/qapi-events-migration.[ch] /qapi/qapi-events-misc.[ch] @@ -70,6 +72,7 @@ /qapi/qapi-types-char.[ch] /qapi/qapi-types-common.[ch] /qapi/qapi-types-crypto.[ch] +/qapi/qapi-types-firmware.[ch] /qapi/qapi-types-introspect.[ch] /qapi/qapi-types-migration.[ch] /qapi/qapi-types-misc.[ch] @@ -87,6 +90,7 @@ /qapi/qapi-visit-char.[ch] /qapi/qapi-visit-common.[ch] /qapi/qapi-visit-crypto.[ch] +/qapi/qapi-visit-firmware.[ch] /qapi/qapi-visit-introspect.[ch] /qapi/qapi-visit-migration.[ch] /qapi/qapi-visit-misc.[ch] -- 2.14.1.3.gb7cf6e02401b

6 47

[libvirt] [PATCH v2 0/9] Be consistent with vir*Obj*Remove* APIs
by John Ferlan 10 Apr '18

10 Apr '18

v1: https://www.redhat.com/archives/libvir-list/2018-March/msg01295.html NB: This can wait until 4.2.0 is release, but I figured I'd post this now just to put it on the radar and of course in hopes that someone will look during the idle moment or two before the release. Changes since v1: Short story: Rework the processing of the code Longer story: In his review Erik noted that there's a "fire dance" when processing the vir*Obj*Remove APIs of requiring a locked object upon entry, then adding a reference to that object, unlocking the object, locking the list to which it is contained, and then relocking the object. So it took some time to think about it and during one lengthy meeting today I had the aha moment that the *Remove API's could take the same key (e.g., uuid or name) used to Add or Find the object and use it for the Remove API. This allows the Remove API to not require a locked (and reffed) object upon entry and perform the lock dance, remove the object, and return just just a reffed object forcing the caller to know to Unref object. Instead, let's simplify things. The *Remove API can take the key, Find the object in the list, remove it from the hash tables, and dispose of the object. In essence the antecedent to the Add or AssignDef API's taking a def, creating an object, and adding it the object to the hash table(s). If there are two *Remove threads competing, one will win and perform the removal, while the other will call *Remove, but won't find the object in the hash table, and just return none the wiser. And yes, I think this can also work for the Domain code, but it's going to take a few patch series to get there as that code is not consistent between consumers. John Ferlan (9): secret: Rework LoadAllConfigs secret: Alter virSecretObjListRemove processing interface: Alter virInterfaceObjListRemove processing nodedev: Alter virNodeDeviceObjListRemove processing conf: Clean up virStoragePoolObjLoad error processing storage: Clean up storagePoolCreateXML error processing test: Clean up testStoragePoolCreateXML error processing conf: Move virStoragePoolObjRemove closer to AssignDef storagepool: Alter virStoragePoolObjRemove processing src/conf/virinterfaceobj.c | 26 +++++++---- src/conf/virinterfaceobj.h | 2 +- src/conf/virnodedeviceobj.c | 29 +++++++----- src/conf/virnodedeviceobj.h | 2 +- src/conf/virsecretobj.c | 58 +++++++++++------------- src/conf/virsecretobj.h | 2 +- src/conf/virstorageobj.c | 92 +++++++++++++++++++++++--------------- src/conf/virstorageobj.h | 2 +- src/node_device/node_device_hal.c | 16 ++++--- src/node_device/node_device_udev.c | 13 ++++-- src/secret/secret_driver.c | 15 ++++--- src/storage/storage_driver.c | 65 +++++++++++++++------------ src/test/test_driver.c | 78 +++++++++++++++++--------------- 13 files changed, 225 insertions(+), 175 deletions(-) -- 2.13.6

2 12

[libvirt] [PATCH] qemuDomainNamespaceSetupDisk: Fix const correctness
by Michal Privoznik 10 Apr '18

10 Apr '18

The array of strings we are building is indeed array of const strings. We are not STRDUP()-ing them nor FREE()-ing them. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f03aa03e8a..0486c5527d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -11196,7 +11196,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, virStorageSourcePtr src) { virStorageSourcePtr next; - char **paths = NULL; + const char **paths = NULL; size_t npaths = 0; int ret = -1; @@ -11214,7 +11214,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, goto cleanup; } - if (qemuDomainNamespaceMknodPaths(vm, (const char **)paths, npaths) < 0) + if (qemuDomainNamespaceMknodPaths(vm, paths, npaths) < 0) return -1; ret = 0; -- 2.16.1

2 1

[libvirt] [jenkins-ci PATCH 0/2] jobs: Simplify Python jobs
by Andrea Bolognani 10 Apr '18

10 Apr '18

By reverting a bunch of semi-recent changes. Requires https://www.redhat.com/archives/libvir-list/2018-April/msg00356.html Andrea Bolognani (2): jobs: Don't set $PYTHONPATH for python-distutil jobs jobs: Build using $PYTHON jobs/python-distutils.yaml | 29 +++++++++++++---------------- projects/libvirt-python.yaml | 29 ++--------------------------- projects/virt-manager.yaml | 11 ++++------- 3 files changed, 19 insertions(+), 50 deletions(-) -- 2.14.3

2 3

[libvirt] [jenkins-ci PATCH 0/2] Add libvirt-dbus project
by Andrea Bolognani 10 Apr '18

10 Apr '18

Andrea Bolognani (2): guests: Add libvirt-dbus project projects: Add libvirt-dbus project guests/host_vars/libvirt-centos-7/main.yml | 1 + guests/host_vars/libvirt-debian-9/main.yml | 1 + guests/host_vars/libvirt-debian-sid/main.yml | 1 + guests/host_vars/libvirt-fedora-26/main.yml | 1 + guests/host_vars/libvirt-fedora-27/main.yml | 1 + guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/host_vars/libvirt-freebsd-10/main.yml | 1 + guests/host_vars/libvirt-freebsd-11/main.yml | 1 + guests/host_vars/libvirt-freebsd-current/main.yml | 1 + guests/host_vars/libvirt-ubuntu-16/main.yml | 1 + guests/vars/mappings.yml | 10 ++++++++ guests/vars/projects/libvirt-dbus.yml | 6 +++++ projects/libvirt-dbus.yaml | 31 +++++++++++++++++++++++ 13 files changed, 57 insertions(+) create mode 100644 guests/vars/projects/libvirt-dbus.yml create mode 100644 projects/libvirt-dbus.yaml -- 2.14.3

2 3

[libvirt] [PATCH 0/6] Add support for TPM emulator and CRB interface
by Stefan Berger 09 Apr '18

09 Apr '18

This series of patches add support for the new TPM CRB interface in QEMU that will become available with QEMU 2.12. The rest of the patches add support for the TPM emulator backend that is available in QEMU and based on swtpm + libtpms. Here I hope for feedback for how to organize the layout of directories, files, and UnixIO socket files that QEMU needs to talk to 'swtpm'. Stefan Stefan Berger (6): tpm: Enable TPM CRB interface tpm: Add support for external swtpm TPM emulator tpm: Label the external swtpm with SELinux labels tpm: Handle TPM emulator device reconfigurations tpm: Add support for choosing emulation of a TPM 2 tpm: Add swtpm to emulator cgroup docs/formatdomain.html.in | 47 ++ docs/schemas/domaincommon.rng | 23 +- src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 131 ++++- src/conf/domain_conf.h | 19 + src/libvirt_private.syms | 8 + src/qemu/Makefile.inc.am | 2 + src/qemu/libvirtd_qemu.aug | 3 + src/qemu/qemu.conf | 7 + src/qemu/qemu_capabilities.c | 10 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_cgroup.c | 54 ++ src/qemu/qemu_cgroup.h | 1 + src/qemu/qemu_command.c | 52 +- src/qemu/qemu_conf.c | 11 +- src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 16 +- src/qemu/qemu_extdevice.c | 245 +++++++++ src/qemu/qemu_extdevice.h | 36 ++ src/qemu/qemu_process.c | 12 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/security/security_dac.c | 6 + src/security/security_driver.h | 5 +- src/security/security_manager.c | 15 + src/security/security_manager.h | 3 + src/security/security_selinux.c | 101 ++++ src/security/security_stack.c | 19 + src/util/vircgroup.c | 42 ++ src/util/vircgroup.h | 1 + src/util/virfile.c | 12 + src/util/virfile.h | 2 +- src/util/virtpm.c | 550 +++++++++++++++++++++ src/util/virtpm.h | 14 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 2 + tests/qemuxml2argvdata/tpm-emulator-tpm2.args | 24 + tests/qemuxml2argvdata/tpm-emulator-tpm2.xml | 30 ++ tests/qemuxml2argvdata/tpm-emulator.args | 24 + tests/qemuxml2argvdata/tpm-emulator.xml | 30 ++ tests/qemuxml2argvdata/tpm-passthrough-crb.args | 24 + tests/qemuxml2argvdata/tpm-passthrough-crb.xml | 32 ++ tests/qemuxml2argvmock.c | 2 + tests/qemuxml2argvtest.c | 23 + tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml | 34 ++ tests/qemuxml2xmloutdata/tpm-emulator.xml | 34 ++ tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml | 36 ++ tests/qemuxml2xmltest.c | 1 + 51 files changed, 1736 insertions(+), 20 deletions(-) create mode 100644 src/qemu/qemu_extdevice.c create mode 100644 src/qemu/qemu_extdevice.h create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2argvdata/tpm-emulator.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator.xml create mode 100644 tests/qemuxml2argvdata/tpm-passthrough-crb.args create mode 100644 tests/qemuxml2argvdata/tpm-passthrough-crb.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-passthrough-crb.xml -- 2.5.5

2 13

[libvirt] [PATCH v1 0/2] Fix qcow2 fully allocated filesystem objects.
by Wim Ten Have 09 Apr '18

09 Apr '18

From: Wim ten Have <wim.ten.have(a)oracle.com> When tools like virt-install request to create a fully allocated filesystem object storage by setting the parameter sparse=no, libvirt doesn't allow that to happen for qcow2 formatted files. Regardless of its XML instuction request libvirt always targets its filesystem object storage with preallocation=metadata if format=qcow2 is in effect. This results in sparse files which could cause problems since total image storage potentially can overrun actual filesystem available space. (NOTE: This is a RESEND holding corrected cover letter and commit messages / Subject headers.) Wim ten Have (2): storage: extend preallocation flags support for qemu-img tests: add qemu-img test for preallocation=falloc include/libvirt/libvirt-storage.h | 5 ++++- src/storage/storage_util.c | 21 +++++++++++++++++---- .../qcow2-nocapacity-convert-prealloc.argv | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) -- 2.14.3

3 5

[libvirt] Race condition between qemuDomainCreate and qemuDomainDestroy
by Marc Hartmayer 09 Apr '18

09 Apr '18

Hi, there is a race condition between 'qemuDomainCreate' and 'qemuDomainDestroy' causing a NULL pointer segmentation fault when accessing priv->monConfig. The race condition can be easily reproduced using gdb. (gdb) set non-stop on # set breakpoint on line 'mon = qemuMonitorOpen(vm, …)' (gdb) b qemu_process.c:1799 # Actually, this second breakpoint is optional but it’s good to see where priv->monConfig is set to NULL # set breakpoint on line priv->monConfig = NULL; (gdb) b qemu_process.c:6589 (gdb) run # continue all threads - just for the case we hit a breakpoint already (gdb) c -a Now start a domain (that is using QEMU) $ virsh start domain The first breakpoint will be hit. Now run in a second shell $ virsh destroy domain The second breakpoint will be hit. Continue the thread where the second breakpoint was hit (for this example this is thread 4) (gdb) thread apply 4 continue Now continue the thread where the first breakpoint was hit. => Segmentation fault because of a NULL pointer dereference at config->value Since I'm not very familiar with that part of the code, I wanted to ask for your advice. Thanks in advance. Beste Grüße / Kind regards Marc Hartmayer IBM Deutschland Research & Development GmbH Vorsitzende des Aufsichtsrats: Martina Koederitz Geschäftsführung: Dirk Wittkopp Sitz der Gesellschaft: Böblingen Registergericht: Amtsgericht Stuttgart, HRB 243294

3 5

[libvirt] [dbus PATCH] APIs should appear in aplhabetical order in all files.
by Katerina Koukiou 09 Apr '18

09 Apr '18

In C and XML files the order is: 1) properties 2) methods 3) signals All of them sorted in their category alphabetically. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- data/org.libvirt.Connect.xml | 12 +-- data/org.libvirt.Domain.xml | 54 ++++++------ src/connect.c | 2 +- src/domain.c | 200 +++++++++++++++++++++---------------------- 4 files changed, 134 insertions(+), 134 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index 5b49ed9..55260cc 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -25,12 +25,6 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-host.html#virConnectGetVersion"/> </property> - <method name="ListDomains"> - <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomai…"/> - <arg name="flags" type="u" direction="in"/> - <arg name="domains" type="ao" direction="out"/> - </method> <method name="DomainCreateXML"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateXML"/> @@ -73,6 +67,12 @@ <arg name="flags" type="u" direction="in"/> <arg name="sysinfo" type="s" direction="out"/> </method> + <method name="ListDomains"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomai…"/> + <arg name="flags" type="u" direction="in"/> + <arg name="domains" type="ao" direction="out"/> + </method> <method name="ListNetworks"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-network.html#virConnectListAllNetw…"/> diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 7679018..78378bb 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -3,25 +3,25 @@ <node name="/org/libvirt/domain"> <interface name="org.libvirt.Domain"> - <property name="Name" type="s" access="read"> + <property name="Active" type="b" access="read"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetName"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsActive"/> </property> - <property name="UUID" type="s" access="read"> + <property name="Autostart" type="b" access="read"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetUUIDString"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetAutostart"/> </property> <property name="Id" type="u" access="read"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetID"/> </property> - <property name="OSType" type="s" access="read"> + <property name="Name" type="s" access="read"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetOSType"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetName"/> </property> - <property name="Active" type="b" access="read"> + <property name="OSType" type="s" access="read"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainIsActive"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetOSType"/> </property> <property name="Persistent" type="b" access="read"> <annotation name="org.gtk.GDBus.DocString" @@ -31,21 +31,19 @@ <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetState"/> </property> - <property name="Autostart" type="b" access="read"> + <property name="UUID" type="s" access="read"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetAutostart"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetUUIDString"/> </property> - <method name="GetVcpus"> + <method name="Create"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetVcpusFlags"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithFla…"/> <arg name="flags" type="u" direction="in"/> - <arg name="vcpus" type="u" direction="out"/> </method> - <method name="GetXMLDesc"> + <method name="Destroy"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetXMLDesc"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroyFlags"/> <arg name="flags" type="u" direction="in"/> - <arg name="xml" type="s" direction="out"/> </method> <method name="GetStats"> <annotation name="org.gtk.GDBus.DocString" @@ -54,15 +52,17 @@ <arg name="flags" type="u" direction="in"/> <arg name="records" type="a{sv}" direction="out"/> </method> - <method name="Shutdown"> + <method name="GetVcpus"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdownFlags"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetVcpusFlags"/> <arg name="flags" type="u" direction="in"/> + <arg name="vcpus" type="u" direction="out"/> </method> - <method name="Destroy"> + <method name="GetXMLDesc"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainDestroyFlags"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetXMLDesc"/> <arg name="flags" type="u" direction="in"/> + <arg name="xml" type="s" direction="out"/> </method> <method name="Reboot"> <annotation name="org.gtk.GDBus.DocString" @@ -74,23 +74,23 @@ value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainReset"/> <arg name="flags" type="u" direction="in"/> </method> - <method name="Create"> + <method name="Resume"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithFla…"/> - <arg name="flags" type="u" direction="in"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainResume"/> </method> - <method name="Undefine"> + <method name="Shutdown"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainUndefineFlags"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainShutdownFlags"/> <arg name="flags" type="u" direction="in"/> </method> <method name="Suspend"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSuspend"/> </method> - <method name="Resume"> + <method name="Undefine"> <annotation name="org.gtk.GDBus.DocString" - value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainResume"/> + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainUndefineFlags"/> + <arg name="flags" type="u" direction="in"/> </method> <signal name="DeviceAdded"> <annotation name="org.gtk.GDBus.DocString" diff --git a/src/connect.c b/src/connect.c index 9820de5..d18f77d 100644 --- a/src/connect.c +++ b/src/connect.c @@ -575,7 +575,6 @@ static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { }; static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { - { "ListDomains", virtDBusConnectListDomains }, { "DomainCreateXML", virtDBusConnectDomainCreateXML }, { "DomainDefineXML", virtDBusConnectDomainDefineXML }, { "DomainLookupByID", virtDBusConnectDomainLookupByID }, @@ -583,6 +582,7 @@ static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "DomainLookupByUUID", virtDBusConnectDomainLookupByUUID }, { "GetCapabilities", virtDBusConnectGetCapabilities }, { "GetSysinfo", virtDBusConnectGetSysinfo }, + { "ListDomains", virtDBusConnectListDomains }, { "ListNetworks", virtDBusConnectListNetworks }, { "NetworkCreateXML", virtDBusConnectNetworkCreateXML }, { "NetworkDefineXML", virtDBusConnectNetworkDefineXML }, diff --git a/src/domain.c b/src/domain.c index 0066788..b3b3630 100644 --- a/src/domain.c +++ b/src/domain.c @@ -25,44 +25,44 @@ virtDBusDomainGetVirDomain(virtDBusConnect *connect, } static void -virtDBusDomainGetName(const gchar *objectPath, - gpointer userData, - GVariant **value, - GError **error) +virtDBusDomainGetActive(const gchar *objectPath, + gpointer userData, + GVariant **value, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - const gchar *name; + gint active; domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - name = virDomainGetName(domain); - if (!name) + active = virDomainIsActive(domain); + if (active < 0) return virtDBusUtilSetLastVirtError(error); - *value = g_variant_new("s", name); + *value = g_variant_new("b", !!active); } static void -virtDBusDomainGetUUID(const gchar *objectPath, - gpointer userData, - GVariant **value, - GError **error) +virtDBusDomainGetAutostart(const gchar *objectPath, + gpointer userData, + GVariant **value, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - gchar uuid[VIR_UUID_STRING_BUFLEN] = ""; + gint autostart = 0; domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - if (virDomainGetUUIDString(domain, uuid) < 0) + if (virDomainGetAutostart(domain, &autostart) < 0) return virtDBusUtilSetLastVirtError(error); - *value = g_variant_new("s", uuid); + *value = g_variant_new("b", !!autostart); } static void @@ -87,45 +87,45 @@ virtDBusDomainGetId(const gchar *objectPath, } static void -virtDBusDomainGetOsType(const gchar *objectPath, - gpointer userData, - GVariant **value, - GError **error) +virtDBusDomainGetName(const gchar *objectPath, + gpointer userData, + GVariant **value, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - g_autofree gchar *osType = NULL; + const gchar *name; domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - osType = virDomainGetOSType(domain); - if (!osType) + name = virDomainGetName(domain); + if (!name) return virtDBusUtilSetLastVirtError(error); - *value = g_variant_new("s", osType); + *value = g_variant_new("s", name); } static void -virtDBusDomainGetActive(const gchar *objectPath, +virtDBusDomainGetOsType(const gchar *objectPath, gpointer userData, GVariant **value, GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - gint active; + g_autofree gchar *osType = NULL; domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - active = virDomainIsActive(domain); - if (active < 0) + osType = virDomainGetOSType(domain); + if (!osType) return virtDBusUtilSetLastVirtError(error); - *value = g_variant_new("b", !!active); + *value = g_variant_new("s", osType); } static void @@ -199,38 +199,36 @@ virtDBusDomainGetState(const gchar *objectPath, } static void -virtDBusDomainGetAutostart(const gchar *objectPath, - gpointer userData, - GVariant **value, - GError **error) +virtDBusDomainGetUUID(const gchar *objectPath, + gpointer userData, + GVariant **value, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - gint autostart = 0; + gchar uuid[VIR_UUID_STRING_BUFLEN] = ""; domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - if (virDomainGetAutostart(domain, &autostart) < 0) + if (virDomainGetUUIDString(domain, uuid) < 0) return virtDBusUtilSetLastVirtError(error); - *value = g_variant_new("b", !!autostart); + *value = g_variant_new("s", uuid); } static void -virtDBusDomainGetVcpus(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) - +virtDBusDomainCreate(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - gint vcpus; guint flags; g_variant_get(inArgs, "(u)", &flags); @@ -239,25 +237,21 @@ virtDBusDomainGetVcpus(GVariant *inArgs, if (!domain) return; - vcpus = virDomainGetVcpusFlags(domain, flags); - if (vcpus < 0) - return virtDBusUtilSetLastVirtError(error); - - *outArgs = g_variant_new("(u)", vcpus); + if (virDomainCreateWithFlags(domain, flags) < 0) + virtDBusUtilSetLastVirtError(error); } static void -virtDBusDomainGetXMLDesc(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainDestroy(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - g_autofree gchar *xml = NULL; guint flags; g_variant_get(inArgs, "(u)", &flags); @@ -266,11 +260,8 @@ virtDBusDomainGetXMLDesc(GVariant *inArgs, if (!domain) return; - xml = virDomainGetXMLDesc(domain, flags); - if (!xml) - return virtDBusUtilSetLastVirtError(error); - - *outArgs = g_variant_new("(s)", xml); + if (virDomainDestroyFlags(domain, flags) < 0) + virtDBusUtilSetLastVirtError(error); } G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListFree); @@ -311,16 +302,18 @@ virtDBusDomainGetStats(GVariant *inArgs, } static void -virtDBusDomainShutdown(GVariant *inArgs, +virtDBusDomainGetVcpus(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, const gchar *objectPath, gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, + GVariant **outArgs, GUnixFDList **outFDs G_GNUC_UNUSED, GError **error) + { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; + gint vcpus; guint flags; g_variant_get(inArgs, "(u)", &flags); @@ -329,21 +322,25 @@ virtDBusDomainShutdown(GVariant *inArgs, if (!domain) return; - if (virDomainShutdownFlags(domain, flags) < 0) - virtDBusUtilSetLastVirtError(error); + vcpus = virDomainGetVcpusFlags(domain, flags); + if (vcpus < 0) + return virtDBusUtilSetLastVirtError(error); + + *outArgs = g_variant_new("(u)", vcpus); } static void -virtDBusDomainDestroy(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainGetXMLDesc(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; + g_autofree gchar *xml = NULL; guint flags; g_variant_get(inArgs, "(u)", &flags); @@ -352,8 +349,11 @@ virtDBusDomainDestroy(GVariant *inArgs, if (!domain) return; - if (virDomainDestroyFlags(domain, flags) < 0) - virtDBusUtilSetLastVirtError(error); + xml = virDomainGetXMLDesc(domain, flags); + if (!xml) + return virtDBusUtilSetLastVirtError(error); + + *outArgs = g_variant_new("(s)", xml); } static void @@ -405,7 +405,7 @@ virtDBusDomainReset(GVariant *inArgs, } static void -virtDBusDomainCreate(GVariant *inArgs, +virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, const gchar *objectPath, gpointer userData, @@ -415,20 +415,17 @@ virtDBusDomainCreate(GVariant *inArgs, { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; - guint flags; - - g_variant_get(inArgs, "(u)", &flags); domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - if (virDomainCreateWithFlags(domain, flags) < 0) + if (virDomainResume(domain) < 0) virtDBusUtilSetLastVirtError(error); } static void -virtDBusDomainUndefine(GVariant *inArgs, +virtDBusDomainShutdown(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, const gchar *objectPath, gpointer userData, @@ -446,7 +443,7 @@ virtDBusDomainUndefine(GVariant *inArgs, if (!domain) return; - if (virDomainUndefineFlags(domain, flags) < 0) + if (virDomainShutdownFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } @@ -471,49 +468,52 @@ virtDBusDomainSuspend(GVariant *inArgs G_GNUC_UNUSED, } static void -virtDBusDomainResume(GVariant *inArgs G_GNUC_UNUSED, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainUndefine(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; + guint flags; + + g_variant_get(inArgs, "(u)", &flags); domain = virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) return; - if (virDomainResume(domain) < 0) + if (virDomainUndefineFlags(domain, flags) < 0) virtDBusUtilSetLastVirtError(error); } static virtDBusGDBusPropertyTable virtDBusDomainPropertyTable[] = { - { "Name", virtDBusDomainGetName, NULL }, - { "UUID", virtDBusDomainGetUUID, NULL }, + { "Active", virtDBusDomainGetActive, NULL }, + { "Autostart", virtDBusDomainGetAutostart, NULL }, { "Id", virtDBusDomainGetId, NULL }, + { "Name", virtDBusDomainGetName, NULL }, { "OSType", virtDBusDomainGetOsType, NULL }, - { "Active", virtDBusDomainGetActive, NULL }, { "Persistent", virtDBusDomainGetPersistent, NULL }, { "State", virtDBusDomainGetState, NULL }, - { "Autostart", virtDBusDomainGetAutostart, NULL }, + { "UUID", virtDBusDomainGetUUID, NULL }, { 0 } }; static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { + { "Create", virtDBusDomainCreate }, + { "Destroy", virtDBusDomainDestroy }, + { "GetStats", virtDBusDomainGetStats }, { "GetVcpus", virtDBusDomainGetVcpus }, { "GetXMLDesc", virtDBusDomainGetXMLDesc }, - { "GetStats", virtDBusDomainGetStats }, - { "Shutdown", virtDBusDomainShutdown }, - { "Destroy", virtDBusDomainDestroy }, { "Reboot", virtDBusDomainReboot }, { "Reset", virtDBusDomainReset }, - { "Create", virtDBusDomainCreate }, - { "Undefine", virtDBusDomainUndefine }, - { "Suspend", virtDBusDomainSuspend }, { "Resume", virtDBusDomainResume }, + { "Shutdown", virtDBusDomainShutdown }, + { "Suspend", virtDBusDomainSuspend }, + { "Undefine", virtDBusDomainUndefine }, { 0 } }; -- 2.15.0

2 2

[libvirt] [RFC] Defining firmware (OVMF, et al) metadata format & file
by Kashyap Chamarthy 09 Apr '18

09 Apr '18

Problem background ------------------ The various OVMF binary file names and paths are slightly different[+] for each Linux distribution. And each high-level management tool (libguestfs, oVirt, `virt-manager` and OpenStack Nova) is inventing its own approach to detect and configure the said OVMF files. This email thread is about arriving at some common understanding to make this a bit more "unified" by addressing these needs in QEMU and libvirt. Suggested approach ------------------ Based on an upstream discussion on 'virt-tools'[1] mailing list and some Bugzillas, Gerd Hoffmann, Laszlo Ersek and Dan Berrangé had a suggestion to define a firmware metadata format and file (example in [1]): - For each firmware file we need a metadata file in a well defined location, e.g. /usr/share/qemu/bios/ that lists stuff like: - Path to the firmware binary - Path to the pre-built OVMF 'vars' file (if any) - Support architectures - associated QEMU feature flags (Secure Boot) - If the binary provides / requires SMM (System Management Mode) Essentially, QEMU would define[*] the file format, and provide metadata files from any ROMs it ships directly. If Linux distributions / vendors ship extra ROMs like OVMF, etc then they should provide suitable metadata files. - Libvirt can read these metadata files and then pick the correct firmware binary based on the settings for the guest. - Management tools can then wire up the libvirt-based OVMF SB (Secure Boot) configuration. [*] Open question: Who, between QEMU and libvirt, should define the said firmware metadata format and file? References ---------- [1] A past proposal from Gerd to create a sort of a "firmware registry" https://www.redhat.com/archives/virt-tools-list/2014-September/msg00145.html [2] A libvirt upstream RFE bug requesting to simplify handling UEFI https://bugzilla.redhat.com/show_bug.cgi?id=1295146 -- RFE: provide a bios=uefi XML convenience option [3] DanPB wrote a PoC in libvirt: https://www.redhat.com/archives/libvir-list/2016-October/msg00045.html -- [libvirt] [PATCH 0/3] Make UEFI firmware config simpler But later came to the conclusion that it is flawed, and said we go the route of "Suggested approach" mentioned earlier). [*] OVMF package path names for different distributions ------------------------------------------------------- - Debian (https://packages.debian.org/stretch/all/ovmf/filelist) - /usr/share/OVMF/OVMF_CODE.fd - /usr/share/OVMF/OVMF_VARS.fd - OpenSUSE (package: "qemu-ovmf-x86_64" -- and it has *35* files in that package): - /usr/share/qemu/ovmf-x86_64-opensuse-code.bin - /usr/share/qemu/ovmf-x86_64-opensuse-vars.bin [...] Their RPM spec file gives some hints (where all the files with 'ms' means signed with MS keys; the files with 'opensuse-4096' means signed with OpenSUSE 4096 bit CA keys -- I think that's one of the points of Secure Boot, to let people have control over system keys): https://build.opensuse.org/package/view_file/openSUSE:Factory/ovmf/ovmf.spe… - Fedora 27 (package: "edk2-ovmf", x86_64): - /usr/share/edk2/ovmf/OVMF_CODE.fd - /usr/share/edk2/ovmf/OVMF_CODE.secboot.fd - /usr/share/edk2/ovmf/OVMF_VARS.fd - RHEL-7.4 (package: "OVMF", x86_64): - /usr/share/OVMF/OVMF_CODE.secboot.fd - /usr/share/OVMF/OVMF_VARS.fd - Gerd's firmware repo from Git: - /usr/share/edk2.git/ovmf-x64/OVMF_VARS-need-smm.fd - /usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd -- /kashyap

5 20

[libvirt] [PATCH 0/4] Fix a race to using monConfig
by John Ferlan 09 Apr '18

09 Apr '18

As reported by Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com>: https://www.redhat.com/archives/libvir-list/2018-March/msg01156.html there is a race to using the priv->monConfig between the Create and destroy domain processing. The patches describe the steps taken to resolve the issue. John Ferlan (4): conf: Use virDomainChrSourceDefNew for vhostuser qemu: Use virDomainChrSourceDefNew for monConfig conf: Convert virDomainChrSourceDefNew to return object qemu: Obtain reference on monConfig src/conf/domain_conf.c | 37 ++++++++++++++++++++++++++++++++----- src/conf/domain_conf.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 8 ++++++-- 5 files changed, 43 insertions(+), 8 deletions(-) -- 2.13.6

4 12

[libvirt] [dbus PATCH v2 0/8] Properties/Methods for Connect Interface
by Katerina Koukiou 09 Apr '18

09 Apr '18

Plus some minor fixes. Changes from v1: * Cabalitities property rewritten as method as dnb suggested. * Added documentation on Secure and Encrypted properties as discussed. Katerina Koukiou (8): Implement GetCapabilities method for connect Interface Implement Hostname property for Connect Interface Implement LibVersion property for Connect Interface Implement Encrypted property for Connect Interface Implement Secure property for Connect Interface Implement GetSysinfo method for connect Interface All functions in src/connect.c should have virtDBusConnect prefix Removing G_GNUC_UNUSED in cases where the parameter is used data/org.libvirt.Connect.xml | 29 ++++++ src/connect.c | 209 ++++++++++++++++++++++++++++++++++--------- src/domain.c | 10 +-- test/test_connect.py | 11 +++ 4 files changed, 214 insertions(+), 45 deletions(-) -- 2.15.0

2 11

[libvirt] [dbus PATCH 0/8] Properties/Methods for Connect Interface
by Katerina Koukiou 09 Apr '18

09 Apr '18

Plus some minor fixes. Katerina Koukiou (8): Implement Capabilities property for connect Interface Implement Hostname property for Connect Interface Implement LibVersion property for Connect Interface Implement Encrypted property for Connect Interface Implement Secure property for Connect Interface Implement GetSysinfo method for connect Interface All functions in src/connect.c should have virtDBusConnect prefix. Removing G_GNUC_UNUSED in cases where the parameter is used data/org.libvirt.Connect.xml | 26 ++++++ src/connect.c | 206 ++++++++++++++++++++++++++++++++++--------- src/domain.c | 10 +-- test/test_connect.py | 9 ++ 4 files changed, 206 insertions(+), 45 deletions(-) -- 2.15.0

3 19

[libvirt] Permissions and ownership on /dev/kvm keep reverting after starting a vm
by Tom 09 Apr '18

09 Apr '18

Hey guys, /dev/kvm permissions and ownership keeps reverting after starting a vm. The ownership and permissions keep going back to crw-rw—— root root .... After starting a vm. I have to revert the perms and ownership to: crw-crw-crw root kvm .... To start any vm but it goes back to the first set of permissions as soon as I start another vm. Any hints what I could check? Cheers, Tom Sent from my iPhone

3 2

[libvirt] [PATCH 0/2] Change virCloseCallback typedef to return void
by John Ferlan 09 Apr '18

09 Apr '18

Slightly related to some current work to clean up the Add/Remove domain object list processing - as it turns out the close callbacks run code didn't even pay attention to what was returned and it really didn't need to - so let's just call it what it is a void function and let the virCloseCallbacksRun code handle the object manipulation (lock/ref and unlock/unref). John Ferlan (2): qemu: Fix qemuProcessAutoDestroy util: Alter virCloseCallback typedef to return void src/bhyve/bhyve_process.c | 8 ++------ src/lxc/lxc_process.c | 8 ++------ src/qemu/qemu_migration.c | 7 ++----- src/qemu/qemu_process.c | 10 ++-------- src/util/virclosecallbacks.c | 5 ++--- src/util/virclosecallbacks.h | 6 +++--- 6 files changed, 13 insertions(+), 31 deletions(-) -- 2.13.6

2 5

[libvirt] [PATCH 00/11] qemu: Implement pcie-to-pci-bridge controller
by Andrea Bolognani 09 Apr '18

09 Apr '18

Patches 1-4 are cleanups and preparation. For more information, take a peek at patch 8's commit message, which also includes a link to the relevant Bugzilla entry. Andrea Bolognani (11): docs: Tweak PCI controller model documentation tests: Add aarch64-traditional-pci test conf: Remove dubious code from virDomainPCIAddressSetGrow() conf: Rename virDomainPCIAddressSet.areMultipleRootsSupported qemu: Add QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE qemu: Implement pcie-to-pci-bridge controller conf: Add virDomainPCIAddressSet.isPCIeToPCIBridgeSupported conf: Prefer pcie-to-pci-bridge to dmi-to-pci-bridge tests: Use pcie-to-pci-bridge for aarch64-traditional-pci news: Add 4.3.0 release news: Update for pcie-to-pci-bridge support docs/formatdomain.html.in | 21 ++--- docs/news.xml | 17 ++++ docs/schemas/domaincommon.rng | 3 + src/conf/domain_addr.c | 95 ++++++++++++++++------ src/conf/domain_addr.h | 8 +- src/conf/domain_conf.c | 3 + src/conf/domain_conf.h | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_domain.c | 17 ++++ src/qemu/qemu_domain_address.c | 14 +++- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + .../qemuxml2argvdata/aarch64-traditional-pci.args | 27 ++++++ tests/qemuxml2argvdata/aarch64-traditional-pci.xml | 19 +++++ tests/qemuxml2argvtest.c | 9 ++ .../qemuxml2xmloutdata/aarch64-traditional-pci.xml | 43 ++++++++++ tests/qemuxml2xmltest.c | 9 ++ 19 files changed, 251 insertions(+), 42 deletions(-) create mode 100644 tests/qemuxml2argvdata/aarch64-traditional-pci.args create mode 100644 tests/qemuxml2argvdata/aarch64-traditional-pci.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-traditional-pci.xml -- 2.14.3

3 34

[libvirt] [PATCH 0/4] Introduce wildcard to log filters
by Erik Skultety 09 Apr '18

09 Apr '18

First, 2 tiny fixes along the way, then the actual change, which lets you do the following for example during runtime: virt-admin daemon-log-filters "1:* 4:remote 4:json" which previously, given the default config setting log_level=3, translated into virt-admin daemon-log-filters \ "1:access 1:admin 1:conf 1:cpu 1:qemu 1:interface 1:<etc-it's-long>" ...of course, "3:*" is equivalent to "log_level=3". Erik Skultety (4): virlog: Fix a typo in virLogParseFilter's error msg libvirtd.conf: Document that we do a 'first' match on log filters util: virlog: Introduce wildcard to log filters news: Update the news file with the log filter wildcard improvement docs/news.xml | 12 ++++++++++++ src/remote/libvirtd.conf | 6 +++++- src/util/virlog.c | 46 ++++++++++++++++++++++++++++++++++++++++++++-- src/util/virlog.h | 1 + 4 files changed, 62 insertions(+), 3 deletions(-) -- 2.14.3

2 10

[libvirt] Project for profiles and defaults for libvirt domains
by Martin Kletzander 08 Apr '18

08 Apr '18

Hi everyone! First of all sorry for such wide distribution, but apparently that's the best way to make sure we cooperate nicely. So please be considerate as this is a cross-post between huge amount of mailing lists. After some discussions with developers from different projects that work with libvirt one cannot but notice some common patterns and workarounds. So I set off to see how can we make all our lives better and our coding more effective (and maybe more fun as well). If all goes well we will create a project that will accommodate most of the defaulting, policies, workarounds and other common algorithms around libvirt domain definitions. And since early design gets you half way, I would like to know your feedback on several key points as well as on the general idea. Also correct me brutally in case I'm wrong. In order to not get confused in the following descriptions, I will refer to this project idea using the name `virtuned`, but there is really no name for it yet (although an abbreviation for "Virtualization Abstraction Definition and Hypervisor Delegation" would suit well, IMHO). Here are some common problems and use cases that virtuned could solve (or help with). Don't take it as something that's impossible to solve on your own, but rather something that could be de-duplicated from multiple projects or "done right" instead of various hack-ish solutions. 1) Default devices/values Libvirt itself must default to whatever values there were before any particular element was introduced due to the fact that it strives to keep the guest ABI stable. That means, for example, that it can't just add -vmcoreinfo option (for KASLR support) or magically add the pvpanic device to all QEMU machines, even though it would be useful, as that would change the guest ABI. For default values this is even more obvious. Let's say someone figures out some "pretty good" default values for various HyperV enlightenment feature tunables. Libvirt can't magically change them, but each one of the projects building on top of it doesn't want to keep that list updated and take care of setting them in every new XML. Some projects don't even expose those to the end user as a knob, while others might. One more thing could be automatically figuring out best values based on libosinfo-provided data. 2) Policies Lot of the time there are parts of the domain definition that need to be added, but nobody really cares about them. Sometimes it's enough to have few templates, another time you might want to have a policy per-scenario and want to combine them in various ways. For example with the data provided by point 1). For example if you want PCI-Express, you need the q35 machine type, but you don't really want to care about the machine type. Or you want to use SPICE, but you don't want to care about adding QXL. What if some of these policies could be specified once (using some DSL for example), and used by virtuned to merge them in a unified and predictable way? 3) Abstracting the XML This is probably just usable for stateless apps, but it might happen that some apps don't really want to care about the XML at all. They just want an abstract view of the domain, possibly add/remove a device and that's it. We could do that as well. I can't really tell how much of a demand there is for it, though. 4) Identifying devices properly In contrast to the previous point, stateful apps might have a problem identifying devices after hotplug. For example, let's say you don't care about the addresses and leave that up to libvirt. You hotplug a device into the domain and dump the new XML of it. Depending on what type of device it was, you might need to identify it based on different values. It could be <target dev=''/> for disks, <mac address=''/> for interfaces etc. For some devices it might not even be possible and you need to remember the addresses of all the previous devices and then parse them just to identify that one device and then throw them away. With new enough libvirt you could use the user aliases for that, but turns out it's not that easy to use them properly anyway. Also the aliases won't help users identify that device inside the guest. <rant> We really should've gone with new attribute for the user alias instead of using an existing one, given how many problems that is causing. </rant> 5) Generating the right XML snippet for device hot-(un)plug This is kind of related to some previous points. When hot-plugging a device and creating an XML snippet for it, you want to keep the defaults from point 1) and policies from 2) in mind. Or something related to the already existing domain which you can describe systematically. And adding something for identification (see previous point). Doing the hot-unplug is easy depending on how much information about that device is saved by your application. The less you save about the device (or show to the user in a GUI, if applicable) the harder it might be to generate an XML that libvirt will accept. Again, some problems with this should be fixed in libvirt, some of them are easy to workaround. But having a common ground that takes care of this should help some projects. Hot-unplug could be implemented just based on the alias. This is something that would fit into libvirt as well. ======================================================================== To mention some pre-existing solutions: - I understand OpenStack has some really sensible and wisely chosen and/or tested default values. - I know KubeVirt has VirtualMachinePresets. That is something closely related to points 1) and 2). Also their abstraction of the XML might be usable for point 3). - There was an effort on creating policy based configuration of libvirt objects called libvirt-designer. This is closely related to points 2) and 3). Unfortunately there was no much going on lately and part of virt-manager repository has currently more features implemented with the same ideas in mind, just not exported for public use. We could utilize some of the above to various extents. Let me know what you think and have a nice day. Martin

6 14

[libvirt] [PATCH v2] docs: add page describing goals for host platform version support
by Daniel P. Berrangé 06 Apr '18

06 Apr '18

Described how we decide which host platforms to support for libvirt, which in turn makes it easier to decide when a platform / software version can be dropped. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/index.html.in | 2 +- docs/platforms.html.in | 105 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 docs/platforms.html.in diff --git a/docs/index.html.in b/docs/index.html.in index 1b3a7a3db6..4783c39e3c 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -28,7 +28,7 @@ The libvirt project: </p> <ul> - <li>is a toolkit to manage virtualization hosts</li> + <li>is a toolkit to manage <a href="platforms.html.in">virtualization platforms</a></li> <li>is accessible from C, Python, Perl, Java and more</li> <li>is licensed under open source licenses</li> <li>supports <a href="drvqemu.html">KVM</a>, diff --git a/docs/platforms.html.in b/docs/platforms.html.in new file mode 100644 index 0000000000..776e930e78 --- /dev/null +++ b/docs/platforms.html.in @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Supported host platforms</h1> + + <ul id="toc"></ul> + + <h2>Build targets</h2> + + <p> + Libvirt drivers aim to support building and executing on multiple + host OS platforms. This document outlines which platforms are the + major build targets. These platforms are used as the basis for deciding + upon the minimum required versions of 3rd party software libvirt depends + on. If a platform is not listed here, it does not imply that libvirt + won't work. If an unlisted platform has comparable software versions + to a listed platform, there is every expectation that it will work. + Bug reports are welcome for problems encountered on unlisted platforms + unless they are clearly older vintage that what is described here. + </p> + + <p> + Note that when considering software versions shipped in distros as + support targets, libvirt considers only the version number, and assumes + the features in that distro match the upstream release with the same + version. IOW, if a distro backports extra features to the software in + their distro, libvirt upstream code will not add explicit support for + those backports, unless the feature is auto-detectable in a manner that + works for the upstream releases too. + </p> + + <p> + The Repology site is a useful resource to identify currently shipped + versions of software in various operating systems, though it does not + cover all distros listed below. + </p> + + <ul> + <li><a href="https://repology.org/metapackage/libvirt/versions">libvirt</a></li> + <li><a href="https://repology.org/metapackage/qemu/versions">qemu</a></li> + </ul> + + + <h3>Linux OS</h3> + + <p> + For distributions with frequent, short-lifetime releases, the project + will aim to support all versions that are not end of life by their + respective vendors. For the purposes of identifying supported software + versions, the project will look at Fedora, Ubuntu & OpenSUSE distros. + Other short-lifetime distros will be assumed to ship similar software + versions. + </p> + + <p> + For distributions with long-lifetime releases, the project will aim to + support the most recent major version at all times. Support for the + previous major version will be dropped 2 years after the new major + version is released. For the purposes of identifying supported software + versions, the project will look at RHEL, Debian, Ubuntu LTS & SLES + distros. Other long-lifetime distros will be assumed to ship similar + software versions. + </p> + + <h3>Windows</h3> + + <p> + The project supports building with current versions of the MinGW + toolchain, hosted on Linux. + </p> + + <h3>macOS</h3> + + <p> + The project supports building with the current version of macOS, + with the current homebrew package set available. + </p> + + <h3>FreeBSD</h3> + + <p> + The project aims to support the most recent major version + at all times. Support for the previous major version will + be dropped 2 years after the new major version is released. + </p> + + <h2>Virtualization platforms</h2> + + <p> + For <a href="drivers.html">hypervisor drivers</a> which execute + locally (QEMU, LXC, VZ, libxl, etc), the set of supported operating + system platforms listed above will inform choices as to the minimum + required versions of 3rd party libraries and hypervisor management + APIs. + </p> + <p> + If a hypervisor is not commonly shipped directly by any distro + listed above, (VMware ESX, HyperV, VZ), the project aims to + support versions up to 5 years, or until the vendor discontinues + support, whichever comes first. + </p> + + </body> +</html> -- 2.14.3

5 5

[libvirt] [PATCH 0/7] Remove the legacy xen driver
by Jim Fehlig 06 Apr '18

06 Apr '18

Long overdue first cut at remove the old xen driver. The first 3 patches move existing tests to WITH_LIBXL since we'll want to continue supporting conversion of the various xen config formats. The remain patches remove the cruft. Jim Fehlig (7): tests: move xml2sexpr tests to WITH_LIBXL tests: move sexpr2xml tests to WITH_LIBXL tests: move xmconfig tests to WITH_LIBXL Remove xencaps tests and data files Remove the xend driver docs: remove mention of legacy Xen driver spec: remove legacy xen driver configure.ac | 7 +- docs/architecture.html.in | 28 +- docs/bugs.html.in | 3 +- docs/uri.html.in | 74 - docs/windows.html.in | 2 +- libvirt.spec.in | 57 +- m4/virt-driver-xen.m4 | 142 - po/POTFILES.in | 7 - src/Makefile.am | 1 - src/xen/Makefile.inc.am | 67 - src/xen/block_stats.c | 355 --- src/xen/block_stats.h | 38 - src/xen/xen_driver.c | 2845 ----------------- src/xen/xen_driver.h | 204 -- src/xen/xen_hypervisor.c | 3125 ------------------- src/xen/xen_hypervisor.h | 142 - src/xen/xen_inotify.c | 447 --- src/xen/xen_inotify.h | 33 - src/xen/xend_internal.c | 3221 -------------------- src/xen/xend_internal.h | 213 -- src/xen/xm_internal.c | 1484 --------- src/xen/xm_internal.h | 105 - src/xen/xs_internal.c | 920 ------ src/xen/xs_internal.h | 101 - tests/Makefile.am | 59 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-curmem.xml | 1 - .../sexpr2xml-disk-block-shareable.xml | 1 - tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 3 +- .../sexpr2xml-disk-drv-blktap-qcow.xml | 1 - .../sexpr2xml-disk-drv-blktap-raw.xml | 1 - .../sexpr2xml-disk-drv-blktap2-raw.xml | 1 - tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 7 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 7 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 7 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 7 +- tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 6 +- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 5 +- .../sexpr2xml-pv-bootloader-cmdline.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 3 +- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 3 +- .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-pv.xml | 3 +- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 7 +- tests/sexpr2xmltest.c | 35 +- tests/testutilsxen.c | 64 - tests/testutilsxen.h | 2 - tests/vircapstest.c | 34 - tests/virdrivermoduletest.c | 3 - tests/virschematest.c | 3 +- tests/xencapsdata/xen-i686-pae-hvm.caps | 1 - tests/xencapsdata/xen-i686-pae-hvm.cpuinfo | 37 - tests/xencapsdata/xen-i686-pae-hvm.xml | 49 - tests/xencapsdata/xen-i686-pae.caps | 1 - tests/xencapsdata/xen-i686-pae.cpuinfo | 18 - tests/xencapsdata/xen-i686-pae.xml | 32 - tests/xencapsdata/xen-i686.caps | 1 - tests/xencapsdata/xen-i686.cpuinfo | 18 - tests/xencapsdata/xen-i686.xml | 29 - tests/xencapsdata/xen-ia64-be-hvm.caps | 1 - tests/xencapsdata/xen-ia64-be-hvm.cpuinfo | 29 - tests/xencapsdata/xen-ia64-be-hvm.xml | 45 - tests/xencapsdata/xen-ia64-be.caps | 1 - tests/xencapsdata/xen-ia64-be.cpuinfo | 29 - tests/xencapsdata/xen-ia64-be.xml | 29 - tests/xencapsdata/xen-ia64-hvm.caps | 1 - tests/xencapsdata/xen-ia64-hvm.cpuinfo | 29 - tests/xencapsdata/xen-ia64-hvm.xml | 41 - tests/xencapsdata/xen-ia64.caps | 1 - tests/xencapsdata/xen-ia64.cpuinfo | 29 - tests/xencapsdata/xen-ia64.xml | 26 - tests/xencapsdata/xen-ppc64.caps | 1 - tests/xencapsdata/xen-ppc64.cpuinfo | 0 tests/xencapsdata/xen-ppc64.xml | 26 - tests/xencapsdata/xen-x86_64-hvm.caps | 1 - tests/xencapsdata/xen-x86_64-hvm.cpuinfo | 47 - tests/xencapsdata/xen-x86_64-hvm.xml | 61 - tests/xencapsdata/xen-x86_64.caps | 1 - tests/xencapsdata/xen-x86_64.cpuinfo | 47 - tests/xencapsdata/xen-x86_64.xml | 29 - tests/xencapstest.c | 224 -- tests/xmconfigdata/test-disk-drv-blktap-raw.xml | 3 +- tests/xmconfigdata/test-disk-drv-blktap2-raw.xml | 3 +- tests/xmconfigdata/test-escape-paths.xml | 11 +- .../xmconfigdata/test-fullvirt-default-feature.xml | 9 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 9 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 9 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 9 +- tests/xmconfigdata/test-fullvirt-net-netfront.xml | 9 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 9 +- tests/xmconfigdata/test-fullvirt-nohap.xml | 9 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 9 +- .../test-fullvirt-serial-tcp-telnet.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 9 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 9 +- tests/xmconfigdata/test-fullvirt-sound.xml | 9 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 9 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 9 +- tests/xmconfigdata/test-fullvirt-utc.xml | 9 +- tests/xmconfigdata/test-no-source-cdrom.xml | 9 +- tests/xmconfigdata/test-paravirt-maxvcpus.xml | 5 +- tests/xmconfigdata/test-paravirt-net-e1000.xml | 5 +- tests/xmconfigdata/test-paravirt-net-vifname.xml | 5 +- .../test-paravirt-new-pvfb-vncdisplay.xml | 5 +- tests/xmconfigdata/test-paravirt-new-pvfb.xml | 5 +- tests/xmconfigdata/test-paravirt-vcpu.xml | 5 +- tests/xmconfigdata/test-pci-devs.xml | 11 +- tests/xmconfigtest.c | 22 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 2 +- .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 2 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 2 +- .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 2 +- tests/xml2sexprtest.c | 7 +- 170 files changed, 282 insertions(+), 15004 deletions(-) delete mode 100644 m4/virt-driver-xen.m4 delete mode 100644 src/xen/Makefile.inc.am delete mode 100644 src/xen/block_stats.c delete mode 100644 src/xen/block_stats.h delete mode 100644 src/xen/xen_driver.c delete mode 100644 src/xen/xen_driver.h delete mode 100644 src/xen/xen_hypervisor.c delete mode 100644 src/xen/xen_hypervisor.h delete mode 100644 src/xen/xen_inotify.c delete mode 100644 src/xen/xen_inotify.h delete mode 100644 src/xen/xend_internal.c delete mode 100644 src/xen/xend_internal.h delete mode 100644 src/xen/xm_internal.c delete mode 100644 src/xen/xm_internal.h delete mode 100644 src/xen/xs_internal.c delete mode 100644 src/xen/xs_internal.h delete mode 100644 tests/xencapsdata/xen-i686-pae-hvm.caps delete mode 100644 tests/xencapsdata/xen-i686-pae-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-i686-pae-hvm.xml delete mode 100644 tests/xencapsdata/xen-i686-pae.caps delete mode 100644 tests/xencapsdata/xen-i686-pae.cpuinfo delete mode 100644 tests/xencapsdata/xen-i686-pae.xml delete mode 100644 tests/xencapsdata/xen-i686.caps delete mode 100644 tests/xencapsdata/xen-i686.cpuinfo delete mode 100644 tests/xencapsdata/xen-i686.xml delete mode 100644 tests/xencapsdata/xen-ia64-be-hvm.caps delete mode 100644 tests/xencapsdata/xen-ia64-be-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64-be-hvm.xml delete mode 100644 tests/xencapsdata/xen-ia64-be.caps delete mode 100644 tests/xencapsdata/xen-ia64-be.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64-be.xml delete mode 100644 tests/xencapsdata/xen-ia64-hvm.caps delete mode 100644 tests/xencapsdata/xen-ia64-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64-hvm.xml delete mode 100644 tests/xencapsdata/xen-ia64.caps delete mode 100644 tests/xencapsdata/xen-ia64.cpuinfo delete mode 100644 tests/xencapsdata/xen-ia64.xml delete mode 100644 tests/xencapsdata/xen-ppc64.caps delete mode 100644 tests/xencapsdata/xen-ppc64.cpuinfo delete mode 100644 tests/xencapsdata/xen-ppc64.xml delete mode 100644 tests/xencapsdata/xen-x86_64-hvm.caps delete mode 100644 tests/xencapsdata/xen-x86_64-hvm.cpuinfo delete mode 100644 tests/xencapsdata/xen-x86_64-hvm.xml delete mode 100644 tests/xencapsdata/xen-x86_64.caps delete mode 100644 tests/xencapsdata/xen-x86_64.cpuinfo delete mode 100644 tests/xencapsdata/xen-x86_64.xml delete mode 100644 tests/xencapstest.c -- 2.16.2

3 11

[libvirt] [PATCH 0/4] Initial phase of domain obj add/remove cleanup
by John Ferlan 06 Apr '18

06 Apr '18

As evidenced by various code comments, the process of adding and removing objects to/from the domain object list is problematic. Long story short is that the Add logic doesn't generate enough object references and the Remove logic removes one extra than was added during Add and leaves the object unlocked upon return (as well as doing a small fire dance to ensure proper lock ordering). Some drivers (libxl, lxc, qemu, and vz) handle the not enough references by adding an virObjectRef to the object returned from the Add code, while others (bhyve, openvz, test, uml, and vmware) live rather vicariously and carefully, but at least don't reference the object after calling Remove. Fixing all this will take a few patch streams across a few mostly dormant driver modules and some coordination with the vir*FindBy{UUID|ID|Name} logic. Some of that was already posted previously, but only received minimal notice: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html So rather than (re)posting a 20-30 patch series on list which probably won't get reviewed, I'll take things in smaller batches of patches in the hopes that all this can be worked through so that the end result is "cleaner" (and agreed upon). John Ferlan (4): conf: Fix error path logic in virDomainObjListAddLocked conf: Fix error path logic in virDomainObjListLoadStatus conf: Introduce virDomainObjListAddObjLocked conf: Fix virDomainObjParseFile object handling src/conf/virdomainobjlist.c | 63 ++++++++++++++++++++++++++++----------------- src/lxc/lxc_controller.c | 2 +- tests/qemuxml2xmltest.c | 2 +- 3 files changed, 42 insertions(+), 25 deletions(-) -- 2.13.6

2 10

[libvirt] [dbus PATCH 0/9] Add more properties and methods for Network
by Katerina Koukiou 06 Apr '18

06 Apr '18

Katerina Koukiou (9): tests: Rename minimal_xml to minimal_domain_xml Add Domain prefix to CreateXML method, test and related functions. Add Domain prefix to DefineXML method, tests and related functions. Implement NetworkCreateXML method for Connect interface Implement NetworkDefineXML method for Connect interface Implement GetXMLDesc method for Network Interface. Implement Active property for Network Interface. Implement Persistent property for Network Interface. Implement Setter for Autostart property of Network Interface. data/org.libvirt.Connect.xml | 16 +++++++- data/org.libvirt.Network.xml | 19 ++++++++- src/connect.c | 90 ++++++++++++++++++++++++++++++++++-------- src/network.c | 94 +++++++++++++++++++++++++++++++++++++++++++- test/test_connect.py | 48 +++++++++++++++++++--- test/test_network.py | 15 +++++++ 6 files changed, 256 insertions(+), 26 deletions(-) -- 2.15.0

2 19

[libvirt] [jenkins-ci PATCH 0/3] Drop CentOS 6, which makes some nice cleanups possible
by Andrea Bolognani 06 Apr '18

06 Apr '18

This applies on top of https://www.redhat.com/archives/libvir-list/2018-April/msg00410.html and, of course, should only be pushed after https://www.redhat.com/archives/libvir-list/2018-April/msg00326.html or a follow-up version has been pushed. Andrea Bolognani (3): guests: Drop CentOS 6 support projects: Drop CentOS 6 support jobs: Introduce {all_machines} and {rpm_machines} guests/host_vars/libvirt-centos-6/install.yml | 3 - guests/host_vars/libvirt-centos-6/main.yml | 9 --- guests/inventory | 1 - guests/vars/mappings.yml | 16 +---- guests/vars/projects/libvirt.yml | 1 - guests/vars/vault.yml | 86 +++++++++++++-------------- jobs/defaults.yaml | 14 +++++ projects/libosinfo.yaml | 16 +---- projects/libvirt-cim.yaml | 7 +-- projects/libvirt-glib.yaml | 16 +---- projects/libvirt-go-xml.yaml | 10 +--- projects/libvirt-go.yaml | 10 +--- projects/libvirt-perl.yaml | 17 +----- projects/libvirt-python.yaml | 18 +----- projects/libvirt.yaml | 30 ++++------ projects/osinfo-db-tools.yaml | 16 +---- projects/osinfo-db.yaml | 16 +---- projects/virt-viewer.yaml | 16 +---- 18 files changed, 84 insertions(+), 218 deletions(-) delete mode 100644 guests/host_vars/libvirt-centos-6/install.yml delete mode 100644 guests/host_vars/libvirt-centos-6/main.yml -- 2.14.3

3 7

[libvirt] [PATCH 00/68] qemu: Refactor migration parameters
by Jiri Denemark 06 Apr '18

06 Apr '18

This series changes the way we handle migration parameters and capabilities with several goals: - make it all consistent and avoid storing the same parameters in several structs - reduce the number of QMP commands we use for setting migration capabilities - concentrate the logic in a separate file and make the code for migration parameters and capabilities in qemu_migration.c less complicated - reset all parameters and capabilities at the end of migration - make adding new parameters and capabilities easier Jiri Denemark (68): qemu: Move qemuDomainCheckMigrationCapabilities qemu: Rename qemuMigrationAnyCapsGet as qemuMigrationCapsGet qemu: Rename qemuMigrationParams qemu: New file for all APIs related to migration parameters qemu: Reindent qemuMigrationParamsSetEmptyTLS qemu: Make qemuMigrationParamsFree follow common pattern qemu: Allocate struct for migration parameters qemu: Drop qemuMigrationParamsClear qemu: Move qemuMigrationCompression struct qemu: Introduce qemuMigrationParams struct qemu: Reset migration parameters in qemuMigrationSrcCleanup qemu: Store original migration params in job qemu: Typedef struct qemuDomainJobObj qemu: Pass job object to qemuProcessRecoverMigration{In,Out} qemu: Reset all migration parameters qemu: Drop qemuMigrationParamsCheckSetupTLS qemu: Drop qemuMigrationParamsCheckTLSCreds qemu: Rename qemuMigrationParamsSetEmptyTLS qemu: Rename qemuMigrationParamsAddTLSObjects qemu: Set tlsHostname inside qemuMigrationParamsEnableTLS qemu: Hide cfg inside qemuMigrationParamsEnableTLS qemu: Rename qemuMigrationParamsSet qemu: Hide internals of qemuMigrationParams struct qemu: Introduce qemuMonitorSetMigrationCapabilities qemu: Set migration caps via migration params APIs qemu: Do not use qemuMonitorSetMigrationCapability qemu: Drop unused qemuMonitorSetMigrationCapability qemu: Add support for xbzrle-cache-size migration parameter qemu: Set XBZRLE cache size via migration parameters qemu: Move ParamsCheck closer to ParamsApply on Dst side qemu: Move ParamsCheck closer to ParamsApply on Src side qemu: Check supported caps in qemuMigrationParamsCheck qemu: Introduce qemuMigrationParty enum qemu: Use qemuMigrationParamsFromFlags everywhere qemu: Hide qemuMigrationParamsNew qemu: Drop qemuMigrationParamsSetPostCopy qemu: Set always-on migration caps in ParamsCheck qemu: Set migration capabilities automatically qemu: Call qemuMigrationAnyCompressionParse only from driver qemu: Generalize macro for getting VIR_MIGRATE_* typed params qemu: Drop qemuMigrationParamsSetCapability qemu: Move qemuMigrationParamsSetCompression qemu: Move qemuMigrationAnyCompression* qemu: Hide qemuMigrationParamsSetCompression qemu: Replace qemuMigrationAnyCompressionDump qemu: Drop qemuMigrationCompression structure qemu: Introduce qemuMigrationParamsFetch qemu: Limit usage of qemuMonitorMigrationParams qemumonitorjsontest: Drop migration params test util: Introduce virJSONValueObjectStealObject qemu: Move migration parameters JSON parsing qemu: Move migration parameters JSON formatting qemu: Move qemuMonitorMigrationParams structure qemu: Refactor qemuMigrationParams qemu: Generalize qemuMigrationParamsGetDowntimeLimit qemu: Set migration parameters automatically qemu: Properly reset migration params when libvirtd restarts qemu: Export qemuMigrationParams{To,From}JSON for tests tests: Add tests for QEMU migration parameters qemumigparamstest: Add basic test data qemumigparamstest: Add test data for TLS parameters qemu: Store API flags for async jobs in qemuDomainJobObj qemu: Properly avoid cancelling memory-only dump qemu: Drop priv->job.dump_memory_only bool qemu: Drop priv->job.postcopyEnabled bool qemu: Store API flags for async jobs in status XML qemu: Don't delete TLS objects unless TLS migration was requested qemuxml2xmltest: Add status XML tests for migration params po/POTFILES.in | 1 + src/libvirt_private.syms | 1 + src/qemu/Makefile.inc.am | 3 + src/qemu/qemu_domain.c | 110 +- src/qemu/qemu_domain.h | 25 +- src/qemu/qemu_driver.c | 175 +-- src/qemu/qemu_migration.c | 965 +++----------- src/qemu/qemu_migration.h | 72 +- src/qemu/qemu_migration_params.c | 1139 +++++++++++++++++ src/qemu/qemu_migration_params.h | 130 ++ src/qemu/qemu_migration_paramspriv.h | 31 + src/qemu/qemu_monitor.c | 64 +- src/qemu/qemu_monitor.h | 43 +- src/qemu/qemu_monitor_json.c | 153 +-- src/qemu/qemu_monitor_json.h | 10 +- src/qemu/qemu_process.c | 30 +- src/qemu/qemu_process.h | 3 +- src/util/virjson.c | 8 + src/util/virjson.h | 2 + tests/Makefile.am | 12 + tests/qemumigparamsdata/basic.json | 9 + tests/qemumigparamsdata/basic.reply | 12 + tests/qemumigparamsdata/basic.xml | 11 + tests/qemumigparamsdata/empty.json | 3 + tests/qemumigparamsdata/empty.reply | 5 + tests/qemumigparamsdata/empty.xml | 4 + tests/qemumigparamsdata/tls-enabled.json | 11 + tests/qemumigparamsdata/tls-enabled.reply | 14 + tests/qemumigparamsdata/tls-enabled.xml | 13 + tests/qemumigparamsdata/tls-hostname.json | 11 + tests/qemumigparamsdata/tls-hostname.reply | 14 + tests/qemumigparamsdata/tls-hostname.xml | 13 + tests/qemumigparamsdata/tls.json | 11 + tests/qemumigparamsdata/tls.reply | 14 + tests/qemumigparamsdata/tls.xml | 13 + tests/qemumigparamsdata/unsupported.json | 3 + tests/qemumigparamsdata/unsupported.reply | 7 + tests/qemumigparamsdata/unsupported.xml | 4 + tests/qemumigparamstest.c | 242 ++++ tests/qemumonitorjsontest.c | 113 +- .../migration-in-params-in.xml | 400 ++++++ .../migration-in-params-out.xml | 1 + .../migration-out-nbd-out.xml | 450 ++++++- .../migration-out-params-in.xml | 414 ++++++ .../migration-out-params-out.xml | 1 + tests/qemuxml2xmltest.c | 2 + 46 files changed, 3456 insertions(+), 1316 deletions(-) create mode 100644 src/qemu/qemu_migration_params.c create mode 100644 src/qemu/qemu_migration_params.h create mode 100644 src/qemu/qemu_migration_paramspriv.h create mode 100644 tests/qemumigparamsdata/basic.json create mode 100644 tests/qemumigparamsdata/basic.reply create mode 100644 tests/qemumigparamsdata/basic.xml create mode 100644 tests/qemumigparamsdata/empty.json create mode 100644 tests/qemumigparamsdata/empty.reply create mode 100644 tests/qemumigparamsdata/empty.xml create mode 100644 tests/qemumigparamsdata/tls-enabled.json create mode 100644 tests/qemumigparamsdata/tls-enabled.reply create mode 100644 tests/qemumigparamsdata/tls-enabled.xml create mode 100644 tests/qemumigparamsdata/tls-hostname.json create mode 100644 tests/qemumigparamsdata/tls-hostname.reply create mode 100644 tests/qemumigparamsdata/tls-hostname.xml create mode 100644 tests/qemumigparamsdata/tls.json create mode 100644 tests/qemumigparamsdata/tls.reply create mode 100644 tests/qemumigparamsdata/tls.xml create mode 100644 tests/qemumigparamsdata/unsupported.json create mode 100644 tests/qemumigparamsdata/unsupported.reply create mode 100644 tests/qemumigparamsdata/unsupported.xml create mode 100644 tests/qemumigparamstest.c create mode 100644 tests/qemustatusxml2xmldata/migration-in-params-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-in-params-out.xml mode change 120000 => 100644 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml create mode 100644 tests/qemustatusxml2xmldata/migration-out-params-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-params-out.xml -- 2.17.0

2 72

[libvirt] [PATCH 0/2] Two almost trivial fixes
by Michal Privoznik 06 Apr '18

06 Apr '18

Any review appreciated. Michal Privoznik (2): storageVolLookupData: Drop conn struct member storageDriverAutostart: Drop unused @conn src/storage/storage_driver.c | 9 ++------- src/test/test_driver.c | 5 ++--- 2 files changed, 4 insertions(+), 10 deletions(-) -- 2.16.1

2 3

[libvirt] [PATCH 0/7] Prepare for daemon split
by Daniel P. Berrangé 06 Apr '18

06 Apr '18

When we split up the daemons, libvirtd will need to forward different sets of APIs to different daemons. This means libvirtd is going to need to have multiple virConnectPtr instances open. This series prepares for that by introducing "separate" connections, which are actually just an extra reference on the current single connection. This will facilitate later changes. Daniel P. Berrangé (7): rpc: refactor way connection object is generated for remote dispatch remote: use a separate connection for interface APIs remote: use a separate connection for network APIs remote: use a separate connection for nodedev APIs remote: use a separate connection for nwfilter APIs remote: use a separate connection for secret APIs remote: use a separate connection for storage APIs src/remote/remote_daemon.h | 6 +++ src/remote/remote_daemon_dispatch.c | 81 +++++++++++++++++++------------ src/rpc/gendispatch.pl | 95 ++++++++++++++++++++++++++++--------- 3 files changed, 128 insertions(+), 54 deletions(-) -- 2.14.3

4 19

[libvirt] [PATCH 0/2] utils: squelch errors from virNetSocketNewConnectTCP
by Jim Fehlig 05 Apr '18

05 Apr '18

Patch1 fixes a case where error is reported even when the reportError parameter is false. Patch2 is essentially a V2 of a patch posted earlier, incorporating some ideas from jferlan's review https://www.redhat.com/archives/libvir-list/2018-March/msg01120.html Jim Fehlig (2): util: honor reportError parameter in virSocketAddrParseInternal util: introduce virSocketAddrParseAny src/libvirt_private.syms | 1 + src/rpc/virnetsocket.c | 2 +- src/util/virsocketaddr.c | 53 ++++++++++++++++++++++++++++++++++++++++++++---- src/util/virsocketaddr.h | 5 +++++ 4 files changed, 56 insertions(+), 5 deletions(-) -- 2.16.2

2 6

[libvirt] [PATCH] util: fix spelling in virSocketAddrParseAny docs
by Jim Fehlig 05 Apr '18

05 Apr '18

s/netork/network/ Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Pushing as trivial. src/util/virsocketaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4f2457629..5c3bfad0a 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -176,7 +176,7 @@ int virSocketAddrParse(virSocketAddrPtr addr, const char *val, int family) * or 2001:db8:85a3:0:0:8a2e:370:7334. * * When @val is a network host name, this function may be susceptible to a - * delay due to potentially lengthy netork host address lookups. + * delay due to potentially lengthy network host address lookups. * * Returns the length of the network address or -1 in case of error. */ -- 2.16.2

1 0

[libvirt] anyone ever seen virDomainCreateWithFlags() essentially hang?
by Chris Friesen 05 Apr '18

05 Apr '18

I'm investigating something weird with libvirt 1.2.17 and qemu 2.3.0. I'm using the python bindings, and I seem to have a case where libvirtmod.virDomainCreateWithFlags() hung rather than returned. Then, about 15min later a subsequent call to libvirtmod.virDomainDestroy() from a different eventlet within the same process seems to have "unblocked" the original creation call, which raised an exception and an error code of libvirt.VIR_ERR_INTERNAL_ERROR. The virDomainDestroy() call came back with an error of "Requested operation is not valid: domain is not running". The corresponding qemu logs show the guest starting up and then a bit over 15min later there is a "shutting down" log. At shutdown time the libvirtd log shows "qemuMonitorIORead:609 : Unable to read from monitor: Connection reset by peer". The parent function did two additional retries, and both the retries failed in similar fashion. In all three caess there seems to be a pattern of the qemu instance starting up but virDomainCreateWithFlags() not returning, then a subsequent virDomainDestroy() call for the same domain causing the virDomainCreateWithFlags() call to get "unblocked" and return -1 leading to an exception in the python code. Any ideas what might cause this behaviour? I haven't reproduced the "hanging" behaviour myself, I'm working entirely off of logs from the affected system. Thanks, Chris

2 2

[libvirt] Run libvirtd from git: virsh hangs
by Mathieu Tarral 05 Apr '18

05 Apr '18

Hi, I managed to compile libvirt from the git repo, now i have some trouble to run it. This is what i did: I configured the source to use /var because i wanted the socket to be at the same place as the system one (/var/run/libvirt/libvirt-sock) ./configure --prefix=$HOME/usr --localstatedir=/var make make install at this point i stopped my system libvirtd and virtlogd sudo systemctl stop libvirtd sudo systemctl stop virtlogd And then i launched my custom libvirtd and virtlogd cd $HOME/usr/sbin sudo ./libvirtd -v sudo ./virtlogd -v After that i tried to list the available domains with virsh (using the system binary) sudo virsh virsh # list --all And this call hangs forever. There is no more output in libvirtd stdout/stderr, even if i set log_level to 1. Did i miss anything in the configuration ? Thanks guys ! -- Mathieu Tarral

3 4

[libvirt] [PATCH v4 0/3] Improve handling of multipath devices
by Michal Privoznik 05 Apr '18

05 Apr '18

The saga continues. v3: https://www.redhat.com/archives/libvir-list/2018-April/msg00083.html diff to v3: - hopefully all Peter's review comments are worked in now. Michal Privoznik (3): util: Introduce virDevMapperGetTargets qemu_cgroup: Handle device mapper targets properly news: Document device mapper fix docs/news.xml | 12 +++ libvirt.spec.in | 2 + src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 46 ++++++++++- src/util/Makefile.inc.am | 2 + src/util/virdevmapper.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virdevmapper.h | 31 ++++++++ 7 files changed, 293 insertions(+), 3 deletions(-) create mode 100644 src/util/virdevmapper.c create mode 100644 src/util/virdevmapper.h -- 2.16.1

2 7

[libvirt] [dbus PATCH] test: Don't hardcode python3 path
by Andrea Bolognani 05 Apr '18

05 Apr '18

Using /usr/bin/python3 is fine for Linux, but it's not portable to other operating systems such as FreeBSD, where the binary lives under /usr/local/bin instead. Use /usr/bin/env to abstract the issue away. With this, 'make check' completes successfully on FreeBSD 10, 11 and -CURRENT. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- test/test_connect.py | 2 +- test/test_domain.py | 2 +- test/test_network.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_connect.py b/test/test_connect.py index 440a496..d972561 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest diff --git a/test/test_domain.py b/test/test_domain.py index d36adf7..7ec2318 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest diff --git a/test/test_network.py b/test/test_network.py index 97ab0aa..5178862 100755 --- a/test/test_network.py +++ b/test/test_network.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import dbus import libvirttest -- 2.14.3

2 1

[libvirt] [dbus PATCH 00/10] Impement some APIs for network Interface
by Katerina Koukiou 05 Apr '18

05 Apr '18

Katerina Koukiou (10): Implement BridgeName property for Network interface. Implement Autostart property for Network Interface Implement UUID property for Network interface. Implement NetworkLookupByUUID method for network interface. Rename virtDBusEventsRegisterEvent to virtDBusDomainEventsRegisterEvent Rename callback_ids variable to domain_callback_ids Register Network Lifecycle Events Implement Destroy method for Network Interface. Implement Undefine method for Network Interface Implement Create method for Network Interface data/org.libvirt.Connect.xml | 12 ++++ data/org.libvirt.Network.xml | 24 ++++++++ src/connect.c | 50 +++++++++++++++-- src/connect.h | 3 +- src/events.c | 112 ++++++++++++++++++++++++++++--------- src/network.c | 128 +++++++++++++++++++++++++++++++++++++++++++ test/test_connect.py | 1 + test/test_network.py | 43 +++++++++++++++ 8 files changed, 342 insertions(+), 31 deletions(-) -- 2.15.0

2 21

[libvirt] [PATCH] qemu: use target.port for isa-serial
by Thilo Cestonaro 05 Apr '18

05 Apr '18

A configured target.port is currently totaly ignored, while contsructing qemu commandline, for all types of serial devices. This patch adds a -device parameter "index" for the target model isa-serial. This enables the user to specify which serial device will end in which ttySX device. --- src/qemu/qemu_command.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bbd3cd0a7..a685abec0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10290,6 +10290,22 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, virDomainChrSerialTargetModelTypeToString(serial->targetModel), serial->info.alias, serial->info.alias); + switch ((virDomainChrSerialTargetModel) serial->targetModel) { + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL: + if (serial->target.port != -1) + virBufferAsprintf(&cmd, ",index=%d", serial->target.port); + break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_USB_SERIAL: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PCI_SERIAL: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SPAPR_VTY: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPLMCONSOLE: + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: + break; + } + if (qemuBuildDeviceAddressStr(&cmd, def, &serial->info, qemuCaps) < 0) goto error; -- 2.15.1

1 0

[libvirt] [PATCH] qemu: cpu: fix fullCPU to include all emulatable qemu features
by Nikolay Shirokovskiy 05 Apr '18

05 Apr '18

On Core i5 650 guest fail to start with error [1] if guest cpu config is taken from domcapabilities and check is set to partial. The problem is in qemu caps fullCPU calculation in virQEMUCapsInitHostCPUModel. It is supposed to include features emulated by qemu and missed on host. Some of such features may be not included however. For mentioned cpu host cpu is detected as Westmere and guest cpu as SandyBridge. x2apic is missed on host and provided by installed qemu. The feature is not mentioned in guest cpu features explicitly because SandyBridge model include it. As a result fullCPU does not include x2apic too. Solution is to expand guest cpu features before updating fullCPU features. [1] error: the CPU is incompatible with host CPU: Host CPU does not provide required features: x2apic, tsc-deadline --- src/qemu/qemu_capabilities.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9c1eeac..edba716 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3475,6 +3475,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virDomainVirtType type) { virCPUDefPtr cpu = NULL; + virCPUDefPtr cpuExpanded = NULL; virCPUDefPtr migCPU = NULL; virCPUDefPtr hostCPU = NULL; virCPUDefPtr fullCPU = NULL; @@ -3504,9 +3505,13 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, NULL, NULL))) goto error; - for (i = 0; i < cpu->nfeatures; i++) { - if (cpu->features[i].policy == VIR_CPU_FEATURE_REQUIRE && - virCPUDefUpdateFeature(fullCPU, cpu->features[i].name, + if (!(cpuExpanded = virCPUDefCopy(cpu)) || + virCPUExpandFeatures(qemuCaps->arch, cpuExpanded) < 0) + goto error; + + for (i = 0; i < cpuExpanded->nfeatures; i++) { + if (cpuExpanded->features[i].policy == VIR_CPU_FEATURE_REQUIRE && + virCPUDefUpdateFeature(fullCPU, cpuExpanded->features[i].name, VIR_CPU_FEATURE_REQUIRE) < 0) goto error; } @@ -3528,6 +3533,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps, virQEMUCapsSetHostModel(qemuCaps, type, cpu, migCPU, fullCPU); cleanup: + virCPUDefFree(cpuExpanded); virCPUDefFree(hostCPU); return; -- 1.8.3.1

2 3

[libvirt] Libvirt master compilation failed
by Mathieu Tarral 05 Apr '18

05 Apr '18

Hello, i have been trying to compile the latest libvirt from the Github mirror. I checked out on this commit: 3487973ee0c730b6fbfc6183af798c46ae3b85ff virjsontest: Use a more stable floating point number for testing But the compilation failed with this error: CC ssh.o CCLD ssh CC qemucapsprobe.o CCLD qemucapsprobe CC nsslinktest-nsslinktest.o CCLD nsslinktest CC nssguestlinktest-nsslinktest.o CCLD nssguestlinktest make[2]: Leaving directory '/var/ansible/libvirt/tests' Making all in po make[2]: Entering directory '/var/ansible/libvirt/po' test ! -f ./libvirt.pot || \ test -z "af.gmo am.gmo anp.gmo ar.gmo as.gmo ast.gmo bal.gmo be.gmo bg.gmo bn.gmo bn_IN.gmo bo.gmo br.gmo brx.gmo bs.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo de_CH.gmo el.gmo en_GB.gmo eo.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo gl.gmo gu.gmo he.gmo hi.gmo hr.gmo hu.gmo ia.gmo id.gmo ilo.gmo is.gmo it.gmo ja.gmo ka.gmo kk.gmo km.gmo kn.gmo ko.gmo kw.gmo kw(a)kkcor.gmo kw(a)uccor.gmo kw_GB.gmo ky.gmo lt.gmo lv.gmo mai.gmo mk.gmo ml.gmo mn.gmo mr.gmo ms.gmo nb.gmo nds.gmo ne.gmo nl.gmo nn.gmo nso.gmo or.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo si.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr(a)latin.gmo sv.gmo ta.gmo te.gmo tg.gmo th.gmo tr.gmo tw.gmo uk.gmo ur.gmo vi.gmo wba.gmo yo.gmo zh_CN.gmo zh_HK.gmo zh_TW.gmo zu.gmo" || make af.gmo am.gmo anp.gmo ar.gmo as.gmo ast.gmo bal.gmo be.gmo bg.gmo bn.gmo bn_IN.gmo bo.gmo br.gmo brx.gmo bs.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo de_CH.gmo el.gmo en_GB.gmo eo.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo gl.gmo gu.gmo he.gmo hi.gmo hr.gmo hu.gmo ia.gmo id.gmo ilo.gmo is.gmo it.gmo ja.gmo ka.gmo kk.gmo km.gmo kn.gmo ko.gmo kw.gmo kw(a)kkcor.gmo kw(a)uccor.gmo kw_GB.gmo ky.gmo lt.gmo lv.gmo mai.gmo mk.gmo ml.gmo mn.gmo mr.gmo ms.gmo nb.gmo nds.gmo ne.gmo nl.gmo nn.gmo nso.gmo or.gmo pa.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo si.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr(a)latin.gmo sv.gmo ta.gmo te.gmo tg.gmo th.gmo tr.gmo tw.gmo uk.gmo ur.gmo vi.gmo wba.gmo yo.gmo zh_CN.gmo zh_HK.gmo zh_TW.gmo zu.gmo make[3]: Entering directory '/var/ansible/libvirt/po' rm -f af.gmo && : -c --statistics -o af.gmo af.po mv: cannot stat 't-af.gmo': No such file or directory Makefile:470: recipe for target 'af.gmo' failed make[3]: *** [af.gmo] Error 1 make[3]: Leaving directory '/var/ansible/libvirt/po' Makefile:507: recipe for target 'stamp-po' failed make[2]: *** [stamp-po] Error 2 make[2]: Leaving directory '/var/ansible/libvirt/po' Makefile:2121: recipe for target 'all-recursive' failed make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory '/var/ansible/libvirt' Makefile:2014: recipe for target 'all' failed make: *** [all] Error 2 I'm on Debian stretch, i installed every dependency required by the configure script. Any ideas what's wrong here ? Thanks. -- Mathieu Tarral

2 2

[libvirt] [PATCH v2 0/8] Prepare for daemon split
by Daniel P. Berrangé 05 Apr '18

05 Apr '18

When we split up the daemons, libvirtd will need to forward different sets of APIs to different daemons. This means libvirtd is going to need to have multiple virConnectPtr instances open. This series prepares for that by introducing "separate" connections, which are actually just an extra reference on the current single connection. This will facilitate later changes. Daniel P. Berrangé (8): rpc: refactor way connection object is generated for remote dispatch remote: push check for conn down into remoteClientFreePrivateCallbacks remote: use a separate connection for interface APIs remote: use a separate connection for network APIs remote: use a separate connection for nodedev APIs remote: use a separate connection for nwfilter APIs remote: use a separate connection for secret APIs remote: use a separate connection for storage APIs src/remote/remote_daemon.h | 6 +++ src/remote/remote_daemon_dispatch.c | 94 +++++++++++++++++++------------- src/rpc/gendispatch.pl | 104 +++++++++++++++++++++++++----------- 3 files changed, 138 insertions(+), 66 deletions(-) -- 2.14.3

2 9

[libvirt] [dbus PATCH v3 0/4] Introduce Network Interface
by Katerina Koukiou 05 Apr '18

05 Apr '18

This patchset introduces also some basic methods and properties for Network interface. More functionality will be added in following patchsets. New functions are covered by the test suite. Changes from v2: * Added test_list_networks test. * xml files should group methods/signals/properties together. * Some other minor fixes. Katerina Koukiou (4): Introduce Network Interface Implement ListNetworks method for Connect interface Implement Name property for Network interface Implement NetworkLookupByName method for Connect interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 12 +++++ data/org.libvirt.Network.xml | 11 +++++ src/Makefile.am | 3 +- src/connect.c | 76 ++++++++++++++++++++++++++++++ src/connect.h | 1 + src/network.c | 107 +++++++++++++++++++++++++++++++++++++++++++ src/network.h | 9 ++++ src/util.c | 33 +++++++++++++ src/util.h | 15 ++++++ test/Makefile.am | 3 +- test/libvirttest.py | 12 +++++ test/test_connect.py | 23 ++++++++++ test/test_network.py | 19 ++++++++ 14 files changed, 324 insertions(+), 3 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h create mode 100755 test/test_network.py -- 2.15.0

2 7

[libvirt] [PATCH] docs: add page describing goals for host platform version support
by Daniel P. Berrangé 05 Apr '18

05 Apr '18

Describe how we decide which host platforms to support for libvirt, which in turn makes it easier to decide when a platform / software version can be dropped. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/index.html.in | 2 +- docs/platforms.html.in | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 docs/platforms.html.in diff --git a/docs/index.html.in b/docs/index.html.in index 1b3a7a3db6..4783c39e3c 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -28,7 +28,7 @@ The libvirt project: </p> <ul> - <li>is a toolkit to manage virtualization hosts</li> + <li>is a toolkit to manage <a href="platforms.html.in">virtualization platforms</a></li> <li>is accessible from C, Python, Perl, Java and more</li> <li>is licensed under open source licenses</li> <li>supports <a href="drvqemu.html">KVM</a>, diff --git a/docs/platforms.html.in b/docs/platforms.html.in new file mode 100644 index 0000000000..859b482428 --- /dev/null +++ b/docs/platforms.html.in @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Supported host platforms</h1> + + <ul id="toc"></ul> + + <h2>Build targets</h2> + + <p> + Libvirt drivers aim to support building and executing on multiple + host OS platforms. This document outlines which platforms are the + major build targets. These platforms are used as the basis for deciding + upon the minimum required versions of 3rd party software libvirt depends + on. If a platform is no listed here, it does not imply that libvirt + won't work. If an unlisted platform has comparable software versions + to a listed platform, there is every expectation that it will work. + Bug reports are welcome for problems encountered on unlisted platforms + unless they are clearly older vintage that what is described here. + </p> + + <h3>Linux OS</h3> + + <p> + For distributions with frequent, short-lifetime releases (Fedora, + Ubuntu, OpenSUSE, etc), the project will aim to support all versions + that are not end of life by their respective vendors. + </p> + + <p> + For distributions with long-lifetime releases (RHEL, Ubuntu LTS, + SLES, etc), the project will aim to support the most recent major + version at all times. Support for the previous major version will + be dropped 2 years after the new major version is released. + </p> + + <h3>Windows</h3> + + <p> + The project supports building with current versions of the MinGW + toolchain, hosted on Linux. + </p> + + <h3>OS-X</h3> + + <p> + The project supports building with the current version of OS-X, + with the current homebrew package set available. + </p> + + <h3>FreeBSD</h3> + + <p> + The project will aim to support the most recent major version + at all times. Support for the previous major version will + be dropped 2 years after the new major version is released. + </p> + + <h2>Virtualization platforms</h2> + + <p> + For hypervisor drivers which execute locally (QEMU, LXC, VZ, + libxl, etc), the set of supported operating system platforms + listed above will inform choices as to the minimum required + versions of 3rd party libraries and hypervisor management APIs. + If a hypervisor is not commonly shipped directly by any distro + listed above, (VMWare ESX, HyperV, VZ), the project aims to + support versions upto 5 years, or until the vendor discontinues + support, whichever comes first. + </p> + + </body> +</html> -- 2.14.3

6 9

[libvirt] [PATCH] docs: Update the format of the generate metadata example
by John Ferlan 05 Apr '18

05 Apr '18

Initially, update the UUID field to have the proper format, but then also changed the type, id, and name fields. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- While beginning to think more about the vmgenid RFC and creating a <genid/> element under the <uuid>, I noted that the existing name and uuid fields were a bit out of date. docs/formatdomain.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 82e7d7ce66..984563379e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -31,9 +31,9 @@ <h3><a id="elementsMetadata">General metadata</a></h3> <pre> -<domain type='xen' id='3'> - <name>fv0</name> - <uuid>4dea22b31d52d8f32516782e98ab3fa0</uuid> +<domain type='kvm' id='1'> + <name>MyFirstGuest</name> + <uuid>4dea22b3-1d52-d8f3-2516-782e98ab3fa0</uuid> <title>A short description - title - of the domain</title> <description>Some human readable description</description> <metadata> -- 2.13.6

2 1

[libvirt] [dbus PATCH v2 0/5] Introduce Network Interface
by Katerina Koukiou 04 Apr '18

04 Apr '18

This patchset introduces also some basic methods and properties for Network interface. More functionality will be added in following patchsets. New functions are covered by the test suite. Changes from v1: I forgot to the test_network.py in v1. Katerina Koukiou (5): Introduce Network Interface Implement ListNetworks method for Connect interface Implement virtDBusUtilVirNetworkFromBusPath helper function. Implement Name property for Network interface Implement NetworkLookupByName method for Connect interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 12 +++++ data/org.libvirt.Network.xml | 11 +++++ src/Makefile.am | 3 +- src/connect.c | 75 ++++++++++++++++++++++++++++++ src/connect.h | 1 + src/network.c | 107 +++++++++++++++++++++++++++++++++++++++++++ src/network.h | 9 ++++ src/util.c | 33 +++++++++++++ src/util.h | 15 ++++++ test/Makefile.am | 3 +- test/libvirttest.py | 12 +++++ test/test_connect.py | 11 +++++ test/test_network.py | 19 ++++++++ 14 files changed, 311 insertions(+), 3 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h create mode 100755 test/test_network.py -- 2.15.0

2 11

[libvirt] [PATCH v3 0/3] Improve handling of multipath devices
by Michal Privoznik 04 Apr '18

04 Apr '18

The saga continues. Turns out, this is bug in both libvirt AND kernel. Firstly, kernel uses different CGroup for checking open() than for ioctl() [1]. However, libvirt needs to allow all targets in the CGroup too. Not only it's logical, kernel devel says it never worked. QEMU was able to open the devmapper device but any subsequent read()/write() would fail because of CGroup perms. Anyway, it's not only RHEL which is affected by this bug. I've upgraded my Gentoo to 4.16 and I'm hitting it even though I was not with 4.15. It all started with upstream kernel commit of 519049afead4f7c3e6446028. This changed call in dm_blk_ioctl() from dm_grab_bdev_for_ioctl() to dm_get_bdev_for_ioctl(). The former merely increases refcount on some internal kernel strcut, the latter calls blkdev_get() which calls __blkdev_get() which actually performs CGroup check. 1: https://bugzilla.redhat.com/show_bug.cgi?id=1557769#c54 Diff to v2: - Changed virDevMapperGetTargets() to do recursive target fetching, and at the same time make it return string list of devices rather than MAJ:MIN pairs. This is because dm_task_set_name() accepts path as string. There's also dm_task_set_major_minor() but: a) handling multiple arrays and merging them (because of recursion) - the code would look ugly, b) we don't need to introduce virDomainAuditCgroupMajorMinor() just to pass MAJ:MIN to it. - Implemented dropping of permissions when unplugging a disk (was missing in previous versions) Michal Privoznik (3): util: Introduce virDevMapperGetTargets qemu_cgroup: Handle device mapper targets properly news: Document device mapper fix docs/news.xml | 10 +++ libvirt.spec.in | 2 + src/libvirt_private.syms | 4 + src/qemu/qemu_cgroup.c | 69 +++++++++++++--- src/util/Makefile.inc.am | 2 + src/util/virdevmapper.c | 200 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virdevmapper.h | 31 ++++++++ 7 files changed, 309 insertions(+), 9 deletions(-) create mode 100644 src/util/virdevmapper.c create mode 100644 src/util/virdevmapper.h -- 2.16.1

2 7

[libvirt] how to expose missing libxl APIs in xml?
by Olaf Hering 04 Apr '18

04 Apr '18

libvirt lacks support for various API interfaces provided by libxl. There is probably no list to track the items not supported by libvirt. Where should such list be maintained, in libvirt.git? The specific case I have right now is this member of libxl_domain_build_info: tools/libxl/libxl_types.idl:483: ("max_grant_frames", uint32, {'init_val': 'LIBXL_MAX_GRANT_FRAMES_DEFAULT'}), How should this be exposed in the guest xml? Olaf

1 0

[libvirt] [Question] Any plan about supporting MBA (Memory Bandwidth Allocation) in libvirt ?
by Zhanghailiang 04 Apr '18

04 Apr '18

Hi, Intel RDT/MBA has been supported by kernel for a time, we also support CAT in libvirt, which is part of RDT. but I didn't find any discussion or patches about MBA feature in Libvirt, does anyone propose supporting it in libvirt ? Thanks, Hailiang

2 1

[libvirt] [PATCH v2 0/3] Clean/fix test driver usage of FindBy{UUID|ID}
by John Ferlan 04 Apr '18

04 Apr '18

v1: https://www.redhat.com/archives/libvir-list/2018-March/msg00507.html e.g., part of a 20 patch series: https://www.redhat.com/archives/libvir-list/2018-March/msg00489.html Changes since v1: * Add patches 2 and 3 essentially... Doing the same ByIDRef as ByUUIDRef and fixing the ListRemove consumers to do the Lock. NB: The ByIDRef logic was formerly part of patch 20 - this just extracts it a bit to make it more orderly. John Ferlan (3): test: Use virDomainObjListFindByUUIDRef test: Use virDomainObjListFindByIDRef test: Need to relock afer virDomainObjListRemove src/test/test_driver.c | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) -- 2.13.6

2 7

[libvirt] [dbus PATCH 0/5] Introduce Network Interface
by Katerina Koukiou 04 Apr '18

04 Apr '18

This patchset introduces also some basic methods and properties for Network interface. More functionality will be added in following patchsets. New functions are covered by the test suite. Katerina Koukiou (5): Introduce Network Interface Implement ListNetworks method for Connect interface Implement virtDBusUtilVirNetworkFromBusPath helper function. Implement Name property for Network interface Implement NetworkLookupByName method for Connect interface data/Makefile.am | 3 +- data/org.libvirt.Connect.xml | 12 +++++ data/org.libvirt.Network.xml | 11 +++++ src/Makefile.am | 3 +- src/connect.c | 75 ++++++++++++++++++++++++++++++ src/connect.h | 1 + src/network.c | 107 +++++++++++++++++++++++++++++++++++++++++++ src/network.h | 9 ++++ src/util.c | 33 +++++++++++++ src/util.h | 15 ++++++ test/Makefile.am | 3 +- test/libvirttest.py | 12 +++++ test/test_connect.py | 11 +++++ 13 files changed, 292 insertions(+), 3 deletions(-) create mode 100644 data/org.libvirt.Network.xml create mode 100644 src/network.c create mode 100644 src/network.h -- 2.15.0

1 6

[libvirt] hash: failed on concurrent iterating.
by Zhangzijian 04 Apr '18

04 Apr '18

In function 'virHashForEach/virHashSearch', 'table->iterating' prevent concurrent iterating. But most caller evoke it, after hold a read lock. This will lead the second caller failed to iterate the table. So, the caller should hold a write lock, then iterate the table.

4 6

[libvirt] [PATCH] tests: utils: Fix out-of-bounds access to memory in virTestCompareToFile
by Peter Krempa 04 Apr '18

04 Apr '18

Similarly to 3506f1ecfde, the contents of 'cmpcontent' may be an empty string so the following code would access memory out of the array. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/testutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 4bd1b63755..7c095caac9 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -797,10 +797,11 @@ virTestCompareToFile(const char *strcontent, if (filecontent) { size_t filecontentLen = strlen(filecontent); + size_t cmpcontentLen = strlen(cmpcontent); if (filecontentLen > 0 && filecontent[filecontentLen - 1] == '\n' && - cmpcontent[strlen(cmpcontent) - 1] != '\n') { + (cmpcontentLen == 0 || cmpcontent[cmpcontentLen - 1] != '\n')) { if (virAsprintf(&fixedcontent, "%s\n", cmpcontent) < 0) goto failure; cmpcontent = fixedcontent; -- 2.16.2

2 1

[libvirt] [libvirt PATCH] qemu: Add support for specifying SPICE TLS ciphers
by Ján Tomko 04 Apr '18

04 Apr '18

From: Christophe Fergeau <cfergeau(a)redhat.com> This commit adds a 'spice_tls_ciphers' parameter in qemu.conf which allows to configure which TLS ciphers SPICE will be using for its TLS connections. https://bugzilla.redhat.com/show_bug.cgi?id=1562032 Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- This is mostly useful as a workaround for missing crypto policies, so I'm not sure if it's upstream material. Changes from the patch attached to the BZ: ciphers(2) -> ciphers(1) Added augeas changes and tests escape the string before passing it to QEMU src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 5 ++++ src/qemu/qemu_command.c | 8 +++++- src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + .../graphics-spice-sasl-ciphers.args | 29 ++++++++++++++++++++++ .../graphics-spice-sasl-ciphers.xml | 1 + tests/qemuxml2argvtest.c | 5 ++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args create mode 120000 tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index c19bf3a43..15222d7e3 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -44,6 +44,7 @@ module Libvirtd_qemu = let spice_entry = str_entry "spice_listen" | bool_entry "spice_tls" | str_entry "spice_tls_x509_cert_dir" + | str_entry "spice_tls_ciphers" | bool_entry "spice_auto_unix_socket" | str_entry "spice_password" | bool_entry "spice_sasl" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 07eab7eff..1d7b6c555 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -181,6 +181,11 @@ #spice_tls_x509_cert_dir = "/etc/pki/libvirt-spice" +# The ciphers used by spice can be overridden here. This is an OpenSSL cipher +# list as documented in ciphers(1) +#spice_tls_ciphers = "DEFAULT" + + # Enable this option to have SPICE served over an automatically created # unix socket. This prevents unprivileged access from users on the # host machine. diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 682d71441..adf0b2cb9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8028,8 +8028,14 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, !cfg->spicePassword) virBufferAddLit(&opt, "disable-ticketing,"); - if (hasSecure) + if (hasSecure) { virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir); + if (cfg->spiceTLSCiphers) { + virBufferAddLit(&opt, "tls-ciphers="); + virQEMUBuildBufferEscapeComma(&opt, cfg->spiceTLSCiphers); + virBufferAddLit(&opt, ","); + } + } switch (graphics->data.spice.defaultMode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 36cf3a281..92afd252d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -374,6 +374,7 @@ static void virQEMUDriverConfigDispose(void *obj) VIR_FREE(cfg->vncSASLdir); VIR_FREE(cfg->spiceTLSx509certdir); + VIR_FREE(cfg->spiceTLSCiphers); VIR_FREE(cfg->spiceListen); VIR_FREE(cfg->spicePassword); VIR_FREE(cfg->spiceSASLdir); @@ -550,6 +551,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; if (virConfGetValueString(conf, "spice_tls_x509_cert_dir", &cfg->spiceTLSx509certdir) < 0) goto cleanup; + if (virConfGetValueString(conf, "spice_tls_ciphers", &cfg->spiceTLSCiphers) < 0) + goto cleanup; if (virConfGetValueBool(conf, "spice_sasl", &cfg->spiceSASL) < 0) goto cleanup; if (virConfGetValueString(conf, "spice_sasl_dir", &cfg->spiceSASLdir) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index e1ad5463f..9ab9f4e37 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -128,6 +128,7 @@ struct _virQEMUDriverConfig { bool spiceTLS; char *spiceTLSx509certdir; + char *spiceTLSCiphers; bool spiceSASL; char *spiceSASLdir; char *spiceListen; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 688e5b9fd..2f62b383e 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -17,6 +17,7 @@ module Test_libvirtd_qemu = { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } +{ "spice_tls_ciphers" = "DEFAULT" } { "spice_auto_unix_socket" = "1" } { "spice_password" = "XYZ12345" } { "spice_sasl" = "1" } diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args new file mode 100644 index 000000000..2f608ad7c --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.args @@ -0,0 +1,29 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +SASL_CONF_PATH=/root/.sasl2 \ +QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu-system-i686 \ +-name QEMUGuest1 \ +-S \ +-M pc \ +-m 214 \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi \ +-boot c \ +-usb \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ +-spice port=5903,tls-port=5904,addr=127.0.0.1,sasl,\ +x509-dir=/etc/pki/libvirt-spice,tls-ciphers=DEFAULT,tls-channel=default \ +-vga qxl \ +-global qxl-vga.ram_size=67108864 \ +-global qxl-vga.vram_size=33554432 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml new file mode 120000 index 000000000..1bfac9efa --- /dev/null +++ b/tests/qemuxml2argvdata/graphics-spice-sasl-ciphers.xml @@ -0,0 +1 @@ +graphics-spice-sasl.xml \ No newline at end of file diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 308d71f72..29f702c5c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1126,6 +1126,11 @@ mymain(void) DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); + ignore_value(VIR_STRDUP(driver.config->spiceTLSCiphers, "DEFAULT")); + DO_TEST("graphics-spice-sasl-ciphers", + QEMU_CAPS_SPICE, + QEMU_CAPS_DEVICE_QXL); + VIR_FREE(driver.config->spiceTLSCiphers); VIR_FREE(driver.config->spiceSASLdir); driver.config->spiceSASL = 0; DO_TEST("graphics-spice-agentmouse", -- 2.13.6

4 3

[libvirt] [PATCH 00/44] Require QEMU 1.3.0 or newer
by Ján Tomko 03 Apr '18

03 Apr '18

It's been a while since we last bumped the minimum QEMU version. Let's get rid of -help parsing and bring our test suite closer to real world usage by implying lots of capabilities. Ján Tomko (44): qemuxml2argvtest: Fix q35-virt-manager capabilities Delete bogus cpu-host-passthrough test Force QMP capability probing Require QEMU 1.3.0 Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON Deprecate QEMU_CAPS_NO_USER_CONFIG Deprecate QEMU_CAPS_MEM_PATH Deprecate QEMU_CAPS_DRIVE_SERIAL Deprecate QEMU_CAPS_SDL Deprecate QEMU_CAPS_RTC Deprecate QEMU_CAPS_RTC_TD_HACK Deprecate QEMU_CAPS_VHOST_NET Deprecate QEMU_CAPS_NODEFCONFIG Deprecate QEMU_CAPS_BOOT_MENU Deprecate QEMU_CAPS_FSDEV Deprecate QEMU_CAPS_NAME_PROCESS Deprecate QEMU_CAPS_SMBIOS_TYPE Deprecate QEMU_CAPS_VGA_NONE Deprecate QEMU_CAPS_DRIVE_AIO Deprecate QEMU_CAPS_CHARDEV_SPICEVMC Deprecate QEMU_CAPS_DEVICE_SPICEVMC Deprecate QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC Deprecate QEMU_CAPS_NO_SHUTDOWN Deprecate QEMU_CAPS_DRIVE_CACHE_UNSAFE Deprecate QEMU_CAPS_FSDEV_READONLY Deprecate QEMU_CAPS_DRIVE_COPY_ON_READ Deprecate QEMU_CAPS_FSDEV_WRITEOUT Deprecate QEMU_CAPS_DRIVE_IOTUNE Deprecate QEMU_CAPS_WAKEUP Deprecate QEMU_CAPS_NETDEV_BRIDGE Deprecate QEMU_CAPS_SECCOMP_SANDBOX Deprecate QEMU_CAPS_DTB Deprecate QEMU_CAPS_IPV6_MIGRATION Deprecate QEMU_CAPS_MACHINE_OPT Deprecate QEMU_CAPS_DUMP_GUEST_CORE Deprecate QEMU_CAPS_VNC_SHARE_POLICY Deprecate QEMU_CAPS_HOST_PCI_MULTIDOMAIN Deprecate QEMU_CAPS_DISPLAY Deprecate QEMU_CAPS_MACHINE_USB_OPT cfg.mk | 2 +- src/qemu/qemu_capabilities.c | 931 +--------- src/qemu/qemu_capabilities.h | 74 +- src/qemu/qemu_capspriv.h | 17 +- src/qemu/qemu_command.c | 690 +++---- src/qemu/qemu_domain.c | 16 - src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 48 +- src/qemu/qemu_hotplug.c | 147 +- src/qemu/qemu_interface.c | 4 +- src/qemu/qemu_interface.h | 1 - src/qemu/qemu_migration.c | 10 +- src/qemu/qemu_process.c | 23 +- tests/Makefile.am | 8 +- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 1886 -------------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 172 -- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 35 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 35 - tests/qemucapabilitiestest.c | 1 - tests/qemucapsprobe.c | 2 +- tests/qemuhelpdata/qemu-0.12.1 | 198 -- tests/qemuhelpdata/qemu-0.12.1-device | 62 - tests/qemuhelpdata/qemu-1.0 | 253 --- tests/qemuhelpdata/qemu-1.0-device | 148 -- tests/qemuhelpdata/qemu-1.1.0 | 269 --- tests/qemuhelpdata/qemu-1.1.0-device | 170 -- tests/qemuhelpdata/qemu-1.2.0 | 272 --- tests/qemuhelpdata/qemu-kvm-0.12.3 | 215 --- tests/qemuhelpdata/qemu-kvm-0.12.3-device | 63 - tests/qemuhelpdata/qemu-kvm-0.13.0 | 242 --- tests/qemuhelpdata/qemu-kvm-0.13.0-device | 90 - tests/qemuhelpdata/qemu-kvm-1.2.0 | 277 --- tests/qemuhelptest.c | 437 ----- .../aarch64-aavmf-virtio-mmio.args | 14 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 9 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 10 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 9 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 9 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 14 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 9 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 9 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 10 +- .../aarch64-usb-controller-nec-xhci.args | 9 +- .../aarch64-usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/aarch64-video-default.args | 8 +- .../aarch64-video-virtio-gpu-pci.args | 16 +- .../aarch64-virt-2.6-virtio-pci-default.args | 15 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 14 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 14 +- .../aarch64-virtio-pci-default.args | 15 +- .../aarch64-virtio-pci-manual-addresses.args | 20 +- tests/qemuxml2argvdata/acpi-table.args | 9 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 14 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 14 +- tests/qemuxml2argvdata/autoindex.args | 9 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 10 +- tests/qemuxml2argvdata/balloon-device-auto.args | 10 +- .../balloon-device-deflate-off.args | 10 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 10 +- tests/qemuxml2argvdata/balloon-device-period.args | 10 +- tests/qemuxml2argvdata/balloon-device.args | 10 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 10 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 11 +- tests/qemuxml2argvdata/bios-nvram.args | 11 +- tests/qemuxml2argvdata/bios.args | 11 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 9 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 9 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 9 +- tests/qemuxml2argvdata/blkdeviotune.args | 9 +- tests/qemuxml2argvdata/blkiotune-device.args | 9 +- tests/qemuxml2argvdata/blkiotune.args | 9 +- tests/qemuxml2argvdata/boot-cdrom.args | 9 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 20 +- tests/qemuxml2argvdata/boot-complex.args | 19 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 9 +- tests/qemuxml2argvdata/boot-floppy.args | 9 +- .../boot-menu-disable-drive-bootindex.args | 9 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 9 +- tests/qemuxml2argvdata/boot-menu-disable.args | 9 +- .../boot-menu-enable-bootindex.args | 9 +- .../boot-menu-enable-with-timeout.args | 9 +- tests/qemuxml2argvdata/boot-menu-enable.args | 9 +- tests/qemuxml2argvdata/boot-multi.args | 9 +- tests/qemuxml2argvdata/boot-network.args | 9 +- tests/qemuxml2argvdata/boot-order.args | 15 +- tests/qemuxml2argvdata/boot-strict.args | 20 +- tests/qemuxml2argvdata/bootindex-floppy-q35.args | 9 +- tests/qemuxml2argvdata/channel-guestfwd.args | 10 +- tests/qemuxml2argvdata/channel-spicevmc-old.args | 29 - tests/qemuxml2argvdata/channel-spicevmc-old.xml | 35 - tests/qemuxml2argvdata/channel-spicevmc.args | 8 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 10 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 10 +- .../channel-virtio-autoassign.args | 10 +- tests/qemuxml2argvdata/channel-virtio-default.args | 10 +- tests/qemuxml2argvdata/channel-virtio-state.args | 10 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 10 +- tests/qemuxml2argvdata/channel-virtio.args | 10 +- tests/qemuxml2argvdata/chardev-reconnect.args | 10 +- tests/qemuxml2argvdata/clock-catchup.args | 8 +- tests/qemuxml2argvdata/clock-france.args | 8 +- tests/qemuxml2argvdata/clock-hpet-off.args | 8 +- .../clock-localtime-basis-localtime.args | 8 +- tests/qemuxml2argvdata/clock-localtime.args | 10 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 9 +- tests/qemuxml2argvdata/clock-utc.args | 10 +- tests/qemuxml2argvdata/clock-variable.args | 8 +- tests/qemuxml2argvdata/console-compat-auto.args | 9 +- tests/qemuxml2argvdata/console-compat-chardev.args | 10 +- tests/qemuxml2argvdata/console-compat.args | 9 +- tests/qemuxml2argvdata/console-sclp.args | 10 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 10 +- tests/qemuxml2argvdata/console-virtio-many.args | 10 +- tests/qemuxml2argvdata/console-virtio-s390.args | 10 +- tests/qemuxml2argvdata/console-virtio.args | 10 +- tests/qemuxml2argvdata/controller-order.args | 13 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 9 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 9 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 9 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 9 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 9 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 9 +- .../qemuxml2argvdata/cpu-check-default-none2.args | 9 +- .../cpu-check-default-partial.args | 9 +- .../cpu-check-default-partial2.args | 9 +- tests/qemuxml2argvdata/cpu-check-none.args | 9 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 9 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 9 +- tests/qemuxml2argvdata/cpu-exact1.args | 9 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 9 +- tests/qemuxml2argvdata/cpu-exact2.args | 9 +- tests/qemuxml2argvdata/cpu-fallback.args | 9 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 10 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 9 +- .../qemuxml2argvdata/cpu-host-model-fallback.args | 9 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 9 +- tests/qemuxml2argvdata/cpu-host-model.args | 9 +- .../cpu-host-passthrough-features.args | 9 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 9 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 9 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 10 +- tests/qemuxml2argvdata/cpu-minimum1.args | 9 +- tests/qemuxml2argvdata/cpu-minimum2.args | 9 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 9 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 9 +- .../cpu-numa-no-memory-element.args | 9 +- tests/qemuxml2argvdata/cpu-numa1.args | 9 +- tests/qemuxml2argvdata/cpu-numa2.args | 9 +- tests/qemuxml2argvdata/cpu-s390-features.args | 9 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 9 +- tests/qemuxml2argvdata/cpu-strict1.args | 9 +- tests/qemuxml2argvdata/cpu-topology1.args | 9 +- tests/qemuxml2argvdata/cpu-topology2.args | 9 +- tests/qemuxml2argvdata/cpu-topology3.args | 9 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 9 +- tests/qemuxml2argvdata/cputune-numatune.args | 9 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 9 +- tests/qemuxml2argvdata/cputune.args | 9 +- tests/qemuxml2argvdata/debug-threads.args | 9 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 9 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 9 +- tests/qemuxml2argvdata/disk-aio.args | 9 +- tests/qemuxml2argvdata/disk-blockio.args | 10 +- tests/qemuxml2argvdata/disk-cdrom-empty.args | 9 +- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-http.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-https.args | 9 +- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 9 +- .../disk-cdrom-tray-no-device-cap.args | 9 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 11 +- tests/qemuxml2argvdata/disk-cdrom.args | 9 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 17 +- tests/qemuxml2argvdata/disk-drive-boot-cdrom.args | 9 +- tests/qemuxml2argvdata/disk-drive-boot-disk.args | 9 +- .../disk-drive-cache-directsync.args | 9 +- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 9 +- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 9 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 9 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 9 +- .../qemuxml2argvdata/disk-drive-copy-on-read.args | 9 +- .../qemuxml2argvdata/disk-drive-detect-zeroes.args | 11 +- tests/qemuxml2argvdata/disk-drive-discard.args | 11 +- .../disk-drive-error-policy-enospace.args | 7 +- .../disk-drive-error-policy-stop.args | 7 +- .../disk-drive-error-policy-wreport-rignore.args | 7 +- tests/qemuxml2argvdata/disk-drive-fmt-qcow.args | 9 +- .../disk-drive-network-gluster.args | 9 +- .../disk-drive-network-iscsi-auth.args | 9 +- .../disk-drive-network-iscsi-lun.args | 10 +- .../qemuxml2argvdata/disk-drive-network-iscsi.args | 9 +- .../disk-drive-network-nbd-export.args | 9 +- .../disk-drive-network-nbd-ipv6-export.args | 9 +- .../disk-drive-network-nbd-ipv6.args | 9 +- .../disk-drive-network-nbd-unix.args | 9 +- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 9 +- .../disk-drive-network-rbd-auth-AES.args | 9 +- .../disk-drive-network-rbd-auth.args | 9 +- .../disk-drive-network-rbd-ipv6.args | 9 +- tests/qemuxml2argvdata/disk-drive-network-rbd.args | 9 +- .../disk-drive-network-sheepdog.args | 9 +- .../disk-drive-network-source-auth.args | 9 +- .../disk-drive-network-tlsx509-vxhs.args | 15 +- .../qemuxml2argvdata/disk-drive-network-vxhs.args | 11 +- tests/qemuxml2argvdata/disk-drive-no-boot.args | 9 +- .../qemuxml2argvdata/disk-drive-readonly-disk.args | 10 +- .../disk-drive-readonly-no-device.args | 10 +- .../disk-drive-shared-locking.args | 9 +- tests/qemuxml2argvdata/disk-drive-shared.args | 9 +- .../disk-floppy-tray-no-device-cap.args | 9 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 9 +- tests/qemuxml2argvdata/disk-floppy.args | 9 +- tests/qemuxml2argvdata/disk-geometry.args | 9 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 9 +- tests/qemuxml2argvdata/disk-ide-drive-split.args | 10 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 9 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 15 +- tests/qemuxml2argvdata/disk-iscsi.args | 9 +- .../qemuxml2argvdata/disk-many-format-probing.args | 9 +- tests/qemuxml2argvdata/disk-many.args | 9 +- tests/qemuxml2argvdata/disk-order.args | 9 +- tests/qemuxml2argvdata/disk-sata-device.args | 10 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 10 +- tests/qemuxml2argvdata/disk-scsi-device.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 10 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 12 +- .../disk-scsi-lun-passthrough.args | 9 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 10 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 10 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 10 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 10 +- tests/qemuxml2argvdata/disk-serial.args | 9 +- tests/qemuxml2argvdata/disk-snapshot.args | 9 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 10 +- tests/qemuxml2argvdata/disk-source-pool.args | 10 +- .../disk-usb-device-removable.args | 10 +- tests/qemuxml2argvdata/disk-usb-device.args | 10 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 9 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 9 +- .../qemuxml2argvdata/disk-virtio-drive-queues.args | 9 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 9 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 9 +- .../disk-virtio-scsi-cmd_per_lun.args | 10 +- .../disk-virtio-scsi-ioeventfd.args | 10 +- .../disk-virtio-scsi-max_sectors.args | 10 +- .../disk-virtio-scsi-num_queues.args | 10 +- tests/qemuxml2argvdata/disk-virtio.args | 9 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 9 +- tests/qemuxml2argvdata/encrypted-disk.args | 9 +- tests/qemuxml2argvdata/eoi-disabled.args | 9 +- tests/qemuxml2argvdata/eoi-enabled.args | 9 +- tests/qemuxml2argvdata/event_idx.args | 17 +- .../fd-memory-no-numa-topology.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology2.args | 9 +- .../qemuxml2argvdata/fd-memory-numa-topology3.args | 9 +- tests/qemuxml2argvdata/fips-enabled.args | 9 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 9 +- tests/qemuxml2argvdata/fs9p-ccw.args | 10 +- tests/qemuxml2argvdata/fs9p.args | 10 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 7 +- tests/qemuxml2argvdata/graphics-sdl.args | 7 +- .../graphics-spice-agent-file-xfer.args | 7 +- .../graphics-spice-agentmouse.args | 8 +- .../graphics-spice-auto-socket-cfg.args | 7 +- .../graphics-spice-auto-socket.args | 7 +- .../graphics-spice-compression.args | 7 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 7 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 7 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 7 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 7 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 14 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 8 +- tests/qemuxml2argvdata/graphics-spice.args | 7 +- .../graphics-vnc-auto-socket-cfg.args | 7 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 7 +- .../graphics-vnc-no-listen-attr.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 7 +- .../graphics-vnc-remove-generated-socket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 7 +- .../graphics-vnc-socket-new-cmdline.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 7 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 7 +- tests/qemuxml2argvdata/graphics-vnc.args | 7 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 10 +- .../hostdev-pci-address-device.args | 10 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 9 +- .../hostdev-scsi-lsi-iscsi-auth.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 9 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 9 +- .../hostdev-scsi-vhost-scsi-ccw.args | 9 +- .../hostdev-scsi-vhost-scsi-pci.args | 9 +- .../hostdev-scsi-vhost-scsi-pcie.args | 9 +- .../hostdev-scsi-virtio-iscsi-auth.args | 9 +- .../hostdev-scsi-virtio-iscsi.args | 9 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 9 +- .../hostdev-usb-address-device-boot.args | 10 +- .../hostdev-usb-address-device.args | 10 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 9 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 10 +- tests/qemuxml2argvdata/hostdev-vfio.args | 10 +- tests/qemuxml2argvdata/hotplug-base.args | 9 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 9 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 9 +- tests/qemuxml2argvdata/hugepages-numa.args | 6 +- tests/qemuxml2argvdata/hugepages-pages.args | 9 +- tests/qemuxml2argvdata/hugepages-pages2.args | 9 +- tests/qemuxml2argvdata/hugepages-pages3.args | 9 +- tests/qemuxml2argvdata/hugepages-pages5.args | 9 +- tests/qemuxml2argvdata/hugepages-pages6.args | 9 +- tests/qemuxml2argvdata/hugepages-pages7.args | 9 +- tests/qemuxml2argvdata/hugepages-shared.args | 9 +- tests/qemuxml2argvdata/hugepages.args | 9 +- tests/qemuxml2argvdata/hyperv-off.args | 9 +- tests/qemuxml2argvdata/hyperv-panic.args | 9 +- tests/qemuxml2argvdata/hyperv.args | 9 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 10 +- tests/qemuxml2argvdata/input-usbmouse.args | 9 +- tests/qemuxml2argvdata/input-usbtablet.args | 9 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 9 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 14 +- .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 9 +- tests/qemuxml2argvdata/intel-iommu-eim.args | 9 +- tests/qemuxml2argvdata/intel-iommu-machine.args | 9 +- tests/qemuxml2argvdata/intel-iommu.args | 9 +- .../iothreads-disk-virtio-ccw.args | 9 +- tests/qemuxml2argvdata/iothreads-disk.args | 9 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 9 +- tests/qemuxml2argvdata/iothreads-ids.args | 9 +- .../iothreads-virtio-scsi-ccw.args | 9 +- .../iothreads-virtio-scsi-pci.args | 9 +- tests/qemuxml2argvdata/iothreads.args | 9 +- tests/qemuxml2argvdata/kvm-features-off.args | 9 +- tests/qemuxml2argvdata/kvm-features.args | 9 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 9 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 9 +- tests/qemuxml2argvdata/kvm.args | 9 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 9 +- tests/qemuxml2argvdata/kvmclock.args | 9 +- tests/qemuxml2argvdata/luks-disks-source.args | 9 +- tests/qemuxml2argvdata/luks-disks.args | 9 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 10 +- .../qemuxml2argvdata/mach-virt-serial-native.args | 10 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 10 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 10 +- .../machine-aeskeywrap-off-cap.args | 10 +- .../machine-aeskeywrap-off-caps.args | 10 +- .../machine-aeskeywrap-on-cap.args | 9 +- .../machine-aeskeywrap-on-caps.args | 9 +- tests/qemuxml2argvdata/machine-aliases1.args | 9 +- tests/qemuxml2argvdata/machine-aliases2.args | 9 +- tests/qemuxml2argvdata/machine-core-cfg-off.args | 9 +- tests/qemuxml2argvdata/machine-core-off.args | 9 +- tests/qemuxml2argvdata/machine-core-on.args | 9 +- .../machine-deakeywrap-off-cap.args | 10 +- .../machine-deakeywrap-off-caps.args | 10 +- .../machine-deakeywrap-on-cap.args | 9 +- .../machine-deakeywrap-on-caps.args | 9 +- .../machine-keywrap-none-caps.args | 9 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 9 +- .../machine-loadparm-multiple-disks-nets-s390.args | 21 +- .../machine-loadparm-net-s390.args | 15 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 9 +- tests/qemuxml2argvdata/machine-smm-opt.args | 9 +- tests/qemuxml2argvdata/machine-usb-opt.args | 9 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 9 +- tests/qemuxml2argvdata/master-key.args | 9 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 9 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 9 +- .../memory-hotplug-nvdimm-access.args | 9 +- .../memory-hotplug-nvdimm-label.args | 9 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 9 +- .../memory-hotplug-ppc64-nonuma.args | 9 +- tests/qemuxml2argvdata/memory-hotplug.args | 9 +- tests/qemuxml2argvdata/memtune-unlimited.args | 9 +- tests/qemuxml2argvdata/memtune.args | 9 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 9 +- tests/qemuxml2argvdata/migrate.args | 9 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 9 +- tests/qemuxml2argvdata/minimal.args | 9 +- tests/qemuxml2argvdata/misc-acpi.args | 9 +- tests/qemuxml2argvdata/misc-disable-s3.args | 9 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 9 +- tests/qemuxml2argvdata/misc-enable-s4.args | 9 +- tests/qemuxml2argvdata/misc-no-reboot.args | 8 +- tests/qemuxml2argvdata/misc-uuid.args | 9 +- tests/qemuxml2argvdata/mlock-off.args | 9 +- tests/qemuxml2argvdata/mlock-on.args | 9 +- tests/qemuxml2argvdata/mlock-unsupported.args | 9 +- tests/qemuxml2argvdata/monitor-json.args | 8 +- .../qemuxml2argvdata/multifunction-pci-device.args | 10 +- tests/qemuxml2argvdata/name-escape.args | 7 +- tests/qemuxml2argvdata/net-client.args | 14 +- tests/qemuxml2argvdata/net-eth-hostip.args | 14 +- tests/qemuxml2argvdata/net-eth-ifname.args | 14 +- tests/qemuxml2argvdata/net-eth-names.args | 18 +- tests/qemuxml2argvdata/net-eth.args | 14 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 10 +- .../net-hostdev-vfio-multidomain.args | 10 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 10 +- tests/qemuxml2argvdata/net-hostdev.args | 10 +- tests/qemuxml2argvdata/net-mcast.args | 14 +- tests/qemuxml2argvdata/net-server.args | 14 +- tests/qemuxml2argvdata/net-udp.args | 15 +- tests/qemuxml2argvdata/net-user-addr.args | 9 +- tests/qemuxml2argvdata/net-user.args | 14 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 9 +- tests/qemuxml2argvdata/net-vhostuser.args | 9 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 19 +- tests/qemuxml2argvdata/net-virtio-device.args | 16 +- .../net-virtio-disable-offloads.args | 14 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 10 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 15 +- tests/qemuxml2argvdata/net-virtio-s390.args | 13 +- tests/qemuxml2argvdata/net-virtio.args | 14 +- tests/qemuxml2argvdata/no-kvm-pit-device.args | 9 +- tests/qemuxml2argvdata/no-shutdown.args | 7 +- tests/qemuxml2argvdata/nographics-display.args | 7 +- tests/qemuxml2argvdata/nographics-vga.args | 9 +- tests/qemuxml2argvdata/nographics.args | 9 +- tests/qemuxml2argvdata/nosharepages.args | 9 +- .../numad-auto-memory-vcpu-cpuset.args | 9 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 9 +- .../numad-auto-vcpu-static-numatune.args | 9 +- .../numad-static-memory-auto-vcpu.args | 9 +- tests/qemuxml2argvdata/numad.args | 9 +- .../numatune-auto-nodeset-invalid.args | 9 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 9 +- tests/qemuxml2argvdata/numatune-distances.args | 9 +- .../numatune-memnode-no-memory.args | 9 +- tests/qemuxml2argvdata/numatune-memnode.args | 9 +- tests/qemuxml2argvdata/numatune-memory.args | 9 +- tests/qemuxml2argvdata/panic-double.args | 10 +- tests/qemuxml2argvdata/panic-no-address.args | 10 +- tests/qemuxml2argvdata/panic.args | 10 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 10 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 10 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 9 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 9 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 9 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 9 +- tests/qemuxml2argvdata/pci-bridge.args | 158 +- tests/qemuxml2argvdata/pci-expander-bus.args | 160 +- tests/qemuxml2argvdata/pci-many.args | 9 +- tests/qemuxml2argvdata/pci-rom.args | 22 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 10 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 164 +- .../pcie-root-port-model-generic.args | 9 +- .../pcie-root-port-model-ioh3420.args | 9 +- tests/qemuxml2argvdata/pcie-root-port.args | 9 +- tests/qemuxml2argvdata/pcie-root.args | 9 +- .../pcie-switch-downstream-port.args | 9 +- .../pcie-switch-upstream-port.args | 9 +- tests/qemuxml2argvdata/pcihole64-q35.args | 9 +- tests/qemuxml2argvdata/pcihole64.args | 9 +- tests/qemuxml2argvdata/pmu-feature-off.args | 9 +- tests/qemuxml2argvdata/pmu-feature.args | 9 +- tests/qemuxml2argvdata/ppc-dtb.args | 9 +- .../ppc64-usb-controller-legacy.args | 9 +- .../ppc64-usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 9 +- tests/qemuxml2argvdata/ppce500-serial.args | 9 +- tests/qemuxml2argvdata/pseries-basic.args | 10 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 10 +- .../pseries-cpu-compat-power9.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 10 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 10 +- tests/qemuxml2argvdata/pseries-features.args | 9 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 10 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 10 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 10 +- .../pseries-machine-max-cpu-compat.args | 10 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 10 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 10 +- tests/qemuxml2argvdata/pseries-many-devices.args | 10 +- tests/qemuxml2argvdata/pseries-nvram.args | 9 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 10 +- .../qemuxml2argvdata/pseries-panic-no-address.args | 10 +- .../pseries-phb-default-missing.args | 10 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 9 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 10 +- tests/qemuxml2argvdata/pseries-serial-native.args | 10 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 10 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 10 +- tests/qemuxml2argvdata/pseries-usb-default.args | 10 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 10 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 10 +- .../pseries-vio-user-assigned.args | 10 +- tests/qemuxml2argvdata/pseries-vio.args | 10 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 9 +- tests/qemuxml2argvdata/pv-spinlock-enabled.args | 9 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 9 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 9 +- .../qemuxml2argvdata/q35-default-devices-only.args | 9 +- tests/qemuxml2argvdata/q35-multifunction.args | 9 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 9 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 14 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 9 +- tests/qemuxml2argvdata/q35-pcie.args | 9 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 9 +- tests/qemuxml2argvdata/q35-pm-disable.args | 9 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 9 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 9 +- tests/qemuxml2argvdata/q35-usb2.args | 9 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 6 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 9 +- tests/qemuxml2argvdata/q35.args | 9 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 9 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 9 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 9 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 9 +- .../qemu-ns-domain-commandline-ns0.args | 9 +- .../qemu-ns-domain-commandline.args | 9 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 9 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 9 +- tests/qemuxml2argvdata/qemu-ns.args | 9 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 9 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 9 +- tests/qemuxml2argvdata/restore-v2-fd.args | 9 +- tests/qemuxml2argvdata/restore-v2.args | 9 +- .../s390-allow-bogus-usb-controller.args | 10 +- .../s390-allow-bogus-usb-none.args | 10 +- tests/qemuxml2argvdata/s390-panic-missing.args | 10 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 10 +- tests/qemuxml2argvdata/s390-serial-2.args | 10 +- tests/qemuxml2argvdata/s390-serial-console.args | 10 +- tests/qemuxml2argvdata/s390-serial.args | 10 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 9 +- .../seclabel-dynamic-baselabel.args | 9 +- .../seclabel-dynamic-labelskip.args | 9 +- .../seclabel-dynamic-override.args | 9 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 9 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 9 +- tests/qemuxml2argvdata/seclabel-none.args | 9 +- .../seclabel-static-labelskip.args | 9 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 9 +- tests/qemuxml2argvdata/seclabel-static.args | 9 +- .../serial-dev-chardev-iobase.args | 10 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 10 +- tests/qemuxml2argvdata/serial-file-chardev.args | 10 +- tests/qemuxml2argvdata/serial-file-log.args | 9 +- tests/qemuxml2argvdata/serial-many-chardev.args | 10 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 10 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 9 +- tests/qemuxml2argvdata/serial-spiceport.args | 8 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 10 +- .../serial-tcp-telnet-chardev.args | 10 +- .../serial-tcp-tlsx509-chardev-notls.args | 10 +- .../serial-tcp-tlsx509-chardev-verify.args | 10 +- .../serial-tcp-tlsx509-chardev.args | 10 +- .../serial-tcp-tlsx509-secret-chardev.args | 10 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 10 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 10 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 10 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 9 +- tests/qemuxml2argvdata/shmem.args | 9 +- tests/qemuxml2argvdata/smartcard-controller.args | 10 +- .../smartcard-host-certificates.args | 10 +- tests/qemuxml2argvdata/smartcard-host.args | 10 +- .../smartcard-passthrough-spicevmc.args | 10 +- .../smartcard-passthrough-tcp.args | 10 +- tests/qemuxml2argvdata/smbios.args | 9 +- tests/qemuxml2argvdata/smp.args | 9 +- tests/qemuxml2argvdata/sound-device.args | 10 +- tests/qemuxml2argvdata/sound.args | 9 +- tests/qemuxml2argvdata/tpm-passthrough.args | 11 +- .../usb-controller-default-q35.args | 9 +- .../usb-controller-explicit-q35.args | 9 +- .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 9 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 10 +- tests/qemuxml2argvdata/usb-controller.args | 10 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 10 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 10 +- tests/qemuxml2argvdata/usb-hub.args | 10 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 10 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 10 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 10 +- tests/qemuxml2argvdata/usb-long-port-path.args | 10 +- tests/qemuxml2argvdata/usb-none.args | 10 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 10 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 10 +- tests/qemuxml2argvdata/usb-port-missing.args | 10 +- tests/qemuxml2argvdata/usb-ports.args | 10 +- tests/qemuxml2argvdata/usb-redir-boot.args | 10 +- .../qemuxml2argvdata/usb-redir-filter-version.args | 10 +- tests/qemuxml2argvdata/usb-redir-filter.args | 10 +- tests/qemuxml2argvdata/usb-redir.args | 10 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 10 +- tests/qemuxml2argvdata/usb1-usb2.args | 10 +- tests/qemuxml2argvdata/user-aliases-usb.args | 9 +- tests/qemuxml2argvdata/user-aliases.args | 25 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 9 +- .../video-device-pciaddr-default.args | 7 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-qxl-device.args | 9 +- tests/qemuxml2argvdata/video-qxl-heads.args | 9 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 9 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 9 +- .../video-qxl-sec-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 9 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 9 +- tests/qemuxml2argvdata/video-vga-device.args | 9 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 9 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 9 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 7 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 9 +- .../video-virtio-gpu-secondary.args | 9 +- .../video-virtio-gpu-spice-gl.args | 7 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 9 +- tests/qemuxml2argvdata/video-virtio-vga.args | 9 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 9 +- tests/qemuxml2argvdata/virtio-input.args | 9 +- tests/qemuxml2argvdata/virtio-lun.args | 16 +- tests/qemuxml2argvdata/virtio-options.args | 15 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 10 +- tests/qemuxml2argvdata/virtio-rng-default.args | 9 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 9 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 9 +- tests/qemuxml2argvdata/virtio-rng-random.args | 9 +- tests/qemuxml2argvdata/vmcoreinfo.args | 9 +- tests/qemuxml2argvdata/watchdog-device.args | 10 +- tests/qemuxml2argvdata/watchdog-diag288.args | 10 +- tests/qemuxml2argvdata/watchdog-dump.args | 9 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 9 +- tests/qemuxml2argvdata/watchdog.args | 9 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 9 +- tests/qemuxml2argvtest.c | 744 +++----- tests/qemuxml2xmltest.c | 119 +- 667 files changed, 4571 insertions(+), 10320 deletions(-) delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml delete mode 100644 tests/qemuhelpdata/qemu-0.12.1 delete mode 100644 tests/qemuhelpdata/qemu-0.12.1-device delete mode 100644 tests/qemuhelpdata/qemu-1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.1.0 delete mode 100644 tests/qemuhelpdata/qemu-1.1.0-device delete mode 100644 tests/qemuhelpdata/qemu-1.2.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.3-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0 delete mode 100644 tests/qemuhelpdata/qemu-kvm-0.13.0-device delete mode 100644 tests/qemuhelpdata/qemu-kvm-1.2.0 delete mode 100644 tests/qemuhelptest.c delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.args delete mode 100644 tests/qemuxml2argvdata/channel-spicevmc-old.xml -- 2.16.1

6 61

[libvirt] [RFC PATCH 0/2] qemu: deny privilege elevation and spawn in seccomp
by Ján Tomko 03 Apr '18

03 Apr '18

QEMU changed the behavior of -sandbox on since 2.11 and it no longer whitelists all the possible calls. Override the meaning of seccomp_sandbox = 1 in qemu.conf to block the privilege elevation set and spawn set on top of the default. Do the same by default even if no option is specified, hoping that this should be enough for everybody (TM) Sending as RFC to ask whether: * this is a sensible default * a coarse setting like this is enough or it makes sense to expose the individual sets in qemu.conf (in that case - can I reasonably promote an int setting to a list of strings?) Ján Tomko (2): Introduce QEMU_CAPS_SECCOMP_BLACKLIST qemu: deny privilege elevation and spawn in seccomp src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 +++++-- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemuxml2argvdata/minimal-sandbox.args | 25 ++++++++++++++++ tests/qemuxml2argvdata/minimal-sandbox.xml | 34 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 11 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.args create mode 100644 tests/qemuxml2argvdata/minimal-sandbox.xml -- 2.13.6

2 3

[libvirt] [PATCH 00/20] Fix virConnect(Un)RegisterCloseCallback and get rid of global variables
by Marc Hartmayer 03 Apr '18

03 Apr '18

The first part of this patch series fixes the behavior of virConnectSupportsFeatures, virConnect(Un)RegisterCloseCallback, and implements these features in the test driver. This results in a better code coverage of our test suite. The subsequent patches remove the need to have the global variables 'qemuProgram', 'adminProgram', 'lxcProgram, and 'remoteProgram' in remote_daemon.[ch]. They only work in combination with the fixed behavior of virConnectSupportsFeatures and virConnect(Un)RegisterCloseCallback. Marc Hartmayer (20): driver: Add typedef for the anonymous enum used for driver features remote: Don't hard code the feature VIR_DRV_FEATURE_REMOTE_CLOSE_CALLBACK as available virConnect(Un)RegisterCloseCallback: Throw an error in case the API is not supported test: Implement virConnectSupportsFeature test: Implement virConnect(Un)RegisterCloseCallback test: testOpenDefault: introduce cleanup path test: testOpenFromFile: return VIR_DRV_OPEN_SUCCESS in case of success test: testConnectAuthenticate: Take the lock when accessing mutable values test: testConnectClose: Set privateData to NULL in all cases test: rename defaultConn to defaultPrivconn test: introduce testDriverCloseInternal test: fix error path in testConnectOpen test: Convert testDriver to virObjectLockable remote: remove unneeded global variables stream: Access stream->prog instead of a hard-coded global variable remote: Set eventID explicitly to an invalid value remote: Add the information which program has to be used to daemonClientEventCallback remote: Use domainClientEventCallbacks for remoteReplayConnectionClosedEvent rpc: Introduce virNetServerGetProgramLocked helper function remote/rpc: Use virNetServerGetProgram() to determine the program src/esx/esx_driver.c | 18 +- src/libvirt-host.c | 24 +-- src/libvirt_internal.h | 4 +- src/libvirt_remote.syms | 1 + src/libxl/libxl_driver.c | 13 +- src/lxc/lxc_driver.c | 24 ++- src/openvz/openvz_driver.c | 15 +- src/qemu/qemu_driver.c | 8 +- src/remote/remote_daemon.c | 8 +- src/remote/remote_daemon.h | 3 - src/remote/remote_daemon_dispatch.c | 182 +++++++++++-------- src/remote/remote_daemon_stream.c | 14 +- src/rpc/gendispatch.pl | 2 + src/rpc/virnetserver.c | 54 +++++- src/rpc/virnetserver.h | 2 + src/test/test_driver.c | 339 ++++++++++++++++++++++-------------- src/vz/vz_driver.c | 15 +- src/xen/xen_driver.c | 15 +- tools/virsh.c | 11 +- 19 files changed, 504 insertions(+), 248 deletions(-) -- 2.13.4

4 62

[libvirt] [PATCH python] Post-release version bump to 4.3.0
by Daniel P. Berrangé 03 Apr '18

03 Apr '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial change. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c40908b..eff9d54 100755 --- a/setup.py +++ b/setup.py @@ -334,7 +334,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '4.2.0', + version = '4.3.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.14.3

1 0

[libvirt] [PATCH] rpm: add deps on rpcgen/libtirpc-devel
by Daniel P. Berrangé 03 Apr '18

03 Apr '18

Since RPC support moved out of glibc we need to have explicit deps on the new packages providing this functionality Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index b55a947ec9..97143c68ae 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -464,6 +464,11 @@ BuildRequires: wireshark-devel >= 2.1.0 BuildRequires: libssh-devel >= 0.7.0 %endif +%if 0%{?fedora} > 27 || 0%{?rhel} > 7 +BuildRequires: rpcgen +BuildRequires: libtirpc-devel +%endif + Provides: bundled(gnulib) %description -- 2.14.3

2 1

[libvirt] [PATCH 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 03 Apr '18

03 Apr '18

Bla bla bla... Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 11 +++++------ docs/news.xml | 9 +++++++++ m4/virt-driver-libxl.m4 | 23 ++--------------------- 3 files changed, 16 insertions(+), 27 deletions(-) -- 2.16.2

3 7

[libvirt] [PATCH] util: json: Remove yajl bits from virJSONValueToStr
by Peter Krempa 03 Apr '18

03 Apr '18

Rather than depending on yajl bits for creating the JSON structure replace it by few virBuffer bits. This will make the JSON formatter libary agnostic. Additionally remove the debug statement from the worker function since it was not very useful. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/virjson.c | 188 ++++++++++++++++++++++++++++------------------------- 1 file changed, 101 insertions(+), 87 deletions(-) diff --git a/src/util/virjson.c b/src/util/virjson.c index 6a02ddf0cc..772a205e9e 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -1834,144 +1834,158 @@ virJSONValueFromString(const char *jsonstring) return ret; } +#else +virJSONValuePtr +virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No JSON parser implementation is available")); + return NULL; +} +#endif + + +static void +virJSONValueToStringAddString(virBufferPtr buf, + virJSONValuePtr string) +{ + const char *t; + + virBufferAddLit(buf, "\""); + + for (t = string->data.string; *t; t++) { + switch (*t) { + case '"': + virBufferAddLit(buf, "\\\""); + break; + case '\\': + virBufferAddLit(buf, "\\\\"); + break; + case '\n': + virBufferAddLit(buf, "\\n"); + break; + case '\t': + virBufferAddLit(buf, "\\t"); + break; + default: + virBufferAdd(buf, t, 1); + break; + } + } + + virBufferAddLit(buf, "\""); +} + + +#define VIR_JSON_PRETTY_NEWLINE \ + if (pretty) \ + virBufferAddLit(buf, "\n") static int virJSONValueToStringOne(virJSONValuePtr object, - yajl_gen g) + virBufferPtr buf, + bool pretty) { size_t i; - VIR_DEBUG("object=%p type=%d gen=%p", object, object->type, g); - - switch (object->type) { + switch ((virJSONType) object->type) { case VIR_JSON_TYPE_OBJECT: - if (yajl_gen_map_open(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "{"); + VIR_JSON_PRETTY_NEWLINE; + virBufferAdjustIndent(buf, 2); + for (i = 0; i < object->data.object.npairs; i++) { - if (yajl_gen_string(g, - (unsigned char *)object->data.object.pairs[i].key, - strlen(object->data.object.pairs[i].key)) - != yajl_gen_status_ok) - return -1; - if (virJSONValueToStringOne(object->data.object.pairs[i].value, g) < 0) + virBufferStrcat(buf, "\"", object->data.object.pairs[i].key, "\":", NULL); + + if (pretty) + virBufferAddLit(buf, " "); + + if (virJSONValueToStringOne(object->data.object.pairs[i].value, + buf, pretty) < 0) return -1; + + if (i != object->data.object.npairs - 1) { + virBufferAddLit(buf, ","); + VIR_JSON_PRETTY_NEWLINE; + } } - if (yajl_gen_map_close(g) != yajl_gen_status_ok) - return -1; + + virBufferAdjustIndent(buf, -2); + VIR_JSON_PRETTY_NEWLINE; + virBufferAddLit(buf, "}"); break; + case VIR_JSON_TYPE_ARRAY: - if (yajl_gen_array_open(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "["); + VIR_JSON_PRETTY_NEWLINE; + virBufferAdjustIndent(buf, 2); + for (i = 0; i < object->data.array.nvalues; i++) { - if (virJSONValueToStringOne(object->data.array.values[i], g) < 0) + if (virJSONValueToStringOne(object->data.array.values[i], buf, pretty) < 0) return -1; + + if (i != object->data.array.nvalues - 1) { + virBufferAddLit(buf, ","); + VIR_JSON_PRETTY_NEWLINE; + } } - if (yajl_gen_array_close(g) != yajl_gen_status_ok) - return -1; + + virBufferAdjustIndent(buf, -2); + VIR_JSON_PRETTY_NEWLINE; + virBufferAddLit(buf, "]"); break; case VIR_JSON_TYPE_STRING: - if (yajl_gen_string(g, (unsigned char *)object->data.string, - strlen(object->data.string)) != yajl_gen_status_ok) - return -1; + virJSONValueToStringAddString(buf, object); break; case VIR_JSON_TYPE_NUMBER: - if (yajl_gen_number(g, object->data.number, - strlen(object->data.number)) != yajl_gen_status_ok) - return -1; + virBufferAdd(buf, object->data.number, -1); break; case VIR_JSON_TYPE_BOOLEAN: - if (yajl_gen_bool(g, object->data.boolean) != yajl_gen_status_ok) - return -1; + if (object->data.boolean) + virBufferAddLit(buf, "true"); + else + virBufferAddLit(buf, "false"); break; case VIR_JSON_TYPE_NULL: - if (yajl_gen_null(g) != yajl_gen_status_ok) - return -1; + virBufferAddLit(buf, "null"); break; default: + virReportEnumRangeError(virJSONType, object->type); return -1; } return 0; } +#undef VIR_JSON_PRETTY_NEWLINE + char * virJSONValueToString(virJSONValuePtr object, bool pretty) { - yajl_gen g; - const unsigned char *str; + virBuffer buf = VIR_BUFFER_INITIALIZER; char *ret = NULL; - yajl_size_t len; -# ifndef WITH_YAJL2 - yajl_gen_config conf = { pretty ? 1 : 0, pretty ? " " : " "}; -# endif VIR_DEBUG("object=%p", object); -# ifdef WITH_YAJL2 - g = yajl_gen_alloc(NULL); - if (g) { - yajl_gen_config(g, yajl_gen_beautify, pretty ? 1 : 0); - yajl_gen_config(g, yajl_gen_indent_string, pretty ? " " : " "); - yajl_gen_config(g, yajl_gen_validate_utf8, 1); - } -# else - g = yajl_gen_alloc(&conf, NULL); -# endif - if (!g) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to create JSON formatter")); - goto cleanup; - } - - if (virJSONValueToStringOne(object, g) < 0) { - virReportOOMError(); - goto cleanup; - } - - if (yajl_gen_get_buf(g, &str, &len) != yajl_gen_status_ok) { - virReportOOMError(); - goto cleanup; + if (virJSONValueToStringOne(object, &buf, pretty) < 0 || + virBufferCheckError(&buf) < 0) { + virBufferFreeAndReset(&buf); + return NULL; } - ignore_value(VIR_STRDUP(ret, (const char *)str)); - - cleanup: - yajl_gen_free(g); - - VIR_DEBUG("result=%s", NULLSTR(ret)); - + ret = virBufferContentAndReset(&buf); + VIR_DEBUG("result=%s", ret); return ret; } -#else -virJSONValuePtr -virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No JSON parser implementation is available")); - return NULL; -} - - -char * -virJSONValueToString(virJSONValuePtr object ATTRIBUTE_UNUSED, - bool pretty ATTRIBUTE_UNUSED) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("No JSON parser implementation is available")); - return NULL; -} -#endif - - /** * virJSONStringReformat: * @jsonstr: string to reformat -- 2.14.3

2 2

[libvirt] [PATCH 0/9] json: Fix leak/double-free, clean up code and privatize virJSONValue
by Peter Krempa 03 Apr '18

03 Apr '18

Coverity was not wrong about the usage of 'a'/'A' modifiers for virJSONValueObjectAddVArgs as noted in [1]. Fix the possible leak/double-free, and add test to make sure it works as expected. This series also cleans up direct access to attributes of virJSONValue and in the end privatizes the implementation so that all users are forced to use accessors. Peter Krempa (9): util: json: Fix freeing of objects appended to virJSONValue tests: json: Validate that attribute values are properly stolen qemu: monitor: Use virJSONValueObjectKeysNumber in qemuMonitorJSONGetCPUModelExpansion qemu: agent: Avoid unnecessary JSON object type check json: Replace access to virJSONValue->type by virJSONValueGetType util: json: Add accessor for geting a VIR_JSON_TYPE_NUMBER as string util: qemu: Don't access virJSONValue members directly in virQEMUBuildCommandLineJSONRecurse qemu: monitor: Don't resist stealing 'actions' in qemuMonitorJSONTransaction util: json: Privatize struct _virJSONValue and sub-structs src/libvirt_private.syms | 1 + src/qemu/qemu_agent.c | 21 +++++----------- src/qemu/qemu_block.c | 22 +++++------------ src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 4 +-- src/qemu/qemu_monitor.c | 4 +-- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 59 ++++++++++++++------------------------------ src/qemu/qemu_monitor_json.h | 2 +- src/util/virjson.c | 59 +++++++++++++++++++++++++++++++++++++++++--- src/util/virjson.h | 39 +---------------------------- src/util/virqemu.c | 13 ++++++---- tests/qemublocktest.c | 4 +-- tests/virjsontest.c | 47 +++++++++++++++++++++++++++++++++++ 14 files changed, 152 insertions(+), 127 deletions(-) -- 2.16.2

3 24

[libvirt] [PATCH] lxc_container: Set source file description
by Radostin Stoyanov 03 Apr '18

03 Apr '18

Signed-off-by: Radostin Stoyanov <rstoyanov1(a)gmail.com> --- src/lxc/lxc_container.c | 2 +- src/lxc/lxc_container.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 14928e8ec..532fd0be0 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 IBM Corp. * Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. * - * lxc_container.c: file description + * lxc_container.c: Performs container setup tasks * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index e0f508d4a..641e2d460 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -1,7 +1,7 @@ /* * Copyright IBM Corp. 2008 * - * lxc_container.h: header file for fcns run inside container + * lxc_container.h: Performs container setup tasks * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> -- 2.14.3

2 1

[libvirt] [dbus PATCH v4 0/5] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 03 Apr '18

03 Apr '18

* Implemented Suspend and Resume APIs. * Reused virsh functions for taking the Event Strings names from ENUM. * Merged all Domain Lifecycle events signals into one signal. Changes from v3: * s/arg2/arg1/ since Event Type is the second argument of the signal. Katerina Koukiou (5): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. utils: Introduce functions and macros for translating ENUMs to strings events: Introduce virtDBusEventsDomainEventToString function Merge all Domain lifecycle signals into one signal called Domain. data/org.libvirt.Connect.xml | 54 +++------------------------------------- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 42 +++++++++++++++++++++++++++++++ src/events.c | 59 +++++++++++++++++--------------------------- src/util.c | 27 ++++++++++++++++++++ src/util.h | 28 +++++++++++++++++++++ test/test_connect.py | 10 +++----- test/test_domain.py | 40 +++++++++++++++++++++++++----- 8 files changed, 168 insertions(+), 100 deletions(-) -- 2.15.0

2 8

[libvirt] RFC: Extending UEFI XML specification
by Prerna 03 Apr '18

03 Apr '18

Hi Michal, The <loader>,<nvram> tags of os element in domain XML ( https://libvirt.org/formatdomain.html#elementsOSBIOS) currently expects absolute path of the local file which would be used to back the the pflash disk representing the non-volatile RAM: <loader readonly='yes' secure='no' type='rom'>/usr/lib/xen/boot/hvmloader</loader> <nvram template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram> However, given that for virtualized environments, it is possible that the VM could be started on different hosts at various points in time, and so we need to expose the firmware/nvram tuple over a network device so as to be accessible from various hosts. I propose extending of the existing config by adding a new element, "backing". This could be one of : - 'file': for local filesystem paths - 'network': for network-attached storage. As an example: <loader readonly='yes' secure='no' type='rom' backing = 'file'>/usr/share/OVMF/OVMF_CODE.fd</loader> <nvram backing='file' template='/usr/share/OVMF/OVMF_VARS.fd'>/var/lib/libvirt/nvram/guest_VARS.fd</nvram> For network-attached storage: <loader readonly='yes' secure='no' type='rom' backing = 'network'>/usr/share/OVMF/OVMF_CODE.fd</loader> <nvram backing='network'> <source protocol='XXX' name='YYY'> <host name='x.x.x.x' port=xxxx/> </source> </nvram> Note that 'template' attribute in NVRAM should be explicitly disallowed for backing type "network". This is because libvirtd may not be able to access the backing store to copy the contents of the template. I would like to capture thoughts from the community to extend the current firmware spec. Regards, Prerna

2 4

[libvirt] [dbus PATCH v3 0/5] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 03 Apr '18

03 Apr '18

* Implemented Suspend and Resume APIs. * Reused virsh functions for taking the Event Strings names from ENUM. * Merged all Domain Lifecycle events signals into one signal. Changed from v2: * Coding style issues. * Removed the Domain prefix for domain event type only in last patch. Katerina Koukiou (5): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. utils: Introduce functions and macros for translating ENUMs to strings events: Introduce virtDBusEventsDomainEventToString function Merge all Domain lifecycle signals into one signal called Domain. data/org.libvirt.Connect.xml | 54 +++------------------------------------- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 42 +++++++++++++++++++++++++++++++ src/events.c | 59 +++++++++++++++++--------------------------- src/util.c | 27 ++++++++++++++++++++ src/util.h | 28 +++++++++++++++++++++ test/test_connect.py | 10 +++----- test/test_domain.py | 40 +++++++++++++++++++++++++----- 8 files changed, 168 insertions(+), 100 deletions(-) -- 2.15.0

1 5

[libvirt] [PATCH] lxc: Use virDomainObjEndAPI after FindByName
by John Ferlan 02 Apr '18

02 Apr '18

For consistency, rather than open coding the Unref and Unlock, just use the virDomainObjEndAPI API. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial src/lxc/lxc_process.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index bc321e360d..85c7bcc321 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -420,8 +420,7 @@ static int virLXCProcessSetupNamespaceName(virConnectPtr conn, int ns_type, cons cleanup: VIR_FREE(path); - virObjectUnlock(vm); - virObjectUnref(vm); + virDomainObjEndAPI(&vm); return fd; } -- 2.13.6

1 0

[libvirt] [PATCH] qemu: s/acceptible/acceptable/
by Ján Tomko 01 Apr '18

01 Apr '18

Prefer the contemporary spelling. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Pushed as trivial src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 580e0f830..136116cfe 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4173,7 +4173,7 @@ qemuDomainDeviceDefValidateControllerAttributes(const virDomainControllerDef *co * * Using the @qemuCaps, let's ensure the provided @model can be supported * - * Returns true if acceptible, false otherwise with error message set. + * Returns true if acceptable, false otherwise with error message set. */ static bool qemuDomainCheckSCSIControllerModel(virQEMUCapsPtr qemuCaps, -- 2.13.6

1 0

[libvirt] [PATCH 0/4] vmx: allow more than 4 NICs (RHBZ#1560917)
by Pino Toscano 01 Apr '18

01 Apr '18

Hi, the VMX parser, used in the esx driver, has currently hardcoded 4 NICs possible, ignoring extra more than that. The following series removes this limitation, allowing to parse all the 10 NICs in the VMX of RHBZ#1560917. Thanks, Pino Toscano (4): vmx: check for present/enabled devices earlier vmx: allocate space for network interfaces if needed internal: add STRCASEPREFIX vmx: convert any amount of NICs src/internal.h | 1 + src/vmx/vmx.c | 150 +++++++++++----------- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.vmx | 163 ++++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 89 +++++++++++++ tests/vmx2xmltest.c | 1 + 5 files changed, 325 insertions(+), 79 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml -- 2.14.3

3 7

[libvirt] Release of libvirt-4.2.0
by Daniel Veillard 01 Apr '18

01 Apr '18

Not April fool one, I made the release on time :-) It's signed in git and signed tarball and rpms are pushed to the usual place: ftp://libvirt.org/libvirt/ I also pushed a python binding 4.2.0 release which can be found at: ftp://libvirt.org/libvirt/python/ New features - Support building with Python 3 Python is required to build libvirt, and up until now only Python 2 could be used as an interpreter. All scripts used during build have now been made compatible with Python 3, which means both major releases of the language are fully supported. - qemu: Provide ccw address support for graphics and input devices Support the virtio-gpu-ccw device as a video device and virtio-{keyboard, mouse, tablet}-ccw devices as input devices on S390. Improvements - qemu: Add logging of guest crash information on S390 On S390, when the guest crashes and QEMU exposes the guest crash information, log the relevant data to the domain log file. - qemu: use arp table of host to get the IP address of guests Find IP address of a VM by arp table on hosts. If someone customizing IP address inside VM, it will be helpful. - Xen: Remove hard-coded scheduler weight The libxl driver was accidentally hard-coding the per-domain scheduler weight to 1000, silently ignoring any user-provided <shares> in <cputune>. The driver now honors <shares>, and defers setting a default value to Xen. Note that the Xen default is 256, so any domains started after this improvement will have one fourth the shares of previously started domains. If all domains must have equal CPU shares, administrators must manually set the weight of previously started domains to 256, or restart them. there is no documented bug fix but there is quite a few there too :-) Thanks everybody for your help getting this release, with patches, reviews, bug reports, documentation, etc. Enjoy ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] qemuDomainRemoveDevice: add qemuDomainRemoveWatchdog
by Ján Tomko 01 Apr '18

01 Apr '18

qemuDomainDetachWatchdog uses the infrastructure for waiting for the DEVICE_DELETED event, but the asynchronous delete was not implemented. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_hotplug.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 49af4d4ff..e840c8010 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4493,12 +4493,15 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret = qemuDomainRemoveRedirdevDevice(driver, vm, dev->data.redirdev); break; + case VIR_DOMAIN_DEVICE_WATCHDOG: + ret = qemuDomainRemoveWatchdog(driver, vm, dev->data.watchdog); + break; + case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_FS: case VIR_DOMAIN_DEVICE_SOUND: case VIR_DOMAIN_DEVICE_VIDEO: - case VIR_DOMAIN_DEVICE_WATCHDOG: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_HUB: case VIR_DOMAIN_DEVICE_SMARTCARD: -- 2.13.6

2 1

[libvirt] [PATCH] qemu: Randomly deny starting domains
by Michal Privoznik 01 Apr '18

01 Apr '18

Libvirt works just too well. Deny starting domains at random so users value our incredibly low number of bugs more. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bcc4936de..4570c76db7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -107,6 +107,7 @@ #include "virnuma.h" #include "dirname.h" #include "netdev_bandwidth_conf.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -7256,7 +7257,7 @@ qemuDomainObjStart(virConnectPtr conn, qemuDomainAsyncJob asyncJob) { int ret = -1; - char *managed_save; + char *managed_save = NULL; bool start_paused = (flags & VIR_DOMAIN_START_PAUSED) != 0; bool autodestroy = (flags & VIR_DOMAIN_START_AUTODESTROY) != 0; bool bypass_cache = (flags & VIR_DOMAIN_START_BYPASS_CACHE) != 0; @@ -7267,6 +7268,13 @@ qemuDomainObjStart(virConnectPtr conn, start_flags |= start_paused ? VIR_QEMU_PROCESS_START_PAUSED : 0; start_flags |= autodestroy ? VIR_QEMU_PROCESS_START_AUTODESTROY : 0; + if (virRandomInt(2)) { + virReportError(VIR_ERR_OPERATION_DENIED, + _("Starting domain %s denied. Today is not your day"), + vm->def->name); + goto cleanup; + } + /* * If there is a managed saved state restore it instead of starting * from scratch. The old state is removed once the restoring succeeded. -- 2.16.1

1 0

[libvirt] [PATCH] Introduce the <watchcat> device
by Ján Tomko 31 Mar '18

31 Mar '18

As one wise man once said about those furry things with no practical purpose: a cat is like a self-aware moving bonsai tree with an attitude. Inspired by this profound quote, introduce a <watchcat> device. A counterpart to <watchdog> that does nothing. If the domain crashes, it just watches. Or purrs. Or wanders around. XML format: <devices> <watchcat breed='persian'/> </devices> Available breeds also include chihuahua, because dogs under 50 lbs are as pointless as cats. Just ask Ron Swanson. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/formatdomain.html.in | 26 ++++++++ docs/schemas/domaincommon.rng | 19 ++++++ src/conf/domain_conf.c | 106 +++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 22 +++++++ src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain_address.c | 1 + src/qemu/qemu_driver.c | 6 ++ src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_process.c | 5 ++ tests/genericxml2xmlindata/watchcat.xml | 18 ++++++ tests/genericxml2xmltest.c | 2 + 11 files changed, 206 insertions(+), 1 deletion(-) create mode 100644 tests/genericxml2xmlindata/watchcat.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 08dc74b6b..bc47b85f1 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -8032,6 +8032,32 @@ qemu-kvm -net nic,model=? /dev/null </dd> </dl> + <h4><a id="elementsWatchcat">Watchcat</a></h4> + + <p> + The <code>watchcat</code> element can be used to add a watchcat. + <span class="since">Since 2.4.0</span> + </p> + + <p> + Example: + </p> +<pre> +... +<devices> + <watchcat breed='siamese'/> +</devices> +... +</pre> + <dl> + <dt><code>breed</code></dt> + <dd> + <p> + This attribute is intentionally left undocumented + </p> + </dd> + </dl> + <h3><a id="seclabel">Security label</a></h3> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8165e699d..58630f68a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4179,6 +4179,22 @@ </element> </define> + <define name="watchcat"> + <element name="watchcat"> + <attribute name="breed"> + <choice> + <value>persian</value> + <value>blue-swedish</value> + <value>abyssinian</value> + <value>british-shorthair</value> + <value>turkish-angora</value> + <value>chihuahua</value> + <value>siamese</value> + </choice> + </attribute> + </element> + </define> + <define name="input"> <element name="input"> <optional> @@ -4691,6 +4707,9 @@ <optional> <ref name="iommu"/> </optional> + <optional> + <ref name="watchcat"/> + </optional> </interleave> </element> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ae7c0d9b7..d45d40ee8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -59,6 +59,7 @@ #include "virnetdevmacvlan.h" #include "virhostdev.h" #include "virmdev.h" +#include "virrandom.h" #define VIR_FROM_THIS VIR_FROM_DOMAIN @@ -256,7 +257,8 @@ VIR_ENUM_IMPL(virDomainDevice, VIR_DOMAIN_DEVICE_LAST, "tpm", "panic", "memory", - "iommu") + "iommu", + "watchcat") VIR_ENUM_IMPL(virDomainDeviceAddress, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_LAST, "none", @@ -929,6 +931,15 @@ VIR_ENUM_IMPL(virDomainShmemModel, VIR_DOMAIN_SHMEM_MODEL_LAST, "ivshmem-plain", "ivshmem-doorbell") +VIR_ENUM_IMPL(virDomainWatchcatBreed, VIR_DOMAIN_WATCHCAT_BREED_LAST, + "persian", + "blue-swedish", + "abyssinian", + "british-shorthair", + "turkish-angora", + "chihuahua", + "siamese") + static virClassPtr virDomainObjClass; static virClassPtr virDomainXMLOptionClass; static void virDomainObjDispose(void *obj); @@ -2739,6 +2750,9 @@ void virDomainDeviceDefFree(virDomainDeviceDefPtr def) case VIR_DOMAIN_DEVICE_IOMMU: VIR_FREE(def->data.iommu); break; + case VIR_DOMAIN_DEVICE_WATCHCAT: + VIR_FREE(def->data.watchcat); + break; case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: break; @@ -3608,6 +3622,7 @@ virDomainDeviceGetInfo(virDomainDeviceDefPtr device) case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: break; @@ -3834,6 +3849,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, case VIR_DOMAIN_DEVICE_RNG: case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: break; } #endif @@ -5010,6 +5026,12 @@ virDomainDefPostParseCommon(virDomainDefPtr def, } } + if (def->watchcat && + def->watchcat->breed == VIR_DOMAIN_WATCHCAT_BREED_CHIHUAHUA) { + virDomainWatchdogDefPtr dawg = def->watchdog; + VIR_FREE(dawg); + } + /* clean up possibly duplicated metadata entries */ virXMLNodeSanitizeNamespaces(def->metadata); @@ -5550,6 +5572,7 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; @@ -15685,6 +15708,39 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, } +static virDomainWatchcatDefPtr +virDomainWatchcatDefParseXML(xmlNodePtr node) +{ + virDomainWatchcatDefPtr watchcat = NULL, ret = NULL; + char *tmp = NULL; + int val; + + if (VIR_ALLOC(watchcat) < 0) + goto cleanup; + + if (!(tmp = virXMLPropString(node, "breed"))) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing breed for Watchcat device")); + goto cleanup; + } + + if ((val = virDomainWatchcatBreedTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_XML_ERROR, _("unknown Watchcat breed: %s"), tmp); + goto cleanup; + } + + watchcat->breed = val; + + ret = watchcat; + watchcat = NULL; + + cleanup: + VIR_FREE(watchcat); + VIR_FREE(tmp); + return ret; +} + + virDomainDeviceDefPtr virDomainDeviceDefParse(const char *xmlStr, const virDomainDef *def, @@ -15840,6 +15896,10 @@ virDomainDeviceDefParse(const char *xmlStr, if (!(dev->data.iommu = virDomainIOMMUDefParseXML(node, ctxt))) goto error; break; + case VIR_DOMAIN_DEVICE_WATCHCAT: + if (!(dev->data.watchcat = virDomainWatchcatDefParseXML(node))) + goto error; + break; case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; @@ -20243,6 +20303,21 @@ virDomainDefParseXML(xmlDocPtr xml, } VIR_FREE(nodes); + if ((n = virXPathNodeSet("./devices/watchcat", ctxt, &nodes)) < 0) + goto error; + + if (n > 1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only a single Watchcat is supported")); + goto error; + } + + if (n > 0) { + if (!(def->watchcat = virDomainWatchcatDefParseXML(nodes[0]))) + goto error; + } + VIR_FREE(nodes); + /* analysis of the user namespace mapping */ if ((n = virXPathNodeSet("./idmap/uid", ctxt, &nodes)) < 0) goto error; @@ -22287,6 +22362,7 @@ virDomainDefCheckABIStabilityFlags(virDomainDefPtr src, case VIR_DOMAIN_DEVICE_SHMEM: case VIR_DOMAIN_DEVICE_MEMORY: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: break; } #endif @@ -26463,6 +26539,27 @@ virDomainIOMMUDefFormat(virBufferPtr buf, } +static int +virDomainWatchcatDefFormat(virBufferPtr buf, + const virDomainWatchcatDef *watchcat) +{ + virBuffer attrBuf = VIR_BUFFER_INITIALIZER; + int ret = -1; + + virBufferAsprintf(&attrBuf, " breed='%s'", + virDomainWatchcatBreedTypeToString(watchcat->breed)); + + if (virXMLFormatElement(buf, "watchcat", &attrBuf, NULL) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virBufferFreeAndReset(&attrBuf); + return ret; +} + + /* This internal version appends to an existing buffer * (possibly with auto-indent), rather than flattening * to string. @@ -27244,6 +27341,12 @@ virDomainDefFormatInternal(virDomainDefPtr def, virDomainIOMMUDefFormat(buf, def->iommu) < 0) goto error; + if (def->watchcat) { + if (virDomainWatchcatDefFormat(buf, def->watchcat) < 0) + goto error; + if (virRandomInt(100) < 2) + VIR_FREE(def->watchcat); + } virBufferAdjustIndent(buf, -2); virBufferAddLit(buf, "</devices>\n"); @@ -28370,6 +28473,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src, case VIR_DOMAIN_DEVICE_MEMBALLOON: case VIR_DOMAIN_DEVICE_NVRAM: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Copying definition of '%d' type " diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 61379e50f..6fd4ee6eb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -157,6 +157,9 @@ typedef virDomainTPMDef *virDomainTPMDefPtr; typedef struct _virDomainIOMMUDef virDomainIOMMUDef; typedef virDomainIOMMUDef *virDomainIOMMUDefPtr; +typedef struct _virDomainWatchcatDef virDomainWatchcatDef; +typedef virDomainWatchcatDef *virDomainWatchcatDefPtr; + typedef struct _virDomainVirtioOptions virDomainVirtioOptions; typedef virDomainVirtioOptions *virDomainVirtioOptionsPtr; @@ -186,6 +189,7 @@ typedef enum { VIR_DOMAIN_DEVICE_PANIC, VIR_DOMAIN_DEVICE_MEMORY, VIR_DOMAIN_DEVICE_IOMMU, + VIR_DOMAIN_DEVICE_WATCHCAT, VIR_DOMAIN_DEVICE_LAST } virDomainDeviceType; @@ -218,6 +222,7 @@ struct _virDomainDeviceDef { virDomainPanicDefPtr panic; virDomainMemoryDefPtr memory; virDomainIOMMUDefPtr iommu; + virDomainWatchcatDefPtr watchcat; } data; }; @@ -2303,6 +2308,21 @@ struct _virDomainIOMMUDef { virTristateSwitch iotlb; }; +typedef enum { + VIR_DOMAIN_WATCHCAT_BREED_PERSIAN, + VIR_DOMAIN_WATCHCAT_BREED_BLUE_SWEDISH, + VIR_DOMAIN_WATCHCAT_BREED_ABYSSINIAN, + VIR_DOMAIN_WATCHCAT_BREED_BRITISH_SHORTHAIR, + VIR_DOMAIN_WATCHCAT_BREED_TURKISH_ANGORA, + VIR_DOMAIN_WATCHCAT_BREED_CHIHUAHUA, + VIR_DOMAIN_WATCHCAT_BREED_SIAMESE, + VIR_DOMAIN_WATCHCAT_BREED_LAST +} virDomainWatchcatBreed; + +struct _virDomainWatchcatDef { + virDomainWatchcatBreed breed; +}; + struct _virDomainVirtioOptions { virTristateSwitch iommu; virTristateSwitch ats; @@ -2448,6 +2468,7 @@ struct _virDomainDef { virSysinfoDefPtr sysinfo; virDomainRedirFilterDefPtr redirfilter; virDomainIOMMUDefPtr iommu; + virDomainWatchcatDefPtr watchcat; void *namespaceData; virDomainXMLNamespace ns; @@ -3345,6 +3366,7 @@ VIR_ENUM_DECL(virDomainMemorySource) VIR_ENUM_DECL(virDomainMemoryAllocation) VIR_ENUM_DECL(virDomainIOMMUModel) VIR_ENUM_DECL(virDomainShmemModel) +VIR_ENUM_DECL(virDomainWatchcatBreed) /* from libvirt.h */ VIR_ENUM_DECL(virDomainState) VIR_ENUM_DECL(virDomainNostateReason) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 580e0f830..c75ce26eb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4978,6 +4978,7 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_NONE: case VIR_DOMAIN_DEVICE_LAST: break; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 37473ebf1..f789cbe92 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -851,6 +851,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: return 0; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bcc4936d..5ede1edb7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7734,6 +7734,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("live attach of device '%s' is not supported"), @@ -7833,6 +7834,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("live detach of device '%s' is not supported"), @@ -7969,6 +7971,7 @@ qemuDomainUpdateDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("live update of device '%s' is not supported"), @@ -8155,6 +8158,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent attach of device '%s' is not supported"), @@ -8338,6 +8342,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent detach of device '%s' is not supported"), @@ -8436,6 +8441,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent update of device '%s' is not supported"), diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 49af4d4ff..e8ba3e967 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4507,6 +4507,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: + case VIR_DOMAIN_DEVICE_WATCHCAT: case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("don't know how to remove a %s device"), diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1afb71f11..3bd08720b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2849,6 +2849,9 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainObjPrivatePtr priv = vm->privateData; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + if (vm->def->watchcat) + VIR_WARN("Meow!"); + /* Bring up netdevs before starting CPUs */ if (qemuInterfaceStartDevices(vm->def) < 0) goto cleanup; @@ -4190,6 +4193,8 @@ qemuProcessBeginJob(virQEMUDriverPtr driver, return -1; qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); + if (vm->def->watchcat) + VIR_WARN("purrr"); return 0; } diff --git a/tests/genericxml2xmlindata/watchcat.xml b/tests/genericxml2xmlindata/watchcat.xml new file mode 100644 index 000000000..daeebfa43 --- /dev/null +++ b/tests/genericxml2xmlindata/watchcat.xml @@ -0,0 +1,18 @@ +<domain type='qemu'> + <name>foo-fighters</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <watchcat breed='blue-swedish'/> + </devices> +</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index d8270a6ca..6438ab2a3 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -141,6 +141,8 @@ mymain(void) DO_TEST_FULL("cachetune-colliding-types", false, true, TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); + DO_TEST("watchcat"); + virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.13.6

1 0

[libvirt] [PATCH] Replace QEmu with QEMU
by Ján Tomko 31 Mar '18

31 Mar '18

QEMU is the preferred spelling used on QEMU website. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- docs/architecture.html.in | 18 +++++++++--------- docs/drvqemu.html.in | 4 ++-- docs/logging.html.in | 4 ++-- docs/schemas/domaincommon.rng | 2 +- src/network/bridge_driver.c | 6 +++--- src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/qemu.conf | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_driver.c | 8 ++++---- src/util/virhook.h | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/architecture.html.in b/docs/architecture.html.in index f1461ba88..5e5671661 100644 --- a/docs/architecture.html.in +++ b/docs/architecture.html.in @@ -46,18 +46,18 @@ connect to initialize the library. It will then fork a libvirt_proxy program running as root and providing read_only access to the API, this is then only useful for reporting and monitoring.</p> - <h2><a id="QEmu">QEmu and KVM support</a></h2> + <h2><a id="QEMU">QEMU and KVM support</a></h2> - <p>The model for QEmu and KVM is completely similar, basically KVM is based -on QEmu for the process controlling a new domain, only small details differs + <p>The model for QEMU and KVM is completely similar, basically KVM is based +on QEMU for the process controlling a new domain, only small details differs between the two. In both case the libvirt API is provided by a controlling process forked by libvirt in the background and which launch and control the -QEmu or KVM process. That program called libvirt_qemud talks though a specific -protocol to the library, and connects to the console of the QEmu process in +QEMU or KVM process. That program called libvirt_qemud talks though a specific +protocol to the library, and connects to the console of the QEMU process in order to control and report on its status. Libvirt tries to expose all the -emulations models of QEmu, the selection is done when creating the new +emulations models of QEMU, the selection is done when creating the new domain, by specifying the architecture and machine type targeted.</p> - <p>The code controlling the QEmu process is available in the + <p>The code controlling the QEMU process is available in the <code>qemud/</code> directory.</p> <h2><a id="drivers">Driver based architecture</a></h2> @@ -83,9 +83,9 @@ drivers present in driver.h:</p> is in the <code>proxy/</code> directory.</li> <li>xm_internal: provide support for Xen defined but not running domains.</li> - <li>qemu_internal: implement the driver functions for QEmu and + <li>qemu_internal: implement the driver functions for QEMU and KVM virtualization engines. It also uses a qemud/ specific daemon - which interacts with the QEmu process to implement libvirt API.</li> + which interacts with the QEMU process to implement libvirt API.</li> <li>test: this is a test driver useful for regression tests of the front-end part of libvirt.</li> </ul> diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index cb41b505d..cbd159da3 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -567,7 +567,7 @@ $ virsh domxml-to-native qemu-argv demo.xml </dl> <p>Example:</p><pre> <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> - <name>QEmu-fedora-i686</name> + <name>QEMU-fedora-i686</name> <memory>219200</memory> <os> <type arch='i686' machine='pc'>hvm</type> @@ -587,7 +587,7 @@ $ virsh domxml-to-native qemu-argv demo.xml <h3>QEMU emulated guest on x86_64</h3> <pre><domain type='qemu'> - <name>QEmu-fedora-i686</name> + <name>QEMU-fedora-i686</name> <uuid>c7a5fdbd-cdaf-9455-926a-d65c16db1809</uuid> <memory>219200</memory> <currentMemory>219200</currentMemory> diff --git a/docs/logging.html.in b/docs/logging.html.in index abedc1784..be2fd4ab5 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -30,7 +30,7 @@ the message is discarded, if higher the message is output. If no filter matches, then a general priority level is applied to all remaining messages. This allows, for example, capturing all - debug messages for the QEmu driver, but otherwise only allowing + debug messages for the QEMU driver, but otherwise only allowing errors to show up from other parts.</li> <li><b>log outputs</b>: once a message has gone through filtering a set of output defines where to send the message, they can also filter @@ -236,7 +236,7 @@ export LIBVIRT_LOG_OUTPUTS="1:file:virsh.log"</pre> what is happening and where things are going wrong, allowing to then put the correct breakpoints when running under a debugger.</p> <p>To activate full debug of the libvirt entry points, utility - functions and the QEmu/KVM driver, set:</p> + functions and the QEMU/KVM driver, set:</p> <pre>log_filters="1:libvirt 1:util 1:qemu" log_outputs="1:file:/var/log/libvirt/libvirtd.log"</pre> <p>in libvirtd.conf and restart the daemon will allow to diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8165e699d..a72c9190d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5821,7 +5821,7 @@  <define name="qemucmdline"> <element name="commandline" ns="http://libvirt.org/schemas/domain/qemu/1.0"> diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 898c94610..d326923d8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -649,7 +649,7 @@ networkMigrateStateFiles(virNetworkDriverStatePtr driver) /** * networkStateInitialize: * - * Initialization function for the QEmu daemon + * Initialization function for the QEMU daemon */ static int networkStateInitialize(bool privileged, @@ -814,7 +814,7 @@ networkStateAutoStart(void) /** * networkStateReload: * - * Function to restart the QEmu daemon, it will recheck the configuration + * Function to restart the QEMU daemon, it will recheck the configuration * files and update its state and the networking */ static int @@ -840,7 +840,7 @@ networkStateReload(void) /** * networkStateCleanup: * - * Shutdown the QEmu daemon, it will stop all active domains and networks + * Shutdown the QEMU daemon, it will stop all active domains and networks */ static int networkStateCleanup(void) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 717bce269..6cc7ca699 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -166,7 +166,7 @@ nwfilterDriverInstallDBusMatches(DBusConnection *sysbus ATTRIBUTE_UNUSED) /** * nwfilterStateInitialize: * - * Initialization function for the QEmu daemon + * Initialization function for the QEMU daemon */ static int nwfilterStateInitialize(bool privileged, diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 43dd561cc..07eab7eff 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -541,7 +541,7 @@ # If clear_emulator_capabilities is enabled, libvirt will drop all -# privileged capabilities of the QEmu/KVM emulator. This is enabled by +# privileged capabilities of the QEMU/KVM emulator. This is enabled by # default. # # Warning: Disabling this option means that a compromised guest can diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 89fd08b64..682d71441 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10009,7 +10009,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, /* * do not use boot=on for drives when not using KVM since this - * is not supported at all in upstream QEmu. + * is not supported at all in upstream QEMU. */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM) && (def->virtType == VIR_DOMAIN_VIRT_QEMU)) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bcc4936d..072eb54b4 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -600,7 +600,7 @@ qemuDomainFindMaxID(virDomainObjPtr vm, /** * qemuStateInitialize: * - * Initialization function for the QEmu daemon + * Initialization function for the QEMU daemon */ static int qemuStateInitialize(bool privileged, @@ -951,7 +951,7 @@ qemuStateInitialize(bool privileged, /** * qemuStateAutoStart: * - * Function to auto start the QEmu daemons + * Function to auto start the QEMU daemons */ static void qemuStateAutoStart(void) @@ -978,7 +978,7 @@ static void qemuNotifyLoadDomain(virDomainObjPtr vm, int newVM, void *opaque) /** * qemuStateReload: * - * Function to restart the QEmu daemon, it will recheck the configuration + * Function to restart the QEMU daemon, it will recheck the configuration * files and update its state and the networking */ static int @@ -1069,7 +1069,7 @@ qemuStateStop(void) /** * qemuStateCleanup: * - * Shutdown the QEmu daemon, it will stop all active domains and networks + * Shutdown the QEMU daemon, it will stop all active domains and networks */ static int qemuStateCleanup(void) diff --git a/src/util/virhook.h b/src/util/virhook.h index 205249c55..00544c96f 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -28,7 +28,7 @@ typedef enum { VIR_HOOK_DRIVER_DAEMON = 0, /* Daemon related events */ - VIR_HOOK_DRIVER_QEMU, /* QEmu domains related events */ + VIR_HOOK_DRIVER_QEMU, /* QEMU domains related events */ VIR_HOOK_DRIVER_LXC, /* LXC domains related events */ VIR_HOOK_DRIVER_NETWORK, /* network related events */ VIR_HOOK_DRIVER_LIBXL, /* Xen libxl domains related events */ -- 2.13.6

2 1

[libvirt] [dbus PATCH v2 0/5] New APIs and Domain Lifecycle signal change
by Katerina Koukiou 31 Mar '18

31 Mar '18

* Implemented Suspend and Resume APIs. * Reused virsh functions for taking the Event Strings names from ENUM. * Merged all Domain Lifecycle events signals into one signal. Katerina Koukiou (5): Implement Suspend method for Domain interface. Implement Resume method for Domain interface. utils: Introduce functions and macros for translating ENUMs to strings events: Introduce virtDBusEventsDomainEventToString function Merge all Domain lifecycle signals into one signal called Domain. data/org.libvirt.Connect.xml | 54 +++------------------------------------- data/org.libvirt.Domain.xml | 8 ++++++ src/domain.c | 42 +++++++++++++++++++++++++++++++ src/events.c | 59 +++++++++++++++++--------------------------- src/events.h | 3 +++ src/util.c | 27 ++++++++++++++++++++ src/util.h | 29 ++++++++++++++++++++++ test/test_connect.py | 10 +++----- test/test_domain.py | 40 +++++++++++++++++++++++++----- 9 files changed, 172 insertions(+), 100 deletions(-) -- 2.15.0

2 7