- 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 @@ </p> <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. </p> <p> 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