- Devel - libvirt List Archives

[libvirt] [PATCH] libxl: add support for specifying clock offset and adjustment
by Jim Fehlig 21 Feb '18

21 Feb '18

libxl supports setting the domain real time clock to local time or UTC via the localtime field of libxl_domain_build_info. Adjustment of the clock is also supported via the rtc_timeoffset field. The libvirt libxl driver has never supported these settings, instead relying on libxl's default of a UTC real time clock with adjustment set to 0. There is at least one user that would like the ability to change the defaults https://www.redhat.com/archives/libvirt-users/2018-February/msg00059.html Add support for specifying a local time clock and for specifying an adjustment for both local time and UTC clocks. Add a test case to verify the XML to libxl_domain_config conversion. Local time clock and clock adjustment is already supported by the XML <-> xl.cfg converter. What is missing is an explicit test for the conversion. There are plenty of existing tests that all use UTC with 0 adjustment. Hijack test-fullvirt-tsc-timer to test a local time clock with 1 hour adjustment. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_conf.c | 35 +++++++-- .../libxlxml2domconfigdata/variable-clock-hvm.json | 91 ++++++++++++++++++++++ .../libxlxml2domconfigdata/variable-clock-hvm.xml | 36 +++++++++ tests/libxlxml2domconfigtest.c | 1 + tests/xlconfigdata/test-fullvirt-tsc-timer.cfg | 4 +- tests/xlconfigdata/test-fullvirt-tsc-timer.xml | 2 +- 6 files changed, 160 insertions(+), 9 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 0c5de344d..39ae709c7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -274,6 +274,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, virCapsPtr caps, libxl_domain_config *d_config) { + virDomainClockDef clock = def->clock; libxl_domain_build_info *b_info = &d_config->b_info; int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM; size_t i; @@ -293,10 +294,32 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, for (i = 0; i < virDomainDefGetVcpus(def); i++) libxl_bitmap_set((&b_info->avail_vcpus), i); - for (i = 0; i < def->clock.ntimers; i++) { - switch ((virDomainTimerNameType) def->clock.timers[i]->name) { + switch (clock.offset) { + case VIR_DOMAIN_CLOCK_OFFSET_VARIABLE: + if (clock.data.variable.basis == VIR_DOMAIN_CLOCK_BASIS_LOCALTIME) + libxl_defbool_set(&b_info->localtime, true); + b_info->rtc_timeoffset = clock.data.variable.adjustment; + break; + + case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: + libxl_defbool_set(&b_info->localtime, true); + break; + + /* Nothing to do since UTC is the default in libxl */ + case VIR_DOMAIN_CLOCK_OFFSET_UTC: + break; + + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported clock offset '%s'"), + virDomainClockOffsetTypeToString(clock.offset)); + return -1; + } + + for (i = 0; i < clock.ntimers; i++) { + switch ((virDomainTimerNameType) clock.timers[i]->name) { case VIR_DOMAIN_TIMER_NAME_TSC: - switch (def->clock.timers[i]->mode) { + switch (clock.timers[i]->mode) { case VIR_DOMAIN_TIMER_MODE_NATIVE: b_info->tsc_mode = LIBXL_TSC_MODE_NATIVE; break; @@ -315,10 +338,10 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, if (!hvm) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported timer type (name) '%s'"), - virDomainTimerNameTypeToString(def->clock.timers[i]->name)); + virDomainTimerNameTypeToString(clock.timers[i]->name)); return -1; } - if (def->clock.timers[i]->present == 1) + if (clock.timers[i]->present == 1) libxl_defbool_set(&b_info->u.hvm.hpet, 1); break; @@ -329,7 +352,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, case VIR_DOMAIN_TIMER_NAME_PIT: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported timer type (name) '%s'"), - virDomainTimerNameTypeToString(def->clock.timers[i]->name)); + virDomainTimerNameTypeToString(clock.timers[i]->name)); return -1; case VIR_DOMAIN_TIMER_NAME_LAST: diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.json b/tests/libxlxml2domconfigdata/variable-clock-hvm.json new file mode 100644 index 000000000..49d0a4330 --- /dev/null +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.json @@ -0,0 +1,91 @@ +{ + "c_info": { + "type": "hvm", + "name": "test-hvm", + "uuid": "2147d599-9cc6-c0dc-92ab-4064b5446e9b" + }, + "b_info": { + "max_vcpus": 4, + "avail_vcpus": [ + 0, + 1, + 2, + 3 + ], + "max_memkb": 1048576, + "target_memkb": 1048576, + "video_memkb": 8192, + "shadow_memkb": 12288, + "rtc_timeoffset": 3600, + "localtime": "True", + "device_model_version": "qemu_xen", + "device_model": "/bin/true", + "sched_params": { + "weight": 1000 + }, + "type.hvm": { + "pae": "True", + "apic": "True", + "acpi": "True", + "vga": { + "kind": "cirrus" + }, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + }, + "spice": { + + }, + "boot": "c", + "rdm": { + + } + }, + "arch_arm": { + + } + }, + "disks": [ + { + "pdev_path": "/var/lib/xen/images/test-hvm.img", + "vdev": "hda", + "backend": "qdisk", + "format": "raw", + "removable": 1, + "readwrite": 1 + } + ], + "nics": [ + { + "devid": 0, + "mac": "00:16:3e:66:12:b4", + "bridge": "br0", + "script": "/etc/xen/scripts/vif-bridge", + "nictype": "vif_ioemu" + } + ], + "vfbs": [ + { + "devid": -1, + "vnc": { + "enable": "True", + "listen": "0.0.0.0", + "findunused": "False" + }, + "sdl": { + "enable": "False" + } + } + ], + "vkbs": [ + { + "devid": -1 + } + ], + "on_reboot": "restart" +} diff --git a/tests/libxlxml2domconfigdata/variable-clock-hvm.xml b/tests/libxlxml2domconfigdata/variable-clock-hvm.xml new file mode 100644 index 000000000..608788779 --- /dev/null +++ b/tests/libxlxml2domconfigdata/variable-clock-hvm.xml @@ -0,0 +1,36 @@ +<domain type='xen'> + <name>test-hvm</name> + <description>None</description> + <uuid>2147d599-9cc6-c0dc-92ab-4064b5446e9b</uuid> + <memory>1048576</memory> + <currentMemory>1048576</currentMemory> + <vcpu>4</vcpu> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <clock offset='localtime' adjustment='3600'/> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='hd'/> + </os> + <features> + <apic/> + <acpi/> + <pae/> + </features> + <devices> + <emulator>/bin/true</emulator> + <disk type='file' device='disk'> + <driver name='qemu'/> + <source file='/var/lib/xen/images/test-hvm.img'/> + <target dev='hda'/> + </disk> + <interface type='bridge'> + <source bridge='br0'/> + <mac address='00:16:3e:66:12:b4'/> + <script path='/etc/xen/scripts/vif-bridge'/> + </interface> + <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0'/> + </devices> +</domain> diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index bd4c3af5a..be3e34944 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -188,6 +188,7 @@ mymain(void) DO_TEST("basic-pv"); DO_TEST("basic-hvm"); + DO_TEST("variable-clock-hvm"); DO_TEST("moredevs-hvm"); DO_TEST("vnuma-hvm"); DO_TEST("multiple-ip"); diff --git a/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg b/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg index 609c0fd5a..587d3461f 100644 --- a/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg +++ b/tests/xlconfigdata/test-fullvirt-tsc-timer.cfg @@ -9,8 +9,8 @@ apic = 1 hap = 0 viridian = 0 tsc_mode = "native" -rtc_timeoffset = 0 -localtime = 0 +rtc_timeoffset = 3600 +localtime = 1 on_poweroff = "destroy" on_reboot = "restart" on_crash = "restart" diff --git a/tests/xlconfigdata/test-fullvirt-tsc-timer.xml b/tests/xlconfigdata/test-fullvirt-tsc-timer.xml index bedbe8e0e..0816f96f3 100644 --- a/tests/xlconfigdata/test-fullvirt-tsc-timer.xml +++ b/tests/xlconfigdata/test-fullvirt-tsc-timer.xml @@ -15,7 +15,7 @@ <pae/> <hap state='off'/> </features> - <clock offset='variable' adjustment='0' basis='utc'> + <clock offset='variable' adjustment='3600' basis='localtime'> <timer name='tsc' present='yes' mode='native'/> </clock> <on_poweroff>destroy</on_poweroff> -- 2.16.1

2 2

[libvirt] [PATCH v2 00/14] Enforce presence of all switch enum cases
by Daniel P. Berrangé 21 Feb '18

21 Feb '18

This is the same as the previous series, but with standardized error reporting macro to get consistent error messages. This is just the first part of the previous series. The second part is much more work to convert to this new error reporting macro, so i'll drip-feed the rest for review over next few days... Daniel P. Berrangé (14): util: add a virReportEnumRangeError for bad value reporting util: handle missing switch enum cases conf: handle missing switch enum cases esx: handle missing switch enum cases hyperv: handle missing switch enum cases libxl: handle missing switch enum cases lxc: handle missing switch enum cases nwfilter: handle missing switch enum cases qemu: handle missing switch enum cases rpc: handle missing switch enum cases security: handle missing switch enum cases xen: handle missing switch enum cases tools: handle missing switch enum cases m4: enforce that all enum cases are listed in switch statements m4/virt-compile-warnings.m4 | 7 +++-- src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 46 +++++++++++++++++++++++++++---- src/conf/nwfilter_conf.c | 31 ++++++++++++++++++++- src/conf/nwfilter_conf.h | 4 +-- src/esx/esx_driver.c | 1 + src/esx/esx_vi.c | 11 +++++--- src/esx/esx_vi_types.c | 9 +++--- src/hyperv/hyperv_driver.c | 18 ++++++++++-- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_container.c | 8 +++--- src/lxc/lxc_controller.c | 8 +++++- src/lxc/lxc_driver.c | 38 ++++++++++++++++++++++--- src/nwfilter/nwfilter_ebiptables_driver.c | 17 ++++++++---- src/nwfilter/nwfilter_learnipaddr.c | 6 +++- src/qemu/qemu_command.c | 26 +++++++++++------ src/qemu/qemu_domain.c | 21 ++++++++++++++ src/qemu/qemu_driver.c | 25 +++++++++++------ src/qemu/qemu_hotplug.c | 33 ++++++++++++++++++---- src/qemu/qemu_migration.c | 11 +++++++- src/qemu/qemu_process.c | 2 ++ src/rpc/virnetclient.c | 2 ++ src/rpc/virnetclientprogram.c | 1 + src/rpc/virnetserverprogram.c | 4 +++ src/security/security_driver.c | 1 + src/util/virconf.c | 11 +++++++- src/util/virerror.h | 9 +++++- src/util/virfirewall.c | 6 ++-- src/util/virlog.c | 9 +++++- src/util/virnetdevvportprofile.c | 10 ++++++- src/vmx/vmx.c | 26 +++++++++++++++-- src/xenconfig/xen_common.c | 18 ++++++++++-- src/xenconfig/xen_xl.c | 7 ++++- tools/virt-host-validate-qemu.c | 3 +- 34 files changed, 359 insertions(+), 73 deletions(-) -- 2.14.3

3 35

[libvirt] [PATCH v2 0/2] Support network stats for hostdev(SR-IOV) in Switchdev mode
by Jai Singh Rana 21 Feb '18

21 Feb '18

With availability of switchdev model in linux, it is possible to capture stats for hostdev SR-IOV VFs using its VF representor interface name on host for nics supporting switchdev model. These stats are supported by adding helper APIs for getting VF Representor name based on BDF info in 'hostdev' and querying required net sysfs entries on host. These helper APIs are then used in qemu_driver to get the hostdev interface stats for pci SR-IOV device. [1] https://www.kernel.org/doc/Documentation/networking/switchdev.txt Jai Singh Rana (2): util: Add helper APIs to get/verify VF Representor name qemu: conf: Network stats support for hostdev VF Representor po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 7 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_driver.c | 34 ++++++- src/util/virhostdev.c | 11 +++ src/util/virhostdev.h | 6 ++ src/util/virnetdevhostdev.c | 224 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevhostdev.h | 33 +++++++ 9 files changed, 318 insertions(+), 4 deletions(-) create mode 100644 src/util/virnetdevhostdev.c create mode 100644 src/util/virnetdevhostdev.h -- 2.13.6

2 6

[libvirt] [PATCH] Add Marcin Juszkiewicz to Planet Virt-Tools
by Marcin Juszkiewicz 21 Feb '18

21 Feb '18

Signed-off-by: Marcin Juszkiewicz <marcin(a)juszkiewicz.com.pl> --- updater/virt-tools/config.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/updater/virt-tools/config.ini b/updater/virt-tools/config.ini index d47e82f..a56d3b7 100644 --- a/updater/virt-tools/config.ini +++ b/updater/virt-tools/config.ini @@ -173,3 +173,6 @@ name = Eduardo Otubo face = otubo.png facewidth = 80 faceheight = 80 + +[https://marcin.juszkiewicz.com.pl/tag/virtualization/feed/] +name = Marcin Juszkiewicz -- 2.14.3

2 1

[libvirt] [PATCH glib] m4: disable gcc8 -Wcast-function-type warnings from -Wextra
by Daniel P. Berrangé 20 Feb '18

20 Feb '18

The -Wextra flag bundle gained a new warning -Wcast-function-type. This complains if you cast between two function prototypes where the number of parameters or their data types are not compatible. Unfortunately we need such "bad" function casts for our event callbacks. It is possible to silence the warning by first casting to the generic "void (*)(void)" function prototype, but that is rather ugly to add throughout libvirt code. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix m4/virt-compile-warnings.m4 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index 0cf67fa..cbd9e0c 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -151,6 +151,9 @@ AC_DEFUN([LIBVIRT_GLIB_COMPILE_WARNINGS],[ # that one off, so we need to manually enable this again wantwarn="$wantwarn -Wjump-misses-init" + # We do "bad" function casts all the time for event callbacks + wantwarn="$wantwarn -Wno-cast-function-type" + # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral, # so we need to manually re-exclude it. Also, older gcc 4.2 # added an implied ATTRIBUTE_NONNULL on any parameter marked -- 2.14.3

1 0

[libvirt] [PATCH v2 00/42] Fix build with gcc8 and switch() robustness
by Daniel P. Berrangé 20 Feb '18

20 Feb '18

This started off as a simple fix to deal with gcc8. After shearing a few hundred yaks, it is a now a 42 patch series :-) The crux of the issue is/was that gcc8 reports various problems wrt fallthrough for some switch statements. These were indeed bugs in libvirt which the first patch fixes. What this highlighted, however, was that relying on only listing valid enum constant names in switch case statements is unsafe. Nothing at all prevents you from assigning an invalid integer value to a variable that is treated as an enum. Thus to be safe we should have a default: for every switch. Adding this causes us to loose the warnings about missing enum constants though, so we must turn on -Wswitch-enum. To turn that on though, we need to fix up various switch() statements that missed enum values but had a default. After going to all that trouble it then adds the default: to all remaining switches. In doing this I found a reasonable number of bugs, where we would call virXXXXXToString() methods with a _LAST constant - this is not right as the _LAST constant can't be converted to a string as it is a sentinal value only. So these were all fixed along the way. At the same time various switches were improved such that the value being switched on was cast to an enum type, to let the compiler report missing enum cases. A big cleanup but the code should be more robust against future mistakes like the one fixed in patch 01. There's a lot of patches here, but they're mostly independant of each other so we can push them incrementally as they're reviewed, so don't feel a need to review everything in one go ! Daniel P. Berrangé (42): conf: add enum constants for default controller models util: handle missing switch enum cases conf: handle missing switch enum cases esx: handle missing switch enum cases hyperv: handle missing switch enum cases libxl: handle missing switch enum cases lxc: handle missing switch enum cases nwfilter: handle missing switch enum cases qemu: handle missing switch enum cases rpc: handle missing switch enum cases security: handle missing switch enum cases xen: handle missing switch enum cases tools: handle missing switch enum cases m4: enforce that all enum cases are listed in switch statements m4: disable gcc8 -Wcast-function-type warnings from -Wextra util: add default: case to all switch statements conf: add default: case to all switch statements cpu: add default: case to all switch statements secret: add default: case to all switch statements xen: add default: case to all switch statements locking: add default: case to all switch statements test: add default: case to all switch statements remote: add default: case to all switch statements openvz: add default: case to all switch statements security: add default: case to all switch statements rpc: add default: case to all switch statements vbox: add default: case to all switch statements libxl: add default: case to all switch statements qemu: add default: case to all switch statements lxc: add default: case to all switch statements uml: add default: case to all switch statements bhyve: add default: case to all switch statements network: add default: case to all switch statements interface: add default: case to all switch statements storage: add default: case to all switch statements nodedev: add default: case to all switch statements nwfilter: add default: case to all switch statements daemon: add default: case to all switch statements tests: add default: case to all switch statements tools: add default: case to all switch statements examples: add default: case to all switch statements m4: enable the -Wswitch-default warning flag daemon/libvirtd.c | 4 +- daemon/remote.c | 4 + examples/object-events/event-test.c | 24 ++ m4/virt-compile-warnings.m4 | 11 +- po/POTFILES.in | 1 + src/bhyve/bhyve_command.c | 12 +- src/conf/device_conf.c | 4 +- src/conf/domain_addr.c | 15 +- src/conf/domain_audit.c | 5 + src/conf/domain_conf.c | 514 ++++++++++++++++++++++++------ src/conf/domain_conf.h | 4 + src/conf/domain_event.c | 1 + src/conf/interface_conf.c | 21 +- src/conf/netdev_bandwidth_conf.h | 4 +- src/conf/network_conf.c | 8 +- src/conf/network_event.c | 1 + src/conf/node_device_conf.c | 27 +- src/conf/node_device_event.c | 1 + src/conf/nwfilter_conf.c | 33 +- src/conf/nwfilter_params.c | 14 + src/conf/secret_event.c | 1 + src/conf/storage_event.c | 1 + src/conf/virnodedeviceobj.c | 1 + src/conf/virstorageobj.c | 1 + src/cpu/cpu.c | 6 +- src/cpu/cpu_ppc64.c | 16 +- src/cpu/cpu_x86.c | 13 +- src/esx/esx_driver.c | 1 + src/esx/esx_vi.c | 11 +- src/esx/esx_vi_types.c | 9 +- src/hyperv/hyperv_driver.c | 18 +- src/interface/interface_backend_udev.c | 12 +- src/libvirt.c | 3 + src/libvirt_private.syms | 6 + src/libxl/libxl_conf.c | 57 +++- src/libxl/libxl_domain.c | 23 +- src/libxl/libxl_driver.c | 16 +- src/libxl/libxl_logger.c | 2 + src/locking/lock_driver_sanlock.c | 6 +- src/locking/lock_manager.c | 2 + src/locking/sanlock_helper.c | 5 +- src/lxc/lxc_container.c | 7 +- src/lxc/lxc_controller.c | 11 +- src/lxc/lxc_driver.c | 42 ++- src/lxc/lxc_process.c | 10 +- src/network/bridge_driver.c | 46 ++- src/network/leaseshelper.c | 11 +- src/node_device/node_device_udev.c | 7 +- src/nwfilter/nwfilter_ebiptables_driver.c | 18 +- src/nwfilter/nwfilter_gentech_driver.c | 23 +- src/nwfilter/nwfilter_learnipaddr.c | 19 +- src/openvz/openvz_driver.c | 3 + src/qemu/qemu_alias.c | 3 + src/qemu/qemu_block.c | 22 +- src/qemu/qemu_blockjob.c | 1 + src/qemu/qemu_capabilities.c | 23 +- src/qemu/qemu_cgroup.c | 9 +- src/qemu/qemu_command.c | 440 ++++++++++++++++++++----- src/qemu/qemu_domain.c | 228 ++++++++++--- src/qemu/qemu_domain_address.c | 68 +++- src/qemu/qemu_driver.c | 136 ++++++-- src/qemu/qemu_hostdev.c | 5 +- src/qemu/qemu_hotplug.c | 94 +++++- src/qemu/qemu_interface.c | 12 +- src/qemu/qemu_migration.c | 35 +- src/qemu/qemu_migration_cookie.c | 6 +- src/qemu/qemu_monitor.c | 13 +- src/qemu/qemu_monitor_json.c | 67 +++- src/qemu/qemu_monitor_text.c | 3 + src/qemu/qemu_parse_command.c | 12 +- src/qemu/qemu_process.c | 110 ++++++- src/remote/remote_driver.c | 19 +- src/rpc/virnetclient.c | 2 + src/rpc/virnetclientprogram.c | 1 + src/rpc/virnetlibsshsession.c | 4 + src/rpc/virnetservermdns.c | 5 +- src/rpc/virnetserverprogram.c | 4 + src/rpc/virnetsshsession.c | 8 + src/secret/secret_util.c | 11 +- src/security/security_apparmor.c | 12 +- src/security/security_dac.c | 59 +++- src/security/security_driver.c | 1 + src/security/security_selinux.c | 69 +++- src/storage/storage_backend_gluster.c | 12 +- src/storage/storage_backend_rbd.c | 6 +- src/storage/storage_driver.c | 1 + src/storage/storage_util.c | 18 +- src/test/test_driver.c | 2 + src/uml/uml_conf.c | 5 +- src/util/vircgroup.c | 1 + src/util/virconf.c | 13 +- src/util/vircrypto.c | 2 + src/util/virerror.c | 6 +- src/util/virfdstream.c | 4 + src/util/virfirewall.c | 8 +- src/util/virhook.c | 12 +- src/util/virhostdev.c | 8 +- src/util/virhostmem.c | 5 + src/util/virjson.c | 5 + src/util/virlog.c | 17 +- src/util/virnetdev.c | 1 + src/util/virnetdevmacvlan.c | 3 + src/util/virnetdevvportprofile.c | 54 +++- src/util/virnuma.c | 5 +- src/util/virprocess.c | 1 + src/util/virqemu.c | 5 + src/util/virsexpr.c | 2 + src/util/virsocketaddr.c | 13 +- src/util/virstoragefile.c | 15 +- src/vbox/vbox_common.c | 42 ++- src/vmx/vmx.c | 27 +- src/xen/xen_driver.c | 17 +- src/xenconfig/xen_common.c | 23 +- src/xenconfig/xen_sxpr.c | 47 ++- src/xenconfig/xen_xl.c | 28 +- tests/cputest.c | 31 +- tests/domaincapstest.c | 1 + tests/qemuhotplugtest.c | 4 + tests/storagevolxml2argvtest.c | 2 + tests/virusbtest.c | 6 + tools/virsh-domain-monitor.c | 4 + tools/virsh-domain.c | 14 +- tools/virsh-nodedev.c | 1 + tools/virsh-pool.c | 1 + tools/virsh.c | 1 + tools/virt-admin.c | 1 + tools/virt-host-validate-qemu.c | 3 +- tools/vsh.c | 5 + 128 files changed, 2567 insertions(+), 512 deletions(-) -- 2.14.3

4 71

[libvirt] [PATCH] Fix build with GCC 8 new switch fallthrough warnings
by Daniel P. Berrangé 20 Feb '18

20 Feb '18

GCC 8 became more fussy about detecting switch fallthroughs. First it doesn't like it if you have a fallthrough attribute that is not before a case statement. e.g. FOO: BAR: WIZZ: ATTRIBUTE_FALLTHROUGH; Is unacceptable as there's no final case statement, so while FOO & BAR are falling through, WIZZ is not falling through. IOW, GCC wants us to write FOO: BAR: ATTRIBUTE_FALLTHROUGH; WIZZ: Second, it will report risk of fallthrough even if you have a case statement for every single enum value, but only if the switch is nested inside another switch and the outer case statement has no final break. This is is arguably valid because despite the fact that we have cast from "int" to the enum typedef, nothing guarantees that the variable we're switching on only contains values that have corresponding switch labels. e.g. int domstate = 87539319; switch ((virDomainState)domstate) { ... } will not match enum value, but also not raise any kind of compiler warning. So it is right to complain about risk of fallthrough if no default: is present. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a minimal build-fix for Fedora rawhide, since the bigger switch cleanup series is taking a while to get ready for merge. src/qemu/qemu_domain.c | 6 ++++-- src/qemu/qemu_domain_address.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 593b9d0fb5..b1308e5a49 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -173,8 +173,9 @@ qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, case QEMU_ASYNC_JOB_SNAPSHOT: case QEMU_ASYNC_JOB_START: case QEMU_ASYNC_JOB_NONE: - case QEMU_ASYNC_JOB_LAST: ATTRIBUTE_FALLTHROUGH; + case QEMU_ASYNC_JOB_LAST: + break; } return "none"; @@ -197,8 +198,9 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, case QEMU_ASYNC_JOB_SNAPSHOT: case QEMU_ASYNC_JOB_START: case QEMU_ASYNC_JOB_NONE: - case QEMU_ASYNC_JOB_LAST: ATTRIBUTE_FALLTHROUGH; + case QEMU_ASYNC_JOB_LAST: + break; } if (STREQ(phase, "none")) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index dd3e703ca5..001c84a906 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -543,6 +543,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST: return 0; } + break; case VIR_DOMAIN_CONTROLLER_TYPE_IDE: return pciFlags; @@ -567,6 +568,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: return 0; } + break; case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: return virtioFlags; @@ -619,6 +621,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_SOUND_MODEL_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_DISK: switch ((virDomainDiskBus) dev->data.disk->bus) { @@ -636,6 +639,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_DISK_BUS_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_HOSTDEV: { virDomainHostdevDefPtr hostdev = dev->data.hostdev; @@ -748,6 +752,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_RNG: switch ((virDomainRNGModel) dev->data.rng->model) { @@ -757,6 +762,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_RNG_MODEL_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_WATCHDOG: /* only one model connects using PCI */ @@ -769,6 +775,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_WATCHDOG_MODEL_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_VIDEO: switch ((virDomainVideoType) dev->data.video->type) { @@ -789,6 +796,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_VIDEO_TYPE_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_SHMEM: return pciFlags; @@ -805,6 +813,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_INPUT_BUS_LAST: return 0; } + break; case VIR_DOMAIN_DEVICE_CHR: switch ((virDomainChrSerialTargetType) dev->data.chr->targetType) { @@ -820,6 +829,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: return 0; } + break; /* These devices don't ever connect with PCI */ case VIR_DOMAIN_DEVICE_NVRAM: -- 2.14.3

1 0

[libvirt] [PATCH v2] conf: add enum constants for default controller models
by Daniel P. Berrangé 20 Feb '18

20 Feb '18

The controller model is slightly unusual in that the default value is -1, not 0. As a result the default value is not covered by any of the existing enum cases. This in turn means that any switch() statements that think they have covered all cases, will in fact not match the default value at all. In the qemuDomainDeviceCalculatePCIConnectFlags() method this has caused a serious mistake where we fallthrough from the SCSI controller case, to the VirtioSerial controller case, and from the USB controller case to the IDE controller case. By adding explicit enum constant starting at -1, we can ensure switches remember to handle the default case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_addr.c | 6 +++--- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 4 ++++ src/libxl/libxl_conf.c | 2 +- src/qemu/qemu_command.c | 21 ++++++++++++++++----- src/qemu/qemu_domain.c | 14 +++++++++++--- src/qemu/qemu_domain_address.c | 19 +++++++++++++++++-- src/qemu/qemu_hotplug.c | 2 +- src/vbox/vbox_common.c | 13 +++++++++---- src/vmx/vmx.c | 2 +- 10 files changed, 65 insertions(+), 21 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 6422682391..4f969adc00 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -39,6 +39,7 @@ virDomainPCIControllerModelToConnectType(virDomainControllerModelPCI model) * the equivalent VIR_PCI_CONNECT_TYPE_*. */ switch (model) { + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: @@ -344,6 +345,7 @@ virDomainPCIAddressBusSetModel(virDomainPCIAddressBusPtr bus, bus->maxSlot = VIR_PCI_ADDRESS_SLOT_LAST; break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("PCI controller model was not set correctly")); @@ -1710,10 +1712,8 @@ virDomainUSBAddressControllerModelToPorts(virDomainControllerDefPtr cont) { int model = cont->model; - if (model == -1) - model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; - switch ((virDomainControllerModelUSB) model) { + case VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI: case VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX4_UHCI: case VIR_DOMAIN_CONTROLLER_MODEL_USB_VT82C686B_UHCI: diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 970efbb13c..28e4f6f681 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4999,7 +4999,7 @@ virDomainDefPostParseCommon(virDomainDefPtr def, * been added in AddImplicitDevices, after we've done the per-device * post-parse. */ for (i = 0; i < def->ncontrollers; i++) { - if (def->controllers[i]->model == -1 && + if (def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT && def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) { virDomainDeviceDef device = { .type = VIR_DOMAIN_DEVICE_CONTROLLER, @@ -10197,6 +10197,7 @@ virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: /* Other controller models don't require extra checks */ break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 117efb1d1d..2350926e5b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -685,6 +685,7 @@ typedef enum { typedef enum { + VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT = -1, VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT, VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT, VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE, @@ -714,6 +715,7 @@ typedef enum { } virDomainControllerPCIModelName; typedef enum { + VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT = -1, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC, VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC, @@ -727,6 +729,7 @@ typedef enum { } virDomainControllerModelSCSI; typedef enum { + VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT = -1, VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI, VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX4_UHCI, VIR_DOMAIN_CONTROLLER_MODEL_USB_EHCI, @@ -746,6 +749,7 @@ typedef enum { } virDomainControllerModelUSB; typedef enum { + VIR_DOMAIN_CONTROLLER_MODEL_IDE_DEFAULT = -1, VIR_DOMAIN_CONTROLLER_MODEL_IDE_PIIX3, VIR_DOMAIN_CONTROLLER_MODEL_IDE_PIIX4, VIR_DOMAIN_CONTROLLER_MODEL_IDE_ICH6, diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 970cff205b..0c5de344de 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1894,7 +1894,7 @@ libxlMakeUSBController(virDomainControllerDefPtr controller, if (controller->type != VIR_DOMAIN_CONTROLLER_TYPE_USB) return -1; - if (controller->model == -1) { + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { usbctrl->version = 2; usbctrl->type = LIBXL_USBCTRL_TYPE_QUSB; } else { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0c6a6cbd15..f8526a6454 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2555,7 +2555,7 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, model = def->model; - if (model == -1) { + if (model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("no model provided for USB controller")); return -1; @@ -2671,10 +2671,16 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(def->model)); + goto error; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected SCSI controller model %d"), + def->model); + goto error; } virBufferAsprintf(&buf, ",id=%s", def->info.alias); break; @@ -2771,9 +2777,14 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, virBufferAsprintf(&buf, ",numa_node=%d", pciopts->numaNode); break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unsupported PCI Express root controller")); + goto error; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("wrong function called")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected PCI controller model %d"), + def->model); goto error; } break; @@ -2905,7 +2916,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, } if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && - cont->model == -1 && + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && !qemuDomainIsQ35(def) && !qemuDomainIsVirt(def)) { diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5d0a18343e..593b9d0fb5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4139,11 +4139,16 @@ qemuDomainCheckSCSIControllerModel(virQEMUCapsPtr qemuCaps, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_AUTO: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_BUSLOGIC: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller model: %s"), virDomainControllerModelSCSITypeToString(model)); return false; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected SCSI controller model %d"), + model); + return false; } return true; @@ -4230,6 +4235,7 @@ qemuDomainDeviceDefValidateControllerSCSI(const virDomainControllerDef *controll case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VMPVSCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: break; } @@ -4277,6 +4283,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; } @@ -4509,6 +4516,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: break; } @@ -4861,7 +4869,7 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, break; case VIR_DOMAIN_CONTROLLER_TYPE_USB: - if (cont->model == -1 && qemuCaps) { + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT && qemuCaps) { /* Pick a suitable default model for the USB controller if none * has been selected by the user and we have the qemuCaps for * figuring out which contollers are supported. @@ -5879,7 +5887,7 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, */ if (ARCH_IS_X86(def->os.arch) && qemuDomainIsI440FX(def) && usb && usb->idx == 0 && - (usb->model == -1 || + (usb->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT || usb->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI)) { VIR_DEBUG("Removing default USB controller from domain '%s'" " for migration compatibility", def->name); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index e28119e4b1..dd3e703ca5 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -513,6 +513,15 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_TYPE_USB: switch ((virDomainControllerModelUSB) cont->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT: + /* qemuDomainControllerDefPostParse should have + * changed 'model' to an explicit USB model in + * most cases. Since we're still on the default + * though, we must be going to use "-usb", which + * is assumed to be a PCI default + */ + return pciFlags; + case VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI: case VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI: return pcieFlags; @@ -540,6 +549,9 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: switch ((virDomainControllerModelSCSI) cont->model) { + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + return 0; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: return virtioFlags; @@ -1275,7 +1287,8 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, addr->function == 1) || (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->idx == 0 && (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI || - cont->model == -1) && addr->function == 2)) { + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT) && + addr->function == 2)) { /* Note the check for nbuses > 0 - if there are no PCI * buses, we skip this check. This is a quirk required for * some machinetypes such as s390, which pretend to have a @@ -1435,7 +1448,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def, } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->idx == 0 && (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI || - cont->model == -1)) { + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_DEFAULT)) { if (virDeviceInfoPCIAddressPresent(&cont->info)) { if (cont->info.addr.pci.domain != 0 || cont->info.addr.pci.bus != 0 || @@ -2165,6 +2178,7 @@ qemuDomainPCIControllerSetDefaultModelName(virDomainControllerDefPtr cont, *modelName = VIR_DOMAIN_CONTROLLER_PCI_MODEL_NAME_SPAPR_PCI_HOST_BRIDGE; break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; } @@ -2552,6 +2566,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3c87d73745..04f4f689a9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -612,7 +612,7 @@ qemuDomainFindOrCreateSCSIDiskController(virQEMUDriverPtr driver, return NULL; cont->type = VIR_DOMAIN_CONTROLLER_TYPE_SCSI; cont->idx = controller; - if (model == -1) + if (model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT) cont->model = qemuDomainGetSCSIControllerModel(vm->def, cont, priv->qemuCaps); else cont->model = model; diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index aed14f02d7..07f4308784 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -410,12 +410,17 @@ vboxSetStorageController(virDomainControllerDefPtr controller, case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The vbox driver does not support %s SCSI " "controller model"), virDomainControllerModelSCSITypeToString(controller->model)); goto cleanup; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected SCSI controller model %d"), + controller->model); + goto cleanup; } /* libvirt ide model => vbox ide model */ } else if (controller->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE) { @@ -433,10 +438,10 @@ vboxSetStorageController(virDomainControllerDefPtr controller, break; case VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST: + case VIR_DOMAIN_CONTROLLER_MODEL_IDE_DEFAULT: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The vbox driver does not support %s IDE " - "controller model"), - virDomainControllerModelIDETypeToString(controller->model)); + _("Unexpected IDE controller model %d"), + controller->model); goto cleanup; } } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 7a749f93ab..1d13ab03db 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1169,7 +1169,7 @@ virVMXHandleLegacySCSIDiskDriverName(virDomainDefPtr def, return -1; } - if (controller->model == -1) { + if (controller->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT) { controller->model = model; } else if (controller->model != model) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.14.3

3 2

[libvirt] [PATCH v2 00/15] qemu: Validate PCI controller options
by Andrea Bolognani 20 Feb '18

20 Feb '18

Changes from [v1]: * error out instead of silently accept invalid options; * shave quite a lot of yaks. [v1] https://www.redhat.com/archives/libvir-list/2018-February/msg00244.html Andrea Bolognani (15): tests: Add some tests for PCI controller options qemu: Move 'done' label in qemuBuildControllerDevStr() qemu: Move skip for implicit PHB of pSeries guests qemu: Restrict scope in qemuBuildControllerDevStr() qemu: Simplify modelName stringification qemu: Defer capability check to command line generation time qemu: Clear out qemuDomainDeviceDefValidateControllerPCI() qemu: Validate PCI controllers (index) qemu: Validate PCI controllers (modelName) qemu: Validate PCI controllers (targetIndex) qemu: Validate PCI controllers (pcihole64) qemu: Validate PCI controllers (busNr) qemu: Validate PCI controllers (numaNode) qemu: Validate PCI controllers (chassisNr) qemu: Validate PCI controllers (chassis and port) src/qemu/qemu_command.c | 80 +++- src/qemu/qemu_domain.c | 425 +++++++++++++-------- .../i440fx-controllers-pciopts.xml | 36 ++ tests/qemuxml2argvdata/pcie-expander-bus.xml | 3 - .../pseries-controllers-pciopts.xml | 35 ++ tests/qemuxml2argvdata/q35-controllers-pciopts.xml | 60 +++ tests/qemuxml2argvtest.c | 4 + tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 4 +- 8 files changed, 475 insertions(+), 172 deletions(-) create mode 100644 tests/qemuxml2argvdata/i440fx-controllers-pciopts.xml create mode 100644 tests/qemuxml2argvdata/pseries-controllers-pciopts.xml create mode 100644 tests/qemuxml2argvdata/q35-controllers-pciopts.xml -- 2.14.3

4 38

[libvirt] [PATCH 0/2] Couple of small fixes
by Michal Privoznik 20 Feb '18

20 Feb '18

These came to existence as I'm walking through code working on PR stuff (as in Persistent Reservations, not Public Relations). The fist patch is a bug fix, the second is an improvement. Michal Privoznik (2): virDomainDiskSourceFormatInternal: Avoid leaking @childBuf storage_conf: Make virStorageAuthDefFormat return void src/conf/domain_conf.c | 22 ++++++++-------------- src/conf/storage_conf.c | 6 ++---- src/util/virstoragefile.c | 4 +--- src/util/virstoragefile.h | 2 +- 4 files changed, 12 insertions(+), 22 deletions(-) -- 2.16.1

2 4

[libvirt] [tck Patch] Require perl(IO::Pty)
by Laine Stump 20 Feb '18

20 Feb '18

The Net::OpenSSH module requires IO::Pty if password authentication will be used, but The Fedora Net::OpenSSH maintainers don't want to put anything stronger that "Suggests: perl(IO::Pty)" in their specfile, which unfortunately does absolutely nothing. (see https://bugzilla.redhat.com/show_bug.cgi?id=1542666 ). The alternate solution is for perl-Sys-Virt-TCK.spec to require perl(IO::Pty), and that's what this patch does. Signed-off-by: Laine Stump <laine(a)laine.org> --- perl-Sys-Virt-TCK.spec.PL | 1 + 1 file changed, 1 insertion(+) diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index 1534854..7c83be9 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -74,6 +74,7 @@ Requires: perl(TAP::Formatter::HTML) Requires: perl(TAP::Formatter::JUnit) Requires: perl(TAP::Harness::Archive) Requires: perl(Net::OpenSSH) +Requires: perl(IO::Pty) Requires: /usr/bin/mkisofs BuildArchitectures: noarch -- 2.14.3

2 1

[libvirt] [PATCH] nwfilter: assure that virNWFilterSnoop(Eth|Dhcp)Hdr objects don't change size
by Laine Stump 20 Feb '18

20 Feb '18

These two objects are used to access fields in actual ethernet packets captures with libpcap, so it's essential that they don't change size for any reason. This patch uses gnulib's verify() macro to make sure their sizes don't change. Signed-off-by: Laine Stump <laine(a)laine.org> --- danpb suggested doing this in his response to my patch fixing virMacAddr: https://www.redhat.com/archives/libvir-list/2018-February/msg00850.html I decided to make it a separate patch from the virMacAddr fix. src/nwfilter/nwfilter_dhcpsnoop.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 743136277d..8e955150fa 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -195,6 +195,7 @@ struct _virNWFilterSnoopEthHdr { uint16_t eh_type; uint8_t eh_data[]; } ATTRIBUTE_PACKED; +verify(sizeof(struct _virNWFilterSnoopEthHdr) == 14); typedef struct _virNWFilterSnoopDHCPHdr virNWFilterSnoopDHCPHdr; typedef virNWFilterSnoopDHCPHdr *virNWFilterSnoopDHCPHdrPtr; @@ -216,6 +217,7 @@ struct _virNWFilterSnoopDHCPHdr { char d_file[128]; uint8_t d_opts[]; } ATTRIBUTE_PACKED; +verify(sizeof(struct _virNWFilterSnoopDHCPHdr) == 236); /* DHCP options */ -- 2.14.3

2 1

[libvirt] [PATCH v2 00/10] Cleanups in QEMU driver wrt virConnectPtr
by Daniel P. Berrangé 20 Feb '18

20 Feb '18

There are many places we can stop passing around virConnectPtr now and directly open secondary drivers where required instead. v2: - Now with working tests ! Daniel P. Berrangé (10): driver: allow override of connection for secondary drivers conf: reimplement virDomainNetResolveActualType in terms of public API qemu: stop passing virConnectPtr into qemuMonitorStartCPUs conf: stop passing virConnectPtr into virDomainDiskTranslateSourcePool qemu: don't pass virConnectPtr around for secrets qemu: stop passing in virConnectPtr for looking up networks qemu: remove virConnectPtr from some more startup code paths qemu: remove virConnectPtr in some migration methods qemu: don't export migration job APIs qemu: rename migration APIs to include Src or Dst in their name src/conf/domain_conf.c | 90 +++++++- src/conf/domain_conf.h | 14 +- src/driver.c | 172 +++++++++++++- src/driver.h | 7 + src/libvirt_private.syms | 6 + src/network/bridge_driver.c | 76 +------ src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_conf.h | 3 +- src/qemu/qemu_domain.c | 111 +++++---- src/qemu/qemu_domain.h | 15 +- src/qemu/qemu_driver.c | 278 ++++++++++------------- src/qemu/qemu_hotplug.c | 66 +++--- src/qemu/qemu_hotplug.h | 15 +- src/qemu/qemu_migration.c | 526 +++++++++++++++++++++++-------------------- src/qemu/qemu_migration.h | 192 +++++++--------- src/qemu/qemu_monitor.c | 10 +- src/qemu/qemu_monitor.h | 11 +- src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_monitor_text.c | 9 +- src/qemu/qemu_monitor_text.h | 3 +- src/qemu/qemu_process.c | 134 +++++------ src/qemu/qemu_process.h | 12 +- tests/Makefile.am | 7 +- tests/qemuhotplugtest.c | 4 +- tests/qemumonitorjsontest.c | 2 +- tests/qemuxml2argvtest.c | 7 +- 27 files changed, 907 insertions(+), 872 deletions(-) -- 2.14.3

5 21

[libvirt] [PATCH] daemon: trigger RPC re-generation when Makefile.am changes
by Daniel P. Berrangé 20 Feb '18

20 Feb '18

The src/Makefile.am rules all re-generate the RPC dispatch code whenever the Makefile.am changes, so for consistency do that for daemon/Makefile.am too. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- daemon/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 77dfd8943a..42d8f7b3fd 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -92,19 +92,19 @@ QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x ADMIN_PROTOCOL = $(top_srcdir)/src/admin/admin_protocol.x remote_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ - $(REMOTE_PROTOCOL) + $(REMOTE_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server remote REMOTE $(REMOTE_PROTOCOL) \ > $(srcdir)/remote_dispatch.h lxc_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ - $(LXC_PROTOCOL) + $(LXC_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server lxc LXC $(LXC_PROTOCOL) \ > $(srcdir)/lxc_dispatch.h qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \ - $(QEMU_PROTOCOL) + $(QEMU_PROTOCOL) Makefile.am $(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \ --mode=server qemu QEMU $(QEMU_PROTOCOL) \ > $(srcdir)/qemu_dispatch.h -- 2.14.3

2 1

[libvirt] [PATCH] tests: fix bhyve build
by Laine Stump 20 Feb '18

20 Feb '18

This file was modified in an editor buffer but not saved prior to commit e62cb4a9b78 (which removed virMacAddr::generated), so the bhyve build would fail. Signed-off-by: Laine Stump <laine(a)laine.org> --- Pushed under the build breaker rule. tests/bhyvexml2argvmock.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index bec7f902aa..7afa0e34c4 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -17,7 +17,6 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], addr->addr[3] = 0; addr->addr[4] = 0; addr->addr[5] = 0; - addr->generated = true; } int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, -- 2.14.3

1 0

[libvirt] [PATCH] docs: Document pcie-root requirement for q35 guests
by Andrea Bolognani 19 Feb '18

19 Feb '18

When you add a bunch of pcie-root-port controllers to a q35 guest in order to have hotplug capabilities, you also need to make sure you're adding the pcie-root controller at the same time or you will get an error. Document this fact. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- docs/pci-hotplug.html.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/pci-hotplug.html.in b/docs/pci-hotplug.html.in index 6e0648ee2..4ac87d644 100644 --- a/docs/pci-hotplug.html.in +++ b/docs/pci-hotplug.html.in @@ -72,6 +72,7 @@ <pre> +<controller type='pci' model='pcie-root'/> <controller type='pci' model='pcie-root-port'/> <controller type='pci' model='pcie-root-port'/> <controller type='pci' model='pcie-root-port'/></pre> @@ -80,7 +81,10 @@ if you expect to hotplug up to three PCI Express devices, either emulated or assigned from the host. That's all the information you need to provide: libvirt will fill in the - remaining details automatically. + remaining details automatically. Note that you need to add + the <code>pcie-root</code> controller along with the + <code>pcie-root-port</code> controllers or you will get an + error. Note that if you're adding PCI controllers to a guest and at -- 2.14.3

2 1

[libvirt] [PATCH] docs: Fix indentation of inlined JavaScript snippet
by Andrea Bolognani 19 Feb '18

19 Feb '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. docs/page.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/page.xsl b/docs/page.xsl index 3a64a06c5..c1804eab3 100644 --- a/docs/page.xsl +++ b/docs/page.xsl @@ -103,7 +103,7 @@ <xsl:comment> <![CDATA[ function init() { - window.addEventListener('scroll', function(e){ + window.addEventListener('scroll', function(e){ var distanceY = window.pageYOffset || document.documentElement.scrollTop, shrinkOn = 94 home = document.getElementById("home"); @@ -125,7 +125,7 @@ search.className = "" } } - }); + }); } window.onload = init(); ]]> -- 2.14.3

1 0

[libvirt] [PATCH v3] qemu: rename migration APIs to include Src or Dst in their name
by Daniel P. Berrangé 19 Feb '18

19 Feb '18

It is very difficult while reading the migration code trying to understand whether a particular function is being called on the src side or the dst side, or either. Putting "Src" or "Dst" in the method names will make this much more obvious. "Any" is used in a few helpers which can be called from both sides. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Changed in v3: - Made most naming suggestions from John. src/qemu/qemu_driver.c | 194 +++---- src/qemu/qemu_migration.c | 1378 +++++++++++++++++++++++---------------------- src/qemu/qemu_migration.h | 264 +++++---- src/qemu/qemu_process.c | 20 +- tests/qemuxml2argvtest.c | 4 +- 5 files changed, 940 insertions(+), 920 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ce25e7a088..69a591d633 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -754,7 +754,7 @@ qemuStateInitialize(bool privileged, if (!(qemu_driver->sharedDevices = virHashCreate(30, qemuSharedDeviceEntryFree))) goto error; - if (qemuMigrationErrorInit(qemu_driver) < 0) + if (qemuMigrationDstErrorInit(qemu_driver) < 0) goto error; if (privileged) { @@ -3282,7 +3282,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, goto cleanup; /* Perform the migration */ - if (qemuMigrationToFile(driver, vm, fd, compressedpath, asyncJob) < 0) + if (qemuMigrationSrcToFile(driver, vm, fd, compressedpath, asyncJob) < 0) goto cleanup; /* Touch up file header to mark image complete. */ @@ -3338,7 +3338,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SAVE, @@ -3893,11 +3893,11 @@ doCoreDump(virQEMUDriverPtr driver, goto cleanup; } - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; - ret = qemuMigrationToFile(driver, vm, fd, compressedpath, - QEMU_ASYNC_JOB_DUMP); + ret = qemuMigrationSrcToFile(driver, vm, fd, compressedpath, + QEMU_ASYNC_JOB_DUMP); } if (ret < 0) @@ -4815,8 +4815,8 @@ processMonitorEOFEvent(virQEMUDriverPtr driver, if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) { stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; - qemuMigrationErrorSave(driver, vm->def->name, - qemuMonitorLastError(priv->mon)); + qemuMigrationDstErrorSave(driver, vm->def->name, + qemuMonitorLastError(priv->mon)); } event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, @@ -12109,15 +12109,15 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) + if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepareTunnelEnsureACL(dconn, def) < 0) goto cleanup; - ret = qemuMigrationPrepareTunnel(driver, - NULL, 0, NULL, NULL, /* No cookies in v2 */ - st, &def, origname, flags); + ret = qemuMigrationDstPrepareTunnel(driver, + NULL, 0, NULL, NULL, /* No cookies in v2 */ + st, &def, origname, flags); cleanup: VIR_FREE(origname); @@ -12158,7 +12158,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, goto cleanup; } - if (!(compression = qemuMigrationCompressionParse(NULL, 0, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(NULL, 0, flags))) goto cleanup; if (virLockManagerPluginUsesState(driver->lockManager)) { @@ -12168,7 +12168,7 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) + if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepare2EnsureACL(dconn, def) < 0) @@ -12178,11 +12178,11 @@ qemuDomainMigratePrepare2(virConnectPtr dconn, * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - ret = qemuMigrationPrepareDirect(driver, - NULL, 0, NULL, NULL, /* No cookies */ - uri_in, uri_out, - &def, origname, NULL, 0, NULL, 0, - compression, flags); + ret = qemuMigrationDstPrepareDirect(driver, + NULL, 0, NULL, NULL, /* No cookies */ + uri_in, uri_out, + &def, origname, NULL, 0, NULL, 0, + compression, flags); cleanup: VIR_FREE(compression); @@ -12218,7 +12218,7 @@ qemuDomainMigratePerform(virDomainPtr dom, goto cleanup; } - if (!(compression = qemuMigrationCompressionParse(NULL, 0, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(NULL, 0, flags))) goto cleanup; if (!(vm = qemuDomObjFromDomain(dom))) @@ -12240,11 +12240,11 @@ qemuDomainMigratePerform(virDomainPtr dom, * * Consume any cookie we were able to decode though */ - ret = qemuMigrationPerform(driver, dom->conn, vm, NULL, - NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, - compression, &migParams, cookie, cookielen, - NULL, NULL, /* No output cookies in v2 */ - flags, dname, resource, false); + ret = qemuMigrationSrcPerform(driver, dom->conn, vm, NULL, + NULL, dconnuri, uri, NULL, NULL, 0, NULL, 0, + compression, &migParams, cookie, cookielen, + NULL, NULL, /* No output cookies in v2 */ + flags, dname, resource, false); cleanup: qemuMigrationParamsClear(&migParams); @@ -12273,7 +12273,7 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching name '%s'"), dname); - qemuMigrationErrorReport(driver, dname); + qemuMigrationDstErrorReport(driver, dname); goto cleanup; } @@ -12286,9 +12286,9 @@ qemuDomainMigrateFinish2(virConnectPtr dconn, * length was not sufficiently large, causing failures * migrating between old & new libvirtd */ - dom = qemuMigrationFinish(driver, dconn, vm, - NULL, 0, NULL, NULL, /* No cookies */ - flags, retcode, false); + dom = qemuMigrationDstFinish(driver, dconn, vm, + NULL, 0, NULL, NULL, /* No cookies */ + flags, retcode, false); cleanup: return dom; @@ -12320,8 +12320,8 @@ qemuDomainMigrateBegin3(virDomainPtr domain, return NULL; } - return qemuMigrationBegin(domain->conn, vm, xmlin, dname, - cookieout, cookieoutlen, 0, NULL, flags); + return qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, + cookieout, cookieoutlen, 0, NULL, flags); } static char * @@ -12366,9 +12366,9 @@ qemuDomainMigrateBegin3Params(virDomainPtr domain, goto cleanup; } - ret = qemuMigrationBegin(domain->conn, vm, xmlin, dname, - cookieout, cookieoutlen, - nmigrate_disks, migrate_disks, flags); + ret = qemuMigrationSrcBegin(domain->conn, vm, xmlin, dname, + cookieout, cookieoutlen, + nmigrate_disks, migrate_disks, flags); cleanup: VIR_FREE(migrate_disks); @@ -12407,21 +12407,21 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, goto cleanup; } - if (!(compression = qemuMigrationCompressionParse(NULL, 0, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(NULL, 0, flags))) goto cleanup; - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) + if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepare3EnsureACL(dconn, def) < 0) goto cleanup; - ret = qemuMigrationPrepareDirect(driver, - cookiein, cookieinlen, - cookieout, cookieoutlen, - uri_in, uri_out, - &def, origname, NULL, 0, NULL, 0, - compression, flags); + ret = qemuMigrationDstPrepareDirect(driver, + cookiein, cookieinlen, + cookieout, cookieoutlen, + uri_in, uri_out, + &def, origname, NULL, 0, NULL, 0, + compression, flags); cleanup: VIR_FREE(compression); @@ -12483,7 +12483,7 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, if (nmigrate_disks < 0) goto cleanup; - if (!(compression = qemuMigrationCompressionParse(params, nparams, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(params, nparams, flags))) goto cleanup; if (flags & VIR_MIGRATE_TUNNELLED) { @@ -12496,19 +12496,19 @@ qemuDomainMigratePrepare3Params(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) + if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) goto cleanup; - ret = qemuMigrationPrepareDirect(driver, - cookiein, cookieinlen, - cookieout, cookieoutlen, - uri_in, uri_out, - &def, origname, listenAddress, - nmigrate_disks, migrate_disks, nbdPort, - compression, flags); + ret = qemuMigrationDstPrepareDirect(driver, + cookiein, cookieinlen, + cookieout, cookieoutlen, + uri_in, uri_out, + &def, origname, listenAddress, + nmigrate_disks, migrate_disks, nbdPort, + compression, flags); cleanup: VIR_FREE(compression); @@ -12545,16 +12545,16 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) + if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepareTunnel3EnsureACL(dconn, def) < 0) goto cleanup; - ret = qemuMigrationPrepareTunnel(driver, - cookiein, cookieinlen, - cookieout, cookieoutlen, - st, &def, origname, flags); + ret = qemuMigrationDstPrepareTunnel(driver, + cookiein, cookieinlen, + cookieout, cookieoutlen, + st, &def, origname, flags); cleanup: VIR_FREE(origname); @@ -12598,16 +12598,16 @@ qemuDomainMigratePrepareTunnel3Params(virConnectPtr dconn, goto cleanup; } - if (!(def = qemuMigrationPrepareDef(driver, dom_xml, dname, &origname))) + if (!(def = qemuMigrationAnyPrepareDef(driver, dom_xml, dname, &origname))) goto cleanup; if (virDomainMigratePrepareTunnel3ParamsEnsureACL(dconn, def) < 0) goto cleanup; - ret = qemuMigrationPrepareTunnel(driver, - cookiein, cookieinlen, - cookieout, cookieoutlen, - st, &def, origname, flags); + ret = qemuMigrationDstPrepareTunnel(driver, + cookiein, cookieinlen, + cookieout, cookieoutlen, + st, &def, origname, flags); cleanup: VIR_FREE(origname); @@ -12637,7 +12637,7 @@ qemuDomainMigratePerform3(virDomainPtr dom, virCheckFlags(QEMU_MIGRATION_FLAGS, -1); - if (!(compression = qemuMigrationCompressionParse(NULL, 0, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(NULL, 0, flags))) return -1; if (!(vm = qemuDomObjFromDomain(dom))) @@ -12648,12 +12648,12 @@ qemuDomainMigratePerform3(virDomainPtr dom, goto cleanup; } - ret = qemuMigrationPerform(driver, dom->conn, vm, xmlin, NULL, - dconnuri, uri, NULL, NULL, 0, NULL, 0, - compression, &migParams, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, dname, resource, true); + ret = qemuMigrationSrcPerform(driver, dom->conn, vm, xmlin, NULL, + dconnuri, uri, NULL, NULL, 0, NULL, 0, + compression, &migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, dname, resource, true); cleanup: qemuMigrationParamsClear(&migParams); @@ -12728,7 +12728,7 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, if (!(migParams = qemuMigrationParams(params, nparams, flags))) goto cleanup; - if (!(compression = qemuMigrationCompressionParse(params, nparams, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(params, nparams, flags))) goto cleanup; if (!(vm = qemuDomObjFromDomain(dom))) @@ -12739,12 +12739,12 @@ qemuDomainMigratePerform3Params(virDomainPtr dom, goto cleanup; } - ret = qemuMigrationPerform(driver, dom->conn, vm, dom_xml, persist_xml, - dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, nbdPort, - compression, migParams, - cookiein, cookieinlen, cookieout, cookieoutlen, - flags, dname, bandwidth, true); + ret = qemuMigrationSrcPerform(driver, dom->conn, vm, dom_xml, persist_xml, + dconnuri, uri, graphicsuri, listenAddress, + nmigrate_disks, migrate_disks, nbdPort, + compression, migParams, + cookiein, cookieinlen, cookieout, cookieoutlen, + flags, dname, bandwidth, true); cleanup: VIR_FREE(compression); qemuMigrationParamsFree(&migParams); @@ -12779,7 +12779,7 @@ qemuDomainMigrateFinish3(virConnectPtr dconn, if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching name '%s'"), dname); - qemuMigrationErrorReport(driver, dname); + qemuMigrationDstErrorReport(driver, dname); return NULL; } @@ -12788,10 +12788,10 @@ qemuDomainMigrateFinish3(virConnectPtr dconn, return NULL; } - return qemuMigrationFinish(driver, dconn, vm, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, cancelled, true); + return qemuMigrationDstFinish(driver, dconn, vm, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, cancelled, true); } static virDomainPtr @@ -12827,7 +12827,7 @@ qemuDomainMigrateFinish3Params(virConnectPtr dconn, if (!vm) { virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching name '%s'"), dname); - qemuMigrationErrorReport(driver, dname); + qemuMigrationDstErrorReport(driver, dname); return NULL; } @@ -12836,10 +12836,10 @@ qemuDomainMigrateFinish3Params(virConnectPtr dconn, return NULL; } - return qemuMigrationFinish(driver, dconn, vm, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, cancelled, true); + return qemuMigrationDstFinish(driver, dconn, vm, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, cancelled, true); } @@ -12862,8 +12862,8 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, return -1; } - return qemuMigrationConfirm(domain->conn->privateData, vm, cookiein, cookieinlen, - flags, cancelled); + return qemuMigrationSrcConfirm(domain->conn->privateData, vm, cookiein, cookieinlen, + flags, cancelled); } static int @@ -12890,8 +12890,8 @@ qemuDomainMigrateConfirm3Params(virDomainPtr domain, return -1; } - return qemuMigrationConfirm(domain->conn->privateData, vm, cookiein, cookieinlen, - flags, cancelled); + return qemuMigrationSrcConfirm(domain->conn->privateData, vm, cookiein, cookieinlen, + flags, cancelled); } @@ -13180,14 +13180,14 @@ qemuDomainGetJobInfoMigrationStats(virQEMUDriverPtr driver, jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) { if (events && jobInfo->status != QEMU_DOMAIN_JOB_STATUS_ACTIVE && - qemuMigrationFetchStats(driver, vm, QEMU_ASYNC_JOB_NONE, - jobInfo, NULL) < 0) + qemuMigrationAnyFetchStats(driver, vm, QEMU_ASYNC_JOB_NONE, + jobInfo, NULL) < 0) return -1; if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE && jobInfo->statsType == QEMU_DOMAIN_JOB_STATS_TYPE_MIGRATION && - qemuMigrationFetchMirrorStats(driver, vm, QEMU_ASYNC_JOB_NONE, - jobInfo) < 0) + qemuMigrationSrcFetchMirrorStats(driver, vm, QEMU_ASYNC_JOB_NONE, + jobInfo) < 0) return -1; if (qemuDomainJobInfoUpdateTime(jobInfo) < 0) @@ -13582,7 +13582,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, priv = vm->privateData; - if (!qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) { + if (!qemuMigrationAnyCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Compressed migration is not supported by " "QEMU binary")); @@ -13633,7 +13633,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, priv = vm->privateData; - if (!qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) { + if (!qemuMigrationAnyCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Compressed migration is not supported by " "QEMU binary")); @@ -13985,7 +13985,7 @@ qemuDomainSnapshotCreateActiveInternal(virQEMUDriverPtr driver, bool resume = false; int ret = -1; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { @@ -14918,7 +14918,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver, /* do the memory snapshot if necessary */ if (memory) { /* check if migration is possible */ - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0)) goto cleanup; /* allow the migration job to be cancelled or the domain to be paused */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 29247d6a39..99d58325cb 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -115,7 +115,7 @@ qemuMigrationJobFinish(virQEMUDriverPtr driver, virDomainObjPtr obj) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -/* qemuMigrationCheckTLSCreds +/* qemuMigrationParamsCheckTLSCreds * @driver: pointer to qemu driver * @vm: domain object * @asyncJob: migration job to join @@ -129,9 +129,9 @@ qemuMigrationJobFinish(virQEMUDriverPtr driver, * private domain structure. Returns -1 on failure. */ static int -qemuMigrationCheckTLSCreds(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob) +qemuMigrationParamsCheckTLSCreds(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -158,7 +158,7 @@ qemuMigrationCheckTLSCreds(virQEMUDriverPtr driver, } -/* qemuMigrationCheckSetupTLS +/* qemuMigrationParamsCheckSetupTLS * @driver: pointer to qemu driver * @vm: domain object * @cfg: configuration pointer @@ -174,10 +174,10 @@ qemuMigrationCheckTLSCreds(virQEMUDriverPtr driver, * Returns 0 on success, -1 on error/failure */ static int -qemuMigrationCheckSetupTLS(virQEMUDriverPtr driver, - virQEMUDriverConfigPtr cfg, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob) +qemuMigrationParamsCheckSetupTLS(virQEMUDriverPtr driver, + virQEMUDriverConfigPtr cfg, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -187,7 +187,7 @@ qemuMigrationCheckSetupTLS(virQEMUDriverPtr driver, return -1; } - if (qemuMigrationCheckTLSCreds(driver, vm, asyncJob) < 0) + if (qemuMigrationParamsCheckTLSCreds(driver, vm, asyncJob) < 0) return -1; if (!priv->migTLSAlias) { @@ -208,7 +208,7 @@ qemuMigrationCheckSetupTLS(virQEMUDriverPtr driver, } -/* qemuMigrationAddTLSObjects +/* qemuMigrationParamsAddTLSObjects * @driver: pointer to qemu driver * @vm: domain object * @cfg: configuration pointer @@ -223,14 +223,14 @@ qemuMigrationCheckSetupTLS(virQEMUDriverPtr driver, * Returns 0 on success, -1 on failure */ static int -qemuMigrationAddTLSObjects(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virQEMUDriverConfigPtr cfg, - bool tlsListen, - qemuDomainAsyncJob asyncJob, - char **tlsAlias, - char **secAlias, - qemuMonitorMigrationParamsPtr migParams) +qemuMigrationParamsAddTLSObjects(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virQEMUDriverConfigPtr cfg, + bool tlsListen, + qemuDomainAsyncJob asyncJob, + char **tlsAlias, + char **secAlias, + qemuMonitorMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; virJSONValuePtr tlsProps = NULL; @@ -266,7 +266,7 @@ qemuMigrationAddTLSObjects(virQEMUDriverPtr driver, static void -qemuMigrationStoreDomainState(virDomainObjPtr vm) +qemuMigrationSrcStoreDomainState(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; priv->preMigrationState = virDomainObjGetState(vm, NULL); @@ -277,7 +277,7 @@ qemuMigrationStoreDomainState(virDomainObjPtr vm) /* Returns true if the domain was resumed, false otherwise */ static bool -qemuMigrationRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) +qemuMigrationSrcRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; int reason; @@ -320,9 +320,9 @@ qemuMigrationRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) static int -qemuMigrationPrecreateDisk(virConnectPtr conn, - virDomainDiskDefPtr disk, - unsigned long long capacity) +qemuMigrationDstPrecreateDisk(virConnectPtr conn, + virDomainDiskDefPtr disk, + unsigned long long capacity) { int ret = -1; virStoragePoolPtr pool = NULL; @@ -425,8 +425,8 @@ qemuMigrationPrecreateDisk(virConnectPtr conn, } static bool -qemuMigrateDisk(virDomainDiskDef const *disk, - size_t nmigrate_disks, const char **migrate_disks) +qemuMigrationAnyCopyDisk(virDomainDiskDef const *disk, + size_t nmigrate_disks, const char **migrate_disks) { size_t i; @@ -447,11 +447,11 @@ qemuMigrateDisk(virDomainDiskDef const *disk, static int -qemuMigrationPrecreateStorage(virDomainObjPtr vm, - qemuMigrationCookieNBDPtr nbd, - size_t nmigrate_disks, - const char **migrate_disks, - bool incremental) +qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, + qemuMigrationCookieNBDPtr nbd, + size_t nmigrate_disks, + const char **migrate_disks, + bool incremental) { int ret = -1; size_t i = 0; @@ -481,7 +481,7 @@ qemuMigrationPrecreateStorage(virDomainObjPtr vm, diskSrcPath = virDomainDiskGetSource(disk); /* Skip disks we don't want to migrate and already existing disks. */ - if (!qemuMigrateDisk(disk, nmigrate_disks, migrate_disks) || + if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks) || (diskSrcPath && virFileExists(diskSrcPath))) { continue; } @@ -495,7 +495,7 @@ qemuMigrationPrecreateStorage(virDomainObjPtr vm, VIR_DEBUG("Proceeding with disk source %s", NULLSTR(diskSrcPath)); - if (qemuMigrationPrecreateDisk(conn, disk, nbd->disks[i].capacity) < 0) + if (qemuMigrationDstPrecreateDisk(conn, disk, nbd->disks[i].capacity) < 0) goto cleanup; } @@ -507,7 +507,7 @@ qemuMigrationPrecreateStorage(virDomainObjPtr vm, /** - * qemuMigrationStartNBDServer: + * qemuMigrationDstStartNBDServer: * @driver: qemu driver * @vm: domain * @@ -519,12 +519,12 @@ qemuMigrationPrecreateStorage(virDomainObjPtr vm, * Returns 0 on success, -1 otherwise. */ static int -qemuMigrationStartNBDServer(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *listenAddr, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort) +qemuMigrationDstStartNBDServer(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *listenAddr, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -542,7 +542,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, virDomainDiskDefPtr disk = vm->def->disks[i]; /* check whether disk should be migrated */ - if (!qemuMigrateDisk(disk, nmigrate_disks, migrate_disks)) + if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) continue; if (disk->src->readonly || virStorageSourceIsEmpty(disk->src)) { @@ -592,9 +592,9 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, static int -qemuMigrationStopNBDServer(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationCookiePtr mig) +qemuMigrationDstStopNBDServer(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationCookiePtr mig) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -617,12 +617,12 @@ qemuMigrationStopNBDServer(virQEMUDriverPtr driver, /** - * qemuMigrationDriveMirrorReady: + * qemuMigrationSrcDriveMirrorReady: * @driver: qemu driver * @vm: domain * * Check the status of all drive-mirrors started by - * qemuMigrationDriveMirror. Any pending block job events + * qemuMigrationSrcDriveMirror. Any pending block job events * for the mirrored disks will be processed. * * Returns 1 if all mirrors are "ready", @@ -630,9 +630,9 @@ qemuMigrationStopNBDServer(virQEMUDriverPtr driver, * -1 on error. */ static int -qemuMigrationDriveMirrorReady(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob) +qemuMigrationSrcDriveMirrorReady(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) { size_t i; size_t notReady = 0; @@ -774,11 +774,11 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver, * -1 on error or when job failed and failNoJob is true. */ static int -qemuMigrationCancelOneDriveMirror(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virDomainDiskDefPtr disk, - bool failNoJob, - qemuDomainAsyncJob asyncJob) +qemuMigrationSrcCancelOneDriveMirror(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virDomainDiskDefPtr disk, + bool failNoJob, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; char *diskAlias = NULL; @@ -829,7 +829,7 @@ qemuMigrationCancelOneDriveMirror(virQEMUDriverPtr driver, /** - * qemuMigrationCancelDriveMirror: + * qemuMigrationSrcCancelDriveMirror: * @driver: qemu driver * @vm: domain * @check: if true report an error when some of the mirrors fails @@ -841,11 +841,11 @@ qemuMigrationCancelOneDriveMirror(virQEMUDriverPtr driver, * Returns 0 on success, -1 otherwise. */ static int -qemuMigrationCancelDriveMirror(virQEMUDriverPtr driver, - virDomainObjPtr vm, - bool check, - qemuDomainAsyncJob asyncJob, - virConnectPtr dconn) +qemuMigrationSrcCancelDriveMirror(virQEMUDriverPtr driver, + virDomainObjPtr vm, + bool check, + qemuDomainAsyncJob asyncJob, + virConnectPtr dconn) { virErrorPtr err = NULL; int ret = -1; @@ -862,8 +862,8 @@ qemuMigrationCancelDriveMirror(virQEMUDriverPtr driver, if (!diskPriv->migrating) continue; - rv = qemuMigrationCancelOneDriveMirror(driver, vm, disk, - check, asyncJob); + rv = qemuMigrationSrcCancelOneDriveMirror(driver, vm, disk, + check, asyncJob); if (rv != 0) { if (rv < 0) { if (!err) @@ -922,22 +922,22 @@ qemuMigrationCancelDriveMirror(virQEMUDriverPtr driver, * simultaneously to both source and destination. On success, * update @migrate_flags so we don't tell 'migrate' command * to do the very same operation. On failure, the caller is - * expected to call qemuMigrationCancelDriveMirror to stop all + * expected to call qemuMigrationSrcCancelDriveMirror to stop all * running mirrors. * * Returns 0 on success (@migrate_flags updated), * -1 otherwise. */ static int -qemuMigrationDriveMirror(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationCookiePtr mig, - const char *host, - unsigned long speed, - unsigned int *migrate_flags, - size_t nmigrate_disks, - const char **migrate_disks, - virConnectPtr dconn) +qemuMigrationSrcDriveMirror(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationCookiePtr mig, + const char *host, + unsigned long speed, + unsigned int *migrate_flags, + size_t nmigrate_disks, + const char **migrate_disks, + virConnectPtr dconn) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; @@ -982,7 +982,7 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, int mon_ret; /* check whether disk should be migrated */ - if (!qemuMigrateDisk(disk, nmigrate_disks, migrate_disks)) + if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) continue; if (!(diskAlias = qemuAliasFromDisk(disk)) || @@ -1013,8 +1013,8 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, } } - while ((rv = qemuMigrationDriveMirrorReady(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_OUT)) != 1) { + while ((rv = qemuMigrationSrcDriveMirrorReady(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_OUT)) != 1) { if (rv < 0) goto cleanup; @@ -1036,8 +1036,8 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, goto cleanup; } - qemuMigrationFetchMirrorStats(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - priv->job.current); + qemuMigrationSrcFetchMirrorStats(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, + priv->job.current); /* Okay, all disks are ready. Modify migrate_flags */ *migrate_flags &= ~(QEMU_MONITOR_MIGRATE_NON_SHARED_DISK | @@ -1054,14 +1054,14 @@ qemuMigrationDriveMirror(virQEMUDriverPtr driver, /** - * qemuMigrationIsAllowedHostdev: + * qemuMigrationSrcIsAllowedHostdev: * @def: domain definition * * Checks that @def does not contain any host devices unsupported accross * migrations. Returns true if the vm is allowed to migrate. */ static bool -qemuMigrationIsAllowedHostdev(const virDomainDef *def) +qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def) { size_t i; @@ -1082,7 +1082,7 @@ qemuMigrationIsAllowedHostdev(const virDomainDef *def) /** - * qemuMigrationIsAllowed: + * qemuMigrationSrcIsAllowed: * @driver: qemu driver struct * @vm: domain object * @remote: migration is remote @@ -1096,10 +1096,10 @@ qemuMigrationIsAllowedHostdev(const virDomainDef *def) * false otherwise. */ bool -qemuMigrationIsAllowed(virQEMUDriverPtr driver, - virDomainObjPtr vm, - bool remote, - unsigned int flags) +qemuMigrationSrcIsAllowed(virQEMUDriverPtr driver, + virDomainObjPtr vm, + bool remote, + unsigned int flags) { int nsnapshots; int pauseReason; @@ -1145,7 +1145,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, return false; } - if (!qemuMigrationIsAllowedHostdev(vm->def)) + if (!qemuMigrationSrcIsAllowedHostdev(vm->def)) return false; if (vm->def->cpu) { @@ -1200,10 +1200,10 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, } static bool -qemuMigrationIsSafe(virDomainDefPtr def, - size_t nmigrate_disks, - const char **migrate_disks, - unsigned int flags) +qemuMigrationSrcIsSafe(virDomainDefPtr def, + size_t nmigrate_disks, + const char **migrate_disks, + unsigned int flags) { bool storagemigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | @@ -1226,7 +1226,7 @@ qemuMigrationIsSafe(virDomainDefPtr def, /* disks which are migrated by qemu are safe too */ if (storagemigration && - qemuMigrateDisk(disk, nmigrate_disks, migrate_disks)) + qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks)) continue; if (virDomainDiskGetType(disk) == VIR_STORAGE_TYPE_FILE) { @@ -1252,12 +1252,12 @@ qemuMigrationIsSafe(virDomainDefPtr def, return true; } -/** qemuMigrationSetOffline +/** qemuMigrationSrcSetOffline * Pause domain for non-live migration. */ int -qemuMigrationSetOffline(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuMigrationSrcSetOffline(virQEMUDriverPtr driver, + virDomainObjPtr vm) { int ret; VIR_DEBUG("driver=%p vm=%p", driver, vm); @@ -1277,8 +1277,8 @@ qemuMigrationSetOffline(virQEMUDriverPtr driver, void -qemuMigrationPostcopyFailed(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuMigrationAnyPostcopyFailed(virQEMUDriverPtr driver, + virDomainObjPtr vm) { virDomainState state; int reason; @@ -1318,7 +1318,7 @@ qemuMigrationPostcopyFailed(virQEMUDriverPtr driver, static int -qemuMigrationSetOption(virQEMUDriverPtr driver, +qemuMigrationOptionSet(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuMonitorMigrationCaps capability, bool state, @@ -1327,7 +1327,7 @@ qemuMigrationSetOption(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; int ret; - if (!qemuMigrationCapsGet(vm, capability)) { + if (!qemuMigrationAnyCapsGet(vm, capability)) { if (!state) { /* Unsupported but we want it off anyway */ return 0; @@ -1360,14 +1360,14 @@ qemuMigrationSetOption(virQEMUDriverPtr driver, static int -qemuMigrationSetPostCopy(virQEMUDriverPtr driver, - virDomainObjPtr vm, - bool state, - qemuDomainAsyncJob job) +qemuMigrationOptionSetPostCopy(virQEMUDriverPtr driver, + virDomainObjPtr vm, + bool state, + qemuDomainAsyncJob job) { qemuDomainObjPrivatePtr priv = vm->privateData; - if (qemuMigrationSetOption(driver, vm, + if (qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_POSTCOPY, state, job) < 0) return -1; @@ -1378,7 +1378,7 @@ qemuMigrationSetPostCopy(virQEMUDriverPtr driver, static int -qemuMigrationWaitForSpice(virDomainObjPtr vm) +qemuMigrationSrcWaitForSpice(virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1437,11 +1437,11 @@ qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo) int -qemuMigrationFetchStats(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - qemuDomainJobInfoPtr jobInfo, - char **error) +qemuMigrationAnyFetchStats(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + qemuDomainJobInfoPtr jobInfo, + char **error) { qemuDomainObjPrivatePtr priv = vm->privateData; qemuMonitorMigrationStats stats; @@ -1480,7 +1480,7 @@ qemuMigrationJobName(virDomainObjPtr vm) static int -qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, +qemuMigrationJobCheckStatus(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob) { @@ -1492,7 +1492,7 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, if (!events || jobInfo->stats.mig.status == QEMU_MONITOR_MIGRATION_STATUS_ERROR) { - if (qemuMigrationFetchStats(driver, vm, asyncJob, jobInfo, &error) < 0) + if (qemuMigrationAnyFetchStats(driver, vm, asyncJob, jobInfo, &error) < 0) return -1; } @@ -1534,6 +1534,7 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, enum qemuMigrationCompletedFlags { QEMU_MIGRATION_COMPLETED_ABORT_ON_ERROR = (1 << 0), + /* This flag should only be set when run on src host */ QEMU_MIGRATION_COMPLETED_CHECK_STORAGE = (1 << 1), QEMU_MIGRATION_COMPLETED_POSTCOPY = (1 << 2), QEMU_MIGRATION_COMPLETED_PRE_SWITCHOVER = (1 << 3), @@ -1547,21 +1548,22 @@ enum qemuMigrationCompletedFlags { * -2 something else failed, we need to cancel migration. */ static int -qemuMigrationCompleted(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - virConnectPtr dconn, - unsigned int flags) +qemuMigrationAnyCompleted(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + virConnectPtr dconn, + unsigned int flags) { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = priv->job.current; int pauseReason; - if (qemuMigrationCheckJobStatus(driver, vm, asyncJob) < 0) + if (qemuMigrationJobCheckStatus(driver, vm, asyncJob) < 0) goto error; + /* This flag should only be set when run on src host */ if (flags & QEMU_MIGRATION_COMPLETED_CHECK_STORAGE && - qemuMigrationDriveMirrorReady(driver, vm, asyncJob) < 0) + qemuMigrationSrcDriveMirrorReady(driver, vm, asyncJob) < 0) goto error; if (flags & QEMU_MIGRATION_COMPLETED_ABORT_ON_ERROR && @@ -1637,11 +1639,11 @@ qemuMigrationCompleted(virQEMUDriverPtr driver, * QEMU reports failed migration. */ static int -qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - virConnectPtr dconn, - unsigned int flags) +qemuMigrationSrcWaitForCompletion(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + virConnectPtr dconn, + unsigned int flags) { qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainJobInfoPtr jobInfo = priv->job.current; @@ -1650,8 +1652,8 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, jobInfo->status = QEMU_DOMAIN_JOB_STATUS_MIGRATING; - while ((rv = qemuMigrationCompleted(driver, vm, asyncJob, - dconn, flags)) != 1) { + while ((rv = qemuMigrationAnyCompleted(driver, vm, asyncJob, + dconn, flags)) != 1) { if (rv < 0) return rv; @@ -1671,7 +1673,7 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, } if (events) - ignore_value(qemuMigrationFetchStats(driver, vm, asyncJob, jobInfo, NULL)); + ignore_value(qemuMigrationAnyFetchStats(driver, vm, asyncJob, jobInfo, NULL)); qemuDomainJobInfoUpdateTime(jobInfo); qemuDomainJobInfoUpdateDowntime(jobInfo); @@ -1690,10 +1692,10 @@ qemuMigrationWaitForCompletion(virQEMUDriverPtr driver, static int -qemuMigrationWaitForDestCompletion(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - bool postcopy) +qemuMigrationDstWaitForCompletion(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + bool postcopy) { qemuDomainObjPrivatePtr priv = vm->privateData; unsigned int flags = 0; @@ -1707,8 +1709,8 @@ qemuMigrationWaitForDestCompletion(virQEMUDriverPtr driver, if (postcopy) flags = QEMU_MIGRATION_COMPLETED_POSTCOPY; - while ((rv = qemuMigrationCompleted(driver, vm, asyncJob, - NULL, flags)) != 1) { + while ((rv = qemuMigrationAnyCompleted(driver, vm, asyncJob, + NULL, flags)) != 1) { if (rv < 0 || virDomainObjWait(vm) < 0) return -1; } @@ -1718,10 +1720,10 @@ qemuMigrationWaitForDestCompletion(virQEMUDriverPtr driver, static int -qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationCookiePtr cookie, - const char *graphicsuri) +qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationCookiePtr cookie, + const char *graphicsuri) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; @@ -1817,9 +1819,9 @@ qemuDomainMigrateGraphicsRelocate(virQEMUDriverPtr driver, static int -qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm, - qemuMigrationCookiePtr cookie) +qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, + virDomainObjPtr vm, + qemuMigrationCookiePtr cookie) { virDomainNetDefPtr netptr; int ret = -1; @@ -1854,8 +1856,8 @@ qemuDomainMigrateOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, int -qemuMigrationCheckIncoming(virQEMUCapsPtr qemuCaps, - const char *migrateFrom) +qemuMigrationDstCheckProtocol(virQEMUCapsPtr qemuCaps, + const char *migrateFrom) { if (STRPREFIX(migrateFrom, "rdma")) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATE_RDMA)) { @@ -1879,8 +1881,8 @@ qemuMigrationCheckIncoming(virQEMUCapsPtr qemuCaps, char * -qemuMigrationIncomingURI(const char *migrateFrom, - int migrateFd) +qemuMigrationDstGetURI(const char *migrateFrom, + int migrateFd) { char *uri = NULL; @@ -1894,10 +1896,10 @@ qemuMigrationIncomingURI(const char *migrateFrom, int -qemuMigrationRunIncoming(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *uri, - qemuDomainAsyncJob asyncJob) +qemuMigrationDstRun(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *uri, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret = -1; @@ -1914,12 +1916,12 @@ qemuMigrationRunIncoming(virQEMUDriverPtr driver, goto cleanup; if (asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) { - /* qemuMigrationWaitForDestCompletion is called from the Finish phase */ + /* qemuMigrationDstWaitForCompletion is called from the Finish phase */ ret = 0; goto cleanup; } - if (qemuMigrationWaitForDestCompletion(driver, vm, asyncJob, false) < 0) + if (qemuMigrationDstWaitForCompletion(driver, vm, asyncJob, false) < 0) goto cleanup; ret = 0; @@ -1936,9 +1938,9 @@ qemuMigrationRunIncoming(virQEMUDriverPtr driver, * qemuDomainMigratePerform3 and qemuDomainMigrateConfirm3. */ static virDomainObjPtr -qemuMigrationCleanup(virDomainObjPtr vm, - virConnectPtr conn, - void *opaque) +qemuMigrationSrcCleanup(virDomainObjPtr vm, + virConnectPtr conn, + void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -1994,15 +1996,15 @@ qemuMigrationCleanup(virDomainObjPtr vm, /* The caller is supposed to lock the vm and start a migration job. */ static char * -qemuMigrationBeginPhase(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *xmlin, - const char *dname, - char **cookieout, - int *cookieoutlen, - size_t nmigrate_disks, - const char **migrate_disks, - unsigned long flags) +qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *xmlin, + const char *dname, + char **cookieout, + int *cookieoutlen, + size_t nmigrate_disks, + const char **migrate_disks, + unsigned long flags) { char *rv = NULL; qemuMigrationCookiePtr mig = NULL; @@ -2028,11 +2030,11 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_BEGIN3); - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags)) goto cleanup; if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && - !qemuMigrationIsSafe(vm->def, nmigrate_disks, migrate_disks, flags)) + !qemuMigrationSrcIsSafe(vm->def, nmigrate_disks, migrate_disks, flags)) goto cleanup; if (flags & VIR_MIGRATE_POSTCOPY && @@ -2164,15 +2166,15 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, } char * -qemuMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - const char *dname, - char **cookieout, - int *cookieoutlen, - size_t nmigrate_disks, - const char **migrate_disks, - unsigned long flags) +qemuMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + const char *dname, + char **cookieout, + int *cookieoutlen, + size_t nmigrate_disks, + const char **migrate_disks, + unsigned long flags) { virQEMUDriverPtr driver = conn->privateData; virQEMUDriverConfigPtr cfg = NULL; @@ -2189,7 +2191,7 @@ qemuMigrationBegin(virConnectPtr conn, asyncJob = QEMU_ASYNC_JOB_NONE; } - qemuMigrationStoreDomainState(vm); + qemuMigrationSrcStoreDomainState(vm); if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -2204,14 +2206,14 @@ qemuMigrationBegin(virConnectPtr conn, qemuProcessRefreshDisks(driver, vm, asyncJob) < 0) goto endjob; - if (!(xml = qemuMigrationBeginPhase(driver, vm, xmlin, dname, - cookieout, cookieoutlen, - nmigrate_disks, migrate_disks, flags))) + if (!(xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname, + cookieout, cookieoutlen, + nmigrate_disks, migrate_disks, flags))) goto endjob; if (flags & VIR_MIGRATE_TLS) { cfg = virQEMUDriverGetConfig(driver); - if (qemuMigrationCheckSetupTLS(driver, cfg, vm, asyncJob) < 0) + if (qemuMigrationParamsCheckSetupTLS(driver, cfg, vm, asyncJob) < 0) goto endjob; } @@ -2221,7 +2223,7 @@ qemuMigrationBegin(virConnectPtr conn, * place. */ if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, - qemuMigrationCleanup) < 0) { + qemuMigrationSrcCleanup) < 0) { VIR_FREE(xml); goto endjob; } @@ -2248,8 +2250,8 @@ qemuMigrationBegin(virConnectPtr conn, */ static void -qemuMigrationPrepareCleanup(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuMigrationDstPrepareCleanup(virQEMUDriverPtr driver, + virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; @@ -2268,12 +2270,12 @@ qemuMigrationPrepareCleanup(virQEMUDriverPtr driver, } static qemuProcessIncomingDefPtr -qemuMigrationPrepareIncoming(virDomainObjPtr vm, - bool tunnel, - const char *protocol, - const char *listenAddress, - unsigned short port, - int fd) +qemuMigrationDstPrepare(virDomainObjPtr vm, + bool tunnel, + const char *protocol, + const char *listenAddress, + unsigned short port, + int fd) { qemuDomainObjPrivatePtr priv = vm->privateData; qemuProcessIncomingDefPtr inc = NULL; @@ -2348,26 +2350,26 @@ qemuMigrationPrepareIncoming(virDomainObjPtr vm, } static int -qemuMigrationSetCompression(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob job, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams) +qemuMigrationParamsSetCompression(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob job, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams) { int ret = -1; qemuDomainObjPrivatePtr priv = vm->privateData; - if (qemuMigrationSetOption(driver, vm, + if (qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE, compression->methods & - (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE), + (1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE), job) < 0) return -1; - if (qemuMigrationSetOption(driver, vm, + if (qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_COMPRESS, compression->methods & - (1ULL << QEMU_MIGRATION_COMPRESS_MT), + (1ULL << QEMU_MIGRATION_COMPRESS_MT), job) < 0) return -1; @@ -2420,7 +2422,7 @@ qemuMigrationParamsFree(qemuMonitorMigrationParamsPtr *migParams) } -/* qemuMigrationSetEmptyTLSParams +/* qemuMigrationParamsSetEmptyTLS * @driver: pointer to qemu driver * @vm: domain object * @asyncJob: migration job to join @@ -2433,14 +2435,14 @@ qemuMigrationParamsFree(qemuMonitorMigrationParamsPtr *migParams) * Returns 0 on success, -1 on failure */ static int -qemuMigrationSetEmptyTLSParams(virQEMUDriverPtr driver, +qemuMigrationParamsSetEmptyTLS(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, qemuMonitorMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; - if (qemuMigrationCheckTLSCreds(driver, vm, asyncJob) < 0) + if (qemuMigrationParamsCheckTLSCreds(driver, vm, asyncJob) < 0) return -1; if (!priv->migTLSAlias) @@ -2501,7 +2503,7 @@ qemuMigrationParams(virTypedParameterPtr params, static int -qemuMigrationSetParams(virQEMUDriverPtr driver, +qemuMigrationParamsSet(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob job, qemuMonitorMigrationParamsPtr migParams) @@ -2525,7 +2527,7 @@ qemuMigrationSetParams(virQEMUDriverPtr driver, } -/* qemuMigrationResetTLS +/* qemuMigrationParamsResetTLS * @driver: pointer to qemu driver * @vm: domain object * @asyncJob: migration job to join @@ -2536,9 +2538,9 @@ qemuMigrationSetParams(virQEMUDriverPtr driver, * Returns 0 on success, -1 on failure */ static int -qemuMigrationResetTLS(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob) +qemuMigrationParamsResetTLS(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; char *tlsAlias = NULL; @@ -2546,7 +2548,7 @@ qemuMigrationResetTLS(virQEMUDriverPtr driver, qemuMonitorMigrationParams migParams = { 0 }; int ret = -1; - if (qemuMigrationCheckTLSCreds(driver, vm, asyncJob) < 0) + if (qemuMigrationParamsCheckTLSCreds(driver, vm, asyncJob) < 0) return -1; /* If the tls-creds doesn't exist or if they're set to "" then there's @@ -2565,7 +2567,7 @@ qemuMigrationResetTLS(virQEMUDriverPtr driver, if (VIR_STRDUP(migParams.tlsCreds, "") < 0 || VIR_STRDUP(migParams.tlsHostname, "") < 0 || - qemuMigrationSetParams(driver, vm, asyncJob, &migParams) < 0) + qemuMigrationParamsSet(driver, vm, asyncJob, &migParams) < 0) goto cleanup; ret = 0; @@ -2580,23 +2582,23 @@ qemuMigrationResetTLS(virQEMUDriverPtr driver, static int -qemuMigrationPrepareAny(virQEMUDriverPtr driver, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - virDomainDefPtr *def, - const char *origname, - virStreamPtr st, - const char *protocol, - unsigned short port, - bool autoPort, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - unsigned long flags) +qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + virDomainDefPtr *def, + const char *origname, + virStreamPtr st, + const char *protocol, + unsigned short port, + bool autoPort, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + unsigned long flags) { virDomainObjPtr vm = NULL; virObjectEventPtr event = NULL; @@ -2664,7 +2666,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (!qemuMigrationIsAllowedHostdev(*def)) + if (!qemuMigrationSrcIsAllowedHostdev(*def)) goto cleanup; /* Let migration hook filter domain XML */ @@ -2748,9 +2750,9 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, goto cleanup; } - if (qemuMigrationPrecreateStorage(vm, mig->nbd, - nmigrate_disks, migrate_disks, - !!(flags & VIR_MIGRATE_NON_SHARED_INC)) < 0) + if (qemuMigrationDstPrecreateStorage(vm, mig->nbd, + nmigrate_disks, migrate_disks, + !!(flags & VIR_MIGRATE_NON_SHARED_INC)) < 0) goto cleanup; if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) @@ -2779,9 +2781,9 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, priv->allowReboot = mig->allowReboot; - if (!(incoming = qemuMigrationPrepareIncoming(vm, tunnel, protocol, - listenAddress, port, - dataFD[0]))) + if (!(incoming = qemuMigrationDstPrepare(vm, tunnel, protocol, + listenAddress, port, + dataFD[0]))) goto stopjob; if (qemuProcessPrepareDomain(driver, vm, startFlags) < 0) @@ -2810,21 +2812,21 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, dataFD[1] = -1; /* 'st' owns the FD now & will close it */ } - if (qemuMigrationSetCompression(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, - compression, &migParams) < 0) + if (qemuMigrationParamsSetCompression(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, + compression, &migParams) < 0) goto stopjob; /* Migrations using TLS need to add the "tls-creds-x509" object and * set the migration TLS parameters */ if (flags & VIR_MIGRATE_TLS) { cfg = virQEMUDriverGetConfig(driver); - if (qemuMigrationCheckSetupTLS(driver, cfg, vm, - QEMU_ASYNC_JOB_MIGRATION_IN) < 0) + if (qemuMigrationParamsCheckSetupTLS(driver, cfg, vm, + QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto stopjob; - if (qemuMigrationAddTLSObjects(driver, vm, cfg, true, - QEMU_ASYNC_JOB_MIGRATION_IN, - &tlsAlias, &secAlias, &migParams) < 0) + if (qemuMigrationParamsAddTLSObjects(driver, vm, cfg, true, + QEMU_ASYNC_JOB_MIGRATION_IN, + &tlsAlias, &secAlias, &migParams) < 0) goto stopjob; /* Force reset of 'tls-hostname', it's a source only parameter */ @@ -2832,7 +2834,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, goto stopjob; } else { - if (qemuMigrationSetEmptyTLSParams(driver, vm, + if (qemuMigrationParamsSetEmptyTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, &migParams) < 0) goto stopjob; @@ -2843,27 +2845,27 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, goto stopjob; } - if (qemuMigrationSetOption(driver, vm, + if (qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL, flags & VIR_MIGRATE_RDMA_PIN_ALL, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto stopjob; - if (qemuMigrationSetPostCopy(driver, vm, - flags & VIR_MIGRATE_POSTCOPY, - QEMU_ASYNC_JOB_MIGRATION_IN) < 0) + if (qemuMigrationOptionSetPostCopy(driver, vm, + flags & VIR_MIGRATE_POSTCOPY, + QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto stopjob; - if (qemuMigrationSetParams(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, + if (qemuMigrationParamsSet(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, &migParams) < 0) goto stopjob; if (mig->nbd && flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC) && virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NBD_SERVER)) { - if (qemuMigrationStartNBDServer(driver, vm, incoming->address, - nmigrate_disks, migrate_disks, - nbdPort) < 0) { + if (qemuMigrationDstStartNBDServer(driver, vm, incoming->address, + nmigrate_disks, migrate_disks, + nbdPort) < 0) { goto stopjob; } cookieFlags |= QEMU_MIGRATION_COOKIE_NBD; @@ -2879,8 +2881,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, } if (incoming->deferredURI && - qemuMigrationRunIncoming(driver, vm, incoming->deferredURI, - QEMU_ASYNC_JOB_MIGRATION_IN) < 0) + qemuMigrationDstRun(driver, vm, incoming->deferredURI, + QEMU_ASYNC_JOB_MIGRATION_IN) < 0) goto stopjob; if (qemuProcessFinishStartup(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, @@ -2897,7 +2899,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_WARN("Unable to encode migration cookie"); } - if (qemuDomainCleanupAdd(vm, qemuMigrationPrepareCleanup) < 0) + if (qemuDomainCleanupAdd(vm, qemuMigrationDstPrepareCleanup) < 0) goto stopjob; if (!(flags & VIR_MIGRATE_OFFLINE)) { @@ -2952,7 +2954,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, return ret; stopjob: - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN); if (stopProcess) { unsigned int stopFlags = VIR_QEMU_PROCESS_STOP_MIGRATED; @@ -2973,15 +2975,15 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, * sets up the corresponding virStream to handle the incoming data. */ int -qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - virStreamPtr st, - virDomainDefPtr *def, - const char *origname, - unsigned long flags) +qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + virStreamPtr st, + virDomainDefPtr *def, + const char *origname, + unsigned long flags) { qemuMigrationCompressionPtr compression = NULL; int ret; @@ -2998,20 +3000,20 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, return -1; } - if (!(compression = qemuMigrationCompressionParse(NULL, 0, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(NULL, 0, flags))) return -1; - ret = qemuMigrationPrepareAny(driver, cookiein, cookieinlen, - cookieout, cookieoutlen, def, origname, - st, NULL, 0, false, NULL, 0, NULL, 0, - compression, flags); + ret = qemuMigrationDstPrepareAny(driver, cookiein, cookieinlen, + cookieout, cookieoutlen, def, origname, + st, NULL, 0, false, NULL, 0, NULL, 0, + compression, flags); VIR_FREE(compression); return ret; } static virURIPtr -qemuMigrationParseURI(const char *uri, bool *wellFormed) +qemuMigrationAnyParseURI(const char *uri, bool *wellFormed) { char *tmp = NULL; virURIPtr parsed; @@ -3034,21 +3036,21 @@ qemuMigrationParseURI(const char *uri, bool *wellFormed) int -qemuMigrationPrepareDirect(virQEMUDriverPtr driver, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - const char *uri_in, - char **uri_out, - virDomainDefPtr *def, - const char *origname, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - unsigned long flags) +qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + const char *uri_in, + char **uri_out, + virDomainDefPtr *def, + const char *origname, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + unsigned long flags) { unsigned short port = 0; bool autoPort = true; @@ -3120,7 +3122,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, } else { bool well_formed_uri; - if (!(uri = qemuMigrationParseURI(uri_in, &well_formed_uri))) + if (!(uri = qemuMigrationAnyParseURI(uri_in, &well_formed_uri))) goto cleanup; if (uri->scheme == NULL) { @@ -3166,12 +3168,12 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (*uri_out) VIR_DEBUG("Generated uri_out=%s", *uri_out); - ret = qemuMigrationPrepareAny(driver, cookiein, cookieinlen, - cookieout, cookieoutlen, def, origname, - NULL, uri ? uri->scheme : "tcp", - port, autoPort, listenAddress, - nmigrate_disks, migrate_disks, nbdPort, - compression, flags); + ret = qemuMigrationDstPrepareAny(driver, cookiein, cookieinlen, + cookieout, cookieoutlen, def, origname, + NULL, uri ? uri->scheme : "tcp", + port, autoPort, listenAddress, + nmigrate_disks, migrate_disks, nbdPort, + compression, flags); cleanup: virURIFree(uri); VIR_FREE(hostname); @@ -3186,10 +3188,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, virDomainDefPtr -qemuMigrationPrepareDef(virQEMUDriverPtr driver, - const char *dom_xml, - const char *dname, - char **origname) +qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, + const char *dom_xml, + const char *dname, + char **origname) { virCapsPtr caps = NULL; virDomainDefPtr def; @@ -3228,12 +3230,12 @@ qemuMigrationPrepareDef(virQEMUDriverPtr driver, static int -qemuMigrationConfirmPhase(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *cookiein, - int cookieinlen, - unsigned int flags, - int retcode) +qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + unsigned int flags, + int retcode) { qemuMigrationCookiePtr mig; virObjectEventPtr event; @@ -3273,8 +3275,8 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, */ if (virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_POSTCOPY && - qemuMigrationFetchStats(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - jobInfo, NULL) < 0) + qemuMigrationAnyFetchStats(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, + jobInfo, NULL) < 0) VIR_WARN("Could not refresh migration statistics"); qemuDomainJobInfoUpdateTime(jobInfo); @@ -3293,7 +3295,7 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, if (retcode == 0) { /* If guest uses SPICE and supports seamless migration we have to hold * up domain shutdown until SPICE server transfers its data */ - qemuMigrationWaitForSpice(vm); + qemuMigrationSrcWaitForSpice(vm); qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, QEMU_ASYNC_JOB_MIGRATION_OUT, @@ -3310,23 +3312,23 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, int reason; /* cancel any outstanding NBD jobs */ - qemuMigrationCancelDriveMirror(driver, vm, false, - QEMU_ASYNC_JOB_MIGRATION_OUT, NULL); + qemuMigrationSrcCancelDriveMirror(driver, vm, false, + QEMU_ASYNC_JOB_MIGRATION_OUT, NULL); virSetError(orig_err); virFreeError(orig_err); if (virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED && reason == VIR_DOMAIN_PAUSED_POSTCOPY) { - qemuMigrationPostcopyFailed(driver, vm); - } else if (qemuMigrationRestoreDomainState(driver, vm)) { + qemuMigrationAnyPostcopyFailed(driver, vm); + } else if (qemuMigrationSrcRestoreDomainState(driver, vm)) { event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); qemuDomainEventQueue(driver, event); } - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->caps) < 0) VIR_WARN("Failed to save status on vm %s", vm->def->name); @@ -3342,12 +3344,12 @@ qemuMigrationConfirmPhase(virQEMUDriverPtr driver, } int -qemuMigrationConfirm(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *cookiein, - int cookieinlen, - unsigned int flags, - int cancelled) +qemuMigrationSrcConfirm(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + unsigned int flags, + int cancelled) { qemuMigrationJobPhase phase; virQEMUDriverConfigPtr cfg = NULL; @@ -3365,11 +3367,11 @@ qemuMigrationConfirm(virQEMUDriverPtr driver, qemuMigrationJobStartPhase(driver, vm, phase); virCloseCallbacksUnset(driver->closeCallbacks, vm, - qemuMigrationCleanup); + qemuMigrationSrcCleanup); - ret = qemuMigrationConfirmPhase(driver, vm, - cookiein, cookieinlen, - flags, cancelled); + ret = qemuMigrationSrcConfirmPhase(driver, vm, + cookiein, cookieinlen, + flags, cancelled); qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) { @@ -3434,7 +3436,7 @@ struct _qemuMigrationIOThread { int wakeupSendFD; }; -static void qemuMigrationIOFunc(void *arg) +static void qemuMigrationSrcIOFunc(void *arg) { qemuMigrationIOThreadPtr data = arg; char *buffer = NULL; @@ -3544,8 +3546,8 @@ static void qemuMigrationIOFunc(void *arg) static qemuMigrationIOThreadPtr -qemuMigrationStartTunnel(virStreamPtr st, - int sock) +qemuMigrationSrcStartTunnel(virStreamPtr st, + int sock) { qemuMigrationIOThreadPtr io = NULL; int wakeupFD[2] = { -1, -1 }; @@ -3565,7 +3567,7 @@ qemuMigrationStartTunnel(virStreamPtr st, io->wakeupSendFD = wakeupFD[1]; if (virThreadCreate(&io->thread, true, - qemuMigrationIOFunc, + qemuMigrationSrcIOFunc, io) < 0) { virReportSystemError(errno, "%s", _("Unable to create migration thread")); @@ -3582,7 +3584,7 @@ qemuMigrationStartTunnel(virStreamPtr st, } static int -qemuMigrationStopTunnel(qemuMigrationIOThreadPtr io, bool error) +qemuMigrationSrcStopTunnel(qemuMigrationIOThreadPtr io, bool error) { int rv = -1; char stop = error ? 1 : 0; @@ -3616,9 +3618,9 @@ qemuMigrationStopTunnel(qemuMigrationIOThreadPtr io, bool error) } static int -qemuMigrationConnect(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationSpecPtr spec) +qemuMigrationSrcConnect(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationSpecPtr spec) { virNetSocketPtr sock; const char *host; @@ -3662,10 +3664,10 @@ qemuMigrationConnect(virQEMUDriverPtr driver, static int -qemuMigrationContinue(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMonitorMigrationStatus status, - qemuDomainAsyncJob asyncJob) +qemuMigrationSrcContinue(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMonitorMigrationStatus status, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; int ret; @@ -3683,22 +3685,22 @@ qemuMigrationContinue(virQEMUDriverPtr driver, static int -qemuMigrationRun(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *persist_xml, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - unsigned long resource, - qemuMigrationSpecPtr spec, - virConnectPtr dconn, - const char *graphicsuri, - size_t nmigrate_disks, - const char **migrate_disks, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams) +qemuMigrationSrcRun(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *persist_xml, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + unsigned long resource, + qemuMigrationSpecPtr spec, + virConnectPtr dconn, + const char *graphicsuri, + size_t nmigrate_disks, + const char **migrate_disks, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams) { int ret = -1; unsigned int migrate_flags = QEMU_MONITOR_MIGRATE_BACKGROUND; @@ -3753,8 +3755,8 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (flags & VIR_MIGRATE_PERSIST_DEST) { if (persist_xml) { - if (!(persistDef = qemuMigrationPrepareDef(driver, persist_xml, - NULL, NULL))) + if (!(persistDef = qemuMigrationAnyPrepareDef(driver, persist_xml, + NULL, NULL))) goto error; } else { virDomainDefPtr def = vm->newDef ? vm->newDef : vm->def; @@ -3770,7 +3772,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (!mig) goto error; - if (qemuDomainMigrateGraphicsRelocate(driver, vm, mig, graphicsuri) < 0) + if (qemuMigrationSrcGraphicsRelocate(driver, vm, mig, graphicsuri) < 0) VIR_WARN("unable to provide data for graphics client relocation"); if (flags & VIR_MIGRATE_TLS) { @@ -3778,9 +3780,9 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* Begin/CheckSetupTLS already set up migTLSAlias, the following * assumes that and adds the TLS objects to the domain. */ - if (qemuMigrationAddTLSObjects(driver, vm, cfg, false, - QEMU_ASYNC_JOB_MIGRATION_OUT, - &tlsAlias, &secAlias, migParams) < 0) + if (qemuMigrationParamsAddTLSObjects(driver, vm, cfg, false, + QEMU_ASYNC_JOB_MIGRATION_OUT, + &tlsAlias, &secAlias, migParams) < 0) goto error; /* We need to add tls-hostname whenever QEMU itself does not @@ -3795,7 +3797,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, goto error; } } else { - if (qemuMigrationSetEmptyTLSParams(driver, vm, + if (qemuMigrationParamsSetEmptyTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, migParams) < 0) goto error; @@ -3805,13 +3807,13 @@ qemuMigrationRun(virQEMUDriverPtr driver, QEMU_MONITOR_MIGRATE_NON_SHARED_INC)) { if (mig->nbd) { /* This will update migrate_flags on success */ - if (qemuMigrationDriveMirror(driver, vm, mig, - spec->dest.host.name, - migrate_speed, - &migrate_flags, - nmigrate_disks, - migrate_disks, - dconn) < 0) { + if (qemuMigrationSrcDriveMirror(driver, vm, mig, + spec->dest.host.name, + migrate_speed, + &migrate_flags, + nmigrate_disks, + migrate_disks, + dconn) < 0) { goto error; } } else { @@ -3825,38 +3827,38 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* Before EnterMonitor, since qemuMigrationSetOffline already does that */ if (!(flags & VIR_MIGRATE_LIVE) && virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { - if (qemuMigrationSetOffline(driver, vm) < 0) + if (qemuMigrationSrcSetOffline(driver, vm) < 0) goto error; } - if (qemuMigrationSetCompression(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, - compression, migParams) < 0) + if (qemuMigrationParamsSetCompression(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, + compression, migParams) < 0) goto error; - if (qemuMigrationSetOption(driver, vm, + if (qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE, flags & VIR_MIGRATE_AUTO_CONVERGE, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto error; - if (qemuMigrationSetOption(driver, vm, + if (qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL, flags & VIR_MIGRATE_RDMA_PIN_ALL, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto error; - if (qemuMigrationSetPostCopy(driver, vm, - flags & VIR_MIGRATE_POSTCOPY, - QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + if (qemuMigrationOptionSetPostCopy(driver, vm, + flags & VIR_MIGRATE_POSTCOPY, + QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto error; - if (qemuMigrationCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER) && - qemuMigrationSetOption(driver, vm, + if (qemuMigrationAnyCapsGet(vm, QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER) && + qemuMigrationOptionSet(driver, vm, QEMU_MONITOR_MIGRATION_CAPS_PAUSE_BEFORE_SWITCHOVER, true, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto error; - if (qemuMigrationSetParams(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, + if (qemuMigrationParamsSet(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT, migParams) < 0) goto error; @@ -3880,7 +3882,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* connect to the destination qemu if needed */ if (spec->destType == MIGRATION_DEST_CONNECT_HOST && - qemuMigrationConnect(driver, vm, spec) < 0) { + qemuMigrationSrcConnect(driver, vm, spec) < 0) { goto exit_monitor; } @@ -3926,7 +3928,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, cancel = true; if (spec->fwdType != MIGRATION_FWD_DIRECT) { - if (!(iothread = qemuMigrationStartTunnel(spec->fwd.stream, fd))) + if (!(iothread = qemuMigrationSrcStartTunnel(spec->fwd.stream, fd))) goto error; /* If we've created a tunnel, then the 'fd' will be closed in the * qemuMigrationIOFunc as data->sock. @@ -3942,9 +3944,9 @@ qemuMigrationRun(virQEMUDriverPtr driver, if (flags & VIR_MIGRATE_POSTCOPY) waitFlags |= QEMU_MIGRATION_COMPLETED_POSTCOPY; - rc = qemuMigrationWaitForCompletion(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_OUT, - dconn, waitFlags); + rc = qemuMigrationSrcWaitForCompletion(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_OUT, + dconn, waitFlags); if (rc == -2) { goto error; } else if (rc == -1) { @@ -3966,14 +3968,14 @@ qemuMigrationRun(virQEMUDriverPtr driver, goto error; } } else if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING && - qemuMigrationSetOffline(driver, vm) < 0) { + qemuMigrationSrcSetOffline(driver, vm) < 0) { goto error; } if (mig && mig->nbd && - qemuMigrationCancelDriveMirror(driver, vm, true, - QEMU_ASYNC_JOB_MIGRATION_OUT, - dconn) < 0) + qemuMigrationSrcCancelDriveMirror(driver, vm, true, + QEMU_ASYNC_JOB_MIGRATION_OUT, + dconn) < 0) goto error; /* When migration was paused before serializing device state we need to @@ -3981,16 +3983,16 @@ qemuMigrationRun(virQEMUDriverPtr driver, * end of the migration. */ if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_PAUSED) { - if (qemuMigrationContinue(driver, vm, - QEMU_MONITOR_MIGRATION_STATUS_PRE_SWITCHOVER, - QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) + if (qemuMigrationSrcContinue(driver, vm, + QEMU_MONITOR_MIGRATION_STATUS_PRE_SWITCHOVER, + QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto error; waitFlags ^= QEMU_MIGRATION_COMPLETED_PRE_SWITCHOVER; - rc = qemuMigrationWaitForCompletion(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_OUT, - dconn, waitFlags); + rc = qemuMigrationSrcWaitForCompletion(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_OUT, + dconn, waitFlags); if (rc == -2) { goto error; } else if (rc == -1) { @@ -4004,7 +4006,7 @@ qemuMigrationRun(virQEMUDriverPtr driver, qemuMigrationIOThreadPtr io; VIR_STEAL_PTR(io, iothread); - if (qemuMigrationStopTunnel(io, false) < 0) + if (qemuMigrationSrcStopTunnel(io, false) < 0) goto error; } @@ -4058,12 +4060,12 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* cancel any outstanding NBD jobs */ if (mig && mig->nbd) - qemuMigrationCancelDriveMirror(driver, vm, false, - QEMU_ASYNC_JOB_MIGRATION_OUT, - dconn); + qemuMigrationSrcCancelDriveMirror(driver, vm, false, + QEMU_ASYNC_JOB_MIGRATION_OUT, + dconn); if (iothread) - qemuMigrationStopTunnel(iothread, true); + qemuMigrationSrcStopTunnel(iothread, true); if (priv->job.current->status != QEMU_DOMAIN_JOB_STATUS_CANCELED) priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_FAILED; @@ -4078,22 +4080,23 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* Perform migration using QEMU's native migrate support, * not encrypted obviously */ -static int doNativeMigrate(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *persist_xml, - const char *uri, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - unsigned long resource, - virConnectPtr dconn, - const char *graphicsuri, - size_t nmigrate_disks, - const char **migrate_disks, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams) +static int +qemuMigrationSrcPerformNative(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *persist_xml, + const char *uri, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + unsigned long resource, + virConnectPtr dconn, + const char *graphicsuri, + size_t nmigrate_disks, + const char **migrate_disks, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams) { qemuDomainObjPrivatePtr priv = vm->privateData; virURIPtr uribits = NULL; @@ -4107,7 +4110,7 @@ static int doNativeMigrate(virQEMUDriverPtr driver, cookieout, cookieoutlen, flags, resource, NULLSTR(graphicsuri), nmigrate_disks, migrate_disks); - if (!(uribits = qemuMigrationParseURI(uri, NULL))) + if (!(uribits = qemuMigrationAnyParseURI(uri, NULL))) return -1; if (uribits->scheme == NULL) { @@ -4141,10 +4144,10 @@ static int doNativeMigrate(virQEMUDriverPtr driver, spec.dest.host.port = uribits->port; spec.fwdType = MIGRATION_FWD_DIRECT; - ret = qemuMigrationRun(driver, vm, persist_xml, cookiein, cookieinlen, cookieout, - cookieoutlen, flags, resource, &spec, dconn, - graphicsuri, nmigrate_disks, migrate_disks, - compression, migParams); + ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, cookieout, + cookieoutlen, flags, resource, &spec, dconn, + graphicsuri, nmigrate_disks, migrate_disks, + compression, migParams); if (spec.destType == MIGRATION_DEST_FD) VIR_FORCE_CLOSE(spec.dest.fd.qemu); @@ -4156,22 +4159,23 @@ static int doNativeMigrate(virQEMUDriverPtr driver, } -static int doTunnelMigrate(virQEMUDriverPtr driver, - virDomainObjPtr vm, - virStreamPtr st, - const char *persist_xml, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - unsigned long resource, - virConnectPtr dconn, - const char *graphicsuri, - size_t nmigrate_disks, - const char **migrate_disks, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams) +static int +qemuMigrationSrcPerformTunnel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + virStreamPtr st, + const char *persist_xml, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + unsigned long resource, + virConnectPtr dconn, + const char *graphicsuri, + size_t nmigrate_disks, + const char **migrate_disks, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams) { int ret = -1; qemuMigrationSpec spec; @@ -4205,10 +4209,10 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, goto cleanup; } - ret = qemuMigrationRun(driver, vm, persist_xml, cookiein, cookieinlen, - cookieout, cookieoutlen, flags, resource, &spec, - dconn, graphicsuri, nmigrate_disks, migrate_disks, - compression, migParams); + ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen, + cookieout, cookieoutlen, flags, resource, &spec, + dconn, graphicsuri, nmigrate_disks, migrate_disks, + compression, migParams); cleanup: VIR_FORCE_CLOSE(spec.dest.fd.qemu); @@ -4223,14 +4227,15 @@ static int doTunnelMigrate(virQEMUDriverPtr driver, * from libvirt.c, but running in source libvirtd context, * instead of client app context & also adding in tunnel * handling */ -static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, - virConnectPtr sconn, - virConnectPtr dconn, - virDomainObjPtr vm, - const char *dconnuri, - unsigned long flags, - const char *dname, - unsigned long resource) +static int +qemuMigrationSrcPerformPeer2Peer2(virQEMUDriverPtr driver, + virConnectPtr sconn, + virConnectPtr dconn, + virDomainObjPtr vm, + const char *dconnuri, + unsigned long flags, + const char *dname, + unsigned long resource) { virDomainPtr ddomain = NULL; char *uri_out = NULL; @@ -4264,7 +4269,7 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, destflags = flags & ~(VIR_MIGRATE_ABORT_ON_ERROR | VIR_MIGRATE_AUTO_CONVERGE); - if (!(compression = qemuMigrationCompressionParse(NULL, 0, flags))) + if (!(compression = qemuMigrationAnyCompressionParse(NULL, 0, flags))) goto cleanup; VIR_DEBUG("Prepare2 %p", dconn); @@ -4316,16 +4321,16 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, VIR_DEBUG("Perform %p", sconn); qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); if (flags & VIR_MIGRATE_TUNNELLED) - ret = doTunnelMigrate(driver, vm, st, NULL, - NULL, 0, NULL, NULL, - flags, resource, dconn, - NULL, 0, NULL, compression, &migParams); + ret = qemuMigrationSrcPerformTunnel(driver, vm, st, NULL, + NULL, 0, NULL, NULL, + flags, resource, dconn, + NULL, 0, NULL, compression, &migParams); else - ret = doNativeMigrate(driver, vm, NULL, uri_out, - cookie, cookielen, - NULL, NULL, /* No out cookie with v2 migration */ - flags, resource, dconn, NULL, 0, NULL, - compression, &migParams); + ret = qemuMigrationSrcPerformNative(driver, vm, NULL, uri_out, + cookie, cookielen, + NULL, NULL, /* No out cookie with v2 migration */ + flags, resource, dconn, NULL, 0, NULL, + compression, &migParams); /* Perform failed. Make sure Finish doesn't overwrite the error */ if (ret < 0) @@ -4379,25 +4384,25 @@ static int doPeer2PeerMigrate2(virQEMUDriverPtr driver, * instead of client app context & also adding in tunnel * handling */ static int -doPeer2PeerMigrate3(virQEMUDriverPtr driver, - virConnectPtr sconn, - virConnectPtr dconn, - const char *dconnuri, - virDomainObjPtr vm, - const char *xmlin, - const char *persist_xml, - const char *dname, - const char *uri, - const char *graphicsuri, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams, - unsigned long long bandwidth, - bool useParams, - unsigned long flags) +qemuMigrationSrcPerformPeer2Peer3(virQEMUDriverPtr driver, + virConnectPtr sconn, + virConnectPtr dconn, + const char *dconnuri, + virDomainObjPtr vm, + const char *xmlin, + const char *persist_xml, + const char *dname, + const char *uri, + const char *graphicsuri, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams, + unsigned long long bandwidth, + bool useParams, + unsigned long flags) { virDomainPtr ddomain = NULL; char *uri_out = NULL; @@ -4430,9 +4435,9 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, * bit here, because we are already running inside the context of * a single job. */ - dom_xml = qemuMigrationBeginPhase(driver, vm, xmlin, dname, - &cookieout, &cookieoutlen, - nmigrate_disks, migrate_disks, flags); + dom_xml = qemuMigrationSrcBeginPhase(driver, vm, xmlin, dname, + &cookieout, &cookieoutlen, + nmigrate_disks, migrate_disks, flags); if (!dom_xml) goto cleanup; @@ -4478,8 +4483,8 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, nbdPort) < 0) goto cleanup; - if (qemuMigrationCompressionDump(compression, &params, &nparams, - &maxparams, &flags) < 0) + if (qemuMigrationAnyCompressionDump(compression, &params, &nparams, + &maxparams, &flags) < 0) goto cleanup; } @@ -4562,19 +4567,19 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, cookieout = NULL; cookieoutlen = 0; if (flags & VIR_MIGRATE_TUNNELLED) { - ret = doTunnelMigrate(driver, vm, st, persist_xml, - cookiein, cookieinlen, - &cookieout, &cookieoutlen, - flags, bandwidth, dconn, graphicsuri, - nmigrate_disks, migrate_disks, compression, - migParams); + ret = qemuMigrationSrcPerformTunnel(driver, vm, st, persist_xml, + cookiein, cookieinlen, + &cookieout, &cookieoutlen, + flags, bandwidth, dconn, graphicsuri, + nmigrate_disks, migrate_disks, compression, + migParams); } else { - ret = doNativeMigrate(driver, vm, persist_xml, uri, - cookiein, cookieinlen, - &cookieout, &cookieoutlen, - flags, bandwidth, dconn, graphicsuri, - nmigrate_disks, migrate_disks, compression, - migParams); + ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, + cookiein, cookieinlen, + &cookieout, &cookieoutlen, + flags, bandwidth, dconn, graphicsuri, + nmigrate_disks, migrate_disks, compression, + migParams); } /* Perform failed. Make sure Finish doesn't overwrite the error */ @@ -4682,9 +4687,9 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, cookieinlen = cookieoutlen; cookieout = NULL; cookieoutlen = 0; - ret = qemuMigrationConfirmPhase(driver, vm, - cookiein, cookieinlen, - flags, cancelled); + ret = qemuMigrationSrcConfirmPhase(driver, vm, + cookiein, cookieinlen, + flags, cancelled); /* If Confirm3 returns -1, there's nothing more we can * do, but fortunately worst case is that there is a * domain left in 'paused' state on source. @@ -4716,9 +4721,9 @@ doPeer2PeerMigrate3(virQEMUDriverPtr driver, static void -qemuMigrationConnectionClosed(virConnectPtr conn, - int reason, - void *opaque) +qemuMigrationSrcConnectionClosed(virConnectPtr conn, + int reason, + void *opaque) { virDomainObjPtr vm = opaque; @@ -4739,24 +4744,25 @@ static virConnectAuth virConnectAuthConfig = { }; -static int doPeer2PeerMigrate(virQEMUDriverPtr driver, - virConnectPtr sconn, - virDomainObjPtr vm, - const char *xmlin, - const char *persist_xml, - const char *dconnuri, - const char *uri, - const char *graphicsuri, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams, - unsigned long flags, - const char *dname, - unsigned long resource, - bool *v3proto) +static int +qemuMigrationSrcPerformPeer2Peer(virQEMUDriverPtr driver, + virConnectPtr sconn, + virDomainObjPtr vm, + const char *xmlin, + const char *persist_xml, + const char *dconnuri, + const char *uri, + const char *graphicsuri, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams, + unsigned long flags, + const char *dname, + unsigned long resource, + bool *v3proto) { int ret = -1; virConnectPtr dconn = NULL; @@ -4815,7 +4821,7 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, cfg->keepAliveCount) < 0) goto cleanup; - if (virConnectRegisterCloseCallback(dconn, qemuMigrationConnectionClosed, + if (virConnectRegisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed, vm, NULL) < 0) { goto cleanup; } @@ -4873,20 +4879,20 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, flags &= ~VIR_MIGRATE_CHANGE_PROTECTION; if (*v3proto) { - ret = doPeer2PeerMigrate3(driver, sconn, dconn, dconnuri, vm, xmlin, - persist_xml, dname, uri, graphicsuri, - listenAddress, nmigrate_disks, migrate_disks, - nbdPort, compression, migParams, resource, - useParams, flags); + ret = qemuMigrationSrcPerformPeer2Peer3(driver, sconn, dconn, dconnuri, vm, xmlin, + persist_xml, dname, uri, graphicsuri, + listenAddress, nmigrate_disks, migrate_disks, + nbdPort, compression, migParams, resource, + useParams, flags); } else { - ret = doPeer2PeerMigrate2(driver, sconn, dconn, vm, - dconnuri, flags, dname, resource); + ret = qemuMigrationSrcPerformPeer2Peer2(driver, sconn, dconn, vm, + dconnuri, flags, dname, resource); } cleanup: orig_err = virSaveLastError(); qemuDomainObjEnterRemote(vm); - virConnectUnregisterCloseCallback(dconn, qemuMigrationConnectionClosed); + virConnectUnregisterCloseCallback(dconn, qemuMigrationSrcConnectionClosed); virObjectUnref(dconn); qemuDomainObjExitRemote(vm); if (orig_err) { @@ -4904,28 +4910,28 @@ static int doPeer2PeerMigrate(virQEMUDriverPtr driver, * perform phase of v2 non-peer2peer migration. */ static int -qemuMigrationPerformJob(virQEMUDriverPtr driver, - virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - const char *persist_xml, - const char *dconnuri, - const char *uri, - const char *graphicsuri, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - const char *dname, - unsigned long resource, - bool v3proto) +qemuMigrationSrcPerformJob(virQEMUDriverPtr driver, + virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + const char *persist_xml, + const char *dconnuri, + const char *uri, + const char *graphicsuri, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dname, + unsigned long resource, + bool v3proto) { virObjectEventPtr event = NULL; int ret = -1; @@ -4941,27 +4947,27 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, goto endjob; } - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags)) goto endjob; if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) && - !qemuMigrationIsSafe(vm->def, nmigrate_disks, migrate_disks, flags)) + !qemuMigrationSrcIsSafe(vm->def, nmigrate_disks, migrate_disks, flags)) goto endjob; - qemuMigrationStoreDomainState(vm); + qemuMigrationSrcStoreDomainState(vm); if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { - ret = doPeer2PeerMigrate(driver, conn, vm, xmlin, persist_xml, - dconnuri, uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, nbdPort, - compression, migParams, flags, dname, resource, - &v3proto); + ret = qemuMigrationSrcPerformPeer2Peer(driver, conn, vm, xmlin, persist_xml, + dconnuri, uri, graphicsuri, listenAddress, + nmigrate_disks, migrate_disks, nbdPort, + compression, migParams, flags, dname, resource, + &v3proto); } else { qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM2); - ret = doNativeMigrate(driver, vm, persist_xml, uri, cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, resource, NULL, NULL, 0, NULL, - compression, migParams); + ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, resource, NULL, NULL, 0, NULL, + compression, migParams); } if (ret < 0) goto endjob; @@ -4988,9 +4994,9 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, * here */ if (!v3proto && ret < 0) - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); - if (qemuMigrationRestoreDomainState(driver, vm)) { + if (qemuMigrationSrcRestoreDomainState(driver, vm)) { event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); @@ -5021,22 +5027,22 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, * This implements perform phase of v3 migration protocol. */ static int -qemuMigrationPerformPhase(virQEMUDriverPtr driver, - virConnectPtr conn, - virDomainObjPtr vm, - const char *persist_xml, - const char *uri, - const char *graphicsuri, - size_t nmigrate_disks, - const char **migrate_disks, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - unsigned long resource) +qemuMigrationSrcPerformPhase(virQEMUDriverPtr driver, + virConnectPtr conn, + virDomainObjPtr vm, + const char *persist_xml, + const char *uri, + const char *graphicsuri, + size_t nmigrate_disks, + const char **migrate_disks, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + unsigned long resource) { virObjectEventPtr event = NULL; int ret = -1; @@ -5051,15 +5057,15 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, qemuMigrationJobStartPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3); virCloseCallbacksUnset(driver->closeCallbacks, vm, - qemuMigrationCleanup); + qemuMigrationSrcCleanup); - ret = doNativeMigrate(driver, vm, persist_xml, uri, cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, resource, NULL, graphicsuri, - nmigrate_disks, migrate_disks, compression, migParams); + ret = qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, resource, NULL, graphicsuri, + nmigrate_disks, migrate_disks, compression, migParams); if (ret < 0) { - if (qemuMigrationRestoreDomainState(driver, vm)) { + if (qemuMigrationSrcRestoreDomainState(driver, vm)) { event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED_MIGRATED); @@ -5070,12 +5076,12 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE); if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn, - qemuMigrationCleanup) < 0) + qemuMigrationSrcCleanup) < 0) goto endjob; endjob: if (ret < 0) { - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT); qemuMigrationJobFinish(driver, vm); } else { qemuMigrationJobContinue(vm); @@ -5091,28 +5097,28 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver, } int -qemuMigrationPerform(virQEMUDriverPtr driver, - virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - const char *persist_xml, - const char *dconnuri, - const char *uri, - const char *graphicsuri, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - const char *dname, - unsigned long resource, - bool v3proto) +qemuMigrationSrcPerform(virQEMUDriverPtr driver, + virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + const char *persist_xml, + const char *dconnuri, + const char *uri, + const char *graphicsuri, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dname, + unsigned long resource, + bool v3proto) { VIR_DEBUG("driver=%p, conn=%p, vm=%p, xmlin=%s, dconnuri=%s, " "uri=%s, graphicsuri=%s, listenAddress=%s, " @@ -5132,13 +5138,13 @@ qemuMigrationPerform(virQEMUDriverPtr driver, return -1; } - return qemuMigrationPerformJob(driver, conn, vm, xmlin, persist_xml, dconnuri, uri, - graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, nbdPort, - compression, migParams, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, dname, resource, v3proto); + return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, dconnuri, uri, + graphicsuri, listenAddress, + nmigrate_disks, migrate_disks, nbdPort, + compression, migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, dname, resource, v3proto); } else { if (dconnuri) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5147,27 +5153,27 @@ qemuMigrationPerform(virQEMUDriverPtr driver, } if (v3proto) { - return qemuMigrationPerformPhase(driver, conn, vm, persist_xml, uri, - graphicsuri, - nmigrate_disks, migrate_disks, - compression, migParams, - cookiein, cookieinlen, - cookieout, cookieoutlen, - flags, resource); + return qemuMigrationSrcPerformPhase(driver, conn, vm, persist_xml, uri, + graphicsuri, + nmigrate_disks, migrate_disks, + compression, migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, + flags, resource); } else { - return qemuMigrationPerformJob(driver, conn, vm, xmlin, persist_xml, NULL, - uri, graphicsuri, listenAddress, - nmigrate_disks, migrate_disks, nbdPort, - compression, migParams, - cookiein, cookieinlen, - cookieout, cookieoutlen, flags, - dname, resource, v3proto); + return qemuMigrationSrcPerformJob(driver, conn, vm, xmlin, persist_xml, NULL, + uri, graphicsuri, listenAddress, + nmigrate_disks, migrate_disks, nbdPort, + compression, migParams, + cookiein, cookieinlen, + cookieout, cookieoutlen, flags, + dname, resource, v3proto); } } } static int -qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) +qemuMigrationDstVPAssociatePortProfiles(virDomainDefPtr def) { size_t i; int last_good_net = -1; @@ -5219,10 +5225,10 @@ qemuMigrationVPAssociatePortProfiles(virDomainDefPtr def) static int -qemuMigrationPersist(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuMigrationCookiePtr mig, - bool ignoreSaveError) +qemuMigrationDstPersist(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuMigrationCookiePtr mig, + bool ignoreSaveError) { virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virCapsPtr caps = NULL; @@ -5271,16 +5277,16 @@ qemuMigrationPersist(virQEMUDriverPtr driver, virDomainPtr -qemuMigrationFinish(virQEMUDriverPtr driver, - virConnectPtr dconn, - virDomainObjPtr vm, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - int retcode, - bool v3proto) +qemuMigrationDstFinish(virQEMUDriverPtr driver, + virConnectPtr dconn, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + int retcode, + bool v3proto) { virDomainPtr dom = NULL; qemuMigrationCookiePtr mig = NULL; @@ -5304,7 +5310,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, priv->migrationPort = 0; if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN)) { - qemuMigrationErrorReport(driver, vm->def->name); + qemuMigrationDstErrorReport(driver, vm->def->name); goto cleanup; } @@ -5314,7 +5320,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, v3proto ? QEMU_MIGRATION_PHASE_FINISH3 : QEMU_MIGRATION_PHASE_FINISH2); - qemuDomainCleanupRemove(vm, qemuMigrationPrepareCleanup); + qemuDomainCleanupRemove(vm, qemuMigrationDstPrepareCleanup); VIR_FREE(priv->job.completed); cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK | @@ -5330,7 +5336,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (flags & VIR_MIGRATE_OFFLINE) { if (retcode == 0 && - qemuMigrationPersist(driver, vm, mig, false) == 0) + qemuMigrationDstPersist(driver, vm, mig, false) == 0) dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, -1); goto endjob; } @@ -5346,17 +5352,17 @@ qemuMigrationFinish(virQEMUDriverPtr driver, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); - qemuMigrationErrorReport(driver, vm->def->name); + qemuMigrationDstErrorReport(driver, vm->def->name); goto endjob; } - if (qemuMigrationVPAssociatePortProfiles(vm->def) < 0) + if (qemuMigrationDstVPAssociatePortProfiles(vm->def) < 0) goto endjob; - if (mig->network && qemuDomainMigrateOPDRelocate(driver, vm, mig) < 0) + if (mig->network && qemuMigrationDstOPDRelocate(driver, vm, mig) < 0) VIR_WARN("unable to provide network data for relocation"); - if (qemuMigrationStopNBDServer(driver, vm, mig) < 0) + if (qemuMigrationDstStopNBDServer(driver, vm, mig) < 0) goto endjob; if (qemuRefreshVirtioChannelState(driver, vm, @@ -5367,7 +5373,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, goto endjob; if (flags & VIR_MIGRATE_PERSIST_DEST) { - if (qemuMigrationPersist(driver, vm, mig, !v3proto) < 0) { + if (qemuMigrationDstPersist(driver, vm, mig, !v3proto) < 0) { /* Hmpf. Migration was successful, but making it persistent * was not. If we report successful, then when this domain * shuts down, management tools are in for a surprise. On the @@ -5388,9 +5394,9 @@ qemuMigrationFinish(virQEMUDriverPtr driver, /* We need to wait for QEMU to process all data sent by the source * before starting guest CPUs. */ - if (qemuMigrationWaitForDestCompletion(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_IN, - !!(flags & VIR_MIGRATE_POSTCOPY)) < 0) { + if (qemuMigrationDstWaitForCompletion(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_IN, + !!(flags & VIR_MIGRATE_POSTCOPY)) < 0) { /* There's not much we can do for v2 protocol since the * original domain on the source host is already gone. */ @@ -5462,9 +5468,9 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } if (inPostCopy) { - if (qemuMigrationWaitForDestCompletion(driver, vm, - QEMU_ASYNC_JOB_MIGRATION_IN, - false) < 0) { + if (qemuMigrationDstWaitForCompletion(driver, vm, + QEMU_ASYNC_JOB_MIGRATION_IN, + false) < 0) { goto endjob; } if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { @@ -5510,7 +5516,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, VIR_DOMAIN_EVENT_STOPPED_FAILED); qemuDomainEventQueue(driver, event); } else { - qemuMigrationPostcopyFailed(driver, vm); + qemuMigrationAnyPostcopyFailed(driver, vm); } } @@ -5531,7 +5537,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver, VIR_FREE(priv->job.completed); } - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN); qemuMigrationJobFinish(driver, vm); if (!virDomainObjIsActive(vm)) @@ -5562,10 +5568,10 @@ qemuMigrationFinish(virQEMUDriverPtr driver, /* Helper function called while vm is active. */ int -qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, - int fd, - const char *compressor, - qemuDomainAsyncJob asyncJob) +qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, + int fd, + const char *compressor, + qemuDomainAsyncJob asyncJob) { qemuDomainObjPrivatePtr priv = vm->privateData; int rc; @@ -5649,7 +5655,7 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, if (rc < 0) goto cleanup; - rc = qemuMigrationWaitForCompletion(driver, vm, asyncJob, NULL, 0); + rc = qemuMigrationSrcWaitForCompletion(driver, vm, asyncJob, NULL, 0); if (rc < 0) { if (rc == -2) { @@ -5700,8 +5706,8 @@ qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int -qemuMigrationCancel(virQEMUDriverPtr driver, - virDomainObjPtr vm) +qemuMigrationSrcCancel(virQEMUDriverPtr driver, + virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv = vm->privateData; virHashTablePtr blockJobs = NULL; @@ -5750,8 +5756,8 @@ qemuMigrationCancel(virQEMUDriverPtr driver, } } - if (qemuMigrationCancelDriveMirror(driver, vm, false, - QEMU_ASYNC_JOB_NONE, NULL) < 0) + if (qemuMigrationSrcCancelDriveMirror(driver, vm, false, + QEMU_ASYNC_JOB_NONE, NULL) < 0) goto endsyncjob; ret = 0; @@ -5863,7 +5869,7 @@ qemuMigrationJobFinish(virQEMUDriverPtr driver, virDomainObjPtr vm) static void -qemuMigrationErrorFree(void *data, +qemuMigrationDstErrorFree(void *data, const void *name ATTRIBUTE_UNUSED) { virErrorPtr err = data; @@ -5871,9 +5877,9 @@ qemuMigrationErrorFree(void *data, } int -qemuMigrationErrorInit(virQEMUDriverPtr driver) +qemuMigrationDstErrorInit(virQEMUDriverPtr driver) { - driver->migrationErrors = virHashAtomicNew(64, qemuMigrationErrorFree); + driver->migrationErrors = virHashAtomicNew(64, qemuMigrationDstErrorFree); if (driver->migrationErrors) return 0; else @@ -5885,9 +5891,9 @@ qemuMigrationErrorInit(virQEMUDriverPtr driver) * invalid after calling this function. */ void -qemuMigrationErrorSave(virQEMUDriverPtr driver, - const char *name, - virErrorPtr err) +qemuMigrationDstErrorSave(virQEMUDriverPtr driver, + const char *name, + virErrorPtr err) { if (!err) return; @@ -5901,8 +5907,8 @@ qemuMigrationErrorSave(virQEMUDriverPtr driver, } void -qemuMigrationErrorReport(virQEMUDriverPtr driver, - const char *name) +qemuMigrationDstErrorReport(virQEMUDriverPtr driver, + const char *name) { virErrorPtr err; @@ -5918,9 +5924,9 @@ qemuMigrationErrorReport(virQEMUDriverPtr driver, /* don't ever pass NULL params with non zero nparams */ qemuMigrationCompressionPtr -qemuMigrationCompressionParse(virTypedParameterPtr params, - int nparams, - unsigned long flags) +qemuMigrationAnyCompressionParse(virTypedParameterPtr params, + int nparams, + unsigned long flags) { size_t i; qemuMigrationCompressionPtr compression = NULL; @@ -6001,11 +6007,11 @@ qemuMigrationCompressionParse(virTypedParameterPtr params, } int -qemuMigrationCompressionDump(qemuMigrationCompressionPtr compression, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, - unsigned long *flags) +qemuMigrationAnyCompressionDump(qemuMigrationCompressionPtr compression, + virTypedParameterPtr *params, + int *nparams, + int *maxparams, + unsigned long *flags) { size_t i; @@ -6052,15 +6058,15 @@ qemuMigrationCompressionDump(qemuMigrationCompressionPtr compression, /* - * qemuMigrationReset: + * qemuMigrationParamsReset: * * Reset all migration parameters so that the next job which internally uses * migration (save, managedsave, snapshots, dump) will not try to use them. */ void -qemuMigrationReset(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob job) +qemuMigrationParamsReset(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob job) { qemuMonitorMigrationCaps cap; virErrorPtr err = virSaveLastError(); @@ -6068,12 +6074,12 @@ qemuMigrationReset(virQEMUDriverPtr driver, if (!virDomainObjIsActive(vm)) goto cleanup; - if (qemuMigrationResetTLS(driver, vm, job) < 0) + if (qemuMigrationParamsResetTLS(driver, vm, job) < 0) goto cleanup; for (cap = 0; cap < QEMU_MONITOR_MIGRATION_CAPS_LAST; cap++) { - if (qemuMigrationCapsGet(vm, cap) && - qemuMigrationSetOption(driver, vm, cap, false, job) < 0) + if (qemuMigrationAnyCapsGet(vm, cap) && + qemuMigrationOptionSet(driver, vm, cap, false, job) < 0) goto cleanup; } @@ -6086,10 +6092,10 @@ qemuMigrationReset(virQEMUDriverPtr driver, int -qemuMigrationFetchMirrorStats(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - qemuDomainJobInfoPtr jobInfo) +qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + qemuDomainJobInfoPtr jobInfo) { size_t i; qemuDomainObjPrivatePtr priv = vm->privateData; @@ -6137,8 +6143,8 @@ qemuMigrationFetchMirrorStats(virQEMUDriverPtr driver, bool -qemuMigrationCapsGet(virDomainObjPtr vm, - qemuMonitorMigrationCaps cap) +qemuMigrationAnyCapsGet(virDomainObjPtr vm, + qemuMonitorMigrationCaps cap) { qemuDomainObjPrivatePtr priv = vm->privateData; bool enabled = false; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 234f1eb858..ecb176e06a 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -25,6 +25,20 @@ # include "qemu_conf.h" # include "qemu_domain.h" +/* + * General function naming conventions: + * + * - qemuMigrationSrcXXX - only runs on source host + * - qemuMigrationDstXXX - only runs on dest host + * - qemuMigrationAnyXXX - runs on source or dest host + * + * Exceptions: + * + * - qemuMigrationParamsXXX - runs on source or dest host + * - qemuMigrationOptionXXX - runs on source or dest host + * - qemuMigrationJobXXX - runs on source or dest host + */ + typedef struct _qemuMigrationCompression qemuMigrationCompression; typedef qemuMigrationCompression *qemuMigrationCompressionPtr; @@ -112,15 +126,15 @@ struct _qemuMigrationCompression { }; qemuMigrationCompressionPtr -qemuMigrationCompressionParse(virTypedParameterPtr params, - int nparams, - unsigned long flags); +qemuMigrationAnyCompressionParse(virTypedParameterPtr params, + int nparams, + unsigned long flags); int -qemuMigrationCompressionDump(qemuMigrationCompressionPtr compression, - virTypedParameterPtr *params, - int *nparams, - int *maxparams, - unsigned long *flags); +qemuMigrationAnyCompressionDump(qemuMigrationCompressionPtr compression, + virTypedParameterPtr *params, + int *nparams, + int *maxparams, + unsigned long *flags); void qemuMigrationParamsClear(qemuMonitorMigrationParamsPtr migParams); @@ -134,166 +148,166 @@ qemuMigrationParams(virTypedParameterPtr params, unsigned long flags); int -qemuMigrationSetOffline(virQEMUDriverPtr driver, - virDomainObjPtr vm); +qemuMigrationSrcSetOffline(virQEMUDriverPtr driver, + virDomainObjPtr vm); char * -qemuMigrationBegin(virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - const char *dname, - char **cookieout, - int *cookieoutlen, - size_t nmigrate_disks, - const char **migrate_disks, - unsigned long flags); +qemuMigrationSrcBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + const char *dname, + char **cookieout, + int *cookieoutlen, + size_t nmigrate_disks, + const char **migrate_disks, + unsigned long flags); virDomainDefPtr -qemuMigrationPrepareDef(virQEMUDriverPtr driver, - const char *dom_xml, - const char *dname, - char **origname); +qemuMigrationAnyPrepareDef(virQEMUDriverPtr driver, + const char *dom_xml, + const char *dname, + char **origname); int -qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - virStreamPtr st, - virDomainDefPtr *def, - const char *origname, - unsigned long flags); +qemuMigrationDstPrepareTunnel(virQEMUDriverPtr driver, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + virStreamPtr st, + virDomainDefPtr *def, + const char *origname, + unsigned long flags); int -qemuMigrationPrepareDirect(virQEMUDriverPtr driver, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - const char *uri_in, - char **uri_out, - virDomainDefPtr *def, - const char *origname, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - unsigned long flags); +qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + const char *uri_in, + char **uri_out, + virDomainDefPtr *def, + const char *origname, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + unsigned long flags); int -qemuMigrationPerform(virQEMUDriverPtr driver, - virConnectPtr conn, - virDomainObjPtr vm, - const char *xmlin, - const char *persist_xml, - const char *dconnuri, - const char *uri, - const char *graphicsuri, - const char *listenAddress, - size_t nmigrate_disks, - const char **migrate_disks, - int nbdPort, - qemuMigrationCompressionPtr compression, - qemuMonitorMigrationParamsPtr migParams, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - const char *dname, - unsigned long resource, - bool v3proto); +qemuMigrationSrcPerform(virQEMUDriverPtr driver, + virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin, + const char *persist_xml, + const char *dconnuri, + const char *uri, + const char *graphicsuri, + const char *listenAddress, + size_t nmigrate_disks, + const char **migrate_disks, + int nbdPort, + qemuMigrationCompressionPtr compression, + qemuMonitorMigrationParamsPtr migParams, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + const char *dname, + unsigned long resource, + bool v3proto); virDomainPtr -qemuMigrationFinish(virQEMUDriverPtr driver, - virConnectPtr dconn, - virDomainObjPtr vm, - const char *cookiein, - int cookieinlen, - char **cookieout, - int *cookieoutlen, - unsigned long flags, - int retcode, - bool v3proto); +qemuMigrationDstFinish(virQEMUDriverPtr driver, + virConnectPtr dconn, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + char **cookieout, + int *cookieoutlen, + unsigned long flags, + int retcode, + bool v3proto); int -qemuMigrationConfirm(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *cookiein, - int cookieinlen, - unsigned int flags, - int cancelled); +qemuMigrationSrcConfirm(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *cookiein, + int cookieinlen, + unsigned int flags, + int cancelled); bool -qemuMigrationIsAllowed(virQEMUDriverPtr driver, - virDomainObjPtr vm, - bool remote, - unsigned int flags); +qemuMigrationSrcIsAllowed(virQEMUDriverPtr driver, + virDomainObjPtr vm, + bool remote, + unsigned int flags); int -qemuMigrationToFile(virQEMUDriverPtr driver, - virDomainObjPtr vm, - int fd, - const char *compressor, - qemuDomainAsyncJob asyncJob) +qemuMigrationSrcToFile(virQEMUDriverPtr driver, + virDomainObjPtr vm, + int fd, + const char *compressor, + qemuDomainAsyncJob asyncJob) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; int -qemuMigrationCancel(virQEMUDriverPtr driver, - virDomainObjPtr vm); +qemuMigrationSrcCancel(virQEMUDriverPtr driver, + virDomainObjPtr vm); int -qemuMigrationFetchStats(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - qemuDomainJobInfoPtr jobInfo, - char **error); +qemuMigrationAnyFetchStats(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + qemuDomainJobInfoPtr jobInfo, + char **error); int -qemuMigrationErrorInit(virQEMUDriverPtr driver); +qemuMigrationDstErrorInit(virQEMUDriverPtr driver); void -qemuMigrationErrorSave(virQEMUDriverPtr driver, - const char *name, - virErrorPtr err); +qemuMigrationDstErrorSave(virQEMUDriverPtr driver, + const char *name, + virErrorPtr err); void -qemuMigrationErrorReport(virQEMUDriverPtr driver, - const char *name); +qemuMigrationDstErrorReport(virQEMUDriverPtr driver, + const char *name); int -qemuMigrationCheckIncoming(virQEMUCapsPtr qemuCaps, - const char *migrateFrom); +qemuMigrationDstCheckProtocol(virQEMUCapsPtr qemuCaps, + const char *migrateFrom); char * -qemuMigrationIncomingURI(const char *migrateFrom, - int migrateFd); +qemuMigrationDstGetURI(const char *migrateFrom, + int migrateFd); int -qemuMigrationRunIncoming(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *uri, - qemuDomainAsyncJob asyncJob); +qemuMigrationDstRun(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *uri, + qemuDomainAsyncJob asyncJob); void -qemuMigrationPostcopyFailed(virQEMUDriverPtr driver, +qemuMigrationAnyPostcopyFailed(virQEMUDriverPtr driver, virDomainObjPtr vm); void -qemuMigrationReset(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob job); +qemuMigrationParamsReset(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob job); int -qemuMigrationFetchMirrorStats(virQEMUDriverPtr driver, - virDomainObjPtr vm, - qemuDomainAsyncJob asyncJob, - qemuDomainJobInfoPtr jobInfo); +qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver, + virDomainObjPtr vm, + qemuDomainAsyncJob asyncJob, + qemuDomainJobInfoPtr jobInfo); bool -qemuMigrationCapsGet(virDomainObjPtr vm, - qemuMonitorMigrationCaps cap); +qemuMigrationAnyCapsGet(virDomainObjPtr vm, + qemuMonitorMigrationCaps cap); #endif /* __QEMU_MIGRATION_H__ */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d0bab5d84e..13b05d236a 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3069,7 +3069,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, * confirm success or failure yet; killing it seems safest unless * we already started guest CPUs or we were in post-copy mode */ if (postcopy) { - qemuMigrationPostcopyFailed(driver, vm); + qemuMigrationAnyPostcopyFailed(driver, vm); } else if (state != VIR_DOMAIN_RUNNING) { VIR_DEBUG("Killing migrated domain %s", vm->def->name); return -1; @@ -3077,7 +3077,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, break; } - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_NONE); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE); return 0; } @@ -3115,11 +3115,11 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, * post-copy mode */ if (postcopy) { - qemuMigrationPostcopyFailed(driver, vm); + qemuMigrationAnyPostcopyFailed(driver, vm); } else { VIR_DEBUG("Cancelling unfinished migration of domain %s", vm->def->name); - if (qemuMigrationCancel(driver, vm) < 0) { + if (qemuMigrationSrcCancel(driver, vm) < 0) { VIR_WARN("Could not cancel ongoing migration of domain %s", vm->def->name); } @@ -3133,7 +3133,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, * post-copy mode we can use PAUSED_POSTCOPY_FAILED state for this */ if (postcopy) - qemuMigrationPostcopyFailed(driver, vm); + qemuMigrationAnyPostcopyFailed(driver, vm); break; case QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED: @@ -3142,7 +3142,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, * as broken in that case */ if (postcopy) { - qemuMigrationPostcopyFailed(driver, vm); + qemuMigrationAnyPostcopyFailed(driver, vm); } else { VIR_DEBUG("Resuming domain %s after failed migration", vm->def->name); @@ -3171,7 +3171,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, } } - qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_NONE); + qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_NONE); return 0; } @@ -4142,7 +4142,7 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, { qemuProcessIncomingDefPtr inc = NULL; - if (qemuMigrationCheckIncoming(qemuCaps, migrateFrom) < 0) + if (qemuMigrationDstCheckProtocol(qemuCaps, migrateFrom) < 0) return NULL; if (VIR_ALLOC(inc) < 0) @@ -4151,7 +4151,7 @@ qemuProcessIncomingDefNew(virQEMUCapsPtr qemuCaps, if (VIR_STRDUP(inc->address, listenAddress) < 0) goto error; - inc->launchURI = qemuMigrationIncomingURI(migrateFrom, fd); + inc->launchURI = qemuMigrationDstGetURI(migrateFrom, fd); if (!inc->launchURI) goto error; @@ -6348,7 +6348,7 @@ qemuProcessStart(virConnectPtr conn, if (incoming && incoming->deferredURI && - qemuMigrationRunIncoming(driver, vm, incoming->deferredURI, asyncJob) < 0) + qemuMigrationDstRun(driver, vm, incoming->deferredURI, asyncJob) < 0) goto stop; if (qemuProcessFinishStartup(driver, vm, asyncJob, diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5791cccbd0..12983bb158 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -448,8 +448,8 @@ testCompareXMLToArgv(const void *data) goto cleanup; if (info->migrateFrom && - !(migrateURI = qemuMigrationIncomingURI(info->migrateFrom, - info->migrateFd))) + !(migrateURI = qemuMigrationDstGetURI(info->migrateFrom, + info->migrateFd))) goto cleanup; if (!(vm = virDomainObjNew(driver.xmlopt))) -- 2.14.3

2 1

[libvirt] [python PATCH 0/4] followup fixes for virPyDictToTypedParams
by Pavel Hrdina 19 Feb '18

19 Feb '18

Pavel Hrdina (4): Use static variables to store virPyDictToTypedParams hints Fix order of virPyDictToTypedParams hints Add missing virPyDictToTypedParams hint for migration params Fix virPyDictToTypedParams type hint for block copy params libvirt-override.c | 150 ++++++++++++----------------------------------------- libvirt-utils.h | 2 + 2 files changed, 35 insertions(+), 117 deletions(-) -- 2.14.3

2 8

[libvirt] [PATCH python 1/1] Set hints for virPyDictToTypedParams
by Edgar Kaziakhmedov 19 Feb '18

19 Feb '18

Predefine hints for all parameters possible to avoid wrong type convert. Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov(a)virtuozzo.com> --- libvirt-override.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 124 insertions(+), 4 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 78a7f08..dba42d4 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7750,7 +7750,9 @@ libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED, PyObject *dict; unsigned int flags; virTypedParameterPtr params; - int nparams; + virPyTypedParamsHintPtr hparams; + int nparams = 0; + int nhparams = 15; virDomainPtr ddom = NULL; if (!PyArg_ParseTuple(args, (char *) "OOOI:virDomainMigrate3", @@ -7760,14 +7762,64 @@ libvirt_virDomainMigrate3(PyObject *self ATTRIBUTE_UNUSED, domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); dconn = (virConnectPtr) PyvirConnect_Get(pyobj_dconn); - if (virPyDictToTypedParams(dict, &params, &nparams, NULL, 0) < 0) + hparams = malloc(sizeof(virPyTypedParamsHint) * nhparams); + hparams[0].name = VIR_MIGRATE_PARAM_URI; + hparams[0].type = VIR_TYPED_PARAM_STRING; + + hparams[1].name = VIR_MIGRATE_PARAM_DEST_NAME; + hparams[1].type = VIR_TYPED_PARAM_STRING; + + hparams[2].name = VIR_MIGRATE_PARAM_DEST_XML; + hparams[2].type = VIR_TYPED_PARAM_STRING; + + hparams[3].name = VIR_MIGRATE_PARAM_GRAPHICS_URI; + hparams[3].type = VIR_TYPED_PARAM_STRING; + + hparams[4].name = VIR_MIGRATE_PARAM_BANDWIDTH; + hparams[4].type = VIR_TYPED_PARAM_ULLONG; + + hparams[5].name = VIR_MIGRATE_PARAM_LISTEN_ADDRESS; + hparams[5].type = VIR_TYPED_PARAM_STRING; + + hparams[6].name = VIR_MIGRATE_PARAM_DISKS_PORT; + hparams[6].type = VIR_TYPED_PARAM_INT; + + hparams[7].name = VIR_MIGRATE_PARAM_COMPRESSION; + hparams[7].type = VIR_TYPED_PARAM_STRING; + + hparams[8].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS; + hparams[8].type = VIR_TYPED_PARAM_INT; + + hparams[9].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL; + hparams[9].type = VIR_TYPED_PARAM_INT; + + hparams[10].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS; + hparams[10].type = VIR_TYPED_PARAM_INT; + + hparams[11].name = VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE; + hparams[11].type = VIR_TYPED_PARAM_ULLONG; + + hparams[12].name = VIR_MIGRATE_PARAM_PERSIST_XML; + hparams[12].type = VIR_TYPED_PARAM_STRING; + + hparams[13].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL; + hparams[13].type = VIR_TYPED_PARAM_INT; + + hparams[14].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT; + hparams[14].type = VIR_TYPED_PARAM_INT; + + if (virPyDictToTypedParams(dict, &params, &nparams, + hparams, nhparams) < 0) { + free(hparams); return NULL; + } LIBVIRT_BEGIN_ALLOW_THREADS; ddom = virDomainMigrate3(domain, dconn, params, nparams, flags); LIBVIRT_END_ALLOW_THREADS; virTypedParamsFree(params, nparams); + free(hparams); return libvirt_virDomainPtrWrap(ddom); } @@ -7781,7 +7833,9 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED, PyObject *dict; unsigned int flags; virTypedParameterPtr params; + virPyTypedParamsHintPtr hparams; int nparams; + int nhparams = 15; int ret = -1; if (!PyArg_ParseTuple(args, (char *) "OzOI:virDomainMigrate3", @@ -7790,14 +7844,64 @@ libvirt_virDomainMigrateToURI3(PyObject *self ATTRIBUTE_UNUSED, domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - if (virPyDictToTypedParams(dict, &params, &nparams, NULL, 0) < 0) + hparams = malloc(sizeof(virPyTypedParamsHint) * nhparams); + hparams[0].name = VIR_MIGRATE_PARAM_URI; + hparams[0].type = VIR_TYPED_PARAM_STRING; + + hparams[1].name = VIR_MIGRATE_PARAM_DEST_NAME; + hparams[1].type = VIR_TYPED_PARAM_STRING; + + hparams[2].name = VIR_MIGRATE_PARAM_DEST_XML; + hparams[2].type = VIR_TYPED_PARAM_STRING; + + hparams[3].name = VIR_MIGRATE_PARAM_GRAPHICS_URI; + hparams[3].type = VIR_TYPED_PARAM_STRING; + + hparams[4].name = VIR_MIGRATE_PARAM_BANDWIDTH; + hparams[4].type = VIR_TYPED_PARAM_ULLONG; + + hparams[5].name = VIR_MIGRATE_PARAM_LISTEN_ADDRESS; + hparams[5].type = VIR_TYPED_PARAM_STRING; + + hparams[6].name = VIR_MIGRATE_PARAM_DISKS_PORT; + hparams[6].type = VIR_TYPED_PARAM_INT; + + hparams[7].name = VIR_MIGRATE_PARAM_COMPRESSION; + hparams[7].type = VIR_TYPED_PARAM_STRING; + + hparams[8].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS; + hparams[8].type = VIR_TYPED_PARAM_INT; + + hparams[9].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_LEVEL; + hparams[9].type = VIR_TYPED_PARAM_INT; + + hparams[10].name = VIR_MIGRATE_PARAM_COMPRESSION_MT_THREADS; + hparams[10].type = VIR_TYPED_PARAM_INT; + + hparams[11].name = VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE; + hparams[11].type = VIR_TYPED_PARAM_ULLONG; + + hparams[12].name = VIR_MIGRATE_PARAM_PERSIST_XML; + hparams[12].type = VIR_TYPED_PARAM_STRING; + + hparams[13].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INITIAL; + hparams[13].type = VIR_TYPED_PARAM_INT; + + hparams[14].name = VIR_MIGRATE_PARAM_AUTO_CONVERGE_INCREMENT; + hparams[14].type = VIR_TYPED_PARAM_INT; + + if (virPyDictToTypedParams(dict, &params, &nparams, + hparams, nhparams) < 0) { + free(hparams); return NULL; + } LIBVIRT_BEGIN_ALLOW_THREADS; ret = virDomainMigrateToURI3(domain, dconnuri, params, nparams, flags); LIBVIRT_END_ALLOW_THREADS; virTypedParamsFree(params, nparams); + free(hparams); return libvirt_intWrap(ret); } #endif /* LIBVIR_CHECK_VERSION(1, 1, 0) */ @@ -8650,7 +8754,9 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, char *disk = NULL; char *destxml = NULL; virTypedParameterPtr params = NULL; + virPyTypedParamsHintPtr hparams; int nparams = 0; + int nhparams = 3; unsigned int flags = 0; int c_retval; @@ -8659,8 +8765,22 @@ libvirt_virDomainBlockCopy(PyObject *self ATTRIBUTE_UNUSED, return NULL; if (PyDict_Check(pyobj_dict)) { - if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, NULL, 0) < 0) + hparams = malloc(sizeof(virPyTypedParamsHint) * nhparams); + hparams[0].name = VIR_DOMAIN_BLOCK_COPY_BANDWIDTH; + hparams[0].type = VIR_TYPED_PARAM_ULLONG; + + hparams[1].name = VIR_DOMAIN_BLOCK_COPY_GRANULARITY; + hparams[1].type = VIR_TYPED_PARAM_UINT; + + hparams[2].name = VIR_DOMAIN_BLOCK_COPY_BUF_SIZE; + hparams[2].type = VIR_TYPED_PARAM_UINT; + + if (virPyDictToTypedParams(pyobj_dict, &params, &nparams, + hparams, nhparams) < 0) { + free(hparams); return NULL; + } + free(hparams); } dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); -- 2.11.0

4 6

[libvirt] [PATCH] bhyve: Fix build
by Andrea Bolognani 19 Feb '18

19 Feb '18

Commit 2d43f0a2dcfd dropped virDomainDiskTranslateSourcePool()'s first argument but failed to update callers in the bhyve driver. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the build breaker rule. src/bhyve/bhyve_command.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index c1241b811..fd738b42c 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -198,7 +198,7 @@ bhyveBuildAHCIControllerArgStr(const virDomainDef *def, goto error; } - if (virDomainDiskTranslateSourcePool(conn, disk) < 0) + if (virDomainDiskTranslateSourcePool(disk) < 0) goto error; disk_source = virDomainDiskGetSource(disk); @@ -289,12 +289,11 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def, static int bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk, - virConnectPtr conn, virCommandPtr cmd) { const char *disk_source; - if (virDomainDiskTranslateSourcePool(conn, disk) < 0) + if (virDomainDiskTranslateSourcePool(disk) < 0) return -1; if (disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) { @@ -562,7 +561,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, /* Handled by bhyveBuildAHCIControllerArgStr() */ break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (bhyveBuildVirtIODiskArgStr(def, disk, conn, cmd) < 0) + if (bhyveBuildVirtIODiskArgStr(def, disk, cmd) < 0) goto error; break; default: @@ -672,10 +671,10 @@ virBhyveProcessBuildCustomLoaderCmd(virDomainDefPtr def) } static bool -virBhyveUsableDisk(virConnectPtr conn, virDomainDiskDefPtr disk) +virBhyveUsableDisk(virDomainDiskDefPtr disk) { - if (virDomainDiskTranslateSourcePool(conn, disk) < 0) + if (virDomainDiskTranslateSourcePool(disk) < 0) return false; if ((disk->device != VIR_DOMAIN_DISK_DEVICE_DISK) && @@ -729,7 +728,7 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, * across. */ cd = hdd = userdef = NULL; for (i = 0; i < def->ndisks; i++) { - if (!virBhyveUsableDisk(conn, def->disks[i])) + if (!virBhyveUsableDisk(def->disks[i])) continue; diskdef = def->disks[i]; @@ -815,7 +814,7 @@ virBhyveProcessBuildGrubbhyveCmd(virDomainDefPtr def, } static virDomainDiskDefPtr -virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def) +virBhyveGetBootDisk(virDomainDefPtr def) { size_t i; virDomainDiskDefPtr match = NULL; @@ -851,7 +850,7 @@ virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def) /* If boot_dev is set, we return the first device of * the request type */ for (i = 0; i < def->ndisks; i++) { - if (!virBhyveUsableDisk(conn, def->disks[i])) + if (!virBhyveUsableDisk(def->disks[i])) continue; if (def->disks[i]->device == boot_dev) { @@ -875,7 +874,7 @@ virBhyveGetBootDisk(virConnectPtr conn, virDomainDefPtr def) int first_usable_disk_index = -1; for (i = 0; i < def->ndisks; i++) { - if (!virBhyveUsableDisk(conn, def->disks[i])) + if (!virBhyveUsableDisk(def->disks[i])) continue; else first_usable_disk_index = i; @@ -907,7 +906,7 @@ virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def, virDomainDiskDefPtr disk = NULL; if (def->os.bootloader == NULL) { - disk = virBhyveGetBootDisk(conn, def); + disk = virBhyveGetBootDisk(def); if (disk == NULL) return NULL; -- 2.14.3

1 0

[libvirt] [PATCH] tests: drop linkage to libvirt_driver_network_impl.la
by Daniel P. Berrangé 19 Feb '18

19 Feb '18

The qemuxml2argvtest does not need to link to the network driver after this commit: commit 0c63c117a2d17f66b05dd83e50aa36ac0b0c9843 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Fri Feb 9 15:08:53 2018 +0000 conf: reimplement virDomainNetResolveActualType in terms of public API Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a CI build fix for OS-X tests/Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d9b3a99477..09647a959d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -583,7 +583,6 @@ qemuxml2argvtest_SOURCES = \ qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ testutils.c testutils.h qemuxml2argvtest_LDADD = libqemutestdriver.la \ - ../src/libvirt_driver_network_impl.la \ $(LDADDS) $(LIBXML_LIBS) qemuxml2argvmock_la_SOURCES = \ -- 2.14.3

1 0

[libvirt] [PATCH] conf: move 'generated' member from virMacAddr to virDomainNetDef
by Laine Stump 19 Feb '18

19 Feb '18

Commit 7e62c4cd26d (first appearing in libvirt-3.9.0 as a resolution to rhbz #1343919) added a "generated" attribute to virMacAddr that was set whenever a mac address was auto-generated by libvirt. This knowledge was used in a single place - when trying to match a NetDef from the domain to delete with user-provided XML. Since the XML parser always auto-generates a MAC address for NetDefs when none is provided, it was previously impossible to make a search where the MAC address wasn't significant, but the addition of the "generated" attribute made it possible for the search function to ignore auto-generated MACs. This implementation had a problem though - it was adding a field to a "low level" struct - virMacAddr - which is used in other places with the assumption that it contains exactly a 6 byte MAC address and nothing else. In particular, virNWFilterSnoopEthHdr uses virMacAddr as part of the definition of an ethernet packet header, whose layout must of course match an actual ethernet packet. Adding the extra bools into virNWFilterSnoopEthHdr caused the nwfilter driver's "IP discovery via DHCP packet snooping" functionality to mysteriously stop working. In order to fix that behavior, and prevent potential future similar odd behavior, this patch moves the "generated" member out of virMacAddr (so that it is again really just a MAC address) and into virDomainNetDef, and sets it only when virDomainNetGenerateMAC() is called from virDomainNetDefParseXML() (which is the only time we care about it). Resolves: https://bugzilla.redhat.com/1529338 (It should also be applied to any maintenance branch that applies commit 7e62c4cd26 and friends to resolve https://bugzilla.redhat.com/1343919) Signed-off-by: Laine Stump <laine(a)laine.org> --- src/conf/domain_conf.c | 3 ++- src/conf/domain_conf.h | 1 + src/util/virmacaddr.c | 5 ----- src/util/virmacaddr.h | 2 -- tests/bhyveargv2xmlmock.c | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3cfd6de5e0..7783a3dbef 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11064,6 +11064,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, } } else { virDomainNetGenerateMAC(xmlopt, &def->mac); + def->mac_generated = true; } if (devaddr) { @@ -16283,7 +16284,7 @@ virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net) size_t i; int matchidx = -1; char mac[VIR_MAC_STRING_BUFLEN]; - bool MACAddrSpecified = !net->mac.generated; + bool MACAddrSpecified = !net->mac_generated; bool PCIAddrSpecified = virDomainDeviceAddressIsValid(&net->info, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e6212818aa..b0a175b4a4 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -966,6 +966,7 @@ struct _virDomainActualNetDef { struct _virDomainNetDef { virDomainNetType type; virMacAddr mac; + bool mac_generated; /* true if mac was *just now* auto-generated by libvirt */ char *model; union { struct { diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 409fdc34d5..7afe032b9c 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -107,7 +107,6 @@ void virMacAddrSet(virMacAddrPtr dst, const virMacAddr *src) { memcpy(dst, src, sizeof(*src)); - dst->generated = false; } /** @@ -121,7 +120,6 @@ void virMacAddrSetRaw(virMacAddrPtr dst, const unsigned char src[VIR_MAC_BUFLEN]) { memcpy(dst->addr, src, VIR_MAC_BUFLEN); - dst->generated = false; } /** @@ -151,7 +149,6 @@ virMacAddrParse(const char* str, virMacAddrPtr addr) { size_t i; - addr->generated = false; errno = 0; for (i = 0; i < VIR_MAC_BUFLEN; i++) { char *end_ptr; @@ -220,7 +217,6 @@ virMacAddrParseHex(const char *str, virMacAddrPtr addr) str[VIR_MAC_HEXLEN]) return -1; - addr->generated = false; for (i = 0; i < VIR_MAC_BUFLEN; i++) addr->addr[i] = (virHexToBin(str[2 * i]) << 4 | virHexToBin(str[2 * i + 1])); @@ -236,7 +232,6 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], addr->addr[3] = virRandomBits(8); addr->addr[4] = virRandomBits(8); addr->addr[5] = virRandomBits(8); - addr->generated = true; } /* The low order bit of the first byte is the "multicast" bit. */ diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index ef4285d639..f4f5e2ce11 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -36,8 +36,6 @@ typedef virMacAddr *virMacAddrPtr; struct _virMacAddr { unsigned char addr[VIR_MAC_BUFLEN]; - bool generated; /* True if MAC address was autogenerated, - false otherwise. */ }; int virMacAddrCompare(const char *mac1, const char *mac2); diff --git a/tests/bhyveargv2xmlmock.c b/tests/bhyveargv2xmlmock.c index dd25f4e13a..1f08bebb7b 100644 --- a/tests/bhyveargv2xmlmock.c +++ b/tests/bhyveargv2xmlmock.c @@ -16,7 +16,6 @@ virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], addr->addr[3] = 0; addr->addr[4] = 0; addr->addr[5] = 0; - addr->generated = true; } int -- 2.14.3

3 2

[libvirt] [PATCH v3 00/10] Cleanups in QEMU driver wrt virConnectPtr
by Daniel P. Berrangé 19 Feb '18

19 Feb '18

There are many places we can stop passing around virConnectPtr now and directly open secondary drivers where required instead. v3: - More migration function renames - Style fixes v2: - Now with working tests ! Daniel P. Berrangé (10): driver: allow override of connection for secondary drivers conf: reimplement virDomainNetResolveActualType in terms of public API qemu: stop passing virConnectPtr into qemuMonitorStartCPUs conf: stop passing virConnectPtr into virDomainDiskTranslateSourcePool qemu: don't pass virConnectPtr around for secrets qemu: stop passing in virConnectPtr for looking up networks qemu: remove virConnectPtr from some more startup code paths qemu: remove virConnectPtr in some migration methods qemu: don't export migration job APIs qemu: rename migration APIs to include Src or Dst in their name src/conf/domain_conf.c | 90 ++- src/conf/domain_conf.h | 14 +- src/driver.c | 184 ++++- src/driver.h | 7 + src/libvirt_private.syms | 6 + src/network/bridge_driver.c | 76 +-- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_conf.h | 3 +- src/qemu/qemu_domain.c | 111 ++- src/qemu/qemu_domain.h | 21 +- src/qemu/qemu_driver.c | 324 ++++----- src/qemu/qemu_hotplug.c | 66 +- src/qemu/qemu_hotplug.h | 15 +- src/qemu/qemu_migration.c | 1522 +++++++++++++++++++++--------------------- src/qemu/qemu_migration.h | 301 ++++----- src/qemu/qemu_monitor.c | 10 +- src/qemu/qemu_monitor.h | 11 +- src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_monitor_text.c | 9 +- src/qemu/qemu_monitor_text.h | 3 +- src/qemu/qemu_process.c | 154 ++--- src/qemu/qemu_process.h | 12 +- tests/Makefile.am | 7 +- tests/qemuhotplugtest.c | 4 +- tests/qemumonitorjsontest.c | 2 +- tests/qemuxml2argvtest.c | 11 +- 27 files changed, 1517 insertions(+), 1455 deletions(-) -- 2.14.3

2 14

Re: [libvirt] Regarding libvirt patchset "Keep original security label"
by Michal Privoznik 19 Feb '18

19 Feb '18

[Adding libvirt-list as others might chime in or when somebody is solving similar issue they can find answers in the archive.] On 02/19/2018 10:09 AM, Toni Peltonen wrote: > Hi, > > Sorry to bother you with ages old stuff like this (https://www.redhat.com/archives/libvir-list/2014-September/msg00551.html) patch set. > > I did some proof of concept work on my laptop during the weekend with a couple of CentOS 7 virtual machines running shared GFS2 mount (with working dlm locking) and libvirtd + QEMU guests on top of that. I am running the latest libvirtd packages from CentOS upstream. > > While I managed to get dlm and global POSIX locking working as expected when I added virtlockd to the picture to actually hold locks for the VM images I ended up getting some gray hair realizing that this ages old security label issue is still present. The situation is basically still the same: > > - On a shared filesystem (like GFS2), despite virtlockd locks working as expected, libvirtd still (as expected with current code) tries to change the ownership and security labels of the target file (QCOW2 image) > > - This sudden change causes the virtual machine running on the other host to drop as read-only since SELinux starts preventing all write operations for it > > - With SELinux in Permissive mode on the host that runs the virtual machine everything work as expected So you have a disk that is shared between two domains? One way to avoid the problem is to have <shareable/> in disk definition so that libvirt doesn't restore disk labels. However, that still might not work for you because it means that libvirt still changes labels on domain start. So far the only way to prevent this from happening is using custom labels https://libvirt.org/formatdomain.html#elementsDisks . > > > I saw that the only code available (that I could easily find and understand) to really tackle this issue was your patch set from as early as 2014. It seems it never hit upstream though, at least I can't find any of the relevant parts in the upstream code. > > I am just reaching out to ask whether this patch set was left out intentionally (https://www.redhat.com/archives/libvir-list/2014-September/msg00551.html) just lost in time or if you are aware of any other work that might be in progress to tackle this issue in the upstream? Unfortunately, the patches were abandoned and the issue is even worse. I remember having a discussion on this topic lately (although can't recall where). Turns out, we firstly relabel the disks and only after that we try to obtain disk locks. So if the latter fails (e.g. because another domain holds the locks) the lables are changed anyway. The suggested solution was to have two locks: one for disk contents the other for disk metadata (like security labels). Anyway, I don't think there's anybody working on this actively. Sorry. Michal

1 0

[libvirt] [PATCH 0/2] Two blockjob fixes
by Peter Krempa 19 Feb '18

19 Feb '18

Peter Krempa (2): virsh: Fix internal naming of some blockjob commands qemu: blockcopy: Add check for bandwidth src/qemu/qemu_driver.c | 8 +++++++ tools/virsh-domain.c | 60 +++++++++++++++++++++++++------------------------- 2 files changed, 38 insertions(+), 30 deletions(-) -- 2.15.0

2 3

[libvirt] ANNOUNCE: ruby-libvirt 0.7.1
by Chris Lalancette 18 Feb '18

18 Feb '18

I'm pleased to release ruby-libvirt 0.7.1. ruby-libvirt is a ruby wrapper around the libvirt API. The changelog between 0.7.0 and 0.7.1 is: * Fix a bad bug in block_resize (Marius Rieder) * Fix up some problems pointed out by clang * Fix up the tests for small semantic differences in how libvirt works Version 0.7.1 is available from http://libvirt.org/ruby: Tarball: http://libvirt.org/ruby/download/ruby-libvirt-0.7.1.tgz Gem: http://libvirt.org/ruby/download/ruby-libvirt-0.7.1.gem It is also available from rubygems.org; to get the latest version, run: $ gem install ruby-libvirt Packages for it are also built for Fedora, and will be released shortly. As usual, if you run into questions, problems, or bugs, please feel free to mail me (clalancette at gmail.com) and the libvirt mailing list. Thanks to those who contributed to this release.

1 0

[libvirt] [jenkins-ci PATCH] projects: Don't run virt-manager's test suite on FreeBSD
by Andrea Bolognani 16 Feb '18

16 Feb '18

The libxml2 bindings are broken under Python 3.6, so we have to disable this for the time being. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- projects/virt-manager.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index 8f3112e..e626cb0 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -20,6 +20,14 @@ - python-distutils-check-job: pyver: 3 parent_jobs: 'virt-manager-master-py{pyver}-build' + # libxml2's Python 3 bindings don't work properly on FreeBSD, + # so skip the test suite there for the time being. See + # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=224902 + machines: + - libvirt-debian-9 + - libvirt-fedora-26 + - libvirt-fedora-27 + - libvirt-fedora-rawhide - python-distutils-rpm-job: pyver: 3 parent_jobs: 'virt-manager-master-py{pyver}-check' -- 2.14.3

2 1

[libvirt] [PATCH 0/6] Alternative way of turning NWFilterObj(list) into virObject
by Michal Privoznik 16 Feb '18

16 Feb '18

This is heavily based on John's work (except 1/6). The difference to his patches is in using virObjectRecursiveLockableNew() for recursive locks instead of RW locks and lock promoting. Also, in 6/6 I was more confident and removed driver lock from define/undefine APIs. John Ferlan (1): nwfilter: Remove need for nwfilterDriverLock in some API's Michal Privoznik (5): virObject: use virReportSystemError if applicable virObject: Introduce virObjectRecursiveLockableNew virNWFilterObj: Turn into virObjectLockable conf: Introduce and use virNWFilterObjEndAPI nwfilter: Convert _virNWFilterObjList to use virObjectRWLockable cfg.mk | 1 - src/conf/virdomainobjlist.c | 3 +- src/conf/virnwfilterobj.c | 504 +++++++++++++++++++++------------ src/conf/virnwfilterobj.h | 12 +- src/libvirt_private.syms | 5 +- src/nwfilter/nwfilter_driver.c | 65 ++--- src/nwfilter/nwfilter_gentech_driver.c | 11 +- src/util/virobject.c | 30 +- src/util/virobject.h | 4 + 9 files changed, 382 insertions(+), 253 deletions(-) -- 2.13.6

5 15

[libvirt] [PATCH v5 0/3] nwfilter common object adjustments
by John Ferlan 15 Feb '18

15 Feb '18

v4: https://www.redhat.com/archives/libvir-list/2017-December/msg00282.html But more recently reviewed: https://www.redhat.com/archives/libvir-list/2018-February/msg00022.html https://www.redhat.com/archives/libvir-list/2018-February/msg00015.html https://www.redhat.com/archives/libvir-list/2018-February/msg00016.html Changes since v4: Pushed former patch 1/4 since it was ACK'd... - Patch 2: * Return NULL on error in virNWFilterObjListFindInstantiateFilter instead of the somewhat obfuscated @obj which would be NULL as a result of the virNWFilterObjEndAPI * Use virNWFilterObjDemoteFromWrite prior to return obj when the path was returning a write locked object. - Patch 3: * Reword the comment prior to virNWFilterObjListFindByNameLocked in order to better explain what's happening * Ensure the write lock occurs while the nwfilters lock is held. * Fix the virNWFilterCountData setup * Fix the formatting for the @def in virNWFilterObjListExportCallback (there was an extra space) - Patch 4: * No change, still needs the official ACK/R-b though NB: Testing done... * Ran/passed the nwfilter concurrency test w/ the changes * Ran/passed the Avocado nwfilter_update_lock, nwfilter_update_vm_running, and virsh.nwfilter_undefine.error_test.acl_test tests - these were the ones with the most nwfilter "interaction" that would cause issues at various points in time during installation. John Ferlan (3): nwfilter: Convert _virNWFilterObj to use virObjectRWLockable nwfilter: Convert _virNWFilterObjList to use virObjectRWLockable nwfilter: Remove need for nwfilterDriverLock in some API's src/conf/virnwfilterobj.c | 540 +++++++++++++++++++++++---------- src/conf/virnwfilterobj.h | 11 +- src/libvirt_private.syms | 3 +- src/nwfilter/nwfilter_driver.c | 71 ++--- src/nwfilter/nwfilter_gentech_driver.c | 11 +- 5 files changed, 427 insertions(+), 209 deletions(-) -- 2.13.6

4 21

[libvirt] [PATCH 0/3] Fix trouble with <backingStore> in virsh detach-disk
by Peter Krempa 15 Feb '18

15 Feb '18

We've created malformed <auth> element for RBD images in backing store of a disk which failed parsing and broke detaching disks via virsh. Fix it by not parsing auth data at all from the disk backing images and remove the <backingStore> element when constructing the XML for disk detach. Peter Krempa (3): virsh: detach-disk: Add --print-xml switch util: storage: Remove detected authentication data for backing chains virsh: Remove <backingStore> sub-element in virshFindDisk src/util/virstoragefile.c | 8 ++++++++ tests/virstoragetest.c | 15 +++------------ tools/virsh-domain.c | 44 +++++++++++++++++++++++++++++++++----------- tools/virsh.pod | 4 ++++ 4 files changed, 48 insertions(+), 23 deletions(-) -- 2.15.0

2 4

[libvirt] [jenkins-ci PATCH] jobs: Set $PYTHONPATH for python-distutils jobs
by Andrea Bolognani 15 Feb '18

15 Feb '18

Since we install Python modules under $VIRT_PREFIX, we need to set $PYTHONPATH or the interpreter won't be able to locate them. This is currently being done per-worker in the Jenkins Web interface. However, now that we've introduced Python 3 builds, depending on the project and the OS, we might be using any of Python 2.7, 3.4, 3.5 and 3.6, which means we can't have a single $PYTHONPATH anymore: in particular, while it's okay to have non-esisting directories in $PYTHONPATH, we have to make sure that a Python 3 interpreter will never try to use a Python 2 module and vice versa. To solve the issue, we use a fairly large hammer: we set $PYTHONPATH at the job level, and include all reasonable minor versions for the Python major version (pyver) the job is using, even if they don't yet exist. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Another approach would be to use something like T=$VIRT_PREFIX/lib/python{pyver}.4/site-packages T=$T:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages T=$T:$VIRT_PREFIX/lib/python{pyver}.5/site-packages T=$T:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages T=$T:$VIRT_PREFIX/lib/python{pyver}.6/site-packages T=$T:$VIRT_PREFIX/lib64/python{pyver}.6/site-packages T=$T:$VIRT_PREFIX/lib/python{pyver}.7/site-packages T=$T:$VIRT_PREFIX/lib64/python{pyver}.7/site-packages export PYTHONPATH=$T but that's just a different kind of ugly :/ jobs/python-distutils.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index ff68c29..510769e 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -42,6 +42,7 @@ - shell: | {global_env} {local_env} + export PYTHONPATH=$VIRT_PREFIX/lib/python{pyver}.4/site-packages:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages:$VIRT_PREFIX/lib/python{pyver}.5/site-packages:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages:$VIRT_PREFIX/lib/python{pyver}.6/site-packages:$VIRT_PREFIX/lib64/python{pyver}.6/site-packages:$VIRT_PREFIX/lib/python{pyver}.7/site-packages:$VIRT_PREFIX/lib64/python{pyver}.7/site-packages {command_pre_build} python{pyver} ./setup.py build python{pyver} ./setup.py install --prefix=$VIRT_PREFIX @@ -83,6 +84,7 @@ - shell: | {global_env} {local_env} + export PYTHONPATH=$VIRT_PREFIX/lib/python{pyver}.4/site-packages:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages:$VIRT_PREFIX/lib/python{pyver}.5/site-packages:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages:$VIRT_PREFIX/lib/python{pyver}.6/site-packages:$VIRT_PREFIX/lib64/python{pyver}.6/site-packages:$VIRT_PREFIX/lib/python{pyver}.7/site-packages:$VIRT_PREFIX/lib64/python{pyver}.7/site-packages python{pyver} ./setup.py test publishers: - email: @@ -121,6 +123,7 @@ - shell: | {global_env} {local_env} + export PYTHONPATH=$VIRT_PREFIX/lib/python{pyver}.4/site-packages:$VIRT_PREFIX/lib64/python{pyver}.4/site-packages:$VIRT_PREFIX/lib/python{pyver}.5/site-packages:$VIRT_PREFIX/lib64/python{pyver}.5/site-packages:$VIRT_PREFIX/lib/python{pyver}.6/site-packages:$VIRT_PREFIX/lib64/python{pyver}.6/site-packages:$VIRT_PREFIX/lib/python{pyver}.7/site-packages:$VIRT_PREFIX/lib64/python{pyver}.7/site-packages sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in python{pyver} ./setup.py rpm publishers: -- 2.14.3

2 2

[libvirt] [PATCH 0/3] virSysinfo: Introduce SMBIOS type 3 support
by Zhuangyanying 15 Feb '18

15 Feb '18

From: Zhuang Yanying <ann.zhuangyanying(a)huawei.com> Some applications inside VM need to access SMBIOS Chassis Asset Tag, which should be emulated. access inside VM (for example) Linux: /sys/class/dmi/id/chassis_asset_tag. Windows: (Get-WmiObject Win32_SystemEnclosure).SMBIOSAssetTag wirhin Windows PowerShell. It has already been realized in qemu: SMBIOS: Build aggregate smbios tables and entry point https://git.qemu.org/?p=qemu.git;a=commit;h=c97294ec1b9e36887e119589d456557… but not in libvirt. we realize it here. As an example, you could use something like <chassis> <entry name='manufacturer'>Huawei</entry> <entry name='version'>To be filled by O.E.M.</entry> <entry name='serial'>To be filled by O.E.M.</entry> <entry name='asset'>To be filled by O.E.M.</entry> <entry name='sku'>Type3Sku1</entry> </chassis> BTW: I'll be on vacation for china spring festival for the next week, I'll response as soon as I get back if there's any modification needed. Zhuang Yanying (3): conf: add support for setting Chassis SMBIOS data fields qemu: add support for generating SMBIOS Chassis strings command line news: add support for setting Chassis SMBIOS data fields docs/formatdomain.html.in | 23 +++++++ docs/news.xml | 5 ++ docs/schemas/domaincommon.rng | 22 ++++++ src/conf/domain_conf.c | 55 +++++++++++++++ src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 51 ++++++++++++++ src/util/virsysinfo.c | 133 +++++++++++++++++++++++++++++++++++- src/util/virsysinfo.h | 13 ++++ tests/qemuxml2argvdata/smbios.args | 2 + tests/qemuxml2argvdata/smbios.xml | 7 ++ tests/qemuxml2xmloutdata/smbios.xml | 7 ++ 11 files changed, 318 insertions(+), 1 deletion(-) -- 1.8.3.1

2 5

[libvirt] Should we switch to a different JSON library?
by Martin Kletzander 14 Feb '18

14 Feb '18

Hi everyone, so we are using yajl for parsing JSON. However there are some reasons why we might consider switching to another one: 1) It is basically dead upstream 2) We're just using the lexer part of it 3) We only use it for parsing 4) The are workarounds for it in the code So I looked at some options and found few other libraries, I only took those that are widely available (read: I checked if some random downstream distro has them), however most of them were not very much usable. Except one. But here's the list of few others that didn't look that bad either. All are MIT-licensed, try to be thread-safe and support pkg-config: - libfastjson [1] - from rsyslog community, optimized for working with logs, used almost only by rsyslog, it's supposed to have doxygen docs, they switched to libfastjson from json-c due to some problems with it (performance, ref counting bug, ...) - json-c [2] - looked abandoned until I looked at the proper github page, "documentation" in doxygen - Jansson [3] - I really like this one. The API seems very intuitive, it has nice documentation [4] in readthedocs (and I'm not talking about the visual style, but how easy is to find information), it can be used for formatting JSON in a similar way we are doing it. It has json_auto_t (optional) type that uses the attribute cleanup for automatic scope dereference (just in case we want to use it), it has iterators... did I tell you I like this one a lot? What do you (others) think of switching the JSON library? Do you know about any other projects that could be used considering license, platform support, etc.? Also feel free to fix any mistakes I might have posted. I double-checked it, but you know, "trust, but verify". Have a nice day, Martin [1] https://github.com/rsyslog/libfastjson [2] https://github.com/json-c/json-c [3] http://www.digip.org/jansson/ [4] https://jansson.readthedocs.io/

7 9

[libvirt] [PATCH 0/6] spec: Misc cleanups and improvements
by Jiri Denemark 14 Feb '18

14 Feb '18

Jiri Denemark (6): spec: Enable fuse only if LXC is enabled spec: Build virt-login-shell iff LXC driver is enabled spec: Drop checks for old Fedora releases spec: Prepare for future RHEL spec: Fix indentation in daemon's triggerpostun spec: Drop overlapping triggers libvirt.spec.in | 64 ++++++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) -- 2.16.1

2 12

[libvirt] [PATCH v2 0/2] Fix parsing and formatting of 'UnixSocketAddress' qapi type
by Peter Krempa 14 Feb '18

14 Feb '18

v2: Don't 'fix' it for gluster disks which use old syntax not conforming to the schema in qemu. Peter Krempa (2): storage: Fix formatting and parsing of qemu type 'UnixSocketAddress' virstoragetest: Add test case for NBD over unix socket with new syntax src/qemu/qemu_block.c | 13 +++++++++++-- src/util/virstoragefile.c | 8 +++++++- tests/virstoragetest.c | 9 +++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) -- 2.15.0

2 3

[libvirt] [jenkins-ci PATCH] jobs: Shorten name for python-distutils jobs
by Andrea Bolognani 14 Feb '18

14 Feb '18

Instead of passing the full name of the Python binary as 'python', only pass the major version as 'pyver' and build everything else based on that. Doing so allows us to make a few things, most notably job names, slightly shorter and nicer. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- I wouldn't bother changing this if the previous change to Python jobs had already been deployed, but since it hasn't yet might as well have nicer names instead :) jobs/python-distutils.yaml | 22 +++++++++++----------- projects/libvirt-python.yaml | 16 ++++++++-------- projects/virt-manager.yaml | 14 +++++++------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jobs/python-distutils.yaml b/jobs/python-distutils.yaml index 122c759..ff68c29 100644 --- a/jobs/python-distutils.yaml +++ b/jobs/python-distutils.yaml @@ -1,11 +1,11 @@ - job-template: id: python-distutils-build-job - name: '{name}-{branch}-{python}-build' + name: '{name}-{branch}-py{pyver}-build' project-type: matrix - description: '{title} Build ({python})' + description: '{title} Build (Python {pyver})' command_pre_build: '' - workspace: '{name}-{branch}-{python}' + workspace: '{name}-{branch}-py{pyver}' child-workspace: '.' block-downstream: true block-upstream: true @@ -43,8 +43,8 @@ {global_env} {local_env} {command_pre_build} - {python} ./setup.py build - {python} ./setup.py install --prefix=$VIRT_PREFIX + python{pyver} ./setup.py build + python{pyver} ./setup.py install --prefix=$VIRT_PREFIX publishers: - email: recipients: '{obj:spam}' @@ -54,9 +54,9 @@ - job-template: id: python-distutils-check-job - name: '{name}-{branch}-{python}-check' + name: '{name}-{branch}-py{pyver}-check' project-type: matrix - description: '{title} Check ({python})' + description: '{title} Check (Python {pyver})' workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true @@ -83,7 +83,7 @@ - shell: | {global_env} {local_env} - {python} ./setup.py test + python{pyver} ./setup.py test publishers: - email: recipients: '{obj:spam}' @@ -92,9 +92,9 @@ - job-template: id: python-distutils-rpm-job - name: '{name}-{branch}-{python}-rpm' + name: '{name}-{branch}-py{pyver}-rpm' project-type: matrix - description: '{title} RPM ({python})' + description: '{title} RPM (Python {pyver})' workspace: '{name}-{branch}' child-workspace: '.' block-downstream: true @@ -122,7 +122,7 @@ {global_env} {local_env} sed -i -e 's/BuildRequires: libvirt.*devel.*//' *.spec.in - {python} ./setup.py rpm + python{pyver} ./setup.py rpm publishers: - email: recipients: '{obj:spam}' diff --git a/projects/libvirt-python.yaml b/projects/libvirt-python.yaml index e065c5d..1c29321 100644 --- a/projects/libvirt-python.yaml +++ b/projects/libvirt-python.yaml @@ -14,10 +14,10 @@ title: Libvirt Python jobs: - python-distutils-build-job: - python: python2 + pyver: 2 parent_jobs: 'libvirt-master-build' - python-distutils-build-job: - python: python3 + pyver: 3 parent_jobs: 'libvirt-master-build' machines: - libvirt-debian-8 @@ -28,11 +28,11 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 - python-distutils-check-job: - python: python2 - parent_jobs: 'libvirt-python-master-{python}-build' + pyver: 2 + parent_jobs: 'libvirt-python-master-py{pyver}-build' - python-distutils-check-job: - python: python3 - parent_jobs: 'libvirt-python-master-{python}-build' + pyver: 3 + parent_jobs: 'libvirt-python-master-py{pyver}-build' machines: - libvirt-debian-8 - libvirt-debian-9 @@ -42,8 +42,8 @@ - libvirt-freebsd-10 - libvirt-freebsd-11 - python-distutils-rpm-job: - python: python2 - parent_jobs: 'libvirt-python-master-{python}-check' + pyver: 2 + parent_jobs: 'libvirt-python-master-py{pyver}-check' machines: - libvirt-centos-6 - libvirt-centos-7 diff --git a/projects/virt-manager.yaml b/projects/virt-manager.yaml index b5b0df5..8f3112e 100644 --- a/projects/virt-manager.yaml +++ b/projects/virt-manager.yaml @@ -11,18 +11,18 @@ title: Virtual Machine Manager jobs: - python-distutils-build-job: - python: python3 + pyver: 3 parent_jobs: - - 'libvirt-python-master-{python}-build' + - 'libvirt-python-master-py{pyver}-build' - 'libosinfo-master-build' command_pre_build: | - {python} ./setup.py configure --prefix=$VIRT_PREFIX + python{pyver} ./setup.py configure --prefix=$VIRT_PREFIX - python-distutils-check-job: - python: python3 - parent_jobs: 'virt-manager-master-{python}-build' + pyver: 3 + parent_jobs: 'virt-manager-master-py{pyver}-build' - python-distutils-rpm-job: - python: python3 - parent_jobs: 'virt-manager-master-{python}-check' + pyver: 3 + parent_jobs: 'virt-manager-master-py{pyver}-check' machines: - libvirt-fedora-26 - libvirt-fedora-27 -- 2.14.3

2 1

[libvirt] [PATCH 0/3] Fix parsing and formatting of 'UnixSocketAddress' qapi type
by Peter Krempa 14 Feb '18

14 Feb '18

Fix the naming mistake, add tests and remove useless comment. Peter Krempa (3): storage: Fix formatting and parsing of qemu type 'UnixSocketAddress' virstoragetest: Add test case for NBD over unix socket with new syntax qemu: block: Remove misleading part of comment in qemuBlockStorageSourceBuildJSONSocketAddress src/qemu/qemu_block.c | 7 +------ src/util/virstoragefile.c | 2 +- tests/virstoragetest.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 9 deletions(-) -- 2.15.0

2 7

[libvirt] [PATCHv2 0/1] Function declarations match definitions
by Chris Venteicher 14 Feb '18

14 Feb '18

Interested in fixing mismatches between function parameter names in declarations (header files) and definitions (.c files)? This is a cosmetic / redability fix and does not change functionality. This is patch 1 of larger set of 22 patches that fix parameter names across the libvirt source code. If there is interest I can send the entire patch set. These are cosmetic redability fixes automatically generated by clang-tidy. make check and make syntax-check pass successfully after the 22 patches are applied. This is my first submission so please point out any issues and I will be glad to fix. Chris Venteicher (1): include: function parameter names same in declaration include/libvirt/libvirt-domain.h | 18 +++++++------- include/libvirt/libvirt-event.h | 4 ++-- include/libvirt/libvirt-host.h | 4 ++-- include/libvirt/libvirt-network.h | 4 ++-- include/libvirt/libvirt-nwfilter.h | 2 +- include/libvirt/libvirt-qemu.h | 2 +- include/libvirt/libvirt-secret.h | 4 ++-- include/libvirt/libvirt-storage.h | 12 +++++----- include/libvirt/libvirt-stream.h | 22 ++++++++--------- src/libvirt-domain.c | 48 +++++++++++++++++++------------------- src/libvirt-network.c | 10 ++++---- 11 files changed, 65 insertions(+), 65 deletions(-) -- 2.14.1

4 6

[libvirt] Default USB controller model vs PCI address assignment
by Daniel P. Berrangé 13 Feb '18

13 Feb '18

GCC8 identified a critical flaw in the QEMU post-parse callback They switch() based on the virDomainControllDef 'model', carefully listing every single enum case..... but no default statement. Unfortunately it is valid for "model" to have the valid "-1" which does not map to any enum constant. So the lack of any "default" statement, means when dealing with the USB controller we mistakenly fall through to the IDE controller code. The SCSI controller simililarly falls through to the virtio serial controller case. I tried just adding the obvious default case: diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index e28119e4b..3eaa22e39 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -532,6 +532,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2: /* xen only */ case VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE: case VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST: + default: return 0; } @@ -553,6 +554,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return pciFlags; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: return 0; } This causes many of the QEMU test cases to fail now with a message "internal error: Cannot automatically add a new PCI bus for a device with connect flags 00" I could theoretically make the "default:" case return "pciFlags" when model == -1, but this seems dubious because it feels like it is blindly assuming that any unknown controller model is PCI based, but it would be functionally equivalent to the current behaviour where USB accidentally falls through to the IDE code. Thoughts ? Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 1

[libvirt] [PATCH v2 0/3] Fix compat with GCC8
by Daniel P. Berrangé 13 Feb '18

13 Feb '18

In this second version I enable -Wswitch-enum to strongly validate all switches cover all enum cases. Daniel P. Berrangé (3): Turn on -Wswitch-enum and fix all problems it identifies Fix more switch fallthrough identified by gcc8 Disable gcc8 -Wcast-function-type warnings from -Wextra m4/virt-compile-warnings.m4 | 9 ++++-- src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++---- src/conf/nwfilter_conf.c | 32 ++++++++++++++++++++- src/esx/esx_driver.c | 1 + src/esx/esx_vi.c | 11 +++++--- src/esx/esx_vi_types.c | 9 +++--- src/hyperv/hyperv_driver.c | 18 ++++++++++-- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_container.c | 7 +++-- src/lxc/lxc_controller.c | 10 ++++++- src/lxc/lxc_driver.c | 40 +++++++++++++++++++++++--- src/nwfilter/nwfilter_ebiptables_driver.c | 16 +++++++---- src/nwfilter/nwfilter_learnipaddr.c | 6 +++- src/qemu/qemu_command.c | 28 ++++++++++++------ src/qemu/qemu_domain.c | 35 ++++++++++++++++++----- src/qemu/qemu_domain_address.c | 11 ++++++++ src/qemu/qemu_driver.c | 27 ++++++++++++------ src/qemu/qemu_hotplug.c | 36 +++++++++++++++++++---- src/qemu/qemu_migration.c | 11 +++++++- src/qemu/qemu_process.c | 2 ++ src/rpc/virnetclient.c | 2 ++ src/rpc/virnetclientprogram.c | 1 + src/rpc/virnetserverprogram.c | 4 +++ src/security/security_driver.c | 1 + src/util/virconf.c | 13 ++++++++- src/util/virfirewall.c | 7 +++-- src/util/virlog.c | 10 ++++++- src/util/virnetdevvportprofile.c | 11 +++++++- src/vmx/vmx.c | 27 ++++++++++++++++-- src/xenconfig/xen_common.c | 17 +++++++++-- src/xenconfig/xen_xl.c | 8 +++++- tools/virt-host-validate-qemu.c | 3 +- 33 files changed, 389 insertions(+), 74 deletions(-) -- 2.16.1

1 4

[libvirt] [PATCH 0/6] Cleanups in QEMU driver wrt virConnectPtr
by Daniel P. Berrangé 13 Feb '18

13 Feb '18

There are many places we can stop passing around virConnectPtr now and directly open secondary drivers where required instead. Daniel P. Berrangé (6): conf: reimplement virDomainNetResolveActualType in terms of public API qemu: stop passing virConnectPtr into qemuMonitorStartCPUs conf: stop passing virConnectPtr into virDomainDiskTranslateSourcePool qemu: don't pass virConnectPtr around for secrets qemu: stop passing in virConnectPtr for looking up networks qemu: remove virConnectPtr from some more startup code paths src/conf/domain_conf.c | 90 +++++++++++++++++++++++++---- src/conf/domain_conf.h | 14 +---- src/network/bridge_driver.c | 76 +----------------------- src/qemu/qemu_conf.c | 3 +- src/qemu/qemu_conf.h | 3 +- src/qemu/qemu_domain.c | 111 +++++++++++++++++------------------ src/qemu/qemu_domain.h | 15 ++--- src/qemu/qemu_driver.c | 126 +++++++++++++++------------------------- src/qemu/qemu_hotplug.c | 66 +++++++++------------ src/qemu/qemu_hotplug.h | 15 ++--- src/qemu/qemu_migration.c | 18 +++--- src/qemu/qemu_monitor.c | 10 ++-- src/qemu/qemu_monitor.h | 11 +--- src/qemu/qemu_monitor_json.c | 3 +- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/qemu_monitor_text.c | 9 +-- src/qemu/qemu_monitor_text.h | 3 +- src/qemu/qemu_process.c | 134 +++++++++++++++++-------------------------- src/qemu/qemu_process.h | 12 ++-- tests/qemuhotplugtest.c | 4 +- tests/qemumonitorjsontest.c | 2 +- 21 files changed, 298 insertions(+), 430 deletions(-) -- 2.14.3

2 12

[libvirt] Developing libvirt for virtual devices like virtual printers
by Deepti S 13 Feb '18

13 Feb '18

Hi, I have a couple of questions. - I am a new libvirt code developer. I have just cloned the repo and I am looking for a suitable debugger/IDE which will help me debug the code. - I work in developing and creating virtual printers with display, with QEMU as the hypervisor (no KVM-only Qemu). Currently we have our own application to manage the virtual printers. Our plan is to migrate to libvirt, and enable our application to use the libvirt APIs. libvirt code currently looks to be specialized in pure OS-specific guests (like PCs), and I hit snags where there are manadatory devices added which a virtual printer does not need. Are there any developers who are looking into customized virtual devices? I would like to knowledge share with them. The intention is to provide new libvirt APIs whenever there is such a snag and thus enable libvirt to be used for managing virtual printers. - One issue that we are seeing is with regard to USB Host Controller: We have a customized model of ehci USB Host Controller (named nr52_ehci_usb) in qemu (locally built). When I add the custom value (n552_ehci_usb) of the host controller as the "model" type in my dom xml, virsh define <xml> fails with invalid model type error. I remove the usb controller entry from the xml, and add "-usb" as a "qemucommandline" parameter, but then libvirt adds the device lsi (-device lsi,id=scsi0 -usb), and the virsh create command fails with: "-device lsi,id=scsi0 No PCI bus found for lsi53c895a". The board we have created in QEMU does not have PCI bus implemented. I am interested in the code related to host controllers. Is there any way I can get my usb host controller to be recognized by libvirt? Is there a way I can prevent lsi device from getting added when I make -usb a qemu command line parameter? Regards, Deepti

2 1

[libvirt] [PATCH libvirt] tests: run virshtest independent of current pwd
by Bjoern Walk 13 Feb '18

13 Feb '18

virshtest execves the virsh binary. Make sure that it finds the binary's location independent of the current working directory by specifying the absolute path as determined by the build environment. Reviewed-by: Marc Hartmayer <mhartmay(a)linux.vnet.ibm.com> Reviewed-by: Boris Fiuczynski <fiuczy(a)linux.vnet.ibm.com> Signed-off-by: Bjoern Walk <bwalk(a)linux.vnet.ibm.com> --- tests/virshtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/virshtest.c b/tests/virshtest.c index 67453bd9..94548a82 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -84,13 +84,13 @@ testCompareOutputLit(const char *expectData, return result; } -# define VIRSH_DEFAULT "../tools/virsh", \ +# define VIRSH_DEFAULT abs_topbuilddir "/tools/virsh", \ "--connect", \ "test:///default" static char *custom_uri; -# define VIRSH_CUSTOM "../tools/virsh", \ +# define VIRSH_CUSTOM abs_topbuilddir "/tools/virsh", \ "--connect", \ custom_uri -- 2.13.4

2 2

[libvirt] [RFC] virSysinfo: Introduce SMBIOS type 3 support
by Zhuangyanying 13 Feb '18

13 Feb '18

From: Zhuang Yanying <ann.zhuangyanying(a)huawei.com> Some applications inside VM need to access SMBIOS Chassis Asset Tag, which should be emulated. It has already been realized in qemu, SMBIOS: Build aggregate smbios tables and entry point https://git.qemu.org/?p=qemu.git;a=commit;h=c97294ec1b9e36887e119589d456557… but not in libvirt. we realize it here. As an example, you could use something like <chassis> <entry name='manufacturer'>LENOVO</entry> <entry name='version'>0B98401 Pro</entry> <entry name='serial'>W1KS427111E</entry> <entry name='asset'>344dfTYH#</entry> </chassis> --- src/conf/domain_conf.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsysinfo.c | 37 +++++++++++++++++++++++++++++++++++ src/util/virsysinfo.h | 13 +++++++++++++ 4 files changed, 151 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34aae82..b0d5d68 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14506,6 +14506,47 @@ virSysinfoBaseBoardParseXML(xmlXPathContextPtr ctxt, return ret; } +static int +virSysinfoChassisParseXML(xmlNodePtr node, + xmlXPathContextPtr ctxt, + virSysinfoChassisDefPtr *chassisdef) +{ + int ret = -1; + virSysinfoChassisDefPtr def; + + if (!xmlStrEqual(node->name, BAD_CAST "chassis")) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("XML does not contain expected 'chassis' element")); + return ret; + } + + if (VIR_ALLOC(def) < 0) + goto cleanup; + + def->manufacturer = + virXPathString("string(entry[@name='manufacturer'])", ctxt); + def->version = + virXPathString("string(entry[@name='version'])", ctxt); + def->serial = + virXPathString("string(entry[@name='serial'])", ctxt); + def->asset = + virXPathString("string(entry[@name='asset'])", ctxt); + def->sku = + virXPathString("string(entry[@name='sku'])", ctxt); + + if (!def->manufacturer && !def->version && + !def->serial && !def->asset && !def->sku) { + virSysinfoChassisDefFree(def); + def = NULL; + } + + *chassisdef = def; + def = NULL; + ret = 0; + cleanup: + virSysinfoChassisDefFree(def); + return ret; +} static int virSysinfoOEMStringsParseXML(xmlXPathContextPtr ctxt, @@ -14600,6 +14641,17 @@ virSysinfoParseXML(xmlNodePtr node, if (virSysinfoBaseBoardParseXML(ctxt, &def->baseBoard, &def->nbaseBoard) < 0) goto error; + /* Extract chassis metadata */ + if ((tmpnode = virXPathNode("./chassis[1]", ctxt)) != NULL) { + oldnode = ctxt->node; + ctxt->node = tmpnode; + if (virSysinfoChassisParseXML(tmpnode, ctxt, &def->chassis) < 0) { + ctxt->node = oldnode; + goto error; + } + ctxt->node = oldnode; + } + /* Extract system related metadata */ if ((tmpnode = virXPathNode("./oemStrings[1]", ctxt)) != NULL) { oldnode = ctxt->node; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24b434a..cf88e75 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5813,6 +5813,49 @@ qemuBuildSmbiosBaseBoardStr(virSysinfoBaseBoardDefPtr def) return NULL; } +static char * +qemuBuildSmbiosChassisStr(virSysinfoChassisDefPtr def) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + if (!def) + return NULL; + + virBufferAddLit(&buf, "type=3"); + + /* 2:Manufacturer */ + virBufferAddLit(&buf, ",manufacturer="); + virQEMUBuildBufferEscapeComma(&buf, def->manufacturer); + /* 2:Version */ + if (def->version) { + virBufferAddLit(&buf, ",version="); + virQEMUBuildBufferEscapeComma(&buf, def->version); + } + /* 2:Serial Number */ + if (def->serial) { + virBufferAddLit(&buf, ",serial="); + virQEMUBuildBufferEscapeComma(&buf, def->serial); + } + /* 2:Asset Tag */ + if (def->asset) { + virBufferAddLit(&buf, ",asset="); + virQEMUBuildBufferEscapeComma(&buf, def->asset); + } + /* 2:Sku */ + if (def->sku) { + virBufferAddLit(&buf, ",sku="); + virQEMUBuildBufferEscapeComma(&buf, def->sku); + } + + if (virBufferCheckError(&buf) < 0) + goto error; + + return virBufferContentAndReset(&buf); + + error: + virBufferFreeAndReset(&buf); + return NULL; +} static char * qemuBuildSmbiosOEMStringsStr(virSysinfoOEMStringsDefPtr def) @@ -5905,6 +5948,12 @@ qemuBuildSmbiosCommandLine(virCommandPtr cmd, VIR_FREE(smbioscmd); } + smbioscmd = qemuBuildSmbiosChassisStr(source->chassis); + if (smbioscmd != NULL) { + virCommandAddArgList(cmd, "-smbios", smbioscmd, NULL); + VIR_FREE(smbioscmd); + } + if (source->oemStrings) { if (!(smbioscmd = qemuBuildSmbiosOEMStringsStr(source->oemStrings))) return -1; diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index e8d3371..af434e0 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -108,6 +108,18 @@ void virSysinfoBaseBoardDefClear(virSysinfoBaseBoardDefPtr def) VIR_FREE(def->location); } +void virSysinfoChassisDefFree(virSysinfoChassisDefPtr def) +{ + if (def == NULL) + return; + + VIR_FREE(def->manufacturer); + VIR_FREE(def->version); + VIR_FREE(def->serial); + VIR_FREE(def->asset); + VIR_FREE(def->sku); +} + void virSysinfoOEMStringsDefFree(virSysinfoOEMStringsDefPtr def) { size_t i; @@ -143,6 +155,8 @@ void virSysinfoDefFree(virSysinfoDefPtr def) virSysinfoBaseBoardDefClear(def->baseBoard + i); VIR_FREE(def->baseBoard); + virSysinfoChassisDefFree(def->chassis); + for (i = 0; i < def->nprocessor; i++) { VIR_FREE(def->processor[i].processor_socket_destination); VIR_FREE(def->processor[i].processor_type); @@ -1203,6 +1217,28 @@ virSysinfoBaseBoardFormat(virBufferPtr buf, } static void +virSysinfoChassisFormat(virBufferPtr buf, virSysinfoChassisDefPtr def) +{ + if (!def) + return; + + virBufferAddLit(buf, "<chassis>\n"); + virBufferAdjustIndent(buf, 2); + virBufferEscapeString(buf, "<entry name='manufacturer'>%s</entry>\n", + def->manufacturer); + virBufferEscapeString(buf, "<entry name='version'>%s</entry>\n", + def->version); + virBufferEscapeString(buf, "<entry name='serial'>%s</entry>\n", + def->serial); + virBufferEscapeString(buf, "<entry name='asset'>%s</entry>\n", + def->asset); + virBufferEscapeString(buf, "<entry name='sku'>%s</entry>\n", + def->sku); + virBufferAdjustIndent(buf, -2); + virBufferAddLit(buf, "</chassis>\n"); +} + +static void virSysinfoProcessorFormat(virBufferPtr buf, virSysinfoDefPtr def) { size_t i; @@ -1354,6 +1390,7 @@ virSysinfoFormat(virBufferPtr buf, virSysinfoDefPtr def) virSysinfoBIOSFormat(&childrenBuf, def->bios); virSysinfoSystemFormat(&childrenBuf, def->system); virSysinfoBaseBoardFormat(&childrenBuf, def->baseBoard, def->nbaseBoard); + virSysinfoChassisFormat(&childrenBuf, def->chassis); virSysinfoProcessorFormat(&childrenBuf, def); virSysinfoMemoryFormat(&childrenBuf, def); virSysinfoOEMStringsFormat(&childrenBuf, def->oemStrings); diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index ecb3a36..00a15db 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -98,6 +98,16 @@ struct _virSysinfoBaseBoardDef { /* XXX board type */ }; +typedef struct _virSysinfoChassisDef virSysinfoChassisDef; +typedef virSysinfoChassisDef *virSysinfoChassisDefPtr; +struct _virSysinfoChassisDef { + char *manufacturer; + char *version; + char *serial; + char *asset; + char *sku; +}; + typedef struct _virSysinfoOEMStringsDef virSysinfoOEMStringsDef; typedef virSysinfoOEMStringsDef *virSysinfoOEMStringsDefPtr; struct _virSysinfoOEMStringsDef { @@ -116,6 +126,8 @@ struct _virSysinfoDef { size_t nbaseBoard; virSysinfoBaseBoardDefPtr baseBoard; + virSysinfoChassisDefPtr chassis; + size_t nprocessor; virSysinfoProcessorDefPtr processor; @@ -130,6 +142,7 @@ virSysinfoDefPtr virSysinfoRead(void); void virSysinfoBIOSDefFree(virSysinfoBIOSDefPtr def); void virSysinfoSystemDefFree(virSysinfoSystemDefPtr def); void virSysinfoBaseBoardDefClear(virSysinfoBaseBoardDefPtr def); +void virSysinfoChassisDefFree(virSysinfoChassisDefPtr def); void virSysinfoOEMStringsDefFree(virSysinfoOEMStringsDefPtr def); void virSysinfoDefFree(virSysinfoDefPtr def); -- 1.8.3.1

2 1

[libvirt] [PATCH 00/11] Fixes and improvements to feature handling
by Andrea Bolognani 13 Feb '18

13 Feb '18

This series is the result of shaving many a yak while implementing support for pSeries optional features (first attempt at [1], respin coming right after I send this). Quick summary of the changes: * handle more sanely cases where the GIC capability has been enabled but no GIC version has been provided; * use the switch construct more, so that the compiler can warn us when we forget to handle some feature; * where possible (eg. the value is mandatory and there is only a limited number of options to choose from) avoid storing whether a feature is enabled and its actual value separately. Save for the first one, none of the changes should be visible to the user, but they will hopefully improve things for developers. [1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (11): qemu: Move feature verification from PostParse() to Validate() qemu: Use switch in qemuDomainDefValidateFeatures() qemu: Move GIC checks to qemuDomainDefValidateFeatures() conf: Use switch in virDomainDefFeaturesCheckABIStability() conf: Validate VIR_DOMAIN_FEATURE_CAPABILITIES properly conf: Integrate all features ABI checks in the switch tests: Improve GIC tests qemu: Fix GIC behavior for the default case conf: Improve IOAPIC feature handling conf: Improve HPT feature handling tests: Clean up HPT tests src/conf/domain_conf.c | 174 +++++++++++++-------- src/conf/domain_conf.h | 15 +- src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 16 +- src/qemu/qemu_domain.c | 117 +++++++++----- .../qemuxml2argvdata/aarch64-gic-default-both.args | 1 + .../qemuxml2argvdata/aarch64-gic-default-both.xml | 1 + tests/qemuxml2argvdata/aarch64-gic-default-v2.args | 1 + tests/qemuxml2argvdata/aarch64-gic-default-v2.xml | 1 + tests/qemuxml2argvdata/aarch64-gic-default-v3.args | 1 + tests/qemuxml2argvdata/aarch64-gic-default-v3.xml | 1 + ...hpt-resizing.args => pseries-features-hpt.args} | 1 - .../pseries-features-hpt.xml} | 0 ...ne.xml => pseries-features-invalid-machine.xml} | 2 +- tests/qemuxml2argvdata/pseries-hpt-resizing.xml | 19 --- tests/qemuxml2argvtest.c | 29 ++-- .../aarch64-gic-default-both.xml | 1 + .../qemuxml2xmloutdata/aarch64-gic-default-v2.xml | 1 + .../qemuxml2xmloutdata/aarch64-gic-default-v3.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-hpt.xml | 1 + tests/qemuxml2xmltest.c | 9 +- 21 files changed, 230 insertions(+), 164 deletions(-) create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-both.args create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-both.xml create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v2.args create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v2.xml create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v3.args create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v3.xml rename tests/qemuxml2argvdata/{pseries-hpt-resizing.args => pseries-features-hpt.args} (96%) rename tests/{qemuxml2xmloutdata/pseries-hpt-resizing.xml => qemuxml2argvdata/pseries-features-hpt.xml} (100%) rename tests/qemuxml2argvdata/{pseries-hpt-resizing-invalid-machine.xml => pseries-features-invalid-machine.xml} (86%) delete mode 100644 tests/qemuxml2argvdata/pseries-hpt-resizing.xml create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml -- 2.14.3

2 30

[libvirt] [PATCH] Fix build with GCC 8 new warnings
by Daniel P. Berrangé 13 Feb '18

13 Feb '18

GCC 8 added a -Wcast-function-type warning to -Wextra by default. This complains if you try to explicitly cast one function signature to another function signature with incompatible args. This is something we do many times in libvirt especially with event callbacks. The hack to silence the warning requires casting via a void(*)(void) signature before casting to the desired type. This gross, so we just disable this new warning. GCC 8 also became more fussy about detecting switch fallthroughs. First it doesn't like it if you have a fallthrough attribute that is not before a case statement. e.g. FOO: BAR: WIZZ: ATTRIBUTE_FALLTHROUGH; Is unacceptable as there's no final case statement, so while FOO & BAR are falling through, WIZZ is not falling through. IOW, GCC wants us to write FOO: BAR: ATTRIBUTE_FALLTHROUGH; WIZZ: Second, it will report risk of fallthrough even if you have a case statement for every single enum value, but only if the switch is nested inside another switch and the outer case statement has no final break. This is is arguably valid because despite the fact that we have cast from "int" to the enum typedef, nothing guarantees that the variable we're switching on only contains values that have corresponding switch labels. e.g. int domstate = 87539319; switch ((virDomainState)domstate) { ... } will not match enum value, but also not raise any kind of compiler warning. So it is right to complain about risk of fallthrough if no default: is present. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- m4/virt-compile-warnings.m4 | 2 ++ src/qemu/qemu_domain.c | 14 +++++++------- src/qemu/qemu_domain_address.c | 11 +++++++++++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index b9c974842..4b35a6f6b 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -177,6 +177,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # with gl_MANYWARN_COMPLEMENT # So we have -W enabled, and then have to explicitly turn off... wantwarn="$wantwarn -Wno-sign-compare" + # We do "bad" function casts all the time for event callbacks + wantwarn="$wantwarn -Wno-cast-function-type" # GNULIB expects this to be part of -Wc++-compat, but we turn # that one off, so we need to manually enable this again diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 178ec24ae..560436f8e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -175,9 +175,9 @@ qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, case QEMU_ASYNC_JOB_NONE: case QEMU_ASYNC_JOB_LAST: ATTRIBUTE_FALLTHROUGH; + default: + return "none"; } - - return "none"; } int @@ -199,12 +199,12 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, case QEMU_ASYNC_JOB_NONE: case QEMU_ASYNC_JOB_LAST: ATTRIBUTE_FALLTHROUGH; + default: + if (STREQ(phase, "none")) + return 0; + else + return -1; } - - if (STREQ(phase, "none")) - return 0; - else - return -1; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index e28119e4b..42c7c0b12 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -532,6 +532,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2: /* xen only */ case VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE: case VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST: + default: return 0; } @@ -553,6 +554,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return pciFlags; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: return 0; } @@ -562,6 +564,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: /* should be 0 */ return pciFlags; } @@ -605,6 +608,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_SOUND_MODEL_PCSPK: case VIR_DOMAIN_SOUND_MODEL_USB: case VIR_DOMAIN_SOUND_MODEL_LAST: + default: return 0; } @@ -622,6 +626,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_DISK_BUS_SATA: case VIR_DOMAIN_DISK_BUS_SD: case VIR_DOMAIN_DISK_BUS_LAST: + default: return 0; } @@ -734,6 +739,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_MEMBALLOON_MODEL_XEN: case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: + default: return 0; } @@ -743,6 +749,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return virtioFlags; case VIR_DOMAIN_RNG_MODEL_LAST: + default: return 0; } @@ -755,6 +762,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_WATCHDOG_MODEL_IB700: case VIR_DOMAIN_WATCHDOG_MODEL_DIAG288: case VIR_DOMAIN_WATCHDOG_MODEL_LAST: + default: return 0; } @@ -775,6 +783,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: case VIR_DOMAIN_VIDEO_TYPE_GOP: case VIR_DOMAIN_VIDEO_TYPE_LAST: + default: return 0; } @@ -791,6 +800,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_INPUT_BUS_XEN: case VIR_DOMAIN_INPUT_BUS_PARALLELS: case VIR_DOMAIN_INPUT_BUS_LAST: + default: return 0; } @@ -806,6 +816,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: + default: return 0; } -- 2.16.1

3 3

[libvirt] [PATCH] qemu: Check for down limit of SLIRP prefix too
by Michal Privoznik 13 Feb '18

13 Feb '18

https://bugzilla.redhat.com/show_bug.cgi?id=1515533 We're already checking if IPv4 prefix isn't too long. But we are not checking if it isn't too short. QEMU supports prefixes longer than 4 (including). I haven't find anything similar related to IPv6 in qemu sources. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index df433c2f0..4fc4db68b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3744,6 +3744,12 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net) _("prefix too long")); return -1; } + + if (ip->prefix < 4) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("prefix too short")); + return -1; + } } if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) { -- 2.13.6

2 1

[libvirt] [PATCH 0/1] Function declarations match definitions
by Chris Venteicher 13 Feb '18

13 Feb '18

Interested in fixing mismatches between function parameter names in declarations (header files) and definitions (.c files)? This is a cosmetic / redability fix and does not change functionality. This is patch 1 of larger set of 22 patches that fix parameter names across the libvirt source code. If there is interest I can send the entire patch set. These are cosmetic redability fixes automatically generated by clang-tidy. make check and make syntax-check pass successfully after the 22 patches are applied. This is my first submission so please point out any issues and I will be glad to fix. Chris Venteicher (1): includes: function parameter names same in headers include/libvirt/libvirt-domain.h | 26 +++++++++++++------------- include/libvirt/libvirt-event.h | 4 ++-- include/libvirt/libvirt-host.h | 4 ++-- include/libvirt/libvirt-interface.h | 4 ++-- include/libvirt/libvirt-network.h | 6 +++--- include/libvirt/libvirt-nwfilter.h | 2 +- include/libvirt/libvirt-qemu.h | 2 +- include/libvirt/libvirt-secret.h | 4 ++-- include/libvirt/libvirt-storage.h | 12 ++++++------ include/libvirt/libvirt-stream.h | 22 +++++++++++----------- 10 files changed, 43 insertions(+), 43 deletions(-) -- 2.14.1

2 3

[libvirt] [PATCH REBASE 0/2] qemu: Clean up PCI controller options
by Andrea Bolognani 12 Feb '18

12 Feb '18

Rebase of https://www.redhat.com/archives/libvir-list/2017-December/msg00154.html on top of master, now that patch 1/3 has been merged as part of John's work to move controller checks from command line generation to guest validation. Andrea Bolognani (2): tests: Add some tests for PCI controller options qemu: Clean up PCI controller options src/qemu/qemu_domain.c | 117 +++++++++++++++++++++ .../i440fx-controllers-pciopts.args | 24 +++++ .../i440fx-controllers-pciopts.xml | 36 +++++++ .../pseries-controllers-pciopts.args | 22 ++++ .../pseries-controllers-pciopts.xml | 36 +++++++ .../qemuxml2argvdata/q35-controllers-pciopts.args | 28 +++++ tests/qemuxml2argvdata/q35-controllers-pciopts.xml | 60 +++++++++++ tests/qemuxml2argvtest.c | 17 +++ .../i440fx-controllers-pciopts.xml | 42 ++++++++ tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 4 +- .../pseries-controllers-pciopts.xml | 41 ++++++++ .../qemuxml2xmloutdata/q35-controllers-pciopts.xml | 63 +++++++++++ tests/qemuxml2xmltest.c | 17 +++ 13 files changed, 504 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2argvdata/i440fx-controllers-pciopts.args create mode 100644 tests/qemuxml2argvdata/i440fx-controllers-pciopts.xml create mode 100644 tests/qemuxml2argvdata/pseries-controllers-pciopts.args create mode 100644 tests/qemuxml2argvdata/pseries-controllers-pciopts.xml create mode 100644 tests/qemuxml2argvdata/q35-controllers-pciopts.args create mode 100644 tests/qemuxml2argvdata/q35-controllers-pciopts.xml create mode 100644 tests/qemuxml2xmloutdata/i440fx-controllers-pciopts.xml create mode 100644 tests/qemuxml2xmloutdata/pseries-controllers-pciopts.xml create mode 100644 tests/qemuxml2xmloutdata/q35-controllers-pciopts.xml -- 2.14.3

2 7

[libvirt] [PATCH] qemu: Fix indentation in qemuBuildControllerDevStr()
by Andrea Bolognani 12 Feb '18

12 Feb '18

Add braces around the multi-line body as well, in compliance with our coding style. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_command.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f7925c93a..6c73cd7bf 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2743,9 +2743,10 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, virBufferAsprintf(&buf, "%s,bus_nr=%d,id=%s", modelName, pciopts->busNr, def->info.alias); - if (pciopts->numaNode != -1) - virBufferAsprintf(&buf, ",numa_node=%d", - pciopts->numaNode); + if (pciopts->numaNode != -1) { + virBufferAsprintf(&buf, ",numa_node=%d", + pciopts->numaNode); + } break; case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: -- 2.14.3

1 0

[libvirt] Google Summer of Code 2018
by Michal Privoznik 12 Feb '18

12 Feb '18

Dear list, Libvirt has been accepted to this year's GSoC. Yay! For those interested in mentoring let me know (if you haven't already). For those interested in participating as students now it's the best time to view our ideas page [1] and contact corresponding mentors. If you have your own idea that's even better! Let me know and we will find you a mentor. Also, it might be worth reading page dedicated to this year's run [2]. Michal 1: https://wiki.libvirt.org/page/Google_Summer_of_Code_Ideas 2: https://wiki.libvirt.org/page/Google_Summer_of_Code_2018

1 0

[libvirt] [PATCH 00/14] Basic implementation of persistent reservations
by Michal Privoznik 12 Feb '18

12 Feb '18

QEMU added support for SCSI persistent reservations. The way QEMU implemented that makes it slightly harder for libvirt to adapt to - it's a small binary that needs to start before qemu so that it can connect to it. Basically, what libvirt does is: 1) start qemu-pr-helper (the small binary from above), 2) records its PID for tracking purposes 3) start qemu and when shutting down a domain the process is reversed: 1) shut down qemu process, 2) kill qemu-pr-helper (PID was saved earlier). Now, here also lies the last missing piece to he puzzle - what if qemu-pr-helper dies while qemu is running? After some discussion with Paolo it was agreed that qemu will emit an event for libvirt so that we can respawn the process. Anyway, that shouldn't be a show stopper for these patches (if it was the patch set might get too big). Please test, review and comment. As usual, you can find the patches on my github too: https://github.com/zippy2/libvirt/tree/pr Michal Privoznik (14): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu_domain: Introduce qemuDomainDiskPRObject qemu: Generate alias for pr-helper qemu: Store prAlias and prPath in status XML qemu: Generate cmd line at startup qemu: Introduce pr_helper to qemu.conf qemu: Start PR daemons on domain startup qemu: Track PR daemons PIDs in status XML qemu_domain: Introduce qemuDomainGetPRUsageCount qemu_process.c: Introduce qemuProcessSetupPRDaemon qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations docs/formatdomain.html.in | 25 +- docs/schemas/domaincommon.rng | 19 +- docs/schemas/storagecommon.rng | 34 ++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 36 ++ src/libvirt_private.syms | 4 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 59 +++ src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 435 ++++++++++++++++++++- src/qemu/qemu_domain.h | 29 ++ src/qemu/qemu_hotplug.c | 110 ++++++ src/qemu/qemu_process.c | 160 ++++++++ src/qemu/qemu_process.h | 4 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virstoragefile.c | 166 ++++++++ src/util/virstoragefile.h | 17 + .../disk-virtio-scsi-reservations-not-managed.args | 28 ++ .../disk-virtio-scsi-reservations-not-managed.xml | 40 ++ .../disk-virtio-scsi-reservations.args | 29 ++ .../disk-virtio-scsi-reservations.xml | 38 ++ tests/qemuxml2argvtest.c | 8 + .../disk-virtio-scsi-reservations-not-managed.xml | 1 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 4 + 29 files changed, 1250 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-managed.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.13.6

6 34

[libvirt] [PATCH] Revert "qemu: Expose rx/tx_queue_size in qemu.conf too"
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

This reverts commit 038eb472a0d970a17ccf4343ead0666df5c92f9d. On reflection adding defaults for arbitrary guest XML device config settings to the qemu.conf is not a sustainable path. Removing the support for rx/tx queue size so that it doesn't set a bad precedent. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/formatdomain.html.in | 14 ++-------- src/qemu/libvirtd_qemu.aug | 4 --- src/qemu/qemu.conf | 6 ----- src/qemu/qemu_command.c | 55 +++++++++++--------------------------- src/qemu/qemu_command.h | 3 +-- src/qemu/qemu_conf.c | 4 --- src/qemu/qemu_conf.h | 3 --- src/qemu/qemu_hotplug.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 2 -- 9 files changed, 19 insertions(+), 74 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 6707744bda..3ec1173c6f 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5456,12 +5456,7 @@ qemu-kvm -net nic,model=? /dev/null some restrictions on actual value. For instance, latest QEMU (as of 2016-09-01) requires value to be a power of two from [256, 1024] range. - Since 2.3.0 (QEMU and KVM only) - Additionally, since 4.1.0 the - value can be set in the <code>qemu.conf</code> file in order - to override the hypervisor default value. Note that XML has - higher precedence because it's more specific. - + Since 2.3.0 (QEMU and KVM only) In general you should leave this option alone, unless you are very certain you know what you are doing. @@ -5477,12 +5472,7 @@ qemu-kvm -net nic,model=? /dev/null range. In addition to that, this may work only for a subset of interface types, e.g. aforementioned QEMU enables this option only for <code>vhostuser</code> type. - Since 3.7.0 (QEMU and KVM only) - Additionally, since 4.1.0 the - value can be set in the <code>qemu.conf</code> file in order - to override the hypervisor default value. Note that XML has - higher precedence because it's more specific. - + Since 3.7.0 (QEMU and KVM only) In general you should leave this option alone, unless you are very certain you know what you are doing. diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 084290296a..c19bf3a43a 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -118,9 +118,6 @@ module Libvirtd_qemu = let vxhs_entry = bool_entry "vxhs_tls" | str_entry "vxhs_tls_x509_cert_dir" - let virtio_entry = int_entry "rx_queue_size" - | int_entry "tx_queue_size" - (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -140,7 +137,6 @@ module Libvirtd_qemu = | gluster_debug_level_entry | memory_entry | vxhs_entry - | virtio_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 62c4265ea9..43dd561cca 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -775,9 +775,3 @@ # This directory is used for memoryBacking source if configured as file. # NOTE: big files will be stored here #memory_backing_dir = "/var/lib/libvirt/qemu/ram" - -# The following two values set the default RX/TX ring buffer size for virtio -# interfaces. These values are taken unless overridden in domain XML. For more -# info consult docs to corresponding attributes from domain XML. -#rx_queue_size = 1024 -#tx_queue_size = 1024 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2bcaa5fc22..f7925c93a8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3351,8 +3351,7 @@ qemuBuildNicStr(virDomainNetDefPtr net, char * -qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, - virDomainDefPtr def, +qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, @@ -3472,41 +3471,21 @@ qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); } } - if (usingVirtio) { - unsigned int rx_queue_size = net->driver.virtio.rx_queue_size; - - if (rx_queue_size == 0) - rx_queue_size = cfg->rx_queue_size; - - if (rx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio rx_queue_size option is " - "not supported with this QEMU binary")); - goto error; - } - - net->driver.virtio.rx_queue_size = rx_queue_size; - virBufferAsprintf(&buf, ",rx_queue_size=%u", rx_queue_size); + if (usingVirtio && net->driver.virtio.rx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio rx_queue_size option is not supported with this QEMU binary")); + goto error; } + virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } - if (usingVirtio) { - unsigned int tx_queue_size = net->driver.virtio.tx_queue_size; - - if (tx_queue_size == 0) - tx_queue_size = cfg->tx_queue_size; - - if (tx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio tx_queue_size option is " - "not supported with this QEMU binary")); - goto error; - } - - net->driver.virtio.tx_queue_size = tx_queue_size; - virBufferAsprintf(&buf, ",tx_queue_size=%u", tx_queue_size); + if (usingVirtio && net->driver.virtio.tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is not supported with this QEMU binary")); + goto error; } + virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); } if (usingVirtio && net->mtu) { @@ -8192,7 +8171,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virCommandAddArg(cmd, netdev); VIR_FREE(netdev); - if (!(nic = qemuBuildNicDevStr(cfg, def, net, -1, bootindex, + if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, queues, qemuCaps))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error generating NIC -device string")); @@ -8229,7 +8208,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int **nicindexes, bool chardevStdioLogd) { - virQEMUDriverConfigPtr cfg = NULL; int ret = -1; char *nic = NULL, *host = NULL; int *tapfd = NULL; @@ -8291,8 +8269,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, return -1; } - cfg = virQEMUDriverGetConfig(driver); - switch (actualType) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -8488,7 +8464,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (qemuDomainSupportsNicdev(def, net)) { - if (!(nic = qemuBuildNicDevStr(cfg, def, net, vlan, bootindex, + if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); @@ -8532,7 +8508,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, VIR_FREE(host); VIR_FREE(tapfdName); VIR_FREE(vhostfdName); - virObjectUnref(cfg); return ret; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 6449883291..31c9da673c 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -90,8 +90,7 @@ char *qemuBuildNicStr(virDomainNetDefPtr net, int vlan); /* Current, best practice */ -char *qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, - virDomainDefPtr def, +char *qemuBuildNicDevStr(virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 2fa96431fa..af503d31cb 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -912,10 +912,6 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueString(conf, "memory_backing_dir", &cfg->memoryBackingDir) < 0) goto cleanup; - if (virConfGetValueUInt(conf, "rx_queue_size", &cfg->rx_queue_size) < 0 || - virConfGetValueUInt(conf, "tx_queue_size", &cfg->tx_queue_size) < 0) - goto cleanup; - ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 3f38a76c26..a553e30e2e 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -206,9 +206,6 @@ struct _virQEMUDriverConfig { bool vxhsTLS; char *vxhsTLSx509certdir; - - unsigned int rx_queue_size; - unsigned int tx_queue_size; }; /* Main driver state */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 3291ce6130..c9868de778 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1118,7 +1118,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, for (i = 0; i < vhostfdSize; i++) VIR_FORCE_CLOSE(vhostfd[i]); - if (!(nicstr = qemuBuildNicDevStr(cfg, vm->def, net, vlan, 0, + if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, queueSize, priv->qemuCaps))) goto try_remove; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 4fc4e2f4ec..688e5b9fda 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -100,5 +100,3 @@ module Test_libvirtd_qemu = { "1" = "mount" } } { "memory_backing_dir" = "/var/lib/libvirt/qemu/ram" } -{ "rx_queue_size" = "1024" } -{ "tx_queue_size" = "1024" } -- 2.14.3

2 1

[libvirt] [PATCH v2] vcpupin: add clear feature
by Yi Wang 12 Feb '18

12 Feb '18

We can't clear vcpupin settings of XML once we did vcpupin command, this is not convenient under some condition such as migration to a host with less CPUs. This patch introduces clear feature, which can clear vcpuin setting of XML using a 'c' option. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Signed-off-by: Xi Xu <xu.xi8(a)zte.com.cn> --- include/libvirt/libvirt-domain.h | 11 +++++++++++ src/qemu/qemu_driver.c | 32 ++++++++++++++++++++++++-------- tools/virsh-domain.c | 5 ++++- tools/virsh.pod | 1 + 4 files changed, 40 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf..46f4e77 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1847,6 +1847,17 @@ int virDomainSetVcpusFlags (virDomainPtr domain, int virDomainGetVcpusFlags (virDomainPtr domain, unsigned int flags); +/* Flags for controlling virtual CPU pinning. */ +typedef enum { + /* See virDomainModificationImpact for these flags. */ + VIR_DOMAIN_VCPU_PIN_CURRENT = VIR_DOMAIN_AFFECT_CURRENT, + VIR_DOMAIN_VCPU_PIN_LIVE = VIR_DOMAIN_AFFECT_LIVE, + VIR_DOMAIN_VCPU_PIN_CONFIG = VIR_DOMAIN_AFFECT_CONFIG, + + /* Additionally, these flags may be bitwise-OR'd in. */ + VIR_DOMAIN_VCPU_PIN_CLEAR = (1 << 2), /* Clear vcpus pin info */ +} virDomainVcpuPinFlags; + int virDomainPinVcpu (virDomainPtr domain, unsigned int vcpu, unsigned char *cpumap, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bbce5bd..fe1f62f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5056,7 +5056,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, int vcpu, virQEMUDriverPtr driver, virQEMUDriverConfigPtr cfg, - virBitmapPtr cpumap) + virBitmapPtr cpumap, + bool clear) { virBitmapPtr tmpmap = NULL; virDomainVcpuDefPtr vcpuinfo; @@ -5069,6 +5070,7 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, int eventNparams = 0; int eventMaxparams = 0; int ret = -1; + virBitmapPtr targetMap = NULL; if (!qemuDomainHasVcpuPids(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -5083,10 +5085,15 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, goto cleanup; } - if (!(tmpmap = virBitmapNewCopy(cpumap))) - goto cleanup; + if (clear) { + targetMap = virHostCPUGetOnlineBitmap(); + } else { + targetMap = cpumap; + if (!(tmpmap = virBitmapNewCopy(cpumap))) + goto cleanup; + } - if (!(str = virBitmapFormat(cpumap))) + if (!(str = virBitmapFormat(targetMap))) goto cleanup; if (vcpuinfo->online) { @@ -5095,11 +5102,11 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, if (virCgroupNewThread(priv->cgroup, VIR_CGROUP_THREAD_VCPU, vcpu, false, &cgroup_vcpu) < 0) goto cleanup; - if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, cpumap) < 0) + if (qemuSetupCgroupCpusetCpus(cgroup_vcpu, targetMap) < 0) goto cleanup; } - if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), cpumap) < 0) + if (virProcessSetAffinity(qemuDomainGetVcpuPid(vm, vcpu), targetMap) < 0) goto cleanup; } @@ -5128,6 +5135,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm, virCgroupFree(&cgroup_vcpu); VIR_FREE(str); qemuDomainEventQueue(driver, event); + if (clear) + virBitmapFree(targetMap); return ret; } @@ -5148,9 +5157,11 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, virBitmapPtr pcpumap = NULL; virDomainVcpuDefPtr vcpuinfo = NULL; virQEMUDriverConfigPtr cfg = NULL; + bool clear = false; virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); + VIR_DOMAIN_AFFECT_CONFIG | + VIR_DOMAIN_VCPU_PIN_CLEAR, -1); cfg = virQEMUDriverGetConfig(driver); @@ -5166,6 +5177,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0) goto endjob; + clear = !!(flags & VIR_DOMAIN_VCPU_PIN_CLEAR); + if ((def && def->virtType == VIR_DOMAIN_VIRT_QEMU) || (persistentDef && persistentDef->virtType == VIR_DOMAIN_VIRT_QEMU)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", @@ -5191,7 +5204,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, } if (def && - qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap) < 0) + qemuDomainPinVcpuLive(vm, def, vcpu, driver, cfg, pcpumap, clear) < 0) goto endjob; if (persistentDef) { @@ -5199,6 +5212,9 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, vcpuinfo->cpumask = pcpumap; pcpumap = NULL; + if (clear) + virBitmapFree(vcpuinfo->cpumask); + ret = virDomainSaveConfig(cfg->configDir, driver->caps, persistentDef); goto endjob; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 5a0e0c1..4981ecc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6863,7 +6863,7 @@ virshParseCPUList(vshControl *ctl, int *cpumaplen, unsigned char *cpumap = NULL; virBitmapPtr map = NULL; - if (cpulist[0] == 'r') { + if (cpulist[0] == 'r' || cpulist[0] == 'c') { if (!(map = virBitmapNew(maxcpu))) return NULL; virBitmapSetAll(map); @@ -6941,6 +6941,9 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (STREQ(cpulist, "c")) + flags |= VIR_DOMAIN_VCPU_PIN_CLEAR; + /* Pin mode: pinning specified vcpu to specified physical cpus*/ if (!(cpumap = virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; diff --git a/tools/virsh.pod b/tools/virsh.pod index 69cc423..d5a1779 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2857,6 +2857,7 @@ I<cpulist> is a list of physical CPU numbers. Its syntax is a comma separated list and a special markup using '-' and '^' (ex. '0-4', '0-3,^2') can also be allowed. The '-' denotes the range and the '^' denotes exclusive. For pinning the I<vcpu> to all physical cpus specify 'r' as a I<cpulist>. +For clearing pinning info, specify 'c' as a I<cpulist>. If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -- 1.8.3.1

3 4

[libvirt] [PATCH] log: fix deadlock obtaining hostname (related CVE-2018-6764)
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

The fix for CVE-2018-6764 introduced a potential deadlock scenario that gets triggered by the NSS module when virGetHostname() calls getaddrinfo to resolve the hostname: #0 0x00007f6e714b57e7 in futex_wait #1 futex_wait_simple #2 __pthread_once_slow #3 0x00007f6e71d16e7d in virOnce #4 0x00007f6e71d0997c in virLogInitialize #5 0x00007f6e71d0a09a in virLogVMessage #6 0x00007f6e71d09ffd in virLogMessage #7 0x00007f6e71d0db22 in virObjectNew #8 0x00007f6e71d0dbf1 in virObjectLockableNew #9 0x00007f6e71d0d3e5 in virMacMapNew #10 0x00007f6e71cdc50a in findLease #11 0x00007f6e71cdcc56 in _nss_libvirt_gethostbyname4_r #12 0x00007f6e724631fc in gaih_inet #13 0x00007f6e72464697 in __GI_getaddrinfo #14 0x00007f6e71d19e81 in virGetHostnameImpl #15 0x00007f6e71d1a057 in virGetHostnameQuiet #16 0x00007f6e71d09936 in virLogOnceInit #17 0x00007f6e71d09952 in virLogOnce #18 0x00007f6e714b5829 in __pthread_once_slow #19 0x00007f6e71d16e7d in virOnce #20 0x00007f6e71d0997c in virLogInitialize #21 0x00007f6e71d0a09a in virLogVMessage #22 0x00007f6e71d09ffd in virLogMessage #23 0x00007f6e71d0db22 in virObjectNew #24 0x00007f6e71d0dbf1 in virObjectLockableNew #25 0x00007f6e71d0d3e5 in virMacMapNew #26 0x00007f6e71cdc50a in findLease #27 0x00007f6e71cdc839 in _nss_libvirt_gethostbyname3_r #28 0x00007f6e71cdc724 in _nss_libvirt_gethostbyname2_r #29 0x00007f6e7248f72f in __gethostbyname2_r #30 0x00007f6e7248f494 in gethostbyname2 #31 0x000056348c30c36d in hosts_keys #32 0x000056348c30b7d2 in main Fortunately the extra stuff virGetHostname does is totally irrelevant to the needs of the logging code, so we can just inline a call to the native hostname() syscall directly. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/util/virlog.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 8f1e4800dd..4f66cc5e5c 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -64,7 +64,7 @@ VIR_LOG_INIT("util.log"); static regex_t *virLogRegex; -static char *virLogHostname; +static char virLogHostname[HOST_NAME_MAX+1]; #define VIR_LOG_DATE_REGEX "[0-9]{4}-[0-9]{2}-[0-9]{2}" @@ -261,6 +261,8 @@ virLogPriorityString(virLogPriority lvl) static int virLogOnceInit(void) { + int r; + if (virMutexInit(&virLogMutex) < 0) return -1; @@ -275,8 +277,17 @@ virLogOnceInit(void) /* We get and remember the hostname early, because at later time * it might not be possible to load NSS modules via getaddrinfo() * (e.g. at container startup the host filesystem will not be - * accessible anymore. */ - virLogHostname = virGetHostnameQuiet(); + * accessible anymore. + * Must not use virGetHostname though as that causes re-entrancy + * problems if it triggers logging codepaths + */ + r = gethostname(virLogHostname, sizeof(virLogHostname)); + if (r == -1) { + ignore_value(virStrcpy(virLogHostname, + "(unknown)", sizeof(virLogHostname))); + } else { + NUL_TERMINATE(virLogHostname); + } virLogUnlock(); return 0; @@ -475,9 +486,6 @@ virLogHostnameString(char **rawmsg, { char *hoststr; - if (!virLogHostname) - return -1; - if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) return -1; -- 2.14.3

2 2

[libvirt] [PATCH v2] qemu: Expose rx/tx_queue_size in qemu.conf too
by Michal Privoznik 12 Feb '18

12 Feb '18

In 2074ef6cd4a2 and c56cdf259 (and friends) we've added two attributes to virtio NICs: rx_queue_size and tx_queue_size. However, sysadmins might want to set these on per-host basis but don't necessarily have an access to domain XML (e.g. because they are generated by some other app). So let's expose them under qemu.conf (the settings from domain XML still take precedence as they are more specific ones). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: - Reworded docs and config file comment - Simplified logic in qemuBuildNicDevStr a bit - Make the values require qemu with corresponding capabilities docs/formatdomain.html.in | 14 ++++++++-- src/qemu/libvirtd_qemu.aug | 4 +++ src/qemu/qemu.conf | 6 +++++ src/qemu/qemu_command.c | 55 +++++++++++++++++++++++++++----------- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_conf.c | 4 +++ src/qemu/qemu_conf.h | 3 +++ src/qemu/qemu_hotplug.c | 2 +- src/qemu/test_libvirtd_qemu.aug.in | 2 ++ 9 files changed, 74 insertions(+), 19 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3ec1173c6..6707744bd 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5456,7 +5456,12 @@ qemu-kvm -net nic,model=? /dev/null some restrictions on actual value. For instance, latest QEMU (as of 2016-09-01) requires value to be a power of two from [256, 1024] range. - Since 2.3.0 (QEMU and KVM only) + Since 2.3.0 (QEMU and KVM only) + Additionally, since 4.1.0 the + value can be set in the <code>qemu.conf</code> file in order + to override the hypervisor default value. Note that XML has + higher precedence because it's more specific. + In general you should leave this option alone, unless you are very certain you know what you are doing. @@ -5472,7 +5477,12 @@ qemu-kvm -net nic,model=? /dev/null range. In addition to that, this may work only for a subset of interface types, e.g. aforementioned QEMU enables this option only for <code>vhostuser</code> type. - Since 3.7.0 (QEMU and KVM only) + Since 3.7.0 (QEMU and KVM only) + Additionally, since 4.1.0 the + value can be set in the <code>qemu.conf</code> file in order + to override the hypervisor default value. Note that XML has + higher precedence because it's more specific. + In general you should leave this option alone, unless you are very certain you know what you are doing. diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index c19bf3a43..084290296 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -118,6 +118,9 @@ module Libvirtd_qemu = let vxhs_entry = bool_entry "vxhs_tls" | str_entry "vxhs_tls_x509_cert_dir" + let virtio_entry = int_entry "rx_queue_size" + | int_entry "tx_queue_size" + (* Each entry in the config is one of the following ... *) let entry = default_tls_entry | vnc_entry @@ -137,6 +140,7 @@ module Libvirtd_qemu = | gluster_debug_level_entry | memory_entry | vxhs_entry + | virtio_entry let comment = [ label "#comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] let empty = [ label "#empty" . eol ] diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 43dd561cc..62c4265ea 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -775,3 +775,9 @@ # This directory is used for memoryBacking source if configured as file. # NOTE: big files will be stored here #memory_backing_dir = "/var/lib/libvirt/qemu/ram" + +# The following two values set the default RX/TX ring buffer size for virtio +# interfaces. These values are taken unless overridden in domain XML. For more +# info consult docs to corresponding attributes from domain XML. +#rx_queue_size = 1024 +#tx_queue_size = 1024 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 899f0cbbb..543270028 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3751,7 +3751,8 @@ qemuBuildNicStr(virDomainNetDefPtr net, char * -qemuBuildNicDevStr(virDomainDefPtr def, +qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, @@ -3871,21 +3872,41 @@ qemuBuildNicDevStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",mq=on,vectors=%zu", 2 * vhostfdSize + 2); } } - if (usingVirtio && net->driver.virtio.rx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio rx_queue_size option is not supported with this QEMU binary")); - goto error; + if (usingVirtio) { + unsigned int rx_queue_size = net->driver.virtio.rx_queue_size; + + if (rx_queue_size == 0) + rx_queue_size = cfg->rx_queue_size; + + if (rx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio rx_queue_size option is " + "not supported with this QEMU binary")); + goto error; + } + + net->driver.virtio.rx_queue_size = rx_queue_size; + virBufferAsprintf(&buf, ",rx_queue_size=%u", rx_queue_size); } - virBufferAsprintf(&buf, ",rx_queue_size=%u", net->driver.virtio.rx_queue_size); } - if (usingVirtio && net->driver.virtio.tx_queue_size) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio tx_queue_size option is not supported with this QEMU binary")); - goto error; + if (usingVirtio) { + unsigned int tx_queue_size = net->driver.virtio.tx_queue_size; + + if (tx_queue_size == 0) + tx_queue_size = cfg->tx_queue_size; + + if (tx_queue_size) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtio tx_queue_size option is " + "not supported with this QEMU binary")); + goto error; + } + + net->driver.virtio.tx_queue_size = tx_queue_size; + virBufferAsprintf(&buf, ",tx_queue_size=%u", tx_queue_size); } - virBufferAsprintf(&buf, ",tx_queue_size=%u", net->driver.virtio.tx_queue_size); } if (usingVirtio && net->mtu) { @@ -8571,7 +8592,7 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virCommandAddArg(cmd, netdev); VIR_FREE(netdev); - if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, + if (!(nic = qemuBuildNicDevStr(cfg, def, net, -1, bootindex, queues, qemuCaps))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Error generating NIC -device string")); @@ -8608,6 +8629,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, int **nicindexes, bool chardevStdioLogd) { + virQEMUDriverConfigPtr cfg = NULL; int ret = -1; char *nic = NULL, *host = NULL; int *tapfd = NULL; @@ -8669,6 +8691,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, return -1; } + cfg = virQEMUDriverGetConfig(driver); + switch (actualType) { case VIR_DOMAIN_NET_TYPE_NETWORK: case VIR_DOMAIN_NET_TYPE_BRIDGE: @@ -8864,7 +8888,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, virCommandAddArgList(cmd, "-netdev", host, NULL); } if (qemuDomainSupportsNicdev(def, net)) { - if (!(nic = qemuBuildNicDevStr(def, net, vlan, bootindex, + if (!(nic = qemuBuildNicDevStr(cfg, def, net, vlan, bootindex, vhostfdSize, qemuCaps))) goto cleanup; virCommandAddArgList(cmd, "-device", nic, NULL); @@ -8908,6 +8932,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, VIR_FREE(host); VIR_FREE(tapfdName); VIR_FREE(vhostfdName); + virObjectUnref(cfg); return ret; } diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 31c9da673..644988329 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -90,7 +90,8 @@ char *qemuBuildNicStr(virDomainNetDefPtr net, int vlan); /* Current, best practice */ -char *qemuBuildNicDevStr(virDomainDefPtr def, +char *qemuBuildNicDevStr(virQEMUDriverConfigPtr cfg, + virDomainDefPtr def, virDomainNetDefPtr net, int vlan, unsigned int bootindex, diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index af503d31c..2fa96431f 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -912,6 +912,10 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueString(conf, "memory_backing_dir", &cfg->memoryBackingDir) < 0) goto cleanup; + if (virConfGetValueUInt(conf, "rx_queue_size", &cfg->rx_queue_size) < 0 || + virConfGetValueUInt(conf, "tx_queue_size", &cfg->tx_queue_size) < 0) + goto cleanup; + ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a553e30e2..3f38a76c2 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -206,6 +206,9 @@ struct _virQEMUDriverConfig { bool vxhsTLS; char *vxhsTLSx509certdir; + + unsigned int rx_queue_size; + unsigned int tx_queue_size; }; /* Main driver state */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 2aa927e62..0672ed130 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1120,7 +1120,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, for (i = 0; i < vhostfdSize; i++) VIR_FORCE_CLOSE(vhostfd[i]); - if (!(nicstr = qemuBuildNicDevStr(vm->def, net, vlan, 0, + if (!(nicstr = qemuBuildNicDevStr(cfg, vm->def, net, vlan, 0, queueSize, priv->qemuCaps))) goto try_remove; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 688e5b9fd..4fc4e2f4e 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -100,3 +100,5 @@ module Test_libvirtd_qemu = { "1" = "mount" } } { "memory_backing_dir" = "/var/lib/libvirt/qemu/ram" } +{ "rx_queue_size" = "1024" } +{ "tx_queue_size" = "1024" } -- 2.13.6

4 4

[libvirt] [PATCH] tests: fix running of qemuxml2argvtest program
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

The previous commit: commit a455d41e3e1c1af3a36ccdbb2e3f2356cc58993e Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Thu Jan 25 09:35:50 2018 +0000 conf: expand network device callbacks to cover resolving NIC type mistakenly dropped qemuxml2argvtest from the tests due to a typo. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d013aed5eb..4ff3fa742a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -291,7 +291,7 @@ test_programs += qemuxml2xmltest \ if WITH_NETWORK # Dep on the network driver callback for resolving NIC # actual type. XXX remove this dep. -test_programs += qemuxml2xmltest +test_programs += qemuxml2argvtest endif WITH_NETWORK test_helpers += qemucapsprobe test_libraries += libqemumonitortestutils.la \ -- 2.14.3

2 1

[libvirt] [PATCH] virutil: Introduce virGetHostnameSimple()
by Michal Privoznik 12 Feb '18

12 Feb '18

After 759b4d1b0fe5f we are getting hostname in virLogOnceInit(). Problem with this approach is in the NSS module because the module calls some internal APIs which occasionally want to log something. This results in virLogInitialize() to be called which in turn ends up calling virGetHostnameQuiet() and effectively the control gets to NSS plugin again which calls some internal APIs which occasionally want to log something. You can see the deadlock now. One way out of this is to call only gethostname() and not whole virGetHostnameQuiet() machinery. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt_private.syms | 1 + src/util/virlog.c | 2 +- src/util/virutil.c | 46 ++++++++++++++++++++++++++++++++++------------ src/util/virutil.h | 1 + 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3b14d7d15..3ef55f809 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3016,6 +3016,7 @@ virGetGroupList; virGetGroupName; virGetHostname; virGetHostnameQuiet; +virGetHostnameSimple; virGetListenFDs; virGetSelfLastChanged; virGetSystemPageSize; diff --git a/src/util/virlog.c b/src/util/virlog.c index 8f1e4800d..fc854ffeb 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -276,7 +276,7 @@ virLogOnceInit(void) * it might not be possible to load NSS modules via getaddrinfo() * (e.g. at container startup the host filesystem will not be * accessible anymore. */ - virLogHostname = virGetHostnameQuiet(); + virLogHostname = virGetHostnameSimple(); virLogUnlock(); return 0; diff --git a/src/util/virutil.c b/src/util/virutil.c index cd6fbf2f3..22adecd53 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -684,26 +684,23 @@ static char * virGetHostnameImpl(bool quiet) { int r; - char hostname[HOST_NAME_MAX+1], *result = NULL; + char *result; struct addrinfo hints, *info; - r = gethostname(hostname, sizeof(hostname)); - if (r == -1) { + if (!(result = virGetHostnameSimple())) { if (!quiet) virReportSystemError(errno, "%s", _("failed to determine host name")); return NULL; } - NUL_TERMINATE(hostname); - if (STRPREFIX(hostname, "localhost") || strchr(hostname, '.')) { + if (STRPREFIX(result, "localhost") || strchr(result, '.')) { /* in this case, gethostname returned localhost (meaning we can't * do any further canonicalization), or it returned an FQDN (and * we don't need to do any further canonicalization). Return the * string as-is; it's up to callers to check whether "localhost" * is allowed. */ - ignore_value(VIR_STRDUP_QUIET(result, hostname)); goto cleanup; } @@ -714,12 +711,11 @@ virGetHostnameImpl(bool quiet) memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_CANONNAME|AI_CANONIDN; hints.ai_family = AF_UNSPEC; - r = getaddrinfo(hostname, NULL, &hints, &info); + r = getaddrinfo(result, NULL, &hints, &info); if (r != 0) { if (!quiet) VIR_WARN("getaddrinfo failed for '%s': %s", - hostname, gai_strerror(r)); - ignore_value(VIR_STRDUP_QUIET(result, hostname)); + result, gai_strerror(r)); goto cleanup; } @@ -727,15 +723,16 @@ virGetHostnameImpl(bool quiet) sa_assert(info); if (info->ai_canonname == NULL || - STRPREFIX(info->ai_canonname, "localhost")) + STRPREFIX(info->ai_canonname, "localhost")) { /* in this case, we tried to canonicalize and we ended up back with * localhost. Ignore the canonicalized name and just return the * original hostname */ - ignore_value(VIR_STRDUP_QUIET(result, hostname)); - else + } else { /* Caller frees this string. */ + VIR_FREE(result); ignore_value(VIR_STRDUP_QUIET(result, info->ai_canonname)); + } freeaddrinfo(info); @@ -760,6 +757,31 @@ virGetHostnameQuiet(void) } +/** + * virGetHostnameSimple: + * + * Plain wrapper over gethostname(). The difference to + * virGetHostname() is that this function doesn't try to + * canonicalize the hostname. + * + * Returns: hostname string (caller must free), + * NULL on error. + */ +char * +virGetHostnameSimple(void) +{ + char hostname[HOST_NAME_MAX+1]; + char *ret; + + if (gethostname(hostname, sizeof(hostname)) == -1) + return NULL; + + NUL_TERMINATE(hostname); + ignore_value(VIR_STRDUP_QUIET(ret, hostname)); + return ret; +} + + char * virGetUserDirectory(void) { diff --git a/src/util/virutil.h b/src/util/virutil.h index be0f6b0ea..57148374b 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -136,6 +136,7 @@ static inline int pthread_sigmask(int how, char *virGetHostname(void); char *virGetHostnameQuiet(void); +char *virGetHostnameSimple(void); char *virGetUserDirectory(void); char *virGetUserDirectoryByUID(uid_t uid); -- 2.13.6

2 2

[libvirt] [PATCH v3 00/15] Misc build refactoring / isolation work
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

This was triggered by the recent Fedora change to add '-z defs' to RPM builds by default which breaks libvirt. Various make rule changes can fix much of the problem, but it also requires source refactoring to get rid of places where virt drivers directly call into the storage/network drivers. Co-incidentally this work will also be useful in allowing us to separate out drivers to distinct daemons. In v3: - Fixed a few build problems identified by travis In v2: - Fixed header file name comment - Resolve conflicts - Fix unit tests - Fix bisectable build by moving libvirt_lxc build patch earlier - Update syntax check header include rule Daniel P. Berrangé (15): storage: extract storage file backend from main storage driver backend storage: move storage file backend framework into util directory rpc: don't link in second copy of RPC code to libvirtd & lockd plugin build: link libvirt_lxc against libvirt.so conf: introduce callback registration for domain net device allocation conf: expand network device callbacks to cover bandwidth updates qemu: replace networkGetNetworkAddress with public API calls conf: expand network device callbacks to cover resolving NIC type network: remove conditional declarations conf: move virStorageTranslateDiskSourcePool into domain conf storage: export virStoragePoolLookupByTargetPath as a public API build: explicitly link all modules with libvirt.so build: provide a AM_FLAGS_MOD for loadable modules build: passing the "-z defs" linker flag to prevent undefined symbols cfg: forbid includes of headers in network and storage drivers again cfg.mk | 2 +- configure.ac | 1 + daemon/Makefile.am | 3 +- include/libvirt/libvirt-storage.h | 2 + m4/virt-linker-no-undefined.m4 | 32 ++ po/POTFILES.in | 2 +- src/Makefile.am | 150 ++++---- src/bhyve/bhyve_command.c | 7 +- src/conf/domain_conf.c | 355 +++++++++++++++++++ src/conf/domain_conf.h | 71 ++++ src/driver-storage.h | 5 + src/libvirt-storage.c | 40 +++ src/libvirt_private.syms | 29 ++ src/libvirt_public.syms | 6 + src/libvirt_remote.syms | 11 +- src/libxl/libxl_domain.c | 5 +- src/libxl/libxl_driver.c | 7 +- src/lxc/lxc_driver.c | 5 +- src/lxc/lxc_process.c | 7 +- src/network/bridge_driver.c | 124 +------ src/network/bridge_driver.h | 72 ---- src/qemu/qemu_alias.c | 3 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_domain.c | 3 - src/qemu/qemu_domain_address.c | 3 +- src/qemu/qemu_driver.c | 15 +- src/qemu/qemu_hotplug.c | 18 +- src/qemu/qemu_migration.c | 3 +- src/qemu/qemu_process.c | 115 +++++- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 7 + src/security/virt-aa-helper.c | 2 - src/storage/storage_backend.c | 66 ---- src/storage/storage_backend.h | 75 ---- src/storage/storage_backend_fs.c | 8 +- src/storage/storage_backend_gluster.c | 4 +- src/storage/storage_driver.c | 256 +------------- src/storage/storage_driver.h | 3 - src/storage/storage_source.c | 645 ---------------------------------- src/storage/storage_source.h | 59 ---- src/util/virstoragefile.c | 609 +++++++++++++++++++++++++++++++- src/util/virstoragefile.h | 32 ++ src/util/virstoragefilebackend.c | 108 ++++++ src/util/virstoragefilebackend.h | 104 ++++++ src/vz/vz_sdk.c | 1 - tests/Makefile.am | 11 +- tests/qemuxml2argvtest.c | 4 + tests/virstoragetest.c | 1 - tools/Makefile.am | 1 + 50 files changed, 1679 insertions(+), 1432 deletions(-) create mode 100644 m4/virt-linker-no-undefined.m4 delete mode 100644 src/storage/storage_source.c delete mode 100644 src/storage/storage_source.h create mode 100644 src/util/virstoragefilebackend.c create mode 100644 src/util/virstoragefilebackend.h -- 2.14.3

3 19

[libvirt] [PATCH] virlog: Allow opting out from logging
by Michal Privoznik 12 Feb '18

12 Feb '18

After 759b4d1b0fe5f we are getting hostname in virLogOnceInit(). Problem with this approach is in the NSS module because the module calls some internal APIs which occasionally want to log something. This results in virLogInitialize() to be called which in turn ends up calling virGetHostnameQuiet() and effectively the control gets to NSS plugin again which calls some internal APIs which occasionally want to log something. You can see the deadlock now. One way out from this is to turn logging into no-op. Which kind of makes sense - the NSS module shouldn't log anything. To achieve this, the virLogVMessage() function is provided with separate no-op implementation if DISABLE_LOGGING_FOR_NSS macro is set. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- config-post.h | 1 + src/util/virlog.c | 119 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 49 deletions(-) diff --git a/config-post.h b/config-post.h index f7eba0d7c..95e834f8e 100644 --- a/config-post.h +++ b/config-post.h @@ -72,6 +72,7 @@ # undef WITH_SECDRIVER_SELINUX # undef WITH_SECDRIVER_APPARMOR # undef WITH_CAPNG +# define DISABLE_LOGGING_FOR_NSS #endif /* LIBVIRT_NSS */ #ifndef __GNUC__ diff --git a/src/util/virlog.c b/src/util/virlog.c index 8f1e4800d..3284bdc03 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -241,23 +241,6 @@ virLogGetDefaultOutput(void) } -static const char * -virLogPriorityString(virLogPriority lvl) -{ - switch (lvl) { - case VIR_LOG_DEBUG: - return "debug"; - case VIR_LOG_INFO: - return "info"; - case VIR_LOG_WARN: - return "warning"; - case VIR_LOG_ERROR: - return "error"; - } - return "unknown"; -} - - static int virLogOnceInit(void) { @@ -429,6 +412,60 @@ virLogOutputListFree(virLogOutputPtr *list, int count) } +/** + * virLogMessage: + * @source: where is that message coming from + * @priority: the priority level + * @filename: file where the message was emitted + * @linenr: line where the message was emitted + * @funcname: the function emitting the (debug) message + * @metadata: NULL or metadata array, terminated by an item with NULL key + * @fmt: the string format + * @...: the arguments + * + * Call the libvirt logger with some information. Based on the configuration + * the message may be stored, sent to output or just discarded + */ +void +virLogMessage(virLogSourcePtr source, + virLogPriority priority, + const char *filename, + int linenr, + const char *funcname, + virLogMetadataPtr metadata, + const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + virLogVMessage(source, priority, + filename, linenr, funcname, + metadata, fmt, ap); + va_end(ap); +} + + +/* For the library we compile in logging code and then turn it + * on/off depending on user settings. However, for the NSS plugin + * we might get into deadlock and logging there is not really + * needed. */ +#ifndef DISABLE_LOGGING_FOR_NSS +static const char * +virLogPriorityString(virLogPriority lvl) +{ + switch (lvl) { + case VIR_LOG_DEBUG: + return "debug"; + case VIR_LOG_INFO: + return "info"; + case VIR_LOG_WARN: + return "warning"; + case VIR_LOG_ERROR: + return "error"; + } + return "unknown"; +} + + static int virLogFormatString(char **msg, int linenr, @@ -514,38 +551,6 @@ virLogSourceUpdate(virLogSourcePtr source) virLogUnlock(); } -/** - * virLogMessage: - * @source: where is that message coming from - * @priority: the priority level - * @filename: file where the message was emitted - * @linenr: line where the message was emitted - * @funcname: the function emitting the (debug) message - * @metadata: NULL or metadata array, terminated by an item with NULL key - * @fmt: the string format - * @...: the arguments - * - * Call the libvirt logger with some information. Based on the configuration - * the message may be stored, sent to output or just discarded - */ -void -virLogMessage(virLogSourcePtr source, - virLogPriority priority, - const char *filename, - int linenr, - const char *funcname, - virLogMetadataPtr metadata, - const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - virLogVMessage(source, priority, - filename, linenr, funcname, - metadata, fmt, ap); - va_end(ap); -} - - /** * virLogVMessage: * @source: where is that message coming from @@ -678,6 +683,22 @@ virLogVMessage(virLogSourcePtr source, errno = saved_errno; } +#else /* DISABLE_LOGGING_FOR_NSS */ + +void +virLogVMessage(virLogSourcePtr source ATTRIBUTE_UNUSED, + virLogPriority priority ATTRIBUTE_UNUSED, + const char *filename ATTRIBUTE_UNUSED, + int linenr ATTRIBUTE_UNUSED, + const char *funcname ATTRIBUTE_UNUSED, + virLogMetadataPtr metadata ATTRIBUTE_UNUSED, + const char *fmt ATTRIBUTE_UNUSED, + va_list vargs ATTRIBUTE_UNUSED) +{ + return; +} + +#endif /* DISABLE_LOGGING_FOR_NSS */ static void virLogStackTraceToFd(int fd) -- 2.13.6

2 1

[libvirt] [PATCH] virlog: determine the hostname on startup CVE-2018-XXX
by Daniel P. Berrangé 12 Feb '18

12 Feb '18

From: Lubomir Rintel <lkundrak(a)v3.sk> At later point it might not be possible or even safe to use getaddrinfo(). It can in turn result in a load of NSS module. Notably, on a LXC container startup we may find ourselves with the guest filesystem already having replaced the host one. Loading a NSS module from the guest tree could allow a malicous guest to escape the confinement of its container environment because libvirt will not yet have locked it down. --- NB, we're still awaiting CVE allocation before pushing to git src/util/virlog.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 68439b9194..9105337ce6 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -64,6 +64,7 @@ VIR_LOG_INIT("util.log"); static regex_t *virLogRegex; +static char *virLogHostname; #define VIR_LOG_DATE_REGEX "[0-9]{4}-[0-9]{2}-[0-9]{2}" @@ -271,6 +272,12 @@ virLogOnceInit(void) VIR_FREE(virLogRegex); } + /* We get and remember the hostname early, because at later time + * it might not be possible to load NSS modules via getaddrinfo() + * (e.g. at container startup the host filesystem will not be + * accessible anymore. */ + virLogHostname = virGetHostnameQuiet(); + virLogUnlock(); return 0; } @@ -466,17 +473,14 @@ static int virLogHostnameString(char **rawmsg, char **msg) { - char *hostname = virGetHostnameQuiet(); char *hoststr; - if (!hostname) + if (!virLogHostname) return -1; - if (virAsprintfQuiet(&hoststr, "hostname: %s", hostname) < 0) { - VIR_FREE(hostname); + if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) { return -1; } - VIR_FREE(hostname); if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { VIR_FREE(hoststr); -- 2.14.3

3 4

[libvirt] [PATCH] qemu: Alter condition to avoid possible NULL deref
by John Ferlan 12 Feb '18

12 Feb '18

Commit 'f0f2a5ec2' neglected to adjust the if condition to split out the possibility that the @watchdog is NULL when altering the message to add detail about the model. Just split out the condition and use previous/original message, but with the new message code. Found by Coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_hotplug.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c7bf25eee..3291ce613 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5159,11 +5159,16 @@ qemuDomainDetachWatchdog(virQEMUDriverPtr driver, virDomainWatchdogDefPtr watchdog = vm->def->watchdog; qemuDomainObjPrivatePtr priv = vm->privateData; + if (!watchdog) { + virReportError(VIR_ERR_DEVICE_MISSING, "%s", + _("watchdog device not present in domain configuration")); + return -1; + } + /* While domains can have up to one watchdog, the one supplied by the user * doesn't necessarily match the one domain has. Refuse to detach in such * case. */ - if (!(watchdog && - watchdog->model == dev->model && + if (!(watchdog->model == dev->model && watchdog->action == dev->action && virDomainDeviceInfoAddressIsEqual(&dev->info, &watchdog->info))) { virReportError(VIR_ERR_DEVICE_MISSING, -- 2.13.6

3 2

[libvirt] [PATCH] qemu: don't leak in qemuGetDHCPInterfaces when failing to alloc
by Chen Hanxiao 12 Feb '18

12 Feb '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> We forgot to free alloced mem when failed to dup ifname or macaddr. Also use VIR_STEAL_PTR to simplify codes. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/qemu/qemu_agent.c | 3 +-- src/qemu/qemu_driver.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 5d125c413..0f36054a6 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -2190,8 +2190,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, iface->naddrs = addrs_count; } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + VIR_STEAL_PTR(*ifaces, ifaces_ret); ret = ifaces_count; cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 978ecd4e0..60cdd237a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -20569,10 +20569,10 @@ qemuGetDHCPInterfaces(virDomainPtr dom, goto error; if (VIR_STRDUP(iface->name, vm->def->nets[i]->ifname) < 0) - goto cleanup; + goto error; if (VIR_STRDUP(iface->hwaddr, macaddr) < 0) - goto cleanup; + goto error; } for (j = 0; j < n_leases; j++) { @@ -20592,8 +20592,7 @@ qemuGetDHCPInterfaces(virDomainPtr dom, VIR_FREE(leases); } - *ifaces = ifaces_ret; - ifaces_ret = NULL; + VIR_STEAL_PTR(*ifaces, ifaces_ret); rv = ifaces_count; cleanup: -- 2.14.3

2 1

[libvirt] [PATCH] util: netlink: fix the mismatch parameter description of functions
by Chen Hanxiao 09 Feb '18

09 Feb '18

From: Chen Hanxiao <chenhanxiao(a)gmail.com> Some of netlink functions don't have the right @parameters description according to the declaration of function. This patch fix them. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- src/util/virnetlink.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index d732fe8cf..6a6508fa4 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -278,14 +278,14 @@ virNetlinkSendRequest(struct nl_msg *nl_msg, uint32_t src_pid, /** * virNetlinkCommand: - * @nlmsg: pointer to netlink message - * @respbuf: pointer to pointer where response buffer will be allocated + * @nl_msg: pointer to netlink message + * @resp: pointer to pointer where response buffer will be allocated * @respbuflen: pointer to integer holding the size of the response buffer - * on return of the function. - * @src_pid: the pid of the process to send a message - * @dst_pid: the pid of the process to talk to, i.e., pid = 0 for kernel - * @protocol: netlink protocol - * @groups: the group identifier + * on return of the function. + * @src_pid: the pid of the process to send a message + * @dst_pid: the pid of the process to talk to, i.e., pid = 0 for kernel + * @protocol: netlink protocol + * @groups: the group identifier * * Send the given message to the netlink layer and receive response. * Returns 0 on success, -1 on error. In case of error, no response @@ -387,9 +387,9 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, * * @ifname: The name of the interface; only use if ifindex <= 0 * @ifindex: The interface index; may be <= 0 if ifname is given - * @data: Gets a pointer to the raw data from netlink. + * @nlData: Gets a pointer to the raw data from netlink. MUST BE FREED BY CALLER! - * @nlattr: Pointer to a pointer of netlink attributes that will contain + * @tb: Pointer to a pointer of netlink attributes that will contain * the results * @src_pid: pid used for nl_pid of the local end of the netlink message * (0 == "use getpid()") @@ -505,7 +505,7 @@ virNetlinkDumpLink(const char *ifname, int ifindex, /** * virNetlinkDelLink: * - * @ifname: Name of the link + * @ifname: Name of the link * @fallback: pointer to an alternate function that will * be called to perform the delete if RTM_DELLINK fails * with EOPNOTSUPP (any other error will simply be treated @@ -648,7 +648,7 @@ virNetlinkEventServerUnlock(virNetlinkEventSrvPrivatePtr driver) /** * virNetlinkEventRemoveClientPrimitive: * - * @i: index of the client to remove from the table + * @i: index of the client to remove from the table * @protocol: netlink protocol * * This static function does the low level removal of a client from @@ -837,7 +837,8 @@ int virNetlinkEventServiceLocalPid(unsigned int protocol) * This registers a netlink socket with the event interface. * * @protocol: netlink protocol - * @groups: broadcast groups to join in + * @groups: broadcast groups to join in + * * Returns -1 if the monitor cannot be registered, 0 upon success */ int @@ -925,9 +926,9 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) * * @handleCB: callback to invoke when an event occurs * @removeCB: callback to invoke when removing a client - * @opaque: user data to pass to callback - * @macaddr: macaddr to store with the data. Used to identify callers. - * May be null. + * @opaque: user data to pass to callback + * @macaddr: macaddr to store with the data. Used to identify callers. + * May be null. * @protocol: netlink protocol * * register a callback for handling of netlink messages. The @@ -1003,8 +1004,8 @@ virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, /** * virNetlinkEventRemoveClient: * - * @watch: watch whose handle to remove - * @macaddr: macaddr whose handle to remove + * @watch: watch whose handle to remove + * @macaddr: macaddr whose handle to remove * @protocol: netlink protocol * * Unregister a callback from a netlink monitor. -- 2.14.3

2 1

[libvirt] [PATCH] qemu: Remove redundancy from qemuBuildControllerDevStr()
by Andrea Bolognani 09 Feb '18

09 Feb '18

Several PCI controllers are handled the same and can thus be squashed together. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_command.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ee4e0b20d..040ea65b6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2722,6 +2722,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, def->info.alias); break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_EXPANDER_BUS: + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: virBufferAsprintf(&buf, "%s,bus_nr=%d,id=%s", modelName, pciopts->busNr, def->info.alias); @@ -2730,29 +2731,15 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, pciopts->numaNode); break; case VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE: - virBufferAsprintf(&buf, "%s,id=%s", modelName, def->info.alias); - break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: - virBufferAsprintf(&buf, "%s,port=0x%x,chassis=%d,id=%s", - modelName, pciopts->port, - pciopts->chassis, def->info.alias); - break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: virBufferAsprintf(&buf, "%s,id=%s", modelName, def->info.alias); break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_DOWNSTREAM_PORT: virBufferAsprintf(&buf, "%s,port=0x%x,chassis=%d,id=%s", modelName, pciopts->port, pciopts->chassis, def->info.alias); break; - case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS: - virBufferAsprintf(&buf, "%s,bus_nr=%d,id=%s", - modelName, pciopts->busNr, - def->info.alias); - if (pciopts->numaNode != -1) - virBufferAsprintf(&buf, ",numa_node=%d", - pciopts->numaNode); - break; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: /* Skip the implicit one */ if (pciopts->targetIndex == 0) -- 2.14.3

2 1

[libvirt] [PATCH] qemu: Error out on invalid pci-root controller model name
by Andrea Bolognani 09 Feb '18

09 Feb '18

This is a hard error, and should be handled as such. Introduced in 24614760228b. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/qemu/qemu_domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 16833474a..178ec24ae 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4446,7 +4446,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle _("PCI controller model name '%s' is not valid " "for a pci-root"), modelName); - return 0; + return -1; } if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE)) { -- 2.14.3

2 1

[libvirt] ANNOUNCE: libguestfs 1.38 released
by Richard W.M. Jones 09 Feb '18

09 Feb '18

I'm pleased to announce libguestfs 1.38, a library and a set of tools for accessing and modifying virtual machine disk images. This release represents about a year of work by many contributors. I'd like to call out in particular substantial contributions from: Cédric Bosdonnat, Pavel Butsykin, Matteo Cafasso, Tomáš Golembiovský, Nikos Skalkotos, and Pino Toscano. Virt-builder-repository is a new tool for creating virt-builder repositories. Virt-rescue has been rewritten, implementing implementing job control, -m and -i options, escape keys. Virt-v2v has several new methods to pull VMs out of VMware faster. The inspection code was rewritten and placed inside the daemon making it much faster and more robust. Of course dozens of other features have been added, and many bugs fixed. See the release notes below for full details. You can get libguestfs 1.38 from here: Main website: http://libguestfs.org/ [not updated yet] Source: http://libguestfs.org/download/1.38-stable/ Fedora: https://koji.fedoraproject.org/koji/packageinfo?packageID=8391 Debian/experimental: https://packages.debian.org/libguestfs0 Note for distro packagers: ocaml >= 4.01, ocaml-hivex are now mandatory build dependencies. If using glibc >= 2.27 which dropped support for SunRPC and crypt(3), you will need rpcgen, libtirpc and libxcrypt. Rich. ---------------------------------------------------------------------- Release notes for libguestfs 1.38 These are also available online at: http://libguestfs.org/guestfs-release-notes.1.html New features New tools Virt-builder-repository is a new tool allowing end users to create and update virt-builder repositories (Cédric Bosdonnat). Virt-rescue (while not a new tool) has been substantially rewritten, implementing job control, -m and -i options, escape keys, etc. New features in existing tools Virt-builder planner has been improved so that faster and more efficient build plans are chosen for complex cases, especially when either the tmpdir or output is on networked storage. New virt-builder Fedora templates (starting with Fedora 26) will have plain partition layout and use GPT for partitions. Virt-customize "firstboot" scripts in guests using systemd are now installed under the "multi-user.target" instead of "default.target" so they will only run when the system is booted normally. Virt-customize now sets a random /etc/machine-id for Linux guests, if one is not already set. Virt-df now works correctly on filesystems with block sizes smaller than 1K (Nikolay Ivanets). Virt-dib has further compatibility enhancements with diskimage-builder (Pino Toscano). Virt-sysprep removes "DHCP_HOSTNAME" from ifcfg-* files. Virt-sysprep now works on Oracle Linux (Jamie Iles). Virt-resize now correctly copies GPT partition attributes from the source to the destination (Cédric Bosdonnat). Bash tab completion implemented or enhanced for: virt-win-reg, virt-v2v-copy-to-local. virt-v2v and virt-p2v Virt-v2v can now read VMware VMX files directly, either from local disk, NFS storage, or over SSH from an ESXi hypervisor. Virt-v2v can now use VDDK as an input source. Both virt-v2v and virt-p2v are now able to pass through the source CPU vendor, model and topology. However unfortunately not all source and target hypervisors are able to provide or consume this data at present (Tomáš Golembiovský). Virt-v2v now supports encrypted guests (Pino Toscano). Virt-v2v can now handle VMware snapshots. Note that the snapshots are collapsed — it does not convert the chain of snapshots into a chain of snapshots. Virt-v2v now installs Windows 10 / Windows Server 2016 virtio block drivers correctly (Pavel Butsykin, Kun Wei). Virt-v2v now installs virtio-rng, balloon and pvpanic drivers, and correctly sets this in the target hypervisor metadata for hypervisors which support that (Tomáš Golembiovský). Virt-v2v now installs both legacy and modern virtio keys in the Windows registry (Ladi Prosek). Virt-p2v can now preserve (in some cases) the offset of the Real Time Clock from UTC. Virt-p2v now combines several scp commands to the conversion server into a single command, improving conversion times. Virt-v2v now detects the special Linux Xen PV-only kernels correctly (Laszlo Ersek). Virt-v2v -o glance now generates the right properties for UEFI guests (Pino Toscano). Virt-v2v -o null now avoids spooling the guest to a temporary file, instead it writes to the qemu "null block device". This makes it faster and use almost no disk space. Virt-v2v -o rhv now supports Windows 2016 Server guest type. Virt-v2v -i libvirtxml can now open network disks over http or https. Virt-v2v will now give a warning about host passthrough devices (Pino Toscano). The virt-v2v --machine-readable output has been enhanced so it includes "vcenter-https", "xen-ssh" and "in-place" facts (Pino Toscano). Language bindings Fix multiple memory leaks and other data corruption problems in the Java bindings (Pino Toscano). Perl %guestfs_introspection has been dropped. Inspection Inspection support was rewritten in OCaml and included inside the daemon. This makes inspection considerably faster, more robust and more easily extensible in future. Better icon support for ALT Linux guests (Pino Toscano). Better support for NeoKylin (Qingzheng Zhang). Can handle OSes like Void Linux which do not include "VERSION_ID" in /etc/os-release (Pino Toscano). Add support for Microsoft MS-DOS (Daniel Berrangé). Architectures and platforms Multiple fixes for S/390 architecture. Libguestfs and all the tools should now compile and run on this architecture. Other The libguestfs API is now thread-safe (although not parallel). You can call APIs on the same handle from multiple threads without needing to take a lock. Security There were multiple vulnerabilities in the icoutils "wrestool" program which is run by libguestfs to create icons for Windows guests. Using the latest "wrestool" is recommended. API New APIs "hivex_value_string" This replaces the deprecated "hivex_value_utf8" API, but does the same thing. "part_get_gpt_attributes" "part_set_gpt_attributes" Read and write GPT partition attribute flags (Cédric Bosdonnat). "part_resize" Enlarge or shrink an existing partition (Nikos Skalkotos). "yara_destroy" "yara_load" "yara_scan" Support for the Yara malware scanning engine (Matteo Cafasso). Other API changes APIs implemented in the daemon can now be written in either C or OCaml. Several APIs were rewritten in OCaml, although we are not planning to rewrite all of them. You will now get a clear error message if you try to add too many disks to the appliance, instead of getting a peculiar failure from qemu. Certain APIs accidentally allowed you to use "/dev/urandom" as an input "device", eg. "g.copy_device_to_device("/dev/urandom", "/dev/sda")". The code has been modified to forbid this usage. All APIs for inspecting installer CDs have been deprecated. Use libosinfo for this task. Build changes A working OCaml compiler ≥ 4.01 is now required for building libguestfs. The "./configure --disable-ocaml" option remains but is only used to disable the OCaml language bindings. Add "RELEASES" file which lists release dates for each version of libguestfs. You must update this file when making a new release. Documentation generated by "gtk-doc" has been removed. "./configure --enable-gtk-doc" now does nothing. Libtirpc is now used for XDR functions and rpcgen. Note that glibc has deprecated and in most Linux distros dropped these, so for most people this will be an extra dependency (Martin Kletzander). Libxcrypt is now used for crypt(3). This is required if using glibc ≥ 2.27. "ocaml-hivex" is now required. Libvirt ≥ 1.2.20 is now required. There is now a "make check-root" target for tests which need to be run as root (analogous to "make check-slow"). "./configure"-time check for "__attribute__((cleanup))" now works in the cross-compilation case (Yann E. Morin). The "AUTHORS" and "p2v/about-authors.c" files are now generated from a single place. Either GnuPG v1 or v2 can be used. "./configure --with-guestfs-path" may be used to set the default "LIBGUESTFS_PATH". In addition the way that the path is searched has changed slightly so that all types of appliances are searched in each path element separately (Pavel Butsykin). "GUESTFSD_EXT_CMD" which was used to mark external commands in the daemon has been removed. It was originally used by SUSE builds, but they have not been using it for a while. The output from "./configure" is now visually grouped under headings related to what it is doing, making it much easier to scan (Pino Toscano). OCaml dependencies are now generated from a single script instead of multiple not-quite-the-same Makefile fragments. "./configure --with-distro=ID" can be used to override automatic Linux distro detection at build time (Pino Toscano). qemu ≥ 2.10 is supported (but not required). This adds mandatory locking to disks and libguestfs turns this off in certain circumstances when it is known to be safe (Lars Seipel, Peter Krempa, Daniel Berrangé, Pino Toscano, Fam Zheng, Yongkui Guo, Václav Kadlčík). Internals Most common code has been moved to the common/ subdirectory, with OCaml common code being in common/ml* directories (eg. common/visit and common/mlvisit contain the visitor library in C and OCaml respectively). The mllib directory has been deleted and replaced by common/mltools. There is now a lightweight OCaml binding for PCRE, see common/mlpcre. Use of OCaml "Str" library has been mostly replaced with PCRE. Add more calls to "udev_settle" to improve stability of partition code (Dawid Zamirski). Run "udev_settle" with --exit-if-exists option, which improves the speed of this command (Pavel Butsykin). Detect new locations of major(3), minor(3), makedev(3). Actions can now be deprecated with no suggested replacement, for APIs such as "guestfs_wait_ready" that should simply be removed from client code. Use gnulib "set_nonblocking_flag" wrapper instead of calling fcntl(2) with "O_NONBLOCK" (Eric Blake). Similarly "set_cloexec_flag". Fix memory leak in XFS version of "guestfs_vfs_minimum_size" (Pino Toscano). Valgrind checks now run on the virt-p2v binary. Unicode single quotes ("‘’") and now used in place of '' or `' throughout the code and documentation. Similarly for "’s" instead of "'s". The "is_zero" function has been reimplemented for greater speed (Eric Blake). In the direct backend, virtio-blk support has been removed. Virtio- scsi is now the only supported way to add disks. Generator string parameter and return types have been rationalised so there are only two types ("String", "StringList") with many subtypes eg. "FileIn" becomes "String (FileIn, ...)". The appliance disk image can now be in formats other than raw (Pavel Butsykin). Multiple improvements to how we automatically build Debian templates for virt-builder (Pino Toscano). Enable serial console for these templates (Florian Klink). In the daemon, instead of making a private copy of lvm.conf and modifying it (eg for filters), start with an empty file since LVM understands that to mean "all defaults" (Alasdair Kergon, Zdenek Kabelac). The "direct" backend can now run QMP queries against the QEMU binary, enhancing the kinds of information we can detect. In addition the code to query QEMU has been made more robust for handling multiple parallel queries of different versions of QEMU. OCaml Augeas bindings are bundled under common/mlaugeas. The long term plan is to remove this and use system ocaml-augeas when it is more widely available in distros (Pino Toscano). All OCaml modules ("*.ml" files) are now required to have an interface file ("*.mli"). If they don't export anything then the interface will be empty except for comments. Certain OCaml features in OCaml ≥ 4.01 are used throughout the code, including replacing ‘{ field = field }’ with ‘{ field }’. Virt-builder "make-template" utility now uses the "virt-install --transient" option so that we should never need to clean up left over domains after a crash. It also saves kickstarts and virt-install commands, which are committed to git for future reference. /dev/shm is now created in the appliance (Nicolas Hicher). In verbose mode on Fedora guests, virt-customize will now use "dnf --verbose" enabling better debugging output. Virt-v2v input and output classes now contain a "#precheck" method which is used to perform environmental checks before conversion starts. Virt-p2v enables miniexpect debugging. It is written to stderr (of virt-p2v). Virt-v2v free space checks are more liberal especially for smaller guests (Pino Toscano). Bugs fixed https://bugzilla.redhat.com/1540535 Example URI of "Convert from ESXi hypervisor over SSH to local libvirt" is incorrect in v2v man page https://bugzilla.redhat.com/1539395 virt-customize segfaults after upgrading to 1.37.35-3 https://bugzilla.redhat.com/1536765 Libguestfs Perl bindings can leak a small amount of memory on error https://bugzilla.redhat.com/1536763 libguestfs Lua bindings use strerror(), which isn’t thread safe https://bugzilla.redhat.com/1536603 man page makes no mention of using '--' when trying to change exit on error behavior https://bugzilla.redhat.com/1525241 virt-df displays zeros for filesystems with block size =512 https://bugzilla.redhat.com/1519204 v2v should improve the result when convert a rhel7.4 guest with no available kernels found in the bootloader https://bugzilla.redhat.com/1518517 virt-v2v fails with "unsupported configuration: shared access for disk 'sdb' requires use of supported storage format" https://bugzilla.redhat.com/1516094 Mere presence of QEMU file locking options breaks NBD (Block protocol 'nbd' doesn't support the option 'locking') https://bugzilla.redhat.com/1514756 ./configure --disable-ocaml breaks building common/mlpcre which breaks building daemon https://bugzilla.redhat.com/1513884 [RFE]Should update some vddk info in v2v man page https://bugzilla.redhat.com/1508874 virt-v2v: warning: ova disk has an unknown VMware controller type (20) https://bugzilla.redhat.com/1506572 virt-v2v '-i ova' is not parsing the MAC address from the source OVF https://bugzilla.redhat.com/1506511 virt-builder fails to parse repo file if it has blank space after the repository identifier https://bugzilla.redhat.com/1503958 Failed to convert the rhel5 guest with kmod-xenpv installed from xen server by virt-v2v https://bugzilla.redhat.com/1503497 qemu-kvm fails to open qcow2 files in read-only mode with qemu-kvm 1.5.3 https://bugzilla.redhat.com/1500673 Error info shows wrong sometimes when ssh to conversion server using non-root user with sudo on p2v client https://bugzilla.redhat.com/1500537 /dev/shm does not exist in the appliance environment https://bugzilla.redhat.com/1497475 guestfish cannot list commands from interactive mode https://bugzilla.redhat.com/1493048 Unbound constructor Hivex.OPEN_UNSAFE https://bugzilla.redhat.com/1484957 bump debian images to use single-partition layout https://bugzilla.redhat.com/1482737 virt-resize failed to expand swap partition for RHEL5.11 guest image with "parsing UUID failed" https://bugzilla.redhat.com/1477623 Running file API on a special chardev may hang forever https://bugzilla.redhat.com/1476081 inspect-os report error: could not parse integer in version number: V7Update2 https://bugzilla.redhat.com/1472719 [RFE]Add warning in process of v2v converting guest which has pci passthrough device https://bugzilla.redhat.com/1472208 virt-v2v fails on opensuse 13.2 guest with error: statns: statns_stub: path must start with a / character https://bugzilla.redhat.com/1469655 firstboot scripts are not correctly installed in Fedora 26 https://bugzilla.redhat.com/1466563 Libguestfs should pass copyonread flag through to the libvirt XML https://bugzilla.redhat.com/1465665 1.36.x build failure: gtkdocize fails using newer autotools due to missing GTK_DOC_CHECK in configure.ac https://bugzilla.redhat.com/1460338 guestfs_shutdown hangs if main process sets signal handlers https://bugzilla.redhat.com/1459979 guestfs_add_domain_argv fails with readonly option when vdi/vhd disk is attached to libvirt domain https://bugzilla.redhat.com/1451665 RFE: Virt-v2v can't convert the guest which has encrypted partition https://bugzilla.redhat.com/1450325 document URI format for -a parameters of tools https://bugzilla.redhat.com/1448739 RFE: Support multicore decompression for OVA files using pigz and pxz https://bugzilla.redhat.com/1447202 Win 2016 guest is described as Win 10 after imported to RHEVM https://bugzilla.redhat.com/1441197 RFE: ability to convert VMware virtual machines via vmx https://bugzilla.redhat.com/1438939 Please drop or update GnuPG (1.4.x) dependency https://bugzilla.redhat.com/1438794 [RFE] Install Windows virtio-rng drivers on VMs imported https://bugzilla.redhat.com/1433937 virt-inspector can't get icon info from altlinux-centaurus https://bugzilla.redhat.com/1433577 policycoreutils setfiles >= 2.6 does .. nothing https://bugzilla.redhat.com/1431579 Windows 8 UEFI from VMware to KVM fails to boot after conversion https://bugzilla.redhat.com/1430680 There is error info about "No such file or directory" when convert a guest from ova file by v2v https://bugzilla.redhat.com/1430184 virt-dib should generate sha256 checksum instead of sha512 https://bugzilla.redhat.com/1429506 RFE: OVMF should be detected on conversion server to prevent failed conversion https://bugzilla.redhat.com/1429491 Should rename network name of rhv in virt-v2v man page https://bugzilla.redhat.com/1427529 virt-sysprep should remove DHCP_HOSTNAME https://bugzilla.redhat.com/1417306 QEMU image file locking (libguestfs) https://bugzilla.redhat.com/1409024 [Debian] Missing db_dump abort inspection https://bugzilla.redhat.com/1406906 Segmentation fault when reading corrupted path with Python 3 bindings https://bugzilla.redhat.com/1379289 RFE: virt-p2v should support mnemonic operations https://bugzilla.redhat.com/1378022 There is virt-v2v warning about <listen type='none'> during converting a guest which has listen type='none' in XML https://bugzilla.redhat.com/1376547 qemu-system-s390x: -device isa-serial,chardev=charserial0,id=serial0: 'isa-serial' is not a valid device model name https://bugzilla.redhat.com/1374232 selinux relabel fails on RHEL 6.2 guests with "libguestfs error: selinux_relabel: : Success" https://bugzilla.redhat.com/1367738 Missing bash completion scripts for: virt-diff guestunmount virt- copy-in virt-copy-out virt-customize virt-get-kernel virt-p2v-make-disk virt-p2v-make-kickstart virt-tar-in virt-tar-out virt-v2v-copy-to-local virt-win-reg https://bugzilla.redhat.com/1362649 RFE: virt-sysprep does not utilize libguestfs encryption support https://bugzilla.redhat.com/1172425 [RFE]virt-v2v failed to convert VMware ESX VM with snapshot https://bugzilla.redhat.com/1171654 Modify a file in virt-rescue with vi on some linux terminal such as yakuake, can lead to abnormal display in virt-rescue shell https://bugzilla.redhat.com/1167623 Remove "If reporting bugs, run virt-v2v with debugging enabled .." message when running virt-p2v https://bugzilla.redhat.com/1152819 Can not end a running command in virt-rescue by press ^C or other keys, the only way is to exit virt-rescue -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top

1 0

[libvirt] [PATCH] qemu: Fix indentation in qemuDomainDeviceDefValidateControllerPCI()
by Andrea Bolognani 09 Feb '18

09 Feb '18

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_domain.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 84207db16..16833474a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4458,10 +4458,10 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle if (pciopts->numaNode != -1 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the spapr-pci-host-bridge controller doesn't " - "support numa_node in this QEMU binary")); - return -1; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("the spapr-pci-host-bridge controller doesn't " + "support numa_node in this QEMU binary")); + return -1; } break; -- 2.14.3

1 0

[libvirt] [PATCH] qemu: fix migration with local and VIR_STORAGE_TYPE_NETWORK disks
by Chris Friesen 09 Feb '18

09 Feb '18

In the current implementation of qemuMigrateDisk() the value of the "nmigrate_disks" parameter wrongly impacts the decision whether or not to migrate a disk that is not a member of "migrate_disks": 1) If "nmigrate_disks" is zero, "disk" is migrated if it's non-shared non-readonly with source. 2) If "nmigrate_disks" is non-zero and "disk" is not a member of "migrate_disks" then "disk" is not migrated. This should instead proceed with checking conditions as per 1) and allow migration of non-shared non-readonly disks with source. Fixing 2) breaks migration of VMs with a mix of rbd and local disks because now libvirt tries to migrate the rbd root disk and it fails. This new problem is solved by updating 1) to factor in disk source type and migrate only 'local' non-shared non-readonly disks with source. The end result is that disks not in "migrate_disks" are treated uniformly regardless of the value of "nmigrate_disks". Signed-off-by: Chris Friesen <chris.friesen(a)windriver.com> --- src/qemu/qemu_migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5ee9e5c..77fafc6 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -409,12 +409,12 @@ qemuMigrateDisk(virDomainDiskDef const *disk, if (STREQ(disk->dst, migrate_disks[i])) return true; } - return false; } - /* Default is to migrate only non-shared non-readonly disks + /* Default is to migrate only non-shared non-readonly local disks * with source */ return !disk->src->shared && !disk->src->readonly && + (disk->src->type != VIR_STORAGE_TYPE_NETWORK) && !virStorageSourceIsEmpty(disk->src); } -- 1.8.3.1

3 8

[libvirt] [PATCH] qemu: command: Extract formatting of floppy related stuff into a helper
by Peter Krempa 09 Feb '18

09 Feb '18

The floppy command formatting is special-cased since it does not directly translate to a single '-device' argument. Move the code from qemuBuildDiskDriveCommandLine to a new helper function so that all the related code is together. --- src/qemu/qemu_command.c | 91 +++++++++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 24b434a458..3857a5ef5b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2211,6 +2211,58 @@ qemuBuildDriveDevStr(const virDomainDef *def, } +static int +qemuBulildFloppyCommandLineOptions(virCommandPtr cmd, + const virDomainDef *def, + virDomainDiskDefPtr disk, + unsigned int bootindex) + +{ + virBuffer fdc_opts = VIR_BUFFER_INITIALIZER; + char *fdc_opts_str = NULL; + char *optstr; + + if (virAsprintf(&optstr, "drive%c=drive-%s", + disk->info.addr.drive.unit ? 'B' : 'A', + disk->info.alias) < 0) + return -1; + + if (!qemuDomainNeedsFDC(def)) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); + } else { + virBufferAsprintf(&fdc_opts, "%s,", optstr); + } + VIR_FREE(optstr); + + if (bootindex) { + if (virAsprintf(&optstr, "bootindex%c=%u", + disk->info.addr.drive.unit + ? 'B' : 'A', + bootindex) < 0) + return -1; + + if (!qemuDomainNeedsFDC(def)) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); + } else { + virBufferAsprintf(&fdc_opts, "%s,", optstr); + } + VIR_FREE(optstr); + } + + /* Newer Q35 machine types require an explicit FDC controller */ + virBufferTrim(&fdc_opts, ",", -1); + if ((fdc_opts_str = virBufferContentAndReset(&fdc_opts))) { + virCommandAddArg(cmd, "-device"); + virCommandAddArgFormat(cmd, "isa-fdc,%s", fdc_opts_str); + VIR_FREE(fdc_opts_str); + } + + return 0; +} + + static int qemuBuildDiskDriveCommandLine(virCommandPtr cmd, const virDomainDef *def, @@ -2220,8 +2272,6 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, unsigned int bootCD = 0; unsigned int bootFloppy = 0; unsigned int bootDisk = 0; - virBuffer fdc_opts = VIR_BUFFER_INITIALIZER; - char *fdc_opts_str = NULL; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_BOOT) || virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX)) { @@ -2300,34 +2350,9 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, if (qemuDiskBusNeedsDeviceArg(disk->bus)) { if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC) { - if (virAsprintf(&optstr, "drive%c=drive-%s", - disk->info.addr.drive.unit ? 'B' : 'A', - disk->info.alias) < 0) + if (qemuBulildFloppyCommandLineOptions(cmd, def, disk, + bootindex) < 0) return -1; - - if (!qemuDomainNeedsFDC(def)) { - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); - } else { - virBufferAsprintf(&fdc_opts, "%s,", optstr); - } - VIR_FREE(optstr); - - if (bootindex) { - if (virAsprintf(&optstr, "bootindex%c=%u", - disk->info.addr.drive.unit - ? 'B' : 'A', - bootindex) < 0) - return -1; - - if (!qemuDomainNeedsFDC(def)) { - virCommandAddArg(cmd, "-global"); - virCommandAddArgFormat(cmd, "isa-fdc.%s", optstr); - } else { - virBufferAsprintf(&fdc_opts, "%s,", optstr); - } - VIR_FREE(optstr); - } } else { virCommandAddArg(cmd, "-device"); @@ -2339,14 +2364,6 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, } } } - /* Newer Q35 machine types require an explicit FDC controller */ - virBufferTrim(&fdc_opts, ",", -1); - if ((fdc_opts_str = virBufferContentAndReset(&fdc_opts))) { - virCommandAddArg(cmd, "-device"); - virCommandAddArgFormat(cmd, "isa-fdc,%s", fdc_opts_str); - VIR_FREE(fdc_opts_str); - } - return 0; } -- 2.15.0

2 1

[libvirt] [tck PATCH v2 0/5] Fix libvirt-tck nwfilter tests
by Laine Stump 09 Feb '18

09 Feb '18

I've pushed the patches that passed review. These patches split a single patch from V1 into 2 patches, repost one patch that had no response, calls out a single line that had sneaked into one of the ACKed patches, and remove all tabs from perl and sh scripts. Laine Stump (5): parameterize filterref in generic_domain default to no nwfilter in test domains filter for proper IP address in tcpdump looking for broadcast packet kill dhclient before attempting to change guest IP in no-ip-spoofing test untabify all perl and sh files lib/Sys/Virt/TCK.pm | 549 ++++++++++++----------- lib/Sys/Virt/TCK/Capabilities.pm | 84 ++-- lib/Sys/Virt/TCK/DomainBuilder.pm | 312 ++++++------- lib/Sys/Virt/TCK/NetworkBuilder.pm | 44 +- lib/Sys/Virt/TCK/NetworkHelpers.pm | 6 +- lib/Sys/Virt/TCK/SELinux.pm | 6 +- lib/Sys/Virt/TCK/StoragePoolBuilder.pm | 40 +- lib/Sys/Virt/TCK/StorageVolBuilder.pm | 48 +- lib/Sys/Virt/TCK/TAP/XMLFormatter.pm | 18 +- lib/Sys/Virt/TCK/TAP/XMLFormatterSession.pm | 66 +-- scripts/nwfilter/100-ping-still-working.t | 3 +- scripts/nwfilter/210-no-mac-spoofing.t | 3 +- scripts/nwfilter/220-no-ip-spoofing.t | 4 +- scripts/nwfilter/230-no-mac-broadcast.t | 5 +- scripts/nwfilter/240-no-arp-spoofing.t | 3 +- scripts/nwfilter/300-vsitype.t | 2 +- scripts/nwfilter/concurrency/chg-vm-filter.sh | 18 +- scripts/nwfilter/concurrency/start-destroy-vm.sh | 20 +- scripts/nwfilter/nwfilter2vmtest.sh | 42 +- 19 files changed, 641 insertions(+), 632 deletions(-) -- 2.14.3

4 19

[libvirt] [PATCH] rpc: export xdr_virNetMessageError for virnetmessagetest on Win32
by Daniel P. Berrangé 09 Feb '18

09 Feb '18

The Win32 symbol export file format can't do wildcards, so none of the 'xdr_*' symbols are exported from the libvirt DLL. This doesn't matter generally since the RPC client is built into the DLL and we don't build libvirtd on Win32. The virnetmessagetest, however, does require xdr_virNetMessageError to be exported, so just do a hack for that. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as win32 CI build fix src/libvirt_remote.syms | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 736848273a..97e22275b9 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -7,6 +7,12 @@ # Generated files xdr_*; +# Hack only required for Win32 to make tests link properly, +# as the wildcard above doesn't work there. Fortunately +# Win32 builds don't require the other xdr_* syms exported. +# since there's no libvirtd built. +xdr_virNetMessageError; + # rpc/virnetclient.h virNetClientAddProgram; -- 2.14.3

1 0

[libvirt] [PATCH 0/2] Support network stats for hostdev(SR-IOV) in Switchdev mode
by Jai Singh Rana 09 Feb '18

09 Feb '18

With availability of switchdev model in linux, it is possible to capture stats for hostdev SR-IOV VFs using its VF representor interface name on host for nics supporting switchdev model. These stats are supported by adding helper APIs for getting VF Representor name based on BDF info in 'hostdev' and querying required net sysfs entries on host. These helper APIs are then used in qemu_driver to get the hostdev interface stats for pci SR-IOV device. [1] https://www.kernel.org/doc/Documentation/networking/switchdev.txt Jai Singh Rana (2): util: Add helper APIs to get/verify VF Representor name qemu: conf: Network stats support for hostdev VF Representor po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 7 ++ src/libvirt_private.syms | 5 + src/qemu/qemu_driver.c | 34 +++++- src/util/virhostdev.c | 10 ++ src/util/virhostdev.h | 6 + src/util/virnetdevhostdev.c | 284 ++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetdevhostdev.h | 33 +++++ 9 files changed, 377 insertions(+), 4 deletions(-) create mode 100644 src/util/virnetdevhostdev.c create mode 100644 src/util/virnetdevhostdev.h -- 2.13.6

1 2

[libvirt] [PATCH python] tests: add special case for virStoragePoolLookupByTargetPath
by Daniel P. Berrangé 09 Feb '18

09 Feb '18

This new API trips up the sanity test for checking mapping of all C APIs into Python. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as build fix. sanitytest.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sanitytest.py b/sanitytest.py index 1d65e8d..190d32b 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -258,7 +258,8 @@ for name in sorted(basicklassmap): "LookupByUUIDString", "LookupByVolume" "LookupByName", "LookupByID", "LookupByName", "LookupByKey", "LookupByPath", "LookupByMACString", "LookupByUsage", "LookupByVolume", - "LookupSCSIHostByWWN", "Restore", "RestoreFlags", + "LookupByTargetPath","LookupSCSIHostByWWN", + "Restore", "RestoreFlags", "SaveImageDefineXML", "SaveImageGetXMLDesc", "DefineXMLFlags"]: if klass != "virDomain": func = klass[3:] + func -- 2.14.3

1 0

[libvirt] [PATCH 0/3] lock manager plugin dlm-corosync implementation
by river 09 Feb '18

09 Feb '18

This is the implementation of the RFC from https://www.redhat.com/archives/libvir-list/2017-December/msg00689.html The following is the design of this iplementation. Environmental requirements: DLM is a symmetric general-purpose distributed lock manager, consisting of a kernel modules named 'dlm.ko', userspace application named 'libdlm', and cluster infrastructure environment which could be 'corosync' responsible for communication. For more usage about libdlm and corosync, `man corosync.conf` and `man dlm_controld` Implementation details: In order to use dlm in cluster, daemons, 'dlm_controld' and 'corosync', must have been runned before. Because dlm is asynchronous, there is something receiving notification from kernel. 'libdlm' provides `dlm_pthread_init` and `dlm_ls_pthread_init` for this purpose. Here is lockspace concept in dlm. Lockspace is different from sanlock, it's just to provide a private namespaceit's one namespace for locks that are part of a single application. One lock must belong to one lockspace, and is associated with one lock resource, owned by one process in one node. Lock/unlock need specific flag. Lock flags `LKF_PERSISTENT` specifies a lock that wouldn't be unlocked if the process was dead or lockspace was closed (`dlm_close_lockspace`). lockspace is cluster-wide, lock with `LKF_PERSISTENT` flag won't be automatically released except that the owner node reboot, but it will become an orphan lock once process disappears. New process in the same node want to adopt orphan lock, just specific `LKF_ORPHAN` when re-lock using the right lock-name and lock-mode, new lock id would be assigned for adopted lock. lkid(lock id) is a mark uniquely identifing a lock in a process, which is returned after locking sucessfully or adopting sucessfully. Lock could be only released by self-process applied using lkid. The following means: locks won't be automatically released when the process(libvirt) that acquired them dies, daemon likes virtlockd isn't necessary. In order to adopt orphan locks, there must be some lock information left after the process died. A file would store the lock information in this design. However, I find that the existence of "leaked" fd in vm instance process inherited from libvirt would tell lock daemon to release their locks instead of libvirt. So destroy or shutdown qemu instance won't make dlm release locks. I refer to the action of libxl(`libxlDomainCleanup` function in 'src/libxl/libxl_domain.c'), add some code after unlink pid and xml files in `qemuProcessStop` ('src/qemu/qemu_process.c') to proactively tell lock manager release locks. Adhere to the simple, enough principle, lock information using by running libvirt process is stored in list instead of hash table. I have tested in some cases: start, migrate, destroy... It works well. *** BLURB HERE *** river (3): Add a plugin dlm for lock manager Fix release of locks with dlm plugin Add configuration files for dlm plugin .gitignore | 2 + configure.ac | 6 + m4/virt-cpg.m4 | 37 ++ m4/virt-dlm.m4 | 36 ++ src/Makefile.am | 53 ++ src/libxl/libxl.conf | 8 +- src/locking/dlm.conf | 52 ++ src/locking/libvirt_dlm.aug | 35 ++ src/locking/lock_driver_dlm.c | 1056 +++++++++++++++++++++++++++++++++++ src/locking/test_libvirt_dlm.aug.in | 9 + src/qemu/qemu.conf | 8 +- src/qemu/qemu_process.c | 5 + src/util/virlist.h | 110 ++++ 13 files changed, 1410 insertions(+), 7 deletions(-) create mode 100644 m4/virt-cpg.m4 create mode 100644 m4/virt-dlm.m4 create mode 100644 src/locking/dlm.conf create mode 100644 src/locking/libvirt_dlm.aug create mode 100644 src/locking/lock_driver_dlm.c create mode 100644 src/locking/test_libvirt_dlm.aug.in create mode 100644 src/util/virlist.h -- 2.15.1

3 6

[libvirt] [PATCH] fix regex to check CN from server certificate
by Tiago M. Vieira 08 Feb '18

08 Feb '18

Currently when the script validates the PKI files and the certificate 'Subject:' field contains RDNs after the Common Name (CN), these values are also included, creating a false result that the CN is not correct. A small change to the sed regex fixes this issue, by extracting only the value for CN and nothing else. The regex is replaced with the exact same regex used to extract the CN value from the client certificate. --- tools/virt-pki-validate.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 206637abf..b04680dde 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -255,7 +255,7 @@ then echo CA organization: $ORG echo Server organization: $S_ORG fi - S_HOST=`"$CERTOOL" -i --infile "$LIBVIRT/servercert.pem" | grep Subject: | sed 's+.*CN=$[a-zA-Z\. _-]*$+\1+'` + S_HOST=`"$CERTOOL" -i --infile "$LIBVIRT/servercert.pem" | grep Subject: | sed 's+.*CN=$.[a-zA-Z \._-]*$.*+\1+'` if test "$S_HOST" != "`hostname -s`" && test "$S_HOST" != "`hostname`" then echo The server certificate does not seem to match the host name -- 2.14.3

2 1

[libvirt] [tck PATCH 0/9] Fix libvirt-tck nwfilter tests
by Laine Stump 08 Feb '18

08 Feb '18

libvirt-tck happens to have the most thorough set of nwfilter tests around. Unfortunately they haven't been run in quite awhile, and have suffered from some bit rot. This patch series (along with Dan's patch to force virt-builder to redo selinux labels after installing extra packages) gets the nwfilter tests all completing successfully again *on a Fedora 26 host* with libvirt 3.2.1 and libvirt 4.0.0+. The concurrency tests (at least) still fail on an F27 host - in that case they are actually revealing a bug due to something in libvirt, libpcap, or maybe the kernel (and since the kernels in F26 and F27 are nearly the same, and I tried both of the above libvirt versions on F27 with the same failure (two threads hung in a polling loop in libpcap) Once I got this all running, I noticed that there are several domain and network tests that are failing, and at least the ones I looked into were due to bugs in the tests (e.g. the netdev hotplug test uses multicast MAC addresses, and assumes that device detaches are synchronous), so there's more work to do, but the nwfilter tests are what's most important right now. Laine Stump (9): create vms that use virt-builder images with no graphics and virtio-net Use $net->get_dhcp_leases() when available Use Net::OpenSSH instead of Net::SSH::Perl Fix no-ip-spoofing test script generation Fix no-arp-spoof test script generation parameterize filterref in generic_domain Fix ebtables check in no-mac-broadcast test filter for proper IP address in tcpdump looking for broadcast packet Eliminate unnecessary path specifications in binary names lib/Sys/Virt/TCK.pm | 22 +++++------- lib/Sys/Virt/TCK/NetworkHelpers.pm | 9 +++++ perl-Sys-Virt-TCK.spec.PL | 3 +- scripts/nwfilter/100-ping-still-working.t | 6 ++-- scripts/nwfilter/210-no-mac-spoofing.t | 52 ++++++++++++++------------- scripts/nwfilter/220-no-ip-spoofing.t | 59 ++++++++++++++++--------------- scripts/nwfilter/230-no-mac-broadcast.t | 39 ++++++++++---------- scripts/nwfilter/240-no-arp-spoofing.t | 36 ++++++++++--------- scripts/nwfilter/300-vsitype.t | 1 - scripts/nwfilter/nwfilter_concurrent.sh | 4 +-- 10 files changed, 121 insertions(+), 110 deletions(-) -- 2.13.6

2 20

[libvirt] [PATCH] qemu: report a nicer error when USB is disabled
by Ján Tomko 08 Feb '18

08 Feb '18

If the user tries to define a domain that has <controller type='usb' model='none'/> and also some USB devices, we report an error: error: internal error: No free USB ports Which is technically still correct for a domain with no USB ports. Change it to: USB is disabled for this domain, but USB devices are present in the domain XML https://bugzilla.redhat.com/show_bug.cgi?id=1347550 --- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain_address.c | 7 +++++++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f3b4dd33d..028fcb5be 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5116,7 +5116,7 @@ virDomainDiskDefValidate(const virDomainDiskDef *disk) return 0; } -static bool +bool virDomainDefHasUSB(const virDomainDef *def) { size_t i; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bb3b6f0c3..32e191e0a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2656,6 +2656,8 @@ int virDomainDefPostParse(virDomainDefPtr def, unsigned int parseFlags, virDomainXMLOptionPtr xmlopt, void *parseOpaque); +bool +virDomainDefHasUSB(const virDomainDef *def); int virDomainDefValidate(virDomainDefPtr def, virCapsPtr caps, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5b1bc5e4f..21f226258 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -267,6 +267,7 @@ virDomainDefGetVcpusTopology; virDomainDefHasDeviceAddress; virDomainDefHasMemballoon; virDomainDefHasMemoryHotplug; +virDomainDefHasUSB; virDomainDefHasVcpusOffline; virDomainDefMaybeAddController; virDomainDefMaybeAddInput; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 69c0c8bf2..0d565b3ea 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2644,6 +2644,13 @@ qemuDomainUSBAddressAddHubs(virDomainDefPtr def) &data, false)); + if (data.count && !virDomainDefHasUSB(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("USB is disabled for this domain, but USB devices " + "are present in the domain XML")); + return -1; + } + if (data.count > available_ports) hubs_needed = VIR_DIV_UP(data.count - available_ports + 1, VIR_DOMAIN_USB_HUB_PORTS - 1); -- 2.13.0

2 1

[libvirt] [PATCH] Migration: Preserve the failed job in case migration job is terminated beyond the perform phase.
by Prerna Saxena 08 Feb '18

08 Feb '18

In case of non-p2p migration, in case libvirt client gets disconnected from source libvirt after PERFORM phase is over, the daemon just resets the current migration job. However, the VM could be left paused on both source and destination in such case. In case the client reconnects and queries migration status, the job has been blanked out from source libvirt, and this reconnected client has no clear way of figuring out if an unclean migration had previously been aborted. This patch calls out a "potentially" incomplete migration as a failed job, so that a client may be able to watch previously failed jobs for this VM and take corrective actions as needed. Signed-off-by: Prerna Saxena <saxenap.ltc(a)gmail.com> --- src/qemu/qemu_domain.c | 16 ++++++++++++++++ src/qemu/qemu_domain.h | 2 ++ src/qemu/qemu_migration.c | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e8e0313..7c60d17 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4564,6 +4564,22 @@ qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj) qemuDomainObjSaveJob(driver, obj); } + +void +qemuDomainObjFailAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj) +{ + qemuDomainObjPrivatePtr priv = obj->privateData; + VIR_FREE(priv->job.completed); + if (VIR_ALLOC(priv->job.completed) == 0) { + priv->job.current->type = VIR_DOMAIN_JOB_FAILED; + priv->job.completed = priv->job.current; + } else { + VIR_WARN("Unable to allocate job.completed for VM %s", obj->def->name); + } + qemuDomainObjResetAsyncJob(priv); + qemuDomainObjEndJob(driver, obj); +} + void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c33af36..6465603 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -497,6 +497,8 @@ void qemuDomainObjRestoreJob(virDomainObjPtr obj, struct qemuDomainJobObj *job); void qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj); +void qemuDomainObjFailAsyncJob(virQEMUDriverPtr driver, + virDomainObjPtr obj); void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj); qemuMonitorPtr qemuDomainGetMonitor(virDomainObjPtr vm) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 69eb231..fd8950e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1911,8 +1911,8 @@ qemuMigrationCleanup(virDomainObjPtr vm, VIR_WARN("Migration of domain %s finished but we don't know if the" " domain was successfully started on destination or not", vm->def->name); - /* clear the job and let higher levels decide what to do */ - qemuDomainObjDiscardAsyncJob(driver, vm); + /* clearly "fail" the job and let higher levels decide what to do */ + qemuDomainObjFailAsyncJob(driver, vm); break; case QEMU_MIGRATION_PHASE_PERFORM3: -- 1.7.1

3 3

[libvirt] Ask question
by 李杰 08 Feb '18

08 Feb '18

Dear Recently,I am interested in libvirt,but I found the libvirt does't support revert and delete the external snapshot which the raw disk based guest.My libvirt and qemu release are both 3.2.0.So I have a question,the community how to solve it,if have any plans about it.Can you tell me more about it?Thank you very much. Best Regards Rambo

1 0

[libvirt] [PATCH 0/7] Keep non-persistent changes alive in snapshot
by Kothapally Madhu Pavan 08 Feb '18

08 Feb '18

Restoring to a snapshot should not overwrite the persistent XML configuration of a snapshot as a side effect. This patchset fixes the same. Currently, virDomainSnapshotDef only saves active domain definition of the guest. And on restore the active domain definition is used as both active and inactive domain definitions. This will make the non-persistent changes persistent in snapshot image. This patchset allows to save inactive domain definition as well and on snapshot-revert non-persistent configuration is restored as is. Currently, snapshot-revert is making non-presistent changes as persistent. Here are the steps to reproduce. Step1: virsh define $dom Step2: virsh attach-device $dom $memory-device.xml --live Step3: virsh snapshot-create $dom Step4: virsh destroy $dom Step5: virsh snapshot-revert $dom $snapshot-name Step6: virsh destroy $dom Step7: virsh start $dom Here we still have $memory-device attached in Step2. This patchset is attempting to solve this issue. This patchset will also allow user to dump and edit inactive XML configuration of a snapshot. Dumping inactive domain definition of a snapshot is important as --redefine uses snapshot-dumpxml output to redefine a snapshot. Kothapally Madhu Pavan (7): qemu: Store inactive domain configuration in snapshot qemu: Use active and inactive snapshot configuration on restore conf: Allow editing inactive snapshot configuration virsh: Dump inactive XML configuration of snapshot using snapshot-dumpxml virsh: Edit inactive XML configuration of snapshot using snapshot-edit virsh: Allow restoring snapshot with non-persistent configuration tests: docs: Add schema and testcase for domainsnapshot docs/schemas/domainsnapshot.rng | 19 +++++ include/libvirt/libvirt-domain-snapshot.h | 10 ++- include/libvirt/libvirt-domain.h | 1 + src/conf/domain_conf.c | 6 +- src/conf/domain_conf.h | 2 + src/conf/snapshot_conf.c | 48 ++++++++++++- src/conf/snapshot_conf.h | 1 + src/qemu/qemu_driver.c | 33 ++++++++- .../full_domain_withinactive.xml | 83 ++++++++++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + tools/virsh-snapshot.c | 20 ++++++ tools/virsh.pod | 37 +++++++++- 12 files changed, 251 insertions(+), 10 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlout/full_domain_withinactive.xml -- 1.8.3.1

4 16

[libvirt] [PATCH 0/2] Add {lockd|logd} admin sockets to install
by John Ferlan 08 Feb '18

08 Feb '18

Hopefully I covered what's necessary... Essentially a bunch of copying of existing examples... I haven't been able to actually build an RPM locally for a long time, but this does work with make install at least (or at least it worked in the environment I tried it on). John Ferlan (2): logd: Install the admin sockets lockd: Install the admin sockets libvirt.spec.in | 20 ++++++++++++++++---- src/Makefile.am | 39 +++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 12 deletions(-) -- 2.13.6

2 8

[libvirt] [jenkins-ci PATCH v2 0/4] Fix virt-manager build failure
by Andrea Bolognani 08 Feb '18

08 Feb '18

Changes from [v1]: * expand coverage instead of reducing it, which makes for a far more acceptable solution. [v1] https://www.redhat.com/archives/libvir-list/2018-February/msg00354.html Andrea Bolognani (4): jobs: Make Python version configurable projects: Build libvirt-python for Python 3 too projects: Build virt-manager using Python 3 guests: Fix Python installation guests/host_vars/libvirt-centos-7/main.yml | 1 - guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/vars/mappings.yml | 50 +++++++++++++++++------------ guests/vars/projects/libvirt-python.yml | 2 ++ guests/vars/projects/virt-manager.yml | 8 ++--- jobs/python-distutils.yaml | 22 ++++++------- projects/libvirt-python.yaml | 29 +++++++++++++++-- projects/virt-manager.yaml | 14 ++++---- 10 files changed, 80 insertions(+), 49 deletions(-) -- 2.14.3

2 5

[libvirt] [PATCH python 1/1] Fix type extracting from PyDict
by Edgar Kaziakhmedov 08 Feb '18

08 Feb '18

PyInt_Check returns value whether or not an input object is the integer type. The existing implementation of extracting leads to the wrong type interpretation in the following code: params = {libvirt.VIR_MIGRATE_PARAM_DISKS_PORT : 50123} ... dom.migrate3(%option1, params, %option3) where libvirt reports: libvirt.libvirtError: invalid argument: invalid type 'ullong' for parameter 'disks_port', expected 'int' So, this patch fixes that bug and allows casting to the VIR_TYPED_PARAM_INT type. Signed-off-by: Edgar Kaziakhmedov <edgar.kaziakhmedov(a)virtuozzo.com> --- libvirt-utils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirt-utils.c b/libvirt-utils.c index f7b4478..3a00e9f 100644 --- a/libvirt-utils.c +++ b/libvirt-utils.c @@ -434,10 +434,7 @@ virPyDictToTypedParamOne(virTypedParameterPtr *params, type = VIR_TYPED_PARAM_ULLONG; #if PY_MAJOR_VERSION < 3 } else if (PyInt_Check(value)) { - if (PyInt_AS_LONG(value) < 0) - type = VIR_TYPED_PARAM_LLONG; - else - type = VIR_TYPED_PARAM_ULLONG; + type = VIR_TYPED_PARAM_INT; #endif } else if (PyFloat_Check(value)) { type = VIR_TYPED_PARAM_DOUBLE; -- 2.11.0

2 6

[libvirt] [PATCH] apparmor: allow libvirt to send term signal to unconfined
by Guido Günther 08 Feb '18

08 Feb '18

Otherwise stopping domains with qemu://session fails like [164012.338157] audit: type=1400 audit(1516202208.784:99): apparmor="DENIED" operation="signal" profile="/usr/sbin/libvirtd" pid=18835 comm="libvirtd" requested_mask="send" denied_mask="send" signal=term peer="unconfined" --- examples/apparmor/usr.sbin.libvirtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd index 0ddec3f6e2..be4fabf905 100644 --- a/examples/apparmor/usr.sbin.libvirtd +++ b/examples/apparmor/usr.sbin.libvirtd @@ -63,7 +63,7 @@ signal (send) peer=/usr/sbin/dnsmasq, signal (read, send) peer=libvirt-*, - signal (send) set=("kill") peer=unconfined, + signal (send) set=("kill", "term") peer=unconfined, # Very lenient profile for libvirtd since we want to first focus on confining # the guests. Guests will have a very restricted profile. -- 2.15.1

8 8

[libvirt] [PATCH v1 01/51] util: conf: separate virDomainDefParseXML into serial parts
by xinhua.Cao 08 Feb '18

08 Feb '18

beacause virDomainDefParseXML is too long, and all domain xml parse in this function, it's difficulty to maintain this function so separate virDomainDefParseXML into serial parts use virDomainPreaseInfoFunc. then it will easy to maintain --- src/conf/domain_conf.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 34aae82..e36783b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18527,6 +18527,28 @@ virDomainCachetuneDefParse(virDomainDefPtr def, } +typedef struct _virDomainParseTotalParam virDomainParseTotalParam; +typedef virDomainParseTotalParam *virDomainParseTotalParamPtr; + +struct _virDomainParseTotalParam{ + //input parameters + virDomainDefPtr def; + xmlDocPtr xml; + xmlNodePtr root; + xmlXPathContextPtr ctxt; + virCapsPtr caps; + virDomainXMLOptionPtr xmlopt; + void *parseOpaque; + unsigned int flags; + + //internal parameters + bool usb_none; + bool usb_other; + bool usb_master; + bool uuid_generated; +}; + + static virDomainDefPtr virDomainDefParseXML(xmlDocPtr xml, xmlNodePtr root, @@ -18536,11 +18558,14 @@ virDomainDefParseXML(xmlDocPtr xml, void *parseOpaque, unsigned int flags) { + typedef int (*virDomainPreaseInfoFunc)(virDomainParseTotalParamPtr params); + xmlNodePtr *nodes = NULL, node = NULL; char *tmp = NULL; size_t i, j; int n, virtType, gic_version; long id = -1; + size_t fun_index = 0; virDomainDefPtr def; bool uuid_generated = false; virHashTablePtr bootHash = NULL; @@ -18548,6 +18573,25 @@ virDomainDefParseXML(xmlDocPtr xml, bool usb_other = false; bool usb_master = false; char *netprefix = NULL; + virDomainParseTotalParam param = { + NULL, + xml, + root, + ctxt, + caps, + xmlopt, + parseOpaque, + flags, + false, + false, + false, + false + + }; + + virDomainPreaseInfoFunc parse_funs[] = { + NULL + }; if (flags & VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA) { char *schema = virFileFindResource("domain.rng", @@ -18565,6 +18609,14 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(def = virDomainDefNew())) return NULL; + param.def = def; + + while (parse_funs[fun_index]) { + if (parse_funs[fun_index](&param) < 0) + goto error; + fun_index++; + } + if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) if (virXPathLong("string(./@id)", ctxt, &id) < 0) id = -1; -- 2.8.3

3 52

[libvirt] [PATCH v1 01/35] util: conf: add bootHash to virDomainParseTotalParam
by xinhua.Cao 08 Feb '18

08 Feb '18

add bootHash to virDomainParseTotalParam --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1e949ea..1a8248d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18516,6 +18516,7 @@ struct _virDomainParseTotalParam{ virCapsPtr caps; virDomainXMLOptionPtr xmlopt; void *parseOpaque; + virHashTablePtr bootHash; unsigned int flags; //internal parameters @@ -19816,6 +19817,7 @@ virDomainDefParseXML(xmlDocPtr xml, caps, xmlopt, parseOpaque, + NULL, flags, false, false, @@ -19861,7 +19863,11 @@ virDomainDefParseXML(xmlDocPtr xml, if (!(def = virDomainDefNew())) return NULL; + if (!(bootHash = virHashCreate(5, NULL))) + goto error; + param.def = def; + param.bootHash = bootHash; while (parse_funs[fun_index]) { if (parse_funs[fun_index](&param) < 0) -- 2.8.3

1 9

[libvirt] Support interface network stats for SR-IOV in Switchdev mode(VF representors)
by Jai Singh Rana 08 Feb '18

08 Feb '18

Hi All, Currently libvirt does not support networks interface stats for <interface type='hostdev'>. With availability of switchdev model in linux, it is possible to capture stats for SR-IOV VFs on host using its VF representor interface on host for nics supporting switchdev model. https://github.com/torvalds/linux/blob/master/Documentation/networking/swit… I want to preapre a patch supporting this feature for hostdev and write some function like 'virHostdevSwitchdevVfRepresentorInterfaceStats' for returning stats. Should I include this function and supporting methods in src/util/virhostdev.c or should i include it in new file something like src/util/virswitchdev.c . Thanks, Jai

2 3

[libvirt] [RFC v2 REPOST] arm64: KVM: KVM API extensions for SVE
by Dave Martin 07 Feb '18

07 Feb '18

Hi all, Reposting this to give people another chance to comment before I move ahead... ---8<--- Here's a second, slightly more complete stab at the KVM API extensions for SVE. I haven't started implementing in earnest yet, so any comments at this stage would be very helpful. [libvir-list readers: this is a proposal for extending the KVM API on AArch64 systems to support the Scalable Vector Extension [1], [2]. This has some interesting configuration and migration quirks -- see "Vector length control" in particular, and feel free to throw questions my way...] Cheers ---Dave [1] Overview https://community.arm.com/processors/b/blog/posts/technology-update-the-sca… [2] Architecture spec https://developer.arm.com/products/architecture/a-profile/docs/ddi0584/late… ---8<--- New feature KVM_ARM_VCPU_SVE: * enables exposure of SVE to the guest * enables visibility of / access to KVM_REG_ARM_SVE_*() via KVM reg ioctls. The main purposes of this are a) is to allow userspace to hide weird-sized registers that it doesn't understand how to deal with, and b) allow SVE to be hidden from the VM so that it can migrate to nodes that don't support SVE. ZCR_EL1 is not specifically hidden, since it is "just a system register" and does not have a weird size or semantics etc. Registers: * A new register size is defined KVM_REG_SIZE_U2048 (which can be encoded sensibly using the next unused value for the reg size field in the reg ID) (grep KVM_REG_SIZE_). * Reg IDs for the SVE regs will be defined as "coproc" 0x14 (i.e., 0x14 << KVM_REG_ARM_COPROC_SHIFT) KVM_REG_ARM_SVE_Z(n, i) is slice i of Zn (each slice is 2048 bits) KVM_REG_ARM_SVE_P(n, i) is slice i of Pn (each slice is 256 bits) KVM_REG_ARM_FFR(i) is slice i of FFR (each slice is 256 bits) The slice sizes allow each register to be read/written in exactly one slice for SVE. Surplus bits (beyond the maximum VL supported by the vcpu) will be read-as-zero write-ignore. Reading/writing surplus slices will probably be forbidden, and the surplus slices would not be reported via KVM_GET_REG_LIST. (We could make these RAZ/WI too, but I'm not sure if it's worth it, or why it would be useful.) Future extensions to the architecture might grow the registers up to 32 slices: this may or may not actually happen, but SVE keeps the possibilty open. I've tried to design for it. * KVM_REG_ARM_SVE_Z(n, 0) bits [127:0] alias Vn in KVM_REG_ARM_CORE(fp_regs.v[n]) .. KVM_REG_ARM_CORE(fp_regs.v[n])+3. It's simplest for userspace if the two views always appear to be in sync, but it's unclear whether this is really useful. Perhaps this can be relaxed if it's a big deal for the KVM implementation; I don't know yet. Vector length control: Some means is needed to determine the set of vector lengths visible to guest software running on a vcpu. When a vcpu is created, the set would be defaulted to the maximal set that can be supported while permitting each vcpu to run on any host CPU. SVE has some virtualisation quirks which mean that this set may exclude some vector lengths that are available for host userspace applications. The common case should be that the sets are the same however. * New ioctl KVM_ARM_VCPU_{SET,GET}_SVE_VLS to set or retrieve the set of vector lengths available to the guest. Adding random vcpu ioctls To configure a non-default set of vector lengths, KVM_ARM_VCPU_SET_SVE_VLS can be called: this would only be permitted before the vcpu is first run. This is primarily intended for supporting migration, by providing a robust check that the destination node will run the vcpu correctly. In a cluster with non-uniform SVE implementation across nodes, this also allows a specific set of VLs to be requested that the caller knows is usable across the whole cluster. For migration purposes, userspace would need to do KVM_ARM_VCPU_GET_SVE_VLS at the origin node and store the returned set as VM metadata: on the destination node, KVM_ARM_VCPU_SET_SVE_VLS should be used to request that exact set of VLs: if the destination node can't support that set of VLs, the call will fail. The interface would look something like: ioctl(vcpu_fd, KVM_ARM_SVE_SET_VLS, __u64 vqs[SVE_VQ_MAX / 64]); How to expose this to the user in an intelligible way would be a problem for userspace to solve. At present, other than initialising each vcpu to the maximum supportable set of VLs, I don't propose having a way to probe for what sets of VLs are supportable: the above call either succeeds or fails. Cheers ---Dave _______________________________________________ kvmarm mailing list kvmarm(a)lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm

2 8

[libvirt] [jenkins-ci PATCH 0/2] Fix virt-manager build failure
by Andrea Bolognani 07 Feb '18

07 Feb '18

By making a lot of compromises. Not a perfect solution, but still better than not building virt-manager at all until we've come up with a proper one I reckon. ¯\_(ツ)_/¯ Andrea Bolognani (2): guests: Install Python 3 dependencies for virt-manager jobs: Switch all Python builds to Python 3 guests/host_vars/libvirt-centos-6/main.yml | 1 - guests/host_vars/libvirt-centos-7/main.yml | 2 -- guests/host_vars/libvirt-debian-8/main.yml | 1 - guests/host_vars/libvirt-ubuntu-14/main.yml | 1 - guests/host_vars/libvirt-ubuntu-16/main.yml | 1 - guests/vars/mappings.yml | 41 ++++++++++++++++------------- guests/vars/projects/virt-manager.yml | 8 +++--- jobs/python-distutils.yaml | 8 +++--- projects/virt-manager.yaml | 2 +- 9 files changed, 31 insertions(+), 34 deletions(-) -- 2.14.3

1 2

[libvirt] [jenkins-ci] lcitool: Use default python for creating salty passwords
by Martin Kletzander 07 Feb '18

07 Feb '18

On my system the crypt module in python2 doesn't have mksalt() function. However python3 does and the code is perfectly fine python3 code as well. So let's make it run in the default python version as that has the highest chance to work. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- guests/lcitool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index ccd0a597785a..24274d800742 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -18,7 +18,7 @@ die() { hash_file() { PASS_FILE="$1" - python2 -c " + python -c " import crypt password = open('$PASS_FILE', 'r').read().strip() print(crypt.crypt(password, -- 2.16.1

3 3

[libvirt] [PATCH] util: Fix syntax-check
by Andrea Bolognani 07 Feb '18

07 Feb '18

Broken by 759b4d1b0fe5f4d84d98b99153dfa7ac289dd167. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as a CI build fix. src/util/virlog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virlog.c b/src/util/virlog.c index 9105337ce..8f1e4800d 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -478,9 +478,8 @@ virLogHostnameString(char **rawmsg, if (!virLogHostname) return -1; - if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) { + if (virAsprintfQuiet(&hoststr, "hostname: %s", virLogHostname) < 0) return -1; - } if (virLogFormatString(msg, 0, NULL, VIR_LOG_INFO, hoststr) < 0) { VIR_FREE(hoststr); -- 2.14.3

1 0

[libvirt] [PATCH] conf: Check for NUMA distances in validity check
by Michal Privoznik 07 Feb '18

07 Feb '18

NUMA distances are part of guest ABI (guests can read it directly!) and therefore as such shouldn't change throughout the lifetime of domain. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/numa_conf.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index c906a53de..7d3f9e661 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -1073,7 +1073,7 @@ bool virDomainNumaCheckABIStability(virDomainNumaPtr src, virDomainNumaPtr tgt) { - size_t i; + size_t i, j; if (virDomainNumaGetNodeCount(src) != virDomainNumaGetNodeCount(tgt)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -1102,6 +1102,17 @@ virDomainNumaCheckABIStability(virDomainNumaPtr src, "match source"), i); return false; } + + for (j = 0; j < virDomainNumaGetNodeCount(src); j++) { + if (virDomainNumaGetNodeDistance(src, i, j) != + virDomainNumaGetNodeDistance(tgt, i, j)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target NUMA distance from %zu to %zu " + "doesn't match source"), i, j); + + return false; + } + } } return true; -- 2.13.6

2 4

[libvirt] [PATCH 0/4] qemu: Don't refresh 'halted' state for domain stats
by Peter Krempa 07 Feb '18

07 Feb '18

The halted state information is useless on most platforms and calling 'query-cpus' is very expensive. Don't report the info on platforms where it does not make sense. Peter Krempa (3): qemu: driver: Extract vcpu halted state directly qemu: Remove unused 'cpuhalted' argument from qemuDomainHelperGetVcpus qemu: domain: Store vcpu halted state as a tristate Viktor Mihajlovski (1): qemu: Limit refresh of CPU halted state to s390 src/qemu/qemu_domain.c | 8 +++++++- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 36 +++++++++++++++--------------------- 3 files changed, 23 insertions(+), 23 deletions(-) -- 2.15.0

3 6

[libvirt] [PATCH RFCv2 0/4] Add optional pSeries features
by Andrea Bolognani 07 Feb '18

07 Feb '18

Applies on top of [req]. RFC because we still don't have a way of probing QEMU to figure out whether the relevant toggles are available. Plus, there's no documentation yet :) Changes from [RFCv1]: * don't nest features inside a <pseries/> element; * implement all optional features. [req] https://www.redhat.com/archives/libvir-list/2018-February/msg00298.html [RFCv1] https://www.redhat.com/archives/libvir-list/2018-January/msg00779.html Andrea Bolognani (4): qemu: Implement the HTM pSeries feature qemu: Implement the SBBC pSeries feature qemu: Implement the CFPC pSeries feature qemu: Implement the IBS pSeries feature docs/schemas/domaincommon.rng | 30 ++++ src/conf/domain_conf.c | 74 +++++++++ src/conf/domain_conf.h | 15 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 17 +++ src/qemu/qemu_capabilities.h | 6 + src/qemu/qemu_command.c | 165 +++++++++++++++++++++ src/qemu/qemu_domain.c | 22 +++ tests/qemuxml2argvdata/pseries-features-cfpc.args | 19 +++ tests/qemuxml2argvdata/pseries-features-cfpc.xml | 28 ++++ tests/qemuxml2argvdata/pseries-features-htm.args | 19 +++ tests/qemuxml2argvdata/pseries-features-htm.xml | 28 ++++ tests/qemuxml2argvdata/pseries-features-ibs.args | 19 +++ tests/qemuxml2argvdata/pseries-features-ibs.xml | 28 ++++ .../pseries-features-invalid-machine.xml | 1 + tests/qemuxml2argvdata/pseries-features-sbbc.args | 19 +++ tests/qemuxml2argvdata/pseries-features-sbbc.xml | 28 ++++ tests/qemuxml2argvtest.c | 20 +++ tests/qemuxml2xmloutdata/pseries-features-cfpc.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-htm.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-ibs.xml | 1 + tests/qemuxml2xmloutdata/pseries-features-sbbc.xml | 1 + tests/qemuxml2xmltest.c | 12 ++ 23 files changed, 556 insertions(+) create mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.args create mode 100644 tests/qemuxml2argvdata/pseries-features-cfpc.xml create mode 100644 tests/qemuxml2argvdata/pseries-features-htm.args create mode 100644 tests/qemuxml2argvdata/pseries-features-htm.xml create mode 100644 tests/qemuxml2argvdata/pseries-features-ibs.args create mode 100644 tests/qemuxml2argvdata/pseries-features-ibs.xml create mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.args create mode 100644 tests/qemuxml2argvdata/pseries-features-sbbc.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-cfpc.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-htm.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-ibs.xml create mode 120000 tests/qemuxml2xmloutdata/pseries-features-sbbc.xml -- 2.14.3

2 6

[libvirt] [PATCH v3 0/4] qemu: use arp table of host to get the
by Chen Hanxiao 07 Feb '18

07 Feb '18

introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the output of /proc/net/arp Chen Hanxiao (4): util: introduce helper to parse /proc/net/arp qemu: introduce qemuARPGetInterfaces to get IP from host's arp table virsh: add --source arp to domifaddr news: qemu: use arp table of host to get the IP address of guests docs/news.xml | 9 ++++ include/libvirt/libvirt-domain.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt-domain.c | 7 +++ src/libvirt_private.syms | 5 ++ src/qemu/qemu_driver.c | 96 +++++++++++++++++++++++++++++++++ src/util/virarptable.c | 114 +++++++++++++++++++++++++++++++++++++++ src/util/virarptable.h | 48 +++++++++++++++++ tools/virsh-domain-monitor.c | 2 + tools/virsh.pod | 7 +-- 11 files changed, 288 insertions(+), 3 deletions(-) create mode 100644 src/util/virarptable.c create mode 100644 src/util/virarptable.h -- 2.14.3

2 7

[libvirt] ANNOUNCE: virt-manager 1.5.0 released
by Cole Robinson 07 Feb '18

07 Feb '18

I'm happy to announce the release of virt-manager 1.5.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ This release includes: - python3 prep work (Radostin Stoyanov, Cole Robinson, Cédric Bosdonnat) - Switch --location ISO to use isoinfo (Andrew Wong) - virt-install: add --cpu numa distance handling (Menno Lageman) - virt-install: fix --disk for rbd volumes with auth (Rauno Väli) - virt-install: add --cputune vcpupin handling (Wim ten Have) - details ui: Showing attached scsi devices per controller (Lin Ma) - network ui: Show details about SR-IOV VF pool (Lin Ma) - Greatly expand UI test suite coverage Note, the next major release will be within the next 2-3 months and will be a port to python3. There may be additional bugfix releases in the 1.5 series if needed. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH perl v2] Remove use of Data::Dumper from example programs
by Daniel P. Berrangé 06 Feb '18

06 Feb '18

Using Data::Dumper in examples does not help devs understand the data structures that the Perl APIs are returning. Change to explicit field accesses to illustrate it better Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- examples/dhcp-leases.pl | 7 +++++-- examples/dom-fsinfo.pl | 8 +++----- examples/dom-ifinfo.pl | 14 +++++++++----- examples/dom-stats.pl | 9 +++------ examples/node-info.pl | 26 +++++++++++++++++++------- 5 files changed, 39 insertions(+), 25 deletions(-) diff --git a/examples/dhcp-leases.pl b/examples/dhcp-leases.pl index 84a81ef..a2202d9 100644 --- a/examples/dhcp-leases.pl +++ b/examples/dhcp-leases.pl @@ -1,7 +1,6 @@ #!/usr/bin/perl use Sys::Virt; -use Data::Dumper; my $c = Sys::Virt->new(uri => "qemu:///system", readonly => 1); @@ -9,5 +8,9 @@ my $c = Sys::Virt->new(uri => "qemu:///system", $n = $c->get_network_by_name("default"); foreach my $lease ($n->get_dhcp_leases()) { - print Dumper($lease); + print "Interface ", $lease->{iface}, "\n"; + print " MAC: ", $lease->{mac}, "\n"; + print " IP: ", $lease->{ipaddr}, "\n"; + print " Host: ", $lease->{hostname}, "\n" if $lease->{hostname}; + print "\n"; } diff --git a/examples/dom-fsinfo.pl b/examples/dom-fsinfo.pl index 7763f78..46c64e9 100644 --- a/examples/dom-fsinfo.pl +++ b/examples/dom-fsinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -15,7 +14,6 @@ my $dom = $c->get_domain_by_name(shift @ARGV); my @fs = $dom->get_fs_info(); -use Data::Dumper; - -print Dumper($fs[0]); -print Dumper($fs[1]); +foreach my $fs (@fs) { + printf "%s (%s) at %s\n", $fs->{name}, $fs->{fstype}, $fs->{mountpoint}; +} diff --git a/examples/dom-ifinfo.pl b/examples/dom-ifinfo.pl index e10579b..66eb157 100644 --- a/examples/dom-ifinfo.pl +++ b/examples/dom-ifinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -13,9 +12,14 @@ my $c = Sys::Virt->new(uri => $uri); my $dom = $c->get_domain_by_name(shift @ARGV); -my @fs = $dom->get_interface_addresses( +my @nics = $dom->get_interface_addresses( Sys::Virt::Domain::INTERFACE_ADDRESSES_SRC_LEASE); -use Data::Dumper; - -print Dumper(@fs); +foreach my $nic (@nics) { + print "Interface ", $nic->{name}, "\n"; + print " MAC: ", $nic->{hwaddr}, "\n"; + foreach my $addr (@{$nic->{addrs}}) { + print " IP: ", $addr->{addr}, "\n"; + } + print "\n"; +} diff --git a/examples/dom-stats.pl b/examples/dom-stats.pl index 13d8fb7..1da0089 100644 --- a/examples/dom-stats.pl +++ b/examples/dom-stats.pl @@ -20,10 +20,7 @@ my @stats = $c->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, \@doms, Sys::Virt::Domain::GET_ALL_STATS_ENFORCE_STATS); -use Data::Dumper; - -print Dumper(\@stats); - -for (my $i = 0 ; $i <= $#stats ; $i++) { - print $stats[$i]->{'dom'}->get_name(), ": ", $stats[$i]->{'data'}->{'state.state'}, "\n"; +foreach my $stats (@stats) { + print "Guest ", $stats->{'dom'}->get_name(), "\n"; + print " State: ", $stats->{'data'}->{'state.state'}, "\n"; } diff --git a/examples/node-info.pl b/examples/node-info.pl index 89bc9ba..9655ab4 100644 --- a/examples/node-info.pl +++ b/examples/node-info.pl @@ -13,13 +13,25 @@ my $info = $hv->get_node_info(); my @models = $hv->get_cpu_model_names($info->{model}); -print join ("\n", sort{ lc $a cmp lc $b } @models), "\n"; - -my @info = $hv->get_node_free_pages([2048], 0, 0); - -use Data::Dumper; -print Dumper(\@info); - +print "Available CPU model names:\n"; +print join ("\n", map { " " . $_ } sort{ lc $a cmp lc $b } @models), "\n"; + +my @pagesizes = ( + 4, 2048, 1048576 + ); + +my @info = $hv->get_node_free_pages(\@pagesizes, 0, 0); + +print "Free pages per NUMA node:\n"; +foreach my $info (@info) { + print " Node: ", $info->{cell}, "\n"; + print " Free: "; + for (my $i = 0; $i <= $#pagesizes; $i++) { + my $pagesize = $pagesizes[$i]; + printf "%d @ %d KB, ", $info->{pages}->{$pagesize}, $pagesize; + } + print "\n"; +} my $xml = $hv->get_domain_capabilities(undef, "x86_64", undef, "kvm"); print $xml; -- 2.14.3

2 1

[libvirt] [PATCH perl] Remove use of Data::Dumper from example programs
by Daniel P. Berrangé 06 Feb '18

06 Feb '18

Using Data::Dumper in examples does not help devs understand the data structures that the Perl APIs are returning. Change to explicit field accesses to illustrate it better Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Virt.xs | 1 - examples/dhcp-leases.pl | 2 -- examples/dom-fsinfo.pl | 8 +++----- examples/dom-ifinfo.pl | 14 +++++++++----- examples/dom-stats.pl | 9 +++------ examples/node-info.pl | 26 +++++++++++++++++++------- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/Virt.xs b/Virt.xs index 7d2f1a7..1254df2 100644 --- a/Virt.xs +++ b/Virt.xs @@ -3358,7 +3358,6 @@ void get_all_domain_stats(con, stats, doms_sv=&PL_sv_undef, flags=0) if (SvOK(doms_sv)) { doms_av = (AV*)SvRV(doms_sv); ndoms = av_len(doms_av) + 1; - fprintf(stderr, "Len %d\n", ndoms); } else { ndoms = 0; } diff --git a/examples/dhcp-leases.pl b/examples/dhcp-leases.pl index af9bd41..a2202d9 100644 --- a/examples/dhcp-leases.pl +++ b/examples/dhcp-leases.pl @@ -1,8 +1,6 @@ #!/usr/bin/perl -use Acme::ChuckNorris; use Sys::Virt; -use Data::Dumper; my $c = Sys::Virt->new(uri => "qemu:///system", readonly => 1); diff --git a/examples/dom-fsinfo.pl b/examples/dom-fsinfo.pl index 7763f78..46c64e9 100644 --- a/examples/dom-fsinfo.pl +++ b/examples/dom-fsinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -15,7 +14,6 @@ my $dom = $c->get_domain_by_name(shift @ARGV); my @fs = $dom->get_fs_info(); -use Data::Dumper; - -print Dumper($fs[0]); -print Dumper($fs[1]); +foreach my $fs (@fs) { + printf "%s (%s) at %s\n", $fs->{name}, $fs->{fstype}, $fs->{mountpoint}; +} diff --git a/examples/dom-ifinfo.pl b/examples/dom-ifinfo.pl index e10579b..66eb157 100644 --- a/examples/dom-ifinfo.pl +++ b/examples/dom-ifinfo.pl @@ -1,6 +1,5 @@ #!/usr/bin/perl - use strict; use warnings; @@ -13,9 +12,14 @@ my $c = Sys::Virt->new(uri => $uri); my $dom = $c->get_domain_by_name(shift @ARGV); -my @fs = $dom->get_interface_addresses( +my @nics = $dom->get_interface_addresses( Sys::Virt::Domain::INTERFACE_ADDRESSES_SRC_LEASE); -use Data::Dumper; - -print Dumper(@fs); +foreach my $nic (@nics) { + print "Interface ", $nic->{name}, "\n"; + print " MAC: ", $nic->{hwaddr}, "\n"; + foreach my $addr (@{$nic->{addrs}}) { + print " IP: ", $addr->{addr}, "\n"; + } + print "\n"; +} diff --git a/examples/dom-stats.pl b/examples/dom-stats.pl index 13d8fb7..1da0089 100644 --- a/examples/dom-stats.pl +++ b/examples/dom-stats.pl @@ -20,10 +20,7 @@ my @stats = $c->get_all_domain_stats(Sys::Virt::Domain::STATS_STATE, \@doms, Sys::Virt::Domain::GET_ALL_STATS_ENFORCE_STATS); -use Data::Dumper; - -print Dumper(\@stats); - -for (my $i = 0 ; $i <= $#stats ; $i++) { - print $stats[$i]->{'dom'}->get_name(), ": ", $stats[$i]->{'data'}->{'state.state'}, "\n"; +foreach my $stats (@stats) { + print "Guest ", $stats->{'dom'}->get_name(), "\n"; + print " State: ", $stats->{'data'}->{'state.state'}, "\n"; } diff --git a/examples/node-info.pl b/examples/node-info.pl index 89bc9ba..9655ab4 100644 --- a/examples/node-info.pl +++ b/examples/node-info.pl @@ -13,13 +13,25 @@ my $info = $hv->get_node_info(); my @models = $hv->get_cpu_model_names($info->{model}); -print join ("\n", sort{ lc $a cmp lc $b } @models), "\n"; - -my @info = $hv->get_node_free_pages([2048], 0, 0); - -use Data::Dumper; -print Dumper(\@info); - +print "Available CPU model names:\n"; +print join ("\n", map { " " . $_ } sort{ lc $a cmp lc $b } @models), "\n"; + +my @pagesizes = ( + 4, 2048, 1048576 + ); + +my @info = $hv->get_node_free_pages(\@pagesizes, 0, 0); + +print "Free pages per NUMA node:\n"; +foreach my $info (@info) { + print " Node: ", $info->{cell}, "\n"; + print " Free: "; + for (my $i = 0; $i <= $#pagesizes; $i++) { + my $pagesize = $pagesizes[$i]; + printf "%d @ %d KB, ", $info->{pages}->{$pagesize}, $pagesize; + } + print "\n"; +} my $xml = $hv->get_domain_capabilities(undef, "x86_64", undef, "kvm"); print $xml; -- 2.14.3

3 4