- Devel - libvirt List Archives

[libvirt] [PATCH 00/10] various test fixes and input devices handling
by Pavel Hrdina 05 Jan '16

05 Jan '16

This patch series is a follow up for [1]. The first patch fixes one missed path for calling virDomainDefPostParse after parsing driver specific configuration. Then there is a bunch of tests improvements to help developers handle large updates of expected output files. It helped me with the last patch, that updates XML files after the input device fixes. And there is a v2 of intput device cleanup patch, now it add implicit input devices into config XML and uses driver's post parse functions to do that. [1] https://www.redhat.com/archives/libvir-list/2015-December/msg00188.html Pavel Hrdina (10): xen: move virDomainDefPostParse to xenParseSxpr tests: introduce VIR_TEST_REGENERATE_OUTPUT flag tests.testutils: use VIR_TEST_REGENERATE_OUTPUT for virTestDifferenceFull tests.testutils: use virTestDifferenceFull in virtTestCompareToFile tests: use virtTestDifferenceFull in tests where we have output file tests: skip regeneration for problematic test tests: regenerate all outputs using VIR_TEST_REGENERATE_OUTPUT flag tests.nwfilterebiptablestest: swap actual and expected device: cleanup input device code tests: update test XML files to follow input changes src/Makefile.am | 4 +- src/conf/domain_conf.c | 77 +----------- src/libxl/libxl_domain.c | 5 + src/qemu/qemu_domain.c | 22 ++++ src/xen/xen_driver.c | 5 + src/xen/xend_internal.c | 6 +- src/xenapi/xenapi_driver.c | 5 + src/xenconfig/xen_common.c | 22 ++++ src/xenconfig/xen_common.h | 2 + src/xenconfig/xen_sxpr.c | 22 ++-- src/xenconfig/xen_sxpr.h | 9 +- .../disk_snapshot_redefine.xml | 2 + .../external_vm_redefine.xml | 2 + tests/domainsnapshotxml2xmlout/full_domain.xml | 2 + tests/domainsnapshotxml2xmlout/metadata.xml | 2 + tests/domainsnapshotxml2xmltest.c | 2 +- tests/interfacexml2xmltest.c | 2 +- tests/lxcconf2xmltest.c | 2 +- tests/nodedevxml2xmltest.c | 2 +- tests/nwfilterebiptablestest.c | 14 +-- tests/qemuargv2xmltest.c | 18 ++- tests/qemuhotplugtest.c | 11 +- .../qemuhotplug-hotplug-base+disk-scsi.xml | 2 + .../qemuhotplug-hotplug-base+disk-usb.xml | 2 + .../qemuhotplug-hotplug-base+disk-virtio.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml | 2 + .../qemuxml2argv-blkiotune-device.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml | 6 +- .../qemuxml2argvdata/qemuxml2argv-boot-floppy.xml | 6 +- .../qemuxml2argv-boot-menu-disable.xml | 2 + .../qemuxml2argv-boot-menu-enable-with-timeout.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-boot-network.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml | 2 + .../qemuxml2argv-channel-guestfwd.xml | 2 + .../qemuxml2argv-channel-virtio.xml | 2 + .../qemuxml2argv-chardev-label.xml | 2 + .../qemuxml2argv-clock-catchup.xml | 2 + .../qemuxml2argv-clock-localtime.xml | 6 +- .../qemuxml2argv-clock-timer-hyperv-rtc.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml | 6 +- .../qemuxml2argv-console-compat.xml | 6 +- .../qemuxml2argv-console-virtio-many.xml | 2 + .../qemuxml2argv-cpu-eoi-disabled.xml | 2 + .../qemuxml2argv-cpu-eoi-enabled.xml | 2 + .../qemuxml2argv-cpu-host-kvmclock.xml | 2 + .../qemuxml2argv-cpu-host-model-features.xml | 2 + .../qemuxml2argv-cpu-host-passthrough-features.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml | 2 + .../qemuxml2argv-cpu-numa-disjoint.xml | 2 + .../qemuxml2argv-cpu-numa-memshared.xml | 2 + ...xml2argv-cputune-iothreadsched-zeropriority.xml | 2 + .../qemuxml2argv-cputune-numatune.xml | 2 + .../qemuxml2argv-cputune-zero-shares.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 2 + .../qemuxml2argv-disk-active-commit.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml | 2 + .../qemuxml2argv-disk-cdrom-empty.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml | 6 +- .../qemuxml2argv-disk-copy_on_read.xml | 2 + .../qemuxml2argv-disk-drive-boot-cdrom.xml | 7 +- .../qemuxml2argv-disk-drive-boot-disk.xml | 7 +- .../qemuxml2argv-disk-drive-cache-directsync.xml | 2 + .../qemuxml2argv-disk-drive-cache-unsafe.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-none.xml | 6 +- .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 2 + .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 2 + .../qemuxml2argv-disk-drive-copy-on-read.xml | 2 + ...muxml2argv-disk-drive-error-policy-enospace.xml | 2 + .../qemuxml2argv-disk-drive-error-policy-stop.xml | 2 + ...rgv-disk-drive-error-policy-wreport-rignore.xml | 2 + .../qemuxml2argv-disk-drive-fat.xml | 2 + .../qemuxml2argv-disk-drive-fmt-qcow.xml | 2 + .../qemuxml2argv-disk-drive-network-gluster.xml | 2 + .../qemuxml2argv-disk-drive-network-iscsi-auth.xml | 2 + .../qemuxml2argv-disk-drive-network-iscsi.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-export.xml | 2 + ...xml2argv-disk-drive-network-nbd-ipv6-export.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-ipv6.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd-unix.xml | 2 + .../qemuxml2argv-disk-drive-network-nbd.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd-auth.xml | 2 + ...emuxml2argv-disk-drive-network-rbd-ceph-env.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd-ipv6.xml | 2 + .../qemuxml2argv-disk-drive-network-rbd.xml | 2 + .../qemuxml2argv-disk-drive-network-sheepdog.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-floppy.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 2 + .../qemuxml2argv-disk-scsi-device.xml | 2 + .../qemuxml2argv-disk-scsi-disk-vpd.xml | 2 + ...qemuxml2argv-disk-scsi-lun-passthrough-sgio.xml | 2 + .../qemuxml2argv-disk-scsi-megasas.xml | 2 + .../qemuxml2argv-disk-scsi-virtio-scsi.xml | 2 + .../qemuxml2argv-disk-scsi-vscsi.xml | 2 + .../qemuxml2argv-disk-source-pool-mode.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-cmd_per_lun.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-ioeventfd.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-max_sectors.xml | 2 + .../qemuxml2argv-disk-virtio-scsi-num_queues.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-virtio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml | 2 + .../qemuxml2argv-encrypted-disk.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-disabled.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-eoi-enabled.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml | 2 + .../qemuxml2argv-floppy-drive-fat.xml | 2 + .../qemuxml2argv-graphics-vnc-policy.xml | 4 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 4 +- .../qemuxml2argv-graphics-vnc-tls.xml | 4 +- .../qemuxml2argv-graphics-vnc-websocket.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 4 +- .../qemuxml2argv-hostdev-pci-address.xml | 6 +- .../qemuxml2argv-hostdev-scsi-large-unit.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi-iscsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-lsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-rawio.xml | 2 + .../qemuxml2argv-hostdev-scsi-readonly.xml | 2 + .../qemuxml2argv-hostdev-scsi-sgio.xml | 2 + .../qemuxml2argv-hostdev-scsi-shareable.xml | 2 + ...qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.xml | 2 + .../qemuxml2argv-hostdev-scsi-virtio-iscsi.xml | 2 + .../qemuxml2argv-hostdev-scsi-virtio-scsi.xml | 2 + .../qemuxml2argv-hostdev-usb-address.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hotplug-base.xml | 2 + .../qemuxml2argv-hugepages-pages.xml | 2 + .../qemuxml2argv-hugepages-pages2.xml | 2 + .../qemuxml2argv-hugepages-pages3.xml | 2 + .../qemuxml2argv-hugepages-shared.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-hyperv-panic.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-hyperv.xml | 6 +- .../qemuxml2argv-input-usbmouse.xml | 2 + .../qemuxml2argv-input-usbtablet.xml | 2 + .../qemuxml2argv-interface-driver.xml | 2 + .../qemuxml2argv-iothreads-disk.xml | 2 + .../qemuxml2argv-iothreads-ids-partial.xml | 2 + .../qemuxml2argv-iothreads-ids.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-iothreads.xml | 2 + .../qemuxml2argv-kvm-features-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-kvm-features.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-lease.xml | 2 + .../qemuxml2argv-machine-aeskeywrap-off-argv.xml | 4 +- .../qemuxml2argv-machine-aeskeywrap-on-argv.xml | 4 +- .../qemuxml2argv-machine-core-off.xml | 6 +- .../qemuxml2argv-machine-core-on.xml | 6 +- .../qemuxml2argv-machine-deakeywrap-off-argv.xml | 4 +- .../qemuxml2argv-machine-deakeywrap-on-argv.xml | 4 +- .../qemuxml2argv-machine-keywrap-none-argv.xml | 4 +- .../qemuxml2argv-memory-hotplug-dimm.xml | 2 + .../qemuxml2argv-memory-hotplug-nonuma.xml | 2 + .../qemuxml2argv-memory-hotplug.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-migrate.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml | 2 + .../qemuxml2argv-misc-disable-s3.xml | 6 +- .../qemuxml2argv-misc-disable-suspends.xml | 6 +- .../qemuxml2argv-misc-enable-s4.xml | 6 +- .../qemuxml2argv-misc-no-reboot.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml | 2 + .../qemuxml2argv-net-eth-ifname.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 6 +- .../qemuxml2argv-net-hostdev-vfio.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-net-midonet.xml | 2 + .../qemuxml2argv-net-openvswitch.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-udp.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 2 + .../qemuxml2argv-net-vhostuser.xml | 2 + .../qemuxml2argv-net-virtio-device.xml | 2 + .../qemuxml2argv-net-virtio-disable-offloads.xml | 2 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml | 2 + .../qemuxml2argv-nographics-vga.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 6 +- .../qemuxml2argv-numad-static-vcpu-no-numatune.xml | 2 + .../qemuxml2argv-numatune-memnode-no-memory.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-panic-double.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-panic-isa.xml | 2 + .../qemuxml2argv-panic-no-address.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + .../qemuxml2argv-pci-serial-dev-chardev.xml | 2 + .../qemuxml2argv-pcie-root-port-too-many.xml | 2 + .../qemuxml2argv-pcie-root-port.xml | 2 + .../qemuxml2argv-pcie-switch-downstream-port.xml | 2 + .../qemuxml2argv-pcie-switch-upstream-port.xml | 2 + .../qemuxml2argv-pcihole64-none.xml | 2 + .../qemuxml2argv-pcihole64-q35.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 2 + .../qemuxml2argv-pmu-feature-off.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- .../qemuxml2argv-pv-spinlock-disabled.xml | 2 + .../qemuxml2argv-pv-spinlock-enabled.xml | 2 + .../qemuxml2argv-qemu-ns-no-env.xml | 2 + .../qemuxml2argv-reboot-timeout-disabled.xml | 6 +- .../qemuxml2argv-reboot-timeout-enabled.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml | 2 + .../qemuxml2argv-seclabel-dac-none.xml | 2 + .../qemuxml2argv-seclabel-device-multiple.xml | 2 + .../qemuxml2argv-seclabel-dynamic-baselabel.xml | 2 + .../qemuxml2argv-seclabel-dynamic-none.xml | 2 + .../qemuxml2argv-seclabel-dynamic-override.xml | 2 + .../qemuxml2argv-seclabel-static-labelskip.xml | 2 + .../qemuxml2argv-seclabel-static.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml | 6 +- .../qemuxml2argvdata/qemuxml2argv-serial-file.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-many.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml | 2 + .../qemuxml2argv-serial-spiceport-nospice.xml | 2 + .../qemuxml2argv-serial-tcp-telnet.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-serial-unix.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml | 6 +- tests/qemuxml2argvdata/qemuxml2argv-shmem.xml | 2 + .../qemuxml2argv-smbios-multiple-type2.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-smbios.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-sound-device.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-tap-vhost.xml | 2 + .../qemuxml2argv-tpm-passthrough.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml | 2 + .../qemuxml2argv-vcpu-placement-static.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-vhost_queues.xml | 2 + .../qemuxml2argv-video-virtio-gpu-device.xml | 2 + .../qemuxml2argv-video-virtio-gpu-virgl.xml | 2 + .../qemuxml2argv-virtio-input-passthrough.xml | 2 + .../qemuxml2argvdata/qemuxml2argv-virtio-input.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml | 2 + .../qemuxml2argv-virtio-rng-egd.xml | 2 + .../qemuxml2argv-virtio-rng-random.xml | 2 + tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml | 6 +- .../qemuxml2xmlout-balloon-device-auto.xml | 2 + .../qemuxml2xmlout-balloon-device-period.xml | 2 + .../qemuxml2xmlout-bios-nvram-os-interleave.xml | 2 + ...muxml2xmlout-boot-menu-disable-with-timeout.xml | 2 + .../qemuxml2xmlout-channel-virtio-auto.xml | 2 + .../qemuxml2xmlout-channel-virtio-state-active.xml | 2 + ...emuxml2xmlout-channel-virtio-state-inactive.xml | 2 + .../qemuxml2xmlout-console-compat-auto.xml | 2 + .../qemuxml2xmlout-console-compat2.xml | 2 + .../qemuxml2xmlout-console-virtio.xml | 2 + .../qemuxml2xmlout-controller-usb-order.xml | 2 + .../qemuxml2xmlout-cpu-empty.xml | 2 + .../qemuxml2xmlout-cpu-numa-disordered.xml | 2 + .../qemuxml2xmlout-cpu-numa-no-memory-element.xml | 2 + .../qemuxml2xmlout-cpu-numa1.xml | 2 + .../qemuxml2xmlout-cpu-numa2.xml | 2 + .../qemuxml2xmlout-cputune-iothreads.xml | 2 + .../qemuxml2xmlout-cputune-iothreadsched.xml | 2 + .../qemuxml2xmlout-default-kvm-host-arch.xml | 2 + .../qemuxml2xmlout-default-qemu-host-arch.xml | 2 + .../qemuxml2xmlout-disk-backing-chains-active.xml | 2 + ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 2 + .../qemuxml2xmlout-disk-drive-discard.xml | 2 + .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 2 + .../qemuxml2xmlout-disk-mirror-old.xml | 2 + .../qemuxml2xmlout-disk-mirror.xml | 2 + .../qemuxml2xmlout-disk-scsi-device-auto.xml | 2 + .../qemuxml2xmlout-disk-source-pool.xml | 2 + ...qemuxml2xmlout-hostdev-scsi-autogen-address.xml | 2 + .../qemuxml2xmlout-memtune-unlimited.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-memtune.xml | 2 + .../qemuxml2xmlout-metadata-duplicate.xml | 2 + .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 2 + ...emuxml2xmlout-numad-auto-memory-vcpu-cpuset.xml | 2 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 2 + .../qemuxml2xmlout-numad-auto-vcpu-no-numatune.xml | 2 + .../qemuxml2xmlout-numatune-auto-prefer.xml | 2 + .../qemuxml2xmlout-numatune-memnode.xml | 2 + tests/qemuxml2xmloutdata/qemuxml2xmlout-panic.xml | 2 + .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 + .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 + .../qemuxml2xmlout-pci-bridge-many-disks.xml | 2 + .../qemuxml2xmlout-pcie-root.xml | 2 + .../qemuxml2xmlout-pcihole64-gib.xml | 2 + .../qemuxml2xmlout-pmu-feature.xml | 2 + tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 + .../qemuxml2xmlout-seclabel-dynamic-labelskip.xml | 2 + .../qemuxml2xmlout-seclabel-dynamic-relabel.xml | 2 + .../qemuxml2xmlout-seclabel-none.xml | 2 + .../qemuxml2xmlout-serial-target-port-auto.xml | 2 + .../qemuxml2xmlout-tap-vhost-incorrect.xml | 2 + .../qemuxml2xmlout-usb-ich9-ehci-addr.xml | 2 + .../qemuxml2xmlout-usb-redir-filter-version.xml | 2 + .../qemuxml2xmlout-usb-redir-filter.xml | 2 + tests/qemuxml2xmltest.c | 8 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 2 + tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 + .../sexpr2xml-disk-block-shareable.xml | 2 + tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 2 + .../sexpr2xml-disk-drv-blktap-qcow.xml | 2 + .../sexpr2xml-disk-drv-blktap-raw.xml | 2 + .../sexpr2xml-disk-drv-blktap2-raw.xml | 2 + tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 2 + .../sexpr2xml-pv-bootloader-cmdline.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pv.xml | 2 + tests/testutils.c | 134 ++++++++++++++++++--- tests/testutils.h | 8 ++ tests/vboxsnapshotxmltest.c | 2 +- tests/vmx2xmldata/vmx2xml-graphics-vnc.xml | 2 - tests/xmconfigdata/test-paravirt-vcpu.xml | 2 + 320 files changed, 913 insertions(+), 221 deletions(-) -- 2.6.3

1 11

[libvirt] Reboot with SR-IOV devices confuses IOMMU (bug #1294677)
by Jakub Kicinski 05 Jan '16

05 Jan '16

Hi! I hit an issue with PCI passthrough - after I reboot the VM IOMMU mappings are incorrect and devices will access invalid memory. The issue is quite easy to reproduce, I'm using NICs (e.g. Intel 40 Gig Ethernet NICs hit the issue reliably, I wasn't able to get Mellanox NICs to work reliably due to other bugs) but you could probably just pass through any PCI device which does a bit of DMA. With NICs I do the following to reproduce: - configure the NIC for SR-IOV passthrough [1]; - create two standard VMs; - configure VMs with 4GB current allocation and 15GB maximum allocation of memory (my machines have 32 or 64GB total); - pass a VF to each machine; Note1: the current/maximum allocation of memory seem to play a role here. I'm not 100% sure, however, if it causes the bug or just makes it more likely to be triggered. Note2: I leave <on_reboot>restart</on_reboot> so that VMs can reboot. I was able to reproduce easily on 3 distinct machines: dual CPU Haswell E, single CPU Haswell E, single Sandy Bridge EP. With the VMs created above do the following: (1) boot; (2) configure VF interfaces; (3) run ping -c30 to confirm they can communicate; (4) run iperf -P4 -t30 between the machines; (5) reboot; (6) goto 2; First time (fresh after boot) ping and iperf should work fine. After first reboot, there should already be communication problems. From traffic inspection with tcpdump it appears that VFs receive zeroed packets. Only some of the packets are zeroed so depending on your luck the communication may work for a while or just have limited throughput. Usually it breaks down when ARP or important TCP segment gets placed in area that device reads as zero. Reboot will not fix this condition, shutdown/start will. I reproduced this with fully up-to-date Ubuntu 14.04 (both host and VM). I also tried kernel from linux-next.git (4ef7675344d68) and qemu from tip of their git (38a762f) and bug is still there. libvirt in Ubuntu 14.04 is at 1.2.2. As already said - I reproduce this easily within a minute on a range of machines. If someone looks into this and have problems hitting the bug - please let me know. Kuba [1] For Intel NICs supported by i40e: http://www.intel.es/content/www/es/es/embedded/products/networking/xl710-sr…

1 1

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 05 Jan '16

05 Jan '16

Required for the copyright year bump to keep 'make syntax-check' happy, and also pulls in several portability fixes. * .gnulib: Update to latest. * bootstrap: Resync from upstream. * gnulib/local/m4/ssize_t.m4.diff: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. .gnulib | 2 +- bootstrap | 2 +- gnulib/local/m4/ssize_t.m4.diff | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index f39477d..6cc32c6 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit f39477dba778e99392948dd3dd19ec0d46aee932 +Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892 diff --git a/bootstrap b/bootstrap index e72894c..294c0bc 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2014-12-08.12; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 2003-2016 Free Software Foundation, 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 diff --git a/gnulib/local/m4/ssize_t.m4.diff b/gnulib/local/m4/ssize_t.m4.diff index 12cff12..c4863b9 100644 --- a/gnulib/local/m4/ssize_t.m4.diff +++ b/gnulib/local/m4/ssize_t.m4.diff @@ -5,7 +5,7 @@ index 209d64c..5ea72a1 100644 @@ -1,4 +1,4 @@ -# ssize_t.m4 serial 5 (gettext-0.18.2) +# ssize_t.m4 serial 6 (gettext-0.18.2) - dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc. + dnl Copyright (C) 2001-2003, 2006, 2010-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,21 @@ AC_DEFUN([gt_TYPE_SSIZE_T], -- 2.4.3

1 1

[libvirt] [PATCH] tests: Add newlines with VIR_TEST_REGENERATE_OUTPUT
by Cole Robinson 05 Jan '16

05 Jan '16

Since test files are formatted predictably nowadays, we can make VIR_TEST_REGENERATE_OUTPUT handle most cases for us with a simple replacement. test-wrap-argv.pl is still canon, but this bit makes it easier to confirm test output changes during active development. --- tests/testutils.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/testutils.c b/tests/testutils.c index 857e819..6487a62 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -598,6 +598,7 @@ virtTestCompareToFile(const char *strcontent, int ret = -1; char *filecontent = NULL; char *fixedcontent = NULL; + char *regencontent = NULL; bool regenerate = !!virTestGetFlag("VIR_TEST_REGENERATE_OUTPUT"); if (virtTestLoadFile(filename, &filecontent) < 0 && !regenerate) @@ -613,7 +614,10 @@ virtTestCompareToFile(const char *strcontent, if (STRNEQ_NULLABLE(fixedcontent ? fixedcontent : strcontent, filecontent)) { if (regenerate) { - if (virFileWriteStr(filename, strcontent, 0666) < 0) + if (!(regencontent = virStringReplace(strcontent, " -", " \\\n-"))) + goto failure; + + if (virFileWriteStr(filename, regencontent, 0666) < 0) goto failure; goto out; } @@ -626,6 +630,7 @@ virtTestCompareToFile(const char *strcontent, failure: VIR_FREE(fixedcontent); VIR_FREE(filecontent); + VIR_FREE(regencontent); return ret; } -- 2.5.0

1 0

[libvirt] [PATCH] qemu: Fix return value of qemuDomainGetBlockJobInfo
by Michal Privoznik 04 Jan '16

04 Jan '16

While reviewing 1b43885d1784640 I've noticed a virReportError() followed by a goto endjob; without setting the correct return value. Problem is, if block job is so fast that it's bandwidth does not fit into ulong, an error is reported. However, by that time @ret is already set to 1 which means success. Since the scenario can be hardly considered successful, we should return a value meaning error. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 304165c..1161aa0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16546,6 +16546,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, virReportError(VIR_ERR_OVERFLOW, _("bandwidth %llu cannot be represented in result"), rawInfo.bandwidth); + ret = -1; goto endjob; } -- 2.4.10

2 1

[libvirt] [PATCH] qemu: Fix all callers of qemuMonitorGetBlockJobInfo()
by Andrea Bolognani 04 Jan '16

04 Jan '16

Commit 1b43885 modified one of the callers of this function to take into account the possible return value of 0 when the block job can't be found. This commit finishes the job by updating the remaining caller. --- src/qemu/qemu_driver.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 304165c..c4573d9 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16150,14 +16150,13 @@ qemuDomainBlockPivot(virQEMUDriverPtr driver, rc = qemuMonitorGetBlockJobInfo(priv->mon, disk->info.alias, &info); if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; - if (rc < 0) + if (rc <= 0) goto cleanup; - if (rc == 1 && - (info.ready == 1 || - (info.ready == -1 && - info.end == info.cur && - (info.type == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY || - info.type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT)))) + if (info.ready == 1 || + (info.ready == -1 && + info.end == info.cur && + (info.type == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY || + info.type == VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT))) disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY; } -- 2.5.0

3 3

[libvirt] [PATCH] rbd: Return VIR_STORAGE_FILE_RAW as format for RBD volumes
by Wido den Hollander 04 Jan '16

04 Jan '16

This used to return 'unkown' and that was not correct. A vol-dumpxml now returns: <volume type='network'> <name>image3</name> <key>libvirt/image3</key> <source> </source> <capacity unit='bytes'>10737418240</capacity> <allocation unit='bytes'>10737418240</allocation> <target> <path>libvirt/image3</path> <format type='raw'/> </target> </volume> The RBD driver will now error out if a different format than RAW is provided when creating a volume. Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/conf/storage_conf.c | 3 ++- src/storage/storage_backend_rbd.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9b8abea..7c81bab 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -220,7 +220,8 @@ static virStoragePoolTypeInfo poolTypeInfo[] = { }, .volOptions = { .defaultFormat = VIR_STORAGE_FILE_RAW, - .formatToString = virStoragePoolFormatDiskTypeToString, + .formatFromString = virStorageVolumeFormatFromString, + .formatToString = virStorageFileFormatTypeToString, } }, {.poolType = VIR_STORAGE_POOL_SHEEPDOG, diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index cdbfdee..80684eb 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -306,6 +306,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, vol->target.capacity = info.size; vol->target.allocation = info.obj_size * info.num_objs; vol->type = VIR_STORAGE_VOL_NETWORK; + vol->target.format = VIR_STORAGE_FILE_RAW; VIR_FREE(vol->target.path); if (virAsprintf(&vol->target.path, "%s/%s", @@ -557,6 +558,12 @@ virStorageBackendRBDCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, { vol->type = VIR_STORAGE_VOL_NETWORK; + if (vol->target.format != VIR_STORAGE_FILE_RAW) { + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("only RAW volumes are supported by this storage pool")); + return -VIR_ERR_NO_SUPPORT; + } + VIR_FREE(vol->target.path); if (virAsprintf(&vol->target.path, "%s/%s", pool->def->source.name, @@ -603,6 +610,12 @@ virStorageBackendRBDBuildVol(virConnectPtr conn, goto cleanup; } + if (vol->target.format != VIR_STORAGE_FILE_RAW) { + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("only RAW volumes are supported by this storage pool")); + goto cleanup; + } + if (virStorageBackendRBDOpenRADOSConn(&ptr, conn, &pool->def->source) < 0) goto cleanup; -- 1.9.1

2 1

[libvirt] [PATCH 0/3] Various Valgrind fixes
by Michael Chapman 04 Jan '16

04 Jan '16

Valgrind reported a couple of memory leaks and jumps conditional on uninitialized values. Happy New Year! Michael Chapman (3): qemu: do not copy out non-existent block job info qemu: do not leak NBD disk data in migration cookie storage: do not leak storage pool XML filename src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_migration.c | 5 +++-- src/storage/storage_driver.c | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) -- 2.4.3

3 5

[libvirt] [libvirt-glib][PATCH] libvirt-glib-1.0.pc.in: Correctly mark variable
by Michal Privoznik 04 Jan '16

04 Jan '16

In the pkg-config file for libvirt-glib we have a typo: Libs.private: @LIBVIRT_LIBS @GLIB2_LIBS@ Noticed the missing '@' after LIBVIRT_LIBS? Well, I just did. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt-glib-1.0.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-glib-1.0.pc.in b/libvirt-glib-1.0.pc.in index 1e8956d..d00be9f 100644 --- a/libvirt-glib-1.0.pc.in +++ b/libvirt-glib-1.0.pc.in @@ -8,5 +8,5 @@ Version: @VERSION@ Description: libvirt glib library Requires: glib-2.0 Libs: -L${libdir} -lvirt-glib-1.0 -Libs.private: @LIBVIRT_LIBS @GLIB2_LIBS@ +Libs.private: @LIBVIRT_LIBS@ @GLIB2_LIBS@ Cflags: -I${includedir}/libvirt-glib-1.0 @LIBVIRT_CFLAGS@ @GLIB2_CFLAGS@ -- 2.4.10

3 3

[libvirt] Non-contiguous NUMA cell numbers
by Andrea Bolognani 04 Jan '16

04 Jan '16

Hi all, libvirt currently doesn't allow you to configure a guest with something like <cpu> <topology sockets='2' cores='5' threads='8'/> <numa> <cell id='0' cpus='0-39' memory='1048576' unit='KiB'/> <cell id='16' cpus='40-79' memory='1048576' unit='KiB'/> </numa> </cpu> with the following error: XML error: Exactly one 'cell' element per guest NUMA cell allowed, non-contiguous ranges or ranges not starting from 0 are not allowed The error message is very specific about not allowing gaps in NUMA cell numbering; however, on the very same host, I have $ numactl --hard | head -1 available: 4 nodes (0-1,16-17) so gaps in numbering are definitely possible, at least on ppc64. Should we consider relaxing this requirement and allow arbitrarily-numbered NUMA cells? Is there a specific reason why it was forbidden in the first place? Cheers. -- Andrea Bolognani Software Engineer - Virtualization Team

4 4

[libvirt] [PATCH v8 0/5] Partial posting of updates to Add quorum to libvirt
by John Ferlan 04 Jan '16

04 Jan '16

I took a few cycles to reformat the initial 5 patches of the add quorum support posted as a v7 here: http://www.redhat.com/archives/libvir-list/2015-December/msg00119.html These patches are easily separable from the rest of the series. Rather than see things linger for months on end, trying to make small leaps. Changes in the series are to reorder things slightly, follow some of the review comments from previous series, and a few other things along the way. I've looked at this way too long to - hopefully I haven't missed anything. Most I forget... One I do remember is the virStorageSourceCopy changes in patch 5 where I believe the "Get" and "Set" wanted to use the 'i' index rather than having the "Get" use the 'i' and the "Set" always use '0'. Matthias Gatto (5): virstoragefile: Add helper to get storage source backingStore virstoragefile: Add helper to set storage source backingStore virstoragefile: Use helper to get storage source backing store virstoragefile: Use helper to set storage source backing store virstoragefile: Convert storage source backingStore into backingStores src/conf/domain_conf.c | 25 +++++---- src/conf/storage_conf.c | 29 ++++++----- src/libvirt_private.syms | 2 + src/qemu/qemu_cgroup.c | 6 ++- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 35 ++++++++----- src/qemu/qemu_monitor_json.c | 4 +- src/security/security_dac.c | 3 +- src/security/security_selinux.c | 5 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_backend.c | 34 +++++++----- src/storage/storage_backend_fs.c | 46 +++++++++------- src/storage/storage_backend_gluster.c | 11 ++-- src/storage/storage_backend_logical.c | 15 ++++-- src/storage/storage_driver.c | 3 +- src/util/virstoragefile.c | 98 ++++++++++++++++++++++++++++++----- src/util/virstoragefile.h | 10 +++- tests/virstoragetest.c | 18 +++---- 18 files changed, 243 insertions(+), 105 deletions(-) -- 2.5.0

2 6

[libvirt] [PATCH] tests: Make test-wrap-argv.pl executable
by Michal Privoznik 03 Jan '16

03 Jan '16

While 'perl test-wrap-argv.pl' is not too long, './test-wrap-argv.pl' is shorter. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/test-wrap-argv.pl | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/test-wrap-argv.pl diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl old mode 100644 new mode 100755 -- 2.4.10

2 1

[libvirt] [PATCH] bhyve: bhyveload: respect boot dev and boot order
by Roman Bogorodskiy 03 Jan '16

03 Jan '16

Make bhyveload respect boot order as specified by os.boot section of the domain XML or by "boot order" for specific devices. As bhyve does not support a real boot order specification right now, it's just about choosing a single device to boot from. --- src/bhyve/bhyve_command.c | 49 ++++++++++++++++++++-- .../bhyvexml2argv-bhyveload-bootorder.args | 10 +++++ .../bhyvexml2argv-bhyveload-bootorder.ldargs | 3 ++ .../bhyvexml2argv-bhyveload-bootorder.xml | 30 +++++++++++++ .../bhyvexml2argv-bhyveload-bootorder1.args | 10 +++++ .../bhyvexml2argv-bhyveload-bootorder1.ldargs | 3 ++ .../bhyvexml2argv-bhyveload-bootorder1.xml | 29 +++++++++++++ .../bhyvexml2argv-bhyveload-bootorder2.args | 9 ++++ .../bhyvexml2argv-bhyveload-bootorder2.ldargs | 3 ++ .../bhyvexml2argv-bhyveload-bootorder2.xml | 24 +++++++++++ .../bhyvexml2argv-bhyveload-bootorder3.args | 10 +++++ .../bhyvexml2argv-bhyveload-bootorder3.ldargs | 3 ++ .../bhyvexml2argv-bhyveload-bootorder3.xml | 30 +++++++++++++ tests/bhyvexml2argvtest.c | 4 ++ 14 files changed, 214 insertions(+), 3 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 6576029..1e5d4c7 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -522,6 +522,48 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, return cmd; } +static virDomainDiskDefPtr +virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def) +{ + size_t i; + virDomainDiskDefPtr match = NULL; + int best_index = INT_MAX; + int boot_cdrom = 0, boot_disk = 0; + + if (def->ndisks == 0) + return NULL; + + for (i = 0; i < def->os.nBootDevs; i++) { + switch (def->os.bootDevs[i]) { + case VIR_DOMAIN_BOOT_CDROM: + boot_cdrom = i; + break; + case VIR_DOMAIN_BOOT_DISK: + boot_disk = i; + break; + } + } + + for (i = 0; i < def->ndisks; i++) { + int bootIndex; + if (!virBhyveUsableDisk(conn, def->disks[i])) + continue; + + bootIndex = def->disks[i]->info.bootIndex; + if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + bootIndex += boot_cdrom; + else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) + bootIndex += boot_disk; + + if (bootIndex < best_index) { + best_index = bootIndex; + match = def->disks[i]; + } + } + + return match; +} + virCommandPtr virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def, const char *devmap_file, char **devicesmap_out) @@ -535,10 +577,11 @@ virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def, } if (def->os.bootloader == NULL) { - disk = def->disks[0]; + disk = virBhyveGetBootDisk(conn, def); - if (!virBhyveUsableDisk(conn, disk)) - return NULL; + if (disk == NULL) + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("no bootable disks found")); return virBhyveProcessBuildBhyveloadCmd(def, disk); } else if (strstr(def->os.bootloader, "grub-bhyve") != NULL) { diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args new file mode 100644 index 0000000..01a0290 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img \ +-s 4:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs new file mode 100644 index 0000000..24e0bc2 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml new file mode 100644 index 0000000..487caf0 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='file' type='raw'/> + <source file='/tmp/cdrom.iso'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args new file mode 100644 index 0000000..01a0290 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img \ +-s 4:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs new file mode 100644 index 0000000..32538b5 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml new file mode 100644 index 0000000..6ea4631 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml @@ -0,0 +1,29 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <boot dev='hd'/> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='file' type='raw'/> + <source file='/tmp/cdrom.iso'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.args new file mode 100644 index 0000000..88de179 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.args @@ -0,0 +1,9 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.ldargs new file mode 100644 index 0000000..32538b5 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/freebsd.img bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml new file mode 100644 index 0000000..f086a9e --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml @@ -0,0 +1,24 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <boot dev='cdrom'/> + <boot dev='hd'/> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args new file mode 100644 index 0000000..01a0290 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args @@ -0,0 +1,10 @@ +/usr/sbin/bhyve \ +-c 1 \ +-m 214 \ +-u \ +-H \ +-P \ +-s 0:0,hostbridge \ +-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \ +-s 2:0,ahci-hd,/tmp/freebsd.img \ +-s 4:0,ahci-cd,/tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs new file mode 100644 index 0000000..24e0bc2 --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs @@ -0,0 +1,3 @@ +/usr/sbin/bhyveload \ +-m 214 \ +-d /tmp/cdrom.iso bhyve diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml new file mode 100644 index 0000000..c3edcdf --- /dev/null +++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml @@ -0,0 +1,30 @@ +<domain type='bhyve'> + <name>bhyve</name> + <uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid> + <memory>219136</memory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + </os> + <devices> + <disk type='file' device='disk'> + <driver name='file' type='raw'/> + <source file='/tmp/freebsd.img'/> + <target dev='hda' bus='sata'/> + <boot order='2'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='file' type='raw'/> + <source file='/tmp/cdrom.iso'/> + <target dev='hda' bus='sata'/> + <boot order='1'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> + </disk> + <interface type='bridge'> + <model type='virtio'/> + <source bridge="virbr0"/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </interface> + </devices> +</domain> diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c index 3e57a78..bea4caa 100644 --- a/tests/bhyvexml2argvtest.c +++ b/tests/bhyvexml2argvtest.c @@ -130,6 +130,10 @@ mymain(void) DO_TEST("grub-defaults"); DO_TEST("grub-bootorder"); DO_TEST("grub-bootorder2"); + DO_TEST("bhyveload-bootorder"); + DO_TEST("bhyveload-bootorder1"); + DO_TEST("bhyveload-bootorder2"); + DO_TEST("bhyveload-bootorder3"); DO_TEST("bhyveload-explicitargs"); DO_TEST("custom-loader"); DO_TEST("disk-cdrom-grub"); -- 2.4.6

2 2

[libvirt] [PATCH] conf: rework code around 'append' attribute to make coverity happy
by Dmitry Mishin 30 Dec '15

30 Dec '15

Signed-off-by: Dmitry Mishin <dim(a)virtuozzo.com> --- src/conf/domain_conf.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f210c0b..8895e10 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1723,10 +1723,11 @@ virDomainChrSourceDefCopy(virDomainChrSourceDefPtr dest, switch (src->type) { case VIR_DOMAIN_CHR_TYPE_FILE: - dest->data.file.append = src->data.file.append; case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_PIPE: + if (src->type == VIR_DOMAIN_CHR_TYPE_FILE) + dest->data.file.append = src->data.file.append; if (VIR_STRDUP(dest->data.file.path, src->data.file.path) < 0) return -1; break; @@ -9386,12 +9387,12 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, switch ((virDomainChrType) def->type) { case VIR_DOMAIN_CHR_TYPE_FILE: - if (!append) - append = virXMLPropString(cur, "append"); case VIR_DOMAIN_CHR_TYPE_PTY: case VIR_DOMAIN_CHR_TYPE_DEV: case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_UNIX: + if (!append && def->type == VIR_DOMAIN_CHR_TYPE_FILE) + append = virXMLPropString(cur, "append"); /* PTY path is only parsed from live xml. */ if (!path && (def->type != VIR_DOMAIN_CHR_TYPE_PTY || @@ -9476,15 +9477,15 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, break; case VIR_DOMAIN_CHR_TYPE_FILE: + case VIR_DOMAIN_CHR_TYPE_PTY: + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_PIPE: if (append && (def->data.file.append = virTristateSwitchTypeFromString(append)) <= 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid append attribute value '%s'"), append); goto error; } - case VIR_DOMAIN_CHR_TYPE_PTY: - case VIR_DOMAIN_CHR_TYPE_DEV: - case VIR_DOMAIN_CHR_TYPE_PIPE: if (!path && def->type != VIR_DOMAIN_CHR_TYPE_PTY) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.3.1

2 2

[libvirt] [PATCHv2 0/3] 'Append' attribute for serial ports output to file
by Dmitry Mishin 27 Dec '15

27 Dec '15

By default, QEMU truncates serial file on open. Sometimes, it could be weird - for example, when we are trying to investigate some event, which occured several restarts ago. This patch set adds an ability to preserve previous content. Dmitry Mishin (3): tests: add qemu 2.6 caps test conf: Add new 'append' attribute for chardevs with file source qemu: Process new 'append' attribute for char dev with output to a file docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 28 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 173 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 4043 ++++++++++++++++++++ tests/qemucapabilitiestest.c | 1 + .../qemuxml2argv-serial-file-chardev.args | 2 +- .../qemuxml2argv-serial-file-chardev.xml | 2 +- tests/qemuxml2argvtest.c | 3 +- 12 files changed, 4264 insertions(+), 7 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.replies -- 1.8.3.1

3 8

[libvirt] Proposal for snapshotting functions of volumes
by Wido den Hollander 25 Dec '15

25 Dec '15

Hi, Currently libvirt is lacking support for snapshotting volumes through the storage pool mechanism. I want to add this to libvirt, but since the internals and the API design ideas of libvirt are not fully known to me I wanted to put this up for a basic review first. This patch can also be viewed on Github: https://github.com/wido/libvirt/commit/4483ab247f607250c5b3314d0a19509ef251… My main questions are: * Is this something we would like to see in libvirt? * If so, am I on the right track? * If so, what API calls should be different? The steps I want to take: 1. Add the new API calls 2. Add support to the RBD backend 3. Add support to virsh 4. Add support to the Java bindings The Apache CloudStack project uses libvirt intensively and I want to add as much support to libvirt as we need so that we don't do stuff inside CloudStack where libvirt might be a lot better place to do it. Any comments are very much appreciated before I start spending hours of my time on this :) Wido

1 1

[libvirt] centos6.5 virsh list hang and libvirtd can not restart
by 王李明 25 Dec '15

25 Dec '15

hi all： my environment is centos6.5 libvirt version is 1.2.14-1 qemu version is 1.7.0-1 I use openstack create a windows guest about two days later I run virsh list but the the process is hang virsh list can not return any thing it hang then I run /etc/init.d/libvirtd restart it show libivrtd stop faild and start failed I run /etc/init.d/libvirtd status it show libvired dead but subsys locked who can help me ? thans

2 2

[libvirt] [PATCH] vz: BUG: fix connecting hang in case of init failure
by Maxim Nestratov 25 Dec '15

25 Dec '15

In case of prlsdkLoadDomains fails, vzOpenDefault should clear connection privateData pointer every time its memory is actually freed. Also it is not necessary to call vzConnectClose if a call to vzOpenDefault fails, because they both make cleanup of connection privateData. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 2ef47e4..dfcffb4 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -266,6 +266,7 @@ vzOpenDefault(virConnectPtr conn) prlsdkDisconnect(privconn); prlsdkDeinit(); err_free: + conn->privateData = NULL; VIR_FREE(privconn); return VIR_DRV_OPEN_ERROR; } @@ -307,10 +308,8 @@ vzConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - if ((ret = vzOpenDefault(conn)) != VIR_DRV_OPEN_SUCCESS) { - vzConnectClose(conn); + if ((ret = vzOpenDefault(conn)) != VIR_DRV_OPEN_SUCCESS) return ret; - } return VIR_DRV_OPEN_SUCCESS; } -- 2.4.3

2 1

[libvirt] [PATCH 0/3] vz: domain undefine fixes
by Maxim Nestratov 24 Dec '15

24 Dec '15

Maxim Nestratov (3): vz: delete domains when undefine is called vz: move prlsdkCleanupBridgedNet after domain deletion vz: support additional flags in domain undefine src/vz/vz_driver.c | 5 +- src/vz/vz_sdk.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++-- src/vz/vz_sdk.h | 2 +- 3 files changed, 138 insertions(+), 7 deletions(-) -- 2.4.3

2 6

[libvirt] ANNOUNCE: libvirt 1.2.18.2 maintenance release
by Cole Robinson 24 Dec '15

24 Dec '15

libvirt 1.2.18.2 is now available. This is a maintenance release of libvirt 1.2.18 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.2.18.2.tar.gz Changes in this version: * Fix a trailing space in spec file * virsh: report errors for empty strings * bridge: check for invalid MAC in networkGetDHCPLeases * Enhance documentation of virDomainDetachDevice * apparmor: add missing qemu binaries * qemu: Use live autoNodeset when numatune placement is auto * Close the source fd if the destination qemu exits during tunnelled migration * storage: Fix incorrect format for <disk> <auth> XML * virt-host-validate: distinguish exists vs accessible for devices * spec: Delete .git after applying patches * apparmor: differentiate between error and unconfined profiles * storage: Adjust calculation of alloc/capacity for disk * qemu: Add conditions for qemu-kvm use on ppc64 * rpc: libssh2: Fix regression in ssh host key verification * rpc: libssh2: Add more debugging info * Update pool allocation with new values on volume creation * Use daemon log facility for journald * virDomainCreateXML: Make domain definition transient * virDomainCreateXML: Don't remove persistent domains on error * qemu: Refresh memory size only on fresh starts * domain: Fix migratable XML with graphics/@listen * tpm: adapt sysfs cancel path for new TPM driver * libvirt-guests: Disable shutdown timeout * systemd: Escape only needed characters for machined * systemd: Escape machine name for machined * CVE-2015-5313: storage: don't allow '/' in filesystem volume names * docs: event impl. registration before hypervisor connection * spec: Fix some warnings with latest rpmbuild * qemu: Fix dynamic_ownership qemu.conf setting For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] ANNOUNCE: libvirt 1.2.13.2 maintenance release
by Cole Robinson 24 Dec '15

24 Dec '15

libvirt 1.2.13.2 is now available. This is a maintenance release of libvirt 1.2.13 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-1.2.13.2.tar.gz Changes in this version: * spec: Delete .git after applying patches * qemu: block-commit: Mark disk in block jobs only on successful command * qemu: Disallow concurrent block jobs on a single disk * qemu: event: Don't fiddle with disk backing trees without a job * qemu: process: Export qemuProcessFindDomainDiskByAlias * spec: Fix polkit dep on F23 * domain: Fix migratable XML with graphics/@listen * qemu: hotplug: Properly clean up drive backend if frontend hotplug fails * tpm: adapt sysfs cancel path for new TPM driver * libvirt-guests: Disable shutdown timeout * systemd: Escape only needed characters for machined * systemd: Escape machine name for machined * cgroup: Drop resource partition from virSystemdMakeScopeName * CVE-2015-5313: storage: don't allow '/' in filesystem volume names * remoteClientCloseFunc: Don't mangle connection object refcount * Revert "LXC: show used memory as 0 when domain is not active" * lxc: Don't pass a local variable address randomly * lxc: set nosuid+nodev+noexec flags on /proc/sys mount * virnetdev: fix moving of 802.11 phys * interface: don't error out if a bond has no interfaces * lxc: don't up the veth interfaces unless explicitly asked to * tests: Add virnetdevtestdata to EXTRA_DIST * lxc: move wireless PHYs to a network namespace * Cleanup "/sys/class/net" usage * Introduce virnetdevtest * build: provide virNetDevSysfsFile on non-Linux For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH 0/3] 'Append' mode for serial ports output to file
by Dmitry Mishin 23 Dec '15

23 Dec '15

By default, QEMU truncates serial file on open. Sometimes, it could be weird - for example, when we are trying to investigate some event, which occured several restarts ago. This patch setadds an ability to preserve previous content. Dmitry Mishin (3): tests: add qemu 2.6 caps test conf: Add mode 'append' for chardevs with file source qemu: Process new mode='append' for char dev with output to a file src/conf/domain_conf.c | 18 +- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 10 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 173 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 4043 +++++++++++++++++++++++ tests/qemucapabilitiestest.c | 1 + 8 files changed, 4245 insertions(+), 4 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.caps create mode 100644 tests/qemucapabilitiesdata/caps_2.6.0-1.replies -- 1.8.3.1

2 4

[libvirt] [PATCHv2 0/3] 'autodeflate' attribute for mememory balloon
by Dmitry Andreev 23 Dec '15

23 Dec '15

This patch-set adds support for the new feature 'deflate-on-oom' that has been added to the QEMU virtio memory balloon a month ago. This feature lets a guest OS deflate balloon on OOM. With 'deflate-on-oom' enabled virtio balloon will release it's memory if possible right before an OOM termination of processes. QEMU commit with the complete feature description: http://git.qemu.org/?p=qemu.git;a=commit;h=e3816255bf4b6377bb405331e2ee0dc1… v2: * attribute renamed to 'autodeflate' [1/3][3/3] * capability check added [2/3][2/3] * ability to change 'autodeflate' for running domain wasn't added because QEMU doesn't allow to on/off 'deflate-on-oom' in runtime * more tests added [3/3] *** BLURB HERE *** Dmitry Andreev (3): conf: introduce 'autodeflate' attribute for memballoon device qemu: add capability check for memballoon 'autodeflate' feature qemu: add support of optional 'autodeflate' attribute docs/formatdomain.html.in | 10 ++ docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 23 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 11 ++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 11 ++ tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 68 ++++++++- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 68 ++++++++- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 68 ++++++++- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 66 ++++++++- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 66 ++++++++- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 66 ++++++++- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 78 +++++++++- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 146 ++++++++++++++++++- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 161 ++++++++++++++++++++- .../qemuxml2argv-balloon-ccw-deflate.args | 20 +++ .../qemuxml2argv-balloon-ccw-deflate.xml | 21 +++ .../qemuxml2argv-balloon-device-deflate-off.args | 23 +++ .../qemuxml2argv-balloon-device-deflate-off.xml | 25 ++++ .../qemuxml2argv-balloon-device-deflate.args | 23 +++ .../qemuxml2argv-balloon-device-deflate.xml | 25 ++++ .../qemuxml2argv-balloon-mmio-deflate.args | 25 ++++ .../qemuxml2argv-balloon-mmio-deflate.xml | 30 ++++ tests/qemuxml2argvtest.c | 9 ++ 27 files changed, 990 insertions(+), 63 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.xml -- 1.8.3.1

1 0

[libvirt] [PATCH 0/3] vz: allow to create CT from template and boot VM from cdrom
by Mikhail Feoktistov 23 Dec '15

23 Dec '15

Mikhail Feoktistov (3): vz: allow to create container based on template vz: allow to boot VM from cdrom vz: implementation of boot device order src/vz/vz_sdk.c | 174 ++++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 125 insertions(+), 49 deletions(-) -- 1.8.3.1

2 6

[libvirt] [PATCH] qemu: Connect to guest agent iff needed
by Michal Privoznik 22 Dec '15

22 Dec '15

https://bugzilla.redhat.com/show_bug.cgi?id=1293351 I've came across a bit of a silly scenario, but long story short: after domain was resumed, the virDomainSetTime() API hung for 5 seconds after which it failed with an error. Problem was, that there is no guest agent installed in the domain. But this got me thinking and digging into the code. So even though we do listen to VSERPORT_CHANGE events and connect and disconnect ourselves to guest agent, we still do connect to the guest agent at both domain startup and resume. This is a bit silly as it produces the delay - basically, because we connect to the guest agent, priv->agent is not NULL. Therefore qemuDomainAgentAvailable() will return true. And the place where we hang? Well, historically, when there was no VSERPORT_CHANGE event, we used a dummy ping command to the guest which has 5 seconds timeout. And it's still there and effective. So there's where the delay comes from. What's the resolution? Well, I'm introducing new capability QEMU_CAPS_VSERPORT_CHANGE that is enabled iff qemu is capable of the event. And, during domain startup, reconnect after resume and attach we do connect to the agent socket iff the capability is NOT set. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_process.c | 66 ++++++++++++++++++---------- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + 6 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6e5d203..9e11af9 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -308,6 +308,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "virtio-tablet", /* 205 */ "virtio-input-host", + "vserport-change-event", ); @@ -1479,6 +1480,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, { "DEVICE_DELETED", QEMU_CAPS_DEVICE_DEL_EVENT }, { "MIGRATION", QEMU_CAPS_MIGRATION_EVENT }, + { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, }; struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 61d6379..983faf6 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -335,6 +335,7 @@ typedef enum { /* 205 */ QEMU_CAPS_VIRTIO_TABLET, /* -device virtio-tablet-{device,pci} */ QEMU_CAPS_VIRTIO_INPUT_HOST, /* -device virtio-input-host-{device,pci} */ + QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f274068..95a795c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3524,15 +3524,21 @@ qemuProcessReconnect(void *opaque) if (qemuConnectMonitor(driver, obj, QEMU_ASYNC_JOB_NONE, NULL) < 0) goto error; - /* Failure to connect to agent shouldn't be fatal */ - if ((ret = qemuConnectAgent(driver, obj)) < 0) { - if (ret == -2) - goto error; + /* With newer qemus capable of VSERPORT_CHANGE event, we are connecting and + * disconnecting to the guest agent as it connects or disconnects to the + * channel within the guest. So, it's important to connect here iff we are + * running qemu not capable of the event. */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE)) { + /* Failure to connect to agent shouldn't be fatal */ + if ((ret = qemuConnectAgent(driver, obj)) < 0) { + if (ret == -2) + goto error; - VIR_WARN("Cannot connect to QEMU guest agent for %s", - obj->def->name); - virResetLastError(); - priv->agentError = true; + VIR_WARN("Cannot connect to QEMU guest agent for %s", + obj->def->name); + virResetLastError(); + priv->agentError = true; + } } if (qemuHostdevUpdateActiveDomainDevices(driver, obj->def) < 0) @@ -4949,15 +4955,21 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessWaitForMonitor(driver, vm, asyncJob, priv->qemuCaps, logCtxt) < 0) goto cleanup; - /* Failure to connect to agent shouldn't be fatal */ - if ((rv = qemuConnectAgent(driver, vm)) < 0) { - if (rv == -2) - goto cleanup; + /* With newer qemus capable of VSERPORT_CHANGE event, we are connecting and + * disconnecting to the guest agent as it connects or disconnects to the + * channel within the guest. So, it's important to connect here iff we are + * running qemu not capable of the event. */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE)) { + /* Failure to connect to agent shouldn't be fatal */ + if ((rv = qemuConnectAgent(driver, vm)) < 0) { + if (rv == -2) + goto cleanup; - VIR_WARN("Cannot connect to QEMU guest agent for %s", - vm->def->name); - virResetLastError(); - priv->agentError = true; + VIR_WARN("Cannot connect to QEMU guest agent for %s", + vm->def->name); + virResetLastError(); + priv->agentError = true; + } } VIR_DEBUG("Detecting if required emulator features are present"); @@ -5664,15 +5676,21 @@ int qemuProcessAttach(virConnectPtr conn ATTRIBUTE_UNUSED, if (qemuProcessWaitForMonitor(driver, vm, QEMU_ASYNC_JOB_NONE, priv->qemuCaps, NULL) < 0) goto error; - /* Failure to connect to agent shouldn't be fatal */ - if ((ret = qemuConnectAgent(driver, vm)) < 0) { - if (ret == -2) - goto error; + /* With newer qemus capable of VSERPORT_CHANGE event, we are connecting and + * disconnecting to the guest agent as it connects or disconnects to the + * channel within the guest. So, it's important to connect here iff we are + * running qemu not capable of the event. */ + if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE)) { + /* Failure to connect to agent shouldn't be fatal */ + if ((ret = qemuConnectAgent(driver, vm)) < 0) { + if (ret == -2) + goto error; - VIR_WARN("Cannot connect to QEMU guest agent for %s", - vm->def->name); - virResetLastError(); - priv->agentError = true; + VIR_WARN("Cannot connect to QEMU guest agent for %s", + vm->def->name); + virResetLastError(); + priv->agentError = true; + } } VIR_DEBUG("Detecting VCPU PIDs"); diff --git a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps index 1098dcf..332b85a 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.1.1-1.caps @@ -159,4 +159,5 @@ <flag name='rtl8139'/> <flag name='e1000'/> <flag name='virtio-net'/> + <flag name='vserport-change-event'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps index d67a48d..1a5fe81 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.4.0-1.caps @@ -167,4 +167,5 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> + <flag name='vserport-change-event'/> </qemuCaps> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps index f4f3673..8b3586a 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0-1.caps +++ b/tests/qemucapabilitiesdata/caps_2.5.0-1.caps @@ -168,4 +168,5 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> + <flag name='vserport-change-event'/> </qemuCaps> -- 2.4.10

1 1

[libvirt] [PATCH 0/3] Fix mingw build
by Michal Privoznik 22 Dec '15

22 Dec '15

We have a build failure on mingw platform:4 https://ci.centos.org/job/libvirt-mingw/899/console Michal Privoznik (3): sysconf: Include unistd.h tools: Include PIE_LDFLAGS at the correct place tools: Disable virt-login-shell on mingw m4/virt-login-shell.m4 | 18 +++++++++++++++--- src/nodeinfo.c | 1 + src/qemu/qemu_conf.h | 2 ++ src/util/vircgroup.c | 1 + src/util/vircommand.c | 1 + tools/Makefile.am | 4 ++-- tools/virt-login-shell.c | 1 + 7 files changed, 23 insertions(+), 5 deletions(-) -- 2.4.10

2 4

[libvirt] Global domain cpu.cfs_quota_us setup
by Alexander Burluka 21 Dec '15

21 Dec '15

Hello all! I would greatly appreciate your help with some cgroup question. Libvirt xml has cpu tuning section and quota element in it. That parameter sets up cpu.cfs_cgroup_us for every domain's vcpu. I set it to 55555 and has such hierarchy of cgroups: cpu.cfs_quota_us (-1) | |-emulator/cpu.cfs_quota_us (-1) |-vcpu0/cpu.cfs_quota_us (55555) |-vcpu1/cpu.cfs_quota_us (55555) |-vcpu2/cpu.cfs_quota_us (55555) .... \-vcpuN/cpu.cfs_quota_us (55555) Is there any way to set up upper level quota limit via libvirt without setting every vcpu? So I'd like to get next hierarchy: cpu.cfs_quota_us (55555) | |-emulator/cpu.cfs_quota_us (-1) |-vcpu0/cpu.cfs_quota_us (-1) |-vcpu1/cpu.cfs_quota_us (-1) |-vcpu2/cpu.cfs_quota_us (-1) .... \-vcpuN/cpu.cfs_quota_us (-1) Thank you! -- Regards, Alexander Burluka

2 4

[libvirt] [PATCH] virStorageVolWipe: Document that wiping journaled FS is useless
by Michal Privoznik 21 Dec '15

21 Dec '15

So you have a libvirt volume that you want to wipe out. But lets say that the volume is actually a file stored on a journaled filesystem. Overwriting it with zeroes or a pattern does not mean that corresponding physical location on the disk is overwritten too, due to journaling. It's the same story with network based volumes, copy-on-write filesystems, and so on. Since there is no way that an userland application can write onto specific areas on disk, all that we can do is document the fact. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-storage.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 66dd9f0..513c72f 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -1725,7 +1725,12 @@ virStorageVolDelete(virStorageVolPtr vol, * @vol: pointer to storage volume * @flags: extra flags; not used yet, so callers should always pass 0 * - * Ensure data previously on a volume is not accessible to future reads + * Ensure data previously on a volume is not accessible to future + * reads. Also note, that depending on the actual volume + * representation, this call may not really overwrite the + * physical location of the volume. For instance, files stored + * journaled, log structured, copy-on-write, versioned, and + * network file systems are known to be problematic. * * Returns 0 on success, or -1 on error */ @@ -1765,8 +1770,13 @@ virStorageVolWipe(virStorageVolPtr vol, * @algorithm: one of virStorageVolWipeAlgorithm * @flags: future flags, use 0 for now * - * Similar to virStorageVolWipe, but one can choose - * between different wiping algorithms. + * Similar to virStorageVolWipe, but one can choose between + * different wiping algorithms. Also note, that depending on the + * actual volume representation, this call may not really + * overwrite the physical location of the volume. For instance, + * files stored journaled, log structured, copy-on-write, + * versioned, and network file systems are known to be + * problematic. * * Returns 0 on success, or -1 on error. */ -- 2.4.10

3 5

[libvirt] [PATCH 0/6] Small PCI hostdev improvements and fixes
by Andrea Bolognani 21 Dec '15

21 Dec '15

While working on v2 of my series[1] intended to fix https://bugzilla.redhat.com/show_bug.cgi?id=1272300 I'm running into some smaller stuff that isn't necessarily strictly related to the issue at hand. The idea is to have this smaller patches merged before the bigger, more invasive changes that series will bring, and hopefully make it easier to review by laying down the groundwork in advance. The series is organized as follows: 1-2: remove function parameters that are either not inspected by the function or never have an interesting value 3: change a string field that can only assume one of three values to a proper enumeration 4: improve bookkeeping when detaching PCI devices from the host, by making sure they always transition through the 'inactive' state (when they're attached to the stub driver) 5: make sure we never try to reattach an unmanaged device to the host, not even when recovering from a previous error 6: add some useful debug messages I expect patches 1, 2 and 6 to be fairly uncontroversial and easy to review; patch 3 is kinda big, but it's IMHO a nice improvement over the current situation; patches 4 and 5 are small but definitely need a long hard stare from a different pair of eyes to ensure they're not breaking anything. Cheers. [1] https://www.redhat.com/archives/libvir-list/2015-December/msg00070.html Andrea Bolognani (6): pci: Remove redundant parameter from virPCIDeviceBindToStub() pci: Remove 'reprobe' parameter from virPCIDeviceUnbind() pci: Introduce virPCIStubDriver enumeration hostdev: Mark PCI devices as inactive as they're detached hostdev: Only rollback detach of managed devices on error hostdev: Emit debug messages while handling PCI hostdevs src/libvirt_private.syms | 2 + src/libxl/libxl_driver.c | 3 +- src/qemu/qemu_driver.c | 6 +-- src/util/virhostdev.c | 107 ++++++++++++++++++++++++++++++----------------- src/util/virpci.c | 102 ++++++++++++++++++++++---------------------- src/util/virpci.h | 18 +++++--- src/xen/xen_driver.c | 3 +- tests/virhostdevtest.c | 5 ++- tests/virpcitest.c | 35 ++++++++++------ 9 files changed, 163 insertions(+), 118 deletions(-) -- 2.5.0

3 20

[libvirt] [PATCH] qemu: Add debug message to spice migration
by Jiri Denemark 21 Dec '15

21 Dec '15

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4519aef..2187241 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2505,6 +2505,7 @@ qemuMigrationWaitForSpice(virDomainObjPtr vm) if (!wait_for_spice) return 0; + VIR_DEBUG("Waiting for SPICE to finish migration"); while (!priv->job.spiceMigrated && !priv->job.abortJob) { if (virDomainObjWait(vm) < 0) return -1; -- 2.6.4

2 1

[libvirt] [PATCH] Revert "admin: Rename virAdmConnect to virAdmDaemon"
by Erik Skultety 21 Dec '15

21 Dec '15

Commmit df8192aa introduced admin related rename and some minor (caused by automated approach, aka sed) and some more severe isues along with it. First reason to revert is the inconsistency with libvirt library. Although we deal with the daemon directly rather than with a specific hypervisor, we still do have a connection. That being said, contributors might get under the impression that AdmDaemonNew would spawn/start a new daemon (since it's admin API, why not...), or AdmDaemonClose would do the exact opposite or they might expect DaemonIsAlive report overall status of the daemon which definitely isn't the case. The second reason to revert this patch is renaming virt-admin client. The client tool does not necessarily have to reflect the names of the API's it's using in his internals. An example would be 's/vshAdmConnect/vshAdmDaemon' where noone can be certain of what the latter function really does. The former is quite expressive about some connection magic it performs, but the latter does not say anything, especially when vshAdmReconnect and vshAdmDisconnect were left untouched. --- The admin API rename is not entirely bad idea (e.g. virAdmDaemonGetURI sounds a little better than virAdmConnectGetURI), so by introducing this patch I'd like to reopen the discussion about what we could/should rename (if anything) and which parts should definitely be left untouched, because there is still time to do somthing with it since admin is disabled and not distributed in the package. daemon/admin_server.c | 22 ++--- include/libvirt/libvirt-admin.h | 48 +++++----- src/admin/admin_protocol.x | 10 +-- src/admin/admin_remote.c | 36 ++++---- src/admin_protocol-structs | 10 +-- src/datatypes.c | 38 ++++---- src/datatypes.h | 28 +++--- src/libvirt-admin.c | 195 ++++++++++++++++++++-------------------- src/libvirt_admin_private.syms | 4 +- src/libvirt_admin_public.syms | 16 ++-- src/rpc/gendispatch.pl | 2 +- tools/virsh.c | 18 ++-- tools/virsh.h | 1 - tools/virt-admin.c | 65 +++++++------- tools/virt-admin.h | 3 +- tools/vsh.h | 1 + 16 files changed, 249 insertions(+), 248 deletions(-) diff --git a/daemon/admin_server.c b/daemon/admin_server.c index 678e8bc..189091e 100644 --- a/daemon/admin_server.c +++ b/daemon/admin_server.c @@ -79,11 +79,11 @@ remoteAdmClientInitHook(virNetServerClientPtr client ATTRIBUTE_UNUSED, /* Functions */ static int -adminDispatchDaemonOpen(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr, - struct admin_daemon_open_args *args) +adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr, + struct admin_connect_open_args *args) { unsigned int flags; struct daemonAdmClientPrivate *priv = @@ -105,18 +105,18 @@ adminDispatchDaemonOpen(virNetServerPtr server ATTRIBUTE_UNUSED, } static int -adminDispatchDaemonClose(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) +adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, + virNetServerClientPtr client, + virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) { virNetServerClientDelayedClose(client); return 0; } static int -adminDaemonGetVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, - unsigned long long *libVer) +adminConnectGetLibVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, + unsigned long long *libVer) { if (libVer) *libVer = LIBVIR_VERSION_NUMBER; diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h index b81698e..ab9df96 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -35,51 +35,53 @@ extern "C" { # undef __VIR_ADMIN_H_INCLUDES__ /** - * virAdmDaemon: + * virAdmConnect: * - * a virAdmDaemon is a private structure representing a remote daemon. + * a virAdmConnect is a private structure representing a connection to + * libvirt daemon. */ -typedef struct _virAdmDaemon virAdmDaemon; +typedef struct _virAdmConnect virAdmConnect; /** - * virAdmDaemonPtr: + * virAdmConnectPtr: * - * a virAdmDaemonPtr is pointer to a virAdmDaemon private structure, - * this is the type used to reference a daemon in the API. + * a virAdmConnectPtr is pointer to a virAdmConnect private structure, + * this is the type used to reference a connection to the daemon + * in the API. */ -typedef virAdmDaemon *virAdmDaemonPtr; +typedef virAdmConnect *virAdmConnectPtr; -virAdmDaemonPtr virAdmDaemonOpen(const char *name, unsigned int flags); -int virAdmDaemonClose(virAdmDaemonPtr dmn); +virAdmConnectPtr virAdmConnectOpen(const char *name, unsigned int flags); +int virAdmConnectClose(virAdmConnectPtr conn); -int virAdmDaemonRef(virAdmDaemonPtr dmn); -int virAdmDaemonIsAlive(virAdmDaemonPtr dmn); +int virAdmConnectRef(virAdmConnectPtr conn); +int virAdmConnectIsAlive(virAdmConnectPtr conn); int virAdmGetVersion(unsigned long long *libVer); -char *virAdmDaemonGetURI(virAdmDaemonPtr dmn); +char *virAdmConnectGetURI(virAdmConnectPtr conn); -int virAdmDaemonGetVersion(virAdmDaemonPtr dmn, - unsigned long long *libVer); +int virAdmConnectGetLibVersion(virAdmConnectPtr conn, + unsigned long long *libVer); /** - * virAdmDaemonCloseFunc: - * @dmn: virAdmDaemon connection + * virAdmConnectCloseFunc: + * @conn: virAdmConnect connection * @reason: reason why the connection was closed (see virConnectCloseReason) * @opaque: opaque client data * * A callback to be registered, in case a connection was closed. */ -typedef void (*virAdmDaemonCloseFunc)(virAdmDaemonPtr dmn, +typedef void (*virAdmConnectCloseFunc)(virAdmConnectPtr conn, int reason, void *opaque); -int virAdmDaemonRegisterCloseCallback(virAdmDaemonPtr dmn, - virAdmDaemonCloseFunc cb, - void *opaque, - virFreeCallback freecb); -int virAdmDaemonUnregisterCloseCallback(virAdmDaemonPtr dmn, - virAdmDaemonCloseFunc cb); +int virAdmConnectRegisterCloseCallback(virAdmConnectPtr conn, + virAdmConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb); +int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn, + virAdmConnectCloseFunc cb); # ifdef __cplusplus } diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index b168f6f..878983d 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -37,11 +37,11 @@ typedef string admin_nonnull_string<ADMIN_STRING_MAX>; typedef admin_nonnull_string *admin_string; /*----- Protocol. -----*/ -struct admin_daemon_open_args { +struct admin_connect_open_args { unsigned int flags; }; -struct admin_daemon_get_version_ret { +struct admin_connect_get_lib_version_ret { unsigned hyper libVer; }; @@ -70,15 +70,15 @@ enum admin_procedure { /** * @generate: none */ - ADMIN_PROC_DAEMON_OPEN = 1, + ADMIN_PROC_CONNECT_OPEN = 1, /** * @generate: none */ - ADMIN_PROC_DAEMON_CLOSE = 2, + ADMIN_PROC_CONNECT_CLOSE = 2, /** * @generate: both */ - ADMIN_PROC_DAEMON_GET_VERSION = 3 + ADMIN_PROC_CONNECT_GET_LIB_VERSION = 3 }; diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 8073b08..7b40ea1 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -48,7 +48,7 @@ remoteAdminPrivDispose(void *opaque) static int -callFull(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, +callFull(virAdmConnectPtr conn ATTRIBUTE_UNUSED, remoteAdminPrivPtr priv, int *fdin, size_t fdinlen, @@ -86,7 +86,7 @@ callFull(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, } static int -call(virAdmDaemonPtr dmn, +call(virAdmConnectPtr conn, unsigned int flags, int proc_nr, xdrproc_t args_filter, char *args, @@ -94,7 +94,7 @@ call(virAdmDaemonPtr dmn, { virCheckFlags(0, -1); - return callFull(dmn, dmn->privateData, + return callFull(conn, conn->privateData, NULL, 0, NULL, NULL, proc_nr, args_filter, args, ret_filter, ret); } @@ -106,14 +106,14 @@ remoteAdminClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, int reason, void *opaque) { - virAdmDaemonCloseCallbackDataPtr cbdata = opaque; + virAdmConnectCloseCallbackDataPtr cbdata = opaque; virObjectLock(cbdata); if (cbdata->callback) { VIR_DEBUG("Triggering connection close callback %p reason=%d, opaque=%p", cbdata->callback, reason, cbdata->opaque); - cbdata->callback(cbdata->dmn, reason, cbdata->opaque); + cbdata->callback(cbdata->conn, reason, cbdata->opaque); if (cbdata->freeCallback) cbdata->freeCallback(cbdata->opaque); @@ -124,11 +124,11 @@ remoteAdminClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, } static int -remoteAdminDaemonOpen(virAdmDaemonPtr dmn, unsigned int flags) +remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags) { int rv = -1; - remoteAdminPrivPtr priv = dmn->privateData; - admin_daemon_open_args args; + remoteAdminPrivPtr priv = conn->privateData; + admin_connect_open_args args; virObjectLock(priv); @@ -140,13 +140,13 @@ remoteAdminDaemonOpen(virAdmDaemonPtr dmn, unsigned int flags) virResetLastError(); } - virObjectRef(dmn->closeCallback); + virObjectRef(conn->closeCallback); virNetClientSetCloseCallback(priv->client, remoteAdminClientCloseFunc, - dmn->closeCallback, + conn->closeCallback, virObjectFreeCallback); - if (call(dmn, 0, ADMIN_PROC_DAEMON_OPEN, - (xdrproc_t)xdr_admin_daemon_open_args, (char *)&args, + if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN, + (xdrproc_t)xdr_admin_connect_open_args, (char *)&args, (xdrproc_t)xdr_void, (char *)NULL) == -1) { goto done; } @@ -159,14 +159,14 @@ remoteAdminDaemonOpen(virAdmDaemonPtr dmn, unsigned int flags) } static int -remoteAdminDaemonClose(virAdmDaemonPtr dmn) +remoteAdminConnectClose(virAdmConnectPtr conn) { int rv = -1; - remoteAdminPrivPtr priv = dmn->privateData; + remoteAdminPrivPtr priv = conn->privateData; virObjectLock(priv); - if (call(dmn, 0, ADMIN_PROC_DAEMON_CLOSE, + if (call(conn, 0, ADMIN_PROC_CONNECT_CLOSE, (xdrproc_t)xdr_void, (char *)NULL, (xdrproc_t)xdr_void, (char *)NULL) == -1) { goto done; @@ -184,10 +184,10 @@ remoteAdminDaemonClose(virAdmDaemonPtr dmn) static void remoteAdminPrivFree(void *opaque) { - virAdmDaemonPtr dmn = opaque; + virAdmConnectPtr conn = opaque; - remoteAdminDaemonClose(dmn); - virObjectUnref(dmn->privateData); + remoteAdminConnectClose(conn); + virObjectUnref(conn->privateData); } static remoteAdminPrivPtr diff --git a/src/admin_protocol-structs b/src/admin_protocol-structs index 1753f54..809379b 100644 --- a/src/admin_protocol-structs +++ b/src/admin_protocol-structs @@ -1,12 +1,12 @@ /* -*- c -*- */ -struct admin_daemon_open_args { +struct admin_connect_open_args { u_int flags; }; -struct admin_daemon_get_version_ret { +struct admin_connect_get_lib_version_ret { uint64_t libVer; }; enum admin_procedure { - ADMIN_PROC_DAEMON_OPEN = 1, - ADMIN_PROC_DAEMON_CLOSE = 2, - ADMIN_PROC_DAEMON_GET_VERSION = 3, + ADMIN_PROC_CONNECT_OPEN = 1, + ADMIN_PROC_CONNECT_CLOSE = 2, + ADMIN_PROC_CONNECT_GET_LIB_VERSION = 3, }; diff --git a/src/datatypes.c b/src/datatypes.c index dc592b6..c832d80 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -59,11 +59,11 @@ static void virStreamDispose(void *obj); static void virStorageVolDispose(void *obj); static void virStoragePoolDispose(void *obj); -virClassPtr virAdmDaemonClass; -virClassPtr virAdmDaemonCloseCallbackDataClass; +virClassPtr virAdmConnectClass; +virClassPtr virAdmConnectCloseCallbackDataClass; -static void virAdmDaemonDispose(void *obj); -static void virAdmDaemonCloseCallbackDataDispose(void *obj); +static void virAdmConnectDispose(void *obj); +static void virAdmConnectCloseCallbackDataDispose(void *obj); static int virDataTypesOnceInit(void) @@ -92,8 +92,8 @@ virDataTypesOnceInit(void) DECLARE_CLASS(virStorageVol); DECLARE_CLASS(virStoragePool); - DECLARE_CLASS_LOCKABLE(virAdmDaemon); - DECLARE_CLASS_LOCKABLE(virAdmDaemonCloseCallbackData); + DECLARE_CLASS_LOCKABLE(virAdmConnect); + DECLARE_CLASS_LOCKABLE(virAdmConnectCloseCallbackData); #undef DECLARE_CLASS_COMMON #undef DECLARE_CLASS_LOCKABLE @@ -814,18 +814,18 @@ virDomainSnapshotDispose(void *obj) } -virAdmDaemonPtr -virAdmDaemonNew(void) +virAdmConnectPtr +virAdmConnectNew(void) { - virAdmDaemonPtr ret; + virAdmConnectPtr ret; if (virDataTypesInitialize() < 0) return NULL; - if (!(ret = virObjectLockableNew(virAdmDaemonClass))) + if (!(ret = virObjectLockableNew(virAdmConnectClass))) return NULL; - if (!(ret->closeCallback = virObjectLockableNew(virAdmDaemonCloseCallbackDataClass))) + if (!(ret->closeCallback = virObjectLockableNew(virAdmConnectCloseCallbackDataClass))) goto error; return ret; @@ -836,21 +836,21 @@ virAdmDaemonNew(void) } static void -virAdmDaemonDispose(void *obj) +virAdmConnectDispose(void *obj) { - virAdmDaemonPtr dmn = obj; + virAdmConnectPtr conn = obj; - if (dmn->privateDataFreeFunc) - dmn->privateDataFreeFunc(dmn); + if (conn->privateDataFreeFunc) + conn->privateDataFreeFunc(conn); - virURIFree(dmn->uri); - virObjectUnref(dmn->closeCallback); + virURIFree(conn->uri); + virObjectUnref(conn->closeCallback); } static void -virAdmDaemonCloseCallbackDataDispose(void *obj) +virAdmConnectCloseCallbackDataDispose(void *obj) { - virAdmDaemonCloseCallbackDataPtr cb_data = obj; + virAdmConnectCloseCallbackDataPtr cb_data = obj; virObjectLock(cb_data); diff --git a/src/datatypes.h b/src/datatypes.h index 0402f09..1b1777d 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -41,7 +41,7 @@ extern virClassPtr virStreamClass; extern virClassPtr virStorageVolClass; extern virClassPtr virStoragePoolClass; -extern virClassPtr virAdmDaemonClass; +extern virClassPtr virAdmConnectClass; # define virCheckConnectReturn(obj, retval) \ do { \ @@ -297,9 +297,9 @@ extern virClassPtr virAdmDaemonClass; dom, NULLSTR(_domname), _uuidstr, __VA_ARGS__); \ } while (0) -# define virCheckAdmDaemonReturn(obj, retval) \ +# define virCheckAdmConnectReturn(obj, retval) \ do { \ - if (!virObjectIsClass(obj, virAdmDaemonClass)) { \ + if (!virObjectIsClass(obj, virAdmConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ __FILE__, __FUNCTION__, __LINE__, \ __FUNCTION__); \ @@ -307,9 +307,9 @@ extern virClassPtr virAdmDaemonClass; return retval; \ } \ } while (0) -# define virCheckAdmDaemonGoto(obj, label) \ +# define virCheckAdmConnectGoto(obj, label) \ do { \ - if (!virObjectIsClass(obj, virAdmDaemonClass)) { \ + if (!virObjectIsClass(obj, virAdmConnectClass)) { \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ __FILE__, __FUNCTION__, __LINE__, \ __FUNCTION__); \ @@ -331,8 +331,8 @@ extern virClassPtr virAdmDaemonClass; typedef struct _virConnectCloseCallbackData virConnectCloseCallbackData; typedef virConnectCloseCallbackData *virConnectCloseCallbackDataPtr; -typedef struct _virAdmDaemonCloseCallbackData virAdmDaemonCloseCallbackData; -typedef virAdmDaemonCloseCallbackData *virAdmDaemonCloseCallbackDataPtr; +typedef struct _virAdmConnectCloseCallbackData virAdmConnectCloseCallbackData; +typedef virAdmConnectCloseCallbackData *virAdmConnectCloseCallbackDataPtr; /** * Internal structures holding data related to connection close callbacks. @@ -346,11 +346,11 @@ struct _virConnectCloseCallbackData { virFreeCallback freeCallback; }; -struct _virAdmDaemonCloseCallbackData { +struct _virAdmConnectCloseCallbackData { virObjectLockable parent; - virAdmDaemonPtr dmn; - virAdmDaemonCloseFunc callback; + virAdmConnectPtr conn; + virAdmConnectCloseFunc callback; void *opaque; virFreeCallback freeCallback; }; @@ -402,11 +402,11 @@ struct _virConnect { }; /** - * _virAdmDaemon: + * _virAdmConnect: * * Internal structure associated to an admin connection */ -struct _virAdmDaemon { +struct _virAdmConnect { virObjectLockable object; virURIPtr uri; @@ -414,7 +414,7 @@ struct _virAdmDaemon { virFreeCallback privateDataFreeFunc; /* Per-connection close callback */ - virAdmDaemonCloseCallbackDataPtr closeCallback; + virAdmConnectCloseCallbackDataPtr closeCallback; }; @@ -599,6 +599,6 @@ virNWFilterPtr virGetNWFilter(virConnectPtr conn, virDomainSnapshotPtr virGetDomainSnapshot(virDomainPtr domain, const char *name); -virAdmDaemonPtr virAdmDaemonNew(void); +virAdmConnectPtr virAdmConnectNew(void); #endif /* __VIR_DATATYPES_H__ */ diff --git a/src/libvirt-admin.c b/src/libvirt-admin.c index 7b767bd..6e6da81 100644 --- a/src/libvirt-admin.c +++ b/src/libvirt-admin.c @@ -53,7 +53,7 @@ virAdmGlobalInit(void) { /* It would be nice if we could trace the use of this call, to * help diagnose in log files if a user calls something other than - * virAdmDaemonOpen first. But we can't rely on VIR_DEBUG working + * virAdmConnectOpen first. But we can't rely on VIR_DEBUG working * until after initialization is complete, and since this is * one-shot, we never get here again. */ if (virThreadInitialize() < 0 || @@ -183,20 +183,20 @@ virAdmGetDefaultURI(virConfPtr conf) } /** - * virAdmDaemonOpen: + * virAdmConnectOpen: * @name: uri of the daemon to connect to, NULL for default * @flags: unused, must be 0 * * Opens connection to admin interface of the daemon. * - * Returns @virAdmDaemonPtr object or NULL on error + * Returns @virAdmConnectPtr object or NULL on error */ -virAdmDaemonPtr -virAdmDaemonOpen(const char *name, unsigned int flags) +virAdmConnectPtr +virAdmConnectOpen(const char *name, unsigned int flags) { char *sock_path = NULL; char *alias = NULL; - virAdmDaemonPtr dmn = NULL; + virAdmConnectPtr conn = NULL; virConfPtr conf = NULL; if (virAdmInitialize() < 0) @@ -206,7 +206,7 @@ virAdmDaemonOpen(const char *name, unsigned int flags) virResetLastError(); virCheckFlags(VIR_CONNECT_NO_ALIASES, NULL); - if (!(dmn = virAdmDaemonNew())) + if (!(conn = virAdmConnectNew())) goto error; if (virConfLoadConfig(&conf, "libvirt-admin.conf") < 0) @@ -219,46 +219,46 @@ virAdmDaemonOpen(const char *name, unsigned int flags) virURIResolveAlias(conf, name, &alias) < 0)) goto error; - if (!(dmn->uri = virURIParse(alias ? alias : name))) + if (!(conn->uri = virURIParse(alias ? alias : name))) goto error; - if (!(sock_path = getSocketPath(dmn->uri))) + if (!(sock_path = getSocketPath(conn->uri))) goto error; - if (!(dmn->privateData = remoteAdminPrivNew(sock_path))) + if (!(conn->privateData = remoteAdminPrivNew(sock_path))) goto error; - dmn->privateDataFreeFunc = remoteAdminPrivFree; + conn->privateDataFreeFunc = remoteAdminPrivFree; - if (remoteAdminDaemonOpen(dmn, flags) < 0) + if (remoteAdminConnectOpen(conn, flags) < 0) goto error; cleanup: VIR_FREE(sock_path); VIR_FREE(alias); virConfFree(conf); - return dmn; + return conn; error: virDispatchError(NULL); - virObjectUnref(dmn); - dmn = NULL; + virObjectUnref(conn); + conn = NULL; goto cleanup; } /** - * virAdmDaemonClose: - * @dmn: pointer to admin connection to close + * virAdmConnectClose: + * @conn: pointer to admin connection to close * * This function closes the admin connection to the Hypervisor. This should not * be called if further interaction with the Hypervisor are needed especially if * there is running domain which need further monitoring by the application. * * Connections are reference counted; the count is explicitly increased by the - * initial virAdmDaemonOpen, as well as virAdmDaemonRef; it is also temporarily + * initial virAdmConnectOpen, as well as virAdmConnectRef; it is also temporarily * increased by other API that depend on the connection remaining alive. The - * open and every virAdmDaemonRef call should have a matching - * virAdmDaemonClose, and all other references will be released after the + * open and every virAdmConnectRef call should have a matching + * virAdmConnectClose, and all other references will be released after the * corresponding operation completes. * * Returns a positive number if at least 1 reference remains on success. The @@ -266,34 +266,34 @@ virAdmDaemonOpen(const char *name, unsigned int flags) * return of 0 implies no references remain and the connection is closed and * memory has been freed. A return of -1 implies a failure. * - * It is possible for the last virAdmDaemonClose to return a positive value if + * It is possible for the last virAdmConnectClose to return a positive value if * some other object still has a temporary reference to the connection, but the * application should not try to further use a connection after the - * virAdmDaemonClose that matches the initial open. + * virAdmConnectClose that matches the initial open. */ int -virAdmDaemonClose(virAdmDaemonPtr dmn) +virAdmConnectClose(virAdmConnectPtr conn) { - VIR_DEBUG("dmn=%p", dmn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); - if (!dmn) + if (!conn) return 0; - virCheckAdmDaemonReturn(dmn, -1); + virCheckAdmConnectReturn(conn, -1); - if (!virObjectUnref(dmn)) + if (!virObjectUnref(conn)) return 0; return 1; } /** - * virAdmDaemonRef: - * @dmn: the connection to hold a reference on + * virAdmConnectRef: + * @conn: the connection to hold a reference on * * Increment the reference count on the connection. For each additional call to - * this method, there shall be a corresponding call to virAdmDaemonClose to + * this method, there shall be a corresponding call to virAdmConnectClose to * release the reference count, once the caller no longer needs the reference to * this object. * @@ -305,15 +305,15 @@ virAdmDaemonClose(virAdmDaemonPtr dmn) * Returns 0 in case of success, -1 in case of failure */ int -virAdmDaemonRef(virAdmDaemonPtr dmn) +virAdmConnectRef(virAdmConnectPtr conn) { - VIR_DEBUG("dmn=%p refs=%d", dmn, - dmn ? dmn->object.parent.u.s.refs : 0); + VIR_DEBUG("conn=%p refs=%d", conn, + conn ? conn->object.parent.u.s.refs : 0); virResetLastError(); - virCheckAdmDaemonReturn(dmn, -1); + virCheckAdmConnectReturn(conn, -1); - virObjectRef(dmn); + virObjectRef(conn); return 0; } @@ -327,7 +327,8 @@ virAdmDaemonRef(virAdmDaemonPtr dmn) * generic message will be returned. @libVer format is as follows: * major * 1,000,000 + minor * 1,000 + release. * - * NOTE: To get the remote side version use virAdmDaemonGetVersion instead. + * NOTE: To get the remote side library version use virAdmConnectGetLibVersion + * instead. * * Returns 0 on success, -1 in case of an error. */ @@ -352,8 +353,8 @@ virAdmGetVersion(unsigned long long *libVer) } /** - * virAdmDaemonIsAlive: - * @dmn: connection to admin server + * virAdmConnectIsAlive: + * @conn: connection to admin server * * Decide whether the connection to the admin server is alive or not. * Connection is considered alive if the channel it is running over is not @@ -363,20 +364,20 @@ virAdmGetVersion(unsigned long long *libVer) * connection at all or the channel has already been closed, or -1 on error. */ int -virAdmDaemonIsAlive(virAdmDaemonPtr dmn) +virAdmConnectIsAlive(virAdmConnectPtr conn) { bool ret; remoteAdminPrivPtr priv = NULL; - VIR_DEBUG("dmn=%p", dmn); + VIR_DEBUG("conn=%p", conn); - if (!dmn) + if (!conn) return 0; - virCheckAdmDaemonReturn(dmn, -1); + virCheckAdmConnectReturn(conn, -1); virResetLastError(); - priv = dmn->privateData; + priv = conn->privateData; virObjectLock(priv); ret = virNetClientIsOpen(priv->client); virObjectUnlock(priv); @@ -385,35 +386,35 @@ virAdmDaemonIsAlive(virAdmDaemonPtr dmn) } /** - * virAdmDaemonGetURI: - * @dmn: pointer to an admin connection + * virAdmConnectGetURI: + * @conn: pointer to an admin connection * * String returned by this method is normally the same as the string passed - * to the virAdmDaemonOpen. Even if NULL was passed to virAdmDaemonOpen, + * to the virAdmConnectOpen. Even if NULL was passed to virAdmConnectOpen, * this method returns a non-null URI string. * * Returns an URI string related to the connection or NULL in case of an error. * Caller is responsible for freeing the string. */ char * -virAdmDaemonGetURI(virAdmDaemonPtr dmn) +virAdmConnectGetURI(virAdmConnectPtr conn) { char *uri = NULL; - VIR_DEBUG("dmn=%p", dmn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); - virCheckAdmDaemonReturn(dmn, NULL); + virCheckAdmConnectReturn(conn, NULL); - if (!(uri = virURIFormat(dmn->uri))) + if (!(uri = virURIFormat(conn->uri))) virDispatchError(NULL); return uri; } /** - * virAdmDaemonRegisterCloseCallback: - * @dmn: connection to admin server + * virAdmConnectRegisterCloseCallback: + * @conn: connection to admin server * @cb: callback to be invoked upon connection close * @opaque: user data to pass to @cb * @freecb: callback to free @opaque @@ -429,103 +430,103 @@ virAdmDaemonGetURI(virAdmDaemonPtr dmn) * * Returns 0 on success, -1 on error */ -int virAdmDaemonRegisterCloseCallback(virAdmDaemonPtr dmn, - virAdmDaemonCloseFunc cb, - void *opaque, - virFreeCallback freecb) +int virAdmConnectRegisterCloseCallback(virAdmConnectPtr conn, + virAdmConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb) { - VIR_DEBUG("dmn=%p", dmn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); - virCheckAdmDaemonReturn(dmn, -1); + virCheckAdmConnectReturn(conn, -1); - virObjectRef(dmn); + virObjectRef(conn); - virObjectLock(dmn); - virObjectLock(dmn->closeCallback); + virObjectLock(conn); + virObjectLock(conn->closeCallback); virCheckNonNullArgGoto(cb, error); - if (dmn->closeCallback->callback) { + if (conn->closeCallback->callback) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A close callback is already registered")); goto error; } - dmn->closeCallback->dmn = dmn; - dmn->closeCallback->callback = cb; - dmn->closeCallback->opaque = opaque; - dmn->closeCallback->freeCallback = freecb; + conn->closeCallback->conn = conn; + conn->closeCallback->callback = cb; + conn->closeCallback->opaque = opaque; + conn->closeCallback->freeCallback = freecb; - virObjectUnlock(dmn->closeCallback); - virObjectUnlock(dmn); + virObjectUnlock(conn->closeCallback); + virObjectUnlock(conn); return 0; error: - virObjectUnlock(dmn->closeCallback); - virObjectUnlock(dmn); + virObjectUnlock(conn->closeCallback); + virObjectUnlock(conn); virDispatchError(NULL); - virObjectUnref(dmn); + virObjectUnref(conn); return -1; } /** - * virAdmDaemonUnregisterCloseCallback: - * @dmn: pointer to connection object + * virAdmConnectUnregisterCloseCallback: + * @conn: pointer to connection object * @cb: pointer to the current registered callback * * Unregisters the callback previously set with the - * virAdmDaemonRegisterCloseCallback method. The callback + * virAdmConnectRegisterCloseCallback method. The callback * will no longer receive notifications when the connection * closes. If a virFreeCallback was provided at time of * registration, it will be invoked. * * Returns 0 on success, -1 on error */ -int virAdmDaemonUnregisterCloseCallback(virAdmDaemonPtr dmn, - virAdmDaemonCloseFunc cb) +int virAdmConnectUnregisterCloseCallback(virAdmConnectPtr conn, + virAdmConnectCloseFunc cb) { - VIR_DEBUG("dmn=%p", dmn); + VIR_DEBUG("conn=%p", conn); virResetLastError(); - virCheckAdmDaemonReturn(dmn, -1); + virCheckAdmConnectReturn(conn, -1); - virObjectLock(dmn); - virObjectLock(dmn->closeCallback); + virObjectLock(conn); + virObjectLock(conn->closeCallback); virCheckNonNullArgGoto(cb, error); - if (dmn->closeCallback->callback != cb) { + if (conn->closeCallback->callback != cb) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("A different callback was requested")); goto error; } - dmn->closeCallback->callback = NULL; - if (dmn->closeCallback->freeCallback) - dmn->closeCallback->freeCallback(dmn->closeCallback->opaque); - dmn->closeCallback->freeCallback = NULL; + conn->closeCallback->callback = NULL; + if (conn->closeCallback->freeCallback) + conn->closeCallback->freeCallback(conn->closeCallback->opaque); + conn->closeCallback->freeCallback = NULL; - virObjectUnlock(dmn->closeCallback); - virObjectUnlock(dmn); - virObjectUnref(dmn); + virObjectUnlock(conn->closeCallback); + virObjectUnlock(conn); + virObjectUnref(conn); return 0; error: - virObjectUnlock(dmn->closeCallback); - virObjectUnlock(dmn); + virObjectUnlock(conn->closeCallback); + virObjectUnlock(conn); virDispatchError(NULL); return -1; } /** - * virAdmDaemonGetVersion: - * @dmn: pointer to an active admin connection + * virAdmConnectGetLibVersion: + * @conn: pointer to an active admin connection * @libVer: stores the current remote libvirt version number * * Retrieves the remote side libvirt version used by the daemon. Format @@ -534,17 +535,17 @@ int virAdmDaemonUnregisterCloseCallback(virAdmDaemonPtr dmn, * * Returns 0 on success, -1 on failure and @libVer follows this format: */ -int virAdmDaemonGetVersion(virAdmDaemonPtr dmn, - unsigned long long *libVer) +int virAdmConnectGetLibVersion(virAdmConnectPtr conn, + unsigned long long *libVer) { - VIR_DEBUG("dmn=%p, libVir=%p", dmn, libVer); + VIR_DEBUG("conn=%p, libVir=%p", conn, libVer); virResetLastError(); - virCheckAdmDaemonReturn(dmn, -1); + virCheckAdmConnectReturn(conn, -1); virCheckNonNullArgReturn(libVer, -1); - if (remoteAdminDaemonGetVersion(dmn, libVer) < 0) + if (remoteAdminConnectGetLibVersion(conn, libVer) < 0) goto error; return 0; diff --git a/src/libvirt_admin_private.syms b/src/libvirt_admin_private.syms index 3dc06a0..85380dc 100644 --- a/src/libvirt_admin_private.syms +++ b/src/libvirt_admin_private.syms @@ -6,8 +6,8 @@ # # admin/admin_protocol.x -xdr_admin_daemon_get_version_ret; -xdr_admin_daemon_open_args; +xdr_admin_connect_get_lib_version_ret; +xdr_admin_connect_open_args; # Let emacs know we want case-insensitive sorting # Local Variables: diff --git a/src/libvirt_admin_public.syms b/src/libvirt_admin_public.syms index 75ff8a8..33b1db4 100644 --- a/src/libvirt_admin_public.syms +++ b/src/libvirt_admin_public.syms @@ -12,13 +12,13 @@ # LIBVIRT_ADMIN_1.3.0 { global: - virAdmDaemonClose; - virAdmDaemonGetURI; - virAdmDaemonGetVersion; - virAdmDaemonIsAlive; - virAdmDaemonOpen; - virAdmDaemonRef; - virAdmDaemonRegisterCloseCallback; - virAdmDaemonUnregisterCloseCallback; + virAdmConnectOpen; + virAdmConnectClose; + virAdmConnectRef; virAdmGetVersion; + virAdmConnectIsAlive; + virAdmConnectGetURI; + virAdmConnectGetLibVersion; + virAdmConnectRegisterCloseCallback; + virAdmConnectUnregisterCloseCallback; }; diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index eb45465..5cfc512 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -49,7 +49,7 @@ my $procprefix = shift or die "missing procedure prefix argument"; my $protocol = shift or die "missing protocol argument"; my @autogen; -my $connect_ptr = $structprefix eq "admin" ? "virAdmDaemonPtr" : "virConnectPtr"; +my $connect_ptr = $structprefix eq "admin" ? "virAdmConnectPtr" : "virConnectPtr"; my $prefix = ($structprefix eq "admin") ? "admin" : "vir"; sub fixup_name { diff --git a/tools/virsh.c b/tools/virsh.c index 96316bf..7484bed 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -198,7 +198,7 @@ virshReconnect(vshControl *ctl) "disconnect from the hypervisor")); } - priv->conn = virshConnect(ctl, priv->connname, priv->readonly); + priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); if (!priv->conn) { if (disconnected) @@ -275,18 +275,18 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) priv->conn = NULL; } - VIR_FREE(priv->connname); + VIR_FREE(ctl->connname); if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - priv->connname = vshStrdup(ctl, name); + ctl->connname = vshStrdup(ctl, name); priv->useGetInfo = false; priv->useSnapshotOld = false; priv->blockJobNoBytes = false; priv->readonly = ro; - priv->conn = virshConnect(ctl, priv->connname, priv->readonly); + priv->conn = virshConnect(ctl, ctl->connname, priv->readonly); if (!priv->conn) { vshError(ctl, "%s", _("Failed to connect to the hypervisor")); @@ -398,7 +398,7 @@ virshInit(vshControl *ctl) NULL)) < 0) return false; - if (priv->connname) { + if (ctl->connname) { virshReconnect(ctl); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it @@ -430,7 +430,7 @@ virshDeinit(vshControl *ctl) virshControlPtr priv = ctl->privData; vshDeinit(ctl); - VIR_FREE(priv->connname); + VIR_FREE(ctl->connname); if (priv->conn) { int ret; virConnectUnregisterCloseCallback(priv->conn, virshCatchDisconnect); @@ -706,8 +706,8 @@ virshParseArgv(vshControl *ctl, int argc, char **argv) while ((arg = getopt_long(argc, argv, "+:c:d:e:hk:K:l:qrtvV", opt, &longindex)) != -1) { switch (arg) { case 'c': - VIR_FREE(priv->connname); - priv->connname = vshStrdup(ctl, optarg); + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, optarg); break; case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { @@ -934,7 +934,7 @@ main(int argc, char **argv) virFileActivateDirOverride(argv[0]); if ((defaultConn = virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"))) - virshCtl.connname = vshStrdup(ctl, defaultConn); + ctl->connname = vshStrdup(ctl, defaultConn); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virsh.h b/tools/virsh.h index 1845b0e..3402408 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -69,7 +69,6 @@ typedef struct _virshCtrlData virshCtrlData; */ struct _virshControl { virConnectPtr conn; /* connection to hypervisor (MAY BE NULL) */ - char *connname; /* connection name */ bool readonly; /* connect readonly (first time only, not * during explicit connect command) */ diff --git a/tools/virt-admin.c b/tools/virt-admin.c index 3b5efab..1372963 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -56,11 +56,11 @@ static const vshClientHooks hooks; * vshAdmCatchDisconnect: * * We get here when the connection was closed. Unlike virsh, we do not save - * the fact that the event was raised, sice there is virAdmDaemonIsAlive to + * the fact that the event was raised, sice there is virAdmConnectIsAlive to * check if the communication channel has not been closed by remote party. */ static void -vshAdmCatchDisconnect(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, +vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, int reason, void *opaque) { @@ -73,7 +73,7 @@ vshAdmCatchDisconnect(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, return; error = virSaveLastError(); - uri = virAdmDaemonGetURI(dmn); + uri = virAdmConnectGetURI(conn); switch ((virConnectCloseReason) reason) { case VIR_CONNECT_CLOSE_REASON_ERROR: @@ -100,21 +100,21 @@ vshAdmCatchDisconnect(virAdmDaemonPtr dmn ATTRIBUTE_UNUSED, } static int -vshAdmDaemon(vshControl *ctl, unsigned int flags) +vshAdmConnect(vshControl *ctl, unsigned int flags) { vshAdmControlPtr priv = ctl->privData; - priv->dmn = virAdmDaemonOpen(priv->name, flags); + priv->conn = virAdmConnectOpen(ctl->connname, flags); - if (!priv->dmn) { + if (!priv->conn) { if (priv->wantReconnect) vshError(ctl, "%s", _("Failed to reconnect to the admin server")); else vshError(ctl, "%s", _("Failed to connect to the admin server")); return -1; } else { - if (virAdmDaemonRegisterCloseCallback(priv->dmn, vshAdmCatchDisconnect, - NULL, NULL) < 0) + if (virAdmConnectRegisterCloseCallback(priv->conn, vshAdmCatchDisconnect, + NULL, NULL) < 0) vshError(ctl, "%s", _("Unable to register disconnect callback")); if (priv->wantReconnect) @@ -132,17 +132,17 @@ vshAdmDisconnect(vshControl *ctl) int ret = 0; vshAdmControlPtr priv = ctl->privData; - if (!priv->dmn) + if (!priv->conn) return ret; - virAdmDaemonUnregisterCloseCallback(priv->dmn, vshAdmCatchDisconnect); - ret = virAdmDaemonClose(priv->dmn); + virAdmConnectUnregisterCloseCallback(priv->conn, vshAdmCatchDisconnect); + ret = virAdmConnectClose(priv->conn); if (ret < 0) vshError(ctl, "%s", _("Failed to disconnect from the admin server")); else if (ret > 0) vshError(ctl, "%s", _("One or more references were leaked after " "disconnect from the hypervisor")); - priv->dmn = NULL; + priv->conn = NULL; return ret; } @@ -156,11 +156,11 @@ static void vshAdmReconnect(vshControl *ctl) { vshAdmControlPtr priv = ctl->privData; - if (priv->dmn) + if (priv->conn) priv->wantReconnect = true; vshAdmDisconnect(ctl); - vshAdmDaemon(ctl, 0); + vshAdmConnect(ctl, 0); priv->wantReconnect = false; } @@ -185,7 +185,7 @@ cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) char *uri; vshAdmControlPtr priv = ctl->privData; - uri = virAdmDaemonGetURI(priv->dmn); + uri = virAdmConnectGetURI(priv->conn); if (!uri) { vshError(ctl, "%s", _("failed to get URI")); return false; @@ -243,7 +243,7 @@ cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) vshPrint(ctl, _("Using library: libvirt %d.%d.%d\n"), major, minor, rel); - ret = virAdmDaemonGetVersion(priv->dmn, &daemonVersion); + ret = virAdmConnectGetLibVersion(priv->conn, &daemonVersion); if (ret < 0) { vshError(ctl, "%s", _("failed to get the daemon version")); } else { @@ -292,28 +292,28 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - VIR_FREE(priv->name); - priv->name = vshStrdup(ctl, name); + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, name); vshAdmReconnect(ctl); - return !!priv->dmn; + return !!priv->conn; } static void * -vshAdmDaemonionHandler(vshControl *ctl) +vshAdmConnectionHandler(vshControl *ctl) { vshAdmControlPtr priv = ctl->privData; - if (!virAdmDaemonIsAlive(priv->dmn)) + if (!virAdmConnectIsAlive(priv->conn)) vshAdmReconnect(ctl); - if (!virAdmDaemonIsAlive(priv->dmn)) { + if (!virAdmConnectIsAlive(priv->conn)) { vshError(ctl, "%s", _("no valid connection")); return NULL; } - return priv->dmn; + return priv->conn; } /* @@ -329,7 +329,7 @@ vshAdmInit(vshControl *ctl) * work properly */ vshInitReload(ctl); - if (priv->dmn) + if (priv->conn) return false; /* set up the library error handler */ @@ -342,7 +342,7 @@ vshAdmInit(vshControl *ctl) return false; ctl->eventLoopStarted = true; - if (priv->name) { + if (ctl->connname) { vshAdmReconnect(ctl); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it @@ -350,7 +350,7 @@ vshAdmInit(vshControl *ctl) * non-default connection, or might be 'help' which needs no * connection). */ - if (!priv->dmn) { + if (!priv->conn) { vshReportError(ctl); return false; } @@ -374,9 +374,9 @@ vshAdmDeinit(vshControl *ctl) vshAdmControlPtr priv = ctl->privData; vshDeinit(ctl); - VIR_FREE(priv->name); + VIR_FREE(ctl->connname); - if (priv->dmn) + if (priv->conn) vshAdmDisconnect(ctl); virResetLastError(); @@ -473,7 +473,6 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv) int arg, debug; size_t i; int longindex = -1; - vshAdmControlPtr priv = ctl->privData; struct option opt[] = { {"connect", required_argument, NULL, 'c'}, {"debug", required_argument, NULL, 'd'}, @@ -490,8 +489,8 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv) while ((arg = getopt_long(argc, argv, "+:c:d:hl:qvV", opt, &longindex)) != -1) { switch (arg) { case 'c': - VIR_FREE(priv->name); - priv->name = vshStrdup(ctl, optarg); + VIR_FREE(ctl->connname); + ctl->connname = vshStrdup(ctl, optarg); break; case 'd': if (virStrToLong_i(optarg, NULL, 10, &debug) < 0) { @@ -599,7 +598,7 @@ static const vshCmdGrp cmdGroups[] = { }; static const vshClientHooks hooks = { - .connHandler = vshAdmDaemonionHandler + .connHandler = vshAdmConnectionHandler }; int @@ -657,7 +656,7 @@ main(int argc, char **argv) virFileActivateDirOverride(argv[0]); if ((defaultConn = virGetEnvBlockSUID("LIBVIRT_DEFAULT_ADMIN_URI"))) - virtAdminCtl.name = vshStrdup(ctl, defaultConn); + ctl->connname = vshStrdup(ctl, defaultConn); if (!vshInit(ctl, cmdGroups, NULL)) exit(EXIT_FAILURE); diff --git a/tools/virt-admin.h b/tools/virt-admin.h index d1b1bb4..62228cc 100644 --- a/tools/virt-admin.h +++ b/tools/virt-admin.h @@ -39,8 +39,7 @@ typedef vshAdmControl *vshAdmControlPtr; * adminControl */ struct _vshAdmControl { - virAdmDaemonPtr dmn; /* remote daemon */ - char *name; + virAdmConnectPtr conn; /* connection to a daemon's admin server */ bool wantReconnect; }; diff --git a/tools/vsh.h b/tools/vsh.h index 9c0d8a6..0c5abdc 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -197,6 +197,7 @@ struct _vshControl { const char *name; /* hardcoded name of the binary that cannot * be changed without recompilation compared * to program name */ + char *connname; /* connection name */ char *progname; /* program name */ vshCmd *cmd; /* the current command */ char *cmdstr; /* string with command */ -- 2.4.3

3 5

[libvirt] [PATCHv2 0/4] Implement shared memory device (cold) hot-plug/unplug
by Luyao Huang 21 Dec '15

21 Dec '15

v1: https://www.redhat.com/archives/libvir-list/2015-June/msg00830.html These patches implement the hot-plug/hot-unplug and cold-plug/cold-unplug for Inter-VM Shared Memory PCI device. Luyao Huang (4): conf: Add helpers to insert/remove/find shmem devices in domain def qemu: Implement shared memory device cold (un)plug qemu: Implement share memory device hot-plug qemu: Implement shared memory device hot-unplug src/conf/domain_conf.c | 66 ++++++++++++++++++++ src/conf/domain_conf.h | 7 +++ src/libvirt_private.syms | 4 ++ src/qemu/qemu_driver.c | 35 +++++++++-- src/qemu/qemu_hotplug.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.h | 6 ++ 6 files changed, 265 insertions(+), 5 deletions(-) -- 1.8.3.1

3 18

[libvirt] [PATCH V2] Xen: support maxvcpus in xm and xl config
by Jim Fehlig 19 Dec '15

19 Dec '15

From: Ian Campbell <ian.campbell(a)citrix.com> xend prior to 4.0 understands vcpus as maxvcpus and vcpu_avail as a bit map of which cpus are online (default is all). xend from 4.0 onwards understands maxvcpus as maxvcpus and vcpus as the number which are online (from 0..N-1). The upstream commit (68a94cf528e6 "xm: Add maxvcpus support") claims that if maxvcpus is omitted then the old behaviour (i.e. obeying vcpu_avail) is retained, but AFAICT it was not, in this case vcpu==maxcpus==online cpus. This is good for us because handling anything else would be fiddly. This patch changes parsing of the virDomainDef maxvcpus and vcpus entries to use the corresponding 'maxvcpus' and 'vcpus' settings from xm and xl config. It also drops use of the old Xen 3.x 'vcpu_avail' setting. The change also removes the maxvcpus limit of MAX_VIRT_VCPUS (since maxvcpus is simply a count, not a bit mask), which is particularly crucial on ARM where MAX_VIRT_CPUS == 1 (since all guests are expected to support vcpu placement, and therefore only the boot vcpu's info lives in the shared info page). Existing tests adjusted accordingly, and new tests added for the 'maxvcpus' setting. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- This is a respin of Ian's patch [1] to support parsing/formatting of the 'maxvcpus' xm and xl config setting. It goes a bit further and removes the old Xen 3.x 'vcpu_avail' setting and lifts the maxvcpus limit of MAX_VIRT_CPUS entirely. The patch is based on my recent series [2] removing xend config version from the codebase. [1] https://www.redhat.com/archives/libvir-list/2015-November/msg01155.html [2] https://www.redhat.com/archives/libvir-list/2015-December/msg00616.html src/xenconfig/xen_common.c | 25 +++++++++++---------- tests/xlconfigdata/test-paravirt-maxvcpus.cfg | 13 +++++++++++ tests/xlconfigdata/test-paravirt-maxvcpus.xml | 28 ++++++++++++++++++++++++ tests/xlconfigtest.c | 1 + tests/xmconfigdata/test-paravirt-maxvcpus.cfg | 13 +++++++++++ tests/xmconfigdata/test-paravirt-maxvcpus.xml | 31 +++++++++++++++++++++++++++ tests/xmconfigdata/test-paravirt-vcpu.cfg | 4 ++-- tests/xmconfigtest.c | 1 + 8 files changed, 101 insertions(+), 15 deletions(-) diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index f3e7e18..54f5791 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -488,19 +488,22 @@ xenParseCPUFeatures(virConfPtr conf, virDomainDefPtr def) const char *str = NULL; int val = 0; - if (xenConfigGetULong(conf, "vcpus", &count, 1) < 0 || - MAX_VIRT_CPUS < count) + if (xenConfigGetULong(conf, "vcpus", &count, 1) < 0) return -1; if (virDomainDefSetVcpusMax(def, count) < 0) return -1; - if (xenConfigGetULong(conf, "vcpu_avail", &count, -1) < 0) + if (virDomainDefSetVcpus(def, count) < 0) return -1; - if (virDomainDefSetVcpus(def, MIN(count_one_bits_l(count), - virDomainDefGetVcpusMax(def))) < 0) - return -1; + if (virConfGetValue(conf, "maxvcpus")) { + if (xenConfigGetULong(conf, "maxvcpus", &count, 0) < 0) + return -1; + + if (virDomainDefSetVcpusMax(def, count) < 0) + return -1; + } if (xenConfigGetString(conf, "cpus", &str, NULL) < 0) return -1; @@ -1494,14 +1497,10 @@ xenFormatCPUAllocation(virConfPtr conf, virDomainDefPtr def) int ret = -1; char *cpus = NULL; - if (xenConfigSetInt(conf, "vcpus", virDomainDefGetVcpusMax(def)) < 0) + if (virDomainDefGetVcpus(def) < virDomainDefGetVcpusMax(def) && + xenConfigSetInt(conf, "maxvcpus", virDomainDefGetVcpusMax(def)) < 0) goto cleanup; - - /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is - either 32, or 64 on a platform where long is big enough. */ - if (virDomainDefHasVcpusOffline(def) && - xenConfigSetInt(conf, "vcpu_avail", - (1UL << virDomainDefGetVcpus(def)) - 1) < 0) + if (xenConfigSetInt(conf, "vcpus", virDomainDefGetVcpus(def)) < 0) goto cleanup; if ((def->cpumask != NULL) && diff --git a/tests/xlconfigdata/test-paravirt-maxvcpus.cfg b/tests/xlconfigdata/test-paravirt-maxvcpus.cfg new file mode 100644 index 0000000..d506b75 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-maxvcpus.cfg @@ -0,0 +1,13 @@ +name = "XenGuest1" +uuid = "45b60f51-88a9-47a8-a3b3-5e66d71b2283" +maxmem = 512 +memory = 512 +maxvcpus = 8 +vcpus = 4 +localtime = 0 +on_poweroff = "preserve" +on_reboot = "restart" +on_crash = "preserve" +vif = [ "mac=5a:36:0e:be:00:09" ] +bootloader = "/usr/bin/pygrub" +disk = [ "/var/lib/xen/images/debian/disk.qcow2,qcow2,xvda,w,backendtype=qdisk" ] diff --git a/tests/xlconfigdata/test-paravirt-maxvcpus.xml b/tests/xlconfigdata/test-paravirt-maxvcpus.xml new file mode 100644 index 0000000..2e1f8f8 --- /dev/null +++ b/tests/xlconfigdata/test-paravirt-maxvcpus.xml @@ -0,0 +1,28 @@ +<domain type='xen'> + <name>XenGuest1</name> + <uuid>45b60f51-88a9-47a8-a3b3-5e66d71b2283</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static' current='4'>8</vcpu> + <bootloader>/usr/bin/pygrub</bootloader> + <os> + <type arch='x86_64' machine='xenpv'>linux</type> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>preserve</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>preserve</on_crash> + <devices> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/xen/images/debian/disk.qcow2'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='ethernet'> + <mac address='5a:36:0e:be:00:09'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + </devices> +</domain> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c index de7f871..1db11e7 100644 --- a/tests/xlconfigtest.c +++ b/tests/xlconfigtest.c @@ -192,6 +192,7 @@ mymain(void) ret = -1; \ } while (0) + DO_TEST("paravirt-maxvcpus"); DO_TEST("new-disk"); DO_TEST("spice"); DO_TEST("spice-features"); diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.cfg b/tests/xmconfigdata/test-paravirt-maxvcpus.cfg new file mode 100644 index 0000000..8d1ac4d --- /dev/null +++ b/tests/xmconfigdata/test-paravirt-maxvcpus.cfg @@ -0,0 +1,13 @@ +name = "XenGuest1" +uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" +maxmem = 579 +memory = 394 +maxvcpus = 4 +vcpus = 2 +localtime = 0 +on_poweroff = "destroy" +on_reboot = "restart" +on_crash = "restart" +vif = [ "mac=00:16:3e:66:94:9c,bridge=br0,script=vif-bridge" ] +bootloader = "/usr/bin/pygrub" +disk = [ "phy:/dev/HostVG/XenGuest1,xvda,w" ] diff --git a/tests/xmconfigdata/test-paravirt-maxvcpus.xml b/tests/xmconfigdata/test-paravirt-maxvcpus.xml new file mode 100644 index 0000000..3b0e0ce --- /dev/null +++ b/tests/xmconfigdata/test-paravirt-maxvcpus.xml @@ -0,0 +1,31 @@ +<domain type='xen'> + <name>XenGuest1</name> + <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <vcpu placement='static' current='2'>4</vcpu> + <bootloader>/usr/bin/pygrub</bootloader> + <os> + <type arch='i686' machine='xenpv'>linux</type> + </os> + <clock offset='utc' adjustment='reset'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/HostVG/XenGuest1'/> + <target dev='xvda' bus='xen'/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:66:94:9c'/> + <source bridge='br0'/> + <script path='vif-bridge'/> + </interface> + <console type='pty'> + <target type='xen' port='0'/> + </console> + <memballoon model='xen'/> + </devices> +</domain> diff --git a/tests/xmconfigdata/test-paravirt-vcpu.cfg b/tests/xmconfigdata/test-paravirt-vcpu.cfg index 1e7765d..8d1ac4d 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.cfg +++ b/tests/xmconfigdata/test-paravirt-vcpu.cfg @@ -2,8 +2,8 @@ name = "XenGuest1" uuid = "c7a5fdb0-cdaf-9455-926a-d65c16db1809" maxmem = 579 memory = 394 -vcpus = 4 -vcpu_avail = 3 +maxvcpus = 4 +vcpus = 2 localtime = 0 on_poweroff = "destroy" on_reboot = "restart" diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index c2084c2..3d47693 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -215,6 +215,7 @@ mymain(void) DO_TEST("paravirt-net-e1000"); DO_TEST("paravirt-net-vifname"); DO_TEST("paravirt-vcpu"); + DO_TEST("paravirt-maxvcpus"); DO_TEST("fullvirt-new-cdrom"); DO_TEST("fullvirt-utc"); DO_TEST("fullvirt-localtime"); -- 2.1.4

3 4

[libvirt] TSO of VM packets degardes significantly on increasing VM's on a Host
by Piyush R Srivastava1 19 Dec '15

19 Dec '15

Hi, Problem- Offloading for VM packets (TSO enabled in VM's ) degrades severely with increase in VM's on a host What is controlling the offloading of VM packets and how can we improve it ? ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Description- We have a testbed OpenStack deployment. We boot 1, 10 and 25 VM's on a single compute node and start iperf traffic. ( VM's are iperf client ). We then simultaneously do tcpdump at the veth-pair connecting the VM to the OVS Bridges. Tcpdump data shows that on increasing the VM's on a host, the % of offloaded packets degrades severely ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Host configuration- 12 cores ( 24 vCPU ), 40 GB RAM [root@rhel7-25 ~]# uname -a Linux rhel7-25.in.ibm.com 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux VM MTU is set to 1450 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Analysis- ------------------------------------------------------------------------------------ | VMs | % Non-Offloaded packets | |-----------------------------------------------------------------------------------| | 1 | 11.11% | | 10 | 71.78% | | 25 | 80.44% | |-----------------------|-----------------------------------------------------------| Thus we see significant degradation in offloaded packets when 10 and 25 VM's are sending iperf data simultaneously. ( TSO enabled VM's ) Non-Offloaded packets means Ethernet Frame of size 1464 ( VM MTU is 1450 ) ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Tcpdump details- Iperf Server IP- 1.1.1.34 For 1 VM, we see majority offloaded packets- [piyush@rhel7-34 25]$ cat qvoed7aa38d-22.log | grep "> 1.1.1.34.5001" | head -n 30 14:36:26.331073 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 74: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 0 14:36:26.331917 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 66: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 0 14:36:26.331946 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 90: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 24 14:36:26.331977 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 7056: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 6990 14:36:26.332018 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 5658: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 5592 14:36:26.332527 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 7056: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 6990 14:36:26.332560 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 9852: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 9786 14:36:26.333024 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 8454: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 8388 14:36:26.333054 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 7056: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 6990 14:36:26.333076 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 4260: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 4194 14:36:26.333530 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 16842: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 16776 14:36:26.333568 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 4260: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 4194 14:36:26.333886 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 21036: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 20970 14:36:26.333925 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 2862: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 2796 14:36:26.334303 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 21036: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 20970 14:36:26.334349 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 2862: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 2796 14:36:26.334741 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 22434: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 22368 14:36:26.335118 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 25230: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 25164 14:36:26.335566 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 25230: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 25164 14:36:26.336007 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 23832: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 23766 14:36:26.336050 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 2862: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 2796 14:36:26.336453 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 26628: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 26562 14:36:26.336898 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 22434: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 22368 14:36:26.336941 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 5658: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 5592 14:36:26.337235 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 23832: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 23766 14:36:26.337603 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 21036: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 20970 14:36:26.337644 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 8454: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 8388 14:36:26.337987 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 18240: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 18174 14:36:26.338040 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 12648: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 12582 14:36:26.338356 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 14046: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 13980 For 20 VM's, we see reduction is size of offloaded packets. Tcpdump for one of the 10 VM's- [piyush@rhel7-34 25]$ cat qvo255d8cdd-90.log | grep "> 1.1.1.34.5001" | head -n 30 15:09:25.024790 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 74: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 0 15:09:25.026834 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 66: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 0 15:09:25.026870 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 90: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 24 15:09:25.027186 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.027213 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 5658: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 5592 15:09:25.032500 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 5658: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 5592 15:09:25.032539 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 1464: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 1398 15:09:25.032567 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.035122 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.035631 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.035661 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.038508 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.038904 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.039300 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.040740 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 4260: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 4194 15:09:25.040774 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 2862: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 2796 15:09:25.040995 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.041235 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.042599 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.043209 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.043592 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.044312 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.044551 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.045232 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.045251 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.049951 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 5658: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 5592 15:09:25.049977 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 1464: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 1398 15:09:25.049996 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.050020 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 2862: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 2796 15:09:25.050039 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 4260: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 4194 For 25 VM's, we hardly see very less offloaded packets. Tcpdump for one of the 25 VM's- 15:52:31.543613 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.543637 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.543957 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.544090 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 4260: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 4194 15:52:31.544272 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.544296 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.544316 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.544340 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545034 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545066 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 5658: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 5592 15:52:31.545474 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545501 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.545539 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.545572 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 7056: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 6990 15:52:31.545736 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545807 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545813 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545934 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545956 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545974 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.546012 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 Thanks and regards, Piyush Raman Mail: pirsriva(a)in.ibm.com

1 0

[libvirt] TSO of VM packets degardes significantly on increasing VM's on a Host
by Piyush R Srivastava1 19 Dec '15

19 Dec '15

Hi, Problem- Offloading for VM packets (TSO enabled in VM's ) degrades severely with increase in VM's on a host What is controlling the offloading of VM packets and how can we improve it ? ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Description- We have a testbed OpenStack deployment. We boot 1, 10 and 25 VM's on a single compute node and start iperf traffic. ( VM's are iperf client ). We then simultaneously do tcpdump at the veth-pair connecting the VM to the OVS Bridges. Tcpdump data shows that on increasing the VM's on a host, the % of offloaded packets degrades severely ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Host configuration- 12 cores ( 24 vCPU ), 40 GB RAM [root@rhel7-25 ~]# uname -a Linux rhel7-25.in.ibm.com 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux VM MTU is set to 1450 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Analysis- ------------------------------------------------------------------------------------ | VMs | % Non-Offloaded packets | |-----------------------------------------------------------------------------------| | 1 | 11.11% | | 10 | 71.78% | | 25 | 80.44% | |-----------------------|-----------------------------------------------------------| Thus we see significant degradation in offloaded packets when 10 and 25 VM's are sending iperf data simultaneously. ( TSO enabled VM's ) Non-Offloaded packets means Ethernet Frame of size 1464 ( VM MTU is 1450 ) ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- Tcpdump details- Iperf Server IP- 1.1.1.34 For 1 VM, we see majority offloaded packets- [piyush@rhel7-34 25]$ cat qvoed7aa38d-22.log | grep "> 1.1.1.34.5001" | head -n 30 14:36:26.331073 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 74: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 0 14:36:26.331917 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 66: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 0 14:36:26.331946 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 90: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 24 14:36:26.331977 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 7056: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 6990 14:36:26.332018 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 5658: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 5592 14:36:26.332527 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 7056: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 6990 14:36:26.332560 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 9852: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 9786 14:36:26.333024 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 8454: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 8388 14:36:26.333054 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 7056: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 6990 14:36:26.333076 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 4260: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 4194 14:36:26.333530 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 16842: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 16776 14:36:26.333568 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 4260: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 4194 14:36:26.333886 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 21036: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 20970 14:36:26.333925 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 2862: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 2796 14:36:26.334303 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 21036: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 20970 14:36:26.334349 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 2862: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 2796 14:36:26.334741 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 22434: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 22368 14:36:26.335118 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 25230: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 25164 14:36:26.335566 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 25230: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 25164 14:36:26.336007 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 23832: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 23766 14:36:26.336050 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 2862: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 2796 14:36:26.336453 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 26628: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 26562 14:36:26.336898 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 22434: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 22368 14:36:26.336941 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 5658: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 5592 14:36:26.337235 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 23832: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 23766 14:36:26.337603 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 21036: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 20970 14:36:26.337644 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 8454: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 8388 14:36:26.337987 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 18240: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 18174 14:36:26.338040 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 12648: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 12582 14:36:26.338356 fa:16:3e:98:41:8b > fa:16:3e:ef:5f:16, IPv4, length 14046: 10.20.7.3.50395 > 1.1.1.34.5001: tcp 13980 For 20 VM's, we see reduction is size of offloaded packets. Tcpdump for one of the 10 VM's- [piyush@rhel7-34 25]$ cat qvo255d8cdd-90.log | grep "> 1.1.1.34.5001" | head -n 30 15:09:25.024790 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 74: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 0 15:09:25.026834 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 66: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 0 15:09:25.026870 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 90: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 24 15:09:25.027186 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.027213 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 5658: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 5592 15:09:25.032500 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 5658: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 5592 15:09:25.032539 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 1464: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 1398 15:09:25.032567 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.035122 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.035631 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.035661 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.038508 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.038904 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.039300 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.040740 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 4260: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 4194 15:09:25.040774 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 2862: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 2796 15:09:25.040995 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.041235 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.042599 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.043209 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.043592 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.044312 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.044551 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.045232 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.045251 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.049951 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 5658: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 5592 15:09:25.049977 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 1464: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 1398 15:09:25.049996 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 7056: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 6990 15:09:25.050020 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 2862: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 2796 15:09:25.050039 fa:16:3e:b9:f8:ec > fa:16:3e:c1:de:cc, IPv4, length 4260: 10.20.18.3.36798 > 1.1.1.34.5001: tcp 4194 For 25 VM's, we hardly see very less offloaded packets. Tcpdump for one of the 25 VM's- 15:52:31.543613 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.543637 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.543957 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.544090 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 4260: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 4194 15:52:31.544272 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.544296 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.544316 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.544340 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545034 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545066 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 5658: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 5592 15:52:31.545474 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545501 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.545539 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 2862: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 2796 15:52:31.545572 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 7056: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 6990 15:52:31.545736 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545807 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545813 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545934 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545956 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.545974 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 15:52:31.546012 fa:16:3e:3c:7d:78 > fa:16:3e:aa:af:d5, IPv4, length 1464: 10.20.10.3.45892 > 1.1.1.34.5001: tcp 1398 Thanks and regards, Piyush Raman Mail: pirsriva(a)in.ibm.com

1 0

[libvirt] [PATCH 0/2] 'deflate-on-oom' attribute for mememory balloon
by Dmitry Andreev 18 Dec '15

18 Dec '15

This patch-set adds support for the new feature that has been added to the QEMU virtio memory balloon a month ago. This feature lets a guest OS deflate balloon on OOM. With 'deflate-on-oom' enabled virtio balloon will release it's memory if possible right before an OOM termination of processes. QEMU commit with the complete feature description: http://git.qemu.org/?p=qemu.git;a=commit;h=e3816255bf4b6377bb405331e2ee0dc1… Dmitry Andreev (2): conf: introduce 'deflate-on-oom' attribute for memballoon device qemu: add support of optional 'deflate-on-oom' attribute docs/formatdomain.html.in | 10 +++++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 23 ++++++++++++++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 4 ++++ .../qemuxml2argv-balloon-device-deflate-off.args | 23 ++++++++++++++++++++ .../qemuxml2argv-balloon-device-deflate-off.xml | 25 ++++++++++++++++++++++ .../qemuxml2argv-balloon-device-deflate.args | 23 ++++++++++++++++++++ .../qemuxml2argv-balloon-device-deflate.xml | 25 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 4 ++++ 10 files changed, 143 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.xml -- 1.8.3.1

2 6

[libvirt] [libvirt-perl][PATCH] Add VIR_STORAGE_POOL_CREATE_* constants
by Michal Privoznik 18 Dec '15

18 Dec '15

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Changes | 4 +++- Virt.xs | 5 +++++ lib/Sys/Virt/StoragePool.pm | 28 ++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Changes b/Changes index 0b3e659..05643b5 100644 --- a/Changes +++ b/Changes @@ -2,7 +2,9 @@ Revision history for perl module Sys::Virt 1.3.1 2015-12-00 - - XXX + - Add VIR_STORAGE_POOL_CREATE_NORMAL, VIR_STORAGE_POOL_CREATE_WITH_BUILD, + VIR_STORAGE_POOL_CREATE_WITH_BUILD_OVERWRITE and + VIR_STORAGE_POOL_CREATE_WITH_BUILD_NO_OVERWRITE constants 1.3.0 2015-12-10 diff --git a/Virt.xs b/Virt.xs index db04fc2..4e28887 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8026,6 +8026,11 @@ BOOT: REGISTER_CONSTANT(VIR_STORAGE_POOL_BUILD_NO_OVERWRITE, BUILD_NO_OVERWRITE); REGISTER_CONSTANT(VIR_STORAGE_POOL_BUILD_OVERWRITE, BUILD_OVERWRITE); + REGISTER_CONSTANT(VIR_STORAGE_POOL_CREATE_NORMAL, CREATE_NORMAL); + REGISTER_CONSTANT(VIR_STORAGE_POOL_CREATE_WITH_BUILD, CREATE_WITH_BUILD); + REGISTER_CONSTANT(VIR_STORAGE_POOL_CREATE_WITH_BUILD_OVERWRITE, CREATE_WITH_BUILD_OVERWRITE); + REGISTER_CONSTANT(VIR_STORAGE_POOL_CREATE_WITH_BUILD_NO_OVERWRITE, CREATE_WITH_BUILD_NO_OVERWRITE); + REGISTER_CONSTANT(VIR_STORAGE_POOL_DELETE_NORMAL, DELETE_NORMAL); REGISTER_CONSTANT(VIR_STORAGE_POOL_DELETE_ZEROED, DELETE_ZEROED); diff --git a/lib/Sys/Virt/StoragePool.pm b/lib/Sys/Virt/StoragePool.pm index 7572d62..5fd6acc 100644 --- a/lib/Sys/Virt/StoragePool.pm +++ b/lib/Sys/Virt/StoragePool.pm @@ -355,6 +355,34 @@ Overwrite existing storage pool data =back +=head2 CREATE MODES + +When creating a storage pool it can be built at the same time. +The following values are therefore close to their BUILD +counterparts. + +=over 4 + +=item Sys::Virt::StoragePool::CREATE_NORMAL + +Just create the storage pool without building it. + +=item Sys::Virt::StoragePool::CREATE_WITH_BUILD + +When creating new storage pool also perform pool build without any flags. + +=item Sys::Virt::StoragePool::CREATE_WITH_BUILD_OVERWRITE + +Create the pool and perform pool build using the BUILD_OVERWRITE +flag. This is mutually exclusive to CREATE_WITH_BUILD_NO_OVERWRITE. + +=item Sys::Virt::StoragePool::CREATE_WITH_BUILD_NO_OVERWRITE + +Create the pool and perform pool build using the BUILD_NO_OVERWRITE +flag. This is mutually exclusive to CREATE_WITH_BUILD_OVERWRITE. + +=back + =head2 XML DOCUMENTS The following constants are useful when requesting -- 2.4.10

3 2

[libvirt] [PATCH] lxc_cgroup: Add check for NULL cgroup before AddTask call
by John Ferlan 18 Dec '15

18 Dec '15

Commit id '71ce4759' altered the cgroup processing with respect to the call to virCgroupAddTask being moved out from lower layers into the calling layers especially for qemu processing of emulator and vcpu threads. The movement affected lxc insomuch as it is possible for a code path to return a NULL cgroup *and* a 0 return status via virCgroupNewPartition failure when virCgroupNewIgnoreError succeeded when virCgroupNewMachineManual returns. Coverity pointed out that would cause virCgroupAddTask to core. This patch will check for a NULL cgroup as well as the negative return and just return the NULL cgroup to the caller (as it would have previously) Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/lxc/lxc_cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 609e9ea..ef332e3 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -501,7 +501,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, nnicindexes, nicindexes, def->resource->partition, -1, - &cgroup) < 0) + &cgroup) < 0 || !cgroup) goto cleanup; if (virCgroupAddTask(cgroup, initpid) < 0) { -- 2.5.0

2 1

[libvirt] [PATCH 0/8] Use macros for more common virsh command options
by John Ferlan 18 Dec '15

18 Dec '15

As a follow on to a recent series which created macros for various virsh-*.c command options, see: http://www.redhat.com/archives/libvir-list/2015-December/msg00672.html (although best to view by index since there are varying opinions on the matter)... Modify virsh-domain.c and virsh-volume.c to "follow" the concept of macro-ifying some commonly used options. In order to choose, I used: $ grep "{.name =" tools/virsh-*.c | \ grep -v "help" | grep -v "desc" | grep -v NULL | \ sort -i | uniq -c | sort -n To generate a list by module. That generated a list where I randomly picked 9 as the nexus, leaving the following: 9 tools/virsh-domain.c: {.name = "persistent", 10 tools/virsh-snapshot.c: {.name = "domain", 12 tools/virsh-network.c: {.name = "network", 12 tools/virsh-pool.c: {.name = "pool", 13 tools/virsh-volume.c: {.name = "vol", 14 tools/virsh-domain.c: {.name = "file", 14 tools/virsh-domain-monitor.c: {.name = "domain", 14 tools/virsh-volume.c: {.name = "pool", 26 tools/virsh-domain.c: {.name = "current", 28 tools/virsh-domain.c: {.name = "config", 28 tools/virsh-domain.c: {.name = "live", 81 tools/virsh-domain.c: {.name = "domain", Because virsh-domain-monitor.c, virsh-network.c, and virsh-snapshot.c only had one element with larger counts - I just left them as is and focused on the virsh-domain.c and virsh-volume.c. The perhaps more controversial choice will be the "file" option in virsh-domain.c which had numerous different helpstr values. I chose to macro-ify them using the entire helpstr including the N_("xxx") rather than just "xxx" since the N_ is the I18N marker. John Ferlan (8): virsh: Create macro for common "domain" option virsh: Create macro for common "persistent" option virsh: Create macro for common "config" option virsh: Create macro for common "live" option virsh: Create macro for common "current" option virsh: Create macro for common "file" option virsh: Create macros for common "pool" options virsh: Create macros for common "vol" options tools/virsh-domain.c | 918 +++++++++++---------------------------------------- tools/virsh-volume.c | 155 +++------ 2 files changed, 247 insertions(+), 826 deletions(-) -- 2.5.0

3 11

[libvirt] [PATCH 0/3] Add delete-snapshots option to virsh commands
by John Ferlan 18 Dec '15

18 Dec '15

Commit id '3c7590e0' added the ability to delete snapshots for rbd backends, but did not provide the virsh commands in order to handle that option. The first two patches fix a couple of minor nits - not using virCheckFlags in virStorageBackendRBDDeleteVol even though the flags are used. Also, the virStorageVolDeleteFlags did not document the possible flags. Added the reference for the API. The third patch is the meat where the --delete-snapshots flag to virsh commands 'undefine' and 'vol-delete' was added and handled. cc'd author of '3c7590e0' - hopefully this series could be applied and tested in a "real" environment. John Ferlan (3): storage: Add virCheckFlags to virStorageBackendRBDDeleteVol libvirt: Add virStorageVolDeleteFlags to virStorageVolDelete virsh: Add --delete-snapshots flag for undefine and vol-delete src/libvirt-storage.c | 2 +- src/storage/storage_backend_rbd.c | 3 +++ tools/virsh-domain.c | 14 +++++++++++++- tools/virsh-volume.c | 12 +++++++++++- tools/virsh.pod | 14 +++++++++++++- 5 files changed, 41 insertions(+), 4 deletions(-) -- 2.5.0

3 6

[libvirt] [PATCH] cpu_map.xml: Expose svm flag for nested kvm on AMD CPU model
by Lin Ma 18 Dec '15

18 Dec '15

QEMU commit 75d373e disables svm by default since PC machine 2.2. So with PC machine version > 2.1, When a user wants to expose the svm flag to a guest, says: ...... <feature policy='require' name='svm'/> ...... The svm flag wont be passed to qemu command line, This patch fixes it. Signed-off-by: Lin Ma <lma(a)suse.com> --- src/cpu/cpu_map.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 0b6d424..8f96843 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -686,7 +686,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1195,7 +1194,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1257,7 +1255,6 @@ <feature name='sep'/> <feature name='sse'/> <feature name='sse2'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1295,7 +1292,6 @@ <feature name='sse'/> <feature name='sse2'/> <feature name='sse4a'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> </model> @@ -1341,7 +1337,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tsc'/> <feature name='xop'/> @@ -1391,7 +1386,6 @@ <feature name='sse4.2'/> <feature name='sse4a'/> <feature name='ssse3'/> - <feature name='svm'/> <feature name='syscall'/> <feature name='tbm'/> <feature name='tsc'/> -- 2.1.4

1 1

[libvirt] [PATCH 00/16] Xen: remove xend config version
by Jim Fehlig 18 Dec '15

18 Dec '15

Hi All, Ian Campbell recently attempted [1] to fix and issue around MAX_VIRT_VPUS on ARM that required adding a new XEND_CONFIG_VERSION. After some discussion [2] we decided to drop support for all of the old xend config versions and go with the version supported in Xen 4.0, since the xl syntax was originally based on (and intended to be compatible with) xm circa that point in time. This series removes all traces of xend config version from the codebase, essentially removing support for Xen 3.x. Hopefully I succeeding in making the rather large series reviewable. The series is also available on the remove-xend-config-version branch of my libvirt github clone [2]. [1] https://www.redhat.com/archives/libvir-list/2015-November/msg01153.html [2] https://www.redhat.com/archives/libvir-list/2015-December/msg00148.html [3] https://github.com/jfehlig/libvirt/tree/remove-xend-config-version Jim Fehlig (16): Xen: tests: remove old xm config tests Xen: tests: remove net-ioemu xm config test Xen: tests: remove old sexpr2xml tests Xen: tests: remove old xml2sexpr tests Xen: tests: use latest XEND_CONFIG_VERSION in xm/xl tests Xen: xenconfig: remove XEND_CONFIG_VERSION in common code Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_xm Xen: xenconfig: remove xendConfigVersion from public functions Xen: tests: use latest XEND_CONFIG_VERSION in sexpr2xml tests Xen: xenconfig: remove disks from '(image)' sexpr Xen: tests: use latest XEND_CONFIG_VERSION in xml2sexpr tests Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_sxpr Xen: xen_driver: remove use of XEND_CONFIG_VERSION Xen: xend: remove use of XEND_CONFIG_VERSION Xen: xenconfig: remove xendConfigVersion from public sexpr functions Xen: remove xendConfigVersion from driver private struct src/libxl/libxl_driver.c | 9 +- src/xen/xen_driver.c | 296 ++++----------- src/xen/xen_driver.h | 2 - src/xen/xend_internal.c | 224 ++--------- src/xen/xm_internal.c | 9 +- src/xenconfig/xen_common.c | 211 ++++------- src/xenconfig/xen_common.h | 7 +- src/xenconfig/xen_sxpr.c | 411 ++++++--------------- src/xenconfig/xen_sxpr.h | 21 +- src/xenconfig/xen_xl.c | 9 +- src/xenconfig/xen_xl.h | 7 +- src/xenconfig/xen_xm.c | 57 +-- src/xenconfig/xen_xm.h | 5 +- src/xenconfig/xenxs_private.h | 8 - tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 +- .../sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 4 +- .../sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 48 --- .../sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 4 +- .../sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 4 +- .../sexpr2xml-fv-serial-dev-2-ports.sexpr | 5 +- .../sexpr2xml-fv-serial-dev-2-ports.xml | 4 +- .../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 4 +- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr | 7 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 4 +- .../sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 4 +- .../sexpr2xml-fv-serial-tcp-telnet.sexpr | 3 +- .../sexpr2xml-fv-serial-tcp-telnet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr | 3 +- tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 2 + tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 4 +- tests/sexpr2xmldata/sexpr2xml-fv.xml | 4 +- tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 34 -- tests/sexpr2xmltest.c | 130 ++++--- .../test-fullvirt-direct-kernel-boot.cfg | 3 +- .../test-fullvirt-direct-kernel-boot.xml | 2 +- tests/xlconfigdata/test-fullvirt-multiusb.cfg | 3 +- tests/xlconfigdata/test-fullvirt-multiusb.xml | 2 +- tests/xlconfigdata/test-new-disk.cfg | 3 +- tests/xlconfigdata/test-new-disk.xml | 2 +- tests/xlconfigdata/test-spice-features.cfg | 3 +- tests/xlconfigdata/test-spice-features.xml | 2 +- tests/xlconfigdata/test-spice.cfg | 3 +- tests/xlconfigdata/test-spice.xml | 2 +- tests/xlconfigtest.c | 29 +- tests/xmconfigdata/test-escape-paths.cfg | 5 +- tests/xmconfigdata/test-escape-paths.xml | 2 +- .../xmconfigdata/test-fullvirt-default-feature.cfg | 5 +- .../xmconfigdata/test-fullvirt-default-feature.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 5 +- tests/xmconfigdata/test-fullvirt-force-hpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 5 +- tests/xmconfigdata/test-fullvirt-force-nohpet.xml | 2 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 5 +- tests/xmconfigdata/test-fullvirt-localtime.xml | 2 +- tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 25 -- tests/xmconfigdata/test-fullvirt-net-ioemu.xml | 49 --- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 3 + tests/xmconfigdata/test-fullvirt-net-netfront.xml | 2 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 5 +- tests/xmconfigdata/test-fullvirt-new-cdrom.xml | 2 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 26 -- tests/xmconfigdata/test-fullvirt-old-cdrom.xml | 49 --- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 5 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.xml | 2 +- .../test-fullvirt-serial-dev-2-ports.cfg | 5 +- .../test-fullvirt-serial-dev-2-ports.xml | 2 +- .../test-fullvirt-serial-dev-2nd-port.cfg | 5 +- .../test-fullvirt-serial-dev-2nd-port.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-file.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-null.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-pipe.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-pty.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-stdio.xml | 2 +- .../test-fullvirt-serial-tcp-telnet.cfg | 5 +- .../test-fullvirt-serial-tcp-telnet.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-tcp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-udp.xml | 2 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 5 +- tests/xmconfigdata/test-fullvirt-serial-unix.xml | 2 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 5 +- tests/xmconfigdata/test-fullvirt-sound.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 5 +- tests/xmconfigdata/test-fullvirt-usbmouse.xml | 2 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 5 +- tests/xmconfigdata/test-fullvirt-usbtablet.xml | 2 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 5 +- tests/xmconfigdata/test-fullvirt-utc.xml | 2 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 5 +- tests/xmconfigdata/test-no-source-cdrom.xml | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 18 - .../test-paravirt-old-pvfb-vncdisplay.xml | 36 -- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 17 - tests/xmconfigdata/test-paravirt-old-pvfb.xml | 36 -- tests/xmconfigdata/test-pci-devs.cfg | 5 +- tests/xmconfigdata/test-pci-devs.xml | 2 +- tests/xmconfigtest.c | 94 +++-- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 2 +- .../xml2sexpr-disk-block-shareable.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-disk-block.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr | 2 +- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 2 +- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr | 2 +- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 2 +- .../xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 6 +- tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr | 10 +- .../xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 5 +- tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr | 9 - tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml | 31 -- .../xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr | 5 +- .../xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr | 10 +- .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 13 +- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr | 13 +- tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr | 13 +- tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr | 10 +- .../xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr | 10 +- .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr | 4 +- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 10 +- tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-net-routed.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr | 6 +- tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 2 +- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr | 2 +- tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr | 6 +- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 3 +- .../xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 3 +- tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr | 10 - tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml | 23 -- tests/xml2sexprdata/xml2sexpr-pv.sexpr | 3 +- tests/xml2sexprtest.c | 120 +++--- 193 files changed, 919 insertions(+), 1833 deletions(-) delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml delete mode 100644 tests/xmconfigdata/test-fullvirt-net-ioemu.cfg delete mode 100644 tests/xmconfigdata/test-fullvirt-net-ioemu.xml delete mode 100755 tests/xmconfigdata/test-fullvirt-old-cdrom.cfg delete mode 100644 tests/xmconfigdata/test-fullvirt-old-cdrom.xml delete mode 100644 tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.cfg delete mode 100644 tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml delete mode 100755 tests/xmconfigdata/test-paravirt-old-pvfb.cfg delete mode 100644 tests/xmconfigdata/test-paravirt-old-pvfb.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml -- 2.1.4

3 21

[libvirt] [PATH lxc_support_ethernet] fix bug:lxc don't support network type of ethernet
by mark zhong 18 Dec '15

18 Dec '15

for exmple,the xml is: <domain type = 'lxc'> ... <devices> <interface type ="ethernet"> <mac address="02:36:1d:18:2a:e4"/> <ip address='192.168.112.105' family='ipv4' prefix='24'/> <target dev="tap361d182e-14"/> </interface> <devices> </domian> when i start lxc with that xml file,system will report error and start lxc failed Now i create the veth pair and set mac address in lxc if the network type is ethernet Signed-off-by: mark zhong <zhongguocheng1(a)163.com> --- src/lxc/lxc_process.c | 36 ++++++++++++++++++++++++++++++++++++ src/lxc/lxc_process.h | 3 +++ 2 files changed, 39 insertions(+) diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 57e3880..913fe36 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -359,6 +359,39 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, return ret; } +char *virLXCProcessSetupInterfaceEthernet(virDomainDefPtr vm, + virDomainNetDefPtr net) +{ + char *ret = NULL; + char *parentVeth; + char *containerVeth = NULL; + + VIR_DEBUG("calling vethCreate()"); + parentVeth = net->ifname; + if (virNetDevVethCreate(&parentVeth, &containerVeth) < 0) + goto cleanup; + VIR_DEBUG("parentVeth: %s, containerVeth: %s", parentVeth, containerVeth); + + if (net->ifname == NULL) + net->ifname = parentVeth; + + if (virNetDevSetMAC(containerVeth, &net->mac) < 0) + goto cleanup; + + if (virNetDevSetOnline(parentVeth, true) < 0) + goto cleanup; + + if (net->filter && + virDomainConfNWFilterInstantiate(vm->uuid, net) < 0) + goto cleanup; + + ret = containerVeth; + + cleanup: + return ret; +} + + static const char *nsInfoLocal[VIR_LXC_DOMAIN_NAMESPACE_LAST] = { [VIR_LXC_DOMAIN_NAMESPACE_SHARENET] = "net", [VIR_LXC_DOMAIN_NAMESPACE_SHAREIPC] = "ipc", @@ -559,6 +592,9 @@ static int virLXCProcessSetupInterfaces(virConnectPtr conn, break; case VIR_DOMAIN_NET_TYPE_ETHERNET: + if (!(veth = virLXCProcessSetupInterfaceEthernet(def, + net))) + goto cleanup; break; case VIR_DOMAIN_NET_TYPE_USER: diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index b6c8083..3b4ade3 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -53,5 +53,8 @@ char *virLXCProcessSetupInterfaceBridged(virDomainDefPtr vm, char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virDomainDefPtr def, virDomainNetDefPtr net); +char *virLXCProcessSetupInterfaceEthernet(virDomainDefPtr vm, + virDomainNetDefPtr net); + #endif /* __LXC_PROCESS_H__ */ -- 2.5.1.windows.1

2 1

[libvirt] [PATCH 0/3] qemu_hotplug: dead code removal
by Ján Tomko 18 Dec '15

18 Dec '15

Originally posted as a part of https://www.redhat.com/archives/libvir-list/2015-August/msg00521.html Ján Tomko (3): qemu_hotplug: remove qemuDomainAttachDeviceControllerLive Remove dead code from qemuDomainAttachControllerDevice mark virDomainVirtioSerialAddrSetAddController as static. src/conf/domain_addr.c | 23 +---------------------- src/conf/domain_addr.h | 8 -------- src/libvirt_private.syms | 2 -- src/qemu/qemu_driver.c | 23 +---------------------- src/qemu/qemu_hotplug.c | 25 +++++++------------------ 5 files changed, 9 insertions(+), 72 deletions(-) -- 2.4.6

2 7

[libvirt] [PATCH v2] Allow building lxc without virt-login-shell
by Cédric Bosdonnat 17 Dec '15

17 Dec '15

Add a configure option to disable virt-login-shell build even if lxc is enabled. --- Diff to V1: * moved the configure.ac code into m4/virt-login-shell.m4 * allow building virt-login-shell without lxc * Introduce WITH_SETUID_RPC_CLIENT to have it built if either lxc or virt-login-shell is built. configure.ac | 9 +++++++++ m4/virt-login-shell.m4 | 27 +++++++++++++++++++++++++++ src/Makefile.am | 4 ++-- tools/Makefile.am | 12 ++++++------ 4 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 m4/virt-login-shell.m4 diff --git a/configure.ac b/configure.ac index f481c50..6fef728 100644 --- a/configure.ac +++ b/configure.ac @@ -1075,6 +1075,14 @@ fi AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"]) dnl +dnl Check for virt-login-shell +dnl + +LIBVIRT_CHECK_LOGIN_SHELL + +AM_CONDITIONAL([WITH_SETUID_RPC_CLIENT], [test "$with_lxc$with_login_shell" != "nono"]) + +dnl dnl Checks for the Parallels driver dnl @@ -2974,6 +2982,7 @@ AC_MSG_NOTICE([ Init script: $with_init_script]) AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files]) AC_MSG_NOTICE([ Default Editor: $DEFAULT_EDITOR]) AC_MSG_NOTICE([ Loader/NVRAM: $with_loader_nvram]) +AC_MSG_NOTICE([ virt-login-shell: $with_login_shell]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) AC_MSG_NOTICE([]) diff --git a/m4/virt-login-shell.m4 b/m4/virt-login-shell.m4 new file mode 100644 index 0000000..0701054 --- /dev/null +++ b/m4/virt-login-shell.m4 @@ -0,0 +1,27 @@ +dnl Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +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/>. + +AC_DEFUN([LIBVIRT_CHECK_LOGIN_SHELL], [ + AC_ARG_WITH([login_shell], + [AS_HELP_STRING([--with-login-shell], + [build virt-login-shell @<:@default=yes@:>@])]) + m4_divert_text([DEFAULTS], [with_login_shell=yes]) + + if test "$with_login_shell" ; then + AC_DEFINE_UNQUOTED([WITH_LOGIN_SHELL], 1, [whether virt-login-shell is built]) + fi + AM_CONDITIONAL([WITH_LOGIN_SHELL], [test "$with_login_shell" = "yes"]) +]) diff --git a/src/Makefile.am b/src/Makefile.am index 99b4993..2f40910 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2225,7 +2225,7 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD) # have a RPC client for local UNIX socket access only. We use # the ../config-post.h header to disable all external deps that # we don't want -if WITH_LXC +if WITH_SETUID_RPC_CLIENT noinst_LTLIBRARIES += libvirt-setuid-rpc-client.la libvirt_setuid_rpc_client_la_SOURCES = \ @@ -2302,7 +2302,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \ $(SECDRIVER_CFLAGS) \ $(XDR_CFLAGS) \ $(NULL) -endif WITH_LXC +endif WITH_SETUID_RPC_CLIENT lockdriverdir = $(libdir)/libvirt/lock-driver lockdriver_LTLIBRARIES = diff --git a/tools/Makefile.am b/tools/Makefile.am index d5638d9..d005035 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -71,12 +71,12 @@ sbin_SCRIPTS = virt-sanlock-cleanup DISTCLEANFILES += virt-sanlock-cleanup endif WITH_SANLOCK -if WITH_LXC +if WITH_LOGIN_SHELL conf_DATA += virt-login-shell.conf bin_PROGRAMS += virt-login-shell -else ! WITH_LXC +else ! WITH_LOGIN_SHELL EXTRA_DIST += virt-login-shell.conf -endif ! WITH_LXC +endif ! WITH_LOGIN_SHELL dist_man1_MANS = \ @@ -84,11 +84,11 @@ dist_man1_MANS = \ virt-pki-validate.1 \ virt-xml-validate.1 \ virsh.1 -if WITH_LXC +if WITH_LOGIN_SHELL dist_man1_MANS += virt-login-shell.1 -else ! WITH_LXC +else ! WITH_LOGIN_SHELL EXTRA_DIST += virt-login-shell.1 -endif ! WITH_LXC +endif ! WITH_LOGIN_SHELL if WITH_SANLOCK dist_man8_MANS = virt-sanlock-cleanup.8 endif WITH_SANLOCK -- 2.1.4

2 1

[libvirt] [PATCH] schema: interleave domain name and uuid with other elements
by Ján Tomko 17 Dec '15

17 Dec '15

Allow <name> and <uuid> anywhere under <domain>, not just at the top: error:XML document failed to validate against schema: Unable to validate doc against /usr/share/libvirt/schemas/domain.rng Expecting an element name, got nothing Invalid sequence in interleave Element domain failed to validate content Introduced with the first RelaxNG schema in commit c642103. https://bugzilla.redhat.com/show_bug.cgi?id=1292131 --- docs/schemas/domaincommon.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 4804c69..01d99f0 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -30,8 +30,8 @@ <define name="domain"> <element name="domain"> <ref name="hvs"/> - <ref name="ids"/> <interleave> + <ref name="ids"/> <optional> <ref name="title"/> </optional> -- 2.4.6

3 3

[libvirt] [PATCH] qemu: Fix event generated for qemuDomainRevertToSnapshot (pause->run)
by John Ferlan 17 Dec '15

17 Dec '15

A closer review of the code shows that for the transition from paused to running which was supposed to emit the VIR_DOMAIN_EVENT_RESUMED - no event would be generated. Rather the event is generated when going from running to running. Following the 'was_running' boolean shows it is set when the domain obj is active and the domain obj state is VIR_DOMAIN_RUNNING. So rather than using was_running to generate the RESUMED event, use !was_running Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I hope I've read the bread crumbs in the code correctly regarding state transitions! Saw this while reviewing something else: http://www.redhat.com/archives/libvir-list/2015-December/msg00330.html src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 783a7cd..deeffc1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15549,7 +15549,7 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, detail); - } else if (was_running) { + } else if (!was_running) { /* Transition 8 */ detail = VIR_DOMAIN_EVENT_RESUMED; event = virDomainEventLifecycleNewFromObj(vm, -- 2.5.0

2 2

[libvirt] [PATCH] storage: Fix startup issue for logical pool
by John Ferlan 17 Dec '15

17 Dec '15

Commit id '71b803ac' assumed that the storage pool source device path was required for a 'logical' pool. This resulted in a failure to start a pool without any device path defined. So, adjust the virStorageBackendLogicalMatchPoolSource logic to return success if at least the pool name matches the vgs output when no pool source device path is/are provided. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_logical.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index c52782f..f59684a 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -541,6 +541,15 @@ virStorageBackendLogicalMatchPoolSource(virStoragePoolObjPtr pool) goto cleanup; } + /* If the pool has defined source device(s), then let's make sure + * they match as well; otherwise, matching can only occur on the + * pool's name. + */ + if (!pool->def->source.ndevice) { + ret = true; + goto cleanup; + } + /* Let's make sure the pool's device(s) match what the pvs output has * for volume group devices. */ -- 2.5.0

2 1

[libvirt] [PATCH v2] storage: Attempt to refresh volume after successful wipe volume
by John Ferlan 17 Dec '15

17 Dec '15

https://bugzilla.redhat.com/show_bug.cgi?id=1270709 When a volume wipe is successful, perform a volume refresh afterwards to update any volume data that may be used in future volume commands, such as volume resize. For a raw file volume, a wipe could truncate the file and a followup volume resize the capacity may fail because the volume target allocation isn't updated to reflect the wipe activity. Since the documentation doesn't mention this side effect of the zero algorithm for a raw file volume, update the various documentation to describe the results. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: http://www.redhat.com/archives/libvir-list/2015-December/msg00085.html Changes since v1: * Use the preferred call format from review * Cause error if refreshVol fails * Add wording to docs regarding zero wipe algorithm and truncating the raw file. src/libvirt-storage.c | 9 +++++++-- src/storage/storage_driver.c | 9 ++++++++- tools/virsh.pod | 5 +++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 66dd9f0..62bb999 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -1725,7 +1725,9 @@ virStorageVolDelete(virStorageVolPtr vol, * @vol: pointer to storage volume * @flags: extra flags; not used yet, so callers should always pass 0 * - * Ensure data previously on a volume is not accessible to future reads + * Ensure data previously on a volume is not accessible to future reads. + * Use of this function is equivalent to calling virStorageVolWipePattern + * with the VIR_STORAGE_VOL_WIPE_ALG_ZERO for the algorithm. * * Returns 0 on success, or -1 on error */ @@ -1766,7 +1768,10 @@ virStorageVolWipe(virStorageVolPtr vol, * @flags: future flags, use 0 for now * * Similar to virStorageVolWipe, but one can choose - * between different wiping algorithms. + * between different wiping algorithms. When choosing the + * zero algorithm (VIR_STORAGE_VOL_WIPE_ALG_ZERO), it is + * possible the target storage backend will truncate the + * file rather than writing a stream of zeroes. * * Returns 0 on success, or -1 on error. */ diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index bbf21f6..2531a88 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2436,7 +2436,14 @@ storageVolWipePattern(virStorageVolPtr obj, goto cleanup; } - ret = backend->wipeVol(obj->conn, pool, vol, algorithm, flags); + if (backend->wipeVol(obj->conn, pool, vol, algorithm, flags) < 0) + goto cleanup; + + if (backend->refreshVol && + backend->refreshVol(obj->conn, pool, vol) < 0) + goto cleanup; + + ret = 0; cleanup: virStoragePoolObjUnlock(pool); diff --git a/tools/virsh.pod b/tools/virsh.pod index 21ae4a3..7f6dc8d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3509,6 +3509,11 @@ B<Supported algorithms> B<Note>: The availability of algorithms may be limited by the version of the C<scrub> binary installed on the host. +B<Note>: Use of the zero algorithm for some storage backends may result +in the truncation of the target file instead of writing all zeroes to the +file. The Storage Driver will refresh the volume allocation and capacity +after successful volume wipe completion. + =item B<vol-dumpxml> [I<--pool> I<pool-or-uuid>] I<vol-name-or-key-or-path> Output the volume information as an XML dump to stdout. -- 2.5.0

4 6

[libvirt] [PATCH 0/5] virStorageBackendWipeLocal cleanups
by Ján Tomko 17 Dec '15

17 Dec '15

The first patch fixes the return values of virStorageWipe on non-sparse local files in the case of a partial wipe or a fdatasync error. The rest reduces the number of parameters of virStorageBackendWipe{Extent,}Local. Ján Tomko (5): storage: fix return values of virStorageBackendWipeExtentLocal storage: move buffer allocation inside virStorageBackendWipeExtentLocal storage: drop 'Extent' from virStorageBackendWipeExtentLocal virStorageBackendWipeLocal: use unsigned long long instead of off_t virStorageBackendWipeLocal: remove bytes_wiped argument src/storage/storage_backend.c | 53 +++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) -- 2.4.6

2 8