- Devel - libvirt List Archives

[libvirt] [PATCH 00/20] Rework/rename virDomainObjListFindBy{UUID|ID}Ref
by John Ferlan 30 Mar '18

30 Mar '18

First, don't be scared off by 20 patches... They're not that difficult. Second, don't be scared off by the all the various code touched. Third, look at all the lines of code being removed! That's unlike my normal patch series! This is really the end game of what I started last year trying to make object access code to be "more common". The last and worse is/was the domain object code which really has a mish-mash of usage models and is (to say the least) confusing depending on the algorithm chosen (ByRef or not). This series focuses on the various virDomainObjListFindBy* APIs to do common things *and* allows the callers to use the common virDomainObjEndAPI when done with the object rather than needing to know whether they should virObjectUnlock and/or virObjectUnref. There were one consumer (libxl) that leaked domain objs because there was no Unref after a Ref on many API's. Additionally, there was a possibility of a deadlock because of a missed Unlock. This reduces a lot of code and reduces the number of virObjectUnlock consumers. Now *obviously* I don't have all these domain types available, but since the goal was to remove the FindBy*Ref APIs, I had to touch much more than I really want to. Of course only a couple are really active anyway and I'm hoping they'll take a peek at their modules (e.g. libxl, vz, and bhyve in particular). Once/if this can get accomplished, fixing the Add and Remove API's is the next task. Those are (to say the least) *really* confusing because the caller should never have to call virObjectRef afterwards, but some do because virDomainObjListAddLocked doesn't make enough references on the obj (places the object in 2 lists, but only accounts for 1). Lots of consumers that have to roll their own "adjustments" because of that. John Ferlan (20): bhyve: Use virDomainObjListFindBy{UUID|ID}Ref libxl: Fix possible deadlock in libxlDomainMigrateBegin3Params libxl: Properly cleanup after libxlDomObjFromDomain libxl: Use virDomainObjListFindBy{UUID|ID}Ref openvz: Cleanup indention openvz: Create accessors to virDomainObjListFindByUUID openvz: Add more descriptive error message on Find failure openvz: Use virDomainObjListFindBy{UUID|ID}Ref uml: Create accessors to virDomainObjListFindByUUID uml: Add more specific error message on failed FindBy call uml: Use virDomainObjListFindBy{UUID|ID}Ref vmware: Create accessors to virDomainObjListFindByUUID vmware: Add more descriptive error message on Find failure vmware: Properly clean up in vmwareDomainLookupByName vmware: Use virDomainObjListFindBy{UUID|ID}Ref vz: Unify vzDomObjFromDomain{Ref} vz: Use virDomainObjListFindBy{UUID|ID}Ref test: Use virDomainObjListFindByUUIDRef conf: Rework/rename virDomainObjListFindByUUIDRef conf: Rework/rename virDomainObjListFindByIDRef src/bhyve/bhyve_driver.c | 52 ++---- src/conf/virdomainobjlist.c | 66 ++------ src/conf/virdomainobjlist.h | 4 - src/libvirt_private.syms | 2 - src/libxl/libxl_domain.c | 2 +- src/libxl/libxl_driver.c | 99 ++++------- src/libxl/libxl_migration.c | 3 +- src/lxc/lxc_driver.c | 7 +- src/openvz/openvz_driver.c | 392 ++++++++++++++----------------------------- src/qemu/qemu_driver.c | 9 +- src/test/test_driver.c | 8 +- src/uml/uml_driver.c | 327 +++++++++++------------------------- src/util/virclosecallbacks.c | 4 +- src/vmware/vmware_driver.c | 234 +++++++++----------------- src/vz/vz_driver.c | 117 +++++++------ src/vz/vz_sdk.c | 13 +- src/vz/vz_utils.c | 34 +--- src/vz/vz_utils.h | 1 - 18 files changed, 458 insertions(+), 916 deletions(-) -- 2.13.6

3 38

[libvirt] [PATCH 0/8] Move the minimum QEMU version closer to 1.3.0
by Ján Tomko 30 Mar '18

30 Mar '18

1.3.0 was released in December 2012, it merged KVM and QEMU and is above our 1.2.0 requirement for QMP capability probing. Ján Tomko (8): virQEMUCapsParseHelpStr: remove unused check_yajl parameter Mandate QEMU >= 0.15.0 Deprecate QEMU_CAPS_PCI_MULTIFUNCTION Deprecate QEMU_CAPS_NETDEV Clean up qemuDomainAttachNetDevice Remove unused qemuDomainNetVLAN Remove qemuDomainSupportsNetdev Deprecate QEMU_CAPS_MONITOR_JSON src/qemu/qemu_capabilities.c | 62 +----- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_capspriv.h | 1 - src/qemu/qemu_command.c | 41 +--- src/qemu/qemu_domain.c | 16 -- src/qemu/qemu_domain.h | 6 - src/qemu/qemu_driver.c | 18 +- src/qemu/qemu_hotplug.c | 138 +++--------- src/qemu/qemu_interface.c | 2 +- src/qemu/qemu_process.c | 8 +- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 3 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 3 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 3 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 3 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 3 - tests/qemuhelpdata/qemu-0.12.1 | 198 ----------------- tests/qemuhelpdata/qemu-0.12.1-device | 62 ------ 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/qemuhelptest.c | 130 +---------- .../aarch64-aavmf-virtio-mmio.args | 6 +- tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +- .../qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +- tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 6 +- tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 2 +- tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +- tests/qemuxml2argvdata/aarch64-pci-serial.args | 2 +- .../aarch64-usb-controller-nec-xhci.args | 2 +- .../aarch64-usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/aarch64-video-default.args | 2 +- .../aarch64-video-virtio-gpu-pci.args | 8 +- .../aarch64-virt-2.6-virtio-pci-default.args | 7 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 6 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 6 +- .../aarch64-virtio-pci-default.args | 7 +- .../aarch64-virtio-pci-manual-addresses.args | 12 +- tests/qemuxml2argvdata/acpi-table.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 2 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 6 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 6 +- tests/qemuxml2argvdata/autoindex.args | 2 +- tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-auto.args | 2 +- .../balloon-device-deflate-off.args | 2 +- tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +- tests/qemuxml2argvdata/balloon-device-period.args | 2 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/balloon-mmio-deflate.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram.args | 2 +- tests/qemuxml2argvdata/bios.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-group-num.args | 2 +- .../qemuxml2argvdata/blkdeviotune-max-length.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-max.args | 2 +- tests/qemuxml2argvdata/blkdeviotune.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/boot-cdrom.args | 2 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 13 +- tests/qemuxml2argvdata/boot-complex.args | 12 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +- tests/qemuxml2argvdata/boot-floppy.args | 2 +- .../boot-menu-disable-drive-bootindex.args | 2 +- .../qemuxml2argvdata/boot-menu-disable-drive.args | 2 +- tests/qemuxml2argvdata/boot-menu-disable.args | 2 +- .../boot-menu-enable-bootindex.args | 2 +- .../boot-menu-enable-with-timeout.args | 2 +- tests/qemuxml2argvdata/boot-menu-enable.args | 2 +- tests/qemuxml2argvdata/boot-multi.args | 2 +- tests/qemuxml2argvdata/boot-network.args | 2 +- tests/qemuxml2argvdata/boot-order.args | 8 +- tests/qemuxml2argvdata/boot-strict.args | 13 +- tests/qemuxml2argvdata/bootindex-floppy-q35.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc-old.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +- tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +- .../channel-virtio-autoassign.args | 2 +- tests/qemuxml2argvdata/channel-virtio-default.args | 2 +- tests/qemuxml2argvdata/channel-virtio-state.args | 2 +- tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- .../clock-localtime-basis-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/console-compat-auto.args | 2 +- tests/qemuxml2argvdata/console-compat-chardev.args | 2 +- tests/qemuxml2argvdata/console-compat.args | 2 +- tests/qemuxml2argvdata/console-sclp.args | 2 +- tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/console-virtio-many.args | 2 +- tests/qemuxml2argvdata/console-virtio-s390.args | 2 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/controller-order.args | 7 +- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable2.args | 2 +- tests/qemuxml2argvdata/cpu-cache-disable3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 2 +- tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +- .../qemuxml2argvdata/cpu-check-default-none2.args | 2 +- .../cpu-check-default-partial.args | 2 +- .../cpu-check-default-partial2.args | 2 +- tests/qemuxml2argvdata/cpu-check-none.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../qemuxml2argvdata/cpu-host-model-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +- tests/qemuxml2argvdata/cpu-hotplug-startup.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +- tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +- .../cpu-numa-no-memory-element.args | 2 +- tests/qemuxml2argvdata/cpu-numa1.args | 2 +- tests/qemuxml2argvdata/cpu-numa2.args | 2 +- tests/qemuxml2argvdata/cpu-s390-features.args | 2 +- tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- tests/qemuxml2argvdata/cpu-topology1.args | 2 +- tests/qemuxml2argvdata/cpu-topology2.args | 2 +- tests/qemuxml2argvdata/cpu-topology3.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- tests/qemuxml2argvdata/cputune-numatune.args | 2 +- tests/qemuxml2argvdata/cputune-zero-shares.args | 2 +- tests/qemuxml2argvdata/cputune.args | 2 +- tests/qemuxml2argvdata/debug-threads.args | 2 +- tests/qemuxml2argvdata/default-kvm-host-arch.args | 2 +- tests/qemuxml2argvdata/default-qemu-host-arch.args | 2 +- tests/qemuxml2argvdata/disk-aio.args | 2 +- tests/qemuxml2argvdata/disk-blockio.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-empty.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-network-ftp.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-ftps.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-http.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-https.args | 2 +- .../qemuxml2argvdata/disk-cdrom-network-tftp.args | 2 +- .../disk-cdrom-tray-no-device-cap.args | 2 +- tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.args | 2 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 8 +- tests/qemuxml2argvdata/disk-drive-boot-cdrom.args | 2 +- tests/qemuxml2argvdata/disk-drive-boot-disk.args | 2 +- .../disk-drive-cache-directsync.args | 2 +- .../qemuxml2argvdata/disk-drive-cache-unsafe.args | 2 +- .../qemuxml2argvdata/disk-drive-cache-v2-none.args | 2 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wb.args | 2 +- tests/qemuxml2argvdata/disk-drive-cache-v2-wt.args | 2 +- .../qemuxml2argvdata/disk-drive-copy-on-read.args | 2 +- .../qemuxml2argvdata/disk-drive-detect-zeroes.args | 2 +- tests/qemuxml2argvdata/disk-drive-discard.args | 2 +- tests/qemuxml2argvdata/disk-drive-fmt-qcow.args | 2 +- .../disk-drive-network-gluster.args | 2 +- .../disk-drive-network-iscsi-auth.args | 2 +- .../disk-drive-network-iscsi-lun.args | 2 +- .../qemuxml2argvdata/disk-drive-network-iscsi.args | 2 +- .../disk-drive-network-nbd-export.args | 2 +- .../disk-drive-network-nbd-ipv6-export.args | 2 +- .../disk-drive-network-nbd-ipv6.args | 2 +- .../disk-drive-network-nbd-unix.args | 2 +- tests/qemuxml2argvdata/disk-drive-network-nbd.args | 2 +- .../disk-drive-network-rbd-auth-AES.args | 2 +- .../disk-drive-network-rbd-auth.args | 2 +- .../disk-drive-network-rbd-ipv6.args | 2 +- tests/qemuxml2argvdata/disk-drive-network-rbd.args | 2 +- .../disk-drive-network-sheepdog.args | 2 +- .../disk-drive-network-source-auth.args | 2 +- .../disk-drive-network-tlsx509-vxhs.args | 2 +- .../qemuxml2argvdata/disk-drive-network-vxhs.args | 2 +- tests/qemuxml2argvdata/disk-drive-no-boot.args | 2 +- .../qemuxml2argvdata/disk-drive-readonly-disk.args | 2 +- .../disk-drive-readonly-no-device.args | 2 +- .../disk-drive-shared-locking.args | 2 +- tests/qemuxml2argvdata/disk-drive-shared.args | 2 +- .../disk-floppy-tray-no-device-cap.args | 2 +- tests/qemuxml2argvdata/disk-floppy-tray.args | 2 +- tests/qemuxml2argvdata/disk-floppy.args | 2 +- tests/qemuxml2argvdata/disk-geometry.args | 2 +- .../disk-hostdev-scsi-virtio-iscsi-auth-AES.args | 2 +- tests/qemuxml2argvdata/disk-ide-drive-split.args | 2 +- tests/qemuxml2argvdata/disk-ide-wwn.args | 2 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 6 +- tests/qemuxml2argvdata/disk-iscsi.args | 2 +- .../qemuxml2argvdata/disk-many-format-probing.args | 2 +- tests/qemuxml2argvdata/disk-many.args | 2 +- tests/qemuxml2argvdata/disk-order.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.args | 2 +- tests/qemuxml2argvdata/disk-scsi-device-auto.args | 2 +- tests/qemuxml2argvdata/disk-scsi-device.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-split.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 2 +- .../disk-scsi-lun-passthrough.args | 2 +- tests/qemuxml2argvdata/disk-scsi-megasas.args | 2 +- tests/qemuxml2argvdata/disk-scsi-mptsas1068.args | 2 +- tests/qemuxml2argvdata/disk-scsi-virtio-scsi.args | 2 +- tests/qemuxml2argvdata/disk-scsi-vscsi.args | 2 +- tests/qemuxml2argvdata/disk-serial.args | 2 +- tests/qemuxml2argvdata/disk-snapshot.args | 2 +- tests/qemuxml2argvdata/disk-source-pool-mode.args | 2 +- tests/qemuxml2argvdata/disk-source-pool.args | 2 +- .../disk-usb-device-removable.args | 2 +- tests/qemuxml2argvdata/disk-usb-device.args | 2 +- tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 2 +- tests/qemuxml2argvdata/disk-virtio-ccw.args | 2 +- .../qemuxml2argvdata/disk-virtio-drive-queues.args | 2 +- tests/qemuxml2argvdata/disk-virtio-s390.args | 2 +- tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args | 2 +- .../disk-virtio-scsi-cmd_per_lun.args | 2 +- .../disk-virtio-scsi-ioeventfd.args | 2 +- .../disk-virtio-scsi-max_sectors.args | 2 +- .../disk-virtio-scsi-num_queues.args | 2 +- tests/qemuxml2argvdata/disk-virtio.args | 2 +- tests/qemuxml2argvdata/encrypted-disk-usage.args | 2 +- tests/qemuxml2argvdata/encrypted-disk.args | 2 +- tests/qemuxml2argvdata/eoi-disabled.args | 2 +- tests/qemuxml2argvdata/eoi-enabled.args | 2 +- tests/qemuxml2argvdata/event_idx.args | 8 +- .../fd-memory-no-numa-topology.args | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology.args | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +- .../qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +- tests/qemuxml2argvdata/fips-enabled.args | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.args | 2 +- tests/qemuxml2argvdata/fs9p-ccw.args | 2 +- tests/qemuxml2argvdata/fs9p.args | 2 +- .../qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- .../graphics-spice-agent-file-xfer.args | 2 +- .../graphics-spice-agentmouse.args | 2 +- .../graphics-spice-auto-socket-cfg.args | 2 +- .../graphics-spice-auto-socket.args | 2 +- .../graphics-spice-compression.args | 2 +- tests/qemuxml2argvdata/graphics-spice-no-args.args | 2 +- tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 2 +- tests/qemuxml2argvdata/graphics-spice-sasl.args | 2 +- tests/qemuxml2argvdata/graphics-spice-socket.args | 2 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 7 +- .../qemuxml2argvdata/graphics-spice-usb-redir.args | 2 +- tests/qemuxml2argvdata/graphics-spice.args | 2 +- .../graphics-vnc-auto-socket-cfg.args | 2 +- .../qemuxml2argvdata/graphics-vnc-auto-socket.args | 2 +- .../graphics-vnc-no-listen-attr.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-none.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-policy.args | 2 +- .../graphics-vnc-remove-generated-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.args | 2 +- .../graphics-vnc-socket-new-cmdline.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-socket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-websocket.args | 2 +- tests/qemuxml2argvdata/graphics-vnc.args | 2 +- .../qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +- .../hostdev-pci-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-pci-address.args | 2 +- .../hostdev-scsi-lsi-iscsi-auth.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-readonly.args | 2 +- .../hostdev-scsi-vhost-scsi-ccw.args | 2 +- .../hostdev-scsi-vhost-scsi-pci.args | 2 +- .../hostdev-scsi-vhost-scsi-pcie.args | 2 +- .../hostdev-scsi-virtio-iscsi-auth.args | 2 +- .../hostdev-scsi-virtio-iscsi.args | 2 +- .../qemuxml2argvdata/hostdev-scsi-virtio-scsi.args | 2 +- .../hostdev-usb-address-device-boot.args | 2 +- .../hostdev-usb-address-device.args | 2 +- tests/qemuxml2argvdata/hostdev-usb-address.args | 2 +- .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hotplug-base.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess.args | 2 +- tests/qemuxml2argvdata/hugepages-memaccess2.args | 2 +- tests/qemuxml2argvdata/hugepages-numa.args | 2 +- tests/qemuxml2argvdata/hugepages-pages.args | 2 +- tests/qemuxml2argvdata/hugepages-pages2.args | 2 +- tests/qemuxml2argvdata/hugepages-pages3.args | 2 +- tests/qemuxml2argvdata/hugepages-pages5.args | 2 +- tests/qemuxml2argvdata/hugepages-pages6.args | 2 +- tests/qemuxml2argvdata/hugepages-pages7.args | 2 +- tests/qemuxml2argvdata/hugepages-shared.args | 2 +- tests/qemuxml2argvdata/hugepages.args | 2 +- tests/qemuxml2argvdata/hyperv-off.args | 2 +- tests/qemuxml2argvdata/hyperv-panic.args | 2 +- tests/qemuxml2argvdata/hyperv.args | 2 +- tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 7 +- .../qemuxml2argvdata/intel-iommu-device-iotlb.args | 2 +- tests/qemuxml2argvdata/intel-iommu-eim.args | 2 +- tests/qemuxml2argvdata/intel-iommu-machine.args | 2 +- tests/qemuxml2argvdata/intel-iommu.args | 2 +- .../iothreads-disk-virtio-ccw.args | 2 +- tests/qemuxml2argvdata/iothreads-disk.args | 2 +- tests/qemuxml2argvdata/iothreads-ids-partial.args | 2 +- tests/qemuxml2argvdata/iothreads-ids.args | 2 +- .../iothreads-virtio-scsi-ccw.args | 2 +- .../iothreads-virtio-scsi-pci.args | 2 +- tests/qemuxml2argvdata/iothreads.args | 2 +- tests/qemuxml2argvdata/kvm-features-off.args | 2 +- tests/qemuxml2argvdata/kvm-features.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvm.args | 2 +- tests/qemuxml2argvdata/kvmclock+eoi-disabled.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- tests/qemuxml2argvdata/luks-disks-source.args | 2 +- tests/qemuxml2argvdata/luks-disks.args | 2 +- .../qemuxml2argvdata/mach-virt-console-virtio.args | 2 +- .../qemuxml2argvdata/mach-virt-serial-native.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-pci.args | 2 +- tests/qemuxml2argvdata/mach-virt-serial-usb.args | 2 +- .../machine-aeskeywrap-off-cap.args | 2 +- .../machine-aeskeywrap-off-caps.args | 2 +- .../machine-aeskeywrap-on-cap.args | 2 +- .../machine-aeskeywrap-on-caps.args | 2 +- tests/qemuxml2argvdata/machine-aliases1.args | 2 +- tests/qemuxml2argvdata/machine-aliases2.args | 2 +- tests/qemuxml2argvdata/machine-core-cfg-off.args | 2 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- .../machine-deakeywrap-off-cap.args | 2 +- .../machine-deakeywrap-off-caps.args | 2 +- .../machine-deakeywrap-on-cap.args | 2 +- .../machine-deakeywrap-on-caps.args | 2 +- .../machine-keywrap-none-caps.args | 2 +- tests/qemuxml2argvdata/machine-keywrap-none.args | 2 +- .../machine-loadparm-multiple-disks-nets-s390.args | 13 +- .../machine-loadparm-net-s390.args | 8 +- tests/qemuxml2argvdata/machine-loadparm-s390.args | 2 +- tests/qemuxml2argvdata/machine-smm-opt.args | 2 +- tests/qemuxml2argvdata/machine-usb-opt.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/master-key.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm-addr.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- .../memory-hotplug-nvdimm-access.args | 2 +- .../memory-hotplug-nvdimm-label.args | 2 +- tests/qemuxml2argvdata/memory-hotplug-nvdimm.args | 2 +- .../memory-hotplug-ppc64-nonuma.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/migrate-numa-unaligned.args | 2 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/minimal-msg-timestamp.args | 2 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-no-reboot.args | 2 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/mlock-off.args | 2 +- tests/qemuxml2argvdata/mlock-on.args | 2 +- tests/qemuxml2argvdata/mlock-unsupported.args | 2 +- .../qemuxml2argvdata/multifunction-pci-device.args | 2 +- tests/qemuxml2argvdata/name-escape.args | 2 +- tests/qemuxml2argvdata/net-client.args | 7 +- tests/qemuxml2argvdata/net-eth-hostip.args | 7 +- tests/qemuxml2argvdata/net-eth-ifname.args | 7 +- tests/qemuxml2argvdata/net-eth-names.args | 11 +- tests/qemuxml2argvdata/net-eth.args | 7 +- .../qemuxml2argvdata/net-hostdev-multidomain.args | 2 +- .../net-hostdev-vfio-multidomain.args | 2 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/net-hostdev.args | 2 +- tests/qemuxml2argvdata/net-mcast.args | 7 +- tests/qemuxml2argvdata/net-server.args | 7 +- tests/qemuxml2argvdata/net-udp.args | 8 +- tests/qemuxml2argvdata/net-user-addr.args | 2 +- tests/qemuxml2argvdata/net-user.args | 7 +- tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 12 +- tests/qemuxml2argvdata/net-virtio-device.args | 8 +- .../net-virtio-disable-offloads.args | 6 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 8 +- tests/qemuxml2argvdata/net-virtio-s390.args | 6 +- tests/qemuxml2argvdata/net-virtio.args | 7 +- tests/qemuxml2argvdata/no-kvm-pit-device.args | 2 +- tests/qemuxml2argvdata/nographics-display.args | 2 +- tests/qemuxml2argvdata/nographics-vga.args | 2 +- tests/qemuxml2argvdata/nographics.args | 2 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- ...d-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-static-memory-auto-vcpu.args | 2 +- tests/qemuxml2argvdata/numad.args | 2 +- .../numatune-auto-nodeset-invalid.args | 2 +- tests/qemuxml2argvdata/numatune-auto-prefer.args | 2 +- tests/qemuxml2argvdata/numatune-distances.args | 2 +- .../numatune-memnode-no-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memnode.args | 2 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/panic-double.args | 2 +- tests/qemuxml2argvdata/panic-no-address.args | 2 +- tests/qemuxml2argvdata/panic.args | 2 +- .../qemuxml2argvdata/parallel-parport-chardev.args | 2 +- tests/qemuxml2argvdata/parallel-tcp-chardev.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 153 +++++++------ tests/qemuxml2argvdata/pci-expander-bus.args | 153 +++++++------ tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-rom.args | 14 +- tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 157 +++++++------ .../pcie-root-port-model-generic.args | 2 +- .../pcie-root-port-model-ioh3420.args | 2 +- tests/qemuxml2argvdata/pcie-root-port.args | 2 +- tests/qemuxml2argvdata/pcie-root.args | 2 +- .../pcie-switch-downstream-port.args | 2 +- .../pcie-switch-upstream-port.args | 2 +- tests/qemuxml2argvdata/pcihole64-q35.args | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pmu-feature-off.args | 2 +- tests/qemuxml2argvdata/pmu-feature.args | 2 +- tests/qemuxml2argvdata/ppc-dtb.args | 2 +- .../ppc64-usb-controller-legacy.args | 2 +- .../ppc64-usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/ppc64-usb-controller.args | 2 +- tests/qemuxml2argvdata/ppce500-serial.args | 2 +- tests/qemuxml2argvdata/pseries-basic.args | 2 +- tests/qemuxml2argvdata/pseries-console-virtio.args | 2 +- .../pseries-cpu-compat-power9.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +- tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +- tests/qemuxml2argvdata/pseries-features.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-1.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-2.args | 2 +- tests/qemuxml2argvdata/pseries-hostdevs-3.args | 2 +- .../pseries-machine-max-cpu-compat.args | 2 +- tests/qemuxml2argvdata/pseries-many-buses-1.args | 2 +- tests/qemuxml2argvdata/pseries-many-buses-2.args | 2 +- tests/qemuxml2argvdata/pseries-many-devices.args | 2 +- tests/qemuxml2argvdata/pseries-nvram.args | 2 +- tests/qemuxml2argvdata/pseries-panic-missing.args | 2 +- .../qemuxml2argvdata/pseries-panic-no-address.args | 2 +- .../pseries-phb-default-missing.args | 2 +- tests/qemuxml2argvdata/pseries-phb-numa-node.args | 2 +- tests/qemuxml2argvdata/pseries-phb-simple.args | 2 +- tests/qemuxml2argvdata/pseries-serial-native.args | 2 +- tests/qemuxml2argvdata/pseries-serial-pci.args | 2 +- tests/qemuxml2argvdata/pseries-serial-usb.args | 2 +- tests/qemuxml2argvdata/pseries-usb-default.args | 2 +- tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +- tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +- .../pseries-vio-user-assigned.args | 2 +- tests/qemuxml2argvdata/pseries-vio.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-disabled.args | 2 +- tests/qemuxml2argvdata/pv-spinlock-enabled.args | 2 +- tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +- .../qemuxml2argvdata/q35-default-devices-only.args | 2 +- tests/qemuxml2argvdata/q35-multifunction.args | 2 +- tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +- tests/qemuxml2argvdata/q35-pci-force-address.args | 7 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +- tests/qemuxml2argvdata/q35-pcie.args | 2 +- .../qemuxml2argvdata/q35-pm-disable-fallback.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +- tests/qemuxml2argvdata/q35-usb2.args | 2 +- tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +- tests/qemuxml2argvdata/q35.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +- tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- .../qemu-ns-domain-commandline.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemu-ns.args | 2 +- .../qemuxml2argvdata/reboot-timeout-disabled.args | 2 +- tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- .../s390-allow-bogus-usb-controller.args | 2 +- .../s390-allow-bogus-usb-none.args | 2 +- tests/qemuxml2argvdata/s390-panic-missing.args | 2 +- tests/qemuxml2argvdata/s390-panic-no-address.args | 2 +- tests/qemuxml2argvdata/s390-serial-2.args | 2 +- tests/qemuxml2argvdata/s390-serial-console.args | 2 +- tests/qemuxml2argvdata/s390-serial.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- .../seclabel-dynamic-baselabel.args | 2 +- .../seclabel-dynamic-labelskip.args | 2 +- .../seclabel-dynamic-override.args | 2 +- .../qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- .../seclabel-static-labelskip.args | 2 +- .../qemuxml2argvdata/seclabel-static-relabel.args | 2 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- .../serial-dev-chardev-iobase.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-chardev.args | 2 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- tests/qemuxml2argvdata/serial-many-chardev.args | 2 +- tests/qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../qemuxml2argvdata/serial-spiceport-nospice.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- tests/qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-telnet-chardev.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- .../serial-tcp-tlsx509-chardev.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- tests/qemuxml2argvdata/serial-udp-chardev.args | 2 +- tests/qemuxml2argvdata/serial-unix-chardev.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +- tests/qemuxml2argvdata/shmem.args | 2 +- tests/qemuxml2argvdata/smartcard-controller.args | 2 +- .../smartcard-host-certificates.args | 2 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-tcp.args | 2 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/sound-device.args | 2 +- tests/qemuxml2argvdata/sound.args | 2 +- tests/qemuxml2argvdata/tpm-passthrough.args | 2 +- .../usb-controller-default-q35.args | 2 +- .../usb-controller-explicit-q35.args | 2 +- .../qemuxml2argvdata/usb-controller-qemu-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-none.args | 2 +- tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +- tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- .../qemuxml2argvdata/usb-redir-filter-version.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases.args | 20 +- tests/qemuxml2argvdata/vcpu-placement-static.args | 2 +- .../video-device-pciaddr-default.args | 2 +- .../qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-qxl-nodevice.args | 2 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +- .../video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- .../qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-vga-nodevice.args | 2 +- tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 2 +- .../qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- .../video-virtio-gpu-secondary.args | 2 +- .../video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- .../qemuxml2argvdata/virtio-input-passthrough.args | 2 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-lun.args | 7 +- tests/qemuxml2argvdata/virtio-options.args | 8 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvdata/watchdog-device.args | 2 +- tests/qemuxml2argvdata/watchdog-diag288.args | 2 +- tests/qemuxml2argvdata/watchdog-dump.args | 2 +- tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +- tests/qemuxml2argvdata/watchdog.args | 2 +- tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +- tests/qemuxml2argvtest.c | 90 ++------ tests/qemuxml2xmltest.c | 35 +-- 648 files changed, 1097 insertions(+), 2336 deletions(-) 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-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 -- 2.16.1

1 9

[libvirt] [PATCH] qemu_monitor_json: Properly check "return" type
by Jiri Denemark 29 Mar '18

29 Mar '18

My commit 2e0d6cdec41 claimed qemuMonitorJSONCheckError guarantees "return" object exists in the JSON reply. But it only makes sure the key is there, while the type of the value is not checked. A lot of callers do not care since they only want to see whether their QMP command failed or not, but any caller which needs to read some data from the reply wants to make sure the correct data type was returned. This patch adds a new API called qemuMonitorJSONCheckReply which calls qemuMonitorJSONCheckError and checks "return" contains a value of the specified type. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor_json.c | 261 ++++++++++++++++++------------------------- 1 file changed, 108 insertions(+), 153 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index d80c4f18d1..b251fc9964 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -413,6 +413,36 @@ qemuMonitorJSONCheckError(virJSONValuePtr cmd, } +static int +qemuMonitorJSONCheckReply(virJSONValuePtr cmd, + virJSONValuePtr reply, + virJSONType type) +{ + virJSONValuePtr data; + + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + return -1; + + data = virJSONValueObjectGet(reply, "return"); + if (data->type != type) { + char *cmdstr = virJSONValueToString(cmd, false); + char *retstr = virJSONValueToString(data, false); + + VIR_DEBUG("Unexpected return type %d (expecting %d) for command %s: %s", + data->type, type, cmdstr, retstr); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected type returned by QEMU command '%s'"), + qemuMonitorJSONCommandName(cmd)); + + VIR_FREE(cmdstr); + VIR_FREE(retstr); + return -1; + } + + return 0; +} + + static bool qemuMonitorJSONErrorIsClass(virJSONValuePtr error, const char *klass) @@ -1389,7 +1419,7 @@ qemuMonitorJSONGetStatus(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1616,7 +1646,7 @@ int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1777,7 +1807,7 @@ qemuMonitorJSONGetBalloonInfo(qemuMonitorPtr mon, } /* See if any other fatal error occurred */ - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1878,7 +1908,7 @@ int qemuMonitorJSONGetMemoryStats(qemuMonitorPtr mon, } } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -1956,14 +1986,10 @@ qemuMonitorJSONQueryBlock(qemuMonitorPtr mon) return NULL; if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0 || - qemuMonitorJSONCheckError(cmd, reply) < 0) + qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(devices = virJSONValueObjectStealArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-block reply was missing device list")); - goto cleanup; - } + devices = virJSONValueObjectStealArray(reply, "return"); cleanup: virJSONValueFree(cmd); @@ -2163,14 +2189,10 @@ qemuMonitorJSONQueryBlockstats(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(ret = virJSONValueObjectStealArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-blockstats reply was missing device list")); - goto cleanup; - } + ret = virJSONValueObjectStealArray(reply, "return"); cleanup: virJSONValueFree(cmd); @@ -2705,13 +2727,12 @@ qemuMonitorJSONGetMigrationCacheSize(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_NUMBER) < 0) goto cleanup; if (virJSONValueObjectGetNumberUlong(reply, "return", cacheSize) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-migrate-cache-size reply was missing " - "'return' data")); + _("invalid cache size in query-migrate-cache-size reply")); goto cleanup; } @@ -2773,7 +2794,7 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; result = virJSONValueObjectGet(reply, "return"); @@ -3133,7 +3154,7 @@ int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; if (qemuMonitorJSONGetMigrationStatsReply(reply, stats, error) < 0) @@ -3225,7 +3246,7 @@ qemuMonitorJSONQueryDump(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; result = virJSONValueObjectGetObject(reply, "return"); @@ -3262,7 +3283,7 @@ qemuMonitorJSONGetDumpGuestMemoryCapability(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; caps = virJSONValueObjectGetObject(reply, "return"); @@ -3434,7 +3455,7 @@ qemuMonitorJSONAddFd(qemuMonitorPtr mon, int fdset, int fd, const char *name) ret = -2; goto cleanup; } - ret = qemuMonitorJSONCheckError(cmd, reply); + ret = qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT); } if (ret == 0) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); @@ -3561,11 +3582,8 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, if (!fil) goto cleanup; - if (!(returnArray = virJSONValueObjectGetArray(msg, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-rx-filter reply was missing return data")); - goto cleanup; - } + returnArray = virJSONValueObjectGetArray(msg, "return"); + if (!(entry = virJSONValueArrayGet(returnArray, 0))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("query -rx-filter return data missing array element")); @@ -3739,7 +3757,7 @@ qemuMonitorJSONQueryRxFilter(qemuMonitorPtr mon, const char *alias, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; if (qemuMonitorJSONQueryRxFilterParse(reply, filter) < 0) @@ -3776,11 +3794,7 @@ qemuMonitorJSONExtractChardevInfo(virJSONValuePtr reply, size_t i; qemuMonitorChardevInfoPtr entry = NULL; - if (!(data = virJSONValueObjectGetArray(reply, "return"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("character device reply was missing return data")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); for (i = 0; i < virJSONValueArraySize(data); i++) { virJSONValuePtr chardev = virJSONValueArrayGet(data, i); @@ -3857,7 +3871,7 @@ qemuMonitorJSONGetChardevInfo(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; ret = qemuMonitorJSONExtractChardevInfo(reply, info); @@ -5035,7 +5049,7 @@ int qemuMonitorJSONGetVersion(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -5101,15 +5115,11 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-machines reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(infolist, n + 1) < 0) @@ -5206,15 +5216,11 @@ qemuMonitorJSONGetCPUDefinitions(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-cpu-definitions reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); if (VIR_ALLOC_N(cpulist, n) < 0) goto cleanup; @@ -5411,7 +5417,7 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -5494,15 +5500,11 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-commands reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(commandlist, n + 1) < 0) @@ -5559,15 +5561,11 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-events reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(eventlist, n + 1) < 0) @@ -5744,7 +5742,7 @@ int qemuMonitorJSONGetKVMState(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -5784,15 +5782,11 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list-types reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(typelist, n + 1) < 0) @@ -5846,15 +5840,11 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(pathlist, n + 1) < 0) @@ -6085,15 +6075,11 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("device-list-properties reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(proplist, n + 1) < 0) @@ -6140,7 +6126,7 @@ qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGetObject(reply, "return"); @@ -6186,15 +6172,11 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(caps)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing migration capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(caps); if (VIR_ALLOC_N(list, n + 1) < 0) goto cleanup; @@ -6330,15 +6312,11 @@ qemuMonitorJSONGetGICCapabilities(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(caps = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(caps)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("missing GIC capabilities")); - goto cleanup; - } + caps = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(caps); /* If the returned array was empty we have to return successfully */ if (n == 0) { @@ -6555,16 +6533,11 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("%s reply data was not an array"), - qmpCmd); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(list, n + 1) < 0) @@ -6792,8 +6765,13 @@ qemuMonitorJSONAttachCharDev(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) - goto cleanup; + if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) + goto cleanup; + } else { + if (qemuMonitorJSONCheckError(cmd, reply) < 0) + goto cleanup; + } if (chr->type == VIR_DOMAIN_CHR_TYPE_PTY) { virJSONValuePtr data = virJSONValueObjectGetObject(reply, "return"); @@ -6939,11 +6917,7 @@ qemuMonitorJSONParseCPUx86Features(virJSONValuePtr data) size_t i; ssize_t n; - if (!data || (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("invalid array of CPUID features")); - goto error; - } + n = virJSONValueArraySize(data); if (!(cpudata = virCPUDataNew(VIR_ARCH_X86_64))) goto error; @@ -6982,7 +6956,7 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply)) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; data = virJSONValueObjectGetArray(reply, "return"); @@ -7029,15 +7003,11 @@ qemuMonitorJSONCheckCPUx86(qemuMonitorPtr mon) } } - if (qemuMonitorJSONCheckError(cmd, reply)) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("qom-list reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); for (i = 0; i < n; i++) { virJSONValuePtr element = virJSONValueArrayGet(data, i); @@ -7162,15 +7132,11 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-iothreads reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); /* null-terminated list */ if (VIR_ALLOC_N(infolist, n + 1) < 0) @@ -7251,15 +7217,11 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon, goto cleanup; } - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(data = virJSONValueObjectGetArray(reply, "return")) || - (n = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-memory-devices reply data was not an array")); - goto cleanup; - } + data = virJSONValueObjectGetArray(reply, "return"); + n = virJSONValueArraySize(data); for (i = 0; i < n; i++) { virJSONValuePtr elem = virJSONValueArrayGet(data, i); @@ -7582,7 +7544,7 @@ qemuMonitorJSONGetRTCTime(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0) goto cleanup; data = virJSONValueObjectGet(reply, "return"); @@ -7741,16 +7703,11 @@ qemuMonitorJSONGetHotpluggableCPUs(qemuMonitorPtr mon, if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; data = virJSONValueObjectGet(reply, "return"); - - if ((ninfo = virJSONValueArraySize(data)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-hotpluggable-cpus reply is not an array")); - goto cleanup; - } + ninfo = virJSONValueArraySize(data); if (VIR_ALLOC_N(info, ninfo) < 0) goto cleanup; @@ -7789,12 +7746,10 @@ qemuMonitorJSONQueryQMPSchema(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; - if (!(ret = virJSONValueObjectStealArray(reply, "return"))) - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("query-qmp-schema reply is not an array")); + ret = virJSONValueObjectStealArray(reply, "return"); cleanup: virJSONValueFree(cmd); @@ -7848,7 +7803,7 @@ qemuMonitorJSONQueryNamedBlockNodes(qemuMonitorPtr mon) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) goto cleanup; - if (qemuMonitorJSONCheckError(cmd, reply) < 0) + if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0) goto cleanup; ret = virJSONValueObjectStealArray(reply, "return"); -- 2.16.3

2 1

[libvirt] [PATCH] virsh: add missing help info of --source to domifaddr
by Chen Hanxiao 29 Mar '18

29 Mar '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> commit b4b5c82ce forgot to add this. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- tools/virsh-domain-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 68da11ed5..0f768d394 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2160,7 +2160,7 @@ static const vshCmdOptDef opts_domifaddr[] = { {.name = "source", .type = VSH_OT_STRING, .flags = VSH_OFLAG_NONE, - .help = N_("address source: 'lease' or 'agent'")}, + .help = N_("address source: 'lease', 'agent' or 'arp'")}, {.name = NULL} }; -- 2.14.3

2 2

[libvirt] [PATCH libvirt sparse files under format=qcow2 v1 0/2] Problem: libvirt fails to create fully allocated qcow2 storage objects.
by Wim Ten Have 29 Mar '18

29 Mar '18

From: Wim ten Have <wim.ten.have(a)oracle.com> When virt-install requests to create fully allocated storage object when the parameter sparse=no is set, 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. Wim ten Have (2): libvirt can't create fully allocated qcow2 formatted storage objects. Adjust qemu-img test required to target with 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

1 2

[libvirt] [PATCH] qemu: Use dynamic buffer for storing PTY aliases
by Michal Privoznik 29 Mar '18

29 Mar '18

https://bugzilla.redhat.com/show_bug.cgi?id=1560976 For historical reasons we've used 32 bytes long static buffer for storing PTY aliases. This breaks users scenario where they try to start a machine with user alias consisting of "ua-$uuid". Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_process.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1afb71f113..c0105c8b84 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1949,21 +1949,18 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, int count, virHashTablePtr info) { + char *id = NULL; size_t i; + int ret = -1; for (i = 0; i < count; i++) { virDomainChrDefPtr chr = devices[i]; if (chr->source->type == VIR_DOMAIN_CHR_TYPE_PTY) { - char id[32]; qemuMonitorChardevInfoPtr entry; - if (snprintf(id, sizeof(id), "char%s", - chr->info.alias) >= sizeof(id)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to format device alias " - "for PTY retrieval")); + VIR_FREE(id); + if (virAsprintf(&id, "char%s", chr->info.alias) < 0) return -1; - } entry = virHashLookup(info, id); if (!entry || !entry->ptyPath) { @@ -1973,7 +1970,7 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, */ virReportError(VIR_ERR_INTERNAL_ERROR, _("no assigned pty for device %s"), id); - return -1; + goto cleanup; } else { /* 'info chardev' had no pty path for this chardev, * but the log output had, so we're fine @@ -1984,11 +1981,14 @@ qemuProcessLookupPTYs(virDomainChrDefPtr *devices, VIR_FREE(chr->source->data.file.path); if (VIR_STRDUP(chr->source->data.file.path, entry->ptyPath) < 0) - return -1; + goto cleanup; } } - return 0; + ret = 0; + cleanup: + VIR_FREE(id); + return ret; } static int @@ -2040,7 +2040,8 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, int agentReason = VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CHANNEL; qemuMonitorChardevInfoPtr entry; virObjectEventPtr event = NULL; - char id[32]; + char *id = NULL; + int ret = -1; if (booted) agentReason = VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_DOMAIN_STARTED; @@ -2048,13 +2049,10 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, for (i = 0; i < vm->def->nchannels; i++) { virDomainChrDefPtr chr = vm->def->channels[i]; if (chr->targetType == VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO) { - if (snprintf(id, sizeof(id), "char%s", - chr->info.alias) >= sizeof(id)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("failed to format device alias " - "for PTY retrieval")); - return -1; - } + + VIR_FREE(id); + if (virAsprintf(&id, "char%s", chr->info.alias) < 0) + goto cleanup; /* port state not reported */ if (!(entry = virHashLookup(info, id)) || @@ -2071,7 +2069,10 @@ qemuProcessRefreshChannelVirtioState(virQEMUDriverPtr driver, } } - return 0; + ret = 0; + cleanup: + VIR_FREE(id); + return ret; } -- 2.16.1

2 4

[libvirt] Entering freeze for libvirt-4.2.0
by Daniel Veillard 29 Mar '18

29 Mar '18

As planned I just tagged the RC1 in git and pushed the signed tarball and rpms at the usual place: ftp://libvirt.org/libvirt/ This seems fine with my minimal testing, and CI at https://ci.centos.org/view/libvirt/ looks pretty good (except libvirt-master-build, weird ...) so this should not be a problem but please give it some testing especially on other arches and platforms. If everything goes well, I will push rc2 on Thursday for a final release over the w.e., but please give it a try first ! thanks, 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

Re: [libvirt] [PATCH] snip my name and email
by Daniel P. Berrangé 28 Mar '18

28 Mar '18

On Mon, Mar 26, 2018 at 10:29:06AM +0300, David Kiarie wrote: > I'd like to snip my name and email from these files Any particular reason why ? > --- > src/xenconfig/xen_xl.c | 1 - > src/xenconfig/xen_xl.h | 1 - > 2 files changed, 2 deletions(-) It is also mentioned in test/xlconfigtest.c. NB, your name & email are still recorded in git history and email archives for eternity Your name, but not email, is also mentioned in the news files, and that file isn't one we'd want to remove since its relevant historical record. > > diff --git a/src/xenconfig/xen_xl.c b/src/xenconfig/xen_xl.c > index e1ec8e7..a3f8af1 100644 > --- a/src/xenconfig/xen_xl.c > +++ b/src/xenconfig/xen_xl.c > @@ -17,7 +17,6 @@ > * License along with this library. If not, see > * <http://www.gnu.org/licenses/>. > * > - * Author: Kiarie Kahurani <davidkiarie4(a)gmail.com> > * Author: Jim Fehlig <jfehlig(a)suse.com> > */ > > diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h > index dd96326..8342f53 100644 > --- a/src/xenconfig/xen_xl.h > +++ b/src/xenconfig/xen_xl.h > @@ -17,7 +17,6 @@ > * License along with this library. If not, see > * <http://www.gnu.org/licenses/>. > * > - * Author: Kiarie Kahurani<davidkiarie4(a)gmail.com> > */ > > #ifndef __VIR_XEN_XL_H__ > -- > 2.16.2 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 7

[libvirt] [PATCH] remote: remove outdated comment about Solaris
by Daniel P. Berrangé 28 Mar '18

28 Mar '18

When removing a conditional in: commit da1ade7a52e040192c5e9396c15ec9225a0a2c48 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Fri Mar 23 10:50:59 2018 +0000 remote: remove some __sun conditionals the corresponding comment was mistakenly left behind. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as trivial fix. src/remote/remote_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 34e5ced0a9..325ef3fa3d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1344,9 +1344,7 @@ remoteConnectOpen(virConnectPtr conn, /* * If URI is NULL, then do a UNIX connection possibly auto-spawning - * unprivileged server and probe remote server for URI. On Solaris, - * this isn't supported, but we may be privileged enough to connect - * to the UNIX socket anyway. + * unprivileged server and probe remote server for URI. */ if (!conn->uri) { VIR_DEBUG("Auto-probe remote URI"); -- 2.14.3

1 0

[libvirt] [PATCH v2 0/3] Introduce hot plug support for mediated devices
by Erik Skultety 28 Mar '18

28 Mar '18

Libvirt shouldn't forbid the operation as unsupported. In fact, from VFIO point of view, mdevs have supported hot plug since the beginning. Then it's up to the 3rd party vendor driver whether it can cope with this feature reliably or not. Since v1 [1]: - dropped the original patch 1 as that adjustment can be done in a bigger scale across multiple modules as part of a 'bite-sized' task - reworded commit message for patches 2 and 3 - fixed the error path in patch 1 where I mistakenly tried to re-attach all host devices for a domain if the hotplug of an mdev failed [1] https://www.redhat.com/archives/libvir-list/2018-March/msg01631.html Erik Skultety (3): qemu: hotplug: Introduce hot plug support for mediated devices qemu: hotplug: Introduce hot unplug for mediated devices news: Update release news with mediated devices hot {plug,unplug} docs/news.xml | 10 ++++ src/qemu/qemu_hotplug.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+) -- 2.14.3

2 5

[libvirt] [PATCH v2 0/3] Improve handling of multipath devices
by Michal Privoznik 28 Mar '18

28 Mar '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-March/msg01541.html diff to v1: - Moved code to new file virdevmapper.c - Rename to virDevMapperGetTargets because this bug is not specific just to multipath rather than all device mapper targets - Reworked logging as suggested in review to v1 Michal Privoznik (3): util: Introduce virDevMapperGetTargets qemu: 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 | 42 ++++++++++++- src/qemu/qemu_domain.c | 64 +++++++++++++++++++ src/util/Makefile.inc.am | 2 + src/util/virdevmapper.c | 160 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virdevmapper.h | 32 ++++++++++ 8 files changed, 313 insertions(+), 3 deletions(-) create mode 100644 src/util/virdevmapper.c create mode 100644 src/util/virdevmapper.h -- 2.16.1

2 9

[libvirt] [PATCH 0/4] Introduce support for mediated devices hot plug
by Erik Skultety 28 Mar '18

28 Mar '18

Libvirt shouldn't forbid the operation as unsupported. In fact, from VFIO point of view, mdevs have supported hot plug since the beginning. Then it's up to the 3rd party vendor driver whether it can cope with this feature reliably or not. Erik Skultety (4): qemu: hotplug: Provide a string of a subsystem type instead of an int qemu: hotplug: Introduce hot plug support for mediated devices qemu: hotplug: Introduce hot unplug for mediated devices news: Update release news with mediated devices hot {plug,unplug} docs/news.xml | 14 +++++ src/qemu/qemu_hotplug.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 1 deletion(-) -- 2.14.3

3 15

[libvirt] [[RFC] 0/8] Implement async QEMU event handling in libvirtd.
by Prerna Saxena 28 Mar '18

28 Mar '18

As noted in https://www.redhat.com/archives/libvir-list/2017-May/msg00016.html libvirt-QEMU driver handles all async events from the main loop. Each event handling needs the per-VM lock to make forward progress. In the case where an async event is received for the same VM which has an RPC running, the main loop is held up contending for the same lock. This impacts scalability, and should be addressed on priority. Note that libvirt does have a 2-step deferred handling for a few event categories, but (1) That is insufficient since blockign happens before the handler could disambiguate which one needs to be posted to this other queue. (2) There needs to be homogeniety. The current series builds a framework for recording and handling VM events. It initializes per-VM event queue, and a global event queue pointing to events from all the VMs. Event handling is staggered in 2 stages: - When an event is received, it is enqueued in the per-VM queue as well as the global queues. - The global queue is built into the QEMU Driver as a threadpool (currently with a single thread). - Enqueuing of a new event triggers the global event worker thread, which then attempts to take a lock for this event's VM. - If the lock is available, the event worker runs the function handling this event type. Once done, it dequeues this event from the global as well as per-VM queues. - If the lock is unavailable(ie taken by RPC thread), the event worker thread leaves this as-is and picks up the next event. - Once the RPC thread completes, it looks for events pertaining to the VM in the per-VM event queue. It then processes the events serially (holding the VM lock) until there are no more events remaining for this VM. At this point, the per-VM lock is relinquished. Patch Series status: Strictly RFC only. No compilation issues. I have not had a chance to (stress) test it after rebase to latest master. Note that documentation and test coverage is TBD, since a few open points remain. Known issues/ caveats: - RPC handling time will become non-deterministic. - An event will only be "notified" to a client once the RPC for same VM completes. - Needs careful consideration in all cases where a QMP event is used to "signal" an RPC thread, else will deadlock. Will be happy to drive more discussion in the community and completely implement it. Prerna Saxena (8): Introduce virObjectTrylock() QEMU Event handling: Introduce async event helpers in qemu_event.[ch] Setup global and per-VM event queues. Also initialize per-VM queues when libvirt reconnects to an existing VM. Events: Allow monitor to "enqueue" events to a queue. Also introduce a framework of handlers for each event type, that can be called when the handler is running an event. Events: Plumb event handling calls before a domain's APIs complete. Code refactor: Move helper functions of doCoreDump*, syncNicRxFilter*, and qemuOpenFile* to qemu_process.[ch] Fold back the 2-stage event implementation for a few events : Watchdog, Monitor EOF, Serial changed, Guest panic, Nic RX filter changed .. into single level. Initialize the per-VM event queues in context of domain init. src/Makefile.am | 1 + src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_conf.h | 4 + src/qemu/qemu_driver.c | 1710 +++++++---------------------------- src/qemu/qemu_event.c | 317 +++++++ src/qemu/qemu_event.h | 231 +++++ src/qemu/qemu_monitor.c | 592 ++++++++++-- src/qemu/qemu_monitor.h | 80 +- src/qemu/qemu_monitor_json.c | 291 +++--- src/qemu/qemu_process.c | 2031 ++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_process.h | 88 ++ src/util/virobject.c | 26 + src/util/virobject.h | 4 + src/util/virthread.c | 5 + src/util/virthread.h | 1 + tests/qemumonitortestutils.c | 2 +- 17 files changed, 3411 insertions(+), 1976 deletions(-) create mode 100644 src/qemu/qemu_event.c create mode 100644 src/qemu/qemu_event.h -- 2.9.5

6 19

[libvirt] [dbus PATCH] domain: remove G_GNUC_UNUSED for used attributes
by Ján Tomko 28 Mar '18

28 Mar '18

A few functions use the G_GNUC_UNUSED marker for objectPath, even though it's passed to virtDBusDomainGetVirDomain later. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- Also passes the build with clang 5.0.1, once that lock issue is fixed: connect.c:59:29: error: unused variable 'lock' [-Werror,-Wunused-variable] g_autoptr(GMutexLocker) lock = g_mutex_locker_new(&connect->lock); src/domain.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/domain.c b/src/domain.c index 3c09351..879366f 100644 --- a/src/domain.c +++ b/src/domain.c @@ -278,7 +278,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainStatsRecordPtr, virDomainStatsRecordListF static void virtDBusDomainGetStats(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, + const gchar *objectPath, gpointer userData, GVariant **outArgs, GUnixFDList **outFDs G_GNUC_UNUSED, @@ -313,7 +313,7 @@ virtDBusDomainGetStats(GVariant *inArgs, static void virtDBusDomainShutdown(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, + const gchar *objectPath, gpointer userData, GVariant **outArgs G_GNUC_UNUSED, GUnixFDList **outFDs G_GNUC_UNUSED, @@ -336,7 +336,7 @@ virtDBusDomainShutdown(GVariant *inArgs G_GNUC_UNUSED, static void virtDBusDomainDestroy(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, + const gchar *objectPath, gpointer userData, GVariant **outArgs G_GNUC_UNUSED, GUnixFDList **outFDs G_GNUC_UNUSED, @@ -383,7 +383,7 @@ virtDBusDomainReboot(GVariant *inArgs, static void virtDBusDomainReset(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, + const gchar *objectPath, gpointer userData, GVariant **outArgs G_GNUC_UNUSED, GUnixFDList **outFDs G_GNUC_UNUSED, @@ -407,7 +407,7 @@ virtDBusDomainReset(GVariant *inArgs, static void virtDBusDomainCreate(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, + const gchar *objectPath, gpointer userData, GVariant **outArgs G_GNUC_UNUSED, GUnixFDList **outFDs G_GNUC_UNUSED, @@ -430,7 +430,7 @@ virtDBusDomainCreate(GVariant *inArgs G_GNUC_UNUSED, static void virtDBusDomainUndefine(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath G_GNUC_UNUSED, + const gchar *objectPath, gpointer userData, GVariant **outArgs G_GNUC_UNUSED, GUnixFDList **outFDs G_GNUC_UNUSED, -- 2.16.1

2 1

[libvirt] [jenkins-ci PATCH] Revert "local"
by Andrea Bolognani 28 Mar '18

28 Mar '18

This reverts commit c190e17fb8f689a0591dedded33d10cecafe3e20. As the original commit message so eloquently explains, the diff contains the tweaks I need for my local setup and it was, of course, never supposed to be pushed :/ Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the -ETOOEMBARRASSING rule. guests/files/ccache.conf | 2 +- guests/group_vars/all/install.yml | 6 +++--- guests/site.yml | 2 +- guests/tasks/users.yml | 18 ------------------ 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/guests/files/ccache.conf b/guests/files/ccache.conf index 18c7d97..48c3756 100644 --- a/guests/files/ccache.conf +++ b/guests/files/ccache.conf @@ -1 +1 @@ -max_size = 1G +max_size = 2G diff --git a/guests/group_vars/all/install.yml b/guests/group_vars/all/install.yml index 780f821..94b752f 100644 --- a/guests/group_vars/all/install.yml +++ b/guests/group_vars/all/install.yml @@ -4,8 +4,8 @@ install_virt_type: kvm install_arch: x86_64 install_machine: pc install_cpu_model: host-passthrough -install_vcpus: 4 -install_memory_size: 1 -install_disk_size: 10 +install_vcpus: 2 +install_memory_size: 2 +install_disk_size: 15 install_storage_pool: default install_network: default diff --git a/guests/site.yml b/guests/site.yml index dfe24bd..869291d 100644 --- a/guests/site.yml +++ b/guests/site.yml @@ -38,7 +38,7 @@ # Install build dependencies for each project - include: tasks/packages.yml with_items: - - libvirt + '{{ projects }}' loop_control: loop_var: project when: diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index e9840fb..1ecacee 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -82,21 +82,3 @@ owner: '{{ flavor }}' group: '{{ flavor }}' create: yes - -- name: '{{ flavor }}: Enable vi mode' - lineinfile: - path: /home/{{ flavor }}/.profile - line: 'set -o vi' - state: present - owner: '{{ flavor }}' - group: '{{ flavor }}' - create: yes - -- name: '{{ flavor }}: Enable vi mode' - lineinfile: - path: /home/{{ flavor }}/.bashrc - line: 'set -o vi' - state: present - owner: '{{ flavor }}' - group: '{{ flavor }}' - create: yes -- 2.14.3

3 5

[libvirt] [dbus PATCH 0/2] misc fixes
by Pavel Hrdina 27 Mar '18

27 Mar '18

2 4

[libvirt] [jenkins-ci PATCH 0/2] guests: Install and enable chrony
by Andrea Bolognani 27 Mar '18

27 Mar '18

Time travel is no longer allowed on these premises. Andrea Bolognani (2): guests: Move environment configuration steps together guests: Install and enable chrony guests/site.yml | 7 ++++--- guests/tasks/services.yml | 15 +++++++++++++++ guests/vars/mappings.yml | 3 +++ guests/vars/projects/base.yml | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 guests/tasks/services.yml -- 2.14.3

2 3

[libvirt] [PATCH v4 0/9] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 27 Mar '18

27 Mar '18

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

1 9

[libvirt] [dbus PATCH v2 0/4] Implement LookupBy* methods for Connect
by Katerina Koukiou 27 Mar '18

27 Mar '18

Changes from v1: * Added to method names Domain prefix. * Seperated move of domain method in seperate commit. Katerina Koukiou (4): tests: Moved `domain` method from test_domain.py to libvirttest.py Implement DomainLookupByID method for Connect Interface. Implement DomainLookupByName method for Connect Interface Implement DomainLookupByUUID method for Connect Interface data/org.libvirt.Connect.xml | 18 +++++++++ src/connect.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ test/libvirttest.py | 5 +++ test/test_connect.py | 14 +++++++ test/test_domain.py | 5 --- 5 files changed, 124 insertions(+), 5 deletions(-) -- 2.15.0

4 10

[libvirt] [PATCH v3 0/9] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 27 Mar '18

27 Mar '18

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

3 15

[libvirt] Compiling Libvirt 3.0.0 failed: cannot stat t-kw@kkcor.gmo
by Mathieu Tarral 27 Mar '18

27 Mar '18

Hi, I tried to compile libvirt 3.0.0, from git, on a Debian Stretch. It failed with these weird errors that i'm not able to fix by myself: rm -f ky.gmo && : -c --statistics -o ky.gmo ky.po rm -f lt.gmo && : -c --statistics -o lt.gmo lt.po mv: cannot stat 't-kw(a)kkcor.gmo': No such file or directory mv: cannot stat 't-kw(a)uccor.gmo': No such file or directory Makefile:448: recipe for target 'kw(a)kkcor.gmo' failed make[3]: *** [kw(a)kkcor.gmo] Error 1 make[3]: *** Waiting for unfinished jobs.... rm -f lv.gmo && : -c --statistics -o lv.gmo lv.po Makefile:448: recipe for target 'kw(a)uccor.gmo' failed make[3]: *** [kw(a)uccor.gmo] Error 1 mv: cannot stat 't-kw_GB.gmo': No such file or directory I have no idea what this "t-kw(a)kkcor.gmo" is about ?? Could you guys help ? Note: the build failed erlier because uuid-dev was missing. You might want to add a check for that lib in the configure.ac Best regards. -- Mathieu Tarral

2 4

[libvirt] [dbus PATCH 0/3] Implement LookupBy* methods for libvirt
by Katerina Koukiou 27 Mar '18

27 Mar '18

Katerina Koukiou (3): Implement LookupByID method for Connect Interface. Implement LookupByName method for Connect Interface Implement LookupByUUID method for Connect Interface data/org.libvirt.Connect.xml | 18 +++++++++ src/connect.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ src/domain.c | 1 + test/libvirttest.py | 5 +++ test/test_connect.py | 15 +++++++- test/test_domain.py | 5 --- 6 files changed, 125 insertions(+), 6 deletions(-) -- 2.15.0

3 5

[libvirt] [jenkins-ci PATCH] guests: Enable ccache
by Andrea Bolognani 27 Mar '18

27 Mar '18

We install ccache on all guests where it's available, but Fedora is the only one actually using it at the moment, because it enables it automatically. Tweak the user's profile so that compilation will use ccache if it's installed. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/users.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 87693e0..1ecacee 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -64,3 +64,21 @@ dest: /home/{{ flavor }}/.ccache/ccache.conf owner: '{{ flavor }}' group: '{{ flavor }}' + +- name: '{{ flavor }}: Enable ccache' + lineinfile: + path: /home/{{ flavor }}/.profile + line: 'which ccache >/dev/null 2>&1 && export CC="ccache cc"' + state: present + owner: '{{ flavor }}' + group: '{{ flavor }}' + create: yes + +- name: '{{ flavor }}: Enable ccache' + lineinfile: + path: /home/{{ flavor }}/.bashrc + line: 'which ccache >/dev/null 2>&1 && export CC="ccache cc"' + state: present + owner: '{{ flavor }}' + group: '{{ flavor }}' + create: yes -- 2.14.3

2 2

[libvirt] libvirt api documentation not reachable
by syam Mohan 27 Mar '18

27 Mar '18

Hi, It seems this page is not accessible now. It was fine till yesterday. Can some one please fix it? Thanks!!

2 1

[libvirt] Google summer of code proposal review request
by Asmaa Osama 27 Mar '18

27 Mar '18

Hi everyone, I've written and shared my proposal for GSoC and I'd be grateful for any advice or comments. It's only a few hours before deadline, but any help is welcomed

1 0

Re: [libvirt] [PATCH 01/12] conf: introduce domain XML element <polling> for iothread
by Sergio Lopez 27 Mar '18

27 Mar '18

Hi, I'd like to resurrect this thread: https://www.redhat.com/archives/libvir-list/2017-February/msg01084.html Recent benchmarks have demonstrated that using large values for poll-max-ns significantly decreases the perceived latency in the Guest, at the expense of the iothread using more CPU: - virtio-blk+iothread, 16 vCPUs, null_blk=200us and default poll-max-ns randread: (groupid=0, jobs=4): err= 0: pid=1314: Thu Feb 15 06:24:06 2018 read: IOPS=15.0k, BW=58.7MiB/s (61.6MB/s)(587MiB/10001msec) clat (usec): min=98, max=2016, avg=257.98, stdev=22.91 lat (usec): min=100, max=2017, avg=259.37, stdev=22.99 randread: (groupid=0, jobs=8): err= 0: pid=1359: Thu Feb 15 06:25:03 2018 read: IOPS=29.8k, BW=117MiB/s (122MB/s)(1166MiB/10002msec) clat (usec): min=33, max=3818, avg=260.92, stdev=32.02 lat (usec): min=34, max=3819, avg=262.14, stdev=32.02 randread: (groupid=0, jobs=16): err= 0: pid=1339: Thu Feb 15 06:24:41 2018 read: IOPS=55.9k, BW=218MiB/s (229MB/s)(2182MiB/10002msec) clat (usec): min=37, max=3390, avg=279.19, stdev=34.53 lat (usec): min=38, max=3391, avg=280.41, stdev=34.54 - virtio-blk+iothread, 16 vCPUs, null_blk=200us and poll-max-ns=1000000 randread: (groupid=0, jobs=4): err= 0: pid=1361: Thu Feb 15 06:31:47 2018 read: IOPS=16.2k, BW=63.3MiB/s (66.3MB/s)(633MiB/10001msec) clat (usec): min=72, max=2790, avg=240.12, stdev=22.28 lat (usec): min=73, max=2791, avg=241.30, stdev=22.28 randread: (groupid=0, jobs=8): err= 0: pid=1342: Thu Feb 15 06:30:51 2018 read: IOPS=32.1k, BW=125MiB/s (132MB/s)(1255MiB/10001msec) clat (usec): min=30, max=5474, avg=242.14, stdev=46.24 lat (usec): min=31, max=5475, avg=243.33, stdev=46.25 randread: (groupid=0, jobs=16): err= 0: pid=1324: Thu Feb 15 06:30:11 2018 read: IOPS=61.8k, BW=241MiB/s (253MB/s)(2413MiB/10002msec) clat (usec): min=26, max=2931, avg=251.89, stdev=38.37 lat (usec): min=27, max=2932, avg=253.11, stdev=38.38 I think this trade-off should be user's decision. Layered products may consider abstracting this configuration under simplified VM tuning attributes. Sergio.

1 0

[libvirt] [dbus PATCH v2] Add 'Version' property for virConnectGetVersion
by Katerina Koukiou 26 Mar '18

26 Mar '18

--- data/org.libvirt.Connect.xml | 4 ++++ src/connect.c | 25 ++++++++++++++++++++++++- test/test_connect.py | 9 +++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index e47c2f5..56a1126 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -3,6 +3,10 @@ <node name="/org/libvirt/connect"> <interface name="org.libvirt.Connect"> + <property name="Version" type="t" access="read"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectGetVersion"/> + </property> <method name="ListDomains"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectListAllDomai…"/> diff --git a/src/connect.c b/src/connect.c index bf97cd5..8898e6d 100644 --- a/src/connect.c +++ b/src/connect.c @@ -80,6 +80,24 @@ virtDBusConnectOpen(virtDBusConnect *connect, return TRUE; } +static void +virtDBusConnectGetVersion(const gchar *objectPath G_GNUC_UNUSED, + gpointer userData, + GVariant **value, + GError **error) +{ + virtDBusConnect *connect = userData; + gulong hvVer; + + if (!virtDBusConnectOpen(connect, error)) + return; + + if (virConnectGetVersion(connect->connection, &hvVer) < 0) + return virtDBusUtilSetLastVirtError(error); + + *value = g_variant_new("t", hvVer); +} + static void virtDBusConnectListDomains(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -177,6 +195,11 @@ virtDBusConnectDefineXML(GVariant *inArgs, *outArgs = g_variant_new("(o)", path); } +static virtDBusGDBusPropertyTable virtDBusConnectPropertyTable[] = { + { "Version", virtDBusConnectGetVersion, NULL }, + { NULL, NULL, NULL } +}; + static virtDBusGDBusMethodTable virtDBusConnectMethodTable[] = { { "ListDomains", virtDBusConnectListDomains }, { "CreateXML", virtDBusConnectCreateXML }, @@ -228,7 +251,7 @@ virtDBusConnectNew(virtDBusConnect **connectp, connect->connectPath, interfaceInfo, virtDBusConnectMethodTable, - NULL, + virtDBusConnectPropertyTable, connect); virtDBusDomainRegister(connect, error); diff --git a/test/test_connect.py b/test/test_connect.py index a52140c..01d4d41 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -2,6 +2,7 @@ import dbus import libvirttest +import pytest class TestConnect(libvirttest.BaseTestClass): @@ -53,6 +54,14 @@ class TestConnect(libvirttest.BaseTestClass): self.main_loop() + @pytest.mark.parametrize("property_name,expected_type", [ + ("Version", dbus.UInt64), + ]) + def test_connect_properties_return_type(self, property_name, expected_type): + obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') + props = obj.GetAll('org.libvirt.Connect', dbus_interface=dbus.PROPERTIES_IFACE) + assert isinstance(props[property_name], expected_type) + if __name__ == '__main__': libvirttest.run() -- 2.15.0

3 5

[libvirt] [dbus PATCH 0/4] remove AUTHORS file and cleanup spec file
by Pavel Hrdina 26 Mar '18

26 Mar '18

Pavel Hrdina (4): maint: remove AUTHORS from repository spec: cleanup spec file based on fedora package review spec: Require dbus and polkit spec: fix D-Bus spelling and improve description AUTHORS.in | 13 ------------- Makefile.am | 14 -------------- libvirt-dbus.spec.in | 34 +++++++++++++++------------------- 3 files changed, 15 insertions(+), 46 deletions(-) delete mode 100644 AUTHORS.in -- 2.14.3

3 15

[libvirt] [PATCH sandbox] Delete the virt-sandbox-service command
by Daniel P. Berrangé 26 Mar '18

26 Mar '18

This command attempted to create sandboxed containers for running systemd services that exist on the host. This code has proved very fragile, however, since it needs heuristics to figure out which dirs need to be made private in the container vs shared with the host. Even a relatively simple "httpd.service" sandbox no longer works with current Fedora. Users wanting to sandbox services are better served by using systemd's native container functionality, or using Docker container images. The virt-sandbox-image tool can even run Docker/virt-builder images directly. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- TODO | 24 - bin/Makefile.am | 80 +- bin/virt-sandbox-service | 1314 --------------------------- bin/virt-sandbox-service-bash-completion.sh | 141 --- bin/virt-sandbox-service-clone.pod | 100 -- bin/virt-sandbox-service-connect.pod | 59 -- bin/virt-sandbox-service-create.pod | 264 ------ bin/virt-sandbox-service-delete.pod | 65 -- bin/virt-sandbox-service-execute.pod | 71 -- bin/virt-sandbox-service-reload.pod | 63 -- bin/virt-sandbox-service-upgrade.pod | 74 -- bin/virt-sandbox-service-util.c | 305 ------- bin/virt-sandbox-service.logrotate | 9 - bin/virt-sandbox-service.pod | 85 -- cfg.mk | 2 +- libvirt-sandbox.spec.in | 7 - libvirt-sandbox/tests/containers_test.sh | 37 - po/POTFILES.in | 1 - 18 files changed, 3 insertions(+), 2698 deletions(-) delete mode 100644 TODO delete mode 100755 bin/virt-sandbox-service delete mode 100755 bin/virt-sandbox-service-bash-completion.sh delete mode 100644 bin/virt-sandbox-service-clone.pod delete mode 100644 bin/virt-sandbox-service-connect.pod delete mode 100644 bin/virt-sandbox-service-create.pod delete mode 100644 bin/virt-sandbox-service-delete.pod delete mode 100644 bin/virt-sandbox-service-execute.pod delete mode 100644 bin/virt-sandbox-service-reload.pod delete mode 100644 bin/virt-sandbox-service-upgrade.pod delete mode 100644 bin/virt-sandbox-service-util.c delete mode 100644 bin/virt-sandbox-service.logrotate delete mode 100644 bin/virt-sandbox-service.pod delete mode 100755 libvirt-sandbox/tests/containers_test.sh diff --git a/TODO b/TODO deleted file mode 100644 index fc63361..0000000 --- a/TODO +++ /dev/null @@ -1,24 +0,0 @@ - libvirt-sandbox TODO list - ================= - -systemd-tmpfiles --create needs to be run within the container, before any -apps are started, since it will populate /run (Completed) - -CGROUPFS: integration so libvirt does it rather then systemd within the container - We need kernel labeling support for cgroupfs so we can allow systemd to write to its section of the cgroupfs. - -SYSLOG: Currently syslog messages are going no where within the container. -If we run a syslog within the container will it get messages from the outside? Should we just use systemd-journal. I think sysadmins will want to be able to look in /var/log/messages within the container. (systemd-journal is now running within a container) - -EXECUTE: - virt-sandbox-service execute --command "BLAH" does not work. We need to have the ability to execute any random command within the container, and get stdin, stdout, stderror outside the container. (Partially Completed) -Still needs kernel to implement missing container namespace files under /proc/PID/ns, Also need a mechanism to get the PID of systemd from libvirt. - -HOSTNAME: - Currently if I execute hostname within the container it sees the name of the host not the name based on the container name or the IP Address associated with dhclient. (Completed) - -virt-sandbox-service connect NAME hangs when you attempt to end the connection. -^d should bring you back to the host terminal. - -Need a mechanism to allow admins to specify additional services to run within -the container. For example you may want to run mysql and apache within the same container. (Completed) You can do this using systemctl enabel BLAH diff --git a/bin/Makefile.am b/bin/Makefile.am index deedcf6..db0a1d1 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,39 +1,12 @@ bin_PROGRAMS = virt-sandbox -libexec_PROGRAMS = virt-sandbox-service-util +bin_SCRIPTS = virt-sandbox-image -bin_SCRIPTS = virt-sandbox-service \ - virt-sandbox-image - -virtsandboxcompdir = $(datarootdir)/bash-completion/completions/ - -crondailydir = $(sysconfdir)/cron.daily -crondaily_SCRIPTS = virt-sandbox-service.logrotate - -POD_FILES = \ - virt-sandbox-service.pod \ - virt-sandbox-service-execute.pod \ - virt-sandbox-service-create.pod \ - virt-sandbox-service-clone.pod \ - virt-sandbox-service-connect.pod \ - virt-sandbox-service-delete.pod \ - virt-sandbox-service-reload.pod \ - virt-sandbox-service-upgrade.pod \ - $(NULL) -EXTRA_DIST = $(bin_SCRIPTS) $(POD_FILES) virt-sandbox-service-bash-completion.sh virt-sandbox-service.logrotate -EXTRA_DIST += virt-sandbox-service-bash-completion.sh +EXTRA_DIST = $(bin_SCRIPTS) man1_MANS = \ virt-sandbox.1 \ - virt-sandbox-service.1 \ - virt-sandbox-service-execute.1 \ - virt-sandbox-service-create.1 \ - virt-sandbox-service-clone.1 \ - virt-sandbox-service-connect.1 \ - virt-sandbox-service-delete.1 \ - virt-sandbox-service-reload.1 \ - virt-sandbox-service-upgrade.1 \ $(NULL) POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" @@ -41,30 +14,6 @@ POD2MAN = pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" virt-sandbox.1: virt-sandbox.c Makefile $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ -virt-sandbox-service.1: virt-sandbox-service.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-execute.1: virt-sandbox-service-execute.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-clone.1: virt-sandbox-service-clone.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-create.1: virt-sandbox-service-create.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-connect.1: virt-sandbox-service-connect.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-delete.1: virt-sandbox-service-delete.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-reload.1: virt-sandbox-service-reload.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - -virt-sandbox-service-upgrade.1: virt-sandbox-service-upgrade.pod Makefile - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ - CLEANFILES = $(man1_MANS) virt_sandbox_SOURCES = virt-sandbox.c @@ -81,28 +30,3 @@ virt_sandbox_LDFLAGS = \ ../libvirt-sandbox/libvirt-sandbox-1.0.la \ $(WARN_CFLAGS) \ $(NULL) - -virt_sandbox_service_util_SOURCES = virt-sandbox-service-util.c -virt_sandbox_service_util_CFLAGS = \ - $(GIO_UNIX_CFLAGS) \ - $(LIBVIRT_GOBJECT_CFLAGS) \ - -I$(top_srcdir) \ - -DLOCALEDIR="\"$(datadir)/locale"\" \ - $(WARN_CFLAGS) \ - $(NULL) -virt_sandbox_service_util_LDFLAGS = \ - $(GIO_UNIX_LIBS) \ - $(LIBVIRT_GOBJECT_LIBS) \ - ../libvirt-sandbox/libvirt-sandbox-1.0.la \ - $(WARN_CFLAGS) \ - $(NULL) - -install-data-local: - $(MKDIR_P) $(DESTDIR)$(sysconfdir)/libvirt-sandbox/services - $(MKDIR_P) $(DESTDIR)$(virtsandboxcompdir) - cp $(srcdir)/virt-sandbox-service-bash-completion.sh $(DESTDIR)$(virtsandboxcompdir)/virt-sandbox-service - -uninstall-local: - $(rmdir) $(DESTDIR)$(sysconfdir)/libvirt-sandbox/services ||: - $(rmdir) $(DESTDIR)$(sysconfdir)/libvirt-sandbox ||: - rm -f $(DESTDIR)$(virtsandboxcompdir)/virt-sandbox-service diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service deleted file mode 100755 index c458716..0000000 --- a/bin/virt-sandbox-service +++ /dev/null @@ -1,1314 +0,0 @@ -#!/usr/bin/env python3 -# -# Authors: Dan Walsh <dwalsh(a)redhat.com> -# -# Copyright (C) 2012-2013 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import gi -gi.require_version('LibvirtGConfig', '1.0') -from gi.repository import LibvirtGConfig -gi.require_version('LibvirtGObject', '1.0') -from gi.repository import LibvirtGObject -gi.require_version('LibvirtSandbox', '1.0') -from gi.repository import LibvirtSandbox -from gi.repository import GLib -import gi -import re -import os, sys, shutil, errno, stat -import rpm -from subprocess import Popen, PIPE, STDOUT -import gettext -import pwd - -if os.path.exists("/sys/fs/selinux"): - import selinux -else: - selinux = None - -LibvirtGObject.init_object_check(None) -LibvirtSandbox.init_check(None) - -gettext.bindtextdomain("libvirt-sandbox", "/usr/share/locale") -gettext.textdomain("libvirt-sandbox") -try: - gettext.install("libvirt-sandbox", - localedir="/usr/share/locale", - codeset = 'utf-8') -except IOError: - import __builtin__ - __builtin__.__dict__['_'] = unicode - -CONFIG_PATH = "/etc/libvirt-sandbox/services/" -def get_config_path(name): - return CONFIG_PATH + name + "/config/sandbox.cfg" - -def get_legacy_config_path(name): - return CONFIG_PATH + name + ".sandbox" - -def read_config(name): - path = get_config_path(name) - if not os.path.exists(path): - return None - return LibvirtSandbox.Config.load_from_path(path) - -# shutil.copytree throws a fit if it finds sockets -# or fifos, and has really bad behaviour on block -# and character devices too. -def copydirtree(src, dst): - filenames = os.listdir(src) - os.makedirs(dst) - - for filename in filenames: - srcfilepath = os.path.join(src, filename) - dstfilepath = os.path.join(dst, filename) - - st = os.lstat(srcfilepath) - if stat.S_ISDIR(st.st_mode): - copydirtree(srcfilepath, dstfilepath) - - os.utime(dstfilepath, (st.st_atime, st.st_mtime)) - os.chmod(dstfilepath, stat.S_IMODE(st.st_mode)) - elif stat.S_ISREG(st.st_mode): - with open(srcfilepath, 'rb') as fsrc: - with open(dstfilepath, 'wb') as fdst: - while 1: - buf = fsrc.read(1024*32) - if not buf: - break - fdst.write(buf) - - os.utime(dstfilepath, (st.st_atime, st.st_mtime)) - os.chmod(dstfilepath, stat.S_IMODE(st.st_mode)) - elif stat.S_ISLNK(st.st_mode): - linkdst = os.readlink(srcfilepath) - os.symlink(linkdst, dstfilepath) - else: - # Ignore all other special files (block/char/sock/fifo) - pass - -class Container: - DEFAULT_PATH = "/var/lib/libvirt/filesystems" - DEFAULT_IMAGE = "/var/lib/libvirt/images/%s.raw" - SELINUX_FILE_TYPE = "svirt_lxc_file_t" - - def __init__(self, name=None, uri = "lxc:///", path = DEFAULT_PATH, config=None, create=False): - self.uri = uri - self.use_image = False - self.size = 10 * MB - self.path = path - self.config = config - if self.config: - self.name = self.config.get_name() - else: - self.name = name - self.dest = "%s/%s" % (self.path, self.name) - self.file_type = self.SELINUX_FILE_TYPE - self.conn = None - self.image = None - self.uid = 0 - self.mounts = [] - - def get_file_type(self): - return self.file_type - - def set_file_type(self, file_type): - self.file_type = file_type - - def set_uid(self, uid): - self.config.set_userid(uid) - - def get_uid(self): - return self.config.get_userid(uid) - - def set_gid(self, gid): - self.config.set_groupid(gid) - - def get_gid(self): - return self.config.get_groupid(gid) - - def set_username(self, username): - self.config.set_username(username) - - def get_username(self): - return self.config.get_username() - - def set_homedir(self, homedir): - self.config.set_homedir(homedir) - - def get_homedir(self): - return self.config.get_homedir() - - def set_mounts(self, mounts): - self.mounts = mounts - - def get_mounts(self): - return self.mounts - - def add_mounts(self): - self.config.add_mount_strv(self.mounts) - - def get_config_path(self, name = None): - if not name: - name = self.name - return get_config_path(name) - - def get_filesystem_path(self, name = None): - if not name: - name = self.get_name() - return "%s/%s" % (self.path, name) - - def get_image_path(self, name = None): - if not name: - name = self.get_name() - return self.DEFAULT_IMAGE % name - - def set_image(self, size): - self.use_image = True - self.size = size * MB - - def set_path(self, path): - self.path = path - self.dest = "%s/%s" % (self.path, self.name) - - def get_name(self): - return self.name - - def set_name(self, name): - if self.config: - raise ValueError([_("Cannot modify Name")]) - self.name = name - self.dest = "%s/%s" % (self.path, self.name) - - def set_security(self, val): - self.config.set_security_opts(val) - - def add_network(self, val): - self.config.add_network_opts(val) - - def get_security_dynamic(self): - return self.config.get_security_dynamic() - - def get_security_label(self): - return self.config.get_security_label() - - def set_security_label(self): - if selinux is None: - return - - if self.image or self.get_security_dynamic(): - return - - selabel = self.get_security_label() - if selabel is None: - raise ValueError([_("Missing security label configuration")]) - parts = selabel.split(":") - selinux.chcon(self.dest, "system_u:object_r:%s:%s" % ( - self.get_file_type(), ":".join(parts[3:])), True) - - def gen_filesystems(self): - if self.use_image: - self.image = self.DEFAULT_IMAGE % self.get_name() - mount = LibvirtSandbox.ConfigMountHostImage.new(self.image, self.dest, - LibvirtGConfig.DomainDiskFormat.RAW) - self.config.add_mount(mount) - - def fix_stat(self, f): - try: - s = os.stat(f) - path = "%s%s" % (self.dest, f) - os.chown(path, s.st_uid, s.st_gid) - os.chmod(path, s.st_mode) - except OSError as e: - if not e.errno == errno.ENOENT: - raise - - def fix_protection(self): - l = len(self.dest) - for root, dirs, files in os.walk(self.dest): - for f in files: - dest = root + "/" + f - self.fix_stat(dest[l:]) - for d in dirs: - dest = root + "/" + d - self.fix_stat(dest[l:]) - - def makedirs(self, d): - try: - path = "%s%s" % (self.dest, d) - os.makedirs(path) - except OSError as e: - if not e.errno == errno.EEXIST: - raise - - def makefile(self, f): - self.makedirs(os.path.dirname(f)) - try: - path = "%s%s" % (self.dest, f) - fd=open(path, "w") - fd.close() - except OSError as e: - if not e.errno == errno.EEXIST: - raise - - def umount(self): - p = Popen(["/bin/umount", self.dest]) - p.communicate() - if p.returncode and p.returncode != 0: - raise OSError(_("Failed to unmount image %s from %s") % (self.image, self.dest)) - - def create_image(self): - fd = open(self.image, "w") - fd.truncate(self.size) - fd.close() - p = Popen(["/sbin/mkfs","-F", "-t", "ext4", self.image],stdout=PIPE, stderr=PIPE) - p.communicate() - if p.returncode and p.returncode != 0: - raise OSError(_("Failed to build image %s") % self.image ) - - p = Popen(["/bin/mount", self.image, self.dest]) - p.communicate() - if p.returncode and p.returncode != 0: - raise OSError(_("Failed to mount image %s on %s") % (self.image, self.dest)) - - def save_config(self): - self.connect() - context = self.context() - context.define() - sys.stdout.write(_("Created sandbox config %s\n") % get_config_path(self.name)) - - def update_config(self): - self.connect() - context = self.context() - context.undefine() - context.define() - sys.stdout.write(_("Re-created sandbox config %s\n") % get_config_path(self.name)) - - def delete(self): - self.connect() - self.conn.fetch_domains(None) - dom = self.conn.find_domain_by_name(self.name) - if dom is not None: - info = dom.get_info() - if info.state == LibvirtGObject.DomainState.RUNNING: - raise ValueError([_("Cannot delete running container")]) - - # Not sure we should remove content - if os.path.exists(self.dest): - shutil.rmtree(self.dest) - - image = self.get_image_path() - if os.path.exists(image): - os.remove(image) - - context = self.context() - context.undefine() - - def get_security_model(self): - model = None - - # Make sure we have a connection - self.connect() - - # Loop over the security models from the host capabilities - # The first in "selinux" and "apparmor" will be the returned model - # Those two models can't coexist on a machine - configCaps = self.conn.get_capabilities() - hostCaps = configCaps.get_host() - secmodels = hostCaps.get_secmodels() - for secmodel in secmodels: - if secmodel.get_model() == "selinux": - model = "selinux" - break - elif secmodel.get_model() == "apparmor": - model = "apparmor" - break - - return model - - - def create(self): - self.connect() - if self.get_security_model() is not None and \ - self.config.get_security_dynamic() and not self.use_image: - raise ValueError([_("Dynamic security label only supported for image based containers")]) - if self.uri != "lxc:///": - self.config.set_shell(True) - if not os.path.exists(self.dest): - os.mkdir(self.dest) - - def connect(self): - if not self.conn: - self.conn=LibvirtGObject.Connection.new(self.uri) - self.conn.open(None) - - def disconnect(self): - if self.conn: - self.conn.close() - self.conn = None - - def context(self): - return LibvirtSandbox.ContextService.new(self.conn, self.config) - - def add_bind_mount(self, source, dest): - if self.image is None: - mount = LibvirtSandbox.ConfigMountHostBind.new(source, dest) - else: - mount = LibvirtSandbox.ConfigMountGuestBind.new(source, dest) - self.config.add_mount(mount) - - def add_ram_mount(self, dest, size): - mount = LibvirtSandbox.ConfigMountRam.new(dest, size); - self.config.add_mount(mount) - -class GenericContainer(Container): - def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False): - Container.__init__(self, name, uri, path, config, create) - - if create: - self.config = LibvirtSandbox.ConfigServiceGeneric.new(name) - - def gen_filesystems(self): - Container.gen_filesystems(self) - self.add_bind_mount(self.dest, self.path) - self.add_mounts() - - def create_generic(self): - Container.create(self) - self.gen_filesystems() - - if self.image: - self.create_image() - self.umount() - sys.stdout.write(_("Created sandbox container image %s\n") % self.image) - else: - sys.stdout.write(_("Created sandbox container dir %s\n") % self.dest) - self.save_config() - - def create(self): - try: - self.create_generic() - except Exception as e: - try: - self.delete() - except Exception as e2: - pass - raise e - - def set_command(self, command): - self.config.set_command(command) - - -def is_template_unit(unit): - return '@' in unit - -class SystemdContainer(Container): - IGNORE_DIRS = [ "/var/run/", "/etc/logrotate.d/", "/etc/pam.d" ] - DEFAULT_DIRS = [ "/etc", "/var" ] - PROFILE_FILES = [ ".bashrc", ".bash_profile", ".profile" ] - MACHINE_ID = "/etc/machine-id" - HOSTNAME = "/etc/hostname" - SYSVINIT_PATH = "/etc/rc.d" - ANACONDA_WANTS_PATH = "/usr/lib/systemd/system/anaconda.target.wants" - MULTI_USER_WANTS_PATH = "/usr/lib/systemd/system/multi-user.target.wants" - SYSINIT_WANTS_PATH = "/usr/lib/systemd/system/sysinit.target.wants" - SOCKET_WANTS_PATH = "/usr/lib/systemd/system/sockets.target.wants" - MAKE_SYSTEM_DIRS = [ "/var/lib/dhclient", "/var/lib/dbus", "/var/log", "/var/spool", "/var/cache", "/var/tmp", "/var/lib/nfs/rpc_pipefs", SYSVINIT_PATH, "/lib/lsb" ] - BIND_SYSTEM_DIRS = [ "/var", "/home", "/root", "/etc/systemd/system", "/etc/rc.d", "/usr/lib/systemd/system/basic.target.wants", "/usr/lib/systemd/system/local-fs.target.wants", ANACONDA_WANTS_PATH, MULTI_USER_WANTS_PATH, SYSINIT_WANTS_PATH, SOCKET_WANTS_PATH ] - BIND_SYSTEM_FILES = [ MACHINE_ID, "/etc/fstab", HOSTNAME ] - LOCAL_LINK_FILES = { SYSINIT_WANTS_PATH : [ "systemd-tmpfiles-setup.service" ] , SOCKET_WANTS_PATH : [ "dbus.socket", "systemd-journald.socket", "systemd-shutdownd.socket", "systemd-initctl.socket" ] } - - DEFAULT_UNIT = "/etc/systemd/system/%s_sandbox.service" - - def __init__(self, name=None, uri = "lxc:///", path = Container.DEFAULT_PATH, config=None, create=False, packages=[]): - Container.__init__(self, name, uri, path, config, create) - self.copy = False - self.unit_file_list = [] - self.packages = packages - if create: - self.config = LibvirtSandbox.ConfigServiceSystemd.new(name) - self.unitfile = None - else: - self.unitfile = self.get_unit_path() - - def follow_units(self): - unitst="" - for i, src in self.unit_file_list: - unitst += "ReloadPropagatedFrom=%s\n" % i - - return unitst - - def get_unit_path(self, name = None): - if not name: - name = self.get_name() - return self.DEFAULT_UNIT % name - - def set_unit_file_list(self, unit_file_list): - self.unit_file_list = unit_file_list - - def get_sandboxed_service(self): - return self.unit_file_list[0][0].split(".")[0] - - def create_system_unit(self): - self.unitfile = self.get_unit_path() - unit = r""" -[Unit] -Description=Secure Sandbox Container %(NAME)s -Requires=libvirtd.service -After=libvirtd.service -%(FOLLOW)s -[Service] -Type=simple -ExecStart=/usr/libexec/virt-sandbox-service-util -c %(URI)s -s %(NAME)s -ExecReload=/usr/bin/virt-sandbox-service -c %(URI)s reload -u %(RELOAD)s %(NAME)s -ExecStop=/usr/bin/virsh -c %(URI)s destroy %(NAME)s - -[Install] -WantedBy=multi-user.target -""" % { 'NAME':self.name, - 'FOLLOW':self.follow_units(), - 'RELOAD': " -u ".join(map(lambda x: x[0], self.unit_file_list)), - 'URI': self.uri, - } - - fd = open(self.unitfile, "w") - fd.write(unit) - fd.close() - if selinux is not None: - selinux.restorecon(self.unitfile) - sys.stdout.write(_("Created unit file %s\n") % self.unitfile) - - def add_dir(self, newd): - if newd in self.all_dirs: - return - for ignd in self.IGNORE_DIRS: - if newd.startswith(ignd): - return - for defd in self.DEFAULT_DIRS: - if newd.startswith(defd): - self.all_dirs.append(newd) - tmp_dirs = [] - for d in self.dirs: - if newd.startswith(d): - return - if not d.startswith(newd): - tmp_dirs.append(d) - self.dirs = tmp_dirs - self.dirs.append(newd) - break; - - def add_file(self, newf): - if newf in self.files: - return - for d in self.IGNORE_DIRS: - if newf.startswith(d): - return - for d in self.DEFAULT_DIRS: - if newf.startswith(d): - self.files.append(newf) - break; - - def get_name(self): - if self.config: - return self.config.get_name() - raise ValueError([_("Name not configured")]) - - def set_copy(self, copy): - self.copy = copy - - def get_security_dynamic(self): - return self.config.get_security_dynamic() - - def extract_rpms(self): - self.all_dirs = [] - self.dirs = [] - self.files = [] - - self.ts = rpm.ts() - - nb_packages = 0 - for u, src in self.unit_file_list: - rpm_name = self.get_rpm_for_unit(src) - if rpm_name: - self.extract_rpm(rpm_name) - nb_packages += 1 - - for package in self.packages: - self.extract_rpm(package) - nb_packages += 1 - - if nb_packages == 0: - raise ValueError([_("Cannot autodetect the package for unit files, please use --package")]) - - def split_filename(self, filename): - if filename[-4:] == '.rpm': - filename = filename[:-4] - - archIndex = filename.rfind('.') - arch = filename[archIndex+1:] - - relIndex = filename[:archIndex].rfind('-') - rel = filename[relIndex+1:archIndex] - - verIndex = filename[:relIndex].rfind('-') - ver = filename[verIndex+1:relIndex] - - epochIndex = filename.find(':') - if epochIndex == -1: - epoch = '' - else: - epoch = filename[:epochIndex] - - name = filename[epochIndex + 1:verIndex] - return name, ver, rel, epoch, arch - - def get_rpm_for_unit(self, unitfile): - mi = self.ts.dbMatch(rpm.RPMTAG_BASENAMES, unitfile) - try: - h = next(mi); - except StopIteration: - return None - return h['name'] - - - def extract_rpm(self, rpm_name): - mi = self.ts.dbMatch('name', rpm_name) - try: - h = next(mi); - except StopIteration: - raise ValueError([_("Cannot find package named %s") % rpm_name]) - - for fentry in h.fiFromHeader(): - fname = fentry[0] - - if os.path.isdir(fname): - self.add_dir(fname) - if os.path.isfile(fname): - self.add_file(fname) - - srcrpm = str(h[rpm.RPMTAG_SOURCERPM], encoding='utf-8') - srcrpmbits = self.split_filename(srcrpm) - - if srcrpmbits[0] == str(h[rpm.RPMTAG_NAME], encoding='utf-8'): - return - - mi = self.ts.dbMatch(rpm.RPMTAG_NAME, srcrpmbits[0]) - try: - h = next(mi); - except StopIteration: - raise ValueError([_("Cannot find base package %s") % srcrpmbits[0]]) - - for fentry in h.fiFromHeader(): - fname = fentry[0] - - if os.path.isdir(fname): - self.add_dir(fname) - if os.path.isfile(fname): - self.add_file(fname) - - def gen_hostname(self): - fd=open(self.dest + self.HOSTNAME, "w") - fd.write("%s\n" % self.name ) - fd.close() - - def gen_machine_id(self): - uuid_fd = open("/proc/sys/kernel/random/uuid") - uuid = uuid_fd.read().replace("-","").rstrip() - uuid_fd.close() - self.config.set_uuid(uuid) - fd=open(self.dest + self.MACHINE_ID, "w") - fd.write("%s\n" % uuid) - fd.close() - - if not self.use_image: - # Link /var/log/journal within the container to /var/log/journal/UUID - # on host. This will allow the hosts journalctl to easily read - # containers journal information. - jdir = "/var/log/journal/" - jpath = jdir + uuid - if not os.path.exists(self.dest + jpath): - os.makedirs(self.dest + jpath) - if not os.path.exists(jdir): - os.makedirs(jdir) - - os.symlink(self.dest + jpath, jpath) - - def gen_filesystems(self): - Container.gen_filesystems(self) - # 10 MB /run - mount = LibvirtSandbox.ConfigMountRam.new("/run", 10 * 1024 * 1024); - self.config.add_mount(mount) - - # 100 MB /tmp - mount = LibvirtSandbox.ConfigMountRam.new("/tmp", 100 * 1024 * 1024); - self.config.add_mount(mount) - - # 100 MB /tmp - mount = LibvirtSandbox.ConfigMountRam.new("/dev/shm", 100 * 1024 * 1024); - self.config.add_mount(mount) - - for d in self.BIND_SYSTEM_DIRS: - if d != "/var" and os.path.exists(d): - source = "%s%s" % ( self.dest, d) - self.add_bind_mount(source, d) - - for f in self.BIND_SYSTEM_FILES: - if os.path.exists(f): - source = "%s%s" % ( self.dest, f) - self.add_bind_mount(source, f) - - for d in self.dirs: - found = False - # Dont add dirs whos parents are in SYSTEM_DIRS - for s in self.BIND_SYSTEM_DIRS: - if d.startswith(s): - found = True - break - if not found: - source = "%s%s" % ( self.dest, d) - self.add_bind_mount(source, d) - - # /var contains the mounted image if there is an image: should be the - # last thing to mount - self.add_bind_mount("%s/var" % self.dest, "/var") - self.add_mounts() - - def get_expanded_unit_template(self, unit): - return unit.replace('@', '@' + self.name) - - def create_container_unit(self, src, dest, unit): - if is_template_unit(unit): - shutil.copy(src, dest + "/" + unit) - unit = self.get_expanded_unit_template(unit) - os.symlink(src, dest + "/" + unit) - - dropin_dir = "%s/%s.d" % (dest, unit) - if not os.path.exists(dropin_dir): - os.mkdir(dropin_dir) - - fd = open(dropin_dir + "/virt-sandbox.conf", "w") - fd.write("""; file placed here by virt-sandbox-service -[Service] -PrivateTmp=false -PrivateNetwork=false -""" ) - fd.close() - - def gen_content(self): - if self.copy: - for d in self.dirs: - copydirtree(d, "%s%s" % (self.dest, d)) - for f in self.files: - self.makedirs(os.path.dirname(f)) - shutil.copy(f, "%s%s" % (self.dest, f)) - else: - for d in self.all_dirs: - self.makedirs(d) - for f in self.files: - self.makedirs(os.path.dirname(f)) - self.makefile(f) - - for d in self.BIND_SYSTEM_DIRS + self.MAKE_SYSTEM_DIRS: - self.makedirs(d) - - for f in self.BIND_SYSTEM_FILES: - self.makefile(f) - - destpath = self.dest + self.SYSVINIT_PATH - for i in range(7): - os.mkdir(destpath+("/rc%s.d" % i)) - - # Copy both /etc/rc.d/init.d/functions and /lib/lsb/init-functions, even - # though the latter is the one recommended - if os.path.exists(self.SYSVINIT_PATH + "/init.d/functions"): - os.mkdir(destpath+"/init.d") - shutil.copy(self.SYSVINIT_PATH + "/init.d/functions" , destpath + "/init.d") - - if os.path.exists("/lib/lsb/init-functions"): - shutil.copy("/lib/lsb/init-functions" , self.dest + "/lib/lsb/") - - self.gen_machine_id() - self.gen_hostname() - - for k in self.LOCAL_LINK_FILES: - for d in self.LOCAL_LINK_FILES[k]: - src = "../%s" % ( d) - dest = "%s%s/%s" % ( self.dest, k, d) - os.symlink(src,dest) - - unitdir = "/etc/systemd/system" - tgtdir = unitdir + "/multi-user.target.wants" - - self.makedirs(unitdir) - self.makedirs(tgtdir) - os.symlink("/run", self.dest + "/var/run") - - for i, src in self.unit_file_list: - self.create_container_unit(src, self.dest + unitdir, i) - if is_template_unit(i): - i = self.get_expanded_unit_template(i) - os.symlink(src, self.dest + tgtdir + "/" + i) - - tgtfile = unitdir + "/multi-user.target" - try: - fd = open(self.dest + tgtfile, "w") - fd.write("[Unit]\n") - fd.write("Description=Sandbox multi-user target\n") - fd.close() - except OSError as e: - if not e.errno == errno.EEXIST: - raise - - for p in self.PROFILE_FILES: - profile = "/etc/skel/" + p - if os.path.exists(profile): - shutil.copy(profile, self.dest + "/root/") - - self.fix_protection() - - def delete(self): - try: - uuid = self.config.get_uuid() - if uuid is not None: - jpath = "/var/log/journal/" + uuid - if os.path.lexists(jpath): - os.remove(jpath) - except Exception as e: - sys.stderr.write("%s: %s\n" % (sys.argv[0], e)) - sys.stderr.flush() - - Container.delete(self) - - if self.unitfile and os.path.exists(self.unitfile): - p = Popen(["/usr/bin/systemctl","disable", self.unitfile],stdout=PIPE, stderr=PIPE) - p.communicate() - if p.returncode and p.returncode != 0: - raise OSError(_("Failed to disable %s unit file") % self.unitfile) - os.remove(self.unitfile) - - def create_systemd(self): - self.extract_rpms() - Container.create(self) - self.gen_filesystems() - if self.image: - self.create_image() - self.gen_content() - self.umount() - sys.stdout.write(_("Created sandbox container image %s\n") % self.image) - else: - self.gen_content() - sys.stdout.write(_("Created sandbox container dir %s\n") % self.dest) - self.set_security_label() - self.create_system_unit() - self.config.set_boot_target("multi-user.target") - self.save_config() - - def create(self): - if os.path.exists(self.dest): - raise OSError(_("%s already exists") % self.dest) - - try: - self.create_systemd() - except Exception as e: - try: - self.delete() - except Exception as e2: - sys.stderr.write("Cleanup failed: %s\n" % str(e2)) - raise - - def reload(self, unitfiles): - class Args: - command = [] - noseclabel = None - name = self.name - uri = self.uri - args = Args() - args.command = [ "systemctl", "reload" ] + map(lambda x: x[0], unitfiles) - execute(args) - -MB = int(1000000) - -def delete(args): - config = read_config(args.name) - if config is None: - sys.stderr.write("Sandbox '%s' does not exist\n" % args.name) - sys.exit(1) - - if isinstance(config, gi.repository.LibvirtSandbox.ConfigServiceGeneric): - container = GenericContainer(uri=args.uri, config = config) - else: - container = SystemdContainer(uri=args.uri, config = config) - container.set_path(args.path) - container.delete() - -def create(args): - if len(args.command) > 0 and len(args.unitfiles) > 0: - raise ValueError([_("Commands cannot be specified with unit files")]) - - if len(args.command) == 0 and len(args.unitfiles) == 0: - raise ValueError([_("You must specify a command or a unit file")]) - - if args.packages and len(args.unitfiles) != 1: - raise ValueError([_("Option --package cannot be used without a unit file")]) - - if len(args.command) > 0: - container = GenericContainer(name = args.name, uri=args.uri, create = True) - container.set_command(args.command) - else: - container = SystemdContainer(name = args.name, uri=args.uri, create = True, packages = args.packages) - container.set_copy(args.copy) - container.set_unit_file_list(args.unitfiles) - for net in args.network: - container.add_network(net) - if args.security: - container.set_security(args.security) - container.set_uid(args.uid) - if not args.homedir: - args.homedir = pwd.getpwuid(args.uid).pw_dir - container.set_homedir(args.homedir) - if not args.username: - args.username = pwd.getpwuid(args.uid).pw_name - container.set_username(args.username) - if not args.gid: - args.gid = pwd.getpwuid(args.uid).pw_gid - container.set_gid(args.gid) - container.set_path(args.path) - container.set_file_type(args.file_type) - container.set_mounts(args.mounts) - if args.imagesize: - container.set_image(args.imagesize) - - container.create() - -def usage(parser, msg): - parser.print_help() - - sys.stderr.write("\n%s\n" % msg) - sys.stderr.flush() - sys.exit(1) - -def sandbox_reload(args): - config = read_config(args.name) - if isinstance(config, gi.repository.LibvirtSandbox.ConfigServiceGeneric): - raise ValueError([_("Generic Containers do not support reload")]) - container = SystemdContainer(uri = args.uri, config = config) - container.reload(args.unitfiles) - -def connect(args): - if args.uri == "lxc:///": - class Args: - command = [] - noseclabel = None - name = args.name - uri = args.uri - - args = Args() - args.command = [ "/bin/sh" ] - execute(args) - return - - print ("""\ -Connected to %s. -Type 'Ctrl + ]' to detach from the console. -""" % ( args.name )) - os.execl("/usr/libexec/virt-sandbox-service-util", - "virt-sandbox-service-util", - "-c", args.uri, - "-a", args.name) - -# -# Search Path for command to execute within the container. -# -def fullpath(cmd): - for i in [ "/", "./", "../" ]: - if cmd.startswith(i): - return cmd - for i in os.environ["PATH"].split(':'): - f = "%s/%s" % (i, cmd) - if os.access(f, os.X_OK): - return f - return cmd - -def execute(args): - if args.uri != "lxc:///": - raise ValueError([_("Can only execute commands inside of linux containers.")]) - - myexec = [ "virsh", "-c", args.uri, "lxc-enter-namespace" ] - if args.noseclabel: - myexec.append("--noseclabel") - myexec.extend([ args.name, "--", fullpath(args.command[0])] + args.command[1:]) - os.execv("/usr/bin/virsh", myexec) - -def clone(args): - config = read_config(args.source) - if isinstance(config, gi.repository.LibvirtSandbox.ConfigServiceGeneric): - container = GenericContainer(uri=args.uri, config=config) - else: - container = SystemdContainer(uri=args.uri, config=config) - newcontainer = None - - container.set_path(args.path) - - old_path = container.get_filesystem_path() - new_path = container.get_filesystem_path(args.dest) - - if os.path.exists(new_path): - raise OSError(_("%s already exists") % new_path) - - try: - fd = open(container.get_config_path(),"r") - recs = fd.read() - fd.close() - - newrec = recs.replace(old_path + "/", new_path + "/") - newrec = newrec.replace("name=" + args.source, "name=" + args.dest) - old_image_path = container.get_image_path() - if os.path.exists(old_image_path): - new_image_path = container.get_image_path(args.dest) - newrec = newrec.replace(old_image_path, new_image_path) - shutil.copy(old_image_path, new_image_path) - sys.stdout.write(_("Created sandbox container image %s\n") % new_image_path) - os.mkdir(new_path) - else: - copydirtree(old_path, new_path) - sys.stdout.write(_("Created sandbox container dir %s\n") % new_path) - - if isinstance(config, gi.repository.LibvirtSandbox.ConfigServiceGeneric): - newcontainer = GenericContainer(name=args.dest, uri=args.uri, create=True) - newcontainer.set_path(args.path) - else: - fd = open(container.get_unit_path()) - recs = fd.read() - fd.close() - - new_unit = container.get_unit_path(args.dest) - fd = open(new_unit, "wx") - fd.write(recs.replace(args.source, args.dest)) - fd.close() - - sys.stdout.write(_("Created unit file %s\n") % new_unit) - - config = LibvirtSandbox.Config.load_from_data(newrec) - newcontainer = SystemdContainer(config=config, uri=args.uri) - newcontainer.set_path(args.path) - newcontainer.gen_machine_id() - newcontainer.gen_hostname() - - if args.security: - newcontainer.set_security(args.security) - newcontainer.set_security_label() - newcontainer.save_config() - except Exception as e: - if newcontainer is not None: - newcontainer.delete() - raise - - -def upgrade_config_legacy(path): - config = LibvirtSandbox.Config.load_from_path(path) - - if isinstance(config, gi.repository.LibvirtSandbox.ConfigServiceGeneric): - container = GenericContainer(uri=args.uri, config=config) - else: - container = SystemdContainer(uri=args.uri, config=config) - - fd = open(container.get_unit_path()) - unitfile = fd.read() - fd.close() - - unitfile = unitfile.replace("/usr/bin/virt-sandbox-service start", - "/usr/libexec/virt-sandbox-service-util -c lxc:/// -s") - unitfile = unitfile.replace("/usr/bin/virt-sandbox-service reload", - "/usr/bin/virt-sandbox-service -c lxc:/// reload") - unitfile = unitfile.replace("/usr/bin/virt-sandbox-service stop", - "/usr/bin/virsh -c lxc:/// destroy") - - unitfile = re.sub("WantedBy=.*\.target", - "WantedBy=multi-user.target", - unitfile) - - os.remove(container.get_unit_path()) - fd = open(container.get_unit_path(), "wx") - fd.write(unitfile) - fd.close() - - sys.stdout.write(_("Created unit file %s\n") % - container.get_unit_path()) - - # Create new config file + libvirt persistent XML config - container.save_config() - # Kill legacy config file - os.remove(path) - - -def upgrade_config_current(path): - config = LibvirtSandbox.Config.load_from_path(path) - - if isinstance(config, gi.repository.LibvirtSandbox.ConfigServiceGeneric): - container = GenericContainer(uri=args.uri, config=config) - else: - container = SystemdContainer(uri=args.uri, config=config) - - # Create new config file + libvirt persistent XML config - container.update_config() - - -def upgrade_config(args): - newconfigfile = get_config_path(args.name) - oldconfigfile = get_legacy_config_path(args.name) - if os.path.exists(oldconfigfile): - upgrade_config_legacy(oldconfigfile) - elif os.path.exists(newconfigfile): - upgrade_config_current(newconfigfile) - else: - sys.stderr.write("Sandbox '%s' does not exist\n" % args.name) - sys.exit(1) - - -def upgrade_filesystem(args): - # This is where we'd look at RPM DB and upgrade the - # filesystem with new info for the unit files - pass - -# This function must be capable of reading configs created by -# old releases and "fixing" them to work with the new release -def upgrade(args): - upgrade_config(args) - upgrade_filesystem(args) - -import argparse -class AddMount(argparse.Action): - def __call__(self, parser, namespace, values, option_string=None): - newval = getattr(namespace, self.dest) - if not newval: - newval = [] - for v in values: - newval.append(v) - setattr(namespace, self.dest, newval) - -class SizeAction(argparse.Action): - def __call__(self, parser, namespace, values, option_string=None): - setattr(namespace, self.dest, int(values)) - -class CheckUnit(argparse.Action): - def __call__(self, parser, namespace, value, option_string=None): - def check_unit(unit): - src = "/etc/systemd/system/" + unit - if os.path.exists(src): - return src - src = "/usr/lib/systemd/system/" + unit - if os.path.exists(src): - return src - return None - src = check_unit(value) - if not src: - src = check_unit(value + ".service") - if src: - value = value + ".service" - else: - raise OSError(_("Requested unit %s does not exist") % value) - - unitfiles = getattr(namespace, self.dest) - if unitfiles: - unitfiles.append((value, src)) - else: - unitfiles = [ (value, src) ] - setattr(namespace, self.dest, unitfiles) - -class SetNet(argparse.Action): - def __call__(self, parser, namespace, values, option_string=None): - nets = getattr(namespace, self.dest) - if nets: - nets.append(values) - else: - nets = [values] - setattr(namespace, self.dest, nets) - -class CheckPackage(argparse.Action): - def __call__(self, parser, namespace, value, option_string=None): - nb_rpm = len(rpm.TransactionSet().dbMatch('name', value)) - if nb_rpm == 0: - raise OSError(_("Cannot find %s rpm") % value) - elif nb_rpm > 1: - raise OSError(_("%s rpm is installed more than once") % value) - packages = getattr(namespace, self.dest) - if packages: - packages.append(value) - else: - packages = [ value ] - setattr(namespace, self.dest, packages) - -def requires_name(parser): - parser.add_argument("name", - help=_("name of the sandbox container")) - -def default_security_opts(): - if selinux is None: - return None - - # XXX vary per URI for kvm/qemu/lxc. - # XXX generate a random category - return "static,label=system_u:system_r:svirt_lxc_net_t:s0" - -def gen_create_args(subparser): - parser = subparser.add_parser("create", - help=_("Create a sandbox container.")) - - parser.add_argument("-C", "--copy", default=False, - action="store_true", - help=_("copy content from the hosts /etc and /var directories that will be mounted within the sandbox")) - - parser.add_argument("-f", "--filetype", dest="file_type", - default=c.get_file_type(), - help=_("SELinux file type to assign to content within the sandbox. Default: %s") % c.get_file_type()) - parser.add_argument("--homedir", dest="homedir", - help=_("Specify the homedir for the container. Default: UID homedir.")) - parser.add_argument("-G", "--gid", dest="gid", - default=None, type=int, - help=_("Specify the login gid for the container. Default: login GID of the UID.")) - parser.add_argument("-i", "--imagesize", dest="imagesize", default = None, - action=SizeAction, - help=_("create image of this many megabytes.")) - parser.add_argument("-m", "--mount", dest="mounts",default=[], nargs="*", action=AddMount, - help=_("Mount a filesytem in the sandbox")) - parser.add_argument("-N", "--network", dest="network", - action=SetNet, default=[], - help=_("Specify the network configuration")) - parser.add_argument("-p", "--path", dest="path", default=c.DEFAULT_PATH, - help=_("select path to store sandbox content. Default: %s") % c.DEFAULT_PATH) - parser.add_argument("-s", "--security", dest="security", - default=default_security_opts(), - help=_("Specify the security model configuration for the sandbox: Defaults to dynamic")) - parser.add_argument("-u", "--unitfile", - action=CheckUnit, - dest="unitfiles", default=[], - help=_("Systemd Unit file to run within the systemd sandbox container. Commands cannot be specified with unit files.")) - parser.add_argument("-P", "--package", - action=CheckPackage, - dest="packages", default=[], - help=_("RPM package to be used in the container. Default: autodetected from unit files.")) - parser.add_argument("--username", dest="username", - help=_("Specify the username for the container. Default: UID username.")) - parser.add_argument("-U", "--uid", dest="uid", - default=os.getuid(),type=int, - help=_("Specify the uid for the container: Default to current UID.")) - - requires_name(parser) - parser.add_argument("command", default=[], nargs="*", - help=_("Command to run within the generic sandbox container. Commands cannot be specified with unit files.")) - - parser.set_defaults(func=create) - -def gen_connect_args(subparser): - parser = subparser.add_parser("connect", - help=_("Connect to a sandbox container")) - requires_name(parser) - parser.set_defaults(func=connect) - -def gen_execute_args(subparser): - parser = subparser.add_parser("execute", - help=_("Execute a command within a sandbox container. Only available for lxc:///")) - parser.add_argument("-N", "--noseclabel", dest="noseclabel", - default=False, action="store_true", - help=_("do not modify the label of the executable process. By default all commands execute with the label of the sandbox")) - requires_name(parser) - parser.add_argument("command", nargs="+", - help=_("command to execute within the container")) - parser.set_defaults(func=execute) - -def gen_reload_args(subparser): - parser = subparser.add_parser("reload", - help=_("Reload a running sandbox container")) - parser.add_argument("-u", "--unitfile", required=True, - action=CheckUnit, dest="unitfiles", - help=_("Systemd Unit file to reload within the sandbox container")) - requires_name(parser) - parser.set_defaults(func=sandbox_reload) - -def gen_clone_args(subparser): - parser = subparser.add_parser("clone", - help=_("Clone an existing sandbox container")) - parser.set_defaults(func=clone) - parser.add_argument("-p", "--path", dest="path", default=c.DEFAULT_PATH, - help=_("select path to copy sandbox content from/to. Default: %s") % c.DEFAULT_PATH) - parser.add_argument("-s", "--security", dest="security", - default=default_security_opts(), - help=_("Specify the security model configuration for the sandbox: Defaults to dynamic")) - - parser.add_argument("source", - help=_("source sandbox container name")) - parser.add_argument("dest", - help=_("dest name of the new sandbox container")) - -def gen_delete_args(subparser): - parser = subparser.add_parser("delete", - help=_("Delete a sandbox container")) - parser.add_argument("-p", "--path", dest="path", default=c.DEFAULT_PATH, - help=_("select path to delete sandbox content from. Default: %s") % c.DEFAULT_PATH) - requires_name(parser) - parser.set_defaults(func=delete) - -def gen_upgrade_args(subparser): - parser = subparser.add_parser("upgrade", - help=_("Upgrade the sandbox container")) - requires_name(parser) - parser.set_defaults(func=upgrade) - -if __name__ == '__main__': - c = Container() - - parser = argparse.ArgumentParser(description='Sandbox Container Tool') - parser.add_argument("-c", "--connect", required=False, dest="uri", default="lxc:///", - help=_("libvirt connection URI to use (lxc:/// [default] or qemu:///session)")) - - subparser = parser.add_subparsers(help=_("commands")) - gen_create_args(subparser) - gen_clone_args(subparser) - gen_connect_args(subparser) - gen_delete_args(subparser) - gen_execute_args(subparser) - gen_reload_args(subparser) - gen_upgrade_args(subparser) - - try: - args = parser.parse_args() - if args.uri[0:3] != "lxc": - sys.stderr.write("%s: only lxc:/// URIs are currently supported\n" % sys.argv[0]) - sys.exit(1) - if os.geteuid() != 0: - sys.stderr.write("%s: lxc:/// URIs are only supported when run as root\n" % sys.argv[0]) - sys.exit(1) - args.func(args) - sys.exit(0) - except KeyboardInterrupt as e: - sys.exit(0) - except ValueError as e: - sys.stderr.write("%s: %s\n" % (sys.argv[0], e)) - sys.stderr.flush() - sys.exit(1) - except IOError as e: - sys.stderr.write("%s: %s: %s\n" % (sys.argv[0], e.filename, e.strerror)) - sys.stderr.flush() - sys.exit(1) - except OSError as e: - sys.stderr.write("%s: %s\n" % (sys.argv[0], e)) - sys.stderr.flush() - sys.exit(1) - except GLib.GError as e: - sys.stderr.write("%s: %s\n" % (sys.argv[0], e)) - sys.stderr.flush() - sys.exit(1) diff --git a/bin/virt-sandbox-service-bash-completion.sh b/bin/virt-sandbox-service-bash-completion.sh deleted file mode 100755 index a101f4a..0000000 --- a/bin/virt-sandbox-service-bash-completion.sh +++ /dev/null @@ -1,141 +0,0 @@ -# This file is part of libvirt-sandbox. -# -# Copyright (C) 2012-2013 Red Hat, Inc. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# systemd is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with systemd; If not, see <http://www.gnu.org/licenses/>. -# -# Authors: Dan Walsh <dwalsh(a)redhat.com> -# -__contains_word () { - local word=$1; shift - for w in $*; do [[ $w = $word ]] && return 0; done - return 1 -} - -ALL_OPTS='-h --help' - -__get_all_unit_files () { - systemctl list-unit-files --no-legend | cut -d' ' -f 1 | grep -v '@' -} - -__get_all_containers () { - virt-sandbox-service list -} - -__get_all_running_containers () { - virt-sandbox-service list --running -} - -__get_all_file_types () { - seinfo -afile_type -x 2>/dev/null | tail -n +2 -} - -_virt_sandbox_service () { - local command=${COMP_WORDS[1]} - local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} - local verb comps - local -A VERBS=( - [CONNECT]='connect' - [CREATE]='create' - [DELETE]='delete' - [RELOAD]='reload' - [START]='start' - [EXECUTE]='execute' - [STOP]='stop' - [LIST]='list' - ) - local -A OPTS=( - [ALL]='-h --help' - [CREATE]='-C --copy -f --filetype -G --gid -i --imagesize --homedir -m --mount -N --network -p --path -s --security -u --unitfile --username -U -uid' - [LIST]='-r --running' - [RELOAD]='-u --unitfile' - [EXECUTE]='-N --noseclabel' - ) - - for ((i=0; $i <= $COMP_CWORD; i++)); do - if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && - ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG}]}; then - verb=${COMP_WORDS[i]} - break - fi - done - - if test "$verb" = "" && test "$prev" = "virt-sandbox-service" ; then - comps="${VERBS[*]}" - COMPREPLY=( $(compgen -W "$comps" -- "$cur") ) - return 0 - elif test "$verb" == "list" ; then - if test "$prev" = "-r" || test "$prev" = "--running" ; then - return 0 - fi - COMPREPLY=( $(compgen -W "${OPTS[ALL]} ${OPTS[LIST]} " -- "$cur") ) - return 0 - elif test "$verb" == "delete" ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} $( __get_all_containers ) " -- "$cur") ) - return 0 - elif test "$verb" == "start" ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} $( __get_all_containers ) " -- "$cur") ) - return 0 - elif test "$verb" == "stop" ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} $( __get_all_running_containers ) " -- "$cur") ) - return 0 - elif test "$verb" == "reload" ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} ${OPTS[RELOAD]} $( __get_all_running_containers ) " -- "$cur") ) - return 0 - elif test "$verb" == "connect" ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} $( __get_all_running_containers ) " -- "$cur") ) - return 0 - elif test "$verb" == "execute" ; then - if test "$prev" = "execute"; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} ${OPTS[EXECUTE]} $( __get_all_running_containers ) " -- "$cur") ) - else - COMPREPLY=( $( compgen -c -- "$cur") ) - fi - return 0 - elif test "$verb" == "create" ; then - if test "$prev" = "-p" || test "$prev" = "--path" ; then - COMPREPLY=( $( compgen -d -- "$cur") ) - compopt -o filenames - return 0 - elif test "$prev" = "-u" || test "$prev" = "--unitfile" ; then - COMPREPLY=( $(compgen -W "$( __get_all_unit_files ) " -- "$cur") ) - return 0 - elif test "$prev" = "-f" || test "$prev" = "--filetype" ; then - COMPREPLY=( $(compgen -W "$( __get_all_file_types ) " -- "$cur") ) - return 0 - elif test "$prev" = "-s" || test "$prev" = "--security" ; then - return 0 - elif test "$prev" = "-m" || test "$prev" = "--mount" ; then - return 0 - elif test "$prev" = "-n" || test "$prev" = "--network" ; then - return 0 - elif test "$prev" = "-i" || test "$prev" = "--imagesize" ; then - return 0 - elif __contains_word "$command" ${VERBS[CREATE]} ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]} ${OPTS[CREATE]}" -- "$cur") ) - return 0 - elif __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} ; then - COMPREPLY=( $(compgen -W "${OPTS[ALL]}" -- "$cur") ) - return 0 - fi - else - if ! __contains_word "${prev}" ${VERBS[*]} && - ! __contains_word "${prev}" ${OPTS[*]}; then - return 0 - fi - fi - COMPREPLY=( $(compgen -W "${OPTS[ALL]} $( __get_all_containers ) " -- "$cur") ) - return 0 -} -complete -F _virt_sandbox_service virt-sandbox-service diff --git a/bin/virt-sandbox-service-clone.pod b/bin/virt-sandbox-service-clone.pod deleted file mode 100644 index e9d997b..0000000 --- a/bin/virt-sandbox-service-clone.pod +++ /dev/null @@ -1,100 +0,0 @@ -=head1 NAME - -virt-sandbox-service clone - clone an existing Secure container - -=head1 SYNOPSIS - -Clone a Security container - - virt-sandbox-service [-c URI] clone [-h] [-p PATH] [-s SECURITY-OPTS] SOURCE DEST - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The clone command will clone the SOURCE security sandbox container into the DEST security sandbox container. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c> URI, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=item B<-p PATH>, B<--path PATH> - -Set path to copy container content from/to. This argument must match the value of -the C<-p> arg given when creating the original source container. - -Default: C</var/lib/libvirt/filesystems>. - -=item B<-s SECURITY-OPTIONS>, B<--security=SECURITY-OPTIONS> - -Use alternative security options. SECURITY-OPTIONS is a set of key=val pairs, -separated by commas. The following options are valid for SELinux - -=over 4 - -=item dynamic - -Dynamically allocate an SELinux label, using the default base context. -The default base context is system_u:system_r:svirt_lxc_net_t:s0 for LXC, -system_u:system_r:svirt_t:s0 for KVM, system_u:system_r:svirt_tcg_t:s0 -for QEMU. - -=item dynamic,label=USER:ROLE:TYPE:LEVEL - -Dynamically allocate an SELinux label, using the base context -USER:ROLE:TYPE:LEVEL, instead of the default base context. - -=item static,label=USER:ROLE:TYPE:LEVEL - -To set a completely static label. For example, -static,label=system_u:system_r:svirt_t:s0:c412,c355 - -=back - -=back - -=head1 EXAMPLE - -Execute /bin/sh in httpd1 container - - # virt-sandbox-service clone -s static,label=system_u:system_r:svirt_lxc_net_t:s0:c1,c2 httpd1 httpd2 - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 FILES - -Container content will be stored in subdirectories of -/var/lib/libvirt/filesystems, by default. You can manage the -content in these directories outside of the container and -processes within the container will see the content. - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-connect.pod b/bin/virt-sandbox-service-connect.pod deleted file mode 100644 index cefa37a..0000000 --- a/bin/virt-sandbox-service-connect.pod +++ /dev/null @@ -1,59 +0,0 @@ -=head1 NAME - -virt-sandbox-service connect - Connect to a security container console - -=head1 SYNOPSIS - - virt-sandbox-service [-c URI] connect [-h] NAME - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The connect command will connect to the security sandbox container console NAME. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c URI>, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=back - -=head1 EXAMPLE - -Connect to the in httpd1 container console - - # virt-sandbox-service connect httpd1 - # - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-create.pod b/bin/virt-sandbox-service-create.pod deleted file mode 100644 index d2f5fdb..0000000 --- a/bin/virt-sandbox-service-create.pod +++ /dev/null @@ -1,264 +0,0 @@ -=head1 NAME - -virt-sandbox-service create - Create a Security container - -=head1 SYNOPSIS - - virt-sandbox-service [-c URI] create [-h] [-C] [-f FILE_TYPE] - [--homedir HOMEDIR] [-G GID] [-i IMAGESIZE] - [[-m TYPE:DST=SRC ] ...] - [-N NETWORK] [-p PATH] [-s SECURITY] - [[-u UNITFILES] ...] [--username USERNAME] - [-U UID] [[-P package] ... ] - NAME -- COMMAND [ARG1 [ARG2...]] - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The create command can setup a sandbox for running one or more systemd unit files. -It can also setup a sandbox for running a command in an GenericContainer. -Specify a unit file to create the SystemdContainer and the command to create an -GenericContainer. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c URI>, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=item B<-u UNIT_FILE>, B<--unitfile UNIT_FILE> - -Name of the systemd unit file to be to run within the Systemd Container. -Can be repeated if multiple unit files are required within the sandbox. -Cannot be specified if you are using a COMMAND. If the unit file end -with @, this will be considered as a template, and a instantiated -systemd unit will be created, using the name of the container as a -instance identifier. - -=item B<-C>, B<--copy> - -Copy content from /etc and /var directories that will be mounted within the container. - -=item B<-G GID>, B<--gid GID> - -Set login gid to use within the container. - -Default: C<Login GID of UID>. - -=item B<-f FILETYPE>, B<--filetype FILETYPE> - -Set SELinux file type to use within container. - -Default: C<svirt_lxc_file_t>. - -=item B<-p PATH>, B<--path PATH> - -Set path to store container content. NB if this argument is used when creating -a container, the exact same argument must also be used when later cloning or -deleting the container. - -Default: C</var/lib/libvirt/filesystems>. - -=item B<--homedir HOMEDIR> - -Set homedir path to use within container. - -Default: C<UID's Homedir>. - -=item B<-m TYPE:DST=SRC>, B<--mount TYPE:DST=SRC> - -Sets up a mount inside the sandbox at B<DST> backed by B<SRC>. The -meaning of B<SRC> depends on the value of C<TYPE> specified: - -=over 4 - -=item B<host-bind> - -If B<TYPE> is B<host-bind>, then B<SRC> is interpreted as the path -to a directory on the host filesystem. If C<SRC> is the empty string, -then a temporary (empty) directory is created on the host before -starting the sandbox and deleted afterwards. The C<--include> option -is useful for populating these temporary directories with copies of host -files. - -=item B<host-image> - -If B<TYPE> is B<host-image>, then B<SRC> is interpreted as the path -to a disk image file on the host filesystem. The image should be -formatted with a filesystem that can be auto-detected by the sandbox, -such as B<ext3>, B<ext4>, etc. The disk image itself should be a raw -file, not qcow2 or any other special format - -=item B<guest-bind> - -If B<TYPE> is B<guest-bind>, then B<SRC> is interpreted as the path -to another directory in the container filesystem. - -=item B<ram> - -If B<TYPE> is B<ram>, then B<SRC> is interpreted as specifying the -size of the RAM disk in bytes. The suffix B<K>, B<KiB>, B<M>, -B<MiB>, B<G>, B<GiB> can used to alter the units from bytes to a -coarser level. - -=back - -Some examples - - -m host-bind:/tmp=/var/lib/sandbox/demo/tmp - -m host-image:/=/var/lib/sandbox/demo.img - -m guest-bind:/home=/tmp/home - -m ram:/tmp=500M - -=item B<-N NETWORK-OPTIONS>, B<--network NETWORK-OPTIONS> - -Add a network interface to the sandbox. By default the sandbox will -only have a loopback interface. This option allows for connectivity -to the LAN in some manner. NETWORK-OPTIONS is a set of -key=val pairs, separated by commas. The following options are valid - -=over 4 - -=item dhcp - -Configure the network interface using dhcp. This key takes no value. -No other keys may be specified. eg - - -N dhcp,source=default - --network dhcp,source=lan - -where 'source' is the name of any libvirt virtual network. - -=item source=NETWORK - -Set the name of the network to connect the interface to. C<NETWORK> -is the name of any libvirt virtual network. See also B<virsh net-list> - -=item mac=NN:NN:NN:NN:NN:NN - -Set the MAC address of the network interface, where each NN is a pair -of hex digits. - -=item address=IP-ADDRESS/PREFIX%BROADCAST - -Configure the network interface with the static IPv4 or IPv6 address -B<IP-ADDRESS>. The B<PREFIX> value is the length of the network -prefix in B<IP-ADDRESS>. The optional B<BROADCAST> parameter -specifies the broadcast address. Some examples - - address=192.168.122.1/24 - address=192.168.122.1/24%192.168.122.255 - address=2001:212::204:2/64 - -=item route=IP-NETWORK/PREFIX%GATEWAY - -Configure the network interface with the static IPv4 or IPv6 route -B<IP-NETWORK>. The B<PREFIX> value is the length of the network -prefix in B<IP-NETWORK>. The B<GATEWAY> parameter specifies the -address of the gateway for the route. Some examples - - route=192.168.122.255/24%192.168.1.1 - -=back - -=item B<-s SECURITY-OPTIONS>, B<--security=SECURITY-OPTIONS> - -Use alternative security options. SECURITY-OPTIONS is a set of key=val pairs, -separated by commas. The following options are valid for SELinux - -=over 4 - -=item dynamic - -Dynamically allocate an SELinux label, using the default base context. -The default base context is system_u:system_r:svirt_lxc_net_t:s0 for LXC, -system_u:system_r:svirt_t:s0 for KVM, system_u:system_r:svirt_tcg_t:s0 -for QEMU. - -=item dynamic,label=USER:ROLE:TYPE:LEVEL - -Dynamically allocate an SELinux label, using the base context -USER:ROLE:TYPE:LEVEL, instead of the default base context. - -=item static,label=USER:ROLE:TYPE:LEVEL - -To set a completely static label. For example, -static,label=system_u:system_r:svirt_t:s0:c412,c355 - -=back - -=item B<-i SIZE>, B<--image SIZE> - -Create file system image file of this size to store container content. - -=item B<-P PACKAGE>, B<--package PACKAGE> - -Package(s) to be used within the container. - -=item B<-U UID>, B<--uid UID> - -Set uid to use within container. - -Default: C<CURRENT UID>. - -=item B<--username USERNAME> - -Set username to use within container. - -Default: C<UID's Username>. - -=back - -=head1 EXAMPLE - -Create httpd1 Systemd container - - # virt-sandbox-service create -C -u httpd.service httpd1 - Created container dir /var/lib/libvirt/filesystems/httpd1 - Created sandbox config /etc/libvirt-sandbox/services/httpd1/config/sandbox.cfg - Created unit file /etc/systemd/system/httpd(a)httpd1.service - -Create foobar1 Generic container - - # virt-sandbox-service create -U 1234 foobar1 -- /usr/bin/foobar -a -b - Created container dir /var/lib/libvirt/filesystems/foobar1 - Created sandbox config /etc/libvirt-sandbox/services/foobar1/config/sandbox.cfg - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 FILES - -Container content will be stored in subdirectories of -C</var/lib/libvirt/filesystems>, by default. You can manage the -content in these directories outside of the container and -processes within the container will see the content. - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-delete.pod b/bin/virt-sandbox-service-delete.pod deleted file mode 100644 index 3b17b97..0000000 --- a/bin/virt-sandbox-service-delete.pod +++ /dev/null @@ -1,65 +0,0 @@ -=head1 NAME - -virt-sandbox-service delete - Delete a security container - -=head1 SYNOPSIS - - virt-sandbox-service [-c URI] delete [-h] [-p PATH] NAME - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The delete command will delete a sandbox container. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c URI>, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=item B<-p PATH>, B<--path PATH> - -Set path to delete container content from. This argument must match the value of -the C<-p> arg given when creating the original source container. - -Default: C</var/lib/libvirt/filesystems>. - -=back - -=head1 EXAMPLE - -Delete the httpd1 container - - # virt-sandbox-service delete httpd1 - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-execute.pod b/bin/virt-sandbox-service-execute.pod deleted file mode 100644 index 62771eb..0000000 --- a/bin/virt-sandbox-service-execute.pod +++ /dev/null @@ -1,71 +0,0 @@ -=head1 NAME - -virt-sandbox-service execute - execute commands inside Secure container - -=head1 SYNOPSIS - -Execute a command within a security container - - virt-sandbox-service [-c URI] execute [-h] [-N] NAME -- COMMAND [ARG1 [ARG2...]] - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The execute subcommand is used to execute commands within an already running container. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c> URI, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=item B<-N>, B<--noseclabel> - -Execute command within the container. - -=back - -=head1 EXAMPLE - -Execute /bin/sh in httpd1 container - - # virt-sandbox-service execute httpd1 -- /bin/sh - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 FILES - -Container content will be stored in subdirectories of -/var/lib/libvirt/filesystems, by default. You can manage the -content in these directories outside of the container and -processes within the container will see the content. - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-reload.pod b/bin/virt-sandbox-service-reload.pod deleted file mode 100644 index fe6fbcc..0000000 --- a/bin/virt-sandbox-service-reload.pod +++ /dev/null @@ -1,63 +0,0 @@ -=head1 NAME - -virt-sandbox-service reload - Reload a security container - -=head1 SYNOPSIS - - virt-sandbox-service [-c URI] reload [-h] -u UNIT_FILE NAME - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The reload command will reload a sandbox container. This is used when software is updated outside of a container and processes within the container need to reload or restart. For example, if you update your httpd software, and you had a running container that was using the httpd service, systemd would send the reload to the container. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c URI>, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=item B<-u UNIT_FILE>, B<--unitfile UNIT_FILE> - -Name of the systemd unit file to reload within the container. Can be repeated -if multiple unit files need to be reloaded within the sandbox. - -=back - -=head1 EXAMPLE - -Reload the httpd1 container - - # virt-sandbox-service reload -u httpd.service httpd1 - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-upgrade.pod b/bin/virt-sandbox-service-upgrade.pod deleted file mode 100644 index 76eb428..0000000 --- a/bin/virt-sandbox-service-upgrade.pod +++ /dev/null @@ -1,74 +0,0 @@ -=head1 NAME - -virt-sandbox-service upgrade - upgrade an existing Secure container - -=head1 SYNOPSIS - -Upgrade a Security container - - virt-sandbox-service [-c URI] upgrade NAME - -=head1 DESCRIPTION - -virt-sandbox-service is used to manage secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -The upgrade command will update the config files for NAME to be compatible -with the currently installed software version. NB this works in an upgrade -direction only, it is not possible to install older versions of the software -and use this command to downgrade the configs. - -If you have editted the main sandbox configuration file manually, this -command can also be used to update the libvirt guest configuration to -match it. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c URI>, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=back - -=head1 EXAMPLE - -Execute /bin/sh in httpd1 container - - # virt-sandbox-service upgrade httpd - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox-service(1)> - -=head1 FILES - -Container content will be stored in subdirectories of -/var/lib/libvirt/filesystems, by default. You can manage the -content in these directories outside of the container and -processes within the container will see the content. - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/bin/virt-sandbox-service-util.c b/bin/virt-sandbox-service-util.c deleted file mode 100644 index a0e090d..0000000 --- a/bin/virt-sandbox-service-util.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * virt-sandbox-service-util.c: libvirt sandbox service util command - * - * Copyright (C) 2012-2013 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Author: Daniel J Walsh <dwalsh(a)redhat.com> - * Author: Daniel P. Berrange <berrange(a)redhat.com> - */ - -#include <config.h> - -#include <libvirt-sandbox/libvirt-sandbox.h> -#include <glib/gi18n.h> - -#define STREQ(x,y) (strcmp(x,y) == 0) - -static gboolean do_close(GVirSandboxConsole *con G_GNUC_UNUSED, - gboolean error G_GNUC_UNUSED, - gpointer opaque) -{ - GMainLoop *loop = opaque; - g_main_loop_quit(loop); - return FALSE; -} - - -static void libvirt_sandbox_version(void) -{ - g_print(_("%s version %s\n"), PACKAGE, VERSION); - exit(EXIT_SUCCESS); -} - - -static GVirSandboxContext *libvirt_sandbox_get_context(const char *uri, - const char *name) -{ - GVirSandboxConfig *config = NULL; - GVirSandboxContextService *ctx = NULL; - GError *err = NULL; - GVirConnection *conn = NULL; - gchar *configfile = NULL; - - configfile = g_strdup_printf("/etc/libvirt-sandbox/services/%s/config/sandbox.cfg", name); - - if (uri) - conn = gvir_connection_new(uri); - else - conn = gvir_connection_new("lxc:///"); - - if (!gvir_connection_open(conn, NULL, &err)) { - g_printerr(_("Unable to open connection: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - if (!(config = gvir_sandbox_config_load_from_path(configfile, &err))) { - g_printerr(_("Unable to read config file %s: %s\n"), configfile, - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - if (!(ctx = gvir_sandbox_context_service_new(conn, GVIR_SANDBOX_CONFIG_SERVICE(config)))) { - g_printerr(_("Unable to create new context service: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - -cleanup: - g_free(configfile); - if (conn) - g_object_unref(conn); - if (config) - g_object_unref(config); - - return ctx ? GVIR_SANDBOX_CONTEXT(ctx) : NULL; -} - -static int container_start(const char *uri, const char *name, GMainLoop *loop) -{ - int ret = EXIT_FAILURE; - GError *err = NULL; - GVirSandboxConsole *con = NULL; - GVirSandboxContext *ctx = NULL; - - if (!(ctx = libvirt_sandbox_get_context(uri, name))) - goto cleanup; - - if (!(gvir_sandbox_context_start(ctx, &err))) { - g_printerr(_("Unable to start container: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - if (!(con = gvir_sandbox_context_get_log_console(ctx, &err))) { - g_printerr(_("Unable to get log console for container: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - gvir_sandbox_console_set_direct(con, TRUE); - - g_signal_connect(con, "closed", (GCallback)do_close, loop); - - if (gvir_sandbox_console_attach_stderr(con, &err) < 0) { - g_printerr(_("Unable to attach console to stderr in the container: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - /* Stop holding open libvirt connection */ - if (gvir_sandbox_console_isolate(con, &err) < 0) { - g_printerr(_("Unable to disconnect console from libvirt: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - gvir_sandbox_context_detach(ctx, NULL); - g_object_unref(ctx); - ctx = NULL; - - g_main_loop_run(loop); - - ret = EXIT_SUCCESS; - -cleanup: - if (ctx) - g_object_unref(ctx); - if (con) - g_object_unref(con); - return ret; -} - -static int container_attach(const char *uri, const char *name, GMainLoop *loop) -{ - int ret = EXIT_FAILURE; - GError *err = NULL; - GVirSandboxConsole *con = NULL; - GVirSandboxContext *ctx = NULL; - - if (!(ctx = libvirt_sandbox_get_context(uri, name))) - goto cleanup; - - if (!(gvir_sandbox_context_attach(ctx, &err))) { - g_printerr(_("Unable to attach to container: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - if (!(con = gvir_sandbox_context_get_shell_console(ctx, &err))) { - g_printerr(_("Unable to get shell console for container: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - gvir_sandbox_console_set_direct(con, TRUE); - - g_signal_connect(con, "closed", (GCallback)do_close, loop); - - if (!(gvir_sandbox_console_attach_stdio(con, &err))) { - g_printerr(_("Unable to attach to container: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - /* Stop holding open libvirt connection */ - if (gvir_sandbox_console_isolate(con, &err) < 0) { - g_printerr(_("Unable to disconnect console from libvirt: %s\n"), - err && err->message ? err->message : _("unknown")); - goto cleanup; - } - - gvir_sandbox_context_detach(ctx, NULL); - - g_object_unref(ctx); - ctx = NULL; - - g_main_loop_run(loop); - - ret = EXIT_SUCCESS; - -cleanup: - if (ctx) - g_object_unref(ctx); - if (con) - g_object_unref(con); - return ret; -} - - -static int (*container_func)(const char *uri, const char *name, GMainLoop *loop) = NULL; - -static gboolean libvirt_lxc_start(const gchar *option_name, - const gchar *value, - const gpointer *data, - const GError **error) - -{ - if (container_func) return FALSE; - container_func = container_start; - return TRUE; -} - -static gboolean libvirt_lxc_attach(const gchar *option_name, - const gchar *value, - const gpointer *data, - const GError **error) - -{ - if (container_func) return FALSE; - container_func = container_attach; - return TRUE; -} - -int main(int argc, char **argv) -{ - GError *err = NULL; - GMainLoop *loop = NULL; - int ret = EXIT_FAILURE; - pid_t pid = 0; - gchar *uri = NULL; - - gchar **cmdargs = NULL; - GOptionContext *context; - GOptionEntry options[] = { - { "version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, - libvirt_sandbox_version, N_("Display version information"), NULL }, - { "start", 's', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, - libvirt_lxc_start, N_("Start a container"), NULL }, - { "attach", 'a', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, - libvirt_lxc_attach, N_("Attach to a container"), NULL }, - { "pid", 'p', 0, G_OPTION_ARG_INT, &pid, - N_("Pid of process in container to which the command will run"), "PID"}, - { "connect", 'c', 0, G_OPTION_ARG_STRING, &uri, - N_("Connect to hypervisor Default:'lxc:///'"), "URI"}, - { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &cmdargs, - NULL, "CONTAINER_NAME" }, - { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL } - }; - const char *help_msg = N_("Run 'virt-sandbox-service-util --help' to see a full list of available command line options\n"); - - setlocale(LC_ALL, ""); - bindtextdomain(PACKAGE, LOCALEDIR); - bind_textdomain_codeset(PACKAGE, "UTF-8"); - textdomain(PACKAGE); - - if (!gvir_sandbox_init_check(&argc, &argv, &err)) - exit(EXIT_FAILURE); - - context = g_option_context_new (_("- Libvirt Sandbox Service")); - g_option_context_add_main_entries (context, options, NULL); - g_option_context_parse (context, &argc, &argv, &err); - - if (err) { - g_printerr("%s\n%s\n", - err->message, - gettext(help_msg)); - goto cleanup; - } - - if ( container_func == NULL ) { - g_printerr(_("Invalid command: You must specify --start or --attach\n%s"), - gettext(help_msg)); - goto cleanup; - } - - if (!cmdargs || !cmdargs[0] ) { - g_printerr(_("Invalid command CONTAINER_NAME required: %s"), - gettext(help_msg)); - goto cleanup; - } - - g_option_context_free(context); - - g_set_application_name(_("Libvirt Sandbox Service")); - - loop = g_main_loop_new(g_main_context_default(), 1); - ret = container_func(uri, cmdargs[0], loop); - g_main_loop_unref(loop); - -cleanup: - exit(ret); -} - -/* - * Local variables: - * c-indent-level: 4 - * c-basic-offset: 4 - * indent-tabs-mode: nil - * tab-width: 8 - * End: - */ diff --git a/bin/virt-sandbox-service.logrotate b/bin/virt-sandbox-service.logrotate deleted file mode 100644 index 6bb7d68..0000000 --- a/bin/virt-sandbox-service.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -for name in `/usr/bin/virsh -c lxc:/// -q list | awk '{print $2}'` -do - if test -d "/etc/libvirt-sandbox/services/$name" - then - /usr/bin/virt-sandbox-service -c lxc:/// execute $name -- /etc/cron.daily/logrotate - fi -done -exit 0 diff --git a/bin/virt-sandbox-service.pod b/bin/virt-sandbox-service.pod deleted file mode 100644 index e6f0739..0000000 --- a/bin/virt-sandbox-service.pod +++ /dev/null @@ -1,85 +0,0 @@ -=head1 NAME - -virt-sandbox-service - Secure container tool - -=head1 SYNOPSIS - - {create,clone,connect,delete,execute,reload,upgrade} - - commands: - - create create a sandbox container - - clone Clone an existing sandbox container - - connect Connect to a sandbox container - - delete Delete a sandbox container - - execute Execute a command within a sandbox container - - reload Reload a running sandbox container - - upgrade Upgrade an existing sandbox container - -=head1 DESCRIPTION - -virt-sandbox-service is used to provision secure sandboxed system services. -These applications will be launched via libvirt and run within a virtualization -technology such as LinuX Containers (LXC), or optionally QEMU/KVM. The -container / virtual machines will be secured by SELinux and resource -separated using cgroups. - -By default, it will use the libvirt LXC driver, with the C<lxc:///> URI. -This is different from libvirt's normal behaviour, which is to probe -for the best URI to use. Thus if using C<virsh> to get a list of containers, -one must specify an explicit URI for it, C<virsh -c lxc:///>. Alternatively -the C<LIBVIRT_DEFAULT_URI> environment variable can be set, or the config -file C</etc/libvirt/libvirt.conf> can have a default URI set. - -=head1 OPTIONS - -=over 4 - -=item B<-h>, B<--help> - -Display help message - -=item B<-c URI>, B<--connect URI> - -The connection URI for the hypervisor (currently only LXC URIs are -supported). - -=back - -=head1 SEE ALSO - -C<libvirt(8)>, C<selinux(8)>, C<systemd(8)>, C<virt-sandbox(1)>, -C<virt-sandbox-service-create(1)>, C<virt-sandbox-service-clone(1)>, -C<virt-sandbox-service-connect(1)>, C<virt-sandbox-service-delete(1)>, -C<virt-sandbox-service-execute(1)>, C<virt-sandbox-service-reload(1)>, -C<virt-sandbox-service-upgrade(1)> - -=head1 FILES - -Container content will be stored in subdirectories of -/var/lib/libvirt/filesystems, by default. You can manage the -content in these directories outside of the container and -processes within the container will see the content. - -=head1 AUTHORS - -Daniel Walsh <dwalsh(a)redhat.com> - -Daniel P. Berrange <dan(a)berrange.com> - -=head1 COPYRIGHT - -Copyright (C) 2011-2013 Red Hat, Inc. - -=head1 LICENSE - -virt-sandbox is distributed under the terms of the GNU LGPL v2+. -This is free software; see the source for copying conditions. -There is NO warranty; not even for MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE diff --git a/cfg.mk b/cfg.mk index 37e5050..39b54f6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -129,6 +129,6 @@ prev_version_file = /dev/null exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = ^libvirt-sandbox/tests -exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-sandbox/tests)|(libvirt-sandbox/libvirt-sandbox-init-*)|(bin/virt-sandbox.c)|(bin/virt-sandbox-service-util.c) +exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-sandbox/tests)|(libvirt-sandbox/libvirt-sandbox-init-*)|(bin/virt-sandbox.c) exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch] diff --git a/libvirt-sandbox.spec.in b/libvirt-sandbox.spec.in index f5868c1..125a361 100644 --- a/libvirt-sandbox.spec.in +++ b/libvirt-sandbox.spec.in @@ -101,17 +101,10 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_datadir}/bash-completion/completions/virt-sandbox-service -%config(noreplace) %{_sysconfdir}/cron.daily/virt-sandbox-service.logrotate -%dir %{_sysconfdir}/libvirt-sandbox/services %{_bindir}/virt-sandbox -%{_bindir}/virt-sandbox-service %{_bindir}/virt-sandbox-image -%{_libexecdir}/virt-sandbox-service-util %{python3_sitelib}/libvirt_sandbox %{_mandir}/man1/virt-sandbox.1* -%{_mandir}/man1/virt-sandbox-service.1* -%{_mandir}/man1/virt-sandbox-service-*.1* %files libs -f %{name}.lang %defattr(-,root,root,-) diff --git a/libvirt-sandbox/tests/containers_test.sh b/libvirt-sandbox/tests/containers_test.sh deleted file mode 100755 index 9b2a716..0000000 --- a/libvirt-sandbox/tests/containers_test.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# Simple script to setup hundreds of containers at the same time -# -# In order to create 100 containers execute -# containers_test.sh create apache 100 -# Start -# containers_test.sh start apache 100 -# Stop -# containers_test.sh stop apache 100 -# Delete -# containers_test.sh delete apache 100 -# - -create() { - virt-sandbox-service create -C -l s0:c$2 -u httpd.service $1 -} - -delete() { - virt-sandbox-service delete $1 -} - -start() { - systemctl start httpd(a)$1.service -} - -stop() { - systemctl stop httpd(a)$1.service -} - -command=$1 -name=$2 -repeat=$3 -for i in $(seq 1 $repeat) -do - eval $command $name$i $i -done diff --git a/po/POTFILES.in b/po/POTFILES.in index 724c49c..6c500b2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,4 @@ bin/virt-sandbox.c -bin/virt-sandbox-service-util.c libvirt-sandbox/libvirt-sandbox-builder-initrd.c libvirt-sandbox/libvirt-sandbox-builder-machine.c libvirt-sandbox/libvirt-sandbox-config.c -- 2.14.3

2 1

[libvirt] [dbus PATCH 0/2] Add missing properties from LIBVIRT 0.0.3
by Katerina Koukiou 26 Mar '18

26 Mar '18

Implemented the following properties: * virConnectGetVersion * virConnectNumOfDomains Katerina Koukiou (2): Add 'Version' property for virConnectGetVersion Add 'NumOfDomains' property for virConnectGetNumOfDomains data/org.libvirt.Connect.xml | 8 ++++++++ src/connect.c | 45 +++++++++++++++++++++++++++++++++++++++++++- test/test_connect.py | 9 +++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) -- 2.15.0

2 5

[libvirt] Plans for next release
by Daniel Veillard 26 Mar '18

26 Mar '18

I was reminded that the end of the month is very soon :-) I suggest to enter freeze tomorrow morning, then going RC2 on Thursday and then push the release over the week-end or Monday morning hope this works for all ! Daniel -- Daniel Veillard | Red Hat Developers Tools http://developer.redhat.com/ veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCHv2 0/6] Use query-cpus-fast instead of query-cpus
by Viktor Mihajlovski 26 Mar '18

26 Mar '18

The QEMU monitor commmand query-cpus is deprecated starting with QEMU 2.12.0 because it can adversely affect the performance of a running virtual machine. This series enables libvirt to use the new query-cpus-fast interface if supported by the local QEMU instance and is required in order to support QEMU once the interface has been removed. query-cpus-fast doesn't return the halted state for a virtual CPU, meaning that the vcpu.<n>.halted value won't be reported with 'virsh domstats' anymore. This is OK, as stats values are not guaranteed to be reported under all circumstances and on all architectures. Upstream discussion consensus was that the halted state was problematic anyway, as it had different semantics per architecture. The only known exploitation happened for s390, for this architecture the halted state will be computed based on an architecture-specific cpu value returned in query-cpus-fast. v1 -> v2: ========= Patch changes: 1/6: - add Acked-by: Peter Krempa 2/6: - evaluate capability outside of monitor code (changes signatures of qemuMonitorGetCPUInfo and qemuMonitorGetCpuHalted) - remove ternary expressions as requested by review - remove Reviewed-bys due to code changes 3/6 - adapt test cases to changes above - remove Reviewed-bys due to code changes 4/6 - replace callbacks for architecture data extraction with direct function calls - remove Reviewed-bys due to code changes Viktor Mihajlovski (6): qemu: add capability detection for query-cpus-fast qemu: use query-cpus-fast in JSON monitor tests: add qemumonitorjson tests for query-cpus-fast qemu: add architecture-specific CPU info handling tests: add testcase for s390 query-cpus-fast qemu: refresh vcpu halted state only via query-cpus-fast src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_domain.c | 21 +++- src/qemu/qemu_monitor.c | 30 +++-- src/qemu/qemu_monitor.h | 7 +- src/qemu/qemu_monitor_json.c | 116 +++++++++++++++++-- src/qemu/qemu_monitor_json.h | 3 +- .../qemumonitorjson-cpuinfo-ppc64-hotplug-4.data | 8 ++ .../qemumonitorjson-cpuinfo-s390-fast-cpus.json | 21 ++++ .../qemumonitorjson-cpuinfo-s390-fast-hotplug.json | 21 ++++ .../qemumonitorjson-cpuinfo-s390-fast.data | 19 ++++ ...emumonitorjson-cpuinfo-x86-basic-pluggable.data | 5 + ...qemumonitorjson-cpuinfo-x86-full-fast-cpus.json | 71 ++++++++++++ ...umonitorjson-cpuinfo-x86-full-fast-hotplug.json | 115 +++++++++++++++++++ .../qemumonitorjson-cpuinfo-x86-full-fast.data | 109 ++++++++++++++++++ .../qemumonitorjson-cpuinfo-x86-node-full.data | 2 + tests/qemumonitorjsontest.c | 123 ++++++++++++++++----- tests/qemumonitortestutils.c | 6 + tests/qemumonitortestutils.h | 1 + 19 files changed, 625 insertions(+), 58 deletions(-) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-cpus.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast-hotplug.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-s390-fast.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-cpus.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast-hotplug.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-x86-full-fast.data -- 1.9.1

2 19

[libvirt] [PATCH sandbox] Fix argparser incompatibilities with newer python 3
by Daniel P. Berrangé 26 Mar '18

26 Mar '18

Python 3 changes such that if no subparser command is listed, it just throws an error. To get back the old behavior we need to set the 'required' attribute and a dest name. Since we treat 'debug' as a global attribute we need to set that on the top level parser too, otherwise we get a missing attribute error with newish python 3 too. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-sandbox/image/cli.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index 490c5e0..d2035de 100644 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -202,7 +202,6 @@ Example supported URI formats: def gen_purge_args(subparser): parser = gen_command_parser(subparser, "purge", _("Purge cached template")) - requires_debug(parser) requires_template(parser) requires_template_dir(parser) parser.set_defaults(func=purge) @@ -210,7 +209,6 @@ def gen_purge_args(subparser): def gen_prepare_args(subparser): parser = gen_command_parser(subparser, "prepare", _("Prepare local template")) - requires_debug(parser) requires_template(parser) requires_connect(parser) requires_template_dir(parser) @@ -219,7 +217,6 @@ def gen_prepare_args(subparser): def gen_run_args(subparser): parser = gen_command_parser(subparser, "run", _("Run an instance of a template")) - requires_debug(parser) requires_name(parser) requires_template(parser) requires_connect(parser) @@ -238,7 +235,6 @@ def gen_run_args(subparser): def gen_list_args(subparser): parser = gen_command_parser(subparser, "list", _("List locally cached images")) - requires_debug(parser) requires_template_dir(parser) parser.add_argument("-s","--source", @@ -249,7 +245,11 @@ def gen_list_args(subparser): def main(): parser = argparse.ArgumentParser(description="Sandbox Container Image Tool") + requires_debug(parser) + subparser = parser.add_subparsers(help=_("commands")) + subparser.required = True + subparser.dest = "command" gen_purge_args(subparser) gen_prepare_args(subparser) gen_run_args(subparser) -- 2.14.3

2 1

[libvirt] [PATCH sandbox] rpm: fix references to python 2 packages / files
by Daniel P. Berrangé 26 Mar '18

26 Mar '18

Since we switched to python 3, we should have deps on the python 3 based packages, and look at the python 3 sitelib directory. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-sandbox.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt-sandbox.spec.in b/libvirt-sandbox.spec.in index 17e9dd9..f5868c1 100644 --- a/libvirt-sandbox.spec.in +++ b/libvirt-sandbox.spec.in @@ -36,12 +36,12 @@ BuildRequires: zlib-devel >= 1.2.0, zlib-static BuildRequires: libtirpc-devel BuildRequires: rpcgen %endif -Requires: rpm-python +Requires: python3-rpm # For virsh lxc-enter-namespace command Requires: libvirt-client >= %{libvirt_version} Requires: systemd >= 198 Requires: pygobject3-base -Requires: libselinux-python +Requires: libselinux-python3 Requires: %{name}-libs = %{version}-%{release} Requires: %{_bindir}/virt-builder @@ -108,7 +108,7 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-sandbox-service %{_bindir}/virt-sandbox-image %{_libexecdir}/virt-sandbox-service-util -%{python_sitelib}/libvirt_sandbox +%{python3_sitelib}/libvirt_sandbox %{_mandir}/man1/virt-sandbox.1* %{_mandir}/man1/virt-sandbox-service.1* %{_mandir}/man1/virt-sandbox-service-*.1* -- 2.14.3

2 1

[libvirt] [PATCH sandbox] Explicitly check for python3 in configure.ac
by Daniel P. Berrangé 26 Mar '18

26 Mar '18

A bare AM_PATH_PYTHON statement is satisfied by any version of python >= 2.0.0, but we converted to Python 3, so should be explicit about it. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index cb7a483..28305d2 100644 --- a/configure.ac +++ b/configure.ac @@ -130,7 +130,7 @@ dnl Should be in m4/virt-gettext.m4 but intltoolize is too dnl dumb to find it there IT_PROG_INTLTOOL([0.35.0]) -AM_PATH_PYTHON +AM_PATH_PYTHON([3]) AC_OUTPUT(Makefile libvirt-sandbox/Makefile -- 2.14.3

2 1

[libvirt] [PATCH 0/5] Improve handling of multipath devices
by Michal Privoznik 26 Mar '18

26 Mar '18

Imagine you have a device mapper target which consists of 1..N disks (e.g. it's a multipath device, LUKS disk, whatever). Now, libvirt currently allows only the frontend (/dev/dm-1) in CGroups. However, this can make qemu fail [1] so we need to allow all the backend devices too. 1: https://bugzilla.redhat.com/show_bug.cgi?id=1557769#c22 Michal Privoznik (5): virlog: Don't log devmapper utils: Introduce virFileGetMPathTargets virfile: Introduce virFileMajMinToName qemu: Handle multipath devices properly news: Document multipath fix docs/news.xml | 10 ++++ libvirt.spec.in | 2 + src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 43 +++++++++++++- src/qemu/qemu_domain.c | 58 +++++++++++++++++++ src/util/virfile.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virfile.h | 7 +++ src/util/virlog.c | 23 ++++++++ 8 files changed, 285 insertions(+), 3 deletions(-) -- 2.16.1

2 14

[libvirt] [PATCH sandbox] Python 3 renamed string.lowercase to string.ascii_lowercase
by Daniel P. Berrangé 26 Mar '18

26 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-sandbox/image/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index d2035de..605183c 100644 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -81,7 +81,7 @@ def prepare(args): connect=args.connect) def random_domain_name(tmpl): - randomid = ''.join(random.choice(string.lowercase) for i in range(10)) + randomid = ''.join(random.choice(string.ascii_lowercase) for i in range(10)) return re.sub('[^a-z0-9-]', '_', tmpl.path[1:], re.I) + ":" + randomid def run(args): -- 2.14.3

2 2

[libvirt] [dbus PATCH v2 0/6] Use API calls supporting flags
by Katerina Koukiou 26 Mar '18

26 Mar '18

* Use API calls with flags parameter when possible * Since libvirt-dbus API doesn't follow strictly the naming of libvirt API there should be documentation regarding which libvirt API is used for each libvirt-dbus API. This patch introduces documentation annotations in D-Bus Interface XML files which will be used later to generate proper documentation. Katerina Koukiou (6): virtDBusDomainGetVcpus: Should be implemented as method and not as property virtDBusDomainShutdown: Use virDomainShutdownFlags instead of virDomainShutdown virtDBusDomainCreate: Use virDomainCreateWithFlags instead of virDomainCreate virtDBusDomainUndefine: Use virDomainUndefineFlags instead of virDomainUndefine virtDBusDomainDestroy: Use virDomainDestroyFlags instead of virDomainDestroy Use Documentation Annotations in D-Bus Interface XML data/org.libvirt.Connect.xml | 24 ++++++++++++ data/org.libvirt.Domain.xml | 87 +++++++++++++++++++++++++++++++++++++------- src/domain.c | 71 +++++++++++++++++++++++------------- test/test_domain.py | 22 +++++++---- 4 files changed, 157 insertions(+), 47 deletions(-) -- 2.15.0

2 10

[libvirt] [tck PATCH] require libguestfs-tool package
by Laine Stump 26 Mar '18

26 Mar '18

The nwfilter tests use virt-builder to download and configure a guest appliance, but we don't require the libguestfs-tools package. Up until now it's just happened that it was always already installed on the test systems, so it wasn't a problem, but it's annoying to have to type the one extra install command when setting up a new machine to run the tests. Signed-off-by: Laine Stump <laine(a)laine.org> --- perl-Sys-Virt-TCK.spec.PL | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 7c83be9..9694227 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -75,6 +75,7 @@ Requires: perl(TAP::Formatter::JUnit) Requires: perl(TAP::Harness::Archive) Requires: perl(Net::OpenSSH) Requires: perl(IO::Pty) +Requires: libguestfs-tools Requires: /usr/bin/mkisofs BuildArchitectures: noarch -- 2.14.3

2 1

[libvirt] [PATCH 0/2] Fix migration with implicit controllers (user-alias saga)
by Ján Tomko 26 Mar '18

26 Mar '18

*** GLUTEN-FREE BLURB *** Ján Tomko (2): virDomainDeviceAliasIsUserAlias: tolerate NULL qemu: do not drop implicit controllers with non-implicit attributes src/conf/domain_conf.c | 2 +- src/qemu/qemu_domain.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) -- 2.13.6

2 4

[libvirt] persistence of pcihole64 over live migration
by Richard, Joseph 25 Mar '18

25 Mar '18

Hello all, In order to reserve 64-bit address space for hotplugging, we are using the pcihole64 attribute on the root pci-controller. When doing a live-migration using libvirt/qemu, the pci-root controller is dropped and re-added on the destination side[1], which results in the pci controller's pcihole64 attribute that we configured when launching the VM being lost. Is there any reason to not keep this (by not dropping it in qemuDomainDefFormatBufInternal when pcihole64 is set on the controller) over a live migration in this case? [1] https://github.com/libvirt/libvirt/commit/b33eb0dca1175bc0e3f796f18e31adc1d… Thanks, Joseph Richard

3 2

[libvirt] [PATCH] build: Remove --with-xml-catalog-file option
by Rainer Müller 25 Mar '18

25 Mar '18

After validation against XHTML 1.0 was dropped in f802c9de0, the XML_CATALOG_FILE is not in use anymore. Therefore the checks in configure can be removed. --- configure.ac | 3 --- m4/virt-xml-catalog.m4 | 33 --------------------------------- 2 files changed, 36 deletions(-) delete mode 100644 m4/virt-xml-catalog.m4 diff --git a/configure.ac b/configure.ac index 56a7ad780..115eb6088 100644 --- a/configure.ac +++ b/configure.ac @@ -459,7 +459,6 @@ dnl LIBVIRT_ARG_DEBUG LIBVIRT_ARG_DTRACE LIBVIRT_ARG_NUMAD -LIBVIRT_ARG_XML_CATALOG LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_CHRDEV_LOCK_FILES LIBVIRT_ARG_DEFAULT_EDITOR @@ -473,7 +472,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_DEBUG LIBVIRT_CHECK_DTRACE LIBVIRT_CHECK_NUMAD -LIBVIRT_CHECK_XML_CATALOG LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_CHRDEV_LOCK_FILES LIBVIRT_CHECK_DEFAULT_EDITOR @@ -1032,7 +1030,6 @@ AC_MSG_NOTICE([ Use -Werror: $enable_werror]) AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS]) LIBVIRT_RESULT_DTRACE LIBVIRT_RESULT_NUMAD -LIBVIRT_RESULT_XML_CATALOG LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_CHRDEV_LOCK_FILES LIBVIRT_RESULT_DEFAULT_EDITOR diff --git a/m4/virt-xml-catalog.m4 b/m4/virt-xml-catalog.m4 deleted file mode 100644 index a25ae89f6..000000000 --- a/m4/virt-xml-catalog.m4 +++ /dev/null @@ -1,33 +0,0 @@ -dnl The XML catalog file check -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_ARG_XML_CATALOG], [ - LIBVIRT_ARG_WITH([XML_CATALOG_FILE], - [path to XML catalog file for validating generated html], - ['/etc/xml/catalog']) -]) - -AC_DEFUN([LIBVIRT_CHECK_XML_CATALOG], [ - dnl Specific XML catalog file for validation of generated html - AC_SUBST([XML_CATALOG_FILE], [$with_xml_catalog_file]) -]) - -AC_DEFUN([LIBVIRT_RESULT_XML_CATALOG], [ - AC_MSG_NOTICE([ XML Catalog: $with_xml_catalog_file]) -]) -- 2.16.2

2 3

[libvirt] [PATCH] polkit: reintroduce check for pkcheck
by Ján Tomko 23 Mar '18

23 Mar '18

Commit 2499d1a0 was too eager and possibly enabled polkit on all platforms with D-Bus, regardless of whether they use polkit. Reintroduce the usage of pkcheck as a witness for --with-polkit=check, but do not require it for --with-polkit=yes. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> Reported-by: Jiří Denemark <jdenemar(a)redhat.com> --- m4/virt-polkit.m4 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/m4/virt-polkit.m4 b/m4/virt-polkit.m4 index fd729dc98..16889e163 100644 --- a/m4/virt-polkit.m4 +++ b/m4/virt-polkit.m4 @@ -25,8 +25,17 @@ AC_DEFUN([LIBVIRT_ARG_POLKIT], [ AC_DEFUN([LIBVIRT_CHECK_POLKIT], [ AC_REQUIRE([LIBVIRT_CHECK_DBUS]) + if test "x$with_polkit" = "xcheck"; then + dnl For --with-polkit=check, also require the pkcheck binary, even + dnl though we talk to polkit directly over D-Bus. + AC_PATH_PROG([PKCHECK_PATH], [pkcheck], [], [$LIBVIRT_SBIN_PATH]) + if test "x$PKCHECK_PATH" = "x" ; then + with_polkit="no" + fi + fi + if test "x$with_polkit" = "xyes" || test "x$with_polkit" = "xcheck"; then - dnl All we need to talk to polkit is D-Bus. + dnl For --with-polkit=yes, all we need is D-Bus. if test "x$with_dbus" = "xyes" ; then AC_DEFINE_UNQUOTED([WITH_POLKIT], 1, [use PolicyKit for UNIX socket access checks]) -- 2.16.1

2 1

[libvirt] [PATCH v3 0/6] Add support for video and input devices on S390
by Farhan Ali 23 Mar '18

23 Mar '18

Hi, This patch series adds Libvirt support for video and input devices for QEMU guests on S390. QEMU v2.11.0 added support for the virtio-gpu-ccw device [1] and virtio-{keyboard, mouse, tablet}-ccw devices [2], which can be used as video and input devices respectively. Thanks Farhan [1] https://git.qemu.org/?p=qemu.git;a=commit;h=1f8ad88935f5cb5a2968909e392dbee… [2] https://git.qemu.org/?p=qemu.git;a=commit;h=3382cf1fabbf722dce931846853dae7… ChangeLog --------- v2 -> v3 - Update 2.12 capabilities files (patch 1 and 4). - Move video model change to it's own separate patch (patch 3). - Separate virtio-gpu-ccw tests into appropriate patches as per Jan's suggestions (patch 1, 2 and 3). - Squash virtio input ccw tests with functionality patch (patch 5). v1 -> v2 - Split virtio-gpu-ccw capability (patch 1) and functionality (patch 2) into 2 patches. - Code changes per John's comments (patch 2). - Split capability for input devices (patch 4) and functionality (patch 5) into 2 patches. - Modify news update as per John's suggestion (patch 7). Farhan Ali (6): qemu: Introduce a new capability for virtio-gpu-ccw qemu: Add support for virtio-gpu-ccw video device on S390 qemu: Change default video model type to virtio for S390 qemu: Introduce capabilities for virtio input ccw devices qemu: Add support for virtio input ccw devices news: Update for virtio-gpu-ccw and virtio input ccw devices docs/formatdomain.html.in | 5 ++ docs/news.xml | 10 +++ src/qemu/qemu_capabilities.c | 13 ++++ src/qemu/qemu_capabilities.h | 6 ++ src/qemu/qemu_command.c | 27 +++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 12 +++- src/qemu/qemu_process.c | 5 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 83 +++++++++++++++++++--- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 6 +- .../qemucapabilitiesdata/caps_2.12.0.s390x.replies | 81 ++++++++++++++++++--- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 4 ++ tests/qemuxml2argvdata/input-virtio-ccw.args | 26 +++++++ tests/qemuxml2argvdata/input-virtio-ccw.xml | 29 ++++++++ .../qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml | 18 +++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 25 +++++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml | 35 +++++++++ tests/qemuxml2argvtest.c | 15 ++++ tests/qemuxml2xmloutdata/input-virtio-ccw.xml | 37 ++++++++++ .../video-virtio-gpu-ccw-auto.xml | 35 +++++++++ tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml | 39 ++++++++++ tests/qemuxml2xmltest.c | 22 ++++++ 22 files changed, 508 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml -- 2.7.4

2 7

[libvirt] [PATCH 0/3] tests: Improvements and cleanups to capabilities testing
by Andrea Bolognani 23 Mar '18

23 Mar '18

*** BLURB NOW OR FOREVER HOLD YOUR PEACE *** Andrea Bolognani (3): tests: domaincaps: Order by architecture tests: domaincaps: Add QEMU 2.12 tests: qemucapabilities: Drop mostly duplicated data ...rt.aarch64.xml => qemu_2.12.0-virt.aarch64.xml} | 5 +- ...icv2-virt.aarch64.xml => qemu_2.12.0.ppc64.xml} | 51 +- ...icv2-virt.aarch64.xml => qemu_2.12.0.s390x.xml} | 50 +- tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml | 143 + ...irt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} | 0 tests/domaincapstest.c | 44 +- .../caps_2.10.0-gicv3.aarch64.replies | 16495 ----------------- .../caps_2.10.0-gicv3.aarch64.xml | 310 - ...aarch64.replies => caps_2.10.0.aarch64.replies} | 0 ...0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} | 0 .../caps_2.12.0-gicv2.aarch64.replies | 18551 ------------------- .../caps_2.12.0-gicv2.aarch64.xml | 322 - ...aarch64.replies => caps_2.12.0.aarch64.replies} | 0 ...0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} | 0 .../caps_2.6.0-gicv3.aarch64.replies | 13035 ------------- .../caps_2.6.0-gicv3.aarch64.xml | 287 - ....aarch64.replies => caps_2.6.0.aarch64.replies} | 0 ....0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} | 0 tests/qemucapabilitiestest.c | 9 +- 19 files changed, 192 insertions(+), 49110 deletions(-) rename tests/domaincapsschemadata/{qemu_2.6.0-gicv3-virt.aarch64.xml => qemu_2.12.0-virt.aarch64.xml} (95%) copy tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.12.0.ppc64.xml} (50%) copy tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.12.0.s390x.xml} (50%) create mode 100644 tests/domaincapsschemadata/qemu_2.12.0.x86_64.xml rename tests/domaincapsschemadata/{qemu_2.6.0-gicv2-virt.aarch64.xml => qemu_2.6.0-virt.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.10.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.replies => caps_2.10.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.10.0-gicv2.aarch64.xml => caps_2.10.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.replies => caps_2.12.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.12.0-gicv3.aarch64.xml => caps_2.12.0.aarch64.xml} (100%) delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies delete mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.replies => caps_2.6.0.aarch64.replies} (100%) rename tests/qemucapabilitiesdata/{caps_2.6.0-gicv2.aarch64.xml => caps_2.6.0.aarch64.xml} (100%) -- 2.14.3

2 4

[libvirt] [PATCH] conf: avoid reporting errors when network driver is disabled
by Daniel P. Berrangé 23 Mar '18

23 Mar '18

In previous releases all these methods were a no-op if the network driver is disabled. These helper methods are called unconditionally for all types of network interface, so must be no-ops if missing. Other code will already generate an error if the network driver is disabled and a NIC with type=network is used. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c8d051fa9f..79d6bd378e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -28979,10 +28979,13 @@ int virDomainNetAllocateActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { + /* Just silently ignore if network driver isn't present. If something + * has tried to use a NIC with type=network, other code will already + * cause an error. This ensures type=bridge doesn't break when + * network driver is compiled out. + */ if (!netAllocate) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device allocation not available")); - return -1; + return 0; } return netAllocate(dom, iface); @@ -28993,8 +28996,6 @@ virDomainNetNotifyActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { if (!netNotify) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device notification not available")); return; } @@ -29007,9 +29008,7 @@ virDomainNetReleaseActualDevice(virDomainDefPtr dom, virDomainNetDefPtr iface) { if (!netRelease) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device release not available")); - return -1; + return 0; } return netRelease(dom, iface); @@ -29020,9 +29019,7 @@ virDomainNetBandwidthChangeAllowed(virDomainNetDefPtr iface, virNetDevBandwidthPtr newBandwidth) { if (!netBandwidthChangeAllowed) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device bandwidth change query not available")); - return -1; + return 0; } return netBandwidthChangeAllowed(iface, newBandwidth); @@ -29033,9 +29030,7 @@ virDomainNetBandwidthUpdate(virDomainNetDefPtr iface, virNetDevBandwidthPtr newBandwidth) { if (!netBandwidthUpdate) { - virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("Network device bandwidth update not available")); - return -1; + return 0; } return netBandwidthUpdate(iface, newBandwidth); -- 2.14.3

2 2

[libvirt] [PATCH python] Disable Python 2 on future RHEL and Fedora > 29
by Daniel P. Berrangé 23 Mar '18

23 Mar '18

The end of Python 2 is nearing, so declare when it will be removed from libvirt Python binding RPMs. NB, this doesn't imply we'll be removing py2 support from upstream libvirt-python on the same timeframe - we'll consider what todo wrt that when upstream Python 2 finally goes EOL. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt-python.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libvirt-python.spec.in b/libvirt-python.spec.in index 7953c82..9697ea8 100644 --- a/libvirt-python.spec.in +++ b/libvirt-python.spec.in @@ -13,6 +13,10 @@ %endif %define _with_python2 1 +%if 0%{?fedora} > 29 || 0%{?rhel} > 7 +%define _with_python2 0 +%endif + %define _with_python3 0 %if 0%{?fedora} || 0%{?rhel} > 7 %define _with_python3 1 -- 2.14.3

2 1

[libvirt] [dbus PATCH 00/10] *** Use API calls supporting flags ***
by Katerina Koukiou 23 Mar '18

23 Mar '18

* Replace all API calls to support flags where possible. * Replace libvirt-dbus API method names to follow naming of libvirt API. * Change type of virtDBusDomainGetVcpus from property to method. Katerina Koukiou (10): virtDBusDomainGetVcpus: Should be implemented as method and not as property GetVcpus API method: Renamed to GetVcpusFlags virtDBusDomainShutdown: Use virDomainShutdownFlags instead of virDomainShutdown Shutdown API method: Renamed to ShutdownFlags virtDBusDomainCreate: Use virDomainCreateWithFlags instead of virDomainCreate Create API method: Renamed to CreateWithFlags virtDBusDomainUndefine: Use virDomainUndefineFlags instead of virDomainUndefine Undefine API method: Renamed to UndefineFlags virtDBusDomainDestroy: Use virDomainDestroyFlags instead of virDomainDestroy Destroy API method: Renamed to DestroyFlags data/org.libvirt.Domain.xml | 21 +++++-- src/domain.c | 134 +++++++++++++++++++++++++------------------- test/test_domain.py | 22 +++++--- 3 files changed, 106 insertions(+), 71 deletions(-) -- 2.15.0

3 14

[libvirt] [PATCH] qemu: Build smartcard command line more wisely
by Michal Privoznik 23 Mar '18

23 Mar '18

https://bugzilla.redhat.com/show_bug.cgi?id=1558317 Similarly to b133fac356324c3 we need to look up alias of CCID controller when constructing smartcard command line instead of relying on broken assumption it will always be 'ccid0'. After user aliases it can be anything. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 38 +++++++++++++++++++++++++++++++- tests/qemuxml2argvdata/user-aliases.args | 3 +++ tests/qemuxml2argvdata/user-aliases.xml | 11 +++++++++ tests/qemuxml2argvtest.c | 3 ++- 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a8afbd14fa..937a7d1b7b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8701,6 +8701,32 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver, } +static const char * +qemuBuildSmartcardFindCCIDController(const virDomainDef *def, + const virDomainSmartcardDef *smartcard) +{ + size_t i; + + /* Should never happen. But doesn't hurt to check. */ + if (smartcard->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID) + return NULL; + + for (i = 0; i < def->ncontrollers; i++) { + const virDomainControllerDef *tmp = def->controllers[i]; + + if (tmp->type != VIR_DOMAIN_CONTROLLER_TYPE_CCID) + continue; + + if (tmp->idx != smartcard->info.addr.ccid.controller) + continue; + + return tmp->info.alias; + } + + return NULL; +} + + static int qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, virCommandPtr cmd, @@ -8714,6 +8740,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, char *devstr; virBuffer opt = VIR_BUFFER_INITIALIZER; const char *database; + const char *contAlias = NULL; if (!def->nsmartcards) return 0; @@ -8811,8 +8838,17 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, virBufferFreeAndReset(&opt); return -1; } + + if (!(contAlias = qemuBuildSmartcardFindCCIDController(def, + smartcard))) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unable to find controller for %s"), + smartcard->info.alias); + return -1; + } + virCommandAddArg(cmd, "-device"); - virBufferAsprintf(&opt, ",id=%s,bus=ccid0.0", smartcard->info.alias); + virBufferAsprintf(&opt, ",id=%s,bus=%s.0", smartcard->info.alias, contAlias); virCommandAddArgBuffer(cmd, &opt); return 0; diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args index 4c9c951cef..ad93947104 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -31,6 +31,8 @@ server,nowait \ -global PIIX4_PM.disable_s4=0 \ -boot cd \ -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 \ +-device usb-ccid,id=ua-myCCID,bus=ua-SomeWeirdController.0,port=1 \ +-device usb-ccid,id=ua-myCCID2,bus=ua-SomeWeirdController.0,port=2 \ -usb \ -drive file=/var/lib/libvirt/images/fd.img,format=raw,if=none,\ id=drive-ua-myDisk1,cache=none \ @@ -55,6 +57,7 @@ bus=pci.0,addr=0x9 \ -device rtl8139,vlan=2,id=ua-AndAlsoClientMode,mac=52:54:00:8c:b1:f8,bus=pci.0,\ addr=0xa \ -net socket,connect=127.0.0.1:1234,vlan=2,name=hostua-AndAlsoClientMode \ +-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ua-myCCID.0 \ -chardev pty,id=charserial0 \ -device isa-serial,chardev=charserial0,id=serial0 \ -chardev pty,id=charserial1 \ diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml index 52132a82d7..9ce123b477 100644 --- a/tests/qemuxml2argvdata/user-aliases.xml +++ b/tests/qemuxml2argvdata/user-aliases.xml @@ -85,6 +85,14 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </controller> <controller type='fdc' index='0'/> + <controller type='ccid' index='0'> + <alias name='ua-myCCID'/> + <address type='usb' bus='0' port='1'/> + </controller> + <controller type='ccid' index='1'> + <alias name='ua-myCCID2'/> + <address type='usb' bus='0' port='2'/> + </controller> <interface type='ethernet'> <mac address='52:54:00:d6:c0:0b'/> <model type='virtio'/> @@ -109,6 +117,9 @@ <alias name='ua-AndAlsoClientMode'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0a' function='0x0'/> </interface> + <smartcard mode='host'> + <address type='ccid' controller='0' slot='0'/> + </smartcard> <serial type='pty'> <target type='isa-serial' port='0'> <model name='isa-serial'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5ece3f0cc6..064fd3b767 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2995,7 +2995,8 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_ISA_SERIAL, - QEMU_CAPS_HDA_DUPLEX); + QEMU_CAPS_HDA_DUPLEX, + QEMU_CAPS_CCID_EMULATED); DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI); DO_TEST("user-aliases-usb", QEMU_CAPS_KVM, QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, -- 2.16.1

2 1

[libvirt] [PATCH] qemu: domain: Drop declaration of qemuDomainDefValidateDisk
by Peter Krempa 23 Mar '18

23 Mar '18

There is no such function in our code. Commit abca72faa49 added it spuriously. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_domain.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 6d3e6eb5e3..63d9fb6d21 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -888,9 +888,6 @@ bool qemuDomainVcpuHotplugIsInOrder(virDomainDefPtr def) void qemuDomainVcpuPersistOrder(virDomainDefPtr def) ATTRIBUTE_NONNULL(1); -int qemuDomainDefValidateDisk(const virDomainDiskDef *disk, - virQEMUCapsPtr qemuCaps); - int qemuDomainCheckMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob); -- 2.16.2

1 0

[libvirt] [PATCH 0/4] Be consistent with vir*Obj*Remove* APIs
by John Ferlan 23 Mar '18

23 Mar '18

Using comments from recent changes/reviews w/ libxl and usage of the virDomainObjListRemove which note that it's "a problem" that the Remove API expects a locked @obj on input, but then returns the @obj unlocked. Although adjusting domainobjlist is a "future" task, we can at least modify the other drivers/vir*obj modules to be consistent at least with respect to expecting and returning a locked (and reffed) object. Thus, modify interface, secret, nodedev, and storage pool. The network is already done this way and nwfilter appears to be a lost cause as we cannot come to a concensus over how to use hash objects and thus the code still uses forward linked list object manipulation. Changes for virdomainobjlist require a number of other changes to happen first with respect to consistent usage of Find and Add API's to return locked and ref counted objects, then being able to have the virDomainObjListRemove be consistent as well. John Ferlan (4): secret: Return with locked obj from virSecretObjListRemove interface: Return with locked obj from virInterfaceObjListRemove nodedev: Return with locked obj from virNodeDeviceObjListRemove storagepool: Return with locked obj from virStoragePoolObjRemove src/conf/virinterfaceobj.c | 13 ++++++++++++- src/conf/virnodedeviceobj.c | 13 ++++++++++++- src/conf/virsecretobj.c | 15 ++++++++------- src/conf/virstorageobj.c | 17 ++++++++++++++--- src/node_device/node_device_hal.c | 4 ++-- src/node_device/node_device_udev.c | 2 +- src/secret/secret_driver.c | 4 ---- src/storage/storage_driver.c | 12 +----------- src/test/test_driver.c | 20 +++++--------------- 9 files changed, 55 insertions(+), 45 deletions(-) -- 2.13.6

2 6

[libvirt] [PATCH] lxc: report error message raised by the failing function
by Prafull 23 Mar '18

23 Mar '18

The code that calls VIR_WARN after a function fails, doesn't report the error message raised by the failing function. Such error messages are now reported in lxc/lxc_driver.c Signed-off-by: Prafullkumar T <talep158(a)gmail.com> --- src/lxc/lxc_driver.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f6b93b..4f600f3 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3915,8 +3915,8 @@ lxcDomainAttachDeviceDiskLive(virLXCDriverPtr driver, major(sb.st_rdev), minor(sb.st_rdev), perms) < 0) - VIR_WARN("cannot deny device %s for domain %s", - src, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + src, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4011,8 +4011,8 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, goto cleanup; } else { VIR_WARN("setting bandwidth on interfaces of " - "type '%s' is not implemented yet", - virDomainNetTypeToString(actualType)); + "type '%s' is not implemented yet: %s", + virDomainNetTypeToString(actualType), virGetLastErrorMessage()); } } @@ -4116,8 +4116,8 @@ lxcDomainAttachDeviceHostdevSubsysUSBLive(virLXCDriverPtr driver, if (virUSBDeviceFileIterate(usb, virLXCTeardownHostUSBDeviceCgroup, priv->cgroup) < 0) - VIR_WARN("cannot deny device %s for domain %s", - src, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + src, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4190,8 +4190,8 @@ lxcDomainAttachDeviceHostdevStorageLive(virLXCDriverPtr driver, major(sb.st_rdev), minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.storage.block, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.storage.block, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4262,8 +4262,8 @@ lxcDomainAttachDeviceHostdevMiscLive(virLXCDriverPtr driver, major(sb.st_rdev), minor(sb.st_rdev), VIR_CGROUP_DEVICE_RWM) < 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.storage.block, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.storage.block, vm->def->name, virGetLastErrorMessage()); goto cleanup; } @@ -4434,8 +4434,8 @@ lxcDomainDetachDeviceDiskLive(virDomainObjPtr vm, if (virCgroupDenyDevicePath(priv->cgroup, src, VIR_CGROUP_DEVICE_RWM, false) != 0) - VIR_WARN("cannot deny device %s for domain %s", - src, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + src, vm->def->name, virGetLastErrorMessage()); virDomainDiskRemove(vm->def, idx); virDomainDiskDefFree(def); @@ -4567,8 +4567,8 @@ lxcDomainDetachDeviceHostdevUSBLive(virLXCDriverPtr driver, if (virUSBDeviceFileIterate(usb, virLXCTeardownHostUSBDeviceCgroup, priv->cgroup) < 0) - VIR_WARN("cannot deny device %s for domain %s", - dst, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + dst, vm->def->name, virGetLastErrorMessage()); virObjectLock(hostdev_mgr->activeUSBHostdevs); virUSBDeviceListDel(hostdev_mgr->activeUSBHostdevs, usb); @@ -4623,8 +4623,8 @@ lxcDomainDetachDeviceHostdevStorageLive(virDomainObjPtr vm, if (virCgroupDenyDevicePath(priv->cgroup, def->source.caps.u.storage.block, VIR_CGROUP_DEVICE_RWM, false) != 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.storage.block, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.storage.block, vm->def->name, virGetLastErrorMessage()); virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); @@ -4673,8 +4673,8 @@ lxcDomainDetachDeviceHostdevMiscLive(virDomainObjPtr vm, if (virCgroupDenyDevicePath(priv->cgroup, def->source.caps.u.misc.chardev, VIR_CGROUP_DEVICE_RWM, false) != 0) - VIR_WARN("cannot deny device %s for domain %s", - def->source.caps.u.misc.chardev, vm->def->name); + VIR_WARN("cannot deny device %s for domain %s: %s", + def->source.caps.u.misc.chardev, vm->def->name, virGetLastErrorMessage()); virDomainHostdevRemove(vm->def, idx); virDomainHostdevDefFree(def); -- 2.1.4

3 2

[libvirt] [PATCH] remote: remove some __sun conditionals
by Daniel P. Berrangé 23 Mar '18

23 Mar '18

The libvirtd daemon has some arbitrary logic to drop privileges, but only on Solaris platforms. This was added during Xen days, when Xen was the only driver running in libvirtd. There's no expectation or testing that this works with the new libxl stack, nor whether dropping privileges breaks any of the secondary drivers. Finally, we'll be splitting drivers out into their own independant daemons, so this won't be applicable to libvirtd in future anyway. The remote driver client meanwhile arbitrarily disables daemon auto-spawn when connecting as non-root, breaking a key feature of libvirt unprivileged connections. Since we've not had any contributions for Solaris since circa 2012 and we don't do any CI testing we should consider this platform unmaintained and thus reasonable to remove this cruft. If someone steps forward to maintain Solaris again, this code would need re-evaluating to come up with something more targetted. There's various __sun conditionals in the Xen driver code, but those are not touched. This is all for the legacy Xen driver, which will be entirely removed at some point in future, so not benefit to hacking out just the Solaris parts. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_daemon.c | 33 --------------------------------- src/remote/remote_driver.c | 2 -- 2 files changed, 35 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 2f9dfad443..31c6ce1b61 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -675,30 +675,6 @@ daemonVersion(const char *argv0) printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); } -#ifdef __sun -static int -daemonSetupPrivs(void) -{ - chown("/var/run/libvirt", SYSTEM_UID, SYSTEM_UID); - - if (__init_daemon_priv(PU_RESETGROUPS | PU_CLEARLIMITSET, - SYSTEM_UID, SYSTEM_UID, PRIV_XVM_CONTROL, NULL)) { - VIR_ERROR(_("additional privileges are required")); - return -1; - } - - if (priv_set(PRIV_OFF, PRIV_ALLSETS, PRIV_FILE_LINK_ANY, PRIV_PROC_INFO, - PRIV_PROC_SESSION, PRIV_PROC_EXEC, PRIV_PROC_FORK, NULL)) { - VIR_ERROR(_("failed to set reduced privileges")); - return -1; - } - - return 0; -} -#else -# define daemonSetupPrivs() 0 -#endif - static void daemonShutdownHandler(virNetDaemonPtr dmn, siginfo_t *sig ATTRIBUTE_UNUSED, @@ -1336,15 +1312,6 @@ int main(int argc, char **argv) { goto cleanup; } - /* Beyond this point, nothing should rely on using - * getuid/geteuid() == 0, for privilege level checks. - */ - VIR_DEBUG("Dropping privileges (if required)"); - if (daemonSetupPrivs() < 0) { - ret = VIR_DAEMON_ERR_PRIVS; - goto cleanup; - } - daemonInitialize(); remoteProcs[REMOTE_PROC_AUTH_LIST].needAuth = false; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f765c09416..34e5ced0a9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1350,7 +1350,6 @@ remoteConnectOpen(virConnectPtr conn, */ if (!conn->uri) { VIR_DEBUG("Auto-probe remote URI"); -#ifndef __sun if (geteuid() > 0) { VIR_DEBUG("Auto-spawn user daemon instance"); rflags |= VIR_DRV_OPEN_REMOTE_USER; @@ -1359,7 +1358,6 @@ remoteConnectOpen(virConnectPtr conn, STRNEQ(autostart, "0"))) rflags |= VIR_DRV_OPEN_REMOTE_AUTOSTART; } -#endif } ret = doRemoteOpen(conn, priv, auth, conf, rflags); -- 2.14.3

2 1

[libvirt] [dbus PATCH v2] Convert testsuite from unittest to pytest
by Katerina Koukiou 23 Mar '18

23 Mar '18

Move to pytest to take advantage of: * tests parametrization * pdb support * more compact tests - not forcing large test classes Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- HACKING.md | 2 +- test/Makefile.am | 7 ++++--- test/conftest.py | 15 +++++++++++++++ test/libvirttest.py | 49 +++++++++++++++++++++++++++++-------------------- test/test_connect.py | 33 +++++++++++++++++---------------- test/test_domain.py | 37 +++++++++++++++++++------------------ test/travis-run | 2 +- 7 files changed, 86 insertions(+), 59 deletions(-) create mode 100644 test/conftest.py diff --git a/HACKING.md b/HACKING.md index 75aa6d0..bb22fd6 100644 --- a/HACKING.md +++ b/HACKING.md @@ -35,7 +35,7 @@ Running from git repository make check ``` - The test tool requires python3 and python3-dbus. + The test tool requires python3, python3-pytest and python3-dbus. * To run libvirt-dbus directly from the build dir without installing it diff --git a/test/Makefile.am b/test/Makefile.am index d3997f3..acb2d33 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,17 +1,18 @@ test_helpers = \ - libvirttest.py + libvirttest.py \ + conftest.py test_programs = \ test_connect.py \ test_domain.py -TESTS = $(test_programs) - EXTRA_DIST = \ $(test_helpers) \ $(test_programs) \ travis-run +TESTS = $(test_programs) + TESTS_ENVIRONMENT = \ abs_top_builddir=$(abs_top_builddir) \ VIRT_DBUS_INTERFACES_DIR=$(abs_top_srcdir)/data diff --git a/test/conftest.py b/test/conftest.py new file mode 100644 index 0000000..3bce7b7 --- /dev/null +++ b/test/conftest.py @@ -0,0 +1,15 @@ +import os +import pytest +import subprocess + + +(a)pytest.fixture(scope="session", autouse=True) +def dbus_daemon_session(): + """Fixture to start D-Bus message bus session daemon for use in the whole test suite. + """ + dbus_daemon = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], + stdout=subprocess.PIPE, universal_newlines=True) + os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_daemon.stdout.readline().strip() + yield + dbus_daemon.terminate() + dbus_daemon.wait(timeout=10) diff --git a/test/libvirttest.py b/test/libvirttest.py index 6a00aea..23fe536 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -1,34 +1,37 @@ -#!/usr/bin/python3 - from dbus.mainloop.glib import DBusGMainLoop from gi.repository import GLib import dbus import os +import pytest import subprocess +import sys import time -import unittest + root = os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirname(__file__))) exe = os.path.join(root, 'src', 'libvirt-dbus') DBusGMainLoop(set_as_default=True) -class TestCase(unittest.TestCase): - @classmethod - def setUpClass(cls): - cls.bus = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], - stdout=subprocess.PIPE, universal_newlines=True) - os.environ['DBUS_SESSION_BUS_ADDRESS'] = cls.bus.stdout.readline().strip() - @classmethod - def tearDownClass(cls): - cls.bus.terminate() - cls.bus.wait(timeout=10) +def run(): + exit(pytest.main(sys.argv)) - def setUp(self): - os.environ['LIBVIRT_DEBUG'] = '3' - self.daemon = subprocess.Popen([exe]) +class BaseTestClass(): + """ Base test class for whole test suite + """ + connect = None + bus = None + libvirt_dbus = None + loop = False + + @pytest.fixture(autouse=True) + def libvirt_dbus_setup(self, request): + """Start libvirt-dbus for each test function + """ + os.environ['LIBVIRT_DEBUG'] = '3' + self.libvirt_dbus = subprocess.Popen([exe]) self.bus = dbus.SessionBus() for i in range(10): @@ -41,12 +44,18 @@ class TestCase(unittest.TestCase): obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') self.connect = dbus.Interface(obj, 'org.libvirt.Connect') - def tearDown(self): - self.daemon.terminate() - self.daemon.wait(timeout=10) + @pytest.fixture(autouse=True) + def libvirt_dbus_teardown(self): + """Terminate libvirt-dbus at the teardown of each test + """ + yield + self.libvirt_dbus.terminate() + self.libvirt_dbus.wait(timeout=10) def main_loop(self): - self.assertFalse(getattr(self, 'loop', False)) + """Initializes the mainloop + """ + assert getattr(self, 'loop', False) is False def timeout(): self.loop.quit() diff --git a/test/test_connect.py b/test/test_connect.py index 4ec3fe0..a52140c 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -2,9 +2,10 @@ import dbus import libvirttest -import unittest -minimal_xml = ''' + +class TestConnect(libvirttest.BaseTestClass): + minimal_xml = ''' <domain type="test"> <name>foo</name> <memory>1024</memory> @@ -12,16 +13,15 @@ minimal_xml = ''' <type>hvm</type> </os> </domain> -''' + ''' -class TestConnect(libvirttest.TestCase): def test_list_domains(self): domains = self.connect.ListDomains(0) - self.assertEqual(type(domains), dbus.Array) - self.assertEqual(len(domains), 1) + assert isinstance(domains, dbus.Array) + assert len(domains) == 1 for path in domains: - self.assertEqual(type(path), dbus.ObjectPath) + assert isinstance(path, dbus.ObjectPath) domain = self.bus.get_object('org.libvirt', path) # ensure the path exists by calling Introspect on it @@ -29,29 +29,30 @@ class TestConnect(libvirttest.TestCase): def test_create(self): def domain_started(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStarted', domain_started) - path = self.connect.CreateXML(minimal_xml, 0) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.CreateXML(self.minimal_xml, 0) + assert isinstance(path, dbus.ObjectPath) self.main_loop() def test_define(self): def domain_defined(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainDefined', domain_defined) - path = self.connect.DefineXML(minimal_xml) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.DefineXML(self.minimal_xml) + assert isinstance(path, dbus.ObjectPath) self.main_loop() + if __name__ == '__main__': - unittest.main(verbosity=2) + libvirttest.run() diff --git a/test/test_domain.py b/test/test_domain.py index b1ab7a5..1bf9c1b 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -2,9 +2,9 @@ import dbus import libvirttest -import unittest -class TestDomain(libvirttest.TestCase): + +class TestDomain(libvirttest.BaseTestClass): def domain(self): path = self.connect.ListDomains(0)[0] obj = self.bus.get_object('org.libvirt', path) @@ -14,21 +14,21 @@ class TestDomain(libvirttest.TestCase): obj, domain = self.domain() props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(type(props['Name']), dbus.String) - self.assertEqual(type(props['UUID']), dbus.String) - self.assertEqual(type(props['Id']), dbus.UInt32) - self.assertEqual(type(props['Vcpus']), dbus.UInt32) - self.assertEqual(type(props['OSType']), dbus.String) - self.assertEqual(type(props['Active']), dbus.Boolean) - self.assertEqual(type(props['Persistent']), dbus.Boolean) - self.assertEqual(type(props['State']), dbus.String) - self.assertEqual(type(props['Autostart']), dbus.Boolean) + assert isinstance(props['Name'], dbus.String) + assert isinstance(props['UUID'], dbus.String) + assert isinstance(props['Id'], dbus.UInt32) + assert isinstance(props['Vcpus'], dbus.UInt32) + assert isinstance(props['OSType'], dbus.String) + assert isinstance(props['Active'], dbus.Boolean) + assert isinstance(props['Persistent'], dbus.Boolean) + assert isinstance(props['State'], dbus.String) + assert isinstance(props['Autostart'], dbus.Boolean) # Call all methods except Reset and GetStats, because the test backend # doesn't support those xml = domain.GetXMLDesc(0) - self.assertEqual(type(xml), dbus.String) + assert isinstance(xml, dbus.String) domain.Reboot(0) domain.Shutdown() @@ -38,8 +38,8 @@ class TestDomain(libvirttest.TestCase): def test_shutdown(self): def domain_stopped(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStopped', domain_stopped) @@ -48,14 +48,14 @@ class TestDomain(libvirttest.TestCase): domain.Shutdown() state = obj.Get('org.libvirt.Domain', 'State', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(state, 'shutoff') + assert state == 'shutoff' self.main_loop() def test_undefine(self): def domain_undefined(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainUndefined', domain_undefined) @@ -66,5 +66,6 @@ class TestDomain(libvirttest.TestCase): self.main_loop() + if __name__ == '__main__': - unittest.main(verbosity=2) + libvirttest.run() diff --git a/test/travis-run b/test/travis-run index 7577253..80b6dec 100755 --- a/test/travis-run +++ b/test/travis-run @@ -22,7 +22,7 @@ sudo chroot "$CHROOT" << EOF set -ex # install build deps apt-get update -apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus dbus +apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus python3-pytest dbus # run build and tests as user chown -R buildd:buildd /build -- 2.15.0

3 2

[libvirt] [PATCH v2 0/2] introduce libvirt-dbus binding
by Pavel Hrdina 23 Mar '18

23 Mar '18

Pavel Hrdina (2): docs: fix a typo in docs.html page docs: introduce libvirt-dbus binding docs/bindings.html.in | 13 ++++++- docs/dbus.html.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 8 ++-- docs/downloads.html.in | 15 ++++++++ 4 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 docs/dbus.html.in -- 2.14.3

2 4

[libvirt] [PATCH RFC] storage: Remove 'cow' disk format
by Peter Krempa 23 Mar '18

23 Mar '18

There's no tests for this format and nothing seems to specifically care about this format. QEMU does not even recognize it. Remove it completely. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/schemas/storagecommon.rng | 1 - src/util/virstoragefile.c | 31 +------------------------------ src/util/virstoragefile.h | 3 +-- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng index edee1b0845..310ed758ff 100644 --- a/docs/schemas/storagecommon.rng +++ b/docs/schemas/storagecommon.rng @@ -78,7 +78,6 @@ we know how to follow backing chains, and all others --> <define name='storageFormatBacking'> <choice> - <value>cow</value> <value>qcow</value> <value>qcow2</value> <value>qed</value> diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 67b9ec71ac..dd07f09d2c 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -67,7 +67,7 @@ VIR_ENUM_IMPL(virStorageFileFormat, /* Not direct file formats, but used for various drivers */ "fat", "vhd", "ploop", /* Formats with backing file below here */ - "cow", "qcow", "qcow2", "qed", "vmdk") + "qcow", "qcow2", "qed", "vmdk") VIR_ENUM_IMPL(virStorageFileFeature, VIR_STORAGE_FILE_FEATURE_LAST, @@ -170,8 +170,6 @@ struct FileTypeInfo { }; -static int cowGetBackingStore(char **, int *, - const char *, size_t); static int qcow1GetBackingStore(char **, int *, const char *, size_t); static int qcow2GetBackingStore(char **, int *, @@ -348,11 +346,6 @@ static struct FileTypeInfo const fileTypeInfo[] = { PLOOP_SIZE_MULTIPLIER, NULL, NULL, NULL }, /* All formats with a backing store probe below here */ - [VIR_STORAGE_FILE_COW] = { - 0, "OOOM", NULL, - LV_BIG_ENDIAN, 4, 4, {2}, - 4+4+1024+4, 8, 1, NULL, cowGetBackingStore, NULL - }, [VIR_STORAGE_FILE_QCOW] = { 0, "QFI", NULL, LV_BIG_ENDIAN, 4, 4, {1}, @@ -397,28 +390,6 @@ static const int qcow2CompatibleFeatureArray[] = { verify(ARRAY_CARDINALITY(qcow2CompatibleFeatureArray) == QCOW2_COMPATIBLE_FEATURE_LAST); -static int -cowGetBackingStore(char **res, - int *format, - const char *buf, - size_t buf_size) -{ -#define COW_FILENAME_MAXLEN 1024 - *res = NULL; - *format = VIR_STORAGE_FILE_AUTO; - - if (buf_size < 4+4+ COW_FILENAME_MAXLEN) - return BACKING_STORE_INVALID; - if (buf[4+4] == '\0') { /* cow_header_v2.backing_file[0] */ - *format = VIR_STORAGE_FILE_NONE; - return BACKING_STORE_OK; - } - - if (VIR_STRNDUP(*res, (const char*)buf + 4 + 4, COW_FILENAME_MAXLEN) < 0) - return BACKING_STORE_ERROR; - return BACKING_STORE_OK; -} - static int qcow2GetBackingStoreFormat(int *format, diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 596746ccb7..c84e013f46 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -82,8 +82,7 @@ typedef enum { * libvirt support for following a backing chain */ VIR_STORAGE_FILE_BACKING, - VIR_STORAGE_FILE_COW = VIR_STORAGE_FILE_BACKING, - VIR_STORAGE_FILE_QCOW, + VIR_STORAGE_FILE_QCOW = VIR_STORAGE_FILE_BACKING, VIR_STORAGE_FILE_QCOW2, VIR_STORAGE_FILE_QED, VIR_STORAGE_FILE_VMDK, -- 2.16.2

2 2

[libvirt] [PATCH] docs: introduce libvirt-dbus binding
by Pavel Hrdina 23 Mar '18

23 Mar '18

libvirt-dbus is a new binding that wraps libvirt API into D-Bus calls. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/bindings.html.in | 4 ++ docs/dbus.html.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++++ docs/docs.html.in | 1 + docs/downloads.html.in | 15 ++++++++ 4 files changed, 122 insertions(+) create mode 100644 docs/dbus.html.in diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 733c89bc20..236bdcf2ae 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -18,6 +18,10 @@ <strong>Go</strong>: Daniel Berrange develops <a href="https://godoc.org/github.com/libvirt/libvirt-go">Go bindings</a>. </li> + <li> + <strong>D-Bus</strong>: Pavel Hrdina develops + <a href="dbus.html">D-Bus bindings</a>. + </li> <li> <strong>Java</strong>: Daniel Veillard develops <a href="java.html">Java bindings</a>. diff --git a/docs/dbus.html.in b/docs/dbus.html.in new file mode 100644 index 0000000000..0da8096122 --- /dev/null +++ b/docs/dbus.html.in @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>D-Bus API bindings</h1> + + <ul id="toc"></ul> + + <h2><a name="description">Description</a></h2> + + <p> + libvirt-dbus wraps libvirt API to provide a high-level object-oriented + API better suited for dbus-based applications. + </p> + + <h2><a name="git">GIT source repository</a></h2> + <p> + The D-Bus bindings source code is maintained in a + <a href="https://git-scm.com/">git</a> repository available on + <a href="https://libvirt.org/git/">libvirt.org</a>: + </p> + +<pre> +git clone https://libvirt.org/git/libvirt-dbus.git +</pre> + + <p> + They can also be browsed online: + </p> + +<pre> +<a href="https://libvirt.org/git/?p=libvirt-dbus.git">https://libvirt.org/git/?p=libvirt-dbus.git</a> +</pre> + + <h2><a name="usage">Usage</a></h2> + + <p> + libvirt-dbus exports libvirt API using D-Bus objects with methods and + properties described by interfaces. Currently only local connection + to libvirt is exported and the list of supported drivers depends + on the type of the bus connection (session or system). + </p> + + <p> + The name of the libvirt-dbus service is <code>org.libvirt</code>. + libvirt-dbus distributes an interface XML descriptions which can be + usually found at <code>/usr/share/dbus-1/interfaces/</code>. + </p> + + <p> + By default unprivileged user has access only to the session D-Bus + connection. In order to allow specific user "foo" to access the system + D-Bus connection you need to create a file + <code>/etc/dbus-1/system.d/org.libvirt.conf</code> that contains: + </p> + +<pre> +<?xml version="1.0"?> +<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> + +<busconfig> + + <policy user="foo"> + <allow send_destination="org.libvirt"/> + </policy> + +</busconfig> +</pre> + + <p> + To get a list of supported drivers for the specific bus connection + you can run these commands (not all drivers may be available on + the host): + </p> + +<pre> +gdbus introspect --xml --session --dest org.libvirt --object-path /org/libvirt +gdbus introspect --xml --system --dest org.libvirt --object-path /org/libvirt +</pre> + + <p> + Every object is introspectable so you can get a list of available + interfaces with methods, signals and properties running this command: + </p> + +<pre> +gdbus introspect --xml --system --dest org.libvirt --object-path /org/libvirt/QEMU +</pre> + + <p> + To get a list of domains for specific connection driver you can run + this command: + </p> + +<pre> +gdbus call --system --dest org.libvirt --object-path /org/libvirt/QEMU \ + --method org.libvirt.Connect.ListDomains 0 +</pre> + + </body> +</html> diff --git a/docs/docs.html.in b/docs/docs.html.in index a8d544f83f..abd344ca2e 100644 --- a/docs/docs.html.in +++ b/docs/docs.html.in @@ -57,6 +57,7 @@ <dt><a href="bindings.html">Language bindings</a></dt> <dd>Bindings of the libvirt API for <a href="csharp.html">c#</a>, + <a href="dbus.html">D-Bus</a>, <a href="https://godoc.org/github.com/libvirt/libvirt-go">go</a>, <a href="java.html">java</a>, <a href="https://libvirt.org/ocaml/">ocaml</a>. diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 7c28e2ba9b..c2bc7af3e9 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -60,6 +60,21 @@ </td> <td></td> </tr> + <tr> + <td>D-Bus</td> + <td> + <a href="ftp://libvirt.org/libvirt/dbus/">ftp</a> + <a href="https://libvirt.org/sources/dbus/">https</a> + </td> + <td> + <a href="https://libvirt.org/git/?p=libvirt-dbus.git;a=summary">libvirt</a> + </td> + <td> + <a href="https://gitlab.com/libvirt/libvirt-dbus">gitlab</a> + <a href="https://github.com/libvirt/libvirt-dbus">github</a> + </td> + <td></td> + </tr> <tr> <td>Go</td> <td> -- 2.14.3

3 6

[libvirt] [PATCH 0/1] Add KVM on Z to Planet virttools
by Stefan Raspl 23 Mar '18

23 Mar '18

Stefan Raspl (1): Add KVM on Z to Planet virttools updater/virt-tools/config.ini | 3 +++ 1 file changed, 3 insertions(+) -- 2.13.5

3 3

[libvirt] ANNOUNCE: libvirt-dbus 0.0.1 released
by Pavel Hrdina 23 Mar '18

23 Mar '18

I'm happy to announce the release of libvirt-dbus 0.0.1. libvirt-dbus wraps libvirt API to provide high-level object-oriented API better suited for dbus-based applications. This is a first release which should be considered as unstable release since we don't promise API stability. You can download it here: https://libvirt.org/sources/dbus/libvirt-dbus-0.0.1.tar.gz This release contains a limited support of libvirt APIs as proof of concept, but we are planning to cover all relevant APIs. Thanks everybody who contributed! Pavel

1 0

[libvirt] [PATCH v4 0/5] Apparmor support for less common devices
by Christian Ehrhardt 23 Mar '18

23 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - Set(Memory|Input)Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) *Updates since v2* - Restore(Memory|Input)Label: drop secdef/relabel check - Set(Memory|Input)Label: check more pointers to be valid before using them *Updates since v3* - added the Acked-by of Jamie Strandboge on patches 1-4 - reuse the already existing tmpdir in virt-aa-helper-test for better cleanup Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 94 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 +++++++ tests/virt-aa-helper-test | 87 ++++++++++++++++++++++--------------- 3 files changed, 163 insertions(+), 34 deletions(-) -- 2.7.4

2 8

[libvirt] [PATCH] tools: fix variable scope in in check_guests_shutdown
by Christian Ehrhardt 23 Mar '18

23 Mar '18

libvirt-guests.sh when run with more active guests than requested to shut down in parallel will run until it times out only shutting down the first set of guests. This patch fixes parallel shutdown by fixing a variable scope issue where check_guests_shutdown unintentionally reset $guests which prevented further progress. Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1688508 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- tools/libvirt-guests.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in index d5e68e5..fcada31 100644 --- a/tools/libvirt-guests.sh.in +++ b/tools/libvirt-guests.sh.in @@ -333,11 +333,11 @@ guest_count() check_guests_shutdown() { uri=$1 - guests=$2 + guests_to_check=$2 guests_shutting_down= for guest in $guests; do - if ! guest_is_on "$uri" "$guest" >/dev/null 2>&1; then + if ! guest_is_on "$uri" "$guests_to_check" >/dev/null 2>&1; then eval_gettext "Failed to determine state of guest: \$guest. Not tracking it anymore." echo continue -- 2.7.4

3 3

[libvirt] [PATCH v2] test_driver: Add testDomainDestroyFlags
by Katerina Koukiou 22 Mar '18

22 Mar '18

Adding this for completeness Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Needed by the libvirt-dbus which is using test_driver for tests. src/test/test_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4de0cc533..99c27cc0a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1782,13 +1782,16 @@ static int testConnectListDomains(virConnectPtr conn, NULL, NULL); } -static int testDomainDestroy(virDomainPtr domain) +static int testDomainDestroyFlags(virDomainPtr domain, + unsigned int flags) { testDriverPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; virObjectEventPtr event = NULL; int ret = -1; + virCheckFlags(VIR_DOMAIN_DESTROY_GRACEFUL, -1); + if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; @@ -1813,6 +1816,11 @@ static int testDomainDestroy(virDomainPtr domain) return ret; } +static int testDomainDestroy(virDomainPtr domain) +{ + return testDomainDestroyFlags(domain, 0); +} + static int testDomainResume(virDomainPtr domain) { testDriverPtr privconn = domain->conn->privateData; @@ -6872,6 +6880,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ .domainReboot = testDomainReboot, /* 0.1.1 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ + .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ -- 2.15.0

2 1

[libvirt] [PATCH 00/11] tests: Add QAPI schema validation (blockdev-add saga)
by Peter Krempa 22 Mar '18

22 Mar '18

The new test APIs allow to validate JSON objects against the QAPI schema. The infrastructure was developed as part of not-yet-posted blockdev JSON property generator. It is quite useful for developing generators for complex objects against the schema. Since it's kind of useful by itself I decided to post it prior to finishing the blockdev work. It at least makes the 'simple' test cases in the qemumonitorjsontest slightly useful. Peter Krempa (11): util: buffer: Tolerate NULL 'buf' in virBufferStrcat qemu: caps: Move QAPI schema related code into separate file qemu: qapi: Fix naming of moved functions qemu: monitor: Move processing of QMP schema to the new file util: json: Add accessor for looking up JSON value type qemu: qapi: Return correct entry in virQEMUQapiSchemaTraverse tests: Add data file with QEMU QAPI schema tests: qemu: Add infrastructure for QAPI schema testing tests: qemumonitorjson: Fix few arguments of test cases tests: qemumonitor: Allow testing schema for fake monitor interactions tests: qemumonitorjson: Do some useful testing in the 'simple' tests po/POTFILES.in | 1 + src/libvirt_private.syms | 1 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_capabilities.c | 171 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_monitor_json.c | 41 +- src/qemu/qemu_monitor_json.h | 2 +- src/qemu/qemu_qapi.c | 237 + src/qemu/qemu_qapi.h | 40 + src/util/virbuffer.c | 3 + src/util/virjson.c | 7 + src/util/virjson.h | 2 + tests/Makefile.am | 3 + tests/qemuhotplugtest.c | 3 +- tests/qemumonitorjsontest.c | 117 +- tests/qemumonitortestutils.c | 85 +- tests/qemumonitortestutils.h | 7 +- tests/qemuqapischema.json | 11364 +++++++++++++++++++++++++++++++++++++++++ tests/testutilsqemuschema.c | 536 ++ tests/testutilsqemuschema.h | 30 + 21 files changed, 12446 insertions(+), 210 deletions(-) create mode 100644 src/qemu/qemu_qapi.c create mode 100644 src/qemu/qemu_qapi.h create mode 100644 tests/qemuqapischema.json create mode 100644 tests/testutilsqemuschema.c create mode 100644 tests/testutilsqemuschema.h -- 2.16.2

2 22

[libvirt] [PATCH v2 0/7] Add support for video and input devices on S390
by Farhan Ali 22 Mar '18

22 Mar '18

Hi, This patch series adds Libvirt support for video and input devices for QEMU guests on S390. QEMU v2.11.0 added support for the virtio-gpu-ccw device [1] and virtio-{keyboard, mouse, tablet}-ccw devices [2], which can be used as video and input devices respectively. Thanks Farhan [1] https://git.qemu.org/?p=qemu.git;a=commit;h=1f8ad88935f5cb5a2968909e392dbee… [2] https://git.qemu.org/?p=qemu.git;a=commit;h=3382cf1fabbf722dce931846853dae7… ChangeLog --------- v1 -> v2 - Split virtio-gpu-ccw capability (patch 1) and functionality (patch 2) into 2 patches. - Code changes per John's comments (patch 2). - Split capability for input devices (patch 4) and functionality (patch 5) into 2 patches. - Modify news update as per John's suggestion (patch 7). Farhan Ali (7): qemu: Introduce a new capability for virtio-gpu-ccw qemu: Add support for virtio-gpu-ccw video device on S390 tests: Add test cases for virtio-gpu-ccw qemu: Introduce capabilities for virtio input ccw devices qemu: Add support for virtio input ccw devices tests: Add test case for virtio input ccw devices news: Update for virtio-gpu-ccw and virtio input ccw devices docs/formatdomain.html.in | 5 ++ docs/news.xml | 10 +++ src/qemu/qemu_capabilities.c | 13 ++++ src/qemu/qemu_capabilities.h | 6 ++ src/qemu/qemu_command.c | 27 +++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 12 +++- src/qemu/qemu_process.c | 5 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 83 +++++++++++++++++++--- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 6 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 26 +++++++ tests/qemuxml2argvdata/input-virtio-ccw.xml | 29 ++++++++ .../qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml | 18 +++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 25 +++++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml | 35 +++++++++ tests/qemuxml2argvtest.c | 15 ++++ tests/qemuxml2xmloutdata/input-virtio-ccw.xml | 37 ++++++++++ .../video-virtio-gpu-ccw-auto.xml | 35 +++++++++ tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml | 39 ++++++++++ tests/qemuxml2xmltest.c | 22 ++++++ 20 files changed, 431 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml -- 2.7.4

2 13

[libvirt] [PATCH 0/2] rpc: cleanup some misc cruft
by Daniel P. Berrangé 22 Mar '18

22 Mar '18

Daniel P. Berrangé (2): rpc: remove remains of obsolete log_buffer_size config parameter rpc: avoid duplicating config in virtlockd/virtlogd augeas tests src/locking/test_virtlockd.aug.in | 15 ++++----------- src/locking/virtlockd.aug | 1 - src/locking/virtlockd.conf | 15 +++------------ src/logging/test_virtlogd.aug.in | 15 ++++----------- src/logging/virtlogd.aug | 1 - src/logging/virtlogd.conf | 5 ++++- src/remote/libvirtd.aug | 1 - src/remote/libvirtd.conf | 7 ------- src/remote/test_libvirtd.aug.in | 1 - 9 files changed, 15 insertions(+), 46 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH] test_driver: Add testDomainDestroyFlags
by Katerina Koukiou 22 Mar '18

22 Mar '18

Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- src/test/test_driver.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 4de0cc533..f9482970a 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1782,13 +1782,17 @@ static int testConnectListDomains(virConnectPtr conn, NULL, NULL); } -static int testDomainDestroy(virDomainPtr domain) +static int testDomainDestroyFlags(virDomainPtr domain, + unsigned int flags) { testDriverPtr privconn = domain->conn->privateData; virDomainObjPtr privdom; virObjectEventPtr event = NULL; int ret = -1; + virCheckFlags(0, -1); + + if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; @@ -1813,6 +1817,11 @@ static int testDomainDestroy(virDomainPtr domain) return ret; } +static int testDomainDestroy(virDomainPtr domain) +{ + return testDomainDestroyFlags(domain, 0); +} + static int testDomainResume(virDomainPtr domain) { testDriverPtr privconn = domain->conn->privateData; @@ -6872,6 +6881,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainShutdownFlags = testDomainShutdownFlags, /* 0.9.10 */ .domainReboot = testDomainReboot, /* 0.1.1 */ .domainDestroy = testDomainDestroy, /* 0.1.1 */ + .domainDestroyFlags = testDomainDestroyFlags, /* 4.2.0 */ .domainGetOSType = testDomainGetOSType, /* 0.1.9 */ .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ -- 2.15.0

1 0

[libvirt] [dbus PATCH] Convert testsuite from unittest to pytest
by Katerina Koukiou 22 Mar '18

22 Mar '18

Also add flake8 target in tests Makefile and rewrite some parts to be more pythonic. Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- HACKING.md | 2 +- test/Makefile.am | 15 ++++++++++++--- test/conftest.py | 15 +++++++++++++++ test/libvirttest.py | 51 ++++++++++++++++++++++++++++----------------------- test/test_connect.py | 35 +++++++++++++++-------------------- test/test_domain.py | 39 +++++++++++++++++---------------------- test/travis-run | 4 ++-- 7 files changed, 90 insertions(+), 71 deletions(-) create mode 100644 test/conftest.py diff --git a/HACKING.md b/HACKING.md index 75aa6d0..30d321c 100644 --- a/HACKING.md +++ b/HACKING.md @@ -35,7 +35,7 @@ Running from git repository make check ``` - The test tool requires python3 and python3-dbus. + The test tool requires python3, pytest and python3-dbus. * To run libvirt-dbus directly from the build dir without installing it diff --git a/test/Makefile.am b/test/Makefile.am index d3997f3..554c433 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,17 +1,26 @@ test_helpers = \ - libvirttest.py + libvirttest.py \ + conftest.py test_programs = \ test_connect.py \ test_domain.py -TESTS = $(test_programs) - EXTRA_DIST = \ $(test_helpers) \ $(test_programs) \ travis-run +TEST_PATH=./ + +lint: + flake8 --exclude=.tox --ignore=E501 + +test: + py.test --verbose --color=yes $(TEST_PATH) + +check: lint test + TESTS_ENVIRONMENT = \ abs_top_builddir=$(abs_top_builddir) \ VIRT_DBUS_INTERFACES_DIR=$(abs_top_srcdir)/data diff --git a/test/conftest.py b/test/conftest.py new file mode 100644 index 0000000..a468599 --- /dev/null +++ b/test/conftest.py @@ -0,0 +1,15 @@ +import os +import subprocess +import pytest + + +(a)pytest.fixture(scope="session", autouse=True) +def dbus_daemon_session(): + """Fixture to start D-Bus message bus session daemon for use in the whole test suite. + """ + dbus_daemon = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], + stdout=subprocess.PIPE, universal_newlines=True) + os.environ['DBUS_SESSION_BUS_ADDRESS'] = dbus_daemon.stdout.readline().strip() + yield + dbus_daemon.terminate() + dbus_daemon.wait(timeout=10) diff --git a/test/libvirttest.py b/test/libvirttest.py index 6a00aea..fc8c5c4 100644 --- a/test/libvirttest.py +++ b/test/libvirttest.py @@ -1,34 +1,33 @@ #!/usr/bin/python3 -from dbus.mainloop.glib import DBusGMainLoop -from gi.repository import GLib -import dbus import os import subprocess import time -import unittest +import pytest +from gi.repository import GLib +from dbus.mainloop.glib import DBusGMainLoop +import dbus -root = os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirname(__file__))) -exe = os.path.join(root, 'src', 'libvirt-dbus') +ROOT = os.environ.get('abs_top_builddir', os.path.dirname(os.path.dirname(__file__))) +EXE = os.path.join(ROOT, 'src', 'libvirt-dbus') DBusGMainLoop(set_as_default=True) -class TestCase(unittest.TestCase): - @classmethod - def setUpClass(cls): - cls.bus = subprocess.Popen(['dbus-daemon', '--session', '--print-address'], - stdout=subprocess.PIPE, universal_newlines=True) - os.environ['DBUS_SESSION_BUS_ADDRESS'] = cls.bus.stdout.readline().strip() - @classmethod - def tearDownClass(cls): - cls.bus.terminate() - cls.bus.wait(timeout=10) +class BaseTestClass(): + """ Base test class for whole test suite + """ + connect = None + bus = None + libvirt_dbus = None + loop = False - def setUp(self): + @pytest.fixture(autouse=True) + def libvirt_dbus_setup(self, request): + """Start libvirt-dbus for each test function + """ os.environ['LIBVIRT_DEBUG'] = '3' - - self.daemon = subprocess.Popen([exe]) + self.libvirt_dbus = subprocess.Popen([EXE]) self.bus = dbus.SessionBus() for i in range(10): @@ -41,12 +40,18 @@ class TestCase(unittest.TestCase): obj = self.bus.get_object('org.libvirt', '/org/libvirt/Test') self.connect = dbus.Interface(obj, 'org.libvirt.Connect') - def tearDown(self): - self.daemon.terminate() - self.daemon.wait(timeout=10) + @pytest.fixture(autouse=True) + def libvirt_dbus_teardown(self): + """Terminate libvirt-dbus at the teardown of each test + """ + yield + self.libvirt_dbus.terminate() + self.libvirt_dbus.wait(timeout=10) def main_loop(self): - self.assertFalse(getattr(self, 'loop', False)) + """Initializes the mainloop + """ + assert getattr(self, 'loop', False) is False def timeout(): self.loop.quit() diff --git a/test/test_connect.py b/test/test_connect.py index 4ec3fe0..14f70d5 100755 --- a/test/test_connect.py +++ b/test/test_connect.py @@ -1,10 +1,9 @@ -#!/usr/bin/python3 - import dbus import libvirttest -import unittest -minimal_xml = ''' + +class TestConnect(libvirttest.BaseTestClass): + minimal_xml = ''' <domain type="test"> <name>foo</name> <memory>1024</memory> @@ -12,16 +11,15 @@ minimal_xml = ''' <type>hvm</type> </os> </domain> -''' + ''' -class TestConnect(libvirttest.TestCase): def test_list_domains(self): domains = self.connect.ListDomains(0) - self.assertEqual(type(domains), dbus.Array) - self.assertEqual(len(domains), 1) + assert isinstance(domains, dbus.Array) + assert len(domains) == 1 for path in domains: - self.assertEqual(type(path), dbus.ObjectPath) + assert isinstance(path, dbus.ObjectPath) domain = self.bus.get_object('org.libvirt', path) # ensure the path exists by calling Introspect on it @@ -29,29 +27,26 @@ class TestConnect(libvirttest.TestCase): def test_create(self): def domain_started(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStarted', domain_started) - path = self.connect.CreateXML(minimal_xml, 0) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.CreateXML(self.minimal_xml, 0) + assert isinstance(path, dbus.ObjectPath) self.main_loop() def test_define(self): def domain_defined(name, path): - self.assertEqual(name, 'foo') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'foo' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainDefined', domain_defined) - path = self.connect.DefineXML(minimal_xml) - self.assertEqual(type(path), dbus.ObjectPath) + path = self.connect.DefineXML(self.minimal_xml) + assert isinstance(path, dbus.ObjectPath) self.main_loop() - -if __name__ == '__main__': - unittest.main(verbosity=2) diff --git a/test/test_domain.py b/test/test_domain.py index b1ab7a5..b176c29 100755 --- a/test/test_domain.py +++ b/test/test_domain.py @@ -1,10 +1,8 @@ -#!/usr/bin/python3 - import dbus import libvirttest -import unittest -class TestDomain(libvirttest.TestCase): + +class TestDomain(libvirttest.BaseTestClass): def domain(self): path = self.connect.ListDomains(0)[0] obj = self.bus.get_object('org.libvirt', path) @@ -14,21 +12,21 @@ class TestDomain(libvirttest.TestCase): obj, domain = self.domain() props = obj.GetAll('org.libvirt.Domain', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(type(props['Name']), dbus.String) - self.assertEqual(type(props['UUID']), dbus.String) - self.assertEqual(type(props['Id']), dbus.UInt32) - self.assertEqual(type(props['Vcpus']), dbus.UInt32) - self.assertEqual(type(props['OSType']), dbus.String) - self.assertEqual(type(props['Active']), dbus.Boolean) - self.assertEqual(type(props['Persistent']), dbus.Boolean) - self.assertEqual(type(props['State']), dbus.String) - self.assertEqual(type(props['Autostart']), dbus.Boolean) + assert isinstance(props['Name'], dbus.String) + assert isinstance(props['UUID'], dbus.String) + assert isinstance(props['Id'], dbus.UInt32) + assert isinstance(props['Vcpus'], dbus.UInt32) + assert isinstance(props['OSType'], dbus.String) + assert isinstance(props['Active'], dbus.Boolean) + assert isinstance(props['Persistent'], dbus.Boolean) + assert isinstance(props['State'], dbus.String) + assert isinstance(props['Autostart'], dbus.Boolean) # Call all methods except Reset and GetStats, because the test backend # doesn't support those xml = domain.GetXMLDesc(0) - self.assertEqual(type(xml), dbus.String) + assert isinstance(xml, dbus.String) domain.Reboot(0) domain.Shutdown() @@ -38,8 +36,8 @@ class TestDomain(libvirttest.TestCase): def test_shutdown(self): def domain_stopped(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainStopped', domain_stopped) @@ -48,14 +46,14 @@ class TestDomain(libvirttest.TestCase): domain.Shutdown() state = obj.Get('org.libvirt.Domain', 'State', dbus_interface=dbus.PROPERTIES_IFACE) - self.assertEqual(state, 'shutoff') + assert state == 'shutoff' self.main_loop() def test_undefine(self): def domain_undefined(name, path): - self.assertEqual(name, 'test') - self.assertEqual(type(path), dbus.ObjectPath) + assert name == 'test' + assert isinstance(path, dbus.ObjectPath) self.loop.quit() self.connect.connect_to_signal('DomainUndefined', domain_undefined) @@ -65,6 +63,3 @@ class TestDomain(libvirttest.TestCase): domain.Undefine() self.main_loop() - -if __name__ == '__main__': - unittest.main(verbosity=2) diff --git a/test/travis-run b/test/travis-run index 7577253..c2ab729 100755 --- a/test/travis-run +++ b/test/travis-run @@ -22,7 +22,7 @@ sudo chroot "$CHROOT" << EOF set -ex # install build deps apt-get update -apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus dbus +apt-get install -y dh-autoreconf pkg-config libvirt-dev libglib2.0-dev libtool python3-gi python3-dbus dbus pytest # run build and tests as user chown -R buildd:buildd /build @@ -31,6 +31,6 @@ set -ex cd /build/src ./autogen.sh make -j4 -make check || { cat test-suite.log; exit 1; } +make check EOU EOF -- 2.15.0

3 2

[libvirt] [PATCH] qemu: Fix virQEMUCapsCommands formatting
by John Ferlan 22 Mar '18

22 Mar '18

Starting with commit id 'fab9d6e1' the formatting of: { "command-name", QEMU_CAPS_NAME }, was altered to: { "command-name", QEMU_CAPS_NAME}, and then commit id 'e2b05c9a' altered that to: { "command-name", QEMU_CAPS_NAME} So, let's just fix that up to make things consistent with the rest of the structures. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Although I could say this was trivial, it does impact at least one upstream series (query-cpus-fast), so rather than just take that route, I figured it'd be better to give ample warning... I can also wait, but that series propagates the middle format with the comma at the end. src/qemu/qemu_capabilities.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 3eb5ed6d1a..3b1bc051af 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1577,9 +1577,9 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "migrate-incoming", QEMU_CAPS_INCOMING_DEFER }, { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-qmp-schema", QEMU_CAPS_QUERY_QMP_SCHEMA }, - { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION}, - { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS}, - { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES} + { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, + { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, + { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES }, }; struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { -- 2.13.6

2 1

[libvirt] [PATCH] remote: fix path for locating libvirtd in source tree during autostart
by Daniel P. Berrangé 22 Mar '18

22 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index f765c09416..0eec50b6bd 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1063,7 +1063,7 @@ doRemoteOpen(virConnectPtr conn, if ((flags & VIR_DRV_OPEN_REMOTE_AUTOSTART) && !(daemonPath = virFileFindResourceFull("libvirtd", NULL, NULL, - abs_topbuilddir "/daemon", + abs_topbuilddir "/src", SBINDIR, "LIBVIRTD_PATH"))) goto failed; -- 2.14.3

3 2

[libvirt] [jenkins-ci PATCH] guests: Fix ~/.ccache ownership
by Andrea Bolognani 22 Mar '18

22 Mar '18

The directory and the files contained within need to be owned by the user or compilation will fail, either loudly or silently depending on the OS, due to missing write permissions. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/tasks/users.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guests/tasks/users.yml b/guests/tasks/users.yml index 6134228..87693e0 100644 --- a/guests/tasks/users.yml +++ b/guests/tasks/users.yml @@ -55,8 +55,12 @@ file: path: /home/{{ flavor }}/.ccache state: directory + owner: '{{ flavor }}' + group: '{{ flavor }}' - name: '{{ flavor }}: Configure ccache' copy: src: files/ccache.conf dest: /home/{{ flavor }}/.ccache/ccache.conf + owner: '{{ flavor }}' + group: '{{ flavor }}' -- 2.14.3

2 1

[libvirt] PCI passthrough/SR-IOV on Cavium cn889x
by Ciprian Barbu 22 Mar '18

22 Mar '18

Hello, In the context of running Openstack on a cluster of Cavium ThunderX cn8890 aarch64 servers, we are trying to attach virtual functions to a VM. First some introduction. This Cavium SoC has a different approach to Virtual Functions than on x86 NICs, in which VFs are always enabled and there are two types of VFs and *one single* PF, as follows: - primary VFs - these are in fact assigned by the system to the physical ports of the server, e.g em2p1s0f1, em2p1s0f3 etc below. - secondary VFs - the main purpose of these is to provide additional HW queues under SW control (usually DPDK applications) by automatically binding them to the needed physical port. - one single "physical" function, device 0002:01:00.0 below, which to the best of my knowledge acts merely as a stub and cannot be assigned an interface name. Below is the output of "dpdk-devbind.py -s" which provides some useful information. Network devices using DPDK-compatible driver ============================================ 0002:01:00.2 'Device a034' drv=vfio-pci unused=nicvf Network devices using kernel driver =================================== 0000:01:10.0 'THUNDERX BGX (Common Ethernet Interface)' if= drv=thunder-BGX unused=thunder_bgx,vfio-pci 0000:01:10.1 'THUNDERX BGX (Common Ethernet Interface)' if= drv=thunder-BGX unused=thunder_bgx,vfio-pci 0002:01:00.0 'THUNDERX Network Interface Controller' if= drv=thunder-nic unused=nicpf,vfio-pci 0002:01:00.1 'Device a034' if=em2p1s0f1 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.3 'Device a034' if=em2p1s0f3 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.4 'Device a034' if=em2p1s0f4 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.5 'Device a034' if=em2p1s0f5 drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.6 'Device a034' if= drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:00.7 'Device a034' if= drv=thunder-nicvf unused=nicvf,vfio-pci 0002:01:01.0 'Device a034' if= drv=thunder-nicvf unused=nicvf,vfio-pci Now for the problem. I don't have a domain definition because libvirt fails to start a domain, but I might be able to find what nova generates. But what it tries to do is passthrough em2p1s0f3, address 0002:01:00.3: <interface type='hostdev' managed='yes'> <source> <address type='pci' domain='0x0002' bus='0x1' slot='0x0' function='0x3'/> </source> </interface> You can find attached a trimmed libvirtd.log where the main error is: 43236: error : virPCIGetVirtualFunctionInfo:2927 : internal error: The PF device for VF /sys/bus/pci/devices/0002:01:00.3 has no network device name I have actually spent a few days trying to do some hacks and learn some more. The main idea is that virPCIGetVirtualFunctionInfo fails to find the physical name for the virtual device at address 0002:01:00.3, which as I explained in the introduction is something that this Cavium SoC does not do. Looking further down the stream, almost all of the helper functions need a linkdev for the physical function, which means that making libvirt work on this system means some heavy refactoring, a solution being to use the sysfs path rather than the interface name. This will not work 100% from what I've seen, at least virNetDevGetVfConfig uses netlink to save the admin MAC (part of virNetDevSaveNetConfig), and netlink needs the ifname. So I'm quite stuck on finding a workaround/fix for this platform which would potentially be something upstreamable, so that we, ENEA, don't burden with maintaining an ugly hack. Right now we are using libvirt 3.5.0 but we can upgrade to something newer if need. The question(s) thus, are 1. is this problem known in the libvirt community? 2. Is there any plan to make it work? 3. Can you give some pointers on an approach to adapt libvirt to this system? 4. Maybe it's worth changing the kernel to assign a sort of dummy interface to the physical function? Thanks and sorry for the long email, /Ciprian

4 4

[libvirt] [dbus PATCH] m4: disable gcc8 -Wcast-function-type warnings from -Wextra
by Pavel Hrdina 22 Mar '18

22 Mar '18

GLib uses macros to create cleanup functions that are used by g_auto or g_autoptr macros. They expect a function defined as "void (*)(void *)" which is usually not that case. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. m4/virt-compile-warnings.m4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index f6ab795..6ece136 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -160,6 +160,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Need -fipa-pure-const in order to make -Wsuggest-attribute=pure # fire even without -O. wantwarn="$wantwarn -fipa-pure-const" + # We do "bad" function cast to define glib auto cleanup functions + wantwarn="$wantwarn -Wno-cast-function-type" if test "$enable_werror" = "yes" then -- 2.14.3

1 0

[libvirt] [PATCHv2 00/25] Python tweaks
by Radostin Stoyanov 22 Mar '18

22 Mar '18

Changes since v1 (https://www.redhat.com/archives/libvir-list/2018-March/msg01001.html) 01 - Fixed typo. 03 - Added whitespace after comma in: value = value + re.sub("^(\d+)U$","\\1", token[1]) 05 and 06 - Use printf style format and break strings everywhere there is a newline. 07 - Use try-except instead of an explicit check. 10 - Use isalnum() instead of a regex match, and a few more simplifications were added. 20 - Use try-except instead of an explicit check. 23 - Don't slice `line` in the loop condition. New patches: 9, 24, 25 The patches have been tested with `make check`, `make syntax-check`. The output of apibuild.py was tested with `cd docs/` followed by: srcdir=. builddir=. /usr/bin/python2 ./apibuild.py; sha1sum *.xml | sha1sum and srcdir=. builddir=. /usr/bin/python3 ./apibuild.py; sha1sum *.xml | sha1sum before and after the patches were applied. Radostin Stoyanov (25): apibuild: Use isinstance for type checking apibuild: Split imports on separate lines apibuild: Remove whitespace before ',' and ':' python: Add whitespace around = and % operators esx_vi_generator: Simplify generate_helper_source esx_vi_generator: Simplify generate_helper_header esx_vi_generator: Simplify get_occurrence_comment esx_vi_generator: Simplify alignment function cfg.mk: check ctype_macros only on *.[c|h] files apibuild: Simplify conditional statements python: Remove space around = in keyword args WmiClass: Don't share "versions" between instances apibuild: Simplify uniq function apibuild: Avoid double sorting of ids python3: cpu-reformat: Use the print() function apibuild: Drop backslash between brackets apibuild: Fix indentation not multiple of 4 apibuild: Simplify strip_lead_star() apibuild: Simplify parseTypeComment() apibuild: Simplify type checking of literals apibuild: Use list comprehension insteand of map apibuild: Simplify merging of preproc tokens apibuild: Simplify parsing string tokens apibuild: Remove redundant parentheses apibuild: Simplify getline() cfg.mk | 1 + docs/apibuild.py | 734 +++++++++++++++++-------------------- docs/index.py | 54 +-- src/esx/esx_vi_generator.py | 183 ++++----- src/hyperv/hyperv_wmi_generator.py | 36 +- tests/cputestdata/cpu-cpuid.py | 6 +- tests/cputestdata/cpu-reformat.py | 6 +- 7 files changed, 472 insertions(+), 548 deletions(-) -- 2.14.3

3 27

[libvirt] [dbus PATCH] run.in: fix typo in abs_top_builddir variable
by Pavel Hrdina 22 Mar '18

22 Mar '18

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under trivial rule. Thanks Katerina! run.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run.in b/run.in index 1e48dc8..e98edaf 100644 --- a/run.in +++ b/run.in @@ -15,7 +15,7 @@ # # Find this script -b=@abs_tob_builddir@ +b=@abs_top_builddir@ export VIRT_DBUS_INTERFACES_DIR="$b/data" -- 2.14.3

1 0

[libvirt] [dbus PATCH v3 0/5] rewrite to GDBus
by Pavel Hrdina 22 Mar '18

22 Mar '18

Changes in v3: - introduced run script to help running libvirt-dbus without installing it - improved README and HACKING Changes in v2: - removed patch that set the required libvirt version to libvirt-dbus version Pavel Hrdina (5): introduce support for GDBus implementation introduce run script to execute libvirt-dbus daemon switch from sd-bus to GDBus implementation main: introduce thread pool to process D-Bus messages docs: rewrite HACKING and README into markdown format and improve it .gitignore | 1 + HACKING | 199 ------------ HACKING.md | 191 +++++++++++ Makefile.am | 2 + README | 80 ----- README.md | 72 +++++ configure.ac | 17 +- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++++ data/org.libvirt.Domain.xml | 51 +++ libvirt-dbus.spec.in | 10 +- run.in | 22 ++ src/Makefile.am | 20 +- src/connect.c | 324 ++++++++----------- src/connect.h | 37 +-- src/domain.c | 748 ++++++++++++++++++++----------------------- src/domain.h | 6 +- src/events.c | 177 +++++----- src/gdbus.c | 453 ++++++++++++++++++++++++++ src/gdbus.h | 112 +++++++ src/main.c | 315 ++++++++---------- src/util.c | 167 ++++------ src/util.h | 53 ++- test/Makefile.am | 3 +- test/travis-run | 2 +- 25 files changed, 1796 insertions(+), 1329 deletions(-) delete mode 100644 HACKING create mode 100644 HACKING.md delete mode 100644 README create mode 100644 README.md create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 run.in create mode 100644 src/gdbus.c create mode 100644 src/gdbus.h -- 2.14.3

2 14

[libvirt] [jenkins-ci PATCH] guests: Drop Ubuntu 12.04 support
by Andrea Bolognani 22 Mar '18

22 Mar '18

As of commit d4ea32e85f9e, libvirt no longer performs Ubuntu 12.04 builds on Travis, and reproducing locally issues that would hit those CI jobs was the only reason introduced support in the first place. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/host_vars/libvirt-ubuntu-12/install.yml | 3 --- guests/host_vars/libvirt-ubuntu-12/main.yml | 3 --- guests/vars/mappings.yml | 11 ----------- 3 files changed, 17 deletions(-) delete mode 100644 guests/host_vars/libvirt-ubuntu-12/install.yml delete mode 100644 guests/host_vars/libvirt-ubuntu-12/main.yml diff --git a/guests/host_vars/libvirt-ubuntu-12/install.yml b/guests/host_vars/libvirt-ubuntu-12/install.yml deleted file mode 100644 index 997304f..0000000 --- a/guests/host_vars/libvirt-ubuntu-12/install.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -install_url: http://archive.ubuntu.com/ubuntu/dists/precise/main/installer-amd64/ -install_config: preseed.cfg diff --git a/guests/host_vars/libvirt-ubuntu-12/main.yml b/guests/host_vars/libvirt-ubuntu-12/main.yml deleted file mode 100644 index 2d21f14..0000000 --- a/guests/host_vars/libvirt-ubuntu-12/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -projects: - - libvirt diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index deae69d..d94d648 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -137,14 +137,12 @@ mappings: deb: libgnutls28-dev pkg: gnutls rpm: gnutls-devel - Ubuntu12: libgnutls-dev Ubuntu14: libgnutls-dev go: default: golang FreeBSD: go CentOS6: - Ubuntu12: Ubuntu14: gobject-introspection: @@ -171,7 +169,6 @@ mappings: hal: FreeBSD: hal - Ubuntu12: libhal-dev intltool: default: intltool @@ -411,7 +408,6 @@ mappings: default: numad FreeBSD: Debian8: - Ubuntu12: Ubuntu14: openwsman: @@ -455,7 +451,6 @@ mappings: pkg: p5-Digest-MD5 rpm: perl-Digest-MD5 CentOS6: - Ubuntu12: Ubuntu14: perl-ExtUtils-MakeMaker: @@ -510,7 +505,6 @@ mappings: deb: libtest-lwp-useragent-perl pkg: p5-Test-LWP-UserAgent Fedora: perl-Test-LWP-UserAgent - Ubuntu12: perl-Test-Pod: deb: libtest-pod-perl @@ -526,7 +520,6 @@ mappings: deb: libtime-hr-perl pkg: p5-Time-HiRes rpm: perl-Time-HiRes - Ubuntu12: perl Ubuntu14: perl perl-XML-Twig: @@ -552,7 +545,6 @@ mappings: pkg-config: default: pkgconf rpm: pkgconfig - Ubuntu12: pkg-config polkit: default: polkit @@ -614,7 +606,6 @@ mappings: default: python3-requests FreeBSD: py36-requests CentOS: - Ubuntu12: qemu-img: default: qemu-utils @@ -642,7 +633,6 @@ mappings: sanlock: deb: libsanlock-dev rpm: sanlock-devel - Ubuntu12: screen: default: screen @@ -692,7 +682,6 @@ mappings: deb: wireshark-dev Fedora: wireshark-devel Debian8: - Ubuntu12: Ubuntu14: xen: -- 2.14.3

2 1

[libvirt] [jenkins-ci PATCH 0/3] guests: Various cleanups
by Andrea Bolognani 22 Mar '18

22 Mar '18

Applies on top of https://www.redhat.com/archives/libvir-list/2018-March/msg01093.html Andrea Bolognani (3): guests: Configure Jenkins agent based on secret availability guests: Don't expose 'jenkins' pseudo-package guests: Don't expose 'base' pseudo-package guests/host_vars/libvirt-centos-6/main.yml | 2 -- guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/host_vars/libvirt-debian-8/main.yml | 2 -- guests/host_vars/libvirt-debian-9/main.yml | 2 -- guests/host_vars/libvirt-debian-sid/main.yml | 1 - guests/host_vars/libvirt-fedora-26/main.yml | 2 -- guests/host_vars/libvirt-fedora-27/main.yml | 2 -- guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 -- guests/host_vars/libvirt-freebsd-10/main.yml | 2 -- guests/host_vars/libvirt-freebsd-11/main.yml | 2 -- guests/host_vars/libvirt-freebsd-current/main.yml | 1 - guests/host_vars/libvirt-ubuntu-12/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/site.yml | 15 ++++++++++++--- guests/tasks/jenkins.yml | 7 +++++++ 16 files changed, 19 insertions(+), 26 deletions(-) -- 2.14.3

3 28

[libvirt] [PATCH v3 00/12] Basic implementation of persistent reservations
by Michal Privoznik 22 Mar '18

22 Mar '18

v3 of: https://www.redhat.com/archives/libvir-list/2018-February/msg01021.html Diff to v2: - John's review worked in The event on pr-helper process dying is still not implemented as qemu has no implementation yet. Michal Privoznik (12): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu: Generate alias and socket path for pr-helper qemu: Store pr runtime data in status XML qemu: Generate cmd line at startup qemu: Introduce pr_helper to qemu.conf qemu_domain: Track pr-helper PID in status XML qemu: Start PR daemon on domain startup qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations qemu: Detect pr-manager-helper capability docs/formatdomain.html.in | 25 ++- docs/schemas/domaincommon.rng | 34 +-- docs/schemas/storagecommon.rng | 50 +++++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 36 ++++ src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 48 +++++ src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 238 ++++++++++++++++++--- src/qemu/qemu_domain.h | 15 ++ src/qemu/qemu_hotplug.c | 94 ++++++++ src/qemu/qemu_process.c | 193 +++++++++++++++++ src/qemu/qemu_process.h | 7 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virstoragefile.c | 181 ++++++++++++++++ src/util/virstoragefile.h | 19 ++ tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + .../disk-virtio-scsi-reservations-not-managed.args | 29 +++ .../disk-virtio-scsi-reservations-not-managed.xml | 41 ++++ .../disk-virtio-scsi-reservations.args | 29 +++ .../disk-virtio-scsi-reservations.xml | 39 ++++ tests/qemuxml2argvtest.c | 8 + .../disk-virtio-scsi-reservations-not-managed.xml | 1 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 4 + 30 files changed, 1064 insertions(+), 57 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-managed.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.16.1

3 20

[libvirt] [PATCH 0/2] virCommand: Two trivial fixes
by Michal Privoznik 22 Mar '18

22 Mar '18

Although not pushed, so review appreciated. Michal Privoznik (2): virCommandPassFD: Give name to flags virCommandFDIsSet: Update documentation src/util/vircommand.c | 13 ++++++------- src/util/vircommand.h | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) -- 2.16.1

3 5

[libvirt] [RFC PATCH 0/2] Add vmgenid XML, schema, docs
by John Ferlan 22 Mar '18

22 Mar '18

Could be a v1, but figured I'd get feedback first - I have a "working example" for QEMU (supported since 2.9.0), but it's not quite ready to be fully posted. Currently only needed for windows guests, but there is some work upstream (somewhere) to make a Linux implementation. Still have to work out all the various "combinations" of when to add the vmgenid device and I think there's one combination that's not quite possible and may require some sort of set vmgenid guid value qmp command (that's being debated on qemu upstream now). To read up on the QEMU implementation, see from the top of a QEMU source tree: docs/specs/vmgenid.txt The (ahem) Microsoft details on the device is found at: http://go.microsoft.com/fwlink/?LinkId=260709 John Ferlan (2): conf: Introduce VIR_DOMAIN_DEVICE_VMGENID conf: Add VM Generation ID device docs/formatdomain.html.in | 54 ++++++++++++++ docs/schemas/domaincommon.rng | 21 ++++++ src/conf/domain_conf.c | 120 +++++++++++++++++++++++++++++- src/conf/domain_conf.h | 12 +++ 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 + tests/qemuxml2argvdata/vmgenid-auto.xml | 32 ++++++++ tests/qemuxml2argvdata/vmgenid.xml | 32 ++++++++ tests/qemuxml2xmloutdata/vmgenid-auto.xml | 1 + tests/qemuxml2xmloutdata/vmgenid.xml | 1 + tests/qemuxml2xmltest.c | 3 + 13 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/vmgenid-auto.xml create mode 100644 tests/qemuxml2argvdata/vmgenid.xml create mode 120000 tests/qemuxml2xmloutdata/vmgenid-auto.xml create mode 120000 tests/qemuxml2xmloutdata/vmgenid.xml -- 2.13.6

3 5

[libvirt] [snmp PATCH 1/2] Replace U64 with struct counter64 to fix build
by Michael Corcoran 22 Mar '18

22 Mar '18

Upstream net-snmp removed the U64 typedef in 2016 as it clashed with a name in Perl, thus all usages of U64 must be replaced by struct counter64 to compile against recent versions of net-snmp. The replacements were made by hand, while referencing diff with new source generated by the mib2c tool. net-snmp have a mib2c-update tool which supposedly assists with updating existing (modified) source code but I was unable to get it to work. Signed-off-by: Michael Corcoran <tracer(a)outlook.co.nz> --- src/defaults/node-libvirtGuestCpuTime.m2d | 2 +- src/libvirtGuestTable-README-libvirtGuestTable.txt | 2 +- src/libvirtGuestTable.h | 4 ++-- src/libvirtGuestTable_data_get.c | 4 ++-- src/libvirtGuestTable_data_get.h | 2 +- src/libvirtGuestTable_data_set.h | 4 ++-- src/libvirtGuestTable_interface.c | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/defaults/node-libvirtGuestCpuTime.m2d b/src/defaults/node-libvirtGuestCpuTime.m2d index 795f697..fc93506 100644 --- a/src/defaults/node-libvirtGuestCpuTime.m2d +++ b/src/defaults/node-libvirtGuestCpuTime.m2d @@ -11,7 +11,7 @@ ## If you do, it is likely to break lots of generated code that ## you will have to fix. ## -## @eval $m2c_decl = U64@ +## @eval $m2c_decl = "struct counter64"@ ## ######################################################################## ## Generate/use mapping functions? Useful if the MIB defines diff --git a/src/libvirtGuestTable-README-libvirtGuestTable.txt b/src/libvirtGuestTable-README-libvirtGuestTable.txt index 5a74dae..74e2274 100644 --- a/src/libvirtGuestTable-README-libvirtGuestTable.txt +++ b/src/libvirtGuestTable-README-libvirtGuestTable.txt @@ -722,7 +722,7 @@ The CPU time used by the virtual guest, in nanoseconds. * * * Its syntax is COUNTER64 (based on perltype COUNTER64) - * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (U64) + * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (struct counter64) */ /*--------------------------------------------------------------------- * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index ca27abd..6762238 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -119,9 +119,9 @@ typedef struct libvirtGuestTable_data_s { u_long libvirtGuestMemoryLimit; /* - * libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h + * libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(struct counter64)//l/A/w/e/r/d/h */ - U64 libvirtGuestCpuTime; + struct counter64 libvirtGuestCpuTime; /* * libvirtGuestRowStatus(9)/RowStatus/ASN_INTEGER/long(u_long)//l/A/W/E/r/d/h diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index b252bdd..08ddb4a 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -442,7 +442,7 @@ The CPU time used by the virtual guest, in nanoseconds. * * * Its syntax is COUNTER64 (based on perltype COUNTER64) - * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (U64) + * The net-snmp type is ASN_COUNTER64. The C type decl is U64 (struct counter64) */ /** * Extract the current value of the libvirtGuestCpuTime data. @@ -459,7 +459,7 @@ The CPU time used by the virtual guest, in nanoseconds. * @retval MFD_ERROR : Any other error */ int -libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 * libvirtGuestCpuTime_val_ptr ) +libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 * libvirtGuestCpuTime_val_ptr ) { /** we should have a non-NULL pointer */ netsnmp_assert( NULL != libvirtGuestCpuTime_val_ptr ); diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 450d112..6a0e7ff 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -55,7 +55,7 @@ extern "C" { int libvirtGuestCpuCount_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestCpuCount_val_ptr ); int libvirtGuestMemoryCurrent_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestMemoryCurrent_val_ptr ); int libvirtGuestMemoryLimit_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestMemoryLimit_val_ptr ); - int libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 * libvirtGuestCpuTime_val_ptr ); + int libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 * libvirtGuestCpuTime_val_ptr ); int libvirtGuestRowStatus_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvirtGuestRowStatus_val_ptr ); diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index cce0fe7..873f9f5 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -80,9 +80,9 @@ int libvirtGuestMemoryLimit_undo_setup( libvirtGuestTable_rowreq_ctx *rowreq_ctx int libvirtGuestMemoryLimit_set( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long libvirtGuestMemoryLimit_val ); int libvirtGuestMemoryLimit_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx ); -int libvirtGuestCpuTime_check_value( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 libvirtGuestCpuTime_val); +int libvirtGuestCpuTime_check_value( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 libvirtGuestCpuTime_val); int libvirtGuestCpuTime_undo_setup( libvirtGuestTable_rowreq_ctx *rowreq_ctx ); -int libvirtGuestCpuTime_set( libvirtGuestTable_rowreq_ctx *rowreq_ctx, U64 libvirtGuestCpuTime_val ); +int libvirtGuestCpuTime_set( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counter64 libvirtGuestCpuTime_val ); int libvirtGuestCpuTime_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx ); int libvirtGuestRowStatus_check_value( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long libvirtGuestRowStatus_val); diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index ce29c3b..ee48291 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -842,11 +842,11 @@ rc = libvirtGuestMemoryCurrent_get(rowreq_ctx, (u_long *)var->val.string ); rc = libvirtGuestMemoryLimit_get(rowreq_ctx, (u_long *)var->val.string ); break; - /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h */ + /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(struct counter64)//l/A/w/e/r/d/h */ case COLUMN_LIBVIRTGUESTCPUTIME: - var->val_len = sizeof(U64); + var->val_len = sizeof(struct counter64); var->type = ASN_COUNTER64; -rc = libvirtGuestCpuTime_get(rowreq_ctx, (U64 *)var->val.string ); +rc = libvirtGuestCpuTime_get(rowreq_ctx, (struct counter64 *)var->val.string ); break; /* libvirtGuestRowStatus(9)/RowStatus/ASN_INTEGER/long(u_long)//l/A/W/E/r/d/h */ @@ -1022,7 +1022,7 @@ _libvirtGuestTable_check_column( libvirtGuestTable_rowreq_ctx *rowreq_ctx, rc = SNMP_ERR_NOTWRITABLE; break; - /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(U64)//l/A/w/e/r/d/h */ + /* libvirtGuestCpuTime(7)/COUNTER64/ASN_COUNTER64/U64(struct counter64)//l/A/w/e/r/d/h */ case COLUMN_LIBVIRTGUESTCPUTIME: rc = SNMP_ERR_NOTWRITABLE; break;

2 2

[libvirt] snapshot: support rbd disk
by Zhangzijian 22 Mar '18

22 Mar '18

Hello, Qemu support create snapshot for rbd disk. But Libvirt have not yet supported this feature now, is there any roadmap? Thanks.

1 0

[libvirt] [PATCH] news: Xen: announce removal of hard-code scheduler weight
by Jim Fehlig 21 Mar '18

21 Mar '18

Also describe a possible side-affect due to changes in the default (unspecified) value from 1000 to 256. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 75a054308..93ab59cf4 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -66,6 +66,22 @@ If someone customizing IP address inside VM, it will be helpful. </description> </change> + <change> + <summary> + Xen: Remove hard-coded scheduler weight + </summary> + <description> + The libxl driver was accidentally hard-coding the per-domain + scheduler weight to 1000, silently ignoring any user-provided + <code><shares></code> in <code><cputune></code>. The + driver now honors <code><shares></code>, 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. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.16.2

2 1

[libvirt] [PATCH] libxl: don't hardcode scheduler weight
by Jim Fehlig 21 Mar '18

21 Mar '18

Long ago in commit dfa1e1dd53 the scheduler weight was accidentally hardcoded to 1000. Weight is a setting with no unit since it is relative to the weight of other domains. If no weight is specified, libxl defaults to 256. Instead of hardcoding the weight to 1000, honor any <shares> specified in <cputune>. libvirt's notion of shares is synonomous to libxl's scheduler weight setting. If shares is unspecified, defer default weight setting to libxl. Removing the hardcoded weight required some test fixup. While at it, add an explicit test for <shares> conversion to scheduler weight. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Honoring <shares> specified by the user is certainly desirable, but I'm not sure about changing the default weight. One problematic scenario that came to mind: Several domains started by pre-patch libvirtd with weight=1000, update libvirtd with patch, start more domains with weight=256. The pre-patch domains unknowingly have a weight nearly 4 times that of post-patch domains. src/libxl/libxl_conf.c | 4 +- tests/libxlxml2domconfigdata/basic-hvm.json | 2 +- tests/libxlxml2domconfigdata/basic-pv.json | 2 +- tests/libxlxml2domconfigdata/cpu-shares-hvm.json | 89 ++++++++++++++++++++++ tests/libxlxml2domconfigdata/cpu-shares-hvm.xml | 39 ++++++++++ tests/libxlxml2domconfigdata/moredevs-hvm.json | 2 +- tests/libxlxml2domconfigdata/multiple-ip.json | 2 +- .../libxlxml2domconfigdata/variable-clock-hvm.json | 2 +- tests/libxlxml2domconfigdata/vnuma-hvm.json | 2 +- tests/libxlxml2domconfigtest.c | 1 + 10 files changed, 138 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index dcd46873c..e40145cfa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -366,7 +366,9 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, } } - b_info->sched_params.weight = 1000; + if (def->cputune.sharesSpecified) + b_info->sched_params.weight = def->cputune.shares; + b_info->max_memkb = virDomainDefGetMemoryInitial(def); b_info->target_memkb = def->mem.cur_balloon; if (hvm) { diff --git a/tests/libxlxml2domconfigdata/basic-hvm.json b/tests/libxlxml2domconfigdata/basic-hvm.json index 6fa41f34f..ccd585385 100644 --- a/tests/libxlxml2domconfigdata/basic-hvm.json +++ b/tests/libxlxml2domconfigdata/basic-hvm.json @@ -19,7 +19,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/basic-pv.json b/tests/libxlxml2domconfigdata/basic-pv.json index 7e1abd3d6..0f846daab 100644 --- a/tests/libxlxml2domconfigdata/basic-pv.json +++ b/tests/libxlxml2domconfigdata/basic-pv.json @@ -15,7 +15,7 @@ "max_memkb": 524288, "target_memkb": 524288, "sched_params": { - "weight": 1000 + }, "type.pv": { "bootloader": "pygrub" diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.json b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json new file mode 100644 index 000000000..2e647eada --- /dev/null +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.json @@ -0,0 +1,89 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, + "shadow_memkb": 12288, + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { + "weight": 1500 + }, + "type.hvm": { + "pae": "True", + "apic": "True", + "acpi": "True", + "vga": { + "kind": "cirrus" + }, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-hvm.img", + "vdev": "hda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + } + ], + "nics": [ + { + "devid": 0, + "mac": "00:16:3e:66:12:b4", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif_ioemu" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml b/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml new file mode 100644 index 000000000..49085b4b7 --- /dev/null +++ b/tests/libxlxml2domconfigdata/cpu-shares-hvm.xml @@ -0,0 +1,39 @@ +<domain type='xen'> + <name>test-hvm</name> + <description>None</description> + <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>4</vcpu> + <cputune> + <shares>1500</shares> + </cputune> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <clock offset='utc'/> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <apic/> + <acpi/> + <pae/> + </features> + <devices> + <emulator>/bin/true</emulator> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/var/lib/xen/images/test-hvm.img'/> + <target dev='hda'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:66:12:b4'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigdata/moredevs-hvm.json b/tests/libxlxml2domconfigdata/moredevs-hvm.json index 8f861f34e..7bfd68bd6 100644 --- a/tests/libxlxml2domconfigdata/moredevs-hvm.json +++ b/tests/libxlxml2domconfigdata/moredevs-hvm.json @@ -21,7 +21,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/multiple-ip.json b/tests/libxlxml2domconfigdata/multiple-ip.json index 4aff61d4b..80dca8261 100644 --- a/tests/libxlxml2domconfigdata/multiple-ip.json +++ b/tests/libxlxml2domconfigdata/multiple-ip.json @@ -15,7 +15,7 @@ "max_memkb": 524288, "target_memkb": 524288, "sched_params": { - "weight": 1000 + }, "type.pv": { "bootloader": "pygrub" diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json index 49d0a4330..69be9c64c 100644 --- a/tests/libxlxml2domconfigdata/variable-clock-hvm.json +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json @@ -21,7 +21,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigdata/vnuma-hvm.json b/tests/libxlxml2domconfigdata/vnuma-hvm.json index 3a5071e14..3b2fc5f40 100644 --- a/tests/libxlxml2domconfigdata/vnuma-hvm.json +++ b/tests/libxlxml2domconfigdata/vnuma-hvm.json @@ -107,7 +107,7 @@ "device_model_version": "qemu_xen", "device_model": "/bin/true", "sched_params": { - "weight": 1000 + }, "type.hvm": { "pae": "True", diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index ea3d2884e..6eec4c752 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -192,6 +192,7 @@ mymain(void) DO_TEST("basic-pv"); DO_TEST("basic-hvm"); + DO_TEST("cpu-shares-hvm"); DO_TEST("variable-clock-hvm"); DO_TEST("moredevs-hvm"); DO_TEST("vnuma-hvm"); -- 2.16.1

2 2

[libvirt] [PATCH v3 0/5] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - Set(Memory|Input)Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) *Updates since v2* - Restore(Memory|Input)Label: drop secdef/relabel check - Set(Memory|Input)Label: check more pointers to be valid before using them Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 94 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 +++++++ tests/virt-aa-helper-test | 88 ++++++++++++++++++++++--------------- 3 files changed, 164 insertions(+), 34 deletions(-) -- 2.7.4

2 11

[libvirt] [PATCH] travis: skip builds on -maint branches
by Daniel P. Berrangé 21 Mar '18

21 Mar '18

For patches pushed upstream we want builds run on master branch, but don't want them run on the -maint branches, as we are not keeping the .travis.yml file on stable branches updated wrt latest needs of travis CI platforms. We can't just whitelist 'master' though, because that will prevent developers triggering their own private travis builds. So we just blacklist *-maint, since developers will typically use named feature branches for any work. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 01dffaa602..d3f72d46f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ sudo: false language: c cache: ccache +branches: + except: + - /^.*-maint$/ + matrix: include: - compiler: gcc -- 2.14.3

2 1

[libvirt] [snmp PATCH 2/2] Replace placeholder org OID with libvirt OID
by Michael Corcoran 21 Mar '18

21 Mar '18

An OID of 36957 was assigned to libvirt by IANA, but the placeholder OID of 12345 was never replaced. IANA lists the libvirt registration as: 36957 libvirt Daniel Veillard daniel&veillard.com https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers Signed-off-by: Michael Corcoran <tracer(a)outlook.co.nz> --- src/LIBVIRT-MIB.txt | 7 ++++--- src/libvirtGuestTable-README-libvirtGuestTable.txt | 18 +++++++++--------- src/libvirtGuestTable.h | 2 +- src/libvirtGuestTable_data_access.c | 4 ++-- src/libvirtGuestTable_data_access.h | 2 +- src/libvirtGuestTable_data_get.c | 16 ++++++++-------- src/libvirtGuestTable_data_get.h | 2 +- src/libvirtGuestTable_data_set.c | 6 +++--- src/libvirtGuestTable_data_set.h | 2 +- src/libvirtGuestTable_interface.c | 2 +- src/libvirtGuestTable_oids.h | 2 +- src/libvirtNotifications.c | 10 +++++----- 12 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/LIBVIRT-MIB.txt b/src/LIBVIRT-MIB.txt index a8195ff..1fd2074 100644 --- a/src/LIBVIRT-MIB.txt +++ b/src/LIBVIRT-MIB.txt @@ -14,7 +14,7 @@ IMPORTS libvirtMIB MODULE-IDENTITY - LAST-UPDATED "201012020000Z" + LAST-UPDATED "201803200000Z" ORGANIZATION "www.libvirt.org" CONTACT-INFO "email: libvirt-users(a)redhat.com @@ -22,10 +22,11 @@ libvirtMIB MODULE-IDENTITY DESCRIPTION "First draft, for experimental purposes only! Not to be used in real deployment!" + REVISION "201803200000Z" + DESCRIPTION "Updated OID" REVISION "201012020000Z" DESCRIPTION "Initial version." - ::= { enterprises 12345 } --- TODO: user real libvirt OID here ^ + ::= { enterprises 36957 } -- structure advised by RFC 4181: diff --git a/src/libvirtGuestTable-README-libvirtGuestTable.txt b/src/libvirtGuestTable-README-libvirtGuestTable.txt index 74e2274..0871568 100644 --- a/src/libvirtGuestTable-README-libvirtGuestTable.txt +++ b/src/libvirtGuestTable-README-libvirtGuestTable.txt @@ -587,14 +587,14 @@ Table / column details /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /*--------------------------------------------------------------------- * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID * libvirtGuestUUID is subid 1 of libvirtGuestEntry. * Its status is Current, and its access level is NoAccess. - * OID: .1.3.6.1.4.1.12345.1.1.1.1 + * OID: .1.3.6.1.4.1.36957.1.1.1.1 * Description: The UUID of the virtual guest. * @@ -620,7 +620,7 @@ The UUID of the virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName * libvirtGuestName is subid 2 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.2 + * OID: .1.3.6.1.4.1.36957.1.1.1.2 * Description: Name of active virtual guest. * @@ -638,7 +638,7 @@ Name of active virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -656,7 +656,7 @@ Current state of the active guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount * libvirtGuestCpuCount is subid 4 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.4 + * OID: .1.3.6.1.4.1.36957.1.1.1.4 * Description: Number of virtual CPUs the virtual guest uses. * @@ -674,7 +674,7 @@ Number of virtual CPUs the virtual guest uses. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent * libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.5 + * OID: .1.3.6.1.4.1.36957.1.1.1.5 * Description: Current amount of memory (in MiB) used by the virtual guest. * @@ -692,7 +692,7 @@ Current amount of memory (in MiB) used by the virtual guest. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit * libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.6 + * OID: .1.3.6.1.4.1.36957.1.1.1.6 * Description: The maximum amount of memory (in MiB) that can be used by the virtual guest. @@ -711,7 +711,7 @@ The maximum amount of memory (in MiB) that can be used by the virtual * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime * libvirtGuestCpuTime is subid 7 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.7 + * OID: .1.3.6.1.4.1.36957.1.1.1.7 * Description: The CPU time used by the virtual guest, in nanoseconds. * @@ -728,7 +728,7 @@ The CPU time used by the virtual guest, in nanoseconds. * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index 6762238..529838b 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -68,7 +68,7 @@ void shutdown_libvirtGuestTable(void); /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* ********************************************************************* * When you register your mib, you get to provide a generic diff --git a/src/libvirtGuestTable_data_access.c b/src/libvirtGuestTable_data_access.c index 2958284..d7de4d5 100644 --- a/src/libvirtGuestTable_data_access.c +++ b/src/libvirtGuestTable_data_access.c @@ -51,7 +51,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /** @@ -291,7 +291,7 @@ libvirtGuestTable_row_prep( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestUUID * libvirtGuestUUID is subid 1 of libvirtGuestEntry. * Its status is Current, and its access level is NoAccess. - * OID: .1.3.6.1.4.1.12345.1.1.1.1 + * OID: .1.3.6.1.4.1.36957.1.1.1.1 * Description: The UUID of the virtual guest. * diff --git a/src/libvirtGuestTable_data_access.h b/src/libvirtGuestTable_data_access.h index 3491aa4..49afb9d 100644 --- a/src/libvirtGuestTable_data_access.h +++ b/src/libvirtGuestTable_data_access.h @@ -45,7 +45,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index 08ddb4a..890ba07 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -50,7 +50,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* --------------------------------------------------------------------- @@ -134,7 +134,7 @@ libvirtGuestTable_indexes_set(libvirtGuestTable_rowreq_ctx *rowreq_ctx, char *li * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestName * libvirtGuestName is subid 2 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.2 + * OID: .1.3.6.1.4.1.36957.1.1.1.2 * Description: Name of active virtual guest. * @@ -222,7 +222,7 @@ libvirtGuestName_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, char **libvirtGu * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -274,7 +274,7 @@ libvirtGuestState_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * libvir * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuCount * libvirtGuestCpuCount is subid 4 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.4 + * OID: .1.3.6.1.4.1.36957.1.1.1.4 * Description: Number of virtual CPUs the virtual guest uses. * @@ -326,7 +326,7 @@ libvirtGuestCpuCount_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * lib * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryCurrent * libvirtGuestMemoryCurrent is subid 5 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.5 + * OID: .1.3.6.1.4.1.36957.1.1.1.5 * Description: Current amount of memory (in MiB) used by the virtual guest. * @@ -378,7 +378,7 @@ libvirtGuestMemoryCurrent_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestMemoryLimit * libvirtGuestMemoryLimit is subid 6 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.6 + * OID: .1.3.6.1.4.1.36957.1.1.1.6 * Description: The maximum amount of memory (in MiB) that can be used by the virtual guest. @@ -431,7 +431,7 @@ libvirtGuestMemoryLimit_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, u_long * * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestCpuTime * libvirtGuestCpuTime is subid 7 of libvirtGuestEntry. * Its status is Current, and its access level is ReadOnly. - * OID: .1.3.6.1.4.1.12345.1.1.1.7 + * OID: .1.3.6.1.4.1.36957.1.1.1.7 * Description: The CPU time used by the virtual guest, in nanoseconds. * @@ -479,7 +479,7 @@ libvirtGuestCpuTime_get( libvirtGuestTable_rowreq_ctx *rowreq_ctx, struct counte * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 6a0e7ff..616f824 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -44,7 +44,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* * indexes diff --git a/src/libvirtGuestTable_data_set.c b/src/libvirtGuestTable_data_set.c index d67c9d9..7ee8e9f 100644 --- a/src/libvirtGuestTable_data_set.c +++ b/src/libvirtGuestTable_data_set.c @@ -46,7 +46,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ /* * NOTE: if you update this chart, please update the versions in @@ -407,7 +407,7 @@ libvirtGuestTable_undo_commit( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestState * libvirtGuestState is subid 3 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.3 + * OID: .1.3.6.1.4.1.36957.1.1.1.3 * Description: Current state of the active guest. * @@ -586,7 +586,7 @@ libvirtGuestState_undo( libvirtGuestTable_rowreq_ctx *rowreq_ctx) * LIBVIRT-MIB::libvirtGuestEntry.libvirtGuestRowStatus * libvirtGuestRowStatus is subid 9 of libvirtGuestEntry. * Its status is Current, and its access level is Create. - * OID: .1.3.6.1.4.1.12345.1.1.1.9 + * OID: .1.3.6.1.4.1.36957.1.1.1.9 * Description: Status of the virtual guest. diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index 873f9f5..28092c5 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -44,7 +44,7 @@ extern "C" { /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index ee48291..14057aa 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -68,7 +68,7 @@ /* * LIBVIRT-MIB::libvirtGuestTable is subid 1 of libvirtObjects. * Its status is Current. - * OID: .1.3.6.1.4.1.12345.1.1, length: 9 + * OID: .1.3.6.1.4.1.36957.1.1, length: 9 */ typedef struct libvirtGuestTable_interface_ctx_s { diff --git a/src/libvirtGuestTable_oids.h b/src/libvirtGuestTable_oids.h index 85950f4..67ccd6f 100644 --- a/src/libvirtGuestTable_oids.h +++ b/src/libvirtGuestTable_oids.h @@ -29,7 +29,7 @@ extern "C" { /* column number definitions for table libvirtGuestTable */ -#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,12345,1,1 +#define LIBVIRTGUESTTABLE_OID 1,3,6,1,4,1,36957,1,1 #define COLUMN_LIBVIRTGUESTUUID 1 diff --git a/src/libvirtNotifications.c b/src/libvirtNotifications.c index 52c7ae4..135f177 100644 --- a/src/libvirtNotifications.c +++ b/src/libvirtNotifications.c @@ -34,15 +34,15 @@ int send_libvirtGuestNotif_trap(virDomainPtr dom) { netsnmp_variable_list *var_list = NULL; - const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 12345, 0, 1 }; + const oid libvirtGuestNotif_oid[] = { 1, 3, 6, 1, 4, 1, 36957, 0, 1 }; const oid libvirtGuestName_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 2, 0 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 2, 0 }; const oid libvirtGuestUUID_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 1, 1 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 1, 1 }; const oid libvirtGuestState_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 3, 2 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 3, 2 }; const oid libvirtGuestRowStatus_oid[] = - { 1, 3, 6, 1, 4, 1, 12345, 1, 1, 1, 9, 3 }; + { 1, 3, 6, 1, 4, 1, 36957, 1, 1, 1, 9, 3 }; const char *domName = virDomainGetName(dom);

2 1

[libvirt] [PATCH v2 0/5] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. *Updates since v1* - (Set|Restore)*Label: remove seclabel check already done in reload_profile - virt-aa-helper: check pointers before accessing them - add tests for new virt-aa-helper supported xml elements - extend tests to check for expected content (new patch in series) Christian Ehrhardt (5): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory virt-aa-helper: test: check for expected profile content src/security/security_apparmor.c | 88 ++++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 16 ++++++++ tests/virt-aa-helper-test | 88 ++++++++++++++++++++++++---------------- 3 files changed, 158 insertions(+), 34 deletions(-) -- 2.7.4

2 12

[libvirt] [PATCH 0/3] libxl: misc fixes for migration
by Jim Fehlig 21 Mar '18

21 Mar '18

While working on the {Begin,End}API improvements I noticed a few problems in the migration code. The first two are trival, but the third describes a problem I encountered while testing, and provides a potential fix. See the patch for more details. Jim Fehlig (3): libxl: dont dereference NULL libxlDomainObjPrivatePtr libxl: remove needless 'else' in libxlDomainMigrationPrepare util: introduce virSocketAddrParseQuiet src/libvirt_private.syms | 1 + src/libxl/libxl_migration.c | 10 ++++---- src/rpc/virnetsocket.c | 2 +- src/util/virsocketaddr.c | 60 +++++++++++++++++++++++++++++++++------------ src/util/virsocketaddr.h | 4 +++ 5 files changed, 55 insertions(+), 22 deletions(-) -- 2.16.2

3 8

[libvirt] [PATCH 0/8] Add optional pSeries features (HTM)
by Andrea Bolognani 21 Mar '18

21 Mar '18

Applies cleanly on top of 90d7262552e8de3b067239b215903144a285723d. Patch 2/8 is fairly big because of all the capabilities data being added: I'm sending a redacted version to the list, the rest of the code can be grabbed from https://github.com/andreabolognani/libvirt/tree/pseries-caps Changes from [RFC v3]: * can be considered for merging, since the QEMU part already has; * fix compatibility issues with QEMU <2.12 spotted by Shivaprasad; * drop all features except for HTM, at least for the time being; * add documentation. Changes from [RFC v2]: * use qom-list-properties to probe availability; * test all features with a single XML file. Changes from [RFC v1]: * don't nest features inside a <pseries/> element; * implement all optional features. [RFC v3] https://www.redhat.com/archives/libvir-list/2018-March/msg00042.html [RFC v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00310.html [RFC v1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (8): tests: Rename pseries-features-hpt test tests: Add capabilities data for QEMU 2.12 qemu: Add capability for qom-list-properties qemu: Rename virQEMUCapsObjectProps* -> virQEMUCapsDeviceProps* qemu: Extract generic part from qemuMonitorJSONGetDeviceProps() qemu: Add capability for the HTM pSeries feature qemu: Implement the HTM pSeries feature news: Update for the HTM pSeries feature docs/formatdomain.html.in | 7 + docs/news.xml | 9 + docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 19 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 281 +- src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 149 + src/qemu/qemu_domain.c | 13 + src/qemu/qemu_monitor.c | 13 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 40 +- src/qemu/qemu_monitor_json.h | 5 + .../caps_2.12.0-gicv2.aarch64.replies | 17153 +++++++++++++++ .../caps_2.12.0-gicv2.aarch64.xml | 319 + .../caps_2.12.0-gicv3.aarch64.replies | 17153 +++++++++++++++ .../caps_2.12.0-gicv3.aarch64.xml | 319 + .../qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 21247 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1095 + .../caps_2.12.0.x86_64.replies | 19121 +++++++++++++++++ tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1271 ++ tests/qemucapabilitiestest.c | 4 + .../pseries-features-invalid-machine.xml | 1 + ...ies-features-hpt.args => pseries-features.args} | 2 +- ...eries-features-hpt.xml => pseries-features.xml} | 1 + tests/qemuxml2argvtest.c | 5 +- tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 - tests/qemuxml2xmloutdata/pseries-features.xml | 1 + tests/qemuxml2xmltest.c | 3 +- 29 files changed, 78113 insertions(+), 130 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv2.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0-gicv3.aarch64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (87%) rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (97%) delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml -- 2.14.3

3 22

[libvirt] [PATCH] rpm: fix incorrect expansion of %systemd_preun macro
by Daniel P. Berrangé 21 Mar '18

21 Mar '18

Macros in RPMs are expanded before line continuations, so when we write %systemd_preun foo \ bar What happens is that it expands to if [ $1 -eq 0 ] ; then # Package removal, not upgrade systemctl --no-reload disable --now foo \ > /dev/null 2>&1 || : fi bar which is obviously complete garbage and not what we expected. It is simply not safe to ever use line continuations in combination with macros. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index bc8257f34b..6bf8368476 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1512,9 +1512,9 @@ exit 0 %if %{with_systemd} %if %{with_systemd_macros} - %systemd_post virtlockd.socket virtlockd-admin.socket \ - virtlogd.socket virtlogd-admin.socket \ - libvirtd.service + %systemd_post virtlockd.socket virtlockd-admin.socket + %systemd_post virtlogd.socket virtlogd-admin.socket + %systemd_post libvirtd.service %else if [ $1 -eq 1 ] ; then # Initial installation @@ -1549,9 +1549,9 @@ touch %{_localstatedir}/lib/rpm-state/libvirt/restart || : %preun daemon %if %{with_systemd} %if %{with_systemd_macros} - %systemd_preun libvirtd.service \ - virtlogd.socket virtlogd-admin.socket virtlogd.service \ - virtlockd.socket virtlockd-admin.socket virtlockd.service + %systemd_preun libvirtd.service + %systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service + %systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade -- 2.14.3

3 9

[libvirt] Libvirt-4.1.0 build fails at the 'make install' linking stage with 4.0.0 installed
by Predrag Ivanović 21 Mar '18

21 Mar '18

Hi. When I try to build Libvirt-4.1.0 on a system that has 4.0.0 installed, the build fails at the 'make install' linking stage with the error below. Same thing happened with git master I tried (commit 43523d7421, haven't tried with the latest one yet) and rebuilding 4.0.0 works fine. 4.1.0 builds on a system without 4.0.0, though, with no changes to configure switches or anything else. Is something broken on my system and/or the way I built 4.0.0 , so 4.1.0 picks up on that? 'make check' passes without errors for both. qemu-2.11.1 ------- ibtool: warning: relinking 'libvirt_driver_qemu.la' libtool: install: (cd /usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src; /bin/sh "/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/libtool" --silent --tag CC --mode=relink gcc -I/usr/include/libxml2 -fno-common -W -Waddress -Waggressive-loop-optimizations -Wall -Wattributes -Wbad-function-cast -Wbool-compare -Wbuiltin-macro-redefined -Wcast-align -Wchar-subscripts -Wchkp -Wclobbered -Wcomment -Wcomments -Wcoverage-mismatch -Wcpp -Wdate-time -Wdeprecated-declarations -Wdesignated-init -Wdiscarded-array-qualifiers -Wdiscarded-qualifiers -Wdiv-by-zero -Wdouble-promotion -Wduplicated-cond -Wempty-body -Wendif-labels -Wextra -Wformat-contains-nul -Wformat-extra-args -Wformat-security -Wformat-y2k -Wformat-zero-length -Wframe-address -Wfree-nonheap-object -Whsa -Wignored-attributes -Wignored-qualifiers -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wincompatible-pointer-types -Winit-self -Winline -Wint-conversion -Wint-to-pointer-cast -Winvalid-memory-model -Winvalid-pch -Wjump-misses- init -Wlogical-not-parentheses -Wlogical-op -Wmain -Wmaybe-uninitialized -Wmemset-transposed-args -Wmisleading-indentation -Wmissing-braces -Wmissing-declarations -Wmissing-field-initializers -Wmissing-include-dirs -Wmissing-parameter-type -Wmissing-prototypes -Wmultichar -Wnarrowing -Wnested-externs -Wnonnull -Wnonnull-compare -Wnull-dereference -Wodr -Wold-style-declaration -Wold-style-definition -Wopenmp-simd -Woverflow -Woverride-init -Wpacked-bitfield-compat -Wparentheses -Wpointer-arith -Wpointer-sign -Wpointer-to-int-cast -Wpragmas -Wpsabi -Wreturn-local-addr -Wreturn-type -Wscalar-storage-order -Wsequence-point -Wshadow -Wshift-count-negative -Wshift-count-overflow -Wshift-negative-value -Wsizeof-array-argument -Wsizeof-pointer-memaccess -Wstrict-aliasing -Wstrict-prototypes -Wsuggest-attribute=const -Wsuggest-attribute=format -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure -Wsuggest-final-methods -Wsuggest-final-types -Wswitch -Wswitch-bool -Wsync-nand -Wtautological- compare -Wtrampolines -Wtrigraphs -Wtype-limits -Wuninitialized -Wunknown-pragmas -Wunused -Wunused-but-set-parameter -Wunused-but-set-variable -Wunused-function -Wunused-label -Wunused-local-typedefs -Wunused-parameter -Wunused-result -Wunused-value -Wunused-variable -Wvarargs -Wvariadic-macros -Wvector-operation-performance -Wvolatile-register-var -Wwrite-strings -Warray-bounds=2 -Wnormalized=nfc -Wshift-overflow=2 -Wunused-const-variable=2 -Wno-sign-compare -Wjump-misses-init -Wswitch-enum -Wno-format-nonliteral -fstack-protector-strong -fexceptions -fasynchronous-unwind-tables -fipa-pure-const -Wno-suggest-attribute=pure -Wno-suggest-attribute=const -Wframe-larger-than=4096 -O2 -march=x86-64 -pipe -DLIBXL_API_VERSION=0x040400 -module -avoid-version -export-dynamic -Wl,-z -Wl,relro -Wl,-z -Wl,now -Wl,--no-copy-dt-needed-entries -Wl,-z -Wl,defs -lX11 -o libvirt_driver_qemu.la -rpath /usr/lib/libvirt/connection-driver libvirt_driver_qemu_impl.la libvirt.la ../gnulib/lib/libgnu.la - ldl -inst-prefix-dir /usr/pkgmk/build/libvirt/pkg) ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessGetVolumeQcowPassphrase': qemu_process.c:(.text+0x1e98): undefined reference to `virGetConnectSecret' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessSetupVcpu': qemu_process.c:(.text+0x4a65): undefined reference to `virResctrlAllocAddPID' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessPrepareDomain': qemu_process.c:(.text+0x4d32): undefined reference to `virGetConnectNetwork' qemu_process.c:(.text+0x52d7): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessPrepareHost': qemu_process.c:(.text+0x5bd5): undefined reference to `virDomainNetAllocateActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessLaunch': qemu_process.c:(.text+0x7ab1): undefined reference to `virResctrlAllocCreate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessStop': qemu_process.c:(.text+0x8ce3): undefined reference to `virDomainNetReleaseActualDevice' qemu_process.c:(.text+0x8dd4): undefined reference to `virResctrlAllocRemove' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_process.o): In function `qemuProcessReconnect': qemu_process.c:(.text+0xa9a8): undefined reference to `virDomainDiskTranslateSourcePool' qemu_process.c:(.text+0xadbb): undefined reference to `virDomainNetNotifyActualDevice' qemu_process.c:(.text+0xb6ec): undefined reference to `virResctrlAllocDeterminePath' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStateCleanup': qemu_driver.c:(.text+0x476): undefined reference to `virPortAllocatorRangeFree' qemu_driver.c:(.text+0x489): undefined reference to `virPortAllocatorRangeFree' qemu_driver.c:(.text+0x49c): undefined reference to `virPortAllocatorRangeFree' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStateInitialize': qemu_driver.c:(.text+0x187e): undefined reference to `virPortAllocatorRangeNew' qemu_driver.c:(.text+0x18af): undefined reference to `virPortAllocatorRangeNew' qemu_driver.c:(.text+0x18e0): undefined reference to `virPortAllocatorRangeNew' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotUpdateDiskSources': qemu_driver.c:(.text+0x4174): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotDiskDataFree': qemu_driver.c:(.text+0x912e): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainBlockCopyCommon': qemu_driver.c:(.text+0x937a): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x956c): undefined reference to `virStorageFileAccess' qemu_driver.c:(.text+0x958c): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x96bb): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x97ce): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x97fb): undefined reference to `virStorageFileUnlink' qemu_driver.c:(.text+0x984f): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x98a1): undefined reference to `virStorageFileUnlink' qemu_driver.c:(.text+0x98b7): undefined reference to `virStorageFileCreate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainBlockPeek': qemu_driver.c:(.text+0x10823): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x108a7): undefined reference to `virStorageFileRead' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSetInterfaceParameters': qemu_driver.c:(.text+0x1156a): undefined reference to `virDomainNetBandwidthChangeAllowed' qemu_driver.c:(.text+0x115b3): undefined reference to `virDomainNetBandwidthUpdate' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuSecurityChownCallback': qemu_driver.c:(.text+0x1c97c): undefined reference to `virStorageFileSupportsSecurityDriver' qemu_driver.c:(.text+0x1ca09): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x1ca50): undefined reference to `virStorageFileInit' qemu_driver.c:(.text+0x1ca62): undefined reference to `virStorageFileChown' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainStorageOpenStat.isra.15': qemu_driver.c:(.text+0x1d19b): undefined reference to `virStorageFileInitAs' qemu_driver.c:(.text+0x1d1ac): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x1d1b8): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuStorageLimitsRefresh': qemu_driver.c:(.text+0x1d2f6): undefined reference to `virStorageFileRead' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainUpdateDeviceFlags': qemu_driver.c:(.text+0x24e17): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainAttachDeviceFlags': qemu_driver.c:(.text+0x25a67): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainSnapshotCreateXML': qemu_driver.c:(.text+0x28f91): undefined reference to `virDomainDiskTranslateSourcePool' qemu_driver.c:(.text+0x2901b): undefined reference to `virStorageFileInit' qemu_driver.c:(.text+0x29031): undefined reference to `virStorageFileStat' qemu_driver.c:(.text+0x2906b): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x2943d): undefined reference to `virStorageFileGetBackingStoreStr' qemu_driver.c:(.text+0x2976f): undefined reference to `virDomainDiskTranslateSourcePool' qemu_driver.c:(.text+0x29af7): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x29b9c): undefined reference to `virStorageFileDeinit' qemu_driver.c:(.text+0x29db4): undefined reference to `virStorageFileCreate' qemu_driver.c:(.text+0x2a179): undefined reference to `virStorageFileUnlink' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_driver.o): In function `qemuDomainStorageCloseStat': qemu_driver.c:(.text+0x244f): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_alias.o): In function `qemuAssignDeviceNetAlias': qemu_alias.c:(.text+0x6f8): undefined reference to `virDomainNetResolveActualType' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainSecretInfoNew': qemu_domain.c:(.text+0x471f): undefined reference to `virGetConnectSecret' qemu_domain.c:(.text+0x48e1): undefined reference to `virGetConnectSecret' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainStorageFileInit': qemu_domain.c:(.text+0x89ff): undefined reference to `virStorageFileInitAs' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainDetermineDiskChain': qemu_domain.c:(.text+0x8ba2): undefined reference to `virStorageFileReportBrokenChain' qemu_domain.c:(.text+0x8bb4): undefined reference to `virStorageFileSupportsAccess' qemu_domain.c:(.text+0x8bd8): undefined reference to `virStorageFileAccess' qemu_domain.c:(.text+0x8be8): undefined reference to `virStorageFileDeinit' qemu_domain.c:(.text+0x8c9f): undefined reference to `virStorageFileGetMetadata' qemu_domain.c:(.text+0x8d14): undefined reference to `virStorageFileReportBrokenChain' qemu_domain.c:(.text+0x8d1c): undefined reference to `virStorageFileDeinit' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain.o): In function `qemuDomainDefValidate': qemu_domain.c:(.text+0xb35d): undefined reference to `virDomainFeatureTypeToString' qemu_domain.c:(.text+0xb379): undefined reference to `virDomainFeatureTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain_address.o): In function `qemuDomainFindSCSIControllerModel': qemu_domain_address.c:(.text+0x2505): undefined reference to `virDomainDeviceFindSCSIController' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_domain_address.o): In function `qemuDomainFillDeviceIsolationGroup': qemu_domain_address.c:(.text+0x2621): undefined reference to `virDomainNetResolveActualType' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainRemoveHostDevice': qemu_hotplug.c:(.text+0xa41): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainRemoveNetDevice': qemu_hotplug.c:(.text+0x191e): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainAttachDeviceDiskLive': qemu_hotplug.c:(.text+0x3b4e): undefined reference to `virDomainDiskTranslateSourcePool' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainAttachNetDevice': qemu_hotplug.c:(.text+0x7093): undefined reference to `virDomainNetAllocateActualDevice' qemu_hotplug.c:(.text+0x716c): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainChangeNet': qemu_hotplug.c:(.text+0x93da): undefined reference to `virDomainNetReleaseActualDevice' qemu_hotplug.c:(.text+0x9549): undefined reference to `virDomainNetAllocateActualDevice' qemu_hotplug.c:(.text+0x977c): undefined reference to `virDomainNetReleaseActualDevice' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainDetachChrDevice': qemu_hotplug.c:(.text+0xbb12): undefined reference to `virDomainChrDeviceTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_hotplug.o): In function `qemuDomainDetachMemoryDevice': qemu_hotplug.c:(.text+0xbdd6): undefined reference to `virDomainMemoryModelTypeToString' ./.libs/libvirt_driver_qemu_impl.a(libvirt_driver_qemu_impl_la-qemu_migration.o): In function `qemuMigrationDstPrepareAny': qemu_migration.c:(.text+0x6ce1): undefined reference to `virGetConnectStorage' qemu_migration.c:(.text+0x6fc5): undefined reference to `virStoragePoolLookupByTargetPath' collect2: error: ld returned 1 exit status libtool: error: error: relink 'libvirt_driver_qemu.la' with the above command before installing it make[3]: *** [Makefile:6292: install-modLTLIBRARIES] Error 1 make[3]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make[2]: *** [Makefile:12096: install-am] Error 2 make[2]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make[1]: *** [Makefile:12090: install] Error 2 make[1]: Leaving directory '/usr/pkgmk/build/libvirt/src/libvirt-4.1.0/src' make: *** [Makefile:2127: install-recursive] Error 1 =======> ERROR: Building '/usr/pkgmk/package/libvirt#4.1.0-1.pkg.tar.gz' failed. ------ Pedja

1 0

[libvirt] [PATCH] libvirt: Fix comments for two public APIs.
by Han Han 21 Mar '18

21 Mar '18

Fix comments for virConnectListAllNodeDevices and virConnectListAllSecrets. Signed-off-by: Han Han <hhan(a)redhat.com> --- src/libvirt-nodedev.c | 2 +- src/libvirt-secret.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt-nodedev.c b/src/libvirt-nodedev.c index 493b21f56..563ce889b 100644 --- a/src/libvirt-nodedev.c +++ b/src/libvirt-nodedev.c @@ -72,7 +72,7 @@ virNodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags) * @devices: Pointer to a variable to store the array containing the node * device objects or NULL if the list is not required (just returns * number of node devices). - * @flags: bitwise-OR of virConnectListAllNodeDevices. + * @flags: bitwise-OR of virConnectListAllNodeDeviceFlags. * * Collect the list of node devices, and allocate an array to store those * objects. diff --git a/src/libvirt-secret.c b/src/libvirt-secret.c index 447d93f33..1e1cd4e65 100644 --- a/src/libvirt-secret.c +++ b/src/libvirt-secret.c @@ -90,7 +90,7 @@ virConnectNumOfSecrets(virConnectPtr conn) * @secrets: Pointer to a variable to store the array containing the secret * objects or NULL if the list is not required (just returns the * number of secrets). - * @flags: extra flags; not used yet, so callers should always pass 0 + * @flags: bitwise-OR of virConnectListAllSecretsFlags. * * Collect the list of secrets, and allocate an array to store those * objects. -- 2.16.2

2 1

[libvirt] [PATCH 0/3] libxl: finish use of {Begin, End}API pattern in APIs
by Jim Fehlig 21 Mar '18

21 Mar '18

This is a follow-up to John and I's recent work to improve locking and ref counting of virDomainObj in the libxl driver. These patches change the remaining APIs to use the begin and end API pattern used throughout libxl and other drivers. Jim Fehlig (3): libxl: lock virDomainObj after ListRemove libxl: call EndJob in error case libxl: convert DefineXMLFlags to use begin/end API pattern src/libxl/libxl_driver.c | 29 ++++++++++++++++------------- src/libxl/libxl_migration.c | 7 +++++-- 2 files changed, 21 insertions(+), 15 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH 0/4] Apparmor support for less common devices
by Christian Ehrhardt 21 Mar '18

21 Mar '18

So far users added manual rules for most of these uncommon devices, but recent changes made some of the callbacks mandatory for hotplug so we should take shot at implementing them as those callbacks as well as for the initial start of a guest via virt-aa-helper. Christian Ehrhardt (4): security, apparmor: add (Set|Restore)MemoryLabel security, apparmor: add (Set|Restore)InputLabel virt-aa-helper: generate rules for passthrough input devices virt-aa-helper: generate rules for nvdimm memory src/security/security_apparmor.c | 101 +++++++++++++++++++++++++++++++++++++++ src/security/virt-aa-helper.c | 14 ++++++ 2 files changed, 115 insertions(+) -- 2.7.4

2 10

[libvirt] [dbus PATCH v2 0/3] rewrite to GDBus
by Pavel Hrdina 21 Mar '18

21 Mar '18

Changes in v2: - removed patch that set the required libvirt version to libvirt-dbus version Pavel Hrdina (3): introduce support for GDBus implementation switch from sd-bus to GDBus implementation main: introduce thread pool to process D-Bus messages README | 2 +- configure.ac | 15 +- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++++ data/org.libvirt.Domain.xml | 51 +++ libvirt-dbus.spec.in | 10 +- src/Makefile.am | 20 +- src/connect.c | 320 ++++++++---------- src/connect.h | 36 +-- src/domain.c | 749 ++++++++++++++++++++----------------------- src/domain.h | 7 +- src/events.c | 177 +++++----- src/gdbus.c | 456 ++++++++++++++++++++++++++ src/gdbus.h | 111 +++++++ src/main.c | 308 +++++++----------- src/util.c | 170 +++++----- src/util.h | 53 ++- test/Makefile.am | 3 +- test/travis-run | 2 +- 19 files changed, 1501 insertions(+), 1052 deletions(-) create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 src/gdbus.c create mode 100644 src/gdbus.h -- 2.14.3

1 4

[libvirt] Wiki Write Access
by Torsten Senf 21 Mar '18

21 Mar '18

Hi, I was in the irc #virt@OFTC last days and kashyap gave me a lot of helping. His wiki page https://wiki.libvirt.org/page/Live-disk-backup-with-active-blockcommit was very cool and I found some enhancements while testing. I would write this enhancements to the wiki page and would ask you for credentials to do this. Thank you. Greetings -- Torsten Senf sentor(a)sentor.de https://torstensenf.de

2 1

[libvirt] [PATCH] libxl: rename migration APIs to include Src or Dst in their name
by Jim Fehlig 21 Mar '18

21 Mar '18

Inspired by commit ffb7954f to improve readability of the libxl migration APIs. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Suggested by jferlan while reviewing other patches touch the libxl migration code https://www.redhat.com/archives/libvir-list/2018-March/msg00769.html src/libxl/libxl_driver.c | 28 +++---- src/libxl/libxl_migration.c | 179 ++++++++++++++++++++++---------------------- src/libxl/libxl_migration.h | 80 ++++++++++---------- 3 files changed, 144 insertions(+), 143 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 89432d03c..52eeb18f9 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5894,8 +5894,8 @@ libxlDomainMigrateBegin3Params(virDomainPtr domain, goto cleanup; } - xmlout = libxlDomainMigrationBegin(domain->conn, vm, xmlin, - cookieout, cookieoutlen); + xmlout = libxlDomainMigrationSrcBegin(domain->conn, vm, xmlin, + cookieout, cookieoutlen); cleanup: virDomainObjEndAPI(&vm); @@ -5940,14 +5940,14 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPtr dconn, goto error; - if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname))) goto error; if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) goto error; - if (libxlDomainMigrationPrepareTunnel3(dconn, st, &def, cookiein, - cookieinlen, flags) < 0) + if (libxlDomainMigrationDstPrepareTunnel3(dconn, st, &def, cookiein, + cookieinlen, flags) < 0) goto error; return 0; @@ -5995,14 +5995,14 @@ libxlDomainMigratePrepare3Params(virConnectPtr dconn, goto error; - if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + if (!(def = libxlDomainMigrationDstPrepareDef(driver, dom_xml, dname))) goto error; if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) goto error; - if (libxlDomainMigrationPrepare(dconn, &def, uri_in, uri_out, - cookiein, cookieinlen, flags) < 0) + if (libxlDomainMigrationDstPrepare(dconn, &def, uri_in, uri_out, + cookiein, cookieinlen, flags) < 0) goto error; return 0; @@ -6058,12 +6058,12 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, goto cleanup; if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { - if (libxlDomainMigrationPerformP2P(driver, vm, dom->conn, dom_xml, - dconnuri, uri, dname, flags) < 0) + if (libxlDomainMigrationSrcPerformP2P(driver, vm, dom->conn, dom_xml, + dconnuri, uri, dname, flags) < 0) goto cleanup; } else { - if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, - uri, dname, flags) < 0) + if (libxlDomainMigrationSrcPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) goto cleanup; } @@ -6124,7 +6124,7 @@ libxlDomainMigrateFinish3Params(virConnectPtr dconn, return NULL; } - ret = libxlDomainMigrationFinish(dconn, vm, flags, cancelled); + ret = libxlDomainMigrationDstFinish(dconn, vm, flags, cancelled); libxlDomainObjEndJob(driver, vm); @@ -6161,7 +6161,7 @@ libxlDomainMigrateConfirm3Params(virDomainPtr domain, if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) goto cleanup; - ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret = libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 7dc39ae02..bfe359f59 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -256,7 +256,7 @@ libxlMigrationDstArgsOnceInit(void) VIR_ONCE_GLOBAL_INIT(libxlMigrationDstArgs) static void -libxlDoMigrateReceive(void *opaque) +libxlDoMigrateDstReceive(void *opaque) { libxlMigrationDstArgs *args = opaque; virDomainObjPtr vm = args->vm; @@ -306,9 +306,9 @@ libxlDoMigrateReceive(void *opaque) static void -libxlMigrateReceive(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, - void *opaque) +libxlMigrateDstReceive(virNetSocketPtr sock, + int events ATTRIBUTE_UNUSED, + void *opaque) { libxlMigrationDstArgs *args = opaque; virNetSocketPtr *socks = args->socks; @@ -335,7 +335,7 @@ libxlMigrateReceive(virNetSocketPtr sock, */ args->recvfd = recvfd; if (virThreadCreate(&thread, false, - libxlDoMigrateReceive, args) < 0) { + libxlDoMigrateDstReceive, args) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration data")); goto fail; @@ -357,10 +357,10 @@ libxlMigrateReceive(virNetSocketPtr sock, } static int -libxlDoMigrateSend(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned long flags, - int sockfd) +libxlDoMigrateSrcSend(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + int sockfd) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); int xl_flags = 0; @@ -395,11 +395,11 @@ libxlDomainMigrationIsAllowed(virDomainDefPtr def) } char * -libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - char **cookieout, - int *cookieoutlen) +libxlDomainMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + char **cookieout, + int *cookieoutlen) { libxlDriverPrivatePtr driver = conn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -449,9 +449,9 @@ libxlDomainMigrationBegin(virConnectPtr conn, } virDomainDefPtr -libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, - const char *dom_xml, - const char *dname) +libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); virDomainDefPtr def; @@ -554,12 +554,12 @@ libxlDomainMigrationPrepareAny(virConnectPtr dconn, } int -libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, - virStreamPtr st, - virDomainDefPtr *def, - const char *cookiein, - int cookieinlen, - unsigned int flags) +libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags) { libxlMigrationCookiePtr mig = NULL; libxlDriverPrivatePtr driver = dconn->privateData; @@ -619,7 +619,7 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, args->nsocks = 0; mig = NULL; - if (virThreadCreate(&thread, false, libxlDoMigrateReceive, args) < 0) { + if (virThreadCreate(&thread, false, libxlDoMigrateDstReceive, args) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Failed to create thread for receiving migration data")); goto error; @@ -645,13 +645,13 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, } int -libxlDomainMigrationPrepare(virConnectPtr dconn, - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, - const char *cookiein, - int cookieinlen, - unsigned int flags) +libxlDomainMigrationDstPrepare(virConnectPtr dconn, + virDomainDefPtr *def, + const char *uri_in, + char **uri_out, + const char *cookiein, + int cookieinlen, + unsigned int flags) { libxlDriverPrivatePtr driver = dconn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -783,7 +783,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, if (virNetSocketAddIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE, - libxlMigrateReceive, + libxlMigrateDstReceive, args, NULL) < 0) continue; @@ -834,10 +834,10 @@ struct _libxlTunnelMigrationThread { /* * The data flow of tunnel3 migration in the src side: - * libxlDoMigrateSend() -> pipe - * libxlTunnel3MigrationFunc() polls pipe out and then write to dest stream. + * libxlDoMigrateSrcSend() -> pipe + * libxlTunnel3MigrationSrcFunc() polls pipe out and then write to dest stream. */ -static void libxlTunnel3MigrationFunc(void *arg) +static void libxlTunnel3MigrationSrcFunc(void *arg) { libxlTunnelMigrationThread *data = (libxlTunnelMigrationThread *)arg; char *buffer = NULL; @@ -858,7 +858,7 @@ static void libxlTunnel3MigrationFunc(void *arg) if (errno == EAGAIN || errno == EINTR) continue; virReportError(errno, "%s", - _("poll failed in libxlTunnel3MigrationFunc")); + _("poll failed in libxlTunnel3MigrationSrcFunc")); goto cleanup; } @@ -904,11 +904,11 @@ struct libxlTunnelControl { }; static int -libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned long flags, - virStreamPtr st, - struct libxlTunnelControl **tnl) +libxlMigrationSrcStartTunnel(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + virStreamPtr st, + struct libxlTunnelControl **tnl) { struct libxlTunnelControl *tc = NULL; libxlTunnelMigrationThread *arg = NULL; @@ -931,7 +931,7 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, /* Write to dest stream */ arg->st = st; if (virThreadCreate(&tc->thread, true, - libxlTunnel3MigrationFunc, arg) < 0) { + libxlTunnel3MigrationSrcFunc, arg) < 0) { virReportError(errno, "%s", _("Unable to create tunnel migration thread")); goto out; @@ -939,16 +939,17 @@ libxlMigrationStartTunnel(libxlDriverPrivatePtr driver, virObjectUnlock(vm); /* Send data to pipe */ - ret = libxlDoMigrateSend(driver, vm, flags, tc->dataFD[1]); + ret = libxlDoMigrateSrcSend(driver, vm, flags, tc->dataFD[1]); virObjectLock(vm); out: - /* libxlMigrationStopTunnel will be called in libxlDoMigrateP2P to free - * all resources for us. */ + /* libxlMigrationSrcStopTunnel will be called in libxlDoMigrateSrcP2P + * to free all resources for us. + */ return ret; } -static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) +static void libxlMigrationSrcStopTunnel(struct libxlTunnelControl *tc) { if (!tc) return; @@ -966,15 +967,15 @@ static void libxlMigrationStopTunnel(struct libxlTunnelControl *tc) * introduced in libxl. */ static int -libxlDoMigrateP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virConnectPtr sconn, - const char *xmlin, - virConnectPtr dconn, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *dname, - const char *uri, - unsigned int flags) +libxlDoMigrateSrcP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + virConnectPtr dconn, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *dname, + const char *uri, + unsigned int flags) { virDomainPtr ddomain = NULL; virTypedParameterPtr params = NULL; @@ -992,8 +993,8 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, virStreamPtr st = NULL; struct libxlTunnelControl *tc = NULL; - dom_xml = libxlDomainMigrationBegin(sconn, vm, xmlin, - &cookieout, &cookieoutlen); + dom_xml = libxlDomainMigrationSrcBegin(sconn, vm, xmlin, + &cookieout, &cookieoutlen); if (!dom_xml) goto cleanup; @@ -1048,10 +1049,10 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, VIR_DEBUG("Perform3 uri=%s", NULLSTR(uri_out)); if (flags & VIR_MIGRATE_TUNNELLED) - ret = libxlMigrationStartTunnel(driver, vm, flags, st, &tc); + ret = libxlMigrationSrcStartTunnel(driver, vm, flags, st, &tc); else - ret = libxlDomainMigrationPerform(driver, vm, NULL, NULL, - uri_out, NULL, flags); + ret = libxlDomainMigrationSrcPerform(driver, vm, NULL, NULL, + uri_out, NULL, flags); if (ret < 0) orig_err = virSaveLastError(); @@ -1082,7 +1083,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, orig_err = virSaveLastError(); VIR_DEBUG("Confirm3 cancelled=%d vm=%p", cancelled, vm); - ret = libxlDomainMigrationConfirm(driver, vm, flags, cancelled); + ret = libxlDomainMigrationSrcConfirm(driver, vm, flags, cancelled); if (ret < 0) VIR_WARN("Guest %s probably left in 'paused' state on source", @@ -1090,7 +1091,7 @@ libxlDoMigrateP2P(libxlDriverPrivatePtr driver, cleanup: if (flags & VIR_MIGRATE_TUNNELLED) { - libxlMigrationStopTunnel(tc); + libxlMigrationSrcStopTunnel(tc); virObjectUnref(st); } @@ -1129,14 +1130,14 @@ static virConnectAuth virConnectAuthConfig = { * the migration process with an established virConnectPtr to the destination. */ int -libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - virConnectPtr sconn, - const char *xmlin, - const char *dconnuri, - const char *uri_str ATTRIBUTE_UNUSED, - const char *dname, - unsigned int flags) +libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *xmlin, + const char *dconnuri, + const char *uri_str ATTRIBUTE_UNUSED, + const char *dname, + unsigned int flags) { int ret = -1; bool useParams; @@ -1170,8 +1171,8 @@ libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, goto cleanup; } - ret = libxlDoMigrateP2P(driver, vm, sconn, xmlin, dconn, dconnuri, - dname, uri_str, flags); + ret = libxlDoMigrateSrcP2P(driver, vm, sconn, xmlin, dconn, dconnuri, + dname, uri_str, flags); cleanup: orig_err = virSaveLastError(); @@ -1187,13 +1188,13 @@ libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, } int -libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - const char *dom_xml ATTRIBUTE_UNUSED, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *uri_str, - const char *dname ATTRIBUTE_UNUSED, - unsigned int flags) +libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri_str, + const char *dname ATTRIBUTE_UNUSED, + unsigned int flags) { libxlDomainObjPrivatePtr priv = vm->privateData; char *hostname = NULL; @@ -1233,7 +1234,7 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, /* suspend vm and send saved data to dst through socket fd */ virObjectUnlock(vm); - ret = libxlDoMigrateSend(driver, vm, flags, sockfd); + ret = libxlDoMigrateSrcSend(driver, vm, flags, sockfd); virObjectLock(vm); if (ret < 0) @@ -1249,10 +1250,10 @@ libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, } virDomainPtr -libxlDomainMigrationFinish(virConnectPtr dconn, - virDomainObjPtr vm, - unsigned int flags, - int cancelled) +libxlDomainMigrationDstFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) { libxlDriverPrivatePtr driver = dconn->privateData; libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); @@ -1347,10 +1348,10 @@ libxlDomainMigrationFinish(virConnectPtr dconn, } int -libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned int flags, - int cancelled) +libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) { libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); libxlDomainObjPrivatePtr priv = vm->privateData; @@ -1358,7 +1359,7 @@ libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, int ret = -1; if (cancelled) { - /* Resume lock process that was paused in MigrationPerform */ + /* Resume lock process that was paused in MigrationSrcPerform */ virDomainLockProcessResume(driver->lockManager, "xen:///system", vm, diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 3bc2d0eae..42897426d 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -42,63 +42,63 @@ NULL char * -libxlDomainMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - char **cookieout, - int *cookieoutlen); +libxlDomainMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + char **cookieout, + int *cookieoutlen); virDomainDefPtr -libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, - const char *dom_xml, - const char *dname); +libxlDomainMigrationDstPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname); int -libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, - virStreamPtr st, - virDomainDefPtr *def, - const char *cookiein, - int cookieinlen, - unsigned int flags); +libxlDomainMigrationDstPrepareTunnel3(virConnectPtr dconn, + virStreamPtr st, + virDomainDefPtr *def, + const char *cookiein, + int cookieinlen, + unsigned int flags); int -libxlDomainMigrationPrepare(virConnectPtr dconn, - virDomainDefPtr *def, - const char *uri_in, - char **uri_out, - const char *cookiein, - int cookieinlen, - unsigned int flags); +libxlDomainMigrationDstPrepare(virConnectPtr dconn, + virDomainDefPtr *def, + const char *uri_in, + char **uri_out, + const char *cookiein, + int cookieinlen, + unsigned int flags); int -libxlDomainMigrationPerformP2P(libxlDriverPrivatePtr driver, +libxlDomainMigrationSrcPerformP2P(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + virConnectPtr sconn, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +int +libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - virConnectPtr sconn, const char *dom_xml, const char *dconnuri, const char *uri_str, const char *dname, unsigned int flags); -int -libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - const char *dom_xml, - const char *dconnuri, - const char *uri_str, - const char *dname, - unsigned int flags); - virDomainPtr -libxlDomainMigrationFinish(virConnectPtr dconn, - virDomainObjPtr vm, - unsigned int flags, - int cancelled); +libxlDomainMigrationDstFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); int -libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, - virDomainObjPtr vm, - unsigned int flags, - int cancelled); +libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); #endif /* LIBXL_DRIVER_H */ -- 2.16.2

2 1

[libvirt] [jenkins-ci PATCH 0/3] guests: Configure ccache
by Andrea Bolognani 20 Mar '18

20 Mar '18

See patch 3/3 for the rationale. Andrea Bolognani (3): guests: Rename 'ci' flavor to 'jenkins' guests: Factor out user creation guests: Configure ccache guests/README.markdown | 9 +++++---- guests/files/ccache.conf | 1 + guests/lcitool | 12 ++++++------ guests/site.yml | 8 ++------ guests/tasks/jenkins.yml | 6 ------ guests/tasks/test.yml | 21 --------------------- guests/tasks/user.yml | 42 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 56 insertions(+), 43 deletions(-) create mode 100644 guests/files/ccache.conf delete mode 100644 guests/tasks/test.yml create mode 100644 guests/tasks/user.yml -- 2.14.3

2 6

[libvirt] [PATCH] travis: Test both python2 and python3
by Andrea Bolognani 20 Mar '18

20 Mar '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d071c98634..01dffaa602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,12 @@ matrix: - compiler: gcc dist: trusty env: + - PYTHON=$(which python2) - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=upstart" - compiler: clang dist: trusty env: + - PYTHON=$(which python3) - DISTCHECK_CONFIGURE_FLAGS="--with-init-script=systemd" - compiler: clang os: osx -- 2.14.3

2 1