- Devel - libvirt List Archives

[libvirt PATCH] ci: jobs.sh: Add back '--no-suite syntax-check --print-errorlogs'
by Erik Skultety 13 Sep '23

13 Sep '23

Commit f688a53a converted .gitlab-ci.yml to the usage of ci/jobs.sh functions, but in doing that our test options '--no-suite syntax-check --print-errorlogs' got lost in the process and since commit 8e660c52 didn't introduce them in the first place, it caused a behavioral regression. This patch adds them back. Fixes: 8e660c5286d7e2d07dd61681074bf1555955552d Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Technically this is a build breaker fix, but sending for review anyway to see if there's an agreement on this approach. ci/jobs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/jobs.sh b/ci/jobs.sh index abd695e231..eb4a4e29cf 100644 --- a/ci/jobs.sh +++ b/ci/jobs.sh @@ -39,7 +39,10 @@ run_dist() { } run_test() { + TEST_ARGS="${TEST_ARGS:=--no-suite syntax-check --print-errorlogs}" + test -f $GIT_ROOT/build/build.ninja || run_meson_setup + run_cmd meson test -C build $TEST_ARGS } -- 2.41.0

2 1

[libvirt PATCH v2 0/5] Add support for vDPA block devices
by Jonathon Jongsma 13 Sep '23

13 Sep '23

see https://bugzilla.redhat.com/show_bug.cgi?id=1900770. Changes in v2: - Don't use virStorageSource->path for vdpa device path to avoid clashing with existing path functionality - Move vdpa device opening to the qemuProcessPrepareHostStorageSource() function rather than the qemuDomainPrepareStorageSource() function. This also required some additional support in the tests for setting up the objects properly for testing. - rebased to latest master branch Jonathon Jongsma (5): conf: add ability to configure a vdpa block disk device qemu: add virtio-blk-vhost-vdpa capability qemu: make vdpa connect function more generic qemu: consider vdpa block devices for memlock limits qemu: Implement support for vDPA block devices docs/formatdomain.rst | 19 +++++++++- src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 8 ++++ src/conf/schemas/domaincommon.rng | 13 +++++++ src/conf/storage_source_conf.c | 7 +++- src/conf/storage_source_conf.h | 2 + src/libxl/xen_xl.c | 1 + src/qemu/qemu_block.c | 20 ++++++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 +++++++++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_domain.c | 12 +++++- src/qemu/qemu_interface.c | 23 ------------ src/qemu/qemu_interface.h | 2 - src/qemu/qemu_migration.c | 2 + src/qemu/qemu_process.c | 34 +++++++++++++++++ src/qemu/qemu_snapshot.c | 4 ++ src/qemu/qemu_validate.c | 33 +++++++++++++++-- src/storage_file/storage_source.c | 1 + .../caps_8.1.0_x86_64.xml | 1 + tests/qemuhotplugmock.c | 4 +- .../disk-vhostvdpa.x86_64-latest.args | 37 +++++++++++++++++++ tests/qemuxml2argvdata/disk-vhostvdpa.xml | 21 +++++++++++ tests/qemuxml2argvmock.c | 2 +- tests/qemuxml2argvtest.c | 34 +++++++++++++++++ tests/testutilsqemu.c | 11 ++++++ tests/testutilsqemu.h | 2 + 28 files changed, 285 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-vhostvdpa.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-vhostvdpa.xml -- 2.41.0

4 11

[libvirt PATCH v2 00/35] ci: Unify the GitLab CI jobs with local executions && adopt lcitool container executions
by Erik Skultety 13 Sep '23

13 Sep '23

since v2 [1]: - moved the custom meson.build directory check before running setup to individual callers for better robustness, but actually let meson deal with an existing setup directory most of the time - drops the ci/Makefile - only set our verbose env variables when running without a TTY - switched the bright yellow (93m) color to green (32m) - added KeyboardInterrupt handling in the ci/helper Python code The changes above require the following lcitool MR to be merged first as they're built on top of it [2] [1] https://listman.redhat.com/archives/libvir-list/2023-August/241471.html [2] https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/431 Erik Skultety (35): ci: build.sh: Add variables from .gitlab-ci.yml ci: build.sh: Add GIT_ROOT env helper variable ci: build.sh: Don't mention that MESON_ARGS are available via CLI ci: build.sh: Add a wrapper function executing 'shell' commands ci: build.sh: Add a wrapper function over meson's setup ci: build.sh: Add a wrapper function over the 'build' job ci: build.sh: Add a helper function to create the dist tarball ci: build.sh: Add a wrapper function over the 'test' job ci: build.sh: Add a wrapper function over the 'codestyle' job ci: build.sh: Add a wrapper function over the 'potfile' job ci: build.sh: Add a wrapper function over the 'rpmbuild' job ci: build.sh: Add a wrapper function over the 'website' job ci: build.sh: Drop changing working directory to CI_CONT_DIR ci: build.sh: Drop direct invocation of meson/ninja commands ci: build.sh: Drop MESON_ARGS definition from global level ci: Rename build.sh -> jobs.sh .gitlab-ci.yml: Add 'after_script' stage to prep for artifact collection .gitlab-ci.yml: Convert the native build job to the build.sh usage .gitlab-ci.yml: Convert the cross build job to the build.sh usage .gitlab-ci.yml: Convert the website build job to the build.sh usage .gitlab-ci.yml: Convert the codestyle job to the build.sh usage .gitlab-ci.yml: Convert the potfile job to the build.sh usage ci: helper: Drop _lcitool_get_targets method ci: helper: Don't make ':' literal a static part of the image tag ci: helper: Add --lcitool-path CLI option ci: helper: Add a required_deps higher order helper/decorator ci: helper: Add Python code hangling git clones ci: helper: Add a helper to create a local repo clone Pythonic way ci: helper: Rework _lcitool_run method logic ci: helper: Add an action to run the container workload via lcitool ci: helper: Add a job argparse subparser ci: helper: Drop original actions ci: helper: Drop the --meson-args/--ninja-args CLI options ci: helper: Drop the _make_run method ci: Drop the now unused Makefile .gitlab-ci.yml | 47 +++++----- ci/Makefile | 245 ------------------------------------------------- ci/build.sh | 23 ----- ci/helper | 181 +++++++++++++++++++++--------------- ci/jobs.sh | 79 ++++++++++++++++ 5 files changed, 211 insertions(+), 364 deletions(-) delete mode 100644 ci/Makefile delete mode 100644 ci/build.sh create mode 100644 ci/jobs.sh -- 2.41.0

2 50

[PATCH (pushed)] virStorageSourceClear: Clear 'vdpadev' field
by Peter Krempa 13 Sep '23

13 Sep '23

Release memory for the recently added field. Fixes: 1df106cc20a4cc6417cfbaf01860f465ec3dd915 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/conf/storage_source_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index f57cb3241d..f7f62c3966 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -1143,6 +1143,7 @@ virStorageSourceClear(virStorageSource *def) VIR_FREE(def->path); VIR_FREE(def->fdgroup); VIR_FREE(def->volume); + VIR_FREE(def->vdpadev); VIR_FREE(def->snapshot); VIR_FREE(def->configFile); VIR_FREE(def->query); -- 2.41.0

1 0

[PATCH 0/2] Check for capng_*() retvals
by Michal Privoznik 11 Sep '23

11 Sep '23

There's a commit inside of (yet-unreleased) libcap-ng which marks some functions as 'warned unused result'. Fedora rawhide already picked up the commit, but since we are not checking for all retvals we got a build failure on rawhide. https://src.fedoraproject.org/rpms/libcap-ng/c/fed9b23c8d0020e07c937a3ac0d6… Green pipeline: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/999435445 Michal Prívozník (2): lxc_container: Check retval of capng_get_caps_process() virutil: Check retval of capng_apply() src/lxc/lxc_container.c | 8 +++++++- src/util/virutil.c | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) -- 2.41.0

3 4

[libvirt PATCH v4] ch: Fix cloud-hypervisor version processing
by Praveen K Paladugu 11 Sep '23

11 Sep '23

Refactor the version processing logic in ch driver to support versions from non-release cloud-hypervisor binaries. This version also supports versions with branch prefixes in them. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/ch/ch_conf.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index a8565d9537..f421af5121 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -172,6 +172,29 @@ virCHDriverConfigDispose(void *obj) #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) +/** + * chPreProcessVersionString: + * + * Returns: a pointer to numerical version without branch/commit info + */ +static char * +chPreProcessVersionString(char *version) +{ + char *tmp = strrchr(version, '/'); + + if (tmp) + version = tmp + 1; + + if (version[0] == 'v') + version++; + + tmp = strchr(version, '-'); + if (tmp) + *tmp = '\0'; + + return version; +} + int chExtractVersion(virCHDriver *driver) { @@ -193,13 +216,20 @@ chExtractVersion(virCHDriver *driver) tmp = help; - /* expected format: cloud-hypervisor v<major>.<minor>.<micro> */ - if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL) { + /* Below are example version formats and expected outputs: + * cloud-hypervisor v32.0.0 (expected: 32.0.0) + * cloud-hypervisor v33.0-104-ge0e3779e-dirty (expected: 33.0) + * cloud-hypervisor testing/v32.0.131-1-ga5d6db5c-dirty (expected: 32.0.131) + */ + if ((tmp = STRSKIP(tmp, "cloud-hypervisor ")) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected output of cloud-hypervisor binary")); return -1; } + tmp = chPreProcessVersionString(tmp); + VIR_DEBUG("Cloud-Hypervisor version detected: %s", tmp); + if (virStringParseVersion(&version, tmp, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse cloud-hypervisor version: %1$s"), tmp); -- 2.41.0

2 1

[PATCH v2] interface: fix udev_device_get_sysattr_value return value check
by Dmitry Frolov 11 Sep '23

11 Sep '23

Reviewing the code I found that return value of function udev_device_get_sysattr_value() is dereferenced without a check. udev_device_get_sysattr_value() may return NULL by number of reasons. v2: VIR_DEBUG added, replaced STREQ(NULLSTR()) with STREQ_NULLABLE() Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru> --- src/interface/interface_backend_udev.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index a0485ddd21..df7066727e 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -23,6 +23,7 @@ #include <dirent.h> #include <libudev.h> +#include "virlog.h" #include "virerror.h" #include "virfile.h" #include "datatypes.h" @@ -40,6 +41,8 @@ #define VIR_FROM_THIS VIR_FROM_INTERFACE +VIR_LOG_INIT("interface.interface_backend_udev"); + struct udev_iface_driver { struct udev *udev; /* pid file FD, ensures two copies of the driver can't use the same root */ @@ -355,10 +358,13 @@ udevConnectListAllInterfaces(virConnectPtr conn, g_autoptr(virInterfaceDef) def = NULL; path = udev_list_entry_get_name(dev_entry); - dev = udev_device_new_from_syspath(udev, path); + if (!(dev = udev_device_new_from_syspath(udev, path))) { + VIR_DEBUG("Skipping interface '%s'", NULLSTR(path)); + continue; + } name = udev_device_get_sysname(dev); macaddr = udev_device_get_sysattr_value(dev, "address"); - status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up"); def = udevGetMinimalDefForDevice(dev); if (!virConnectListAllInterfacesCheckACL(conn, def)) { @@ -964,9 +970,9 @@ udevGetIfaceDef(struct udev *udev, const char *name) /* MTU */ mtu_str = udev_device_get_sysattr_value(dev, "mtu"); - if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { + if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse MTU value '%1$s'"), mtu_str); + _("Could not parse MTU value '%1$s'"), NULLSTR(mtu_str)); goto error; } ifacedef->mtu = mtu; @@ -1089,7 +1095,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) goto cleanup; /* Check if it's active or not */ - status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + status = STREQ_NULLABLE(udev_device_get_sysattr_value(dev, "operstate"), "up"); udev_device_unref(dev); -- 2.34.1

2 1

[libvirt PATCH 0/5] Add support for vDPA block devices
by Jonathon Jongsma 08 Sep '23

08 Sep '23

see https://bugzilla.redhat.com/show_bug.cgi?id=1900770. Jonathon Jongsma (5): conf: add ability to configure a vdpa block disk device qemu: add virtio-blk-vhost-vdpa capability qemu: make vdpa connect function more generic qemu: consider vdpa block devices for memlock limits qemu: Implement support for vDPA block devices docs/formatdomain.rst | 19 ++++++++- src/ch/ch_monitor.c | 1 + src/conf/domain_conf.c | 7 ++++ src/conf/schemas/domaincommon.rng | 13 +++++++ src/conf/storage_source_conf.c | 6 ++- src/conf/storage_source_conf.h | 1 + src/libxl/xen_xl.c | 1 + src/qemu/qemu_block.c | 20 ++++++++++ src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 +++++++++++- src/qemu/qemu_command.h | 1 + src/qemu/qemu_domain.c | 37 +++++++++++++++++- src/qemu/qemu_interface.c | 23 ----------- src/qemu/qemu_interface.h | 2 - src/qemu/qemu_migration.c | 2 + src/qemu/qemu_snapshot.c | 4 ++ src/qemu/qemu_validate.c | 45 +++++++++++++++++++--- src/storage_file/storage_source.c | 1 + tests/qemuhotplugmock.c | 4 +- tests/qemuxml2argvdata/disk-vhostvdpa.args | 35 +++++++++++++++++ tests/qemuxml2argvdata/disk-vhostvdpa.xml | 21 ++++++++++ tests/qemuxml2argvmock.c | 2 +- tests/qemuxml2argvtest.c | 2 + 24 files changed, 235 insertions(+), 39 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-vhostvdpa.args create mode 100644 tests/qemuxml2argvdata/disk-vhostvdpa.xml -- 2.40.1

3 22

[PATCH] interface: fix udev_device_get_sysattr_value return value check
by Dmitry Frolov 08 Sep '23

08 Sep '23

Reviewing the code I found that return value of function udev_device_get_sysattr_value() is dereferenced without a check. udev_device_get_sysattr_value() may return NULL by number of reasons. Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru> --- src/interface/interface_backend_udev.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index a0485ddd21..c820b3ccdf 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -355,10 +355,11 @@ udevConnectListAllInterfaces(virConnectPtr conn, g_autoptr(virInterfaceDef) def = NULL; path = udev_list_entry_get_name(dev_entry); - dev = udev_device_new_from_syspath(udev, path); + if (!(dev = udev_device_new_from_syspath(udev, path))) + continue; name = udev_device_get_sysname(dev); macaddr = udev_device_get_sysattr_value(dev, "address"); - status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + status = STREQ(NULLSTR(udev_device_get_sysattr_value(dev, "operstate")), "up"); def = udevGetMinimalDefForDevice(dev); if (!virConnectListAllInterfacesCheckACL(conn, def)) { @@ -964,9 +965,9 @@ udevGetIfaceDef(struct udev *udev, const char *name) /* MTU */ mtu_str = udev_device_get_sysattr_value(dev, "mtu"); - if (virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { + if (!mtu_str || virStrToLong_ui(mtu_str, NULL, 10, &mtu) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse MTU value '%1$s'"), mtu_str); + _("Could not parse MTU value '%1$s'"), NULLSTR(mtu_str)); goto error; } ifacedef->mtu = mtu; @@ -1089,7 +1090,7 @@ udevInterfaceIsActive(virInterfacePtr ifinfo) goto cleanup; /* Check if it's active or not */ - status = STREQ(udev_device_get_sysattr_value(dev, "operstate"), "up"); + status = STREQ(NULLSTR(udev_device_get_sysattr_value(dev, "operstate")), "up"); udev_device_unref(dev); -- 2.34.1

2 1

[PATCH] virnetdevopenvswitch: Propagate OVS error messages
by Michal Privoznik 08 Sep '23

08 Sep '23

When configuring OVS interfaces/bridges we spawn 'ovs-vsctl' with appropriate arguments and if it exited with a non-zero status we report a generic error message, like "Unable to add port vnet0 to OVS bridge ovsbr0". This is all cool, but the real reason why operation failed is hidden in (debug) logs because that's where virCommandRun() reports it unless caller requested otherwise. This is a bit clumsy because then we have to ask users to turn on debug logs and reproduce the problem again, e.g. [1]. Therefore, in cases where an error is reported to the user - just read ovs-vsctl's stderr and include it in the error message. For other cases (like VIR_DEBUG/VIR_WARN) - well they are meant to end up in (debug) logs anyway. 1: https://mail.openvswitch.org/pipermail/ovs-discuss/2023-September/052640.ht… Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdevopenvswitch.c | 93 ++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 35 deletions(-) diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 8dad6ed2bd..d836d05845 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -54,10 +54,14 @@ virNetDevOpenvswitchSetTimeout(unsigned int timeout) } static virCommand * -virNetDevOpenvswitchCreateCmd(void) +virNetDevOpenvswitchCreateCmd(char **errbuf) { virCommand *cmd = virCommandNew(OVS_VSCTL); + virCommandAddArgFormat(cmd, "--timeout=%u", virNetDevOpenvswitchTimeout); + if (errbuf) + virCommandSetErrorBuffer(cmd, errbuf); + return cmd; } @@ -137,6 +141,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, char ifuuidstr[VIR_UUID_STRING_BUFLEN]; char vmuuidstr[VIR_UUID_STRING_BUFLEN]; g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; g_autofree char *attachedmac_ex_id = NULL; g_autofree char *ifaceid_ex_id = NULL; g_autofree char *profile_ex_id = NULL; @@ -157,7 +162,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, ovsport->profileID); } - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "--", "--may-exist", "add-port", brname, ifname, NULL); @@ -185,8 +190,8 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to add port %1$s to OVS bridge %2$s"), - ifname, brname); + _("Unable to add port %1$s to OVS bridge %2$s: %3$s"), + ifname, brname, NULLSTR(errbuf)); return -1; } @@ -203,13 +208,15 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, */ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char *ifname) { - g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "--", "--if-exists", "del-port", ifname, NULL); if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to delete port %1$s from OVS"), ifname); + _("Unable to delete port %1$s from OVS: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } @@ -228,7 +235,8 @@ int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const char int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) { size_t len; - g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "--if-exists", "get", "Interface", ifname, "external_ids:PortData", NULL); @@ -238,8 +246,8 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) /* Run the command */ if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS port data for interface %1$s"), - ifname); + _("Unable to run command to get OVS port data for interface %1$s: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } @@ -263,21 +271,22 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) { g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; if (!migrate) { VIR_DEBUG("No OVS port data for interface %s", ifname); return 0; } - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "external_ids:PortData=%s", migrate); /* Run the command */ if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to set OVS port data for interface %1$s"), - ifname); + _("Unable to run command to set OVS port data for interface %1$s: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } @@ -371,7 +380,8 @@ int virNetDevOpenvswitchInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) { - g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(&errbuf); g_autofree char *output = NULL; virCommandAddArgList(cmd, "--if-exists", "--format=list", "--data=json", @@ -390,8 +400,9 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, if (virCommandRun(cmd, NULL) < 0 || STREQ_NULLABLE(output, "")) { /* no ovs-vsctl or interface 'ifname' doesn't exists in ovs */ - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Interface not found")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Interface not found: %1$s"), + NULLSTR(errbuf)); return -1; } @@ -433,7 +444,8 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname, int virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) { - g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(&errbuf); int exitstatus; *master = NULL; @@ -443,8 +455,8 @@ virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **master) if (virCommandRun(cmd, &exitstatus) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to run command to get OVS master for interface %1$s"), - ifname); + _("Unable to run command to get OVS master for interface %1$s: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } @@ -546,7 +558,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, return 0; } - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(NULL); if (server) { virCommandAddArgList(cmd, "--no-headings", "--columns=name", "find", @@ -600,7 +612,8 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path, int virNetDevOpenvswitchUpdateVlan(const char *ifname, const virNetDevVlan *virtVlan) { - g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(); + g_autofree char *errbuf = NULL; + g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "--", "--if-exists", "clear", "Port", ifname, "tag", @@ -614,7 +627,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set vlan configuration on port %1$s"), ifname); + _("Unable to set vlan configuration on port %1$s: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } @@ -629,7 +643,7 @@ virNetDevOpenvswitchFindUUID(const char *table, g_autoptr(virCommand) cmd = NULL; char *uuid = NULL; - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(NULL); virCommandAddArgList(cmd, "--no-heading", "--columns=_uuid", "find", table, vmid_ex_id, ifname_ex_id, NULL); virCommandSetOutputBuffer(cmd, &uuid); @@ -673,7 +687,7 @@ virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname, if (!*line) { continue; } - listcmd = virNetDevOpenvswitchCreateCmd(); + listcmd = virNetDevOpenvswitchCreateCmd(NULL); virCommandAddArgList(listcmd, "--no-heading", "--columns=_uuid", "--if-exists", "list", "port", ifname, "qos", NULL); virCommandSetOutputBuffer(listcmd, &port_qos); @@ -681,13 +695,13 @@ virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname, VIR_WARN("Unable to remove port qos on port %s", ifname); } if (port_qos && *port_qos) { - g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(); + g_autoptr(virCommand) cmd = virNetDevOpenvswitchCreateCmd(NULL); virCommandAddArgList(cmd, "remove", "port", ifname, "qos", line, NULL); if (virCommandRun(cmd, NULL) < 0) { VIR_WARN("Unable to remove port qos on port %s", ifname); } } - destroycmd = virNetDevOpenvswitchCreateCmd(); + destroycmd = virNetDevOpenvswitchCreateCmd(NULL); virCommandAddArgList(destroycmd, "destroy", "qos", line, NULL); if (virCommandRun(destroycmd, NULL) < 0) { VIR_WARN("Unable to destroy qos on port %s", ifname); @@ -706,7 +720,7 @@ virNetDevOpenvswitchInterfaceClearTxQos(const char *ifname, continue; } - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(NULL); virCommandAddArgList(cmd, "destroy", "queue", line, NULL); if (virCommandRun(cmd, NULL) < 0) { VIR_WARN("Unable to destroy queue on port %s", ifname); @@ -722,15 +736,17 @@ static int virNetDevOpenvswitchInterfaceClearRxQos(const char *ifname) { g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "ingress_policing_rate=%llu", 0llu); virCommandAddArgFormat(cmd, "ingress_policing_burst=%llu", 0llu); if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to reset ingress on port %1$s"), ifname); + _("Unable to reset ingress on port %1$s: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } @@ -754,6 +770,7 @@ virNetDevOpenvswitchInterfaceSetTxQos(const char *ifname, { char vmuuidstr[VIR_UUID_STRING_BUFLEN]; g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; g_autofree char *vmid_ex_id = NULL; g_autofree char *ifname_ex_id = NULL; g_autofree char *average = NULL; @@ -777,7 +794,7 @@ virNetDevOpenvswitchInterfaceSetTxQos(const char *ifname, qos_uuid = virNetDevOpenvswitchFindUUID("qos", vmid_ex_id, ifname_ex_id); /* create qos and set */ - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(&errbuf); if (queue_uuid && *queue_uuid) { g_auto(GStrv) lines = g_strsplit(queue_uuid, "\n", 0); virCommandAddArgList(cmd, "set", "queue", lines[0], NULL); @@ -806,17 +823,20 @@ virNetDevOpenvswitchInterfaceSetTxQos(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { if (queue_uuid && *queue_uuid) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set queue configuration on port %1$s"), ifname); + _("Unable to set queue configuration on port %1$s: %2$s"), + ifname, NULLSTR(errbuf)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to create and set qos configuration on port %1$s"), ifname); + _("Unable to create and set qos configuration on port %1$s: %2$s"), + ifname, NULLSTR(errbuf)); } return -1; } if (qos_uuid && *qos_uuid) { g_auto(GStrv) lines = g_strsplit(qos_uuid, "\n", 0); - g_autoptr(virCommand) qoscmd = virNetDevOpenvswitchCreateCmd(); + g_autofree char *qoserrbuf = NULL; + g_autoptr(virCommand) qoscmd = virNetDevOpenvswitchCreateCmd(&qoserrbuf); virCommandAddArgList(qoscmd, "set", "qos", lines[0], NULL); virCommandAddArgFormat(qoscmd, "other_config:min-rate=%s", average); @@ -829,7 +849,8 @@ virNetDevOpenvswitchInterfaceSetTxQos(const char *ifname, virCommandAddArgList(qoscmd, vmid_ex_id, ifname_ex_id, NULL); if (virCommandRun(qoscmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set qos configuration on port %1$s"), ifname); + _("Unable to set qos configuration on port %1$s: %2$s"), + ifname, NULLSTR(qoserrbuf)); return -1; } } @@ -842,8 +863,9 @@ virNetDevOpenvswitchInterfaceSetRxQos(const char *ifname, const virNetDevBandwidthRate *rx) { g_autoptr(virCommand) cmd = NULL; + g_autofree char *errbuf = NULL; - cmd = virNetDevOpenvswitchCreateCmd(); + cmd = virNetDevOpenvswitchCreateCmd(&errbuf); virCommandAddArgList(cmd, "set", "Interface", ifname, NULL); virCommandAddArgFormat(cmd, "ingress_policing_rate=%llu", rx->average * VIR_NETDEV_RX_TO_OVS); @@ -853,7 +875,8 @@ virNetDevOpenvswitchInterfaceSetRxQos(const char *ifname, if (virCommandRun(cmd, NULL) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unable to set vlan configuration on port %1$s"), ifname); + _("Unable to set vlan configuration on port %1$s: %2$s"), + ifname, NULLSTR(errbuf)); return -1; } -- 2.41.0

2 1

Error : virHostCPUGetKVMMaxVCPUs:1228 : KVM is not supported on this platform: Function not implemented.
by Mario Marietto 07 Sep '23

07 Sep '23

Hello. I'm running Debian bookworm on my ARM Chromebook,model "xe303c12" and I've recompiled the kernel (5.4) to enable KVM,so now my system sounds like this : $ lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 12 (bookworm) Release: 12 Codename: bookworm $ uname -a Linux chromarietto 5.4.244-stb-cbe #8 SMP PREEMPT Sat Aug 19 22:19:32 UTC 2023 armv7l GNU/Linux $ uname -r 5.4.244-stb-cbe $ kvm-ok INFO: /dev/kvm exists KVM acceleration can be used $ qemu-system-arm --version QEMU emulator version 5.1.0 (v5.1.0-dirty) Copyright (c) 2003-2020 Fabrice Bellard and the QEMU Project developers $ python3 --version Python 3.11.2 I have installed libvirt 9.7.0,qemu 5.1 and virt-manager from source code with the final goal to be able to connect qemu,kvm and libvirt together to virtualize FreeBSD 13.2 for arm 32 bit. Some useful informations about my platform : root@chromarietto:/home/marietto/Desktop# virt-host-validate QEMU: Checking if device /dev/kvm exists : PASS QEMU: Checking if device /dev/kvm is accessible : PASS QEMU: Checking if device /dev/vhost-net exists : PASS QEMU: Checking if device /dev/net/tun exists : PASS QEMU: Checking for cgroup 'cpu' controller support : PASS QEMU: Checking for cgroup 'cpuacct' controller support : PASS QEMU: Checking for cgroup 'cpuset' controller support : PASS QEMU: Checking for cgroup 'memory' controller support : PASS QEMU: Checking for cgroup 'devices' controller support : PASS QEMU: Checking for cgroup 'blkio' controller support : PASS QEMU: Checking for device assignment IOMMU support : WARN (No ACPI IORT table found, IOMMU not supported by this hardware platform) QEMU: Checking for secure guest support : WARN (Unknown if this platform has Secure Guest support) LXC: Checking for Linux >= 2.6.26 : PASS LXC: Checking for namespace ipc : PASS LXC: Checking for namespace mnt : PASS LXC: Checking for namespace pid : PASS LXC: Checking for namespace uts : PASS LXC: Checking for namespace net : PASS LXC: Checking for namespace user : PASS LXC: Checking for cgroup 'cpu' controller support : PASS LXC: Checking for cgroup 'cpuacct' controller support : PASS LXC: Checking for cgroup 'cpuset' controller support : PASS LXC: Checking for cgroup 'memory' controller support : PASS LXC: Checking for cgroup 'devices' controller support : PASS LXC: Checking for cgroup 'freezer' controller support : FAIL (Enable 'freezer' in kernel Kconfig file or mount/enable cgroup controller in your system) LXC: Checking for cgroup 'blkio' controller support : PASS LXC: Checking if device /sys/fs/fuse/connections exists : PASS # lsmod | grep kvm no errors (I have embedded the options needed to enable KVM inside the kernel) # virsh --connect qemu:///system capabilities | grep baselabel <baselabel type='kvm'>+1002:+1002</baselabel> <baselabel type='qemu'>+1002:+1002</baselabel> The error that I'm not able to fix is the following one : root@chromarietto:~# virsh domcapabilities --machine virt --emulatorbin /usr/local/bin/qemu-system-arm 2023-08-29 10:17:59.110+0000: 1763: error : virHostCPUGetKVMMaxVCPUs:1228 : KVM is not supported on this platform: Function not implemented ; error: failed to get emulator capabilities error: KVM is not supported on this platform: Function not implemented and this is the log that I've got when I ran libvirtd with the debug option enabled root@chromarietto:~# libvirtd --debug [Tue, 29 Aug 2023 10:10:11 virt-manager 2141] DEBUG (createvm:494) UEFI found, setting it as default. [Tue, 29 Aug 2023 10:10:11 virt-manager 2141] DEBUG (createvm:728) Guest type set to os_type=hvm, arch=armv7l, dom_type=kvm [Tue, 29 Aug 2023 10:10:11 virt-manager 2141] DEBUG (guest:546) Prefer EFI => True 2023-08-29 10:10:12.972+0000: 1765: error : virHostCPUGetKVMMaxVCPUs:1228 : KVM is not supported on this platform: Function not implemented [Tue, 29 Aug 2023 10:10:12 virt-manager 2141] DEBUG (domcapabilities:250) Error fetching domcapabilities XML Traceback (most recent call last): File "/usr/local/share/virt-manager/virtinst/domcapabilities.py", line 245, in build_from_params xml = conn.getDomainCapabilities(emulator, arch, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/libvirt.py", line 4612, in getDomainCapabilities raise libvirtError('virConnectGetDomainCapabilities() failed') libvirt.libvirtError: KVM is not supported on this platform: Function not implemented *2023-08-29 10:10:14.157+0000: 1762: error : virHostCPUGetKVMMaxVCPUs:1228 : KVM is not supported on this platform: Function not implemented* [Tue, 29 Aug 2023 10:10:14 virt-manager 2141] DEBUG (domcapabilities:250) Error fetching domcapabilities XML Traceback (most recent call last): File "/usr/local/share/virt-manager/virtinst/domcapabilities.py", line 245, in build_from_params xml = conn.getDomainCapabilities(emulator, arch, ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/lib/python3/dist-packages/libvirt.py", line 4612, in getDomainCapabilities raise libvirtError('virConnectGetDomainCapabilities() failed') libvirt.libvirtError: KVM is not supported on this platform: Function not implemented [Tue, 29 Aug 2023 10:10:14 virt-manager 2141] DEBUG (createvm:497) Error checking for UEFI default Traceback (most recent call last): File "/usr/local/share/virt-manager/virtManager/createvm.py", line 491, in _set_caps_state guest.enable_uefi() File "/usr/local/share/virt-manager/virtinst/guest.py", line 589, in enable_uefi path = self._lookup_default_uefi_path() ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ File "/usr/local/share/virt-manager/virtinst/guest.py", line 848, in _lookup_default_uefi_path raise RuntimeError(_("Libvirt version does not support UEFI.")) RuntimeError: Libvirt version does not support UEFI Does anyone know how to fix that error ? -- Mario.

3 6

[libvirt PATCH v3] ch: Fix cloud-hypervisor version processing
by Praveen K Paladugu 07 Sep '23

07 Sep '23

Refactor the version processing logic in ch driver to support versions from non-release cloud-hypervisor binaries. This version also supports versions with branch prefixes in them. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/ch/ch_conf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index a8565d9537..5573119b23 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -172,6 +172,37 @@ virCHDriverConfigDispose(void *obj) #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) +/** + * chPreProcessVersionString: + * + * Returns: a pointer to numerical version without branch/commit info + */ +static char * +chPreProcessVersionString(char *version) +{ + char *tmp_version = version; + g_autofree char *ret_version = NULL; + char *sub_string; + + if ((sub_string = strrchr(version, '/')) != NULL) { + tmp_version = sub_string + 1; + } + + if (tmp_version[0] == 'v') { + tmp_version = tmp_version + 1; + } + + // Duplicate the string in both cases. This would allow the calling method + // free the returned string in a consistent manner. + if ((sub_string = strchr(tmp_version, '-')) != NULL) { + ret_version = g_strndup(tmp_version, sub_string - tmp_version); + } else{ + ret_version = g_strdup(tmp_version); + } + + return g_steal_pointer(&ret_version); + +} int chExtractVersion(virCHDriver *driver) { @@ -193,13 +224,20 @@ chExtractVersion(virCHDriver *driver) tmp = help; - /* expected format: cloud-hypervisor v<major>.<minor>.<micro> */ - if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL) { + /* Below are some example version formats and expected outputs: + * cloud-hypervisor v32.0.0 (expected: 32.0.0) + * cloud-hypervisor v33.0-104-ge0e3779e-dirty (expected: 33.0) + * cloud-hypervisor testing/v32.0.131-1-ga5d6db5c-dirty (expected: 32.0.131) + */ + if ((tmp = STRSKIP(tmp, "cloud-hypervisor ")) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected output of cloud-hypervisor binary")); return -1; } + tmp = chPreProcessVersionString(tmp); + VIR_DEBUG("Cloud-Hypervisor version detected: %s", tmp); + if (virStringParseVersion(&version, tmp, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse cloud-hypervisor version: %1$s"), tmp); -- 2.41.0

3 2

Re: [libvirt PATCH v3] ch: Fix cloud-hypervisor version processing
by Praveen Paladugu 07 Sep '23

07 Sep '23

On Thu, Sep 07, 2023 at 09:02:44AM +0200, Jiri Denemark wrote: > On Wed, Sep 06, 2023 at 10:50:30 -0500, Praveen K Paladugu wrote: > > Refactor the version processing logic in ch driver to support versions > > from non-release cloud-hypervisor binaries. This version also supports > > versions with branch prefixes in them. > > > > Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> > > --- > > src/ch/ch_conf.c | 42 ++++++++++++++++++++++++++++++++++++++++-- > > 1 file changed, 40 insertions(+), 2 deletions(-) > > > > diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c > > index a8565d9537..5573119b23 100644 > > --- a/src/ch/ch_conf.c > > +++ b/src/ch/ch_conf.c > > @@ -172,6 +172,37 @@ virCHDriverConfigDispose(void *obj) > > > > #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) > > > > +/** > > + * chPreProcessVersionString: > > + * > > + * Returns: a pointer to numerical version without branch/commit info > > + */ > > +static char * > > +chPreProcessVersionString(char *version) > > +{ > > + char *tmp_version = version; > > + g_autofree char *ret_version = NULL; > > As Daniel pointed out in previous version this g_autofree and > g_steal_pointer below are useless as there is no path that actually free > the string here. > Thanks Jirka, I expected "autofree" attribute to be carried to "tmp" in the calling method, which would be freed when tmp goes out of scope. So, I implemented it this way. With some experimentation, I confirmed the correct behavior. I will fix this in my next version. > > + char *sub_string; > > + > > + if ((sub_string = strrchr(version, '/')) != NULL) { > > + tmp_version = sub_string + 1; > > + } > > + > > + if (tmp_version[0] == 'v') { > > + tmp_version = tmp_version + 1; > > + } > > + > > + // Duplicate the string in both cases. This would allow the calling method > > + // free the returned string in a consistent manner. > > Our coding style document says we prefer /* ... */ comments. > > > + if ((sub_string = strchr(tmp_version, '-')) != NULL) { > > + ret_version = g_strndup(tmp_version, sub_string - tmp_version); > > + } else{ > > + ret_version = g_strdup(tmp_version); > > + } > > + > > + return g_steal_pointer(&ret_version); > > + > > +} > > int > > chExtractVersion(virCHDriver *driver) > > { > > @@ -193,13 +224,20 @@ chExtractVersion(virCHDriver *driver) > > > > tmp = help; > > > > - /* expected format: cloud-hypervisor v<major>.<minor>.<micro> */ > > - if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL) { > > + /* Below are some example version formats and expected outputs: > > + * cloud-hypervisor v32.0.0 (expected: 32.0.0) > > + * cloud-hypervisor v33.0-104-ge0e3779e-dirty (expected: 33.0) > > + * cloud-hypervisor testing/v32.0.131-1-ga5d6db5c-dirty (expected: 32.0.131) > > + */ > > + if ((tmp = STRSKIP(tmp, "cloud-hypervisor ")) == NULL) { > > virReportError(VIR_ERR_INTERNAL_ERROR, "%s", > > _("Unexpected output of cloud-hypervisor binary")); > > return -1; > > } > > > > + tmp = chPreProcessVersionString(tmp); > > So chPreProcessVersionString returns an allocated string that will never > be freed because you assign it to tmp that's only used to point inside > other buffers and thus is (correctly) not freed anywhere. You need to > make sure the pointer returned here is freed before chExtractVersion > exits. Understood. > > > + VIR_DEBUG("Cloud-Hypervisor version detected: %s", tmp); > > + > > if (virStringParseVersion(&version, tmp, true) < 0) { > > virReportError(VIR_ERR_INTERNAL_ERROR, > > _("Unable to parse cloud-hypervisor version: %1$s"), tmp); > > Jirka

1 0

[PATCH] manpage: virsh: Note that 'virsh undefine --remove-all-storage' doesn't remove backing images
by Peter Krempa 07 Sep '23

07 Sep '23

Removing a backing image could break other image chains as it's theoretically possible to share backing chains. As --storage/--remove-all-storage is fully implemented in virsh as a helper option, which enumerates and deletes VM's volumes. We do not plan to make it any more complicated. Document that backing chains are not removed. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/manpages/virsh.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst index 91e1d5de37..4ae3bb4d93 100644 --- a/docs/manpages/virsh.rst +++ b/docs/manpages/virsh.rst @@ -4614,12 +4614,13 @@ undefined; if not all of the requested volumes could be deleted, the error message indicates what still remains behind. If a volume path is not found in the domain definition, it's treated as if the volume was successfully deleted. Only volumes managed by libvirt in storage pools can be removed this -way. +way. Note that this also removes only the top level image of a backing chain, +any backing stores of the image are kept as they may be shared. (See ``domblklist`` for list of target names associated to a domain). Example: --storage vda,/path/to/storage.img The *--remove-all-storage* flag specifies that all of the domain's storage -volumes should be deleted. +volumes should be deleted as if they were specified via *--storage*. The *--delete-storage-volume-snapshots* (previously *--delete-snapshots*) flag specifies that any snapshots associated with -- 2.41.0

2 1

[PATCH] virsh-snapshot: Avoid passing NULL to qsort() in virshSnapshotListCollect()
by Michal Privoznik 07 Sep '23

07 Sep '23

If a domain has no snapshots and 'virsh snapshot-list' is called, this gets all the way down to virshSnapshotListCollect() which then collects all snapshots (none), and passes them to qsort() which doesn't like being called with NULL: extern void qsort (void *__base, size_t __nmemb, size_t __size, __compar_fn_t __compar) __nonnull ((1, 4)); Resolves: https://gitlab.com/libvirt/libvirt/-/issues/533 Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/virsh-snapshot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index d7889a38e4..ecb935b2b4 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1310,9 +1310,11 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, } } } - if (!(orig_flags & VIR_DOMAIN_SNAPSHOT_LIST_TOPOLOGICAL)) + if (!(orig_flags & VIR_DOMAIN_SNAPSHOT_LIST_TOPOLOGICAL) && + snaplist->snaps) { qsort(snaplist->snaps, snaplist->nsnaps, sizeof(*snaplist->snaps), virshSnapSorter); + } snaplist->nsnaps -= deleted; ret = g_steal_pointer(&snaplist); -- 2.41.0

2 1

[PATCH] lxc: fix lxcContainerMountAllFS() DEREF_BEFORE_CHECK
by Dmitry Frolov 07 Sep '23

07 Sep '23

Reviewing the sources, I found, that in function lxcContainerMountAllFS() pointers vmDef->fss[i]->src and vmDef->fss[i]->src->path are checked for NULL after dereferencing in VIR_DEBUG() macro. Fixes: 57487085dc ("lxc: don't try to reference NULL when mounting filesystems") --- src/lxc/lxc_container.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 21220661f7..58a6695458 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1467,13 +1467,15 @@ static int lxcContainerMountAllFS(virDomainDef *vmDef, if (STREQ(vmDef->fss[i]->dst, "/")) continue; + if (!(vmDef->fss[i]->src && vmDef->fss[i]->src->path)) + return -1; + VIR_DEBUG("Mounting '%s' -> '%s'", vmDef->fss[i]->src->path, vmDef->fss[i]->dst); if (lxcContainerResolveSymlinks(vmDef->fss[i], false) < 0) return -1; - if (!(vmDef->fss[i]->src && vmDef->fss[i]->src->path && - STRPREFIX(vmDef->fss[i]->src->path, vmDef->fss[i]->dst)) && + if (!STRPREFIX(vmDef->fss[i]->src->path, vmDef->fss[i]->dst) && lxcContainerUnmountSubtree(vmDef->fss[i]->dst, false) < 0) return -1; -- 2.34.1

4 4

[PATCH Libvirt v3 00/10] Support dirty page rate upper limit
by ~hyman 07 Sep '23

07 Sep '23

Hi, This is the latest version for the series, please review. Thanks, Yong v3: - rebase on master and fix conflicts - refactor the comments and update the version tag v2: The patch set introduce a new API virDomainSetVcpuDirtyLimit to allow upper Apps to set upper limits of dirty page rate for virtual CPUs, the corresponding virsh API as follows: limit-dirty-page-rate <domain> <rate> [--vcpu <number>] \ [--config] [--live] [--current] We put the dirty limit persistent info with the "vcpus" element in domain XML and extend dirtylimit statistics for domGetStats: <domain> ... <vcpu current='2'>3</vcpu> <vcpus> <vcpu id='0' hotpluggable='no' dirty_limit='10' order='1'.../> <vcpu id='1' hotpluggable='yes' dirty_limit='10' order='2'.../> </vcpus> ... </domain> If --vcpu option is not passed in the virsh command, set all virtual CPUs; if rate is set to zero, cancel the upper limit. Examples: To set the dirty page rate upper limit 10 MB/s for all virtual CPUs in c81_node1, use: # virsh limit-dirty-page-rate c81_node1 --rate 10 --live Set dirty page rate limit 10(MB/s) for all virtual CPUs successfully # virsh dumpxml c81_node1 | grep dirty_limit <vcpu id='0' enabled='yes' hotpluggable='no' order='1' dirty_limit='10'/> <vcpu id='1' enabled='yes' hotpluggable='no' order='2' dirty_limit='10'/> <vcpu id='2' enabled='yes' hotpluggable='no' order='3' dirty_limit='10'/> <vcpu id='3' enabled='no' hotpluggable='yes' dirty_limit='10'/> <vcpu id='4' enabled='no' hotpluggable='yes' dirty_limit='10'/> ...... Query the dirty limit info dynamically: # virsh domstats c81_node1 --dirtylimit Domain: 'c81_node1' dirtylimit.vcpu.0.limit=10 dirtylimit.vcpu.0.current=0 dirtylimit.vcpu.1.limit=10 dirtylimit.vcpu.1.current=0 dirtylimit.vcpu.2.limit=10 dirtylimit.vcpu.2.current=0 dirtylimit.vcpu.3.limit=10 dirtylimit.vcpu.3.current=0 dirtylimit.vcpu.4.limit=10 dirtylimit.vcpu.4.current=0 ...... To cancel the upper limit, use: # virsh limit-dirty-page-rate c81_node1 --rate 0 --live Cancel dirty page rate limit for all virtual CPUs successfully # virsh dumpxml c81_node1 | grep dirty_limit # virsh domstats c81_node1 --dirtylimit Domain: 'c81_node1' The dirty limit uses the QEMU dirty-limit feature introduced since 7.1.0, this feature allows CPU to be throttled as needed to keep their dirty page rate within the limit. It could, in some scenes, be used to provide quality-of-service in the aspect of the memory workload for virtual CPUs and QEMU itself use the feature to implement the dirty-limit throttle algorithm and apply it on the live migration, which improve responsiveness of large guests during live migration and can result in more stable read performance. The other application scenarios remain unexplored, before that, Libvirt could provide the basic API. Hyman Huang(黄勇) (10): qemu_capabilities: Introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability conf: Introduce XML for dirty limit configuration libvirt: Add virDomainSetVcpuDirtyLimit API qemu_driver: Implement qemuDomainSetVcpuDirtyLimit domain_validate: Export virDomainDefHasDirtyLimitStartupVcpus symbol qemu_process: Setup dirty limit after launching VM virsh: Introduce limit-dirty-page-rate api qemu_monitor: Implement qemuMonitorQueryVcpuDirtyLimit qemu_driver: Extend dirtlimit statistics for domGetStats virsh: Introduce command 'virsh domstats --dirtylimit' docs/formatdomain.rst | 7 +- docs/manpages/virsh.rst | 38 +++- include/libvirt/libvirt-domain.h | 5 + src/conf/domain_conf.c | 26 +++ src/conf/domain_conf.h | 8 + src/conf/domain_validate.c | 33 ++++ src/conf/domain_validate.h | 2 + src/conf/schemas/domaincommon.rng | 5 + src/driver-hypervisor.h | 7 + src/libvirt-domain.c | 68 +++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 181 ++++++++++++++++++ src/qemu/qemu_monitor.c | 25 +++ src/qemu/qemu_monitor.h | 22 +++ src/qemu/qemu_monitor_json.c | 107 +++++++++++ src/qemu/qemu_monitor_json.h | 9 + src/qemu/qemu_process.c | 44 +++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 18 +- src/remote_protocol-structs | 7 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_riscv64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 109 +++++++++++ 34 files changed, 739 insertions(+), 4 deletions(-) -- 2.38.5

4 17

[libvirt PATCH v2] ch: Fix cloud-hypervisor version processing
by Praveen K Paladugu 06 Sep '23

06 Sep '23

Refactor the version processing logic in ch driver to support versions from non-release cloud-hypervisor binaries. This version also supports versions with branch prefixes in them. Signed-off-by: Praveen K Paladugu <prapal(a)linux.microsoft.com> --- src/ch/ch_conf.c | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c index a8565d9537..a0849bfbd6 100644 --- a/src/ch/ch_conf.c +++ b/src/ch/ch_conf.c @@ -172,6 +172,33 @@ virCHDriverConfigDispose(void *obj) #define MIN_VERSION ((15 * 1000000) + (0 * 1000) + (0)) +/** + * chPreProcessVersionString - crop branch, commit info and return just the version + */ +static char * +chPreProcessVersionString(char *version) +{ + g_autofree char *new_version = version; + char *tmp_version; + + if ((tmp_version = strrchr(version, '/')) != NULL) { + new_version = tmp_version + 1; + } + + if (new_version[0] == 'v') { + new_version = new_version + 1; + } + // Duplicate the string in both cases. This would allow the calling method + // free the returned string in a consistent manner. + if ((tmp_version = strchr(new_version, '-')) != NULL) { + new_version = g_strndup(new_version, tmp_version - new_version); + } else{ + new_version = g_strdup(new_version); + } + + return g_steal_pointer(&new_version); + +} int chExtractVersion(virCHDriver *driver) { @@ -193,19 +220,25 @@ chExtractVersion(virCHDriver *driver) tmp = help; - /* expected format: cloud-hypervisor v<major>.<minor>.<micro> */ - if ((tmp = STRSKIP(tmp, "cloud-hypervisor v")) == NULL) { + /* Below are some example version formats and expected outputs: + * cloud-hypervisor v32.0.0 (expected: 32.0.0) + * cloud-hypervisor v33.0-104-ge0e3779e-dirty (expected: 33.0) + * cloud-hypervisor testing/v32.0.131-1-ga5d6db5c-dirty (expected: 32.0.131) + */ + if ((tmp = STRSKIP(tmp, "cloud-hypervisor ")) == NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unexpected output of cloud-hypervisor binary")); return -1; } + tmp = chPreProcessVersionString(tmp); + VIR_DEBUG("Cloud-Hypervisor version detected: %s", tmp); + if (virStringParseVersion(&version, tmp, true) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to parse cloud-hypervisor version: %1$s"), tmp); return -1; } - if (version < MIN_VERSION) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cloud-Hypervisor version is too old (v15.0 is the minimum supported version)")); -- 2.41.0

3 2

[libvirt PATCH 0/2] Add cpu model for EPYC Genoa
by Tim Wiederhake 06 Sep '23

06 Sep '23

Plus one drive-by improvement to sync_qemu_features_i386.py. Tim Wiederhake (2): cpu_map: Ignore all vmx-* features in sync_qemu_features_i386.py cpu_map: Add cpu model EPYC Genoa src/cpu_map/index.xml | 1 + src/cpu_map/meson.build | 1 + src/cpu_map/sync_qemu_features_i386.py | 90 +------------- src/cpu_map/x86_EPYC-Genoa.xml | 115 ++++++++++++++++++ .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_8.1.0.x86_64.xml | 1 + 7 files changed, 121 insertions(+), 89 deletions(-) create mode 100644 src/cpu_map/x86_EPYC-Genoa.xml -- 2.39.2

2 3

[libvirt PATCH] rpm: Drop obsolete Obsoletes
by Andrea Bolognani 06 Sep '23

06 Sep '23

All platforms we target come with at least libvirt 6.0.0, so none of the Obsoletes referring to earlier versions are useful at this point. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index b471afebb1..3e68961fb9 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -250,9 +250,6 @@ Requires: libvirt-daemon-driver-lxc = %{version}-%{release} %if %{with_qemu} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} %endif -# We had UML driver, but we've removed it. -Obsoletes: libvirt-daemon-driver-uml <= 5.0.0 -Obsoletes: libvirt-daemon-uml <= 5.0.0 %if %{with_vbox} Requires: libvirt-daemon-driver-vbox = %{version}-%{release} %endif @@ -608,9 +605,6 @@ Requires: util-linux # From QEMU RPMs Requires: /usr/bin/qemu-img %endif -%if !%{with_storage_rbd} -Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 -%endif Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 %description daemon-driver-storage-core @@ -812,7 +806,6 @@ VirtualBox Summary: Libxl driver plugin for the libvirtd daemon Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} -Obsoletes: libvirt-daemon-driver-xen < 4.3.0 %description daemon-driver-libxl The Libxl driver plugin for the libvirtd daemon, providing -- 2.41.0

2 6

virDomainGetJobStats not populating VIR_DOMAIN_JOB_DISK_BPS
by João Vilaça 06 Sep '23

06 Sep '23

Hello, I'm using https://gitlab.com/libvirt/libvirt-go-module and executing 'GetJobStats' to get information about the progress of a VM with a disk migration in KubeVirt. Everything works correctly and the migration is successful, with the disk correctly copied. Across multiple executions of 'GetJobStats' while copying the disk, I get the information about data: *DataTotal:151592960 DataProcessedSet:true DataProcessed:163080901 DataRemainingSet:true DataRemaining:266240* about disk total values: *DiskTotal:21037056 DiskProcessedSet:true DiskProcessed:13631488 DiskRemainingSet:true DiskRemaining:7405568* but '*DiskBpsSet:false *' and '*DiskBps:0 *' are always false and 0. Even when I run 'virsh domjobinfo', I get Data and File absolute values, but not the throughput. Is QEMU not reporting this data? Can this be a bug? -- kind regards, João Vilaça

2 1

[PATCH 00/51] Finish conversion of all test cases in qemuxml2argvtest to real capabilities
by Peter Krempa 06 Sep '23

06 Sep '23

This series converts all outstanding test cases to use real capabilities. In the process few cases of pointless tests or features which are supported by every version of qemu were identified and addressed. To simplify the bulk of the conversion I've opted to simply set the most common capabilities in DO_TEST and DO_TEST_NOCAPS in addition to what the test asked for. This is done in a handful of patches and allows then a bulk conversion of many tests with no changes in the output files. I've payed special attention to CPU tests were I've ensured that they are semantically testing what they were before. Peter Krempa (51): qemu: Always assume support for QEMU_CAPS_PIIX_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities qemu: capabilities: Preserve location of the default machine type when stripping aliases for tests qemuxml2argvtest: Clean up host CPU if overriden qemuxml2argvtest: testAddCPUModels: Remove non-x86_64 fake cpu models qemuxml2argvtest: Drop 'monitor-json' case qemu: Always assume support for QEMU_CAPS_CPU_CACHE qemu: capabilities: Retire QEMU_CAPS_CPU_CACHE qemu: Always assume support for QEMU_CAPS_DEVICE_VFIO_PCI qemu_capabilities: Retire QEMU_CAPS_DEVICE_VFIO_PCI qemuxml2argvtest: Add missing versioned test cases for 'cpu-host-model' qemuxml2argvtest: Remove old chardev tests qemuxml2argvtest: Simplify invocation of GIC tests qemuxml2argvtest: Remove duplicated test invocations qemuxml2argvtest: Remove fake-caps invocations of tests which also real caps version qemuxml2argvtest: Use proper version in negative 'virtio-options-memballoon-freepage-reporting' case qemuxml2argvtest: Use real caps for 'cpu-host-model-fallback' test case qemuxml2argvtest: Use real caps for 'cpu-host-model-nofallback' test case qemuxml2argvtest: Remove FLAG_SKIP_LEGACY_CPUS qemuxml2argvtest: Enable JSON syntax for -device, -object, and -netdev for all fake-caps tests virQEMUCapsAddCPUDefinitions: Fill in cpu type in data and node it's used only in tests qemuxml2argvtest: Modernize negative testing for hugepages qemuxml2argvtest: Modernize 'numatune' tests testutilsqemu: Always populate default ram id, default cpu, ACPI support for fake machines qemuxml2argvtest: Enable 'seccomp' sandbox in all fake caps tests qemuxml2argvtest: Consolidate tests for usb controllers qemuxml2argvtest: Add tests for auto-added USB controllers qemuxml2argvtest: Improve default usb controller testing qemuxml2argvtest: Consolidate testing of 'xhci' controllers qemuxml2argvtest: Assume QEMU_CAPS_PIIX3_USB_UHCI for all fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_DEVICE_PCIE_ROOT_PORT for fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_CPU_MIGRATABLE and QEMU_CAPS_SMP_DIES for fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_USB_HOST_HOSTDEVICE and QEMU_CAPS_DEVICE_QEMU_XHCI for fake-caps tests qemuxml2argvtest: Assume QEMU_CAPS_QXL_VRAM64, QEMU_CAPS_(QXL|VGA)_VGAMEM for fake-caps tests qemuxml2argvtest: Properly modernize 'clock-hpet-off' test case qemuxml2argvtest: Modernize migration/restore tests qemuxml2argvtest: Consolidate and modernize CPU topology testing qemuxml2argvtest: Modernize test cases using 'host-model' CPU qemuxml2argvtest: Modernize 'cpu-Haswell' test cases qemuxml2argvtest: Modernize 'cpu-minimum' cases qemuxml2argvtest: Modernize 'cpu-strict' case qemuxml2argvtest: Modernize 'cpu-(no)fallback' test qemuxml2argvtest: Modernize 'cpu-exact' cases qemuxml2argvtest: Modernize rest of the test cases testutilsqemu: Drop fake machine capability data for 'x86_64' qemustatusxml2xmltest: Remove capabilities infrastructure testutilsqemu: Drop infrastructure for fake-caps testing testutilsqemu: Unexport 'testQemuCapsInit' qemu: capabilities: Unexport 'virQEMUCapsAddMachine' qemuxml2argvtest: Remove cpu model faking for fake-caps tests qemu: capabilities: Remove 'virQEMUCapsAddCPUDefinitions' src/qemu/qemu_capabilities.c | 81 +- src/qemu/qemu_capabilities.h | 17 +- src/qemu/qemu_capspriv.h | 14 - src/qemu/qemu_command.c | 46 +- src/qemu/qemu_domain.c | 11 +- src/qemu/qemu_validate.c | 43 +- .../caps_4.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../caps_4.2.0_x86_64.xml | 6 - .../caps_5.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 - .../caps_5.0.0_riscv64.xml | 1 - .../caps_5.0.0_x86_64.xml | 6 - .../caps_5.1.0_x86_64.xml | 6 - .../caps_5.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 - .../caps_5.2.0_riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../caps_5.2.0_x86_64.xml | 6 - .../caps_6.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 6 - .../caps_6.1.0_x86_64.xml | 6 - .../caps_6.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 3 - .../caps_6.2.0_x86_64.xml | 6 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 3 - .../caps_7.0.0_x86_64.xml | 6 - .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 3 - .../caps_7.1.0_x86_64.xml | 6 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 3 - .../caps_7.2.0_x86_64+hvf.xml | 6 - .../caps_7.2.0_x86_64.xml | 6 - .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.xml | 6 - .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - .../caps_8.1.0_x86_64.xml | 6 - tests/qemustatusxml2xmltest.c | 17 +- ...fx-ide-address-conflict.x86_64-latest.err} | 0 ...err => 440fx-wrong-root.x86_64-latest.err} | 0 ...ch64-gic-default-both.aarch64-latest.args} | 0 ...arch64-gic-default-v2.aarch64-latest.args} | 0 ...arch64-gic-default-v3.aarch64-latest.args} | 0 ...s => aarch64-gic-host.aarch64-latest.args} | 0 ...aarch64-gic-none-both.aarch64-latest.args} | 0 ... aarch64-gic-none-tcg.aarch64-latest.args} | 0 ...> aarch64-gic-none-v2.aarch64-latest.args} | 0 ...> aarch64-gic-none-v3.aarch64-latest.args} | 0 ...rgs => aarch64-gic-v2.aarch64-latest.args} | 0 ...rgs => aarch64-gic-v3.aarch64-latest.args} | 0 ...off.args => acpi-table.x86_64-latest.args} | 14 +- tests/qemuxml2argvdata/autoindex.args | 63 - .../autoindex.x86_64-latest.args | 65 + .../balloon-device-auto.x86_64-latest.args | 36 + ...loon-device-deflate-off.x86_64-latest.args | 36 + .../balloon-device-deflate.x86_64-latest.args | 36 + .../balloon-device-period.x86_64-latest.args | 36 + .../balloon-device.x86_64-latest.args | 36 + tests/qemuxml2argvdata/blkiotune-device.args | 34 - .../blkiotune-device.x86_64-latest.args | 36 + tests/qemuxml2argvdata/blkiotune.args | 34 - .../blkiotune.x86_64-latest.args | 36 + ...gs => channel-guestfwd.x86_64-latest.args} | 16 +- ...gs => channel-spicevmc.x86_64-latest.args} | 20 +- .../qemuxml2argvdata/channel-virtio-auto.args | 49 - .../channel-virtio-auto.x86_64-latest.args | 51 + .../channel-virtio-autoadd.args | 48 - .../channel-virtio-autoadd.x86_64-latest.args | 50 + .../channel-virtio-autoassign.args | 48 - ...annel-virtio-autoassign.x86_64-latest.args | 50 + .../channel-virtio-default.args | 41 - .../channel-virtio-default.x86_64-latest.args | 43 + .../channel-virtio-state.x86_64-latest.args | 43 + ...=> channel-virtio-unix.x86_64-latest.args} | 24 +- tests/qemuxml2argvdata/channel-virtio.args | 37 - ...args => channel-virtio.x86_64-latest.args} | 22 +- ...econnect-generated-path.x86_64-latest.err} | 0 ...connect-invalid-timeout.x86_64-latest.err} | 0 tests/qemuxml2argvdata/chardev-reconnect.args | 44 - .../chardev-reconnect.x86_64-latest.args | 46 + ....args => clock-catchup.x86_64-latest.args} | 14 +- ...e.args => clock-france.x86_64-latest.args} | 14 +- ....args => clock-hpet-off.x86_64-7.2.0.args} | 14 +- .../clock-hpet-off.x86_64-latest.args | 37 + ...altime-basis-localtime.x86_64-latest.args} | 14 +- ...rgs => clock-localtime.x86_64-latest.args} | 14 +- ...clock-timer-hyperv-rtc.x86_64-latest.args} | 11 +- ...-off.args => clock-utc.x86_64-latest.args} | 13 +- ...args => clock-variable.x86_64-latest.args} | 14 +- .../qemuxml2argvdata/console-compat-auto.args | 36 - .../console-compat-chardev.args | 36 - tests/qemuxml2argvdata/console-compat.args | 35 - ...=> console-virtio-many.x86_64-latest.args} | 24 +- ...args => console-virtio.x86_64-latest.args} | 18 +- tests/qemuxml2argvdata/controller-order.args | 52 - .../controller-order.x86_64-latest.args | 55 + ...s => cpu-Haswell-noTSX.x86_64-latest.args} | 11 +- ...ll.args => cpu-Haswell.x86_64-latest.args} | 11 +- ...2.args => cpu-Haswell2.x86_64-latest.args} | 11 +- ...3.args => cpu-Haswell3.x86_64-latest.args} | 11 +- .../cpu-cache-disable.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-cache-disable2.xml | 20 - .../cpu-cache-disable3.x86_64-latest.args | 33 + ...=> cpu-cache-emulate-l2.x86_64-latest.err} | 0 ...> cpu-cache-emulate-l3.x86_64-latest.args} | 13 +- ...pu-cache-passthrough-l3.x86_64-latest.err} | 0 .../cpu-cache-passthrough.args | 32 - ... cpu-cache-passthrough.x86_64-latest.args} | 13 +- .../cpu-cache-passthrough2.args | 32 - .../cpu-cache-passthrough2.xml | 20 - ... cpu-cache-passthrough3.x86_64-latest.err} | 0 .../cpu-check-default-none.args | 32 - .../cpu-check-default-none.x86_64-latest.args | 33 + ...pu-check-default-none2.x86_64-latest.args} | 11 +- .../cpu-check-default-partial.args | 32 - ...u-check-default-partial.x86_64-latest.args | 33 + ...check-default-partial2.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-check-full.args | 1 - .../cpu-check-full.x86_64-latest.args | 1 + ...args => cpu-check-none.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-check-partial.args | 1 - .../cpu-check-partial.x86_64-latest.args | 1 + ...ct1.args => cpu-exact1.x86_64-latest.args} | 11 +- ... cpu-exact2-nofallback.x86_64-latest.args} | 11 +- ...ct2.args => cpu-exact2.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-fallback.args | 32 - ...er.args => cpu-fallback.x86_64-5.2.0.args} | 9 +- .../cpu-fallback.x86_64-8.0.0.args | 33 + tests/qemuxml2argvdata/cpu-fallback.xml | 15 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 32 - .../cpu-host-kvmclock.x86_64-latest.args | 33 + ... => cpu-host-model-cmt.x86_64-latest.args} | 11 +- ...cpu-host-model-fallback.x86_64-4.2.0.args} | 7 +- ...cpu-host-model-fallback.x86_64-5.0.0.args} | 7 +- .../cpu-host-model-fallback.x86_64-5.1.0.args | 33 + .../cpu-host-model-fallback.x86_64-5.2.0.args | 34 + .../cpu-host-model-fallback.x86_64-6.0.0.args | 34 + .../cpu-host-model-fallback.x86_64-6.1.0.args | 34 + .../cpu-host-model-fallback.x86_64-6.2.0.args | 34 + .../cpu-host-model-fallback.x86_64-7.0.0.args | 34 + .../cpu-host-model-fallback.x86_64-7.1.0.args | 34 + .../cpu-host-model-fallback.x86_64-7.2.0.args | 34 + .../cpu-host-model-fallback.x86_64-8.0.0.args | 33 + ...cpu-host-model-fallback.x86_64-latest.args | 33 + .../cpu-host-model-nofallback.err | 1 - ...pu-host-model-nofallback.x86_64-4.2.0.args | 33 + ...pu-host-model-nofallback.x86_64-5.0.0.args | 33 + ...pu-host-model-nofallback.x86_64-5.1.0.args | 33 + ...pu-host-model-nofallback.x86_64-5.2.0.args | 34 + ...pu-host-model-nofallback.x86_64-6.0.0.args | 34 + ...pu-host-model-nofallback.x86_64-6.1.0.args | 34 + ...pu-host-model-nofallback.x86_64-6.2.0.args | 34 + ...pu-host-model-nofallback.x86_64-7.0.0.args | 34 + ...pu-host-model-nofallback.x86_64-7.1.0.args | 34 + ...pu-host-model-nofallback.x86_64-7.2.0.args | 34 + ...pu-host-model-nofallback.x86_64-8.0.0.args | 33 + ...u-host-model-nofallback.x86_64-latest.args | 33 + .../cpu-host-model-vendor.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-host-model.args | 40 - .../cpu-host-model.x86_64-6.2.0.args | 39 + .../cpu-host-model.x86_64-7.0.0.args | 39 + .../cpu-host-model.x86_64-7.1.0.args | 39 + .../cpu-host-model.x86_64-7.2.0.args | 39 + .../cpu-host-model.x86_64-8.0.0.args | 38 + ...t-passthrough-features.x86_64-latest.args} | 14 +- .../cpu-host-passthrough.args | 32 - .../cpu-host-passthrough.x86_64-latest.args | 33 + ...k.args => cpu-kvmclock.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-minimum1.args | 32 - .../cpu-minimum1.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-minimum2.args | 32 - .../cpu-minimum2.x86_64-latest.args | 33 + ...pu-no-removed-features.x86_64-latest.args} | 11 +- tests/qemuxml2argvdata/cpu-nofallback.err | 1 - .../cpu-nofallback.x86_64-5.2.0.err | 1 + .../cpu-nofallback.x86_64-8.0.0.args | 33 + tests/qemuxml2argvdata/cpu-nofallback.xml | 15 +- tests/qemuxml2argvdata/cpu-numa-disjoint.args | 33 - .../cpu-numa-disjoint.x86_64-latest.args | 36 + .../cpu-numa-memshared.x86_64-latest.args | 36 + .../cpu-numa-no-memory-element.args | 33 - ...numa-no-memory-element.x86_64-latest.args} | 17 +- tests/qemuxml2argvdata/cpu-numa1.args | 33 - .../cpu-numa1.x86_64-latest.args | 36 + tests/qemuxml2argvdata/cpu-numa2.args | 33 - .../cpu-numa2.x86_64-latest.args | 36 + ...-numa3.err => cpu-numa3.x86_64-latest.err} | 0 .../cpu-phys-bits-emulate.args | 32 - ... cpu-phys-bits-emulate.x86_64-latest.args} | 13 +- .../cpu-phys-bits-emulate2.args | 32 - .../cpu-phys-bits-emulate2.x86_64-latest.args | 33 + .../cpu-phys-bits-passthrough.args | 32 - ...-phys-bits-passthrough.x86_64-latest.args} | 13 +- ...-phys-bits-passthrough2.x86_64-latest.err} | 0 ...u-qemu-host-passthrough.x86_64-latest.err} | 0 tests/qemuxml2argvdata/cpu-strict1.args | 32 - .../cpu-strict1.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-strict1.xml | 12 +- tests/qemuxml2argvdata/cpu-topology1.args | 31 - ....args => cpu-topology1.x86_64-latest.args} | 17 +- tests/qemuxml2argvdata/cpu-topology1.xml | 4 +- tests/qemuxml2argvdata/cpu-topology2.args | 32 - .../cpu-topology2.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-topology2.xml | 5 +- tests/qemuxml2argvdata/cpu-topology3.args | 31 - .../cpu-topology3.x86_64-latest.args | 33 + tests/qemuxml2argvdata/cpu-topology3.xml | 2 +- .../cpu-topology4.x86_64-latest.args | 33 + .../{monitor-json.xml => cpu-topology4.xml} | 18 +- ...s => cpu-tsc-frequency.x86_64-latest.args} | 11 +- ... default-kvm-host-arch.x86_64-latest.args} | 12 +- ...default-qemu-host-arch.x86_64-latest.args} | 12 +- .../graphics-egl-headless.args | 33 - ...raphics-sdl-fullscreen.x86_64-latest.args} | 14 +- ...l.args => graphics-sdl.x86_64-latest.args} | 14 +- ...isplay-missing-graphics.x86_64-latest.err} | 0 ... hostdev-mdev-duplicate.x86_64-latest.err} | 0 ...-invalid-target-address.x86_64-latest.err} | 0 ...ostdev-mdev-precreated.x86_64-latest.args} | 12 +- ...dev-src-address-invalid.x86_64-latest.err} | 0 .../hostdev-pci-address-unassigned.args | 34 - ...-pci-address-unassigned.x86_64-latest.args | 36 + ...> hostdev-pci-duplicate.x86_64-latest.err} | 0 .../hostdev-pci-multifunction.args | 38 - ...stdev-pci-multifunction.x86_64-latest.args | 40 + ... hostdev-scsi-duplicate.x86_64-latest.err} | 0 ...ev-scsi-vhost-scsi-pci.x86_64-latest.args} | 22 +- ...> hostdev-usb-duplicate.x86_64-latest.err} | 0 ...stdev-vfio-multidomain.x86_64-latest.args} | 17 +- ...ev-vfio-zpci-wrong-arch.x86_64-latest.err} | 0 tests/qemuxml2argvdata/hostdev-vfio.args | 35 - ...n.args => hostdev-vfio.x86_64-latest.args} | 16 +- ...e.args => hotplug-base.x86_64-latest.args} | 13 +- ...s-default-1G-nodeset-2M.x86_64-latest.err} | 0 ...pages-memaccess-invalid.x86_64-latest.err} | 0 ... => hugepages-memaccess3.x86_64-5.1.0.err} | 0 .../qemuxml2argvdata/input-usbmouse-addr.args | 35 - .../input-usbmouse-addr.x86_64-latest.args | 37 + .../input-usbmouse.x86_64-latest.args | 36 + tests/qemuxml2argvdata/input-usbtablet.args | 34 - .../input-usbtablet.x86_64-latest.args | 36 + ....args => kvm-pit-delay.x86_64-latest.args} | 14 +- ...rgs => kvm-pit-discard.x86_64-latest.args} | 14 +- ...clock.args => kvmclock.x86_64-latest.args} | 9 +- tests/qemuxml2argvdata/machine-aliases1.args | 34 - .../machine-aliases1.x86_64-latest.args | 36 + ...gs => machine-aliases2.x86_64-latest.args} | 15 +- .../machine-core-off.x86_64-latest.args | 35 + tests/qemuxml2argvdata/machine-core-on.args | 33 - ...rgs => machine-core-on.x86_64-latest.args} | 13 +- ...dparm-s390-char-invalid.x86_64-latest.err} | 0 ...adparm-s390-len-invalid.x86_64-latest.err} | 0 .../qemuxml2argvdata/machine-vmport-opt.args | 34 - .../machine-vmport-opt.x86_64-latest.args | 36 + ...rr => memory-align-fail.x86_64-latest.err} | 0 .../memory-hotplug-dimm.x86_64-latest.args | 41 + ...plug-invalid-targetnode.x86_64-latest.err} | 0 ...> memory-hotplug-nonuma.x86_64-latest.err} | 0 tests/qemuxml2argvdata/memory-hotplug.args | 35 - ...args => memory-hotplug.x86_64-latest.args} | 22 +- tests/qemuxml2argvdata/memtune-unlimited.args | 34 - .../memtune-unlimited.x86_64-latest.args | 36 + tests/qemuxml2argvdata/memtune.args | 34 - .../memtune.x86_64-latest.args | 36 + ...migrate-numa-unaligned.x86_64-latest.args} | 17 +- ...igrate.args => migrate.x86_64-latest.args} | 12 +- ...rr => minimal-no-memory.x86_64-latest.err} | 0 tests/qemuxml2argvdata/minimal.args | 34 - .../minimal.x86_64-latest.args | 36 + tests/qemuxml2argvdata/misc-acpi.args | 32 - ...late.args => misc-acpi.x86_64-latest.args} | 13 +- ...rgs => misc-disable-s3.x86_64-latest.args} | 12 +- ... misc-disable-suspends.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/misc-enable-s4.err | 1 - ...args => misc-enable-s4.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/misc-uuid.args | 32 - ...auto.args => misc-uuid.x86_64-latest.args} | 13 +- tests/qemuxml2argvdata/monitor-json.args | 34 - .../multifunction-pci-device.args | 43 - ...ultifunction-pci-device.x86_64-latest.args | 45 + ...s.args => nosharepages.x86_64-latest.args} | 12 +- .../numad-auto-memory-vcpu-cpuset.args | 34 - ...auto-memory-vcpu-cpuset.x86_64-latest.args | 36 + ...o-memory-vcpu-no-cpuset-and-placement.args | 34 - ...no-cpuset-and-placement.x86_64-latest.args | 36 + ...tic-numatune-no-nodeset.x86_64-latest.err} | 0 .../numad-auto-vcpu-static-numatune.args | 34 - ...to-vcpu-static-numatune.x86_64-latest.args | 36 + .../numad-static-memory-auto-vcpu.args | 34 - ...static-memory-auto-vcpu.x86_64-latest.args | 36 + tests/qemuxml2argvdata/numad.args | 34 - .../qemuxml2argvdata/numad.x86_64-latest.args | 36 + .../numatune-auto-nodeset-invalid.args | 34 - ...ne-auto-nodeset-invalid.x86_64-latest.args | 36 + ...> numatune-auto-prefer.x86_64-latest.args} | 14 +- ... => numatune-distances.x86_64-latest.args} | 28 +- ...ne-memnode-invalid-mode.x86_64-latest.err} | 0 ...tune-memnode-no-memory.x86_64-latest.args} | 15 +- ... numatune-memnode-nocpu.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memnode.args | 37 - ...ne-memnodes-problematic.x86_64-latest.err} | 0 ...-memory-invalid-nodeset.x86_64-latest.err} | 0 tests/qemuxml2argvdata/numatune-memory.args | 34 - tests/qemuxml2argvdata/numatune-memory.xml | 31 - ...nodeset-exceed-hostnode.x86_64-latest.err} | 0 .../parallel-parport-chardev.args | 36 - .../parallel-tcp-chardev.args | 36 - tests/qemuxml2argvdata/pci-autoadd-addr.args | 41 - .../pci-autoadd-addr.x86_64-latest.args | 44 + tests/qemuxml2argvdata/pci-autoadd-idx.args | 42 - .../pci-autoadd-idx.x86_64-latest.args | 45 + ...s => pci-autofill-addr.x86_64-latest.args} | 16 +- ...-bridge-duplicate-index.x86_64-latest.err} | 0 ... pci-bridge-many-disks.x86_64-latest.args} | 224 ++-- ...-negative-index-invalid.x86_64-latest.err} | 0 tests/qemuxml2argvdata/pci-bridge.args | 101 -- .../pci-bridge.x86_64-latest.args | 104 ++ ....err => pci-bus-invalid.x86_64-latest.err} | 0 ...r => pci-domain-invalid.x86_64-latest.err} | 0 ...ci-expander-bus-bad-bus.x86_64-latest.err} | 0 ...xpander-bus-bad-machine.x86_64-latest.err} | 0 ...i-expander-bus-bad-node.x86_64-latest.err} | 0 tests/qemuxml2argvdata/pci-expander-bus.args | 98 -- .../pci-expander-bus.x86_64-latest.args | 101 ++ ...=> pci-function-invalid.x86_64-latest.err} | 0 ...-many.args => pci-many.x86_64-latest.args} | 71 +- .../pci-rom-disabled-invalid.args | 1 - ...ci-rom-disabled-invalid.x86_64-latest.args | 1 + ...gs => pci-rom-disabled.x86_64-latest.args} | 12 +- .../pci-rom.x86_64-latest.args | 42 + ...err => pci-root-address.x86_64-latest.err} | 0 ... pci-root-nonzero-index.x86_64-latest.err} | 0 .../pci-serial-dev-chardev.args | 36 - ...err => pci-slot-invalid.x86_64-latest.err} | 0 ...ie-expander-bus-bad-bus.x86_64-latest.err} | 0 ...xpander-bus-bad-machine.x86_64-latest.err} | 0 tests/qemuxml2argvdata/pcie-expander-bus.args | 135 -- .../pcie-expander-bus.x86_64-latest.args | 140 ++ ...oot-port-model-generic.x86_64-latest.args} | 14 +- ...oot-port-model-ioh3420.x86_64-latest.args} | 14 +- ...pcie-root-port-too-many.x86_64-latest.err} | 0 ...args => pcie-root-port.x86_64-latest.args} | 17 +- ...root.args => pcie-root.x86_64-latest.args} | 11 +- .../pcie-switch-downstream-port.args | 45 - ...-switch-downstream-port.x86_64-latest.args | 48 + .../pcie-switch-upstream-port.args | 39 - ...ie-switch-upstream-port.x86_64-latest.args | 43 + ....args => pcihole64-q35.x86_64-latest.args} | 15 +- ...le64.args => pcihole64.x86_64-latest.args} | 12 +- ...rgs => pmu-feature-off.x86_64-latest.args} | 8 +- ...re.args => pmu-feature.x86_64-latest.args} | 8 +- ...eatures-invalid-machine.x86_64-latest.err} | 0 ...-serial-invalid-machine.x86_64-latest.err} | 0 ...=> q35-dmi-bad-address1.x86_64-latest.err} | 0 ...=> q35-dmi-bad-address2.x86_64-latest.err} | 0 .../q35-pci-force-address.args | 38 - .../q35-pci-force-address.x86_64-latest.args | 40 + .../q35-pm-disable-fallback.args | 37 - .../q35-pm-disable-fallback.xml | 18 - tests/qemuxml2argvdata/q35-pm-disable.args | 37 - tests/qemuxml2argvdata/q35-pm-disable.xml | 18 - tests/qemuxml2argvdata/q35-usb2-multi.args | 49 - .../q35-usb2-multi.x86_64-latest.args | 51 + tests/qemuxml2argvdata/q35-usb2-reorder.args | 49 - .../q35-usb2-reorder.x86_64-latest.args | 51 + .../q35-usb2.x86_64-latest.args | 43 + ...t.err => q35-wrong-root.x86_64-latest.err} | 0 tests/qemuxml2argvdata/q35.args | 39 - .../{q35-usb2.args => q35.x86_64-latest.args} | 23 +- tests/qemuxml2argvdata/q35.xml | 4 + ...nv.args => qemu-ns-alt.x86_64-latest.args} | 15 +- .../qemu-ns-commandline-ns0.args | 34 - ...qemu-ns-commandline-ns0.x86_64-latest.args | 36 + .../qemu-ns-commandline-ns1.args | 34 - ...qemu-ns-commandline-ns1.x86_64-latest.args | 36 + .../qemuxml2argvdata/qemu-ns-commandline.args | 34 - .../qemu-ns-commandline.x86_64-latest.args | 36 + .../qemu-ns-domain-commandline-ns0.args | 34 - ...-domain-commandline-ns0.x86_64-latest.args | 36 + .../qemu-ns-domain-commandline.args | 34 - ...u-ns-domain-commandline.x86_64-latest.args | 36 + .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 34 - .../qemu-ns-domain-ns0.x86_64-latest.args | 36 + ...args => qemu-ns-no-env.x86_64-latest.args} | 15 +- ...eboot-timeout-disabled.x86_64-latest.args} | 10 +- ...reboot-timeout-enabled.x86_64-latest.args} | 10 +- ....args => restore-v2-fd.x86_64-latest.args} | 14 +- ...-v2.args => restore-v2.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 34 - .../seclabel-dac-none.x86_64-latest.args | 36 + ...label-device-duplicates.x86_64-latest.err} | 0 ...-device-relabel-invalid.x86_64-latest.err} | 0 .../seclabel-dynamic-baselabel.args | 34 - ...label-dynamic-baselabel.x86_64-latest.args | 36 + .../seclabel-dynamic-labelskip.args | 34 - ...label-dynamic-labelskip.x86_64-latest.args | 36 + ...label-dynamic-override.x86_64-latest.args} | 16 +- .../seclabel-dynamic-relabel.args | 34 - ...eclabel-dynamic-relabel.x86_64-latest.args | 36 + tests/qemuxml2argvdata/seclabel-dynamic.args | 34 - .../seclabel-dynamic.x86_64-latest.args | 36 + ...rr => seclabel-multiple.x86_64-latest.err} | 0 tests/qemuxml2argvdata/seclabel-none.args | 34 - .../seclabel-none.x86_64-latest.args | 36 + .../seclabel-static-labelskip.args | 34 - ...clabel-static-labelskip.x86_64-latest.args | 36 + .../seclabel-static-relabel.args | 34 - ...seclabel-static-relabel.x86_64-latest.args | 36 + tests/qemuxml2argvdata/seclabel-static.args | 34 - .../seclabel-static.x86_64-latest.args | 36 + .../serial-dev-chardev-iobase.args | 36 - .../qemuxml2argvdata/serial-dev-chardev.args | 36 - .../qemuxml2argvdata/serial-file-chardev.args | 37 - tests/qemuxml2argvdata/serial-file-log.args | 37 - .../qemuxml2argvdata/serial-many-chardev.args | 39 - .../qemuxml2argvdata/serial-pty-chardev.args | 36 - tests/qemuxml2argvdata/serial-spiceport.args | 38 - .../qemuxml2argvdata/serial-tcp-chardev.args | 36 - .../serial-tcp-telnet-chardev.args | 36 - .../serial-tcp-tlsx509-chardev-verify.args | 39 - .../serial-tcp-tlsx509-chardev.args | 39 - .../serial-tcp-tlsx509-secret-chardev.args | 40 - .../qemuxml2argvdata/serial-udp-chardev.args | 38 - tests/qemuxml2argvdata/serial-vc-chardev.args | 36 - .../smartcard-controller.x86_64-latest.args | 35 + ...t-certificates-database.x86_64-latest.args | 35 + .../smartcard-host-certificates.args | 33 - ...tcard-host-certificates.x86_64-latest.args | 35 + tests/qemuxml2argvdata/smartcard-host.args | 33 - .../smartcard-host.x86_64-latest.args | 35 + ...d-passthrough-spicevmc.x86_64-latest.args} | 18 +- ...rtcard-passthrough-tcp.x86_64-latest.args} | 16 +- ...date.err => smbios-date.x86_64-latest.err} | 0 ...rr => smbios-uuid-match.x86_64-latest.err} | 0 ...{smbios.args => smbios.x86_64-latest.args} | 14 +- tests/qemuxml2argvdata/smp-dies.args | 33 - tests/qemuxml2argvdata/smp.args | 33 - ... tpm-no-backend-invalid.x86_64-latest.err} | 0 ....err => usb-bus-missing.x86_64-latest.err} | 0 ...troller-default-i440fx.x86_64-latest.args} | 14 +- ....xml => usb-controller-default-i440fx.xml} | 0 ...controller-default-isapc.x86_64-latest.err | 1 + .../usb-controller-default-isapc.xml | 16 + ...controller-default-q35.x86_64-latest.args} | 10 +- ...ult-unavailable-i440fx.x86_64-latest.args} | 12 +- ...-controller-default-unavailable-i440fx.xml | 1 + ...default-unavailable-q35.x86_64-latest.err} | 0 ...sb-controller-explicit-unavailable-q35.xml | 1 - ...troller-ich9-autoassign.x86_64-latest.args | 41 + ...xml => usb-controller-ich9-autoassign.xml} | 0 ...ntroller-ich9-companion.x86_64-latest.args | 36 + ....xml => usb-controller-ich9-companion.xml} | 0 ...ntroller-ich9-ehci-addr.x86_64-latest.args | 44 + ....xml => usb-controller-ich9-ehci-addr.xml} | 0 ...oller-ich9-no-companion.x86_64-latest.err} | 0 ...l => usb-controller-ich9-no-companion.xml} | 0 ...roller-implicit-i440fx.x86_64-latest.args} | 13 +- ...xml => usb-controller-implicit-i440fx.xml} | 1 - ...troller-implicit-isapc.x86_64-latest.args} | 8 +- .../usb-controller-implicit-isapc.xml | 15 + ...controller-implicit-q35.x86_64-latest.args | 36 + .../usb-controller-implicit-q35.xml | 15 + ...ntroller-nec-xhci-limit.x86_64-latest.err} | 0 ....xml => usb-controller-nec-xhci-limit.xml} | 0 ...er-nec-xhci-unavailable.x86_64-latest.err} | 0 .../usb-controller-nec-xhci-unavailable.xml | 1 + ...sb-controller-nec-xhci.x86_64-latest.args} | 10 +- ...it-q35.xml => usb-controller-nec-xhci.xml} | 0 ...ler-nex-xhci-autoassign.x86_64-latest.args | 37 + ...=> usb-controller-nex-xhci-autoassign.xml} | 0 ...> usb-controller-piix3.x86_64-latest.args} | 15 +- ...ontroller.xml => usb-controller-piix3.xml} | 0 ...troller-qemu-xhci-limit.x86_64-latest.err} | 0 .../usb-controller-qemu-xhci-unavailable.err | 1 - .../usb-controller-qemu-xhci-unavailable.xml | 1 - .../usb-controller-qemu-xhci.args | 30 - ...b-controller-qemu-xhci.x86_64-latest.args} | 15 +- .../qemuxml2argvdata/usb-controller-xhci.args | 30 - tests/qemuxml2argvdata/usb-controller.args | 31 - .../usb-hub-autoadd-deluxe.args | 50 - .../usb-hub-autoadd-deluxe.x86_64-latest.args | 52 + tests/qemuxml2argvdata/usb-hub-autoadd.args | 36 - .../usb-hub-autoadd.x86_64-latest.args | 38 + ...err => usb-hub-conflict.x86_64-latest.err} | 0 ... => usb-hub-nonexistent.x86_64-latest.err} | 0 tests/qemuxml2argvdata/usb-hub.args | 32 - .../usb-hub.x86_64-latest.args | 34 + .../qemuxml2argvdata/usb-ich9-autoassign.args | 39 - .../qemuxml2argvdata/usb-ich9-companion.args | 34 - .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 42 - .../qemuxml2argvdata/usb-long-port-path.args | 35 - .../usb-long-port-path.x86_64-latest.args | 37 + ...hub.err => usb-none-hub.x86_64-latest.err} | 0 ...r.err => usb-none-other.x86_64-latest.err} | 0 ...r => usb-none-usbtablet.x86_64-latest.err} | 0 tests/qemuxml2argvdata/usb-none.args | 30 - .../usb-none.x86_64-latest.args | 32 + .../qemuxml2argvdata/usb-port-autoassign.args | 36 - .../usb-port-autoassign.x86_64-latest.args | 38 + tests/qemuxml2argvdata/usb-port-missing.args | 34 - .../usb-port-missing.x86_64-latest.args | 36 + ... usb-ports-out-of-range.x86_64-latest.err} | 0 tests/qemuxml2argvdata/usb-ports.args | 36 - .../usb-ports.x86_64-latest.args | 38 + tests/qemuxml2argvdata/usb-redir-boot.args | 39 - .../usb-redir-boot.x86_64-latest.args | 41 + .../usb-redir-filter-version.args | 36 - ...sb-redir-filter-version.x86_64-latest.args | 38 + tests/qemuxml2argvdata/usb-redir-filter.args | 39 - .../usb-redir-filter.x86_64-latest.args | 41 + tests/qemuxml2argvdata/usb-redir.args | 39 - .../usb-redir.x86_64-latest.args | 41 + ...-long-port-path-invalid.x86_64-latest.err} | 0 .../qemuxml2argvdata/usb-xhci-autoassign.args | 35 - tests/qemuxml2argvdata/usb1-usb2.args | 43 - .../usb1-usb2.x86_64-latest.args | 45 + ...=> vhost_queues-invalid.x86_64-latest.err} | 0 .../virtio-input-passthrough.args | 32 - ...irtio-input-passthrough.x86_64-latest.args | 34 + tests/qemuxml2argvdata/virtio-input.args | 34 - .../virtio-input.x86_64-latest.args | 36 + ...lloon-freepage-reporting.x86_64-5.0.0.err} | 0 .../qemuxml2argvdata/virtio-rng-default.args | 33 - .../virtio-rng-default.x86_64-latest.args | 35 + ...=> virtio-rng-egd-crash.x86_64-latest.err} | 0 ...args => virtio-rng-egd.x86_64-latest.args} | 16 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 36 - .../virtio-rng-multiple.x86_64-latest.args | 38 + tests/qemuxml2argvdata/virtio-rng-random.args | 33 - .../virtio-rng-random.x86_64-latest.args | 35 + tests/qemuxml2argvdata/vmcoreinfo.args | 35 - .../vmcoreinfo.x86_64-latest.args | 37 + tests/qemuxml2argvtest.c | 1189 ++++++----------- .../default-kvm-host-arch.x86_64-latest.xml | 2 +- .../default-qemu-host-arch.x86_64-latest.xml | 2 +- .../qemuxml2xmloutdata/q35.x86_64-latest.xml | 4 + ...ntroller-default-i440fx.x86_64-latest.xml} | 0 ...ault-unavailable-i440fx.x86_64-latest.xml} | 22 +- ...ntroller-ich9-ehci-addr.x86_64-latest.xml} | 0 ...troller-implicit-i440fx.x86_64-latest.xml} | 12 +- ...ntroller-implicit-isapc.x86_64-latest.xml} | 18 +- ...-controller-implicit-q35.x86_64-latest.xml | 43 + ...usb-controller-nec-xhci.x86_64-latest.xml} | 0 ...=> usb-controller-piix3.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 14 +- tests/testutilsqemu.c | 159 +-- tests/testutilsqemu.h | 6 +- 550 files changed, 6870 insertions(+), 7188 deletions(-) rename tests/qemuxml2argvdata/{440fx-ide-address-conflict.err => 440fx-ide-address-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{440fx-wrong-root.err => 440fx-wrong-root.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-both.args => aarch64-gic-default-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v2.args => aarch64-gic-default-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-default-v3.args => aarch64-gic-default-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-host.args => aarch64-gic-host.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-both.args => aarch64-gic-none-both.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-tcg.args => aarch64-gic-none-tcg.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v2.args => aarch64-gic-none-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-none-v3.args => aarch64-gic-none-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v2.args => aarch64-gic-v2.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{aarch64-gic-v3.args => aarch64-gic-v3.aarch64-latest.args} (100%) rename tests/qemuxml2argvdata/{machine-core-off.args => acpi-table.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/autoindex.args create mode 100644 tests/qemuxml2argvdata/autoindex.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-auto.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate-off.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-deflate.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device-period.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/balloon-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/blkiotune-device.args create mode 100644 tests/qemuxml2argvdata/blkiotune-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/blkiotune.args create mode 100644 tests/qemuxml2argvdata/blkiotune.x86_64-latest.args rename tests/qemuxml2argvdata/{channel-guestfwd.args => channel-guestfwd.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{channel-spicevmc.args => channel-spicevmc.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-auto.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoadd.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-autoassign.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/channel-virtio-default.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-default.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/channel-virtio-state.x86_64-latest.args rename tests/qemuxml2argvdata/{channel-virtio-unix.args => channel-virtio-unix.x86_64-latest.args} (50%) delete mode 100644 tests/qemuxml2argvdata/channel-virtio.args rename tests/qemuxml2argvdata/{channel-virtio-state.args => channel-virtio.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{chardev-reconnect-generated-path.err => chardev-reconnect-generated-path.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{chardev-reconnect-invalid-timeout.err => chardev-reconnect-invalid-timeout.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/chardev-reconnect.args create mode 100644 tests/qemuxml2argvdata/chardev-reconnect.x86_64-latest.args rename tests/qemuxml2argvdata/{clock-catchup.args => clock-catchup.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{clock-localtime.args => clock-france.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{clock-hpet-off.args => clock-hpet-off.x86_64-7.2.0.args} (60%) create mode 100644 tests/qemuxml2argvdata/clock-hpet-off.x86_64-latest.args rename tests/qemuxml2argvdata/{clock-localtime-basis-localtime.args => clock-localtime-basis-localtime.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{clock-france.args => clock-localtime.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{clock-timer-hyperv-rtc.args => clock-timer-hyperv-rtc.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{balloon-device-deflate-off.args => clock-utc.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{clock-variable.args => clock-variable.x86_64-latest.args} (61%) delete mode 100644 tests/qemuxml2argvdata/console-compat-auto.args delete mode 100644 tests/qemuxml2argvdata/console-compat-chardev.args delete mode 100644 tests/qemuxml2argvdata/console-compat.args rename tests/qemuxml2argvdata/{console-virtio-many.args => console-virtio-many.x86_64-latest.args} (52%) rename tests/qemuxml2argvdata/{console-virtio.args => console-virtio.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/controller-order.args create mode 100644 tests/qemuxml2argvdata/controller-order.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-Haswell-noTSX.args => cpu-Haswell-noTSX.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{cpu-Haswell.args => cpu-Haswell.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{cpu-Haswell2.args => cpu-Haswell2.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{cpu-Haswell3.args => cpu-Haswell3.x86_64-latest.args} (60%) create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-disable2.xml create mode 100644 tests/qemuxml2argvdata/cpu-cache-disable3.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-cache-emulate-l2.err => cpu-cache-emulate-l2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-cache-disable.args => cpu-cache-emulate-l3.x86_64-latest.args} (56%) rename tests/qemuxml2argvdata/{cpu-cache-passthrough-l3.err => cpu-cache-passthrough-l3.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough.args rename tests/qemuxml2argvdata/{cpu-cache-disable2.args => cpu-cache-passthrough.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.args delete mode 100644 tests/qemuxml2argvdata/cpu-cache-passthrough2.xml rename tests/qemuxml2argvdata/{cpu-cache-passthrough3.err => cpu-cache-passthrough3.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.args create mode 100644 tests/qemuxml2argvdata/cpu-check-default-none.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-default-none2.args => cpu-check-default-none2.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.args create mode 100644 tests/qemuxml2argvdata/cpu-check-default-partial.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-default-partial2.args => cpu-check-default-partial2.x86_64-latest.args} (60%) delete mode 120000 tests/qemuxml2argvdata/cpu-check-full.args create mode 120000 tests/qemuxml2argvdata/cpu-check-full.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-check-none.args => cpu-check-none.x86_64-latest.args} (60%) delete mode 120000 tests/qemuxml2argvdata/cpu-check-partial.args create mode 120000 tests/qemuxml2argvdata/cpu-check-partial.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-exact1.args => cpu-exact1.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args => cpu-exact2-nofallback.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{cpu-exact2.args => cpu-exact2.x86_64-latest.args} (63%) delete mode 100644 tests/qemuxml2argvdata/cpu-fallback.args rename tests/qemuxml2argvdata/{usb-piix3-controller.args => cpu-fallback.x86_64-5.2.0.args} (73%) create mode 100644 tests/qemuxml2argvdata/cpu-fallback.x86_64-8.0.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.args create mode 100644 tests/qemuxml2argvdata/cpu-host-kvmclock.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-model-cmt.args => cpu-host-model-cmt.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{cpu-host-model-fallback.args => cpu-host-model-fallback.x86_64-4.2.0.args} (63%) rename tests/qemuxml2argvdata/{cpu-host-model-vendor.args => cpu-host-model-fallback.x86_64-5.0.0.args} (63%) create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-fallback.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-4.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-5.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-8.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-nofallback.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model-vendor.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-6.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.0.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.1.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-7.2.0.args create mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-8.0.0.args rename tests/qemuxml2argvdata/{machine-aliases2.args => cpu-host-passthrough-features.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.args create mode 100644 tests/qemuxml2argvdata/cpu-host-passthrough.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-kvmclock.args => cpu-kvmclock.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-minimum1.args create mode 100644 tests/qemuxml2argvdata/cpu-minimum1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-minimum2.args create mode 100644 tests/qemuxml2argvdata/cpu-minimum2.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-no-removed-features.args => cpu-no-removed-features.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/cpu-nofallback.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-5.2.0.err create mode 100644 tests/qemuxml2argvdata/cpu-nofallback.x86_64-8.0.0.args delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-numa-no-memory-element.args rename tests/qemuxml2argvdata/{cpu-numa-memshared.args => cpu-numa-no-memory-element.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/cpu-numa1.args create mode 100644 tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-numa2.args create mode 100644 tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-numa3.err => cpu-numa3.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args rename tests/qemuxml2argvdata/{cpu-cache-disable3.args => cpu-phys-bits-emulate.x86_64-latest.args} (57%) delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args rename tests/qemuxml2argvdata/{cpu-cache-emulate-l3.args => cpu-phys-bits-passthrough.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{cpu-phys-bits-passthrough2.err => cpu-phys-bits-passthrough2.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{cpu-qemu-host-passthrough.err => cpu-qemu-host-passthrough.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-strict1.args create mode 100644 tests/qemuxml2argvdata/cpu-strict1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-topology1.args rename tests/qemuxml2argvdata/{balloon-device.args => cpu-topology1.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/cpu-topology2.args create mode 100644 tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/cpu-topology3.args create mode 100644 tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args rename tests/qemuxml2argvdata/{monitor-json.xml => cpu-topology4.xml} (51%) rename tests/qemuxml2argvdata/{cpu-tsc-frequency.args => cpu-tsc-frequency.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{default-kvm-host-arch.args => default-kvm-host-arch.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{default-qemu-host-arch.args => default-qemu-host-arch.x86_64-latest.args} (59%) delete mode 100644 tests/qemuxml2argvdata/graphics-egl-headless.args rename tests/qemuxml2argvdata/{graphics-sdl-fullscreen.args => graphics-sdl-fullscreen.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{graphics-sdl.args => graphics-sdl.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{hostdev-mdev-display-missing-graphics.err => hostdev-mdev-display-missing-graphics.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-duplicate.err => hostdev-mdev-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-invalid-target-address.err => hostdev-mdev-invalid-target-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-mdev-precreated.args => hostdev-mdev-precreated.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{hostdev-mdev-src-address-invalid.err => hostdev-mdev-src-address-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-unassigned.x86_64-latest.args rename tests/qemuxml2argvdata/{hostdev-pci-duplicate.err => hostdev-pci-duplicate.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.x86_64-latest.args rename tests/qemuxml2argvdata/{hostdev-scsi-duplicate.err => hostdev-scsi-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-rom.args => hostdev-scsi-vhost-scsi-pci.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{hostdev-usb-duplicate.err => hostdev-usb-duplicate.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-pci.args => hostdev-vfio-multidomain.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-wrong-arch.err => hostdev-vfio-zpci-wrong-arch.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio.args rename tests/qemuxml2argvdata/{hostdev-vfio-multidomain.args => hostdev-vfio.x86_64-latest.args} (58%) rename tests/qemuxml2argvdata/{hotplug-base.args => hotplug-base.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{hugepages-default-1G-nodeset-2M.err => hugepages-default-1G-nodeset-2M.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess-invalid.err => hugepages-memaccess-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{hugepages-memaccess3.err => hugepages-memaccess3.x86_64-5.1.0.err} (100%) delete mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.args create mode 100644 tests/qemuxml2argvdata/input-usbmouse-addr.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/input-usbmouse.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/input-usbtablet.args create mode 100644 tests/qemuxml2argvdata/input-usbtablet.x86_64-latest.args rename tests/qemuxml2argvdata/{kvm-pit-delay.args => kvm-pit-delay.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{kvm-pit-discard.args => kvm-pit-discard.x86_64-latest.args} (62%) rename tests/qemuxml2argvdata/{kvmclock.args => kvmclock.x86_64-latest.args} (64%) delete mode 100644 tests/qemuxml2argvdata/machine-aliases1.args create mode 100644 tests/qemuxml2argvdata/machine-aliases1.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-host-passthrough-features.args => machine-aliases2.x86_64-latest.args} (61%) create mode 100644 tests/qemuxml2argvdata/machine-core-off.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/machine-core-on.args rename tests/qemuxml2argvdata/{balloon-device-period.args => machine-core-on.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{machine-loadparm-s390-char-invalid.err => machine-loadparm-s390-char-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{machine-loadparm-s390-len-invalid.err => machine-loadparm-s390-len-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.args create mode 100644 tests/qemuxml2argvdata/machine-vmport-opt.x86_64-latest.args rename tests/qemuxml2argvdata/{memory-align-fail.err => memory-align-fail.x86_64-latest.err} (100%) create mode 100644 tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args rename tests/qemuxml2argvdata/{memory-hotplug-invalid-targetnode.err => memory-hotplug-invalid-targetnode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-nonuma.err => memory-hotplug-nonuma.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/memory-hotplug.args rename tests/qemuxml2argvdata/{memory-hotplug-dimm.args => memory-hotplug.x86_64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/memtune-unlimited.args create mode 100644 tests/qemuxml2argvdata/memtune-unlimited.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/memtune.args create mode 100644 tests/qemuxml2argvdata/memtune.x86_64-latest.args rename tests/qemuxml2argvdata/{migrate-numa-unaligned.args => migrate-numa-unaligned.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{migrate.args => migrate.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{minimal-no-memory.err => minimal-no-memory.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/minimal.args create mode 100644 tests/qemuxml2argvdata/minimal.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/misc-acpi.args rename tests/qemuxml2argvdata/{balloon-device-deflate.args => misc-acpi.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{misc-disable-s3.args => misc-disable-s3.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{misc-disable-suspends.args => misc-disable-suspends.x86_64-latest.args} (65%) delete mode 100644 tests/qemuxml2argvdata/misc-enable-s4.err rename tests/qemuxml2argvdata/{misc-enable-s4.args => misc-enable-s4.x86_64-latest.args} (65%) delete mode 100644 tests/qemuxml2argvdata/misc-uuid.args rename tests/qemuxml2argvdata/{balloon-device-auto.args => misc-uuid.x86_64-latest.args} (64%) delete mode 100644 tests/qemuxml2argvdata/monitor-json.args delete mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.args create mode 100644 tests/qemuxml2argvdata/multifunction-pci-device.x86_64-latest.args rename tests/qemuxml2argvdata/{nosharepages.args => nosharepages.x86_64-latest.args} (64%) delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args create mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args create mode 100644 tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args rename tests/qemuxml2argvdata/{numad-auto-vcpu-static-numatune-no-nodeset.err => numad-auto-vcpu-static-numatune-no-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args create mode 100644 tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numad.args create mode 100644 tests/qemuxml2argvdata/numad.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args create mode 100644 tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args rename tests/qemuxml2argvdata/{numatune-auto-prefer.args => numatune-auto-prefer.x86_64-latest.args} (56%) rename tests/qemuxml2argvdata/{numatune-distances.args => numatune-distances.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{numatune-memnode-invalid-mode.err => numatune-memnode-invalid-mode.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memnode-no-memory.args => numatune-memnode-no-memory.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{numatune-memnode-nocpu.err => numatune-memnode-nocpu.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.args rename tests/qemuxml2argvdata/{numatune-memnodes-problematic.err => numatune-memnodes-problematic.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{numatune-memory-invalid-nodeset.err => numatune-memory-invalid-nodeset.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/numatune-memory.args delete mode 100644 tests/qemuxml2argvdata/numatune-memory.xml rename tests/qemuxml2argvdata/{numatune-static-nodeset-exceed-hostnode.err => numatune-static-nodeset-exceed-hostnode.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/parallel-parport-chardev.args delete mode 100644 tests/qemuxml2argvdata/parallel-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.args create mode 100644 tests/qemuxml2argvdata/pci-autoadd-addr.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.args create mode 100644 tests/qemuxml2argvdata/pci-autoadd-idx.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-autofill-addr.args => pci-autofill-addr.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{pci-bridge-duplicate-index.err => pci-bridge-duplicate-index.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-bridge-many-disks.args => pci-bridge-many-disks.x86_64-latest.args} (68%) rename tests/qemuxml2argvdata/{pci-bridge-negative-index-invalid.err => pci-bridge-negative-index-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pci-bridge.args create mode 100644 tests/qemuxml2argvdata/pci-bridge.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-bus-invalid.err => pci-bus-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-domain-invalid.err => pci-domain-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-bus.err => pci-expander-bus-bad-bus.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-machine.err => pci-expander-bus-bad-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-expander-bus-bad-node.err => pci-expander-bus-bad-node.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pci-expander-bus.args create mode 100644 tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-function-invalid.err => pci-function-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-many.args => pci-many.x86_64-latest.args} (67%) delete mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.args create mode 120000 tests/qemuxml2argvdata/pci-rom-disabled-invalid.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-rom-disabled.args => pci-rom-disabled.x86_64-latest.args} (58%) create mode 100644 tests/qemuxml2argvdata/pci-rom.x86_64-latest.args rename tests/qemuxml2argvdata/{pci-root-address.err => pci-root-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pci-root-nonzero-index.err => pci-root-nonzero-index.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pci-serial-dev-chardev.args rename tests/qemuxml2argvdata/{pci-slot-invalid.err => pci-slot-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-bus.err => pcie-expander-bus-bad-bus.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-expander-bus-bad-machine.err => pcie-expander-bus-bad-machine.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.args create mode 100644 tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args rename tests/qemuxml2argvdata/{pcie-root-port-model-ioh3420.args => pcie-root-port-model-generic.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{pcie-root-port-model-generic.args => pcie-root-port-model-ioh3420.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{pcie-root-port-too-many.err => pcie-root-port-too-many.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pcie-root-port.args => pcie-root-port.x86_64-latest.args} (53%) rename tests/qemuxml2argvdata/{pcie-root.args => pcie-root.x86_64-latest.args} (55%) delete mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.args create mode 100644 tests/qemuxml2argvdata/pcie-switch-downstream-port.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.args create mode 100644 tests/qemuxml2argvdata/pcie-switch-upstream-port.x86_64-latest.args rename tests/qemuxml2argvdata/{pcihole64-q35.args => pcihole64-q35.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{pcihole64.args => pcihole64.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{pmu-feature-off.args => pmu-feature-off.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{pmu-feature.args => pmu-feature.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{pseries-features-invalid-machine.err => pseries-features-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{pseries-serial-invalid-machine.err => pseries-serial-invalid-machine.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-dmi-bad-address1.err => q35-dmi-bad-address1.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{q35-dmi-bad-address2.err => q35-dmi-bad-address2.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.args create mode 100644 tests/qemuxml2argvdata/q35-pci-force-address.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable-fallback.xml delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.args delete mode 100644 tests/qemuxml2argvdata/q35-pm-disable.xml delete mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.args create mode 100644 tests/qemuxml2argvdata/q35-usb2-multi.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.args create mode 100644 tests/qemuxml2argvdata/q35-usb2-reorder.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/q35-usb2.x86_64-latest.args rename tests/qemuxml2argvdata/{q35-wrong-root.err => q35-wrong-root.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/q35.args rename tests/qemuxml2argvdata/{q35-usb2.args => q35.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{qemu-ns-no-env.args => qemu-ns-alt.x86_64-latest.args} (61%) delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns0.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline-ns1.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-commandline.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-commandline.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.args create mode 100644 tests/qemuxml2argvdata/qemu-ns-domain-ns0.x86_64-latest.args rename tests/qemuxml2argvdata/{qemu-ns-alt.args => qemu-ns-no-env.x86_64-latest.args} (65%) rename tests/qemuxml2argvdata/{reboot-timeout-disabled.args => reboot-timeout-disabled.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{reboot-timeout-enabled.args => reboot-timeout-enabled.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{restore-v2-fd.args => restore-v2-fd.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{restore-v2.args => restore-v2.x86_64-latest.args} (65%) delete mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.args create mode 100644 tests/qemuxml2argvdata/seclabel-dac-none.x86_64-latest.args rename tests/qemuxml2argvdata/{seclabel-device-duplicates.err => seclabel-device-duplicates.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{seclabel-device-relabel-invalid.err => seclabel-device-relabel-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-baselabel.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-labelskip.x86_64-latest.args rename tests/qemuxml2argvdata/{seclabel-dynamic-override.args => seclabel-dynamic-override.x86_64-latest.args} (63%) delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic-relabel.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.args create mode 100644 tests/qemuxml2argvdata/seclabel-dynamic.x86_64-latest.args rename tests/qemuxml2argvdata/{seclabel-multiple.err => seclabel-multiple.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/seclabel-none.args create mode 100644 tests/qemuxml2argvdata/seclabel-none.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.args create mode 100644 tests/qemuxml2argvdata/seclabel-static-labelskip.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.args create mode 100644 tests/qemuxml2argvdata/seclabel-static-relabel.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/seclabel-static.args create mode 100644 tests/qemuxml2argvdata/seclabel-static.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev-iobase.args delete mode 100644 tests/qemuxml2argvdata/serial-dev-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-file-log.args delete mode 100644 tests/qemuxml2argvdata/serial-many-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-pty-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-spiceport.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-udp-chardev.args delete mode 100644 tests/qemuxml2argvdata/serial-vc-chardev.args create mode 100644 tests/qemuxml2argvdata/smartcard-controller.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates-database.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.args create mode 100644 tests/qemuxml2argvdata/smartcard-host-certificates.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/smartcard-host.args create mode 100644 tests/qemuxml2argvdata/smartcard-host.x86_64-latest.args rename tests/qemuxml2argvdata/{smartcard-passthrough-spicevmc.args => smartcard-passthrough-spicevmc.x86_64-latest.args} (52%) rename tests/qemuxml2argvdata/{smartcard-passthrough-tcp.args => smartcard-passthrough-tcp.x86_64-latest.args} (54%) rename tests/qemuxml2argvdata/{smbios-date.err => smbios-date.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{smbios-uuid-match.err => smbios-uuid-match.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{smbios.args => smbios.x86_64-latest.args} (70%) delete mode 100644 tests/qemuxml2argvdata/smp-dies.args delete mode 100644 tests/qemuxml2argvdata/smp.args rename tests/qemuxml2argvdata/{tpm-no-backend-invalid.err => tpm-no-backend-invalid.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-bus-missing.err => usb-bus-missing.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{clock-utc.args => usb-controller-default-i440fx.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{usb-controller.xml => usb-controller-default-i440fx.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.x86_64-latest.err create mode 100644 tests/qemuxml2argvdata/usb-controller-default-isapc.xml rename tests/qemuxml2argvdata/{usb-controller-default-q35.args => usb-controller-default-q35.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{smartcard-controller.args => usb-controller-default-unavailable-i440fx.x86_64-latest.args} (63%) create mode 120000 tests/qemuxml2argvdata/usb-controller-default-unavailable-i440fx.xml rename tests/qemuxml2argvdata/{usb-controller-default-unavailable-q35.err => usb-controller-default-unavailable-q35.x86_64-latest.err} (100%) delete mode 120000 tests/qemuxml2argvdata/usb-controller-explicit-unavailable-q35.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-autoassign.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ich9-autoassign.xml => usb-controller-ich9-autoassign.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-companion.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ich9-companion.xml => usb-controller-ich9-companion.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-ich9-ehci-addr.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ich9-ehci-addr.xml => usb-controller-ich9-ehci-addr.xml} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.err => usb-controller-ich9-no-companion.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-ich9-no-companion.xml => usb-controller-ich9-no-companion.xml} (100%) rename tests/qemuxml2argvdata/{smartcard-host-certificates-database.args => usb-controller-implicit-i440fx.x86_64-latest.args} (63%) rename tests/qemuxml2argvdata/{usb-controller-xhci.xml => usb-controller-implicit-i440fx.xml} (86%) rename tests/qemuxml2argvdata/{acpi-table.args => usb-controller-implicit-isapc.x86_64-latest.args} (67%) create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-isapc.xml create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/usb-controller-implicit-q35.xml rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.err => usb-controller-nec-xhci-limit.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-controller-xhci-limit.xml => usb-controller-nec-xhci-limit.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-explicit-unavailable-q35.err => usb-controller-nec-xhci-unavailable.x86_64-latest.err} (100%) create mode 120000 tests/qemuxml2argvdata/usb-controller-nec-xhci-unavailable.xml rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.args => usb-controller-nec-xhci.x86_64-latest.args} (64%) rename tests/qemuxml2argvdata/{usb-controller-explicit-q35.xml => usb-controller-nec-xhci.xml} (100%) create mode 100644 tests/qemuxml2argvdata/usb-controller-nex-xhci-autoassign.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-xhci-autoassign.xml => usb-controller-nex-xhci-autoassign.xml} (100%) rename tests/qemuxml2argvdata/{input-usbmouse.args => usb-controller-piix3.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{usb-piix3-controller.xml => usb-controller-piix3.xml} (100%) rename tests/qemuxml2argvdata/{usb-controller-qemu-xhci-limit.err => usb-controller-qemu-xhci-limit.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.err delete mode 120000 tests/qemuxml2argvdata/usb-controller-qemu-xhci-unavailable.xml delete mode 100644 tests/qemuxml2argvdata/usb-controller-qemu-xhci.args rename tests/qemuxml2argvdata/{serial-unix-chardev.args => usb-controller-qemu-xhci.x86_64-latest.args} (63%) delete mode 100644 tests/qemuxml2argvdata/usb-controller-xhci.args delete mode 100644 tests/qemuxml2argvdata/usb-controller.args delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.args create mode 100644 tests/qemuxml2argvdata/usb-hub-autoadd.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-hub-conflict.err => usb-hub-conflict.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-hub-nonexistent.err => usb-hub-nonexistent.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-hub.args create mode 100644 tests/qemuxml2argvdata/usb-hub.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-ich9-autoassign.args delete mode 100644 tests/qemuxml2argvdata/usb-ich9-companion.args delete mode 100644 tests/qemuxml2argvdata/usb-ich9-ehci-addr.args delete mode 100644 tests/qemuxml2argvdata/usb-long-port-path.args create mode 100644 tests/qemuxml2argvdata/usb-long-port-path.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-none-hub.err => usb-none-hub.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none-other.err => usb-none-other.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{usb-none-usbtablet.err => usb-none-usbtablet.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-none.args create mode 100644 tests/qemuxml2argvdata/usb-none.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.args create mode 100644 tests/qemuxml2argvdata/usb-port-autoassign.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-port-missing.args create mode 100644 tests/qemuxml2argvdata/usb-port-missing.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-ports-out-of-range.err => usb-ports-out-of-range.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-ports.args create mode 100644 tests/qemuxml2argvdata/usb-ports.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-boot.args create mode 100644 tests/qemuxml2argvdata/usb-redir-boot.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.args create mode 100644 tests/qemuxml2argvdata/usb-redir-filter-version.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir-filter.args create mode 100644 tests/qemuxml2argvdata/usb-redir-filter.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/usb-redir.args create mode 100644 tests/qemuxml2argvdata/usb-redir.x86_64-latest.args rename tests/qemuxml2argvdata/{usb-too-long-port-path-invalid.err => usb-too-long-port-path-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/usb-xhci-autoassign.args delete mode 100644 tests/qemuxml2argvdata/usb1-usb2.args create mode 100644 tests/qemuxml2argvdata/usb1-usb2.x86_64-latest.args rename tests/qemuxml2argvdata/{vhost_queues-invalid.err => vhost_queues-invalid.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.args create mode 100644 tests/qemuxml2argvdata/virtio-input-passthrough.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/virtio-input.args create mode 100644 tests/qemuxml2argvdata/virtio-input.x86_64-latest.args rename tests/qemuxml2argvdata/{virtio-options-memballoon-freepage-reporting.err => virtio-options-memballoon-freepage-reporting.x86_64-5.0.0.err} (100%) delete mode 100644 tests/qemuxml2argvdata/virtio-rng-default.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-default.x86_64-latest.args rename tests/qemuxml2argvdata/{virtio-rng-egd-crash.err => virtio-rng-egd-crash.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{virtio-rng-egd.args => virtio-rng-egd.x86_64-latest.args} (54%) delete mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-multiple.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/virtio-rng-random.args create mode 100644 tests/qemuxml2argvdata/virtio-rng-random.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/vmcoreinfo.args create mode 100644 tests/qemuxml2argvdata/vmcoreinfo.x86_64-latest.args rename tests/qemuxml2xmloutdata/{usb-controller.x86_64-latest.xml => usb-controller-default-i440fx.x86_64-latest.xml} (100%) rename tests/{qemuxml2argvdata/smp.xml => qemuxml2xmloutdata/usb-controller-default-unavailable-i440fx.x86_64-latest.xml} (57%) rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.x86_64-latest.xml => usb-controller-ich9-ehci-addr.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{smp.x86_64-latest.xml => usb-controller-implicit-i440fx.x86_64-latest.xml} (65%) rename tests/{qemuxml2argvdata/smp-dies.xml => qemuxml2xmloutdata/usb-controller-implicit-isapc.x86_64-latest.xml} (50%) create mode 100644 tests/qemuxml2xmloutdata/usb-controller-implicit-q35.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.x86_64-latest.xml => usb-controller-nec-xhci.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.x86_64-latest.xml => usb-controller-piix3.x86_64-latest.xml} (100%) -- 2.41.0

3 58

[libvirt PATCH] rpm: Install client-qemu with main package
by Andrea Bolognani 06 Sep '23

06 Sep '23

The libvirt package is a sort of catch-all that brings in all daemon drivers as well as the client package, so it makes sense for it do drag in the QEMU-specific clients as well. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index b471afebb1..051cf886d6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -249,6 +249,7 @@ Requires: libvirt-daemon-driver-lxc = %{version}-%{release} %endif %if %{with_qemu} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} +Requires: libvirt-client-qemu = %{version}-%{release} %endif # We had UML driver, but we've removed it. Obsoletes: libvirt-daemon-driver-uml <= 5.0.0 -- 2.41.0

2 1

[PATCH] storage_util: Drop getDeviceType()
by Michal Privoznik 05 Sep '23

05 Sep '23

The sole purpose of getDeviceType() is to parse a file that contains one integer (and a newline character). Well, we already have a function for that: virFileReadValueInt(). Use the latter and drop the former. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_util.c | 75 ++++++++------------------------------ 1 file changed, 15 insertions(+), 60 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index bf8de2475d..7243308a02 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3847,62 +3847,6 @@ getBlockDevice(uint32_t host, } -/* Function to check if the type file in the given sysfs_path is a - * Direct-Access device (i.e. type 0). Return -1 on failure, type of - * the device otherwise. - */ -static int -getDeviceType(uint32_t host, - uint32_t bus, - uint32_t target, - uint32_t lun, - int *type) -{ - char typestr[3]; - char *gottype, *p; - FILE *typefile; - g_autofree char *type_path = NULL; - - type_path = g_strdup_printf("/sys/bus/scsi/devices/%u:%u:%u:%u/type", host, - bus, target, lun); - - typefile = fopen(type_path, "r"); - if (typefile == NULL) { - virReportSystemError(errno, - _("Could not find typefile '%1$s'"), - type_path); - /* there was no type file; that doesn't seem right */ - return -1; - } - - gottype = fgets(typestr, 3, typefile); - VIR_FORCE_FCLOSE(typefile); - - if (gottype == NULL) { - virReportSystemError(errno, - _("Could not read typefile '%1$s'"), - type_path); - /* we couldn't read the type file; have to give up */ - return -1; - } - - /* we don't actually care about p, but if you pass NULL and the last - * character is not \0, virStrToLong_i complains - */ - if (virStrToLong_i(typestr, &p, 10, type) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Device type '%1$s' is not an integer"), - typestr); - /* Hm, type wasn't an integer; seems strange */ - return -1; - } - - VIR_DEBUG("Device type is %d", *type); - - return 0; -} - - /* * Process a Logical Unit entry from the scsi host device directory * @@ -3921,18 +3865,29 @@ processLU(virStoragePoolObj *pool, { int retval = -1; int device_type; + int rc; g_autofree char *block_device = NULL; VIR_DEBUG("Processing LU %u:%u:%u:%u", host, bus, target, lun); - if (getDeviceType(host, bus, target, lun, &device_type) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to determine if %1$u:%2$u:%3$u:%4$u is a Direct-Access LUN"), - host, bus, target, lun); + if ((rc = virFileReadValueInt(&device_type, + "/sys/bus/scsi/devices/%u:%u:%u:%u/type", + host, bus, target, lun)) < 0) { + + /* Report an error if file doesn't exist. Appropriate + * error was reported otherwise. */ + if (rc == -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to determine if %1$u:%2$u:%3$u:%4$u is a Direct-Access LUN"), + host, bus, target, lun); + } + return -1; } + VIR_DEBUG("Device type is %d", device_type); + /* We don't create volumes for devices other than disk and cdrom * devices, but finding a device that isn't one of those types * isn't an error, either. */ -- 2.41.0

2 1

[PATCH 0/3] ch: Couple of format directive fixes
by Michal Privoznik 05 Sep '23

05 Sep '23

*** BLURB HERE *** Michal Prívozník (3): ch: Use uint for @maxvcpus in virCHDomainRefreshThreadInfo() ch: Use int for @niothreads in virCHMonitorGetIOThreads() ch: Use proper format directive for @i in virCHProcessSetupIOThreads() src/ch/ch_domain.c | 4 ++-- src/ch/ch_monitor.c | 4 ++-- src/ch/ch_process.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.41.0

2 4

[PATCH] fix virCgroupGetMemoryStat arguments order
by Dmitry Frolov 05 Sep '23

05 Sep '23

Reviewing the sources, I noticed that, argumets order in virCgroupGetMemoryStat() function call does not correspond to the function declaration: -instead of *activeAnon, &meminfo->inactive_anon is passed; -instead of *inactiveAnon, &meminfo->active_anon is passed; -instead of *activeFile, &meminfo->inactive_file is passed; -instead of *inactiveFile, &meminfo->active_file is passed. Fixes: e634c7cd0d ("lxc: Use virCgroupGetMemoryStat") Signed-off-by: Dmitry Frolov <frolov(a)swemel.ru> --- src/lxc/lxc_cgroup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 1b516bba73..bc39b16928 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -130,10 +130,10 @@ static int virLXCCgroupGetMemStat(virCgroup *cgroup, { return virCgroupGetMemoryStat(cgroup, &meminfo->cached, - &meminfo->inactive_anon, &meminfo->active_anon, - &meminfo->inactive_file, + &meminfo->inactive_anon, &meminfo->active_file, + &meminfo->inactive_file, &meminfo->unevictable); } -- 2.34.1

2 1

[PATCH Libvirt v2 00/10] Support dirty page rate upper limit
by ~hyman 05 Sep '23

05 Sep '23

Hi, This is the latest version for the series, comparing with version 1, there are some key modifications has made inspired and suggested by Peter, see as follows: 1. Introduce XML for dirty limit persistent configuration 2. Merge the cancel API into the set API 3. Extend the domstats/virDomainListGetStats API for dirty limit information query 4. Introduce the virDomainModificationImpact flags to control the behavior of the API 5. Enrich the comments and docs about the feature and API The patch set introduce the new API virDomainSetVcpuDirtyLimit to allow upper Apps to set upper limits of dirty page rate for virtual CPUs, the corresponding virsh API as follows: # limit-dirty-page-rate <domain> <rate> [--vcpu <number>] \ [--config] [--live] [--current] We put the dirty limit persistent info with the "vcpus" element in domain XML and extend dirtylimit statistics for domGetStats: <domain> ... <vcpu current='2'>3</vcpu> <vcpus> <vcpu id='0' hotpluggable='no' dirty_limit='10' order='1'.../> <vcpu id='1' hotpluggable='yes' dirty_limit='10' order='2'.../> </vcpus> ... If --vcpu option is not passed in the virsh command, set all virtual CPUs; if rate is set to zero, cancel the upper limit. Examples: To set the dirty page rate upper limit 10 MB/s for all virtual CPUs in c81_node1, use: [root@srv2 my_libvirt]# virsh limit-dirty-page-rate c81_node1 --rate 10 --live Set dirty page rate limit 10(MB/s) for all virtual CPUs successfully [root@srv2 my_libvirt]# virsh dumpxml c81_node1 | grep dirty_limit <vcpu id='0' enabled='yes' hotpluggable='no' order='1' dirty_limit='10'/> <vcpu id='1' enabled='yes' hotpluggable='no' order='2' dirty_limit='10'/> <vcpu id='2' enabled='yes' hotpluggable='no' order='3' dirty_limit='10'/> <vcpu id='3' enabled='no' hotpluggable='yes' dirty_limit='10'/> <vcpu id='4' enabled='no' hotpluggable='yes' dirty_limit='10'/> ...... Query the dirty limit info dynamically: [root@srv2 my_libvirt]# virsh domstats c81_node1 --dirtylimit Domain: 'c81_node1' dirtylimit.vcpu.0.limit=10 dirtylimit.vcpu.0.current=0 dirtylimit.vcpu.1.limit=10 dirtylimit.vcpu.1.current=0 dirtylimit.vcpu.2.limit=10 dirtylimit.vcpu.2.current=0 dirtylimit.vcpu.3.limit=10 dirtylimit.vcpu.3.current=0 dirtylimit.vcpu.4.limit=10 dirtylimit.vcpu.4.current=0 ...... To cancel the upper limit, use: [root@srv2 my_libvirt]# virsh limit-dirty-page-rate c81_node1 \ --rate 0 --live Cancel dirty page rate limit for all virtual CPUs successfully [root@srv2 my_libvirt]# virsh dumpxml c81_node1 | grep dirty_limit [root@srv2 my_libvirt]# virsh domstats c81_node1 --dirtylimit Domain: 'c81_node1' The dirty limit uses the QEMU dirty-limit feature introduced since 7.1.0, this feature allows CPU to be throttled as needed to keep their dirty page rate within the limit. It could, in some scenes, be used to provide quality-of-service in the aspect of the memory workload for virtual CPUs and QEMU itself use the feature to implement the dirty-limit throttle algorithm and apply it on the live migration, which improve responsiveness of large guests during live migration and can result in more stable read performance. The other application scenarios remain unexplored, before that, Libvirt could provide the basic API. Please review, thanks Yong Hyman Huang(黄勇) (10): qemu_capabilities: Introduce QEMU_CAPS_VCPU_DIRTY_LIMIT capability conf: Introduce XML for dirty limit configuration libvirt: Add virDomainSetVcpuDirtyLimit API qemu_driver: Implement qemuDomainSetVcpuDirtyLimit domain_validate: Export virDomainDefHasDirtyLimitStartupVcpus symbol qemu_process: Setup dirty limit after launching VM virsh: Introduce limit-dirty-page-rate api qemu_monitor: Implement qemuMonitorQueryVcpuDirtyLimit qemu_driver: Extend dirtlimit statistics for domGetStats virsh: Introduce command 'virsh domstats --dirtylimit' docs/formatdomain.rst | 7 +- docs/manpages/virsh.rst | 33 +++- include/libvirt/libvirt-domain.h | 5 + src/conf/domain_conf.c | 26 +++ src/conf/domain_conf.h | 8 + src/conf/domain_validate.c | 33 ++++ src/conf/domain_validate.h | 2 + src/conf/schemas/domaincommon.rng | 5 + src/driver-hypervisor.h | 7 + src/libvirt-domain.c | 68 +++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 181 ++++++++++++++++++ src/qemu/qemu_monitor.c | 25 +++ src/qemu/qemu_monitor.h | 22 +++ src/qemu/qemu_monitor_json.c | 107 +++++++++++ src/qemu/qemu_monitor_json.h | 9 + src/qemu/qemu_process.c | 44 +++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 7 + .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 + .../caps_7.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + .../caps_7.2.0_x86_64+hvf.xml | 1 + .../caps_7.2.0_x86_64.xml | 1 + .../caps_8.0.0_riscv64.xml | 1 + .../caps_8.0.0_x86_64.xml | 1 + .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + .../caps_8.1.0_x86_64.xml | 1 + tools/virsh-domain-monitor.c | 7 + tools/virsh-domain.c | 109 +++++++++++ 34 files changed, 737 insertions(+), 4 deletions(-) -- 2.38.5

3 15

[PATCH 0/8] Finish effort to decrease maximum stack frame to 2048
by Peter Krempa 05 Sep '23

05 Sep '23

Few outstanding patches of code compiled only on FreeBSD Pipeline: https://gitlab.com/pipo.sk/libvirt/-/pipelines/986470469 Peter Krempa (8): bhyve: Don't stack-allocate huge error buffers virHostValidateBhyve: Declare one variable per line virHostValidateBhyve: Heap allocate massive 'struct kld_file_stat' nss: aiforaf: Format one argument/variable per line nss: aiforaf: Remove unused 'ret' variable nss: aiforaf: Drop unused buffer 'port' nss: aiforaf: Decrease stack size by scoping off large buffers. build: Decrease maximum stack frame size to 2048 meson.build | 2 +- src/bhyve/bhyve_process.c | 4 +- tools/nss/libvirt_nss.c | 105 ++++++++++++++++++------------- tools/virt-host-validate-bhyve.c | 20 +++--- 4 files changed, 74 insertions(+), 57 deletions(-) -- 2.41.0

4 24

Pure Python binding?
by Philipp Hahn 05 Sep '23

05 Sep '23

Hello, "pip install libvirt-python" does not work in several cases as that requires the low-level C library, compilers, tools, and Python header files to be installed. This prevents the use of "libvirt" in scenarios, where "root" privileges are not available to install these dependencies, e.g. running "libvirt" inside a JupyterHub notebook for gathering statistics. This also breaks the adoption on Windows, see <https://gitlab.com/libvirt/libvirt-python/-/issues/7> and <https://gitlab.com/libvirt/libvirt-python/-/issues/6> Looking at <https://libvirt.org/bindings.html> and <https://gitlab.com/libvirt> I only see "bindings" for the low-level C library. Does someone know of a "pure Python binding" for talking to a remote "libvirtd", either via "+ssh" or "+tls"? Or is there another "trick" to talk to libvirtd? And no, parsing the output of subprocess.run("ssh ... virsh ...") is not an option ;-) Philipp -- Philipp Hahn Open Source Software Engineer Univention GmbH Mary-Somerville-Str. 1 28359 Bremen Germany | Deutschland Phone: +49 (0)421 22232-0 | E-Mail: info(a)univention.de https://www.univention.de | https://www.univention.com Managing Directors: Peter H. Ganten, Stefan Gohmann Local court: Amtsgericht Bremen HRB 20755 | Ust-ID: DE220051310

2 1

[PATCH] conf: Generate MAC address instead of keeping all zeroes
by Martin Kletzander 04 Sep '23

04 Sep '23

When we parse <mac address="00:00:00:00:00:00"/> we keep that in memory and pass it down to the hypervisor. However, that MAC address is not strictly valid as it is not marked as locally administered (bit 0x02) but it is not even globally unique. It is also used for loopback device on Linux, for example. And QEMU sees such MAC address just as "not specified" and generates a new one that libvirt does not even know about. So to make the overall experience better we now generate it if the supplied one is all clear. Resolves: https://issues.redhat.com/browse/RHEL-974 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/util/virmacaddr.c | 5 +++++ src/util/virmacaddr.h | 1 + .../network-interface-mac-clear.xml | 21 +++++++++++++++++++ .../network-interface-mac-clear.xml | 21 +++++++++++++++++++ tests/genericxml2xmltest.c | 4 +++- 6 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 tests/genericxml2xmlindata/network-interface-mac-clear.xml create mode 100644 tests/genericxml2xmloutdata/network-interface-mac-clear.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bb4f1fdb948d..652bd09b21b8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9675,7 +9675,7 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, return NULL; } - if (!macaddr) { + if (!macaddr || virMacAddrIsAllClear(&def->mac)) { virDomainNetGenerateMAC(xmlopt, &def->mac); def->mac_generated = true; } diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 073f298b5b66..e06bb200fc68 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -246,6 +246,11 @@ virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]) return memcmp(virMacAddrBroadcastAddrRaw, s, sizeof(*s)) == 0; } +bool virMacAddrIsAllClear(const virMacAddr *addr) +{ + return !virMacAddrCmpRaw(addr, (const unsigned char[VIR_MAC_BUFLEN]){0}); +} + void virMacAddrFree(virMacAddr *addr) { diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index f32b58805a61..7b9eb7443bd1 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -58,6 +58,7 @@ int virMacAddrParseHex(const char* str, bool virMacAddrIsUnicast(const virMacAddr *addr); bool virMacAddrIsMulticast(const virMacAddr *addr); bool virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]); +bool virMacAddrIsAllClear(const virMacAddr *addr); void virMacAddrFree(virMacAddr *addr); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMacAddr, virMacAddrFree); diff --git a/tests/genericxml2xmlindata/network-interface-mac-clear.xml b/tests/genericxml2xmlindata/network-interface-mac-clear.xml new file mode 100644 index 000000000000..41beda8a79bb --- /dev/null +++ b/tests/genericxml2xmlindata/network-interface-mac-clear.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='00:00:00:00:00:00'/> + <source bridge='br0'/> + </interface> + </devices> +</domain> diff --git a/tests/genericxml2xmloutdata/network-interface-mac-clear.xml b/tests/genericxml2xmloutdata/network-interface-mac-clear.xml new file mode 100644 index 000000000000..a7935fa9f4de --- /dev/null +++ b/tests/genericxml2xmloutdata/network-interface-mac-clear.xml @@ -0,0 +1,21 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <interface type='bridge'> + <mac address='52:54:00:00:00:00'/> + <source bridge='br0'/> + </interface> + </devices> +</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 3501eadf5597..bf160b7e0bef 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -187,6 +187,7 @@ mymain(void) DO_TEST("cpu-cache-disable"); DO_TEST("network-interface-mac-check"); + DO_TEST_DIFFERENT("network-interface-mac-clear"); DO_TEST_DIFFERENT("chardev-tcp"); DO_TEST_FAIL_ACTIVE("chardev-tcp-missing-host"); @@ -255,4 +256,5 @@ mymain(void) return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -VIR_TEST_MAIN(mymain) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virrandom")) -- 2.42.0

2 2

[PATCH (pushed)] build: Fix logic bug determining whether running with optimization
by Peter Krempa 04 Sep '23

04 Sep '23

The conversion from ternary to a 'if' clause was wrong and thus didn't properly increase the stack size where needed but only where not actually needed. Fixes: b68faa99d9f16c2f504b23737040d25d072ee85d Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e0ee4f2f21..3bf15d93a4 100644 --- a/meson.build +++ b/meson.build @@ -255,7 +255,7 @@ if cc.get_id() == 'clang' and get_option('optimization') == '0' endif # sanitizer instrumentation may enlarge stack frames -if get_option('b_sanitize') == 'none' +if get_option('b_sanitize') != 'none' stack_frame_size = 32768 endif -- 2.41.0

1 0

[PATCH (pushed)] build: Fix assignment into 'stack_frame_size' when sanitizer is enabled
by Peter Krempa 04 Sep '23

04 Sep '23

Instead of an assignment into the 'stack_frame_size' variable when sanitizers are enabled I've accidentally compared the value against the requested size. Fix the typo. Fixes: b68faa99d9f16c2f504b23737040d25d072ee85d Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index d29761bc71..e0ee4f2f21 100644 --- a/meson.build +++ b/meson.build @@ -256,7 +256,7 @@ endif # sanitizer instrumentation may enlarge stack frames if get_option('b_sanitize') == 'none' - stack_frame_size == 32768 + stack_frame_size = 32768 endif # array_bounds=2 check triggers false positive on some GCC -- 2.41.0

1 0

[PATCH 0/2] build: Fix build with clang without optimization
by Peter Krempa 04 Sep '23

04 Sep '23

Add a note for users how optimization is supposed to be controled with meson and fix the build by using 4k stack flame on clang without optimization. Peter Krempa (2): docs: compiling: Add a note about use of CFLAGS for optimization build: Work around clang's stack size calculation without optimization docs/compiling.rst | 5 +++++ meson.build | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) -- 2.41.0

2 4

[PATCH] Revert "build: Decrease maximum stack frame size to 2048"
by Peter Krempa 04 Sep '23

04 Sep '23

Build fails with this patch with 'clang' when optimizations are disabled in long functions which have many helper variables declared in nested blocks such as for-loops. As there is no clean solution for now, let's keep the stack frame size at 4k. This reverts commit 42bc76cdb8486ef502200f3bce9e3faebdd78103. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 6b6f7ccb7c..dd7a4e8d34 100644 --- a/meson.build +++ b/meson.build @@ -248,7 +248,7 @@ alloc_max = run_command( ) # sanitizer instrumentation may enlarge stack frames -stack_frame_size = get_option('b_sanitize') == 'none' ? 2048 : 32768 +stack_frame_size = get_option('b_sanitize') == 'none' ? 4096 : 32768 # array_bounds=2 check triggers false positive on some GCC # versions when using sanitizers. Seen on Fedora 34 with -- 2.41.0

2 1

[PATCH 0/2] syntax-check: Introduce a rule for one line error messages
by Michal Privoznik 04 Sep '23

04 Sep '23

This is a follow up of: https://listman.redhat.com/archives/libvir-list/2023-August/241416.html And while the regular expression in patch 2/2 is very trivial it mostly works. But I'm open for suggestions. Michal Prívozník (2): tools: Reformat --help output of virsh and virt-admin syntax-check: Introduce a rule for one line error messages build-aux/syntax-check.mk | 8 ++++++++ tools/virsh.c | 6 ++++-- tools/virt-admin.c | 6 ++++-- 3 files changed, 16 insertions(+), 4 deletions(-) -- 2.41.0

2 5

[PATCH] docs, passt: Clarify some niche passt usage
by Martin Kletzander 04 Sep '23

04 Sep '23

Change example logfile path and clarify how complicated all things passt are. I chose not to create the non-existing directory because it could open a whole new can of worms. Also explain missing `dev` attribute of `<portForward/>` Resolves: https://issues.redhat.com/browse/RHEL-1833 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- docs/formatdomain.rst | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 68f54ab3ed62..bc469e5f9f94 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -4902,14 +4902,23 @@ When the passt backend is used, the ``<backend>`` attribute ``logFile`` can be used to tell the passt process for this interface where to write its message log, and the ``<source>`` attribute ``dev`` can tell it to use a particular host interface to derive the routes -given to the guest for forwarding traffic upstream. +given to the guest for forwarding traffic upstream. Due to the design +decisions of passt, if using SELinux, the log file is recommended to +reside in the runtime directory of a user under which the passt +process will run, most probably ``/run/user/$UID`` where ``$UID`` is +the UID of the user, e.g. ``qemu``. Beware that libvirt does not +create this directory if it does not already exist to avoid possible, +however unlikely, issues, especially since this logfile attribute is +meant mostly for debugging. Additionally, when passt is used, multiple ``<portForward>`` elements can be added to forward incoming network traffic for the host to this guest interface. Each ``<portForward>`` must have a ``proto`` -attribute (set to ``tcp`` or ``udp``) and optional original -``address`` (if not specified, then all incoming sessions to any host -IP for the given proto/port(s) will be forwarded to the guest). +attribute (set to ``tcp`` or ``udp``), optional original ``address`` +(if not specified, then all incoming sessions to any host IP for the +given proto/port(s) will be forwarded to the guest), and an optional +``dev`` attribute to limit the forwarded traffic to a specific host +interface. The decision of which ports to forward is described with zero or more ``<range>`` subelements of ``<portForward>`` (if there is no @@ -4934,7 +4943,7 @@ ports **with the exception of some subset**. <devices> ... <interface type='user'> - <backend type='passt' logFile='/tmp/passt.log'/> + <backend type='passt' logFile='/run/user/$UID/passt-domain.log'/> <mac address="00:11:22:33:44:55"/> <source dev='eth0'/> <ip family='ipv4' address='172.17.2.4' prefix='24'/> @@ -4946,7 +4955,7 @@ ports **with the exception of some subset**. <range start='5000' end='5020' to='6000'/> <range start='5010' end='5015' exclude='yes'/> </portForward> - <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10'> + <portForward proto='tcp' address='2001:db8:ac10:fd01::1:10' dev='eth0'> <range start='80'/> <range start='443' to='344'/> </portForward> -- 2.41.0

2 1

[PATCH] conf, schema: Switch iothread/poll values to unsignedLong
by Martin Kletzander 04 Sep '23

04 Sep '23

They represent nanoseconds, and we accept such values already. Not that anyone would use such values in the wild, but even one person testing QEMU could put in a bigger value and will be bothered with validation errors after every `virsh edit`. Also add a test for it. Resolves: https://issues.redhat.com/browse/RHEL-1717 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/schemas/domaincommon.rng | 6 +++--- tests/genericxml2xmlindata/iothreadids.xml | 23 ++++++++++++++++++++++ tests/genericxml2xmltest.c | 2 ++ 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 tests/genericxml2xmlindata/iothreadids.xml diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index de3bd1c35c55..2f9ba31c0aec 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -876,17 +876,17 @@ <element name="poll"> <optional> <attribute name="max"> - <ref name="unsignedInt"/> + <ref name="unsignedLong"/> </attribute> </optional> <optional> <attribute name="grow"> - <ref name="unsignedInt"/> + <ref name="unsignedLong"/> </attribute> </optional> <optional> <attribute name="shrink"> - <ref name="unsignedInt"/> + <ref name="unsignedLong"/> </attribute> </optional> </element> diff --git a/tests/genericxml2xmlindata/iothreadids.xml b/tests/genericxml2xmlindata/iothreadids.xml new file mode 100644 index 000000000000..671a4672958d --- /dev/null +++ b/tests/genericxml2xmlindata/iothreadids.xml @@ -0,0 +1,23 @@ +<domain type='kvm'> + <name>foo</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <iothreads>1</iothreads> + <iothreadids> + <iothread id='8' thread_pool_min='2147483647' thread_pool_max='2147483647'> + <poll max='9223372036854775807' grow='456' shrink='789'/> + </iothread> + </iothreadids> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + </devices> +</domain> diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c index 3501eadf5597..ce8073e85a30 100644 --- a/tests/genericxml2xmltest.c +++ b/tests/genericxml2xmltest.c @@ -249,6 +249,8 @@ mymain(void) DO_TEST("cpu-phys-bits-emulate"); DO_TEST("cpu-phys-bits-passthrough"); + DO_TEST("iothreadids"); + virObjectUnref(caps); virObjectUnref(xmlopt); -- 2.41.0

2 2

[libvirt PATCH 00/33] ci: Unify the GitLab CI jobs with local executions && adopt lcitool container executions
by Erik Skultety 01 Sep '23

01 Sep '23

Technically a v2 of: https://listman.redhat.com/archives/libvir-list/2023-February/237552.html However, the approach here is slightly different and what that series said about migration to lcitool container executions as a replacement for ci/Makefile is actually done here. One of the core problems of the above pointed out in review was that more Shell logic was introduced including CLI parsing, conditional executions, etc. which we fought hard to get rid of in the past. I reworked the Shell functions quite a bit and dropped whatever extra Shell logic the original series added. Obviously we can't get rid of Shell completely because of .gitlab-ci.yml and so I merely extracted the recipes into functions which are then sourced as ci/build.sh and executed. Now, that on its own would hide the actual commands being run in the GitLab job log, so before any command is actually executed, it is formatted with a color sequence so we don't miss that information as that would be a regression to the status quo. Lastly, this series then takes the effort inside the ci/build.sh script and basically mirrors whatever GitLab would do to run a job inside a local container which is executed by lcitool (yes, we already have that capability). Please give this a try and I'm already looking forward to comments as I'd like to expand this effort to local VM executions running the TCK integration tests, so this series is quite important in that regard. Erik Skultety (33): ci: build.sh: Add variables from .gitlab-ci.yml ci: build.sh: Add GIT_ROOT env helper variable ci: build.sh: Don't mention that MESON_ARGS are available via CLI ci: build.sh: Add a wrapper function over meson's setup ci: build.sh: Add a wrapper function executing 'shell' commands ci: build.sh: Add a wrapper function over the 'build' job ci: build.sh: Add a helper function to create the dist tarball ci: build.sh: Add a wrapper function over the 'test' job ci: build.sh: Add a wrapper function over the 'codestyle' job ci: build.sh: Add a wrapper function over the 'potfile' job ci: build.sh: Add a wrapper function over the 'rpmbuild' job ci: build.sh: Add a wrapper function over the 'website' job ci: build.sh: Drop changing working directory to CI_CONT_DIR ci: build.sh: Drop direct invocation of meson/ninja commands ci: build.sh: Drop MESON_ARGS definition from global level gitlab-ci.yml: Add 'after_script' stage to prep for artifact collection .gitlab-ci.yml: Convert the native build job to the build.sh usage .gitlab-ci.yml: Convert the cross build job to the build.sh usage .gitlab-ci.yml: Convert the website build job to the build.sh usage .gitlab-ci.yml: Convert the codestyle job to the build.sh usage .gitlab-ci.yml: Convert the potfile job to the build.sh usage ci: helper: Drop _lcitool_get_targets method ci: helper: Don't make ':' literal a static part of the image tag ci: helper: Add --lcitool-path CLI option ci: helper: Add a job argparse subparser ci: helper: Add a required_deps higher order helper/decorator ci: helper: Add Python code hangling git clones ci: helper: Add a helper to create a local repo clone Pythonic way ci: helper: Rework _lcitool_run method logic ci: helper: Add an action to run the container workload via lcitool ci: helper: Drop original actions ci: helper: Drop the --meson-args/--ninja-args CLI options ci: helper: Drop the _make_run method .gitlab-ci.yml | 47 +++++++------ ci/build.sh | 105 +++++++++++++++++++++++++---- ci/helper | 176 ++++++++++++++++++++++++++++--------------------- 3 files changed, 218 insertions(+), 110 deletions(-) -- 2.41.0

2 83

[PATCH] tests: Remove unused symlink
by Martin Kletzander 01 Sep '23

01 Sep '23

The test does not use VIR_TEST_DIFFERENT anyway, so it's probably a leftover. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial tests/genericxml2xmloutdata/device-backenddomain.xml | 1 - 1 file changed, 1 deletion(-) delete mode 120000 tests/genericxml2xmloutdata/device-backenddomain.xml diff --git a/tests/genericxml2xmloutdata/device-backenddomain.xml b/tests/genericxml2xmloutdata/device-backenddomain.xml deleted file mode 120000 index f19471e3b50c..000000000000 --- a/tests/genericxml2xmloutdata/device-backenddomain.xml +++ /dev/null @@ -1 +0,0 @@ -../genericxml2xmlindata/device-backenddomain.xml \ No newline at end of file -- 2.42.0

1 0

[PATCH v2] NEWS: Announcing Network Metadata APIs
by K Shiva Kiran 01 Sep '23

01 Sep '23

Ref to patchset implementing the above: https://listman.redhat.com/archives/libvir-list/2023-August/241250.html Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> --- This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-August/241469.html Diff to v1: - Shortened the text and put all text under one section. NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e40c8ac259..5275a8299a 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -28,6 +28,17 @@ v9.7.0 (unreleased) 2) pre-binding the variant driver using the ``--driver`` option of ``virsh nodedev-detach``. + * network: Support for ``<title>`` and ``<description>`` fields in Network XML + + The network object adds two more user defined metadata fields ``<title>`` + and ``<description>``. + Two new APIs ``virNetworkGetMetadata()`` and ``virNetworkSetMetadata()`` can be + used to view and modify the above including the existing ``<metadata>`` field. + + virsh adds two new commands ``net-desc`` and ``net-metadata`` to view/modify the same. + ``net-list`` adds a new option ``--title`` that prints the content of ``<title>`` + in an extra column within the default ``--table`` output. + * **Improvements** * **Bug fixes** -- 2.42.0

2 1

Release of libvirt-9.7.0
by Jiri Denemark 01 Sep '23

01 Sep '23

The 9.7.0 release of both libvirt and libvirt-python is tagged and signed tarballs and source RPMs are available at https://download.libvirt.org/ https://download.libvirt.org/python/ Thanks everybody who helped with this release by sending patches, reviewing, testing, or providing feedback. Your work is greatly appreciated. * New features * qemu: basic support for use of "VFIO variant" drivers A VFIO variant driver is a device-specific driver that can be used in place of the generic vfio-pci driver, and provides extra functionality to support things like live migration of guests with vfio-assigned devices. It can currently be used by: 1) setting ``managed='no'`` in the XML configuration for the device 2) pre-binding the variant driver using the ``--driver`` option of ``virsh nodedev-detach``. * Bug fixes * qemu: Various fixes to firmware selection The changes made to firmware selection in libvirt 9.2.0 have unfortunately introduced a number of regressions. All known issues in this area have now been resolved. Enjoy. Jirka

2 1

[libvirt PATCH v2 0/6] external snapshot revert fixes
by Pavel Hrdina 01 Sep '23

01 Sep '23

This fixes reverting external snapshots to not error out in cases where it should work and makes it correctly load the memory state when reverting to snapshot of running VM. Last patch is not part of the fix, it is alternative solution to remove the capability as we are close to releasing libvirt 9.7.0 in case the code fixing reverting snapshots is considered too complex. This v2 limits the impact only to snapshot code and no longer changes anything in qemu_saveimage except for exporting one function and one enum. Pavel Hrdina (6): qemu_snapshot: fix reverting external snapshot when not all disks are included qemu_saveimage: export virQEMUSaveFormat enum qemu_saveimage: export qemuSaveImageGetCompressionCommand qemu_snapshot: correctly load the saved memory state file NEWS: document support for reverting external snapshots Revert "capabilities: report full external snapshot support" NEWS.rst | 8 ++ docs/formatcaps.rst | 7 - src/conf/capabilities.c | 1 - src/conf/capabilities.h | 1 - src/conf/schemas/capability.rng | 5 - src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_saveimage.c | 19 +-- src/qemu/qemu_saveimage.h | 20 +++ src/qemu/qemu_snapshot.c | 127 +++++++++++++++--- .../qemucaps2xmloutdata/caps.aarch64+hvf.xml | 1 - tests/qemucaps2xmloutdata/caps.aarch64.xml | 1 - tests/qemucaps2xmloutdata/caps.ppc.xml | 1 - tests/qemucaps2xmloutdata/caps.ppc64.xml | 1 - tests/qemucaps2xmloutdata/caps.riscv64.xml | 1 - tests/qemucaps2xmloutdata/caps.s390x.xml | 1 - tests/qemucaps2xmloutdata/caps.sparc.xml | 1 - tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml | 1 - tests/qemucaps2xmloutdata/caps.x86_64.xml | 1 - 18 files changed, 138 insertions(+), 60 deletions(-) -- 2.41.0

3 15

[libvirt PATCH] docs: remove archived projects from CI dashboard
by Daniel P. Berrangé 01 Sep '23

01 Sep '23

When the projects were archived, their pipelines were all purged, and no new ones will be run. There is no point in continuing to display them on the CI dashboard. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/ci-dashboard.rst | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/docs/ci-dashboard.rst b/docs/ci-dashboard.rst index a7f4e71f96..50f39cd252 100644 --- a/docs/ci-dashboard.rst +++ b/docs/ci-dashboard.rst @@ -87,11 +87,6 @@ Object mappings * - Project - Pipeline - * - libvirt-cim - - .. image:: https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-cim/pipelines - :alt: libvirt-cim pipeline status - * - libvirt-dbus - .. image:: https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg :target: https://gitlab.com/libvirt/libvirt-dbus/pipelines @@ -107,11 +102,6 @@ Object mappings :target: https://gitlab.com/libvirt/libvirt-go-xml-module/pipelines :alt: libvirt-go-xml-module pipeline status - * - libvirt-snmp - - .. image:: https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-snmp/pipelines - :alt: libvirt-snmp pipeline status - Testing ------- @@ -149,16 +139,6 @@ Documentation / websites * - Project - Pipeline - * - libvirt-publican - - .. image:: https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-publican/pipelines - :alt: libvirt-publican pipeline status - - * - libvirt-appdev-guide-python - - .. image:: https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeli… - :target: https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines - :alt: libvirt-appdev-guide-python pipeline status - * - libvirt-wiki - .. image:: https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg :target: https://gitlab.com/libvirt/libvirt-wiki/pipelines @@ -190,26 +170,11 @@ Miscellaneous :target: https://gitlab.com/libvirt/libvirt-console-proxy/pipelines :alt: libvirt-console-proxy pipeline status - * - libvirt-designer - - .. image:: https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-designer/pipelines - :alt: libvirt-designer pipeline status - * - libvirt-devaddr - .. image:: https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg :target: https://gitlab.com/libvirt/libvirt-devaddr/pipelines :alt: libvirt-devaddr pipeline status - * - libvirt-sandbox - - .. image:: https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-sandbox/pipelines - :alt: libvirt-sandbox pipeline status - - * - libvirt-sandbox-image - - .. image:: https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg - :target: https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines - :alt: libvirt-sandbox-image pipeline status - * - libvirt-security-notice - .. image:: https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.s… :target: https://gitlab.com/libvirt/libvirt-security-notice/pipelines -- 2.41.0

2 1

Sunset libvirt-snmp?
by Michal Prívozník 01 Sep '23

01 Sep '23

It's been a while since libvirt-snmp was actively developed. Now it receives only libvirt-ci related commits. The code compiles with net-snmp-5.9.3 but the freshly released net-snmp-5.9.4 [1] breaks compilation [2]. Now, libvirt-snmp has this crazy architecture, where some sources are manually generated from src/LIBVIRT-MIB.txt, then edited (added code to talk to libvirt) and then added to git. This is labor extensive and since I don't think libvirt-snmp is actually used I'd like to sunset it. According to repology [3] only Gentoo (and its clones) has the latest version (released ~5 years ago). And I doubt it has any real users there. Thoughts? 1: https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.4/ 2: https://bugs.gentoo.org/show_bug.cgi?id=912582 2: https://repology.org/project/libvirt-snmp/versions Michal

4 9

[PATCH] virsh: Fix net-desc --config output
by K Shiva Kiran 01 Sep '23

01 Sep '23

Fixes the following bug: Command: `net-desc --config [--title] my_network` Expected Output: Title/Description of persistent config Output: Title/Description of live config This was caused due to the usage of a single `flags` variable in `virshGetNetworkDescription()` which ended up in a wrong enum being passed to `virNetworkGetMetadata()` (enum being that of LIVE instead of CONFIG). Although the domain object has the same code, this didn't cause a problem there because the enum values of `VIR_DOMAIN_INACTIVE_XML` and `VIR_DOMAIN_METADATA_CONFIG` turn out to be the same (1 << 1), whereas they are not for network equivalent ones (1 << 0, 1 << 1). Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> --- tools/virsh-network.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 49778d0f4f..8965d87c9c 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -366,7 +366,8 @@ static const vshCmdOptDef opts_network_desc[] = { /* extract description or title from network xml */ static char * virshGetNetworkDescription(vshControl *ctl, virNetworkPtr net, - bool title, unsigned int flags) + bool title, unsigned int flags, + unsigned int queryflags) { char *desc = NULL; g_autoptr(xmlDoc) doc = NULL; @@ -394,7 +395,7 @@ virshGetNetworkDescription(vshControl *ctl, virNetworkPtr net, } /* fall back to xml */ - if (virshNetworkGetXMLFromNet(ctl, net, flags, &doc, &ctxt) < 0) + if (virshNetworkGetXMLFromNet(ctl, net, queryflags, &doc, &ctxt) < 0) return NULL; if (title) @@ -454,7 +455,7 @@ cmdNetworkDesc(vshControl *ctl, const vshCmd *cmd) g_autofree char *descNet = NULL; g_autofree char *descNew = NULL; - if (!(descNet = virshGetNetworkDescription(ctl, net, title, queryflags))) + if (!(descNet = virshGetNetworkDescription(ctl, net, title, flags, queryflags))) return false; if (!descArg) @@ -515,7 +516,7 @@ cmdNetworkDesc(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, "%s", _("Network description updated successfully")); } else { - g_autofree char *desc = virshGetNetworkDescription(ctl, net, title, queryflags); + g_autofree char *desc = virshGetNetworkDescription(ctl, net, title, flags, queryflags); if (!desc) return false; @@ -1128,7 +1129,7 @@ cmdNetworkList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) if (optTitle) { g_autofree char *title = NULL; - if (!(title = virshGetNetworkDescription(ctl, network, true, 0))) + if (!(title = virshGetNetworkDescription(ctl, network, true, 0, 0))) goto cleanup; if (vshTableRowAppend(table, virNetworkGetName(network), -- 2.42.0

2 1

[libvirt PATCH 0/7] external snapshot revert fixes
by Pavel Hrdina 01 Sep '23

01 Sep '23

This fixes reverting external snapshots to not error out in cases where it should work and makes it correctly load the memory state when reverting to snapshot of running VM. Pavel Hrdina (7): qemu_saveimage: extract starting process to qemuSaveImageStartProcess qemuSaveImageStartProcess: allow setting reason for audit log qemuSaveImageStartProcess: add snapshot argument qemuSaveImageStartProcess: make it possible to use without header qemu_snapshot: fix reverting external snapshot when not all disks are included qemu_snapshot: correctly load the saved memory state file NEWS: document support for reverting external snapshots NEWS.rst | 8 +++ src/qemu/qemu_saveimage.c | 111 ++++++++++++++++++++++++++------------ src/qemu/qemu_saveimage.h | 14 +++++ src/qemu/qemu_snapshot.c | 90 ++++++++++++++++++++----------- 4 files changed, 158 insertions(+), 65 deletions(-) -- 2.41.0

2 18

Entering freeze for libvirt-9.7.0
by Jiri Denemark 31 Aug '23

31 Aug '23

I have just tagged v9.7.0-rc1 in the repository and pushed signed tarballs and source RPMs to https://download.libvirt.org/ Please give the release candidate some testing and in case you find a serious issue which should have a fix in the upcoming release, feel free to reply to this thread to make sure the issue is more visible. If you have not done so yet, please update NEWS.rst to document any significant change you made since the last release. Thanks, Jirka

2 2

[PATCH v2] accel: Remove HAX accelerator
by Philippe Mathieu-Daudé 31 Aug '23

31 Aug '23

HAX is deprecated since commits 73741fda6c ("MAINTAINERS: Abort HAXM maintenance") and 90c167a1da ("docs/about/deprecated: Mark HAXM in QEMU as deprecated"), released in v8.0.0. Per the latest HAXM release (v7.8 [*]), the latest QEMU supported is v7.2: Note: Up to this release, HAXM supports QEMU from 2.9.0 to 7.2.0. The next commit (https://github.com/intel/haxm/commit/da1b8ec072) added: HAXM v7.8.0 is our last release and we will not accept pull requests or respond to issues after this. It became very hard to build and test HAXM. Its previous maintainers made it clear they won't help. It doesn't seem to be a very good use of QEMU maintainers to spend their time in a dead project. Save our time by removing this orphan zombie code. [*] https://github.com/intel/haxm/releases/tag/v7.8.0 Reviewed-by: Richard Henderson <richard.henderson(a)linaro.org> Acked-by: Markus Armbruster <armbru(a)redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- I plan to commit this in my next PR. --- MAINTAINERS | 8 - docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 6 - docs/about/index.rst | 2 +- docs/about/removed-features.rst | 11 +- docs/system/index.rst | 2 +- docs/system/introduction.rst | 3 - meson.build | 7 - include/exec/poison.h | 1 - include/hw/core/cpu.h | 2 +- include/sysemu/hax.h | 49 - include/sysemu/hw_accel.h | 1 - target/i386/hax/hax-accel-ops.h | 31 - target/i386/hax/hax-i386.h | 98 -- target/i386/hax/hax-interface.h | 369 ------ target/i386/hax/hax-posix.h | 61 - target/i386/hax/hax-windows.h | 88 -- accel/stubs/hax-stub.c | 24 - hw/intc/apic_common.c | 3 +- softmmu/cpus.c | 6 - softmmu/vl.c | 6 - target/i386/hax/hax-accel-ops.c | 105 -- target/i386/hax/hax-all.c | 1141 ----------------- target/i386/hax/hax-mem.c | 323 ----- target/i386/hax/hax-posix.c | 305 ----- target/i386/hax/hax-windows.c | 485 ------- accel/Kconfig | 3 - accel/stubs/meson.build | 1 - meson_options.txt | 2 - qemu-options.hx | 8 +- .../ci/org.centos/stream/8/x86_64/configure | 1 - scripts/meson-buildoptions.sh | 3 - target/i386/hax/meson.build | 7 - target/i386/meson.build | 1 - 34 files changed, 16 insertions(+), 3149 deletions(-) delete mode 100644 include/sysemu/hax.h delete mode 100644 target/i386/hax/hax-accel-ops.h delete mode 100644 target/i386/hax/hax-i386.h delete mode 100644 target/i386/hax/hax-interface.h delete mode 100644 target/i386/hax/hax-posix.h delete mode 100644 target/i386/hax/hax-windows.h delete mode 100644 accel/stubs/hax-stub.c delete mode 100644 target/i386/hax/hax-accel-ops.c delete mode 100644 target/i386/hax/hax-all.c delete mode 100644 target/i386/hax/hax-mem.c delete mode 100644 target/i386/hax/hax-posix.c delete mode 100644 target/i386/hax/hax-windows.c delete mode 100644 target/i386/hax/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 6111b6b4d9..3b29568ed4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -543,14 +543,6 @@ F: include/sysemu/xen.h F: include/sysemu/xen-mapcache.h F: stubs/xen-hw-stub.c -Guest CPU Cores (HAXM) ---------------------- -X86 HAXM CPUs -S: Orphan -F: accel/stubs/hax-stub.c -F: include/sysemu/hax.h -F: target/i386/hax/ - Guest CPU Cores (NVMM) ---------------------- NetBSD Virtual Machine Monitor (NVMM) CPU support diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 0e2cb9e770..f2a7aec56f 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -52,7 +52,7 @@ Those hosts are officially supported, with various accelerators: * - SPARC - tcg * - x86 - - hax, hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen + - hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen Other host architectures are not supported. It is possible to build QEMU system emulation on an unsupported host architecture using the configure diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 92a2bafd2b..dc4da95329 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -105,12 +105,6 @@ Use ``-machine hpet=off`` instead. The ``-no-acpi`` setting has been turned into a machine property. Use ``-machine acpi=off`` instead. -``-accel hax`` (since 8.0) -'''''''''''''''''''''''''' - -The HAXM project has been retired (see https://github.com/intel/haxm#status) -Use "whpx" (on Windows) or "hvf" (on macOS) instead. - ``-async-teardown`` (since 8.1) ''''''''''''''''''''''''''''''' diff --git a/docs/about/index.rst b/docs/about/index.rst index b00b584b31..4f96ab5d91 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -8,7 +8,7 @@ QEMU can be used in several different ways. The most common is for :ref:`System Emulation`, where it provides a virtual model of an entire machine (CPU, memory and emulated devices) to run a guest OS. In this mode the CPU may be fully emulated, or it may work with a -hypervisor such as KVM, Xen, Hax or Hypervisor.Framework to allow the +hypervisor such as KVM, Xen or Hypervisor.Framework to allow the guest to run directly on the host CPU. The second supported way to use QEMU is :ref:`User Mode Emulation`, diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 5b258b446b..c2043fd415 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -659,15 +659,18 @@ Use ``Icelake-Server`` instead. System accelerators ------------------- -Userspace local APIC with KVM (x86, removed 8.0) -'''''''''''''''''''''''''''''''''''''''''''''''' +Userspace local APIC with KVM (x86, removed in 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''' ``-M kernel-irqchip=off`` cannot be used on KVM if the CPU model includes a local APIC. The ``split`` setting is supported, as is using ``-M kernel-irqchip=off`` when the CPU does not have a local APIC. -System accelerators -------------------- +HAXM (``-accel hax``) (removed in 8.2) +'''''''''''''''''''''''''''''''''''''' + +The HAXM project has been retired (see https://github.com/intel/haxm#status) +Use "whpx" (on Windows) or "hvf" (on macOS) instead. MIPS "Trap-and-Emulate" KVM support (removed in 8.0) '''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/system/index.rst b/docs/system/index.rst index 3605bbe1ce..45bf1f19e7 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -6,7 +6,7 @@ System Emulation This section of the manual is the overall guide for users using QEMU for full system emulation (as opposed to user-mode emulation). -This includes working with hypervisors such as KVM, Xen, Hax +This includes working with hypervisors such as KVM, Xen or Hypervisor.Framework. .. toctree:: diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst index 3e256f8326..51ac132d6c 100644 --- a/docs/system/introduction.rst +++ b/docs/system/introduction.rst @@ -21,9 +21,6 @@ Tiny Code Generator (TCG) capable of emulating many CPUs. * - Xen - Linux (as dom0) - Arm, x86 - * - Intel HAXM (hax) - - Linux, Windows - - x86 * - Hypervisor Framework (hvf) - MacOS - x86 (64 bit only), Arm (64 bit only) diff --git a/meson.build b/meson.build index 98e68ef0b1..ec14079c67 100644 --- a/meson.build +++ b/meson.build @@ -140,7 +140,6 @@ if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] endif if cpu in ['x86', 'x86_64'] accelerator_targets += { - 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_NVMM': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], @@ -663,11 +662,6 @@ if get_option('hvf').allowed() accelerators += 'CONFIG_HVF' endif endif -if get_option('hax').allowed() - if get_option('hax').enabled() or targetos in ['windows', 'darwin', 'netbsd'] - accelerators += 'CONFIG_HAX' - endif -endif if targetos == 'netbsd' nvmm = cc.find_library('nvmm', required: get_option('nvmm')) if nvmm.found() @@ -4140,7 +4134,6 @@ endif summary_info = {} if have_system summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')} - summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')} summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')} summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')} summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')} diff --git a/include/exec/poison.h b/include/exec/poison.h index e94ee8dfef..1ea5633eb3 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -81,7 +81,6 @@ #pragma GCC poison CONFIG_SPARC_DIS #pragma GCC poison CONFIG_XTENSA_DIS -#pragma GCC poison CONFIG_HAX #pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index fdcbe87352..92a4234439 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -422,7 +422,7 @@ struct CPUState { int32_t exception_index; AccelCPUState *accel; - /* shared by kvm, hax and hvf */ + /* shared by kvm and hvf */ bool vcpu_dirty; /* Used to keep track of an outstanding cpu throttle thread for migration diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h deleted file mode 100644 index 80fc716f80..0000000000 --- a/include/sysemu/hax.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright IBM, Corp. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * Copyright 2016 Google, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* header to be included in non-HAX-specific code */ - -#ifndef QEMU_HAX_H -#define QEMU_HAX_H - -int hax_sync_vcpus(void); - -#ifdef NEED_CPU_H -# ifdef CONFIG_HAX -# define CONFIG_HAX_IS_POSSIBLE -# endif -#else /* !NEED_CPU_H */ -# define CONFIG_HAX_IS_POSSIBLE -#endif - -#ifdef CONFIG_HAX_IS_POSSIBLE - -extern bool hax_allowed; - -#define hax_enabled() (hax_allowed) - -#else /* !CONFIG_HAX_IS_POSSIBLE */ - -#define hax_enabled() (0) - -#endif /* CONFIG_HAX_IS_POSSIBLE */ - -#endif /* QEMU_HAX_H */ diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h index 22903a55f7..c71b77e71f 100644 --- a/include/sysemu/hw_accel.h +++ b/include/sysemu/hw_accel.h @@ -12,7 +12,6 @@ #define QEMU_HW_ACCEL_H #include "hw/core/cpu.h" -#include "sysemu/hax.h" #include "sysemu/kvm.h" #include "sysemu/hvf.h" #include "sysemu/whpx.h" diff --git a/target/i386/hax/hax-accel-ops.h b/target/i386/hax/hax-accel-ops.h deleted file mode 100644 index 9e357e7b40..0000000000 --- a/target/i386/hax/hax-accel-ops.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Accelerator CPUS Interface - * - * Copyright 2020 SUSE LLC - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef TARGET_I386_HAX_ACCEL_OPS_H -#define TARGET_I386_HAX_ACCEL_OPS_H - -#include "sysemu/cpus.h" - -#include "hax-interface.h" -#include "hax-i386.h" - -int hax_init_vcpu(CPUState *cpu); -int hax_smp_cpu_exec(CPUState *cpu); -int hax_populate_ram(uint64_t va, uint64_t size); - -void hax_cpu_synchronize_state(CPUState *cpu); -void hax_cpu_synchronize_post_reset(CPUState *cpu); -void hax_cpu_synchronize_post_init(CPUState *cpu); -void hax_cpu_synchronize_pre_loadvm(CPUState *cpu); - -int hax_vcpu_destroy(CPUState *cpu); -void hax_raise_event(CPUState *cpu); -void hax_reset_vcpu_state(void *opaque); - -#endif /* TARGET_I386_HAX_ACCEL_OPS_H */ diff --git a/target/i386/hax/hax-i386.h b/target/i386/hax/hax-i386.h deleted file mode 100644 index 87153f40ab..0000000000 --- a/target/i386/hax/hax-i386.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef HAX_I386_H -#define HAX_I386_H - -#include "cpu.h" -#include "sysemu/hax.h" - -#ifdef CONFIG_POSIX -typedef int hax_fd; -#endif - -#ifdef CONFIG_WIN32 -typedef HANDLE hax_fd; -#endif - -extern struct hax_state hax_global; - -struct AccelCPUState { -#ifdef _WIN32 - HANDLE hThread; -#endif - hax_fd fd; - int vcpu_id; - struct hax_tunnel *tunnel; - unsigned char *iobuf; -}; - -struct hax_state { - hax_fd fd; /* the global hax device interface */ - uint32_t version; - struct hax_vm *vm; - uint64_t mem_quota; - bool supports_64bit_ramblock; -}; - -#define HAX_MAX_VCPU 0x10 - -struct hax_vm { - hax_fd fd; - int id; - int numvcpus; - AccelCPUState **vcpus; -}; - -/* Functions exported to host specific mode */ -hax_fd hax_vcpu_get_fd(CPUArchState *env); -int valid_hax_tunnel_size(uint16_t size); - -/* Host specific functions */ -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version); -int hax_inject_interrupt(CPUArchState *env, int vector); -struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus); -int hax_vcpu_run(AccelCPUState *vcpu); -int hax_vcpu_create(int id); -void hax_kick_vcpu_thread(CPUState *cpu); - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, - int set); -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set); -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set); - -int hax_vm_destroy(struct hax_vm *vm); -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap); -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion); -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags); - -/* Common host function */ -int hax_host_create_vm(struct hax_state *hax, int *vm_id); -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id); -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid); -hax_fd hax_host_open_vcpu(int vmid, int vcpuid); -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu); -hax_fd hax_mod_open(void); -void hax_memory_init(void); - - -#ifdef CONFIG_POSIX -#include "hax-posix.h" -#endif - -#ifdef CONFIG_WIN32 -#include "hax-windows.h" -#endif - -#include "hax-interface.h" - -#endif diff --git a/target/i386/hax/hax-interface.h b/target/i386/hax/hax-interface.h deleted file mode 100644 index 537ae084e9..0000000000 --- a/target/i386/hax/hax-interface.h +++ /dev/null @@ -1,369 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* Interface with HAX kernel module */ - -#ifndef HAX_INTERFACE_H -#define HAX_INTERFACE_H - -/* fx_layout has 3 formats table 3-56, 512bytes */ -struct fx_layout { - uint16_t fcw; - uint16_t fsw; - uint8_t ftw; - uint8_t res1; - uint16_t fop; - union { - struct { - uint32_t fip; - uint16_t fcs; - uint16_t res2; - }; - uint64_t fpu_ip; - }; - union { - struct { - uint32_t fdp; - uint16_t fds; - uint16_t res3; - }; - uint64_t fpu_dp; - }; - uint32_t mxcsr; - uint32_t mxcsr_mask; - uint8_t st_mm[8][16]; - uint8_t mmx_1[8][16]; - uint8_t mmx_2[8][16]; - uint8_t pad[96]; -} __attribute__ ((aligned(8))); - -struct vmx_msr { - uint64_t entry; - uint64_t value; -} __attribute__ ((__packed__)); - -/* - * Fixed array is not good, but it makes Mac support a bit easier by avoiding - * memory map or copyin staff. - */ -#define HAX_MAX_MSR_ARRAY 0x20 -struct hax_msr_data { - uint16_t nr_msr; - uint16_t done; - uint16_t pad[2]; - struct vmx_msr entries[HAX_MAX_MSR_ARRAY]; -} __attribute__ ((__packed__)); - -union interruptibility_state_t { - uint32_t raw; - struct { - uint32_t sti_blocking:1; - uint32_t movss_blocking:1; - uint32_t smi_blocking:1; - uint32_t nmi_blocking:1; - uint32_t reserved:28; - }; - uint64_t pad; -}; - -typedef union interruptibility_state_t interruptibility_state_t; - -/* Segment descriptor */ -struct segment_desc_t { - uint16_t selector; - uint16_t _dummy; - uint32_t limit; - uint64_t base; - union { - struct { - uint32_t type:4; - uint32_t desc:1; - uint32_t dpl:2; - uint32_t present:1; - uint32_t:4; - uint32_t available:1; - uint32_t long_mode:1; - uint32_t operand_size:1; - uint32_t granularity:1; - uint32_t null:1; - uint32_t:15; - }; - uint32_t ar; - }; - uint32_t ipad; -}; - -typedef struct segment_desc_t segment_desc_t; - -struct vcpu_state_t { - union { - uint64_t _regs[16]; - struct { - union { - struct { - uint8_t _al, _ah; - }; - uint16_t _ax; - uint32_t _eax; - uint64_t _rax; - }; - union { - struct { - uint8_t _cl, _ch; - }; - uint16_t _cx; - uint32_t _ecx; - uint64_t _rcx; - }; - union { - struct { - uint8_t _dl, _dh; - }; - uint16_t _dx; - uint32_t _edx; - uint64_t _rdx; - }; - union { - struct { - uint8_t _bl, _bh; - }; - uint16_t _bx; - uint32_t _ebx; - uint64_t _rbx; - }; - union { - uint16_t _sp; - uint32_t _esp; - uint64_t _rsp; - }; - union { - uint16_t _bp; - uint32_t _ebp; - uint64_t _rbp; - }; - union { - uint16_t _si; - uint32_t _esi; - uint64_t _rsi; - }; - union { - uint16_t _di; - uint32_t _edi; - uint64_t _rdi; - }; - - uint64_t _r8; - uint64_t _r9; - uint64_t _r10; - uint64_t _r11; - uint64_t _r12; - uint64_t _r13; - uint64_t _r14; - uint64_t _r15; - }; - }; - - union { - uint32_t _eip; - uint64_t _rip; - }; - - union { - uint32_t _eflags; - uint64_t _rflags; - }; - - segment_desc_t _cs; - segment_desc_t _ss; - segment_desc_t _ds; - segment_desc_t _es; - segment_desc_t _fs; - segment_desc_t _gs; - segment_desc_t _ldt; - segment_desc_t _tr; - - segment_desc_t _gdt; - segment_desc_t _idt; - - uint64_t _cr0; - uint64_t _cr2; - uint64_t _cr3; - uint64_t _cr4; - - uint64_t _dr0; - uint64_t _dr1; - uint64_t _dr2; - uint64_t _dr3; - uint64_t _dr6; - uint64_t _dr7; - uint64_t _pde; - - uint32_t _efer; - - uint32_t _sysenter_cs; - uint64_t _sysenter_eip; - uint64_t _sysenter_esp; - - uint32_t _activity_state; - uint32_t pad; - interruptibility_state_t _interruptibility_state; -}; - -/* HAX exit status */ -enum exit_status { - /* IO port request */ - HAX_EXIT_IO = 1, - /* MMIO instruction emulation */ - HAX_EXIT_MMIO, - /* QEMU emulation mode request, currently means guest enter non-PG mode */ - HAX_EXIT_REAL, - /* - * Interrupt window open, qemu can inject interrupt now - * Also used when signal pending since at that time qemu usually need - * check interrupt - */ - HAX_EXIT_INTERRUPT, - /* Unknown vmexit, mostly trigger reboot */ - HAX_EXIT_UNKNOWN_VMEXIT, - /* HALT from guest */ - HAX_EXIT_HLT, - /* Reboot request, like because of tripple fault in guest */ - HAX_EXIT_STATECHANGE, - /* the vcpu is now only paused when destroy, so simply return to hax */ - HAX_EXIT_PAUSED, - HAX_EXIT_FAST_MMIO, -}; - -/* - * The interface definition: - * 1. vcpu_run execute will return 0 on success, otherwise mean failed - * 2. exit_status return the exit reason, as stated in enum exit_status - * 3. exit_reason is the vmx exit reason - */ -struct hax_tunnel { - uint32_t _exit_reason; - uint32_t _exit_flag; - uint32_t _exit_status; - uint32_t user_event_pending; - int ready_for_interrupt_injection; - int request_interrupt_window; - union { - struct { - /* 0: read, 1: write */ -#define HAX_EXIT_IO_IN 1 -#define HAX_EXIT_IO_OUT 0 - uint8_t _direction; - uint8_t _df; - uint16_t _size; - uint16_t _port; - uint16_t _count; - uint8_t _flags; - uint8_t _pad0; - uint16_t _pad1; - uint32_t _pad2; - uint64_t _vaddr; - } pio; - struct { - uint64_t gla; - } mmio; - struct { - } state; - }; -} __attribute__ ((__packed__)); - -struct hax_module_version { - uint32_t compat_version; - uint32_t cur_version; -} __attribute__ ((__packed__)); - -/* This interface is support only after API version 2 */ -struct hax_qemu_version { - /* Current API version in QEMU */ - uint32_t cur_version; - /* The minimum API version supported by QEMU */ - uint32_t min_version; -} __attribute__ ((__packed__)); - -/* The mac specfic interface to qemu, mostly is ioctl related */ -struct hax_tunnel_info { - uint64_t va; - uint64_t io_va; - uint16_t size; - uint16_t pad[3]; -} __attribute__ ((__packed__)); - -struct hax_alloc_ram_info { - uint32_t size; - uint32_t pad; - uint64_t va; -} __attribute__ ((__packed__)); - -struct hax_ramblock_info { - uint64_t start_va; - uint64_t size; - uint64_t reserved; -} __attribute__ ((__packed__)); - -#define HAX_RAM_INFO_ROM 0x01 /* Read-Only */ -#define HAX_RAM_INFO_INVALID 0x80 /* Unmapped, usually used for MMIO */ -struct hax_set_ram_info { - uint64_t pa_start; - uint32_t size; - uint8_t flags; - uint8_t pad[3]; - uint64_t va; -} __attribute__ ((__packed__)); - -#define HAX_CAP_STATUS_WORKING 0x1 -#define HAX_CAP_STATUS_NOTWORKING 0x0 -#define HAX_CAP_WORKSTATUS_MASK 0x1 - -#define HAX_CAP_FAILREASON_VT 0x1 -#define HAX_CAP_FAILREASON_NX 0x2 - -#define HAX_CAP_MEMQUOTA 0x2 -#define HAX_CAP_UG 0x4 -#define HAX_CAP_64BIT_RAMBLOCK 0x8 - -struct hax_capabilityinfo { - /* bit 0: 1 - working - * 0 - not working, possibly because NT/NX disabled - * bit 1: 1 - memory limitation working - * 0 - no memory limitation - */ - uint16_t wstatus; - /* valid when not working - * bit 0: VT not enabeld - * bit 1: NX not enabled*/ - uint16_t winfo; - uint32_t pad; - uint64_t mem_quota; -} __attribute__ ((__packed__)); - -struct hax_fastmmio { - uint64_t gpa; - union { - uint64_t value; - uint64_t gpa2; /* since HAX API v4 */ - }; - uint8_t size; - uint8_t direction; - uint16_t reg_index; - uint32_t pad0; - uint64_t _cr0; - uint64_t _cr2; - uint64_t _cr3; - uint64_t _cr4; -} __attribute__ ((__packed__)); -#endif diff --git a/target/i386/hax/hax-posix.h b/target/i386/hax/hax-posix.h deleted file mode 100644 index fb7c64426d..0000000000 --- a/target/i386/hax/hax-posix.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef TARGET_I386_HAX_POSIX_H -#define TARGET_I386_HAX_POSIX_H - -#include <sys/ioctl.h> - -#define HAX_INVALID_FD (-1) -static inline int hax_invalid_fd(hax_fd fd) -{ - return fd <= 0; -} - -static inline void hax_mod_close(struct hax_state *hax) -{ - close(hax->fd); -} - -static inline void hax_close_fd(hax_fd fd) -{ - close(fd); -} - -/* HAX model level ioctl */ -#define HAX_IOCTL_VERSION _IOWR(0, 0x20, struct hax_module_version) -#define HAX_IOCTL_CREATE_VM _IOWR(0, 0x21, uint32_t) -#define HAX_IOCTL_DESTROY_VM _IOW(0, 0x22, uint32_t) -#define HAX_IOCTL_CAPABILITY _IOR(0, 0x23, struct hax_capabilityinfo) - -#define HAX_VM_IOCTL_VCPU_CREATE _IOWR(0, 0x80, uint32_t) -#define HAX_VM_IOCTL_ALLOC_RAM _IOWR(0, 0x81, struct hax_alloc_ram_info) -#define HAX_VM_IOCTL_SET_RAM _IOWR(0, 0x82, struct hax_set_ram_info) -#define HAX_VM_IOCTL_VCPU_DESTROY _IOW(0, 0x83, uint32_t) -#define HAX_VM_IOCTL_NOTIFY_QEMU_VERSION _IOW(0, 0x84, struct hax_qemu_version) -#define HAX_VM_IOCTL_ADD_RAMBLOCK _IOW(0, 0x85, struct hax_ramblock_info) - -#define HAX_VCPU_IOCTL_RUN _IO(0, 0xc0) -#define HAX_VCPU_IOCTL_SET_MSRS _IOWR(0, 0xc1, struct hax_msr_data) -#define HAX_VCPU_IOCTL_GET_MSRS _IOWR(0, 0xc2, struct hax_msr_data) - -#define HAX_VCPU_IOCTL_SET_FPU _IOW(0, 0xc3, struct fx_layout) -#define HAX_VCPU_IOCTL_GET_FPU _IOR(0, 0xc4, struct fx_layout) - -#define HAX_VCPU_IOCTL_SETUP_TUNNEL _IOWR(0, 0xc5, struct hax_tunnel_info) -#define HAX_VCPU_IOCTL_INTERRUPT _IOWR(0, 0xc6, uint32_t) -#define HAX_VCPU_SET_REGS _IOWR(0, 0xc7, struct vcpu_state_t) -#define HAX_VCPU_GET_REGS _IOWR(0, 0xc8, struct vcpu_state_t) - -#endif /* TARGET_I386_HAX_POSIX_H */ diff --git a/target/i386/hax/hax-windows.h b/target/i386/hax/hax-windows.h deleted file mode 100644 index b1f5d4f32f..0000000000 --- a/target/i386/hax/hax-windows.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright IBM, Corp. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef TARGET_I386_HAX_WINDOWS_H -#define TARGET_I386_HAX_WINDOWS_H - -#include <winioctl.h> -#include <windef.h> - -#include "hax-accel-ops.h" - -#define HAX_INVALID_FD INVALID_HANDLE_VALUE - -static inline void hax_mod_close(struct hax_state *hax) -{ - CloseHandle(hax->fd); -} - -static inline void hax_close_fd(hax_fd fd) -{ - CloseHandle(fd); -} - -static inline int hax_invalid_fd(hax_fd fd) -{ - return (fd == INVALID_HANDLE_VALUE); -} - -#define HAX_DEVICE_TYPE 0x4000 - -#define HAX_IOCTL_VERSION CTL_CODE(HAX_DEVICE_TYPE, 0x900, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_IOCTL_CREATE_VM CTL_CODE(HAX_DEVICE_TYPE, 0x901, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_IOCTL_CAPABILITY CTL_CODE(HAX_DEVICE_TYPE, 0x910, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VM_IOCTL_VCPU_CREATE CTL_CODE(HAX_DEVICE_TYPE, 0x902, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_ALLOC_RAM CTL_CODE(HAX_DEVICE_TYPE, 0x903, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_SET_RAM CTL_CODE(HAX_DEVICE_TYPE, 0x904, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_VCPU_DESTROY CTL_CODE(HAX_DEVICE_TYPE, 0x905, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_ADD_RAMBLOCK CTL_CODE(HAX_DEVICE_TYPE, 0x913, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VCPU_IOCTL_RUN CTL_CODE(HAX_DEVICE_TYPE, 0x906, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_SET_MSRS CTL_CODE(HAX_DEVICE_TYPE, 0x907, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_GET_MSRS CTL_CODE(HAX_DEVICE_TYPE, 0x908, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_SET_FPU CTL_CODE(HAX_DEVICE_TYPE, 0x909, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_GET_FPU CTL_CODE(HAX_DEVICE_TYPE, 0x90a, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VCPU_IOCTL_SETUP_TUNNEL CTL_CODE(HAX_DEVICE_TYPE, 0x90b, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_INTERRUPT CTL_CODE(HAX_DEVICE_TYPE, 0x90c, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_SET_REGS CTL_CODE(HAX_DEVICE_TYPE, 0x90d, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_GET_REGS CTL_CODE(HAX_DEVICE_TYPE, 0x90e, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VM_IOCTL_NOTIFY_QEMU_VERSION CTL_CODE(HAX_DEVICE_TYPE, 0x910, \ - METHOD_BUFFERED, \ - FILE_ANY_ACCESS) -#endif /* TARGET_I386_HAX_WINDOWS_H */ diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c deleted file mode 100644 index 2fe31aaa9a..0000000000 --- a/accel/stubs/hax-stub.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2015, Intel Corporation - * - * Copyright 2016 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "sysemu/hax.h" - -bool hax_allowed; - -int hax_sync_vcpus(void) -{ - return 0; -} diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 4a34f03047..68ad30e2f5 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -28,7 +28,6 @@ #include "hw/intc/kvm_irqcount.h" #include "trace.h" #include "hw/boards.h" -#include "sysemu/hax.h" #include "sysemu/kvm.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" @@ -271,7 +270,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp) /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && - !hax_enabled() && current_machine->ram_size >= 1024 * 1024) { + current_machine->ram_size >= 1024 * 1024) { vapic = sysbus_create_simple("kvmvapic", -1, NULL); } s->vapic = vapic; diff --git a/softmmu/cpus.c b/softmmu/cpus.c index fed20ffb5d..0848e0dbdb 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -427,12 +427,6 @@ void qemu_wait_io_event(CPUState *cpu) qemu_plugin_vcpu_resume_cb(cpu); } -#ifdef _WIN32 - /* Eat dummy APC queued by cpus_kick_thread. */ - if (hax_enabled()) { - SleepEx(0, TRUE); - } -#endif qemu_wait_io_event_common(cpu); } diff --git a/softmmu/vl.c b/softmmu/vl.c index b0b96f67fa..5a10b3c309 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -86,7 +86,6 @@ #include "migration/colo.h" #include "migration/postcopy-ram.h" #include "sysemu/kvm.h" -#include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" #include "qemu/option.h" #include "qemu/config-file.h" @@ -2546,11 +2545,6 @@ static void qemu_init_board(void) drive_check_orphaned(); realtime_init(); - - if (hax_enabled()) { - /* FIXME: why isn't cpu_synchronize_all_post_init enough? */ - hax_sync_vcpus(); - } } static void qemu_create_cli_devices(void) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-ops.c deleted file mode 100644 index 5031096760..0000000000 --- a/target/i386/hax/hax-accel-ops.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * QEMU HAX support - * - * Copyright IBM, Corp. 2008 - * Red Hat, Inc. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * Glauber Costa <gcosta(a)redhat.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qemu/main-loop.h" -#include "sysemu/runstate.h" -#include "sysemu/cpus.h" -#include "qemu/guest-random.h" - -#include "hax-accel-ops.h" - -static void *hax_cpu_thread_fn(void *arg) -{ - CPUState *cpu = arg; - int r; - - rcu_register_thread(); - qemu_mutex_lock_iothread(); - qemu_thread_get_self(cpu->thread); - - cpu->thread_id = qemu_get_thread_id(); - current_cpu = cpu; - hax_init_vcpu(cpu); - cpu_thread_signal_created(cpu); - qemu_guest_random_seed_thread_part2(cpu->random_seed); - - do { - if (cpu_can_run(cpu)) { - r = hax_smp_cpu_exec(cpu); - if (r == EXCP_DEBUG) { - cpu_handle_guest_debug(cpu); - } - } - - qemu_wait_io_event(cpu); - } while (!cpu->unplug || cpu_can_run(cpu)); - hax_vcpu_destroy(cpu); - cpu_thread_signal_destroyed(cpu); - rcu_unregister_thread(); - return NULL; -} - -static void hax_start_vcpu_thread(CPUState *cpu) -{ - char thread_name[VCPU_THREAD_NAME_SIZE]; - - cpu->thread = g_new0(QemuThread, 1); - cpu->halt_cond = g_new0(QemuCond, 1); - qemu_cond_init(cpu->halt_cond); - - snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX", - cpu->cpu_index); - qemu_thread_create(cpu->thread, thread_name, hax_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); - assert(cpu->accel); -#ifdef _WIN32 - cpu->accel->hThread = qemu_thread_get_handle(cpu->thread); -#endif -} - -static void hax_accel_ops_class_init(ObjectClass *oc, void *data) -{ - AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); - - ops->create_vcpu_thread = hax_start_vcpu_thread; - ops->kick_vcpu_thread = hax_kick_vcpu_thread; - - ops->synchronize_post_reset = hax_cpu_synchronize_post_reset; - ops->synchronize_post_init = hax_cpu_synchronize_post_init; - ops->synchronize_state = hax_cpu_synchronize_state; - ops->synchronize_pre_loadvm = hax_cpu_synchronize_pre_loadvm; -} - -static const TypeInfo hax_accel_ops_type = { - .name = ACCEL_OPS_NAME("hax"), - - .parent = TYPE_ACCEL_OPS, - .class_init = hax_accel_ops_class_init, - .abstract = true, -}; - -static void hax_accel_ops_register_types(void) -{ - type_register_static(&hax_accel_ops_type); -} -type_init(hax_accel_ops_register_types); diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c deleted file mode 100644 index 18d78e5b6b..0000000000 --- a/target/i386/hax/hax-all.c +++ /dev/null @@ -1,1141 +0,0 @@ -/* - * QEMU HAX support - * - * Copyright IBM, Corp. 2008 - * Red Hat, Inc. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * Glauber Costa <gcosta(a)redhat.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* - * HAX common code for both windows and darwin - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/address-spaces.h" - -#include "qemu/accel.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "hw/boards.h" - -#include "hax-accel-ops.h" - -#define DEBUG_HAX 0 - -#define DPRINTF(fmt, ...) \ - do { \ - if (DEBUG_HAX) { \ - fprintf(stdout, fmt, ## __VA_ARGS__); \ - } \ - } while (0) - -/* Current version */ -const uint32_t hax_cur_version = 0x4; /* API v4: unmapping and MMIO moves */ -/* Minimum HAX kernel version */ -const uint32_t hax_min_version = 0x4; /* API v4: supports unmapping */ - -bool hax_allowed; - -struct hax_state hax_global; - -static void hax_vcpu_sync_state(CPUArchState *env, int modified); -static int hax_arch_get_registers(CPUArchState *env); - -int valid_hax_tunnel_size(uint16_t size) -{ - return size >= sizeof(struct hax_tunnel); -} - -hax_fd hax_vcpu_get_fd(CPUArchState *env) -{ - AccelCPUState *vcpu = env_cpu(env)->accel; - if (!vcpu) { - return HAX_INVALID_FD; - } - return vcpu->fd; -} - -static int hax_get_capability(struct hax_state *hax) -{ - int ret; - struct hax_capabilityinfo capinfo, *cap = &capinfo; - - ret = hax_capability(hax, cap); - if (ret) { - return ret; - } - - if ((cap->wstatus & HAX_CAP_WORKSTATUS_MASK) == HAX_CAP_STATUS_NOTWORKING) { - if (cap->winfo & HAX_CAP_FAILREASON_VT) { - DPRINTF - ("VTX feature is not enabled, HAX driver will not work.\n"); - } else if (cap->winfo & HAX_CAP_FAILREASON_NX) { - DPRINTF - ("NX feature is not enabled, HAX driver will not work.\n"); - } - return -ENXIO; - - } - - if (!(cap->winfo & HAX_CAP_UG)) { - fprintf(stderr, "UG mode is not supported by the hardware.\n"); - return -ENOTSUP; - } - - hax->supports_64bit_ramblock = !!(cap->winfo & HAX_CAP_64BIT_RAMBLOCK); - - if (cap->wstatus & HAX_CAP_MEMQUOTA) { - if (cap->mem_quota < hax->mem_quota) { - fprintf(stderr, "The VM memory needed exceeds the driver limit.\n"); - return -ENOSPC; - } - } - return 0; -} - -static int hax_version_support(struct hax_state *hax) -{ - int ret; - struct hax_module_version version; - - ret = hax_mod_version(hax, &version); - if (ret < 0) { - return 0; - } - - if (hax_min_version > version.cur_version) { - fprintf(stderr, "Incompatible HAX module version %d,", - version.cur_version); - fprintf(stderr, "requires minimum version %d\n", hax_min_version); - return 0; - } - if (hax_cur_version < version.compat_version) { - fprintf(stderr, "Incompatible QEMU HAX API version %x,", - hax_cur_version); - fprintf(stderr, "requires minimum HAX API version %x\n", - version.compat_version); - return 0; - } - - return 1; -} - -int hax_vcpu_create(int id) -{ - AccelCPUState *vcpu = NULL; - int ret; - - if (!hax_global.vm) { - fprintf(stderr, "vcpu %x created failed, vm is null\n", id); - return -1; - } - - if (hax_global.vm->vcpus[id]) { - fprintf(stderr, "vcpu %x allocated already\n", id); - return 0; - } - - vcpu = g_new0(AccelCPUState, 1); - - ret = hax_host_create_vcpu(hax_global.vm->fd, id); - if (ret) { - fprintf(stderr, "Failed to create vcpu %x\n", id); - goto error; - } - - vcpu->vcpu_id = id; - vcpu->fd = hax_host_open_vcpu(hax_global.vm->id, id); - if (hax_invalid_fd(vcpu->fd)) { - fprintf(stderr, "Failed to open the vcpu\n"); - ret = -ENODEV; - goto error; - } - - hax_global.vm->vcpus[id] = vcpu; - - ret = hax_host_setup_vcpu_channel(vcpu); - if (ret) { - fprintf(stderr, "Invalid hax tunnel size\n"); - ret = -EINVAL; - goto error; - } - return 0; - - error: - /* vcpu and tunnel will be closed automatically */ - if (vcpu && !hax_invalid_fd(vcpu->fd)) { - hax_close_fd(vcpu->fd); - } - - hax_global.vm->vcpus[id] = NULL; - g_free(vcpu); - return -1; -} - -int hax_vcpu_destroy(CPUState *cpu) -{ - AccelCPUState *vcpu = cpu->accel; - - if (!hax_global.vm) { - fprintf(stderr, "vcpu %x destroy failed, vm is null\n", vcpu->vcpu_id); - return -1; - } - - if (!vcpu) { - return 0; - } - - /* - * 1. The hax_tunnel is also destroyed when vcpu is destroyed - * 2. close fd will cause hax module vcpu be cleaned - */ - hax_close_fd(vcpu->fd); - hax_global.vm->vcpus[vcpu->vcpu_id] = NULL; -#ifdef _WIN32 - CloseHandle(vcpu->hThread); -#endif - g_free(vcpu); - cpu->accel = NULL; - return 0; -} - -int hax_init_vcpu(CPUState *cpu) -{ - int ret; - - ret = hax_vcpu_create(cpu->cpu_index); - if (ret < 0) { - fprintf(stderr, "Failed to create HAX vcpu\n"); - exit(-1); - } - - cpu->accel = hax_global.vm->vcpus[cpu->cpu_index]; - cpu->vcpu_dirty = true; - qemu_register_reset(hax_reset_vcpu_state, cpu->env_ptr); - - return ret; -} - -struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus) -{ - struct hax_vm *vm; - int vm_id = 0, ret, i; - - if (hax_invalid_fd(hax->fd)) { - return NULL; - } - - if (hax->vm) { - return hax->vm; - } - - if (max_cpus > HAX_MAX_VCPU) { - fprintf(stderr, "Maximum VCPU number QEMU supported is %d\n", HAX_MAX_VCPU); - return NULL; - } - - vm = g_new0(struct hax_vm, 1); - - ret = hax_host_create_vm(hax, &vm_id); - if (ret) { - fprintf(stderr, "Failed to create vm %x\n", ret); - goto error; - } - vm->id = vm_id; - vm->fd = hax_host_open_vm(hax, vm_id); - if (hax_invalid_fd(vm->fd)) { - fprintf(stderr, "Failed to open vm %d\n", vm_id); - goto error; - } - - vm->numvcpus = max_cpus; - vm->vcpus = g_new0(AccelCPUState *, vm->numvcpus); - for (i = 0; i < vm->numvcpus; i++) { - vm->vcpus[i] = NULL; - } - - hax->vm = vm; - return vm; - - error: - g_free(vm); - hax->vm = NULL; - return NULL; -} - -int hax_vm_destroy(struct hax_vm *vm) -{ - int i; - - for (i = 0; i < vm->numvcpus; i++) - if (vm->vcpus[i]) { - fprintf(stderr, "VCPU should be cleaned before vm clean\n"); - return -1; - } - hax_close_fd(vm->fd); - vm->numvcpus = 0; - g_free(vm->vcpus); - g_free(vm); - hax_global.vm = NULL; - return 0; -} - -static int hax_init(ram_addr_t ram_size, int max_cpus) -{ - struct hax_state *hax = NULL; - struct hax_qemu_version qversion; - int ret; - - hax = &hax_global; - - memset(hax, 0, sizeof(struct hax_state)); - hax->mem_quota = ram_size; - - hax->fd = hax_mod_open(); - if (hax_invalid_fd(hax->fd)) { - hax->fd = 0; - ret = -ENODEV; - goto error; - } - - ret = hax_get_capability(hax); - - if (ret) { - if (ret != -ENOSPC) { - ret = -EINVAL; - } - goto error; - } - - if (!hax_version_support(hax)) { - ret = -EINVAL; - goto error; - } - - hax->vm = hax_vm_create(hax, max_cpus); - if (!hax->vm) { - fprintf(stderr, "Failed to create HAX VM\n"); - ret = -EINVAL; - goto error; - } - - hax_memory_init(); - - qversion.cur_version = hax_cur_version; - qversion.min_version = hax_min_version; - hax_notify_qemu_version(hax->vm->fd, &qversion); - - return ret; - error: - if (hax->vm) { - hax_vm_destroy(hax->vm); - } - if (hax->fd) { - hax_mod_close(hax); - } - - return ret; -} - -static int hax_accel_init(MachineState *ms) -{ - int ret = hax_init(ms->ram_size, (int)ms->smp.max_cpus); - - if (ret && (ret != -ENOSPC)) { - fprintf(stderr, "No accelerator found.\n"); - } else { - fprintf(stdout, "HAX is %s and emulator runs in %s mode.\n", - !ret ? "working" : "not working", - !ret ? "fast virt" : "emulation"); - fprintf(stdout, - "NOTE: HAX is deprecated and will be removed in a future release.\n" - " Use 'whpx' (on Windows) or 'hvf' (on macOS) instead.\n"); - } - return ret; -} - -static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) -{ - if (hft->direction < 2) { - cpu_physical_memory_rw(hft->gpa, &hft->value, hft->size, - hft->direction); - } else { - /* - * HAX API v4 supports transferring data between two MMIO addresses, - * hft->gpa and hft->gpa2 (instructions such as MOVS require this): - * hft->direction == 2: gpa ==> gpa2 - */ - uint64_t value; - cpu_physical_memory_read(hft->gpa, &value, hft->size); - cpu_physical_memory_write(hft->gpa2, &value, hft->size); - } - - return 0; -} - -static int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port, - int direction, int size, int count, void *buffer) -{ - uint8_t *ptr; - int i; - MemTxAttrs attrs = { 0 }; - - if (!df) { - ptr = buffer; - } else { - ptr = buffer + size * count - size; - } - for (i = 0; i < count; i++) { - address_space_rw(&address_space_io, port, attrs, - ptr, size, direction == HAX_EXIT_IO_OUT); - if (!df) { - ptr += size; - } else { - ptr -= size; - } - } - - return 0; -} - -static int hax_vcpu_interrupt(CPUArchState *env) -{ - CPUState *cpu = env_cpu(env); - AccelCPUState *vcpu = cpu->accel; - struct hax_tunnel *ht = vcpu->tunnel; - - /* - * Try to inject an interrupt if the guest can accept it - * Unlike KVM, HAX kernel check for the eflags, instead of qemu - */ - if (ht->ready_for_interrupt_injection && - (cpu->interrupt_request & CPU_INTERRUPT_HARD)) { - int irq; - - irq = cpu_get_pic_interrupt(env); - if (irq >= 0) { - hax_inject_interrupt(env, irq); - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD; - } - } - - /* If we have an interrupt but the guest is not ready to receive an - * interrupt, request an interrupt window exit. This will - * cause a return to userspace as soon as the guest is ready to - * receive interrupts. */ - if ((cpu->interrupt_request & CPU_INTERRUPT_HARD)) { - ht->request_interrupt_window = 1; - } else { - ht->request_interrupt_window = 0; - } - return 0; -} - -void hax_raise_event(CPUState *cpu) -{ - AccelCPUState *vcpu = cpu->accel; - - if (!vcpu) { - return; - } - vcpu->tunnel->user_event_pending = 1; -} - -/* - * Ask hax kernel module to run the CPU for us till: - * 1. Guest crash or shutdown - * 2. Need QEMU's emulation like guest execute MMIO instruction - * 3. Guest execute HLT - * 4. QEMU have Signal/event pending - * 5. An unknown VMX exit happens - */ -static int hax_vcpu_hax_exec(CPUArchState *env) -{ - int ret = 0; - CPUState *cpu = env_cpu(env); - X86CPU *x86_cpu = X86_CPU(cpu); - AccelCPUState *vcpu = cpu->accel; - struct hax_tunnel *ht = vcpu->tunnel; - - if (!hax_enabled()) { - DPRINTF("Trying to vcpu execute at eip:" TARGET_FMT_lx "\n", env->eip); - return 0; - } - - if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL; - apic_poll_irq(x86_cpu->apic_state); - } - - /* After a vcpu is halted (either because it is an AP and has just been - * reset, or because it has executed the HLT instruction), it will not be - * run (hax_vcpu_run()) until it is unhalted. The next few if blocks check - * for events that may change the halted state of this vcpu: - * a) Maskable interrupt, when RFLAGS.IF is 1; - * Note: env->eflags may not reflect the current RFLAGS state, because - * it is not updated after each hax_vcpu_run(). We cannot afford - * to fail to recognize any unhalt-by-maskable-interrupt event - * (in which case the vcpu will halt forever), and yet we cannot - * afford the overhead of hax_vcpu_sync_state(). The current - * solution is to err on the side of caution and have the HLT - * handler (see case HAX_EXIT_HLT below) unconditionally set the - * IF_MASK bit in env->eflags, which, in effect, disables the - * RFLAGS.IF check. - * b) NMI; - * c) INIT signal; - * d) SIPI signal. - */ - if (((cpu->interrupt_request & CPU_INTERRUPT_HARD) && - (env->eflags & IF_MASK)) || - (cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - cpu->halted = 0; - } - - if (cpu->interrupt_request & CPU_INTERRUPT_INIT) { - DPRINTF("\nhax_vcpu_hax_exec: handling INIT for %d\n", - cpu->cpu_index); - do_cpu_init(x86_cpu); - hax_vcpu_sync_state(env, 1); - } - - if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) { - DPRINTF("hax_vcpu_hax_exec: handling SIPI for %d\n", - cpu->cpu_index); - hax_vcpu_sync_state(env, 0); - do_cpu_sipi(x86_cpu); - hax_vcpu_sync_state(env, 1); - } - - if (cpu->halted) { - /* If this vcpu is halted, we must not ask HAXM to run it. Instead, we - * break out of hax_smp_cpu_exec() as if this vcpu had executed HLT. - * That way, this vcpu thread will be trapped in qemu_wait_io_event(), - * until the vcpu is unhalted. - */ - cpu->exception_index = EXCP_HLT; - return 0; - } - - do { - int hax_ret; - - if (cpu->exit_request) { - ret = 1; - break; - } - - hax_vcpu_interrupt(env); - - qemu_mutex_unlock_iothread(); - cpu_exec_start(cpu); - hax_ret = hax_vcpu_run(vcpu); - cpu_exec_end(cpu); - qemu_mutex_lock_iothread(); - - /* Simply continue the vcpu_run if system call interrupted */ - if (hax_ret == -EINTR || hax_ret == -EAGAIN) { - DPRINTF("io window interrupted\n"); - continue; - } - - if (hax_ret < 0) { - fprintf(stderr, "vcpu run failed for vcpu %x\n", vcpu->vcpu_id); - abort(); - } - switch (ht->_exit_status) { - case HAX_EXIT_IO: - ret = hax_handle_io(env, ht->pio._df, ht->pio._port, - ht->pio._direction, - ht->pio._size, ht->pio._count, vcpu->iobuf); - break; - case HAX_EXIT_FAST_MMIO: - ret = hax_handle_fastmmio(env, (struct hax_fastmmio *) vcpu->iobuf); - break; - /* Guest state changed, currently only for shutdown */ - case HAX_EXIT_STATECHANGE: - fprintf(stdout, "VCPU shutdown request\n"); - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - hax_vcpu_sync_state(env, 0); - ret = 1; - break; - case HAX_EXIT_UNKNOWN_VMEXIT: - fprintf(stderr, "Unknown VMX exit %x from guest\n", - ht->_exit_reason); - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - hax_vcpu_sync_state(env, 0); - cpu_dump_state(cpu, stderr, 0); - ret = -1; - break; - case HAX_EXIT_HLT: - if (!(cpu->interrupt_request & CPU_INTERRUPT_HARD) && - !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - /* hlt instruction with interrupt disabled is shutdown */ - env->eflags |= IF_MASK; - cpu->halted = 1; - cpu->exception_index = EXCP_HLT; - ret = 1; - } - break; - /* these situations will continue to hax module */ - case HAX_EXIT_INTERRUPT: - case HAX_EXIT_PAUSED: - break; - case HAX_EXIT_MMIO: - /* Should not happen on UG system */ - fprintf(stderr, "HAX: unsupported MMIO emulation\n"); - ret = -1; - break; - case HAX_EXIT_REAL: - /* Should not happen on UG system */ - fprintf(stderr, "HAX: unimplemented real mode emulation\n"); - ret = -1; - break; - default: - fprintf(stderr, "Unknown exit %x from HAX\n", ht->_exit_status); - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - hax_vcpu_sync_state(env, 0); - cpu_dump_state(cpu, stderr, 0); - ret = 1; - break; - } - } while (!ret); - - if (cpu->exit_request) { - cpu->exit_request = 0; - cpu->exception_index = EXCP_INTERRUPT; - } - return ret < 0; -} - -static void do_hax_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_arch_get_registers(env); - cpu->vcpu_dirty = true; -} - -void hax_cpu_synchronize_state(CPUState *cpu) -{ - if (!cpu->vcpu_dirty) { - run_on_cpu(cpu, do_hax_cpu_synchronize_state, RUN_ON_CPU_NULL); - } -} - -static void do_hax_cpu_synchronize_post_reset(CPUState *cpu, - run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_vcpu_sync_state(env, 1); - cpu->vcpu_dirty = false; -} - -void hax_cpu_synchronize_post_reset(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_post_reset, RUN_ON_CPU_NULL); -} - -static void do_hax_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_vcpu_sync_state(env, 1); - cpu->vcpu_dirty = false; -} - -void hax_cpu_synchronize_post_init(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_post_init, RUN_ON_CPU_NULL); -} - -static void do_hax_cpu_synchronize_pre_loadvm(CPUState *cpu, run_on_cpu_data arg) -{ - cpu->vcpu_dirty = true; -} - -void hax_cpu_synchronize_pre_loadvm(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_pre_loadvm, RUN_ON_CPU_NULL); -} - -int hax_smp_cpu_exec(CPUState *cpu) -{ - CPUArchState *env = cpu->env_ptr; - int fatal; - int ret; - - while (1) { - if (cpu->exception_index >= EXCP_INTERRUPT) { - ret = cpu->exception_index; - cpu->exception_index = -1; - break; - } - - fatal = hax_vcpu_hax_exec(env); - - if (fatal) { - fprintf(stderr, "Unsupported HAX vcpu return\n"); - abort(); - } - } - - return ret; -} - -static void set_v8086_seg(struct segment_desc_t *lhs, const SegmentCache *rhs) -{ - memset(lhs, 0, sizeof(struct segment_desc_t)); - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->type = 3; - lhs->present = 1; - lhs->dpl = 3; - lhs->operand_size = 0; - lhs->desc = 1; - lhs->long_mode = 0; - lhs->granularity = 0; - lhs->available = 0; -} - -static void get_seg(SegmentCache *lhs, const struct segment_desc_t *rhs) -{ - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->flags = (rhs->type << DESC_TYPE_SHIFT) - | (rhs->present * DESC_P_MASK) - | (rhs->dpl << DESC_DPL_SHIFT) - | (rhs->operand_size << DESC_B_SHIFT) - | (rhs->desc * DESC_S_MASK) - | (rhs->long_mode << DESC_L_SHIFT) - | (rhs->granularity * DESC_G_MASK) | (rhs->available * DESC_AVL_MASK); -} - -static void set_seg(struct segment_desc_t *lhs, const SegmentCache *rhs) -{ - unsigned flags = rhs->flags; - - memset(lhs, 0, sizeof(struct segment_desc_t)); - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->type = (flags >> DESC_TYPE_SHIFT) & 15; - lhs->present = (flags & DESC_P_MASK) != 0; - lhs->dpl = rhs->selector & 3; - lhs->operand_size = (flags >> DESC_B_SHIFT) & 1; - lhs->desc = (flags & DESC_S_MASK) != 0; - lhs->long_mode = (flags >> DESC_L_SHIFT) & 1; - lhs->granularity = (flags & DESC_G_MASK) != 0; - lhs->available = (flags & DESC_AVL_MASK) != 0; -} - -static void hax_getput_reg(uint64_t *hax_reg, target_ulong *qemu_reg, int set) -{ - target_ulong reg = *hax_reg; - - if (set) { - *hax_reg = *qemu_reg; - } else { - *qemu_reg = reg; - } -} - -/* The sregs has been synced with HAX kernel already before this call */ -static int hax_get_segments(CPUArchState *env, struct vcpu_state_t *sregs) -{ - get_seg(&env->segs[R_CS], &sregs->_cs); - get_seg(&env->segs[R_DS], &sregs->_ds); - get_seg(&env->segs[R_ES], &sregs->_es); - get_seg(&env->segs[R_FS], &sregs->_fs); - get_seg(&env->segs[R_GS], &sregs->_gs); - get_seg(&env->segs[R_SS], &sregs->_ss); - - get_seg(&env->tr, &sregs->_tr); - get_seg(&env->ldt, &sregs->_ldt); - env->idt.limit = sregs->_idt.limit; - env->idt.base = sregs->_idt.base; - env->gdt.limit = sregs->_gdt.limit; - env->gdt.base = sregs->_gdt.base; - return 0; -} - -static int hax_set_segments(CPUArchState *env, struct vcpu_state_t *sregs) -{ - if ((env->eflags & VM_MASK)) { - set_v8086_seg(&sregs->_cs, &env->segs[R_CS]); - set_v8086_seg(&sregs->_ds, &env->segs[R_DS]); - set_v8086_seg(&sregs->_es, &env->segs[R_ES]); - set_v8086_seg(&sregs->_fs, &env->segs[R_FS]); - set_v8086_seg(&sregs->_gs, &env->segs[R_GS]); - set_v8086_seg(&sregs->_ss, &env->segs[R_SS]); - } else { - set_seg(&sregs->_cs, &env->segs[R_CS]); - set_seg(&sregs->_ds, &env->segs[R_DS]); - set_seg(&sregs->_es, &env->segs[R_ES]); - set_seg(&sregs->_fs, &env->segs[R_FS]); - set_seg(&sregs->_gs, &env->segs[R_GS]); - set_seg(&sregs->_ss, &env->segs[R_SS]); - - if (env->cr[0] & CR0_PE_MASK) { - /* force ss cpl to cs cpl */ - sregs->_ss.selector = (sregs->_ss.selector & ~3) | - (sregs->_cs.selector & 3); - sregs->_ss.dpl = sregs->_ss.selector & 3; - } - } - - set_seg(&sregs->_tr, &env->tr); - set_seg(&sregs->_ldt, &env->ldt); - sregs->_idt.limit = env->idt.limit; - sregs->_idt.base = env->idt.base; - sregs->_gdt.limit = env->gdt.limit; - sregs->_gdt.base = env->gdt.base; - return 0; -} - -static int hax_sync_vcpu_register(CPUArchState *env, int set) -{ - struct vcpu_state_t regs; - int ret; - memset(&regs, 0, sizeof(struct vcpu_state_t)); - - if (!set) { - ret = hax_sync_vcpu_state(env, &regs, 0); - if (ret < 0) { - return -1; - } - } - - /* generic register */ - hax_getput_reg(&regs._rax, &env->regs[R_EAX], set); - hax_getput_reg(&regs._rbx, &env->regs[R_EBX], set); - hax_getput_reg(&regs._rcx, &env->regs[R_ECX], set); - hax_getput_reg(&regs._rdx, &env->regs[R_EDX], set); - hax_getput_reg(&regs._rsi, &env->regs[R_ESI], set); - hax_getput_reg(&regs._rdi, &env->regs[R_EDI], set); - hax_getput_reg(&regs._rsp, &env->regs[R_ESP], set); - hax_getput_reg(&regs._rbp, &env->regs[R_EBP], set); -#ifdef TARGET_X86_64 - hax_getput_reg(&regs._r8, &env->regs[8], set); - hax_getput_reg(&regs._r9, &env->regs[9], set); - hax_getput_reg(&regs._r10, &env->regs[10], set); - hax_getput_reg(&regs._r11, &env->regs[11], set); - hax_getput_reg(&regs._r12, &env->regs[12], set); - hax_getput_reg(&regs._r13, &env->regs[13], set); - hax_getput_reg(&regs._r14, &env->regs[14], set); - hax_getput_reg(&regs._r15, &env->regs[15], set); -#endif - hax_getput_reg(&regs._rflags, &env->eflags, set); - hax_getput_reg(&regs._rip, &env->eip, set); - - if (set) { - regs._cr0 = env->cr[0]; - regs._cr2 = env->cr[2]; - regs._cr3 = env->cr[3]; - regs._cr4 = env->cr[4]; - hax_set_segments(env, &regs); - } else { - env->cr[0] = regs._cr0; - env->cr[2] = regs._cr2; - env->cr[3] = regs._cr3; - env->cr[4] = regs._cr4; - hax_get_segments(env, &regs); - } - - if (set) { - ret = hax_sync_vcpu_state(env, &regs, 1); - if (ret < 0) { - return -1; - } - } - return 0; -} - -static void hax_msr_entry_set(struct vmx_msr *item, uint32_t index, - uint64_t value) -{ - item->entry = index; - item->value = value; -} - -static int hax_get_msrs(CPUArchState *env) -{ - struct hax_msr_data md; - struct vmx_msr *msrs = md.entries; - int ret, i, n; - - n = 0; - msrs[n++].entry = MSR_IA32_SYSENTER_CS; - msrs[n++].entry = MSR_IA32_SYSENTER_ESP; - msrs[n++].entry = MSR_IA32_SYSENTER_EIP; - msrs[n++].entry = MSR_IA32_TSC; -#ifdef TARGET_X86_64 - msrs[n++].entry = MSR_EFER; - msrs[n++].entry = MSR_STAR; - msrs[n++].entry = MSR_LSTAR; - msrs[n++].entry = MSR_CSTAR; - msrs[n++].entry = MSR_FMASK; - msrs[n++].entry = MSR_KERNELGSBASE; -#endif - md.nr_msr = n; - ret = hax_sync_msr(env, &md, 0); - if (ret < 0) { - return ret; - } - - for (i = 0; i < md.done; i++) { - switch (msrs[i].entry) { - case MSR_IA32_SYSENTER_CS: - env->sysenter_cs = msrs[i].value; - break; - case MSR_IA32_SYSENTER_ESP: - env->sysenter_esp = msrs[i].value; - break; - case MSR_IA32_SYSENTER_EIP: - env->sysenter_eip = msrs[i].value; - break; - case MSR_IA32_TSC: - env->tsc = msrs[i].value; - break; -#ifdef TARGET_X86_64 - case MSR_EFER: - env->efer = msrs[i].value; - break; - case MSR_STAR: - env->star = msrs[i].value; - break; - case MSR_LSTAR: - env->lstar = msrs[i].value; - break; - case MSR_CSTAR: - env->cstar = msrs[i].value; - break; - case MSR_FMASK: - env->fmask = msrs[i].value; - break; - case MSR_KERNELGSBASE: - env->kernelgsbase = msrs[i].value; - break; -#endif - } - } - - return 0; -} - -static int hax_set_msrs(CPUArchState *env) -{ - struct hax_msr_data md; - struct vmx_msr *msrs; - msrs = md.entries; - int n = 0; - - memset(&md, 0, sizeof(struct hax_msr_data)); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_CS, env->sysenter_cs); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip); - hax_msr_entry_set(&msrs[n++], MSR_IA32_TSC, env->tsc); -#ifdef TARGET_X86_64 - hax_msr_entry_set(&msrs[n++], MSR_EFER, env->efer); - hax_msr_entry_set(&msrs[n++], MSR_STAR, env->star); - hax_msr_entry_set(&msrs[n++], MSR_LSTAR, env->lstar); - hax_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar); - hax_msr_entry_set(&msrs[n++], MSR_FMASK, env->fmask); - hax_msr_entry_set(&msrs[n++], MSR_KERNELGSBASE, env->kernelgsbase); -#endif - md.nr_msr = n; - md.done = 0; - - return hax_sync_msr(env, &md, 1); -} - -static int hax_get_fpu(CPUArchState *env) -{ - struct fx_layout fpu; - int i, ret; - - ret = hax_sync_fpu(env, &fpu, 0); - if (ret < 0) { - return ret; - } - - env->fpstt = (fpu.fsw >> 11) & 7; - env->fpus = fpu.fsw; - env->fpuc = fpu.fcw; - for (i = 0; i < 8; ++i) { - env->fptags[i] = !((fpu.ftw >> i) & 1); - } - memcpy(env->fpregs, fpu.st_mm, sizeof(env->fpregs)); - - for (i = 0; i < 8; i++) { - env->xmm_regs[i].ZMM_Q(0) = ldq_p(&fpu.mmx_1[i][0]); - env->xmm_regs[i].ZMM_Q(1) = ldq_p(&fpu.mmx_1[i][8]); - if (CPU_NB_REGS > 8) { - env->xmm_regs[i + 8].ZMM_Q(0) = ldq_p(&fpu.mmx_2[i][0]); - env->xmm_regs[i + 8].ZMM_Q(1) = ldq_p(&fpu.mmx_2[i][8]); - } - } - env->mxcsr = fpu.mxcsr; - - return 0; -} - -static int hax_set_fpu(CPUArchState *env) -{ - struct fx_layout fpu; - int i; - - memset(&fpu, 0, sizeof(fpu)); - fpu.fsw = env->fpus & ~(7 << 11); - fpu.fsw |= (env->fpstt & 7) << 11; - fpu.fcw = env->fpuc; - - for (i = 0; i < 8; ++i) { - fpu.ftw |= (!env->fptags[i]) << i; - } - - memcpy(fpu.st_mm, env->fpregs, sizeof(env->fpregs)); - for (i = 0; i < 8; i++) { - stq_p(&fpu.mmx_1[i][0], env->xmm_regs[i].ZMM_Q(0)); - stq_p(&fpu.mmx_1[i][8], env->xmm_regs[i].ZMM_Q(1)); - if (CPU_NB_REGS > 8) { - stq_p(&fpu.mmx_2[i][0], env->xmm_regs[i + 8].ZMM_Q(0)); - stq_p(&fpu.mmx_2[i][8], env->xmm_regs[i + 8].ZMM_Q(1)); - } - } - - fpu.mxcsr = env->mxcsr; - - return hax_sync_fpu(env, &fpu, 1); -} - -static int hax_arch_get_registers(CPUArchState *env) -{ - int ret; - - ret = hax_sync_vcpu_register(env, 0); - if (ret < 0) { - return ret; - } - - ret = hax_get_fpu(env); - if (ret < 0) { - return ret; - } - - ret = hax_get_msrs(env); - if (ret < 0) { - return ret; - } - - x86_update_hflags(env); - return 0; -} - -static int hax_arch_set_registers(CPUArchState *env) -{ - int ret; - ret = hax_sync_vcpu_register(env, 1); - - if (ret < 0) { - fprintf(stderr, "Failed to sync vcpu reg\n"); - return ret; - } - ret = hax_set_fpu(env); - if (ret < 0) { - fprintf(stderr, "FPU failed\n"); - return ret; - } - ret = hax_set_msrs(env); - if (ret < 0) { - fprintf(stderr, "MSR failed\n"); - return ret; - } - - return 0; -} - -static void hax_vcpu_sync_state(CPUArchState *env, int modified) -{ - if (hax_enabled()) { - if (modified) { - hax_arch_set_registers(env); - } else { - hax_arch_get_registers(env); - } - } -} - -/* - * much simpler than kvm, at least in first stage because: - * We don't need consider the device pass-through, we don't need - * consider the framebuffer, and we may even remove the bios at all - */ -int hax_sync_vcpus(void) -{ - if (hax_enabled()) { - CPUState *cpu; - - cpu = first_cpu; - if (!cpu) { - return 0; - } - - for (; cpu != NULL; cpu = CPU_NEXT(cpu)) { - int ret; - - ret = hax_arch_set_registers(cpu->env_ptr); - if (ret < 0) { - return ret; - } - } - } - - return 0; -} - -void hax_reset_vcpu_state(void *opaque) -{ - CPUState *cpu; - for (cpu = first_cpu; cpu != NULL; cpu = CPU_NEXT(cpu)) { - cpu->accel->tunnel->user_event_pending = 0; - cpu->accel->tunnel->ready_for_interrupt_injection = 0; - } -} - -static void hax_accel_class_init(ObjectClass *oc, void *data) -{ - AccelClass *ac = ACCEL_CLASS(oc); - ac->name = "HAX"; - ac->init_machine = hax_accel_init; - ac->allowed = &hax_allowed; -} - -static const TypeInfo hax_accel_type = { - .name = ACCEL_CLASS_NAME("hax"), - .parent = TYPE_ACCEL, - .class_init = hax_accel_class_init, -}; - -static void hax_type_init(void) -{ - type_register_static(&hax_accel_type); -} - -type_init(hax_type_init); diff --git a/target/i386/hax/hax-mem.c b/target/i386/hax/hax-mem.c deleted file mode 100644 index bb5ffbc9ac..0000000000 --- a/target/i386/hax/hax-mem.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * HAX memory mapping operations - * - * Copyright (c) 2015-16 Intel Corporation - * Copyright 2016 Google, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/address-spaces.h" -#include "qemu/error-report.h" - -#include "hax-accel-ops.h" -#include "qemu/queue.h" - -#define DEBUG_HAX_MEM 0 - -#define DPRINTF(fmt, ...) \ - do { \ - if (DEBUG_HAX_MEM) { \ - fprintf(stdout, fmt, ## __VA_ARGS__); \ - } \ - } while (0) - -/** - * HAXMapping: describes a pending guest physical memory mapping - * - * @start_pa: a guest physical address marking the start of the region; must be - * page-aligned - * @size: a guest physical address marking the end of the region; must be - * page-aligned - * @host_va: the host virtual address of the start of the mapping - * @flags: mapping parameters e.g. HAX_RAM_INFO_ROM or HAX_RAM_INFO_INVALID - * @entry: additional fields for linking #HAXMapping instances together - */ -typedef struct HAXMapping { - uint64_t start_pa; - uint32_t size; - uint64_t host_va; - int flags; - QTAILQ_ENTRY(HAXMapping) entry; -} HAXMapping; - -/* - * A doubly-linked list (actually a tail queue) of the pending page mappings - * for the ongoing memory transaction. - * - * It is used to optimize the number of page mapping updates done through the - * kernel module. For example, it's effective when a driver is digging an MMIO - * hole inside an existing memory mapping. It will get a deletion of the whole - * region, then the addition of the 2 remaining RAM areas around the hole and - * finally the memory transaction commit. During the commit, it will effectively - * send to the kernel only the removal of the pages from the MMIO hole after - * having computed locally the result of the deletion and additions. - */ -static QTAILQ_HEAD(, HAXMapping) mappings = - QTAILQ_HEAD_INITIALIZER(mappings); - -/** - * hax_mapping_dump_list: dumps @mappings to stdout (for debugging) - */ -static void hax_mapping_dump_list(void) -{ - HAXMapping *entry; - - DPRINTF("%s updates:\n", __func__); - QTAILQ_FOREACH(entry, &mappings, entry) { - DPRINTF("\t%c 0x%016" PRIx64 "->0x%016" PRIx64 " VA 0x%016" PRIx64 - "%s\n", entry->flags & HAX_RAM_INFO_INVALID ? '-' : '+', - entry->start_pa, entry->start_pa + entry->size, entry->host_va, - entry->flags & HAX_RAM_INFO_ROM ? " ROM" : ""); - } -} - -static void hax_insert_mapping_before(HAXMapping *next, uint64_t start_pa, - uint32_t size, uint64_t host_va, - uint8_t flags) -{ - HAXMapping *entry; - - entry = g_malloc0(sizeof(*entry)); - entry->start_pa = start_pa; - entry->size = size; - entry->host_va = host_va; - entry->flags = flags; - if (!next) { - QTAILQ_INSERT_TAIL(&mappings, entry, entry); - } else { - QTAILQ_INSERT_BEFORE(next, entry, entry); - } -} - -static bool hax_mapping_is_opposite(HAXMapping *entry, uint64_t host_va, - uint8_t flags) -{ - /* removed then added without change for the read-only flag */ - bool nop_flags = (entry->flags ^ flags) == HAX_RAM_INFO_INVALID; - - return (entry->host_va == host_va) && nop_flags; -} - -static void hax_update_mapping(uint64_t start_pa, uint32_t size, - uint64_t host_va, uint8_t flags) -{ - uint64_t end_pa = start_pa + size; - HAXMapping *entry, *next; - - QTAILQ_FOREACH_SAFE(entry, &mappings, entry, next) { - uint32_t chunk_sz; - if (start_pa >= entry->start_pa + entry->size) { - continue; - } - if (start_pa < entry->start_pa) { - chunk_sz = end_pa <= entry->start_pa ? size - : entry->start_pa - start_pa; - hax_insert_mapping_before(entry, start_pa, chunk_sz, - host_va, flags); - start_pa += chunk_sz; - host_va += chunk_sz; - size -= chunk_sz; - } else if (start_pa > entry->start_pa) { - /* split the existing chunk at start_pa */ - chunk_sz = start_pa - entry->start_pa; - hax_insert_mapping_before(entry, entry->start_pa, chunk_sz, - entry->host_va, entry->flags); - entry->start_pa += chunk_sz; - entry->host_va += chunk_sz; - entry->size -= chunk_sz; - } - /* now start_pa == entry->start_pa */ - chunk_sz = MIN(size, entry->size); - if (chunk_sz) { - bool nop = hax_mapping_is_opposite(entry, host_va, flags); - bool partial = chunk_sz < entry->size; - if (partial) { - /* remove the beginning of the existing chunk */ - entry->start_pa += chunk_sz; - entry->host_va += chunk_sz; - entry->size -= chunk_sz; - if (!nop) { - hax_insert_mapping_before(entry, start_pa, chunk_sz, - host_va, flags); - } - } else { /* affects the full mapping entry */ - if (nop) { /* no change to this mapping, remove it */ - QTAILQ_REMOVE(&mappings, entry, entry); - g_free(entry); - } else { /* update mapping properties */ - entry->host_va = host_va; - entry->flags = flags; - } - } - start_pa += chunk_sz; - host_va += chunk_sz; - size -= chunk_sz; - } - if (!size) { /* we are done */ - break; - } - } - if (size) { /* add the leftover */ - hax_insert_mapping_before(NULL, start_pa, size, host_va, flags); - } -} - -static void hax_process_section(MemoryRegionSection *section, uint8_t flags) -{ - MemoryRegion *mr = section->mr; - hwaddr start_pa = section->offset_within_address_space; - ram_addr_t size = int128_get64(section->size); - unsigned int delta; - uint64_t host_va; - uint32_t max_mapping_size; - - /* We only care about RAM and ROM regions */ - if (!memory_region_is_ram(mr)) { - if (memory_region_is_romd(mr)) { - /* HAXM kernel module does not support ROMD yet */ - warn_report("Ignoring ROMD region 0x%016" PRIx64 "->0x%016" PRIx64, - start_pa, start_pa + size); - } - return; - } - - /* Adjust start_pa and size so that they are page-aligned. (Cf - * kvm_set_phys_mem() in kvm-all.c). - */ - delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask()); - delta &= ~qemu_real_host_page_mask(); - if (delta > size) { - return; - } - start_pa += delta; - size -= delta; - size &= qemu_real_host_page_mask(); - if (!size || (start_pa & ~qemu_real_host_page_mask())) { - return; - } - - host_va = (uintptr_t)memory_region_get_ram_ptr(mr) - + section->offset_within_region + delta; - if (memory_region_is_rom(section->mr)) { - flags |= HAX_RAM_INFO_ROM; - } - - /* - * The kernel module interface uses 32-bit sizes: - * https://github.com/intel/haxm/blob/master/API.md#hax_vm_ioctl_set_ram - * - * If the mapping size is longer than 32 bits, we can't process it in one - * call into the kernel. Instead, we split the mapping into smaller ones, - * and call hax_update_mapping() on each. - */ - max_mapping_size = UINT32_MAX & qemu_real_host_page_mask(); - while (size > max_mapping_size) { - hax_update_mapping(start_pa, max_mapping_size, host_va, flags); - start_pa += max_mapping_size; - size -= max_mapping_size; - host_va += max_mapping_size; - } - /* Now size <= max_mapping_size */ - hax_update_mapping(start_pa, (uint32_t)size, host_va, flags); -} - -static void hax_region_add(MemoryListener *listener, - MemoryRegionSection *section) -{ - memory_region_ref(section->mr); - hax_process_section(section, 0); -} - -static void hax_region_del(MemoryListener *listener, - MemoryRegionSection *section) -{ - hax_process_section(section, HAX_RAM_INFO_INVALID); - memory_region_unref(section->mr); -} - -static void hax_transaction_begin(MemoryListener *listener) -{ - g_assert(QTAILQ_EMPTY(&mappings)); -} - -static void hax_transaction_commit(MemoryListener *listener) -{ - if (!QTAILQ_EMPTY(&mappings)) { - HAXMapping *entry, *next; - - if (DEBUG_HAX_MEM) { - hax_mapping_dump_list(); - } - QTAILQ_FOREACH_SAFE(entry, &mappings, entry, next) { - if (entry->flags & HAX_RAM_INFO_INVALID) { - /* for unmapping, put the values expected by the kernel */ - entry->flags = HAX_RAM_INFO_INVALID; - entry->host_va = 0; - } - if (hax_set_ram(entry->start_pa, entry->size, - entry->host_va, entry->flags)) { - fprintf(stderr, "%s: Failed mapping @0x%016" PRIx64 "+0x%" - PRIx32 " flags %02x\n", __func__, entry->start_pa, - entry->size, entry->flags); - } - QTAILQ_REMOVE(&mappings, entry, entry); - g_free(entry); - } - } -} - -/* currently we fake the dirty bitmap sync, always dirty */ -static void hax_log_sync(MemoryListener *listener, - MemoryRegionSection *section) -{ - MemoryRegion *mr = section->mr; - - if (!memory_region_is_ram(mr)) { - /* Skip MMIO regions */ - return; - } - - memory_region_set_dirty(mr, 0, int128_get64(section->size)); -} - -static MemoryListener hax_memory_listener = { - .name = "hax", - .begin = hax_transaction_begin, - .commit = hax_transaction_commit, - .region_add = hax_region_add, - .region_del = hax_region_del, - .log_sync = hax_log_sync, - .priority = MEMORY_LISTENER_PRIORITY_ACCEL, -}; - -static void hax_ram_block_added(RAMBlockNotifier *n, void *host, size_t size, - size_t max_size) -{ - /* - * We must register each RAM block with the HAXM kernel module, or - * hax_set_ram() will fail for any mapping into the RAM block: - * https://github.com/intel/haxm/blob/master/API.md#hax_vm_ioctl_alloc_ram - * - * Old versions of the HAXM kernel module (< 6.2.0) used to preallocate all - * host physical pages for the RAM block as part of this registration - * process, hence the name hax_populate_ram(). - */ - if (hax_populate_ram((uint64_t)(uintptr_t)host, max_size) < 0) { - fprintf(stderr, "HAX failed to populate RAM\n"); - abort(); - } -} - -static struct RAMBlockNotifier hax_ram_notifier = { - .ram_block_added = hax_ram_block_added, -}; - -void hax_memory_init(void) -{ - ram_block_notifier_add(&hax_ram_notifier); - memory_listener_register(&hax_memory_listener, &address_space_memory); -} diff --git a/target/i386/hax/hax-posix.c b/target/i386/hax/hax-posix.c deleted file mode 100644 index a057a5bd94..0000000000 --- a/target/i386/hax/hax-posix.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* HAX module interface - darwin version */ -#include "qemu/osdep.h" -#include <sys/ioctl.h> - -#include "sysemu/cpus.h" -#include "hax-accel-ops.h" - -hax_fd hax_mod_open(void) -{ - int fd = open("/dev/HAX", O_RDWR); - if (fd == -1) { - fprintf(stderr, "Failed to open the hax module\n"); - } - - qemu_set_cloexec(fd); - - return fd; -} - -int hax_populate_ram(uint64_t va, uint64_t size) -{ - int ret; - - if (!hax_global.vm || !hax_global.vm->fd) { - fprintf(stderr, "Allocate memory before vm create?\n"); - return -EINVAL; - } - - if (hax_global.supports_64bit_ramblock) { - struct hax_ramblock_info ramblock = { - .start_va = va, - .size = size, - .reserved = 0 - }; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ADD_RAMBLOCK, &ramblock); - } else { - struct hax_alloc_ram_info info = { - .size = (uint32_t)size, - .pad = 0, - .va = va - }; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ALLOC_RAM, &info); - } - if (ret < 0) { - fprintf(stderr, "Failed to register RAM block: ret=%d, va=0x%" PRIx64 - ", size=0x%" PRIx64 ", method=%s\n", ret, va, size, - hax_global.supports_64bit_ramblock ? "new" : "legacy"); - return ret; - } - return 0; -} - -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags) -{ - struct hax_set_ram_info info; - int ret; - - info.pa_start = start_pa; - info.size = size; - info.va = host_va; - info.flags = (uint8_t) flags; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_SET_RAM, &info); - if (ret < 0) { - return -errno; - } - return 0; -} - -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap) -{ - int ret; - - ret = ioctl(hax->fd, HAX_IOCTL_CAPABILITY, cap); - if (ret == -1) { - fprintf(stderr, "Failed to get HAX capability\n"); - return -errno; - } - - return 0; -} - -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) -{ - int ret; - - ret = ioctl(hax->fd, HAX_IOCTL_VERSION, version); - if (ret == -1) { - fprintf(stderr, "Failed to get HAX version\n"); - return -errno; - } - - return 0; -} - -static char *hax_vm_devfs_string(int vm_id) -{ - return g_strdup_printf("/dev/hax_vm/vm%02d", vm_id); -} - -static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) -{ - return g_strdup_printf("/dev/hax_vm%02d/vcpu%02d", vm_id, vcpu_id); -} - -int hax_host_create_vm(struct hax_state *hax, int *vmid) -{ - int ret; - int vm_id = 0; - - if (hax_invalid_fd(hax->fd)) { - return -EINVAL; - } - - if (hax->vm) { - return 0; - } - - ret = ioctl(hax->fd, HAX_IOCTL_CREATE_VM, &vm_id); - *vmid = vm_id; - return ret; -} - -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id) -{ - hax_fd fd; - char *vm_name = NULL; - - vm_name = hax_vm_devfs_string(vm_id); - if (!vm_name) { - return -1; - } - - fd = open(vm_name, O_RDWR); - g_free(vm_name); - - qemu_set_cloexec(fd); - - return fd; -} - -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion) -{ - int ret; - - if (hax_invalid_fd(vm_fd)) { - return -EINVAL; - } - - ret = ioctl(vm_fd, HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, qversion); - - if (ret < 0) { - fprintf(stderr, "Failed to notify qemu API version\n"); - return ret; - } - return 0; -} - -/* Simply assume the size should be bigger than the hax_tunnel, - * since the hax_tunnel can be extended later with compatibility considered - */ -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid) -{ - int ret; - - ret = ioctl(vm_fd, HAX_VM_IOCTL_VCPU_CREATE, &vcpuid); - if (ret < 0) { - fprintf(stderr, "Failed to create vcpu %x\n", vcpuid); - } - - return ret; -} - -hax_fd hax_host_open_vcpu(int vmid, int vcpuid) -{ - char *devfs_path = NULL; - hax_fd fd; - - devfs_path = hax_vcpu_devfs_string(vmid, vcpuid); - if (!devfs_path) { - fprintf(stderr, "Failed to get the devfs\n"); - return -EINVAL; - } - - fd = open(devfs_path, O_RDWR); - g_free(devfs_path); - if (fd < 0) { - fprintf(stderr, "Failed to open the vcpu devfs\n"); - } - qemu_set_cloexec(fd); - return fd; -} - -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu) -{ - int ret; - struct hax_tunnel_info info; - - ret = ioctl(vcpu->fd, HAX_VCPU_IOCTL_SETUP_TUNNEL, &info); - if (ret) { - fprintf(stderr, "Failed to setup the hax tunnel\n"); - return ret; - } - - if (!valid_hax_tunnel_size(info.size)) { - fprintf(stderr, "Invalid hax tunnel size %x\n", info.size); - ret = -EINVAL; - return ret; - } - - vcpu->tunnel = (struct hax_tunnel *) (intptr_t) (info.va); - vcpu->iobuf = (unsigned char *) (intptr_t) (info.io_va); - return 0; -} - -int hax_vcpu_run(AccelCPUState *vcpu) -{ - return ioctl(vcpu->fd, HAX_VCPU_IOCTL_RUN, NULL); -} - -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - if (set) { - ret = ioctl(fd, HAX_VCPU_IOCTL_SET_FPU, fl); - } else { - ret = ioctl(fd, HAX_VCPU_IOCTL_GET_FPU, fl); - } - return ret; -} - -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - if (set) { - ret = ioctl(fd, HAX_VCPU_IOCTL_SET_MSRS, msrs); - } else { - ret = ioctl(fd, HAX_VCPU_IOCTL_GET_MSRS, msrs); - } - return ret; -} - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - if (set) { - ret = ioctl(fd, HAX_VCPU_SET_REGS, state); - } else { - ret = ioctl(fd, HAX_VCPU_GET_REGS, state); - } - return ret; -} - -int hax_inject_interrupt(CPUArchState *env, int vector) -{ - int fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - return ioctl(fd, HAX_VCPU_IOCTL_INTERRUPT, &vector); -} - -void hax_kick_vcpu_thread(CPUState *cpu) -{ - /* - * FIXME: race condition with the exit_request check in - * hax_vcpu_hax_exec - */ - cpu->exit_request = 1; - cpus_kick_thread(cpu); -} diff --git a/target/i386/hax/hax-windows.c b/target/i386/hax/hax-windows.c deleted file mode 100644 index 4bf6cc08d2..0000000000 --- a/target/i386/hax/hax-windows.c +++ /dev/null @@ -1,485 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "hax-accel-ops.h" - -/* - * return 0 when success, -1 when driver not loaded, - * other negative value for other failure - */ -static int hax_open_device(hax_fd *fd) -{ - uint32_t errNum = 0; - HANDLE hDevice; - - if (!fd) { - return -2; - } - - hDevice = CreateFile("\\\\.\\HAX", - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hDevice == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Failed to open the HAX device!\n"); - errNum = GetLastError(); - if (errNum == ERROR_FILE_NOT_FOUND) { - return -1; - } - return -2; - } - *fd = hDevice; - return 0; -} - -/* hax_fd hax_mod_open */ - hax_fd hax_mod_open(void) -{ - int ret; - hax_fd fd = NULL; - - ret = hax_open_device(&fd); - if (ret != 0) { - fprintf(stderr, "Open HAX device failed\n"); - } - - return fd; -} - -int hax_populate_ram(uint64_t va, uint64_t size) -{ - int ret; - HANDLE hDeviceVM; - DWORD dSize = 0; - - if (!hax_global.vm || !hax_global.vm->fd) { - fprintf(stderr, "Allocate memory before vm create?\n"); - return -EINVAL; - } - - hDeviceVM = hax_global.vm->fd; - if (hax_global.supports_64bit_ramblock) { - struct hax_ramblock_info ramblock = { - .start_va = va, - .size = size, - .reserved = 0 - }; - - ret = DeviceIoControl(hDeviceVM, - HAX_VM_IOCTL_ADD_RAMBLOCK, - &ramblock, sizeof(ramblock), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } else { - struct hax_alloc_ram_info info = { - .size = (uint32_t) size, - .pad = 0, - .va = va - }; - - ret = DeviceIoControl(hDeviceVM, - HAX_VM_IOCTL_ALLOC_RAM, - &info, sizeof(info), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } - - if (!ret) { - fprintf(stderr, "Failed to register RAM block: va=0x%" PRIx64 - ", size=0x%" PRIx64 ", method=%s\n", va, size, - hax_global.supports_64bit_ramblock ? "new" : "legacy"); - return ret; - } - - return 0; -} - -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags) -{ - struct hax_set_ram_info info; - HANDLE hDeviceVM = hax_global.vm->fd; - DWORD dSize = 0; - int ret; - - info.pa_start = start_pa; - info.size = size; - info.va = host_va; - info.flags = (uint8_t) flags; - - ret = DeviceIoControl(hDeviceVM, HAX_VM_IOCTL_SET_RAM, - &info, sizeof(info), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap) -{ - int ret; - HANDLE hDevice = hax->fd; /* handle to hax module */ - DWORD dSize = 0; - DWORD err = 0; - - if (hax_invalid_fd(hDevice)) { - fprintf(stderr, "Invalid fd for hax device!\n"); - return -ENODEV; - } - - ret = DeviceIoControl(hDevice, HAX_IOCTL_CAPABILITY, NULL, 0, cap, - sizeof(*cap), &dSize, (LPOVERLAPPED) NULL); - - if (!ret) { - err = GetLastError(); - if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) { - fprintf(stderr, "hax capability is too long to hold.\n"); - } - fprintf(stderr, "Failed to get Hax capability:%luu\n", err); - return -EFAULT; - } else { - return 0; - } -} - -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) -{ - int ret; - HANDLE hDevice = hax->fd; /* handle to hax module */ - DWORD dSize = 0; - DWORD err = 0; - - if (hax_invalid_fd(hDevice)) { - fprintf(stderr, "Invalid fd for hax device!\n"); - return -ENODEV; - } - - ret = DeviceIoControl(hDevice, - HAX_IOCTL_VERSION, - NULL, 0, - version, sizeof(*version), &dSize, - (LPOVERLAPPED) NULL); - - if (!ret) { - err = GetLastError(); - if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) { - fprintf(stderr, "hax module verion is too long to hold.\n"); - } - fprintf(stderr, "Failed to get Hax module version:%lu\n", err); - return -EFAULT; - } else { - return 0; - } -} - -static char *hax_vm_devfs_string(int vm_id) -{ - return g_strdup_printf("\\\\.\\hax_vm%02d", vm_id); -} - -static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) -{ - return g_strdup_printf("\\\\.\\hax_vm%02d_vcpu%02d", vm_id, vcpu_id); -} - -int hax_host_create_vm(struct hax_state *hax, int *vmid) -{ - int ret; - int vm_id = 0; - DWORD dSize = 0; - - if (hax_invalid_fd(hax->fd)) { - return -EINVAL; - } - - if (hax->vm) { - return 0; - } - - ret = DeviceIoControl(hax->fd, - HAX_IOCTL_CREATE_VM, - NULL, 0, &vm_id, sizeof(vm_id), &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to create VM. Error code: %lu\n", - GetLastError()); - return -1; - } - *vmid = vm_id; - return 0; -} - -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id) -{ - char *vm_name = NULL; - hax_fd hDeviceVM; - - vm_name = hax_vm_devfs_string(vm_id); - if (!vm_name) { - fprintf(stderr, "Failed to open VM. VM name is null\n"); - return INVALID_HANDLE_VALUE; - } - - hDeviceVM = CreateFile(vm_name, - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hDeviceVM == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Open the vm device error:%s, ec:%lu\n", - vm_name, GetLastError()); - } - - g_free(vm_name); - return hDeviceVM; -} - -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion) -{ - int ret; - DWORD dSize = 0; - if (hax_invalid_fd(vm_fd)) { - return -EINVAL; - } - ret = DeviceIoControl(vm_fd, - HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, - qversion, sizeof(struct hax_qemu_version), - NULL, 0, &dSize, (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to notify qemu API version\n"); - return -1; - } - return 0; -} - -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid) -{ - int ret; - DWORD dSize = 0; - - ret = DeviceIoControl(vm_fd, - HAX_VM_IOCTL_VCPU_CREATE, - &vcpuid, sizeof(vcpuid), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to create vcpu %x\n", vcpuid); - return -1; - } - - return 0; -} - -hax_fd hax_host_open_vcpu(int vmid, int vcpuid) -{ - char *devfs_path = NULL; - hax_fd hDeviceVCPU; - - devfs_path = hax_vcpu_devfs_string(vmid, vcpuid); - if (!devfs_path) { - fprintf(stderr, "Failed to get the devfs\n"); - return INVALID_HANDLE_VALUE; - } - - hDeviceVCPU = CreateFile(devfs_path, - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, - NULL); - - if (hDeviceVCPU == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Failed to open the vcpu devfs\n"); - } - g_free(devfs_path); - return hDeviceVCPU; -} - -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu) -{ - hax_fd hDeviceVCPU = vcpu->fd; - int ret; - struct hax_tunnel_info info; - DWORD dSize = 0; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SETUP_TUNNEL, - NULL, 0, &info, sizeof(info), &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to setup the hax tunnel\n"); - return -1; - } - - if (!valid_hax_tunnel_size(info.size)) { - fprintf(stderr, "Invalid hax tunnel size %x\n", info.size); - ret = -EINVAL; - return ret; - } - vcpu->tunnel = (struct hax_tunnel *) (intptr_t) (info.va); - vcpu->iobuf = (unsigned char *) (intptr_t) (info.io_va); - return 0; -} - -int hax_vcpu_run(AccelCPUState *vcpu) -{ - int ret; - HANDLE hDeviceVCPU = vcpu->fd; - DWORD dSize = 0; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_RUN, - NULL, 0, NULL, 0, &dSize, (LPOVERLAPPED) NULL); - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize = 0; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SET_FPU, - fl, sizeof(*fl), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_GET_FPU, - NULL, 0, fl, sizeof(*fl), &dSize, - (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize = 0; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SET_MSRS, - msrs, sizeof(*msrs), - msrs, sizeof(*msrs), &dSize, (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_GET_MSRS, - msrs, sizeof(*msrs), - msrs, sizeof(*msrs), &dSize, (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_SET_REGS, - state, sizeof(*state), - NULL, 0, &dSize, (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_GET_REGS, - NULL, 0, - state, sizeof(*state), &dSize, - (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_inject_interrupt(CPUArchState *env, int vector) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_INTERRUPT, - &vector, sizeof(vector), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -static void CALLBACK dummy_apc_func(ULONG_PTR unused) -{ -} - -void hax_kick_vcpu_thread(CPUState *cpu) -{ - /* - * FIXME: race condition with the exit_request check in - * hax_vcpu_hax_exec - */ - cpu->exit_request = 1; - if (!qemu_cpu_is_self(cpu)) { - if (!QueueUserAPC(dummy_apc_func, cpu->accel->hThread, 0)) { - fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n", - __func__, GetLastError()); - exit(1); - } - } -} diff --git a/accel/Kconfig b/accel/Kconfig index 8bdedb7d15..a30cf2eb48 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -4,9 +4,6 @@ config WHPX config NVMM bool -config HAX - bool - config HVF bool diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index f7a9486e06..6b0f200efe 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,5 +1,4 @@ sysemu_stubs_ss = ss.source_set() -sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) diff --git a/meson_options.txt b/meson_options.txt index aaea5ddd77..4f3b1ecab0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -69,8 +69,6 @@ option('malloc', type : 'combo', choices : ['system', 'tcmalloc', 'jemalloc'], option('kvm', type: 'feature', value: 'auto', description: 'KVM acceleration support') -option('hax', type: 'feature', value: 'auto', - description: 'HAX acceleration support') option('whpx', type: 'feature', value: 'auto', description: 'WHPX acceleration support') option('hvf', type: 'feature', value: 'auto', diff --git a/qemu-options.hx b/qemu-options.hx index 29b98c3d4c..463f520c57 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -26,7 +26,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=]name[,prop[=value][,...]]\n" " selects emulated machine ('-machine help' for list)\n" " property accel=accel1[:accel2[:...]] selects accelerator\n" - " supported accelerators are kvm, xen, hax, hvf, nvmm, whpx or tcg (default: tcg)\n" + " supported accelerators are kvm, xen, hvf, nvmm, whpx or tcg (default: tcg)\n" " vmport=on|off|auto controls emulation of vmport (default: auto)\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" @@ -59,7 +59,7 @@ SRST ``accel=accels1[:accels2[:...]]`` This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. + architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. @@ -178,7 +178,7 @@ ERST DEF("accel", HAS_ARG, QEMU_OPTION_accel, "-accel [accel=]accelerator[,prop[=value][,...]]\n" - " select accelerator (kvm, xen, hax, hvf, nvmm, whpx or tcg; use 'help' for a list)\n" + " select accelerator (kvm, xen, hvf, nvmm, whpx or tcg; use 'help' for a list)\n" " igd-passthru=on|off (enable Xen integrated Intel graphics passthrough, default=off)\n" " kernel-irqchip=on|off|split controls accelerated irqchip support (default=on)\n" " kvm-shadow-mem=size of KVM shadow MMU in bytes\n" @@ -191,7 +191,7 @@ DEF("accel", HAS_ARG, QEMU_OPTION_accel, SRST ``-accel name[,prop=value[,...]]`` This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. By + architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index d02b09a4b9..131f8ee5f3 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -68,7 +68,6 @@ --disable-gtk \ --disable-guest-agent \ --disable-guest-agent-msi \ ---disable-hax \ --disable-hvf \ --disable-iconv \ --disable-kvm \ diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 9da3fe299b..504a61ad01 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -110,7 +110,6 @@ meson_options_help() { printf "%s\n" ' gtk-clipboard clipboard support for the gtk UI (EXPERIMENTAL, MAY HANG)' printf "%s\n" ' guest-agent Build QEMU Guest Agent' printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Agent' - printf "%s\n" ' hax HAX acceleration support' printf "%s\n" ' hvf HVF acceleration support' printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' @@ -312,8 +311,6 @@ _meson_option_parse() { --disable-guest-agent) printf "%s" -Dguest_agent=disabled ;; --enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;; --disable-guest-agent-msi) printf "%s" -Dguest_agent_msi=disabled ;; - --enable-hax) printf "%s" -Dhax=enabled ;; - --disable-hax) printf "%s" -Dhax=disabled ;; --enable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=true ;; --disable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=false ;; --enable-hvf) printf "%s" -Dhvf=enabled ;; diff --git a/target/i386/hax/meson.build b/target/i386/hax/meson.build deleted file mode 100644 index 6ac314aa35..0000000000 --- a/target/i386/hax/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -i386_system_ss.add(when: 'CONFIG_HAX', if_true: files( - 'hax-all.c', - 'hax-mem.c', - 'hax-accel-ops.c', -)) -i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c')) -i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c')) diff --git a/target/i386/meson.build b/target/i386/meson.build index 1effe1ed9a..6f1036d469 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -25,7 +25,6 @@ i386_system_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files( i386_user_ss = ss.source_set() subdir('kvm') -subdir('hax') subdir('whpx') subdir('nvmm') subdir('hvf') -- 2.41.0

3 2

[PULL 01/41] accel: Remove HAX accelerator
by Philippe Mathieu-Daudé 31 Aug '23

31 Aug '23

HAX is deprecated since commits 73741fda6c ("MAINTAINERS: Abort HAXM maintenance") and 90c167a1da ("docs/about/deprecated: Mark HAXM in QEMU as deprecated"), released in v8.0.0. Per the latest HAXM release (v7.8 [*]), the latest QEMU supported is v7.2: Note: Up to this release, HAXM supports QEMU from 2.9.0 to 7.2.0. The next commit (https://github.com/intel/haxm/commit/da1b8ec072) added: HAXM v7.8.0 is our last release and we will not accept pull requests or respond to issues after this. It became very hard to build and test HAXM. Its previous maintainers made it clear they won't help. It doesn't seem to be a very good use of QEMU maintainers to spend their time in a dead project. Save our time by removing this orphan zombie code. [*] https://github.com/intel/haxm/releases/tag/v7.8.0 Reviewed-by: Richard Henderson <richard.henderson(a)linaro.org> Acked-by: Markus Armbruster <armbru(a)redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> Reviewed-by: Thomas Huth <thuth(a)redhat.com> Message-Id: <20230831082016.60885-1-philmd(a)linaro.org> --- MAINTAINERS | 8 - docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 6 - docs/about/index.rst | 2 +- docs/about/removed-features.rst | 11 +- docs/system/index.rst | 2 +- docs/system/introduction.rst | 3 - meson.build | 7 - include/exec/poison.h | 1 - include/hw/core/cpu.h | 2 +- include/sysemu/hax.h | 49 - include/sysemu/hw_accel.h | 1 - target/i386/hax/hax-accel-ops.h | 31 - target/i386/hax/hax-i386.h | 98 -- target/i386/hax/hax-interface.h | 369 ------ target/i386/hax/hax-posix.h | 61 - target/i386/hax/hax-windows.h | 88 -- accel/stubs/hax-stub.c | 24 - hw/intc/apic_common.c | 3 +- softmmu/cpus.c | 6 - softmmu/vl.c | 6 - target/i386/hax/hax-accel-ops.c | 105 -- target/i386/hax/hax-all.c | 1141 ----------------- target/i386/hax/hax-mem.c | 323 ----- target/i386/hax/hax-posix.c | 305 ----- target/i386/hax/hax-windows.c | 485 ------- accel/Kconfig | 3 - accel/stubs/meson.build | 1 - meson_options.txt | 2 - qemu-options.hx | 8 +- .../ci/org.centos/stream/8/x86_64/configure | 1 - scripts/meson-buildoptions.sh | 3 - target/i386/hax/meson.build | 7 - target/i386/meson.build | 1 - 34 files changed, 16 insertions(+), 3149 deletions(-) delete mode 100644 include/sysemu/hax.h delete mode 100644 target/i386/hax/hax-accel-ops.h delete mode 100644 target/i386/hax/hax-i386.h delete mode 100644 target/i386/hax/hax-interface.h delete mode 100644 target/i386/hax/hax-posix.h delete mode 100644 target/i386/hax/hax-windows.h delete mode 100644 accel/stubs/hax-stub.c delete mode 100644 target/i386/hax/hax-accel-ops.c delete mode 100644 target/i386/hax/hax-all.c delete mode 100644 target/i386/hax/hax-mem.c delete mode 100644 target/i386/hax/hax-posix.c delete mode 100644 target/i386/hax/hax-windows.c delete mode 100644 target/i386/hax/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 6111b6b4d9..3b29568ed4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -543,14 +543,6 @@ F: include/sysemu/xen.h F: include/sysemu/xen-mapcache.h F: stubs/xen-hw-stub.c -Guest CPU Cores (HAXM) ---------------------- -X86 HAXM CPUs -S: Orphan -F: accel/stubs/hax-stub.c -F: include/sysemu/hax.h -F: target/i386/hax/ - Guest CPU Cores (NVMM) ---------------------- NetBSD Virtual Machine Monitor (NVMM) CPU support diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 0e2cb9e770..f2a7aec56f 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -52,7 +52,7 @@ Those hosts are officially supported, with various accelerators: * - SPARC - tcg * - x86 - - hax, hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen + - hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen Other host architectures are not supported. It is possible to build QEMU system emulation on an unsupported host architecture using the configure diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 92a2bafd2b..dc4da95329 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -105,12 +105,6 @@ Use ``-machine hpet=off`` instead. The ``-no-acpi`` setting has been turned into a machine property. Use ``-machine acpi=off`` instead. -``-accel hax`` (since 8.0) -'''''''''''''''''''''''''' - -The HAXM project has been retired (see https://github.com/intel/haxm#status) -Use "whpx" (on Windows) or "hvf" (on macOS) instead. - ``-async-teardown`` (since 8.1) ''''''''''''''''''''''''''''''' diff --git a/docs/about/index.rst b/docs/about/index.rst index b00b584b31..4f96ab5d91 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -8,7 +8,7 @@ QEMU can be used in several different ways. The most common is for :ref:`System Emulation`, where it provides a virtual model of an entire machine (CPU, memory and emulated devices) to run a guest OS. In this mode the CPU may be fully emulated, or it may work with a -hypervisor such as KVM, Xen, Hax or Hypervisor.Framework to allow the +hypervisor such as KVM, Xen or Hypervisor.Framework to allow the guest to run directly on the host CPU. The second supported way to use QEMU is :ref:`User Mode Emulation`, diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 5b258b446b..c2043fd415 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -659,15 +659,18 @@ Use ``Icelake-Server`` instead. System accelerators ------------------- -Userspace local APIC with KVM (x86, removed 8.0) -'''''''''''''''''''''''''''''''''''''''''''''''' +Userspace local APIC with KVM (x86, removed in 8.0) +''''''''''''''''''''''''''''''''''''''''''''''''''' ``-M kernel-irqchip=off`` cannot be used on KVM if the CPU model includes a local APIC. The ``split`` setting is supported, as is using ``-M kernel-irqchip=off`` when the CPU does not have a local APIC. -System accelerators -------------------- +HAXM (``-accel hax``) (removed in 8.2) +'''''''''''''''''''''''''''''''''''''' + +The HAXM project has been retired (see https://github.com/intel/haxm#status) +Use "whpx" (on Windows) or "hvf" (on macOS) instead. MIPS "Trap-and-Emulate" KVM support (removed in 8.0) '''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/system/index.rst b/docs/system/index.rst index 3605bbe1ce..45bf1f19e7 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -6,7 +6,7 @@ System Emulation This section of the manual is the overall guide for users using QEMU for full system emulation (as opposed to user-mode emulation). -This includes working with hypervisors such as KVM, Xen, Hax +This includes working with hypervisors such as KVM, Xen or Hypervisor.Framework. .. toctree:: diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst index 3e256f8326..51ac132d6c 100644 --- a/docs/system/introduction.rst +++ b/docs/system/introduction.rst @@ -21,9 +21,6 @@ Tiny Code Generator (TCG) capable of emulating many CPUs. * - Xen - Linux (as dom0) - Arm, x86 - * - Intel HAXM (hax) - - Linux, Windows - - x86 * - Hypervisor Framework (hvf) - MacOS - x86 (64 bit only), Arm (64 bit only) diff --git a/meson.build b/meson.build index 98e68ef0b1..ec14079c67 100644 --- a/meson.build +++ b/meson.build @@ -140,7 +140,6 @@ if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] endif if cpu in ['x86', 'x86_64'] accelerator_targets += { - 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_NVMM': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], @@ -663,11 +662,6 @@ if get_option('hvf').allowed() accelerators += 'CONFIG_HVF' endif endif -if get_option('hax').allowed() - if get_option('hax').enabled() or targetos in ['windows', 'darwin', 'netbsd'] - accelerators += 'CONFIG_HAX' - endif -endif if targetos == 'netbsd' nvmm = cc.find_library('nvmm', required: get_option('nvmm')) if nvmm.found() @@ -4140,7 +4134,6 @@ endif summary_info = {} if have_system summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')} - summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')} summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')} summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')} summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')} diff --git a/include/exec/poison.h b/include/exec/poison.h index e94ee8dfef..1ea5633eb3 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -81,7 +81,6 @@ #pragma GCC poison CONFIG_SPARC_DIS #pragma GCC poison CONFIG_XTENSA_DIS -#pragma GCC poison CONFIG_HAX #pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index fdcbe87352..92a4234439 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -422,7 +422,7 @@ struct CPUState { int32_t exception_index; AccelCPUState *accel; - /* shared by kvm, hax and hvf */ + /* shared by kvm and hvf */ bool vcpu_dirty; /* Used to keep track of an outstanding cpu throttle thread for migration diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h deleted file mode 100644 index 80fc716f80..0000000000 --- a/include/sysemu/hax.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright IBM, Corp. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * Copyright 2016 Google, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* header to be included in non-HAX-specific code */ - -#ifndef QEMU_HAX_H -#define QEMU_HAX_H - -int hax_sync_vcpus(void); - -#ifdef NEED_CPU_H -# ifdef CONFIG_HAX -# define CONFIG_HAX_IS_POSSIBLE -# endif -#else /* !NEED_CPU_H */ -# define CONFIG_HAX_IS_POSSIBLE -#endif - -#ifdef CONFIG_HAX_IS_POSSIBLE - -extern bool hax_allowed; - -#define hax_enabled() (hax_allowed) - -#else /* !CONFIG_HAX_IS_POSSIBLE */ - -#define hax_enabled() (0) - -#endif /* CONFIG_HAX_IS_POSSIBLE */ - -#endif /* QEMU_HAX_H */ diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h index 22903a55f7..c71b77e71f 100644 --- a/include/sysemu/hw_accel.h +++ b/include/sysemu/hw_accel.h @@ -12,7 +12,6 @@ #define QEMU_HW_ACCEL_H #include "hw/core/cpu.h" -#include "sysemu/hax.h" #include "sysemu/kvm.h" #include "sysemu/hvf.h" #include "sysemu/whpx.h" diff --git a/target/i386/hax/hax-accel-ops.h b/target/i386/hax/hax-accel-ops.h deleted file mode 100644 index 9e357e7b40..0000000000 --- a/target/i386/hax/hax-accel-ops.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Accelerator CPUS Interface - * - * Copyright 2020 SUSE LLC - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef TARGET_I386_HAX_ACCEL_OPS_H -#define TARGET_I386_HAX_ACCEL_OPS_H - -#include "sysemu/cpus.h" - -#include "hax-interface.h" -#include "hax-i386.h" - -int hax_init_vcpu(CPUState *cpu); -int hax_smp_cpu_exec(CPUState *cpu); -int hax_populate_ram(uint64_t va, uint64_t size); - -void hax_cpu_synchronize_state(CPUState *cpu); -void hax_cpu_synchronize_post_reset(CPUState *cpu); -void hax_cpu_synchronize_post_init(CPUState *cpu); -void hax_cpu_synchronize_pre_loadvm(CPUState *cpu); - -int hax_vcpu_destroy(CPUState *cpu); -void hax_raise_event(CPUState *cpu); -void hax_reset_vcpu_state(void *opaque); - -#endif /* TARGET_I386_HAX_ACCEL_OPS_H */ diff --git a/target/i386/hax/hax-i386.h b/target/i386/hax/hax-i386.h deleted file mode 100644 index 87153f40ab..0000000000 --- a/target/i386/hax/hax-i386.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef HAX_I386_H -#define HAX_I386_H - -#include "cpu.h" -#include "sysemu/hax.h" - -#ifdef CONFIG_POSIX -typedef int hax_fd; -#endif - -#ifdef CONFIG_WIN32 -typedef HANDLE hax_fd; -#endif - -extern struct hax_state hax_global; - -struct AccelCPUState { -#ifdef _WIN32 - HANDLE hThread; -#endif - hax_fd fd; - int vcpu_id; - struct hax_tunnel *tunnel; - unsigned char *iobuf; -}; - -struct hax_state { - hax_fd fd; /* the global hax device interface */ - uint32_t version; - struct hax_vm *vm; - uint64_t mem_quota; - bool supports_64bit_ramblock; -}; - -#define HAX_MAX_VCPU 0x10 - -struct hax_vm { - hax_fd fd; - int id; - int numvcpus; - AccelCPUState **vcpus; -}; - -/* Functions exported to host specific mode */ -hax_fd hax_vcpu_get_fd(CPUArchState *env); -int valid_hax_tunnel_size(uint16_t size); - -/* Host specific functions */ -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version); -int hax_inject_interrupt(CPUArchState *env, int vector); -struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus); -int hax_vcpu_run(AccelCPUState *vcpu); -int hax_vcpu_create(int id); -void hax_kick_vcpu_thread(CPUState *cpu); - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, - int set); -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set); -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set); - -int hax_vm_destroy(struct hax_vm *vm); -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap); -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion); -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags); - -/* Common host function */ -int hax_host_create_vm(struct hax_state *hax, int *vm_id); -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id); -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid); -hax_fd hax_host_open_vcpu(int vmid, int vcpuid); -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu); -hax_fd hax_mod_open(void); -void hax_memory_init(void); - - -#ifdef CONFIG_POSIX -#include "hax-posix.h" -#endif - -#ifdef CONFIG_WIN32 -#include "hax-windows.h" -#endif - -#include "hax-interface.h" - -#endif diff --git a/target/i386/hax/hax-interface.h b/target/i386/hax/hax-interface.h deleted file mode 100644 index 537ae084e9..0000000000 --- a/target/i386/hax/hax-interface.h +++ /dev/null @@ -1,369 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* Interface with HAX kernel module */ - -#ifndef HAX_INTERFACE_H -#define HAX_INTERFACE_H - -/* fx_layout has 3 formats table 3-56, 512bytes */ -struct fx_layout { - uint16_t fcw; - uint16_t fsw; - uint8_t ftw; - uint8_t res1; - uint16_t fop; - union { - struct { - uint32_t fip; - uint16_t fcs; - uint16_t res2; - }; - uint64_t fpu_ip; - }; - union { - struct { - uint32_t fdp; - uint16_t fds; - uint16_t res3; - }; - uint64_t fpu_dp; - }; - uint32_t mxcsr; - uint32_t mxcsr_mask; - uint8_t st_mm[8][16]; - uint8_t mmx_1[8][16]; - uint8_t mmx_2[8][16]; - uint8_t pad[96]; -} __attribute__ ((aligned(8))); - -struct vmx_msr { - uint64_t entry; - uint64_t value; -} __attribute__ ((__packed__)); - -/* - * Fixed array is not good, but it makes Mac support a bit easier by avoiding - * memory map or copyin staff. - */ -#define HAX_MAX_MSR_ARRAY 0x20 -struct hax_msr_data { - uint16_t nr_msr; - uint16_t done; - uint16_t pad[2]; - struct vmx_msr entries[HAX_MAX_MSR_ARRAY]; -} __attribute__ ((__packed__)); - -union interruptibility_state_t { - uint32_t raw; - struct { - uint32_t sti_blocking:1; - uint32_t movss_blocking:1; - uint32_t smi_blocking:1; - uint32_t nmi_blocking:1; - uint32_t reserved:28; - }; - uint64_t pad; -}; - -typedef union interruptibility_state_t interruptibility_state_t; - -/* Segment descriptor */ -struct segment_desc_t { - uint16_t selector; - uint16_t _dummy; - uint32_t limit; - uint64_t base; - union { - struct { - uint32_t type:4; - uint32_t desc:1; - uint32_t dpl:2; - uint32_t present:1; - uint32_t:4; - uint32_t available:1; - uint32_t long_mode:1; - uint32_t operand_size:1; - uint32_t granularity:1; - uint32_t null:1; - uint32_t:15; - }; - uint32_t ar; - }; - uint32_t ipad; -}; - -typedef struct segment_desc_t segment_desc_t; - -struct vcpu_state_t { - union { - uint64_t _regs[16]; - struct { - union { - struct { - uint8_t _al, _ah; - }; - uint16_t _ax; - uint32_t _eax; - uint64_t _rax; - }; - union { - struct { - uint8_t _cl, _ch; - }; - uint16_t _cx; - uint32_t _ecx; - uint64_t _rcx; - }; - union { - struct { - uint8_t _dl, _dh; - }; - uint16_t _dx; - uint32_t _edx; - uint64_t _rdx; - }; - union { - struct { - uint8_t _bl, _bh; - }; - uint16_t _bx; - uint32_t _ebx; - uint64_t _rbx; - }; - union { - uint16_t _sp; - uint32_t _esp; - uint64_t _rsp; - }; - union { - uint16_t _bp; - uint32_t _ebp; - uint64_t _rbp; - }; - union { - uint16_t _si; - uint32_t _esi; - uint64_t _rsi; - }; - union { - uint16_t _di; - uint32_t _edi; - uint64_t _rdi; - }; - - uint64_t _r8; - uint64_t _r9; - uint64_t _r10; - uint64_t _r11; - uint64_t _r12; - uint64_t _r13; - uint64_t _r14; - uint64_t _r15; - }; - }; - - union { - uint32_t _eip; - uint64_t _rip; - }; - - union { - uint32_t _eflags; - uint64_t _rflags; - }; - - segment_desc_t _cs; - segment_desc_t _ss; - segment_desc_t _ds; - segment_desc_t _es; - segment_desc_t _fs; - segment_desc_t _gs; - segment_desc_t _ldt; - segment_desc_t _tr; - - segment_desc_t _gdt; - segment_desc_t _idt; - - uint64_t _cr0; - uint64_t _cr2; - uint64_t _cr3; - uint64_t _cr4; - - uint64_t _dr0; - uint64_t _dr1; - uint64_t _dr2; - uint64_t _dr3; - uint64_t _dr6; - uint64_t _dr7; - uint64_t _pde; - - uint32_t _efer; - - uint32_t _sysenter_cs; - uint64_t _sysenter_eip; - uint64_t _sysenter_esp; - - uint32_t _activity_state; - uint32_t pad; - interruptibility_state_t _interruptibility_state; -}; - -/* HAX exit status */ -enum exit_status { - /* IO port request */ - HAX_EXIT_IO = 1, - /* MMIO instruction emulation */ - HAX_EXIT_MMIO, - /* QEMU emulation mode request, currently means guest enter non-PG mode */ - HAX_EXIT_REAL, - /* - * Interrupt window open, qemu can inject interrupt now - * Also used when signal pending since at that time qemu usually need - * check interrupt - */ - HAX_EXIT_INTERRUPT, - /* Unknown vmexit, mostly trigger reboot */ - HAX_EXIT_UNKNOWN_VMEXIT, - /* HALT from guest */ - HAX_EXIT_HLT, - /* Reboot request, like because of tripple fault in guest */ - HAX_EXIT_STATECHANGE, - /* the vcpu is now only paused when destroy, so simply return to hax */ - HAX_EXIT_PAUSED, - HAX_EXIT_FAST_MMIO, -}; - -/* - * The interface definition: - * 1. vcpu_run execute will return 0 on success, otherwise mean failed - * 2. exit_status return the exit reason, as stated in enum exit_status - * 3. exit_reason is the vmx exit reason - */ -struct hax_tunnel { - uint32_t _exit_reason; - uint32_t _exit_flag; - uint32_t _exit_status; - uint32_t user_event_pending; - int ready_for_interrupt_injection; - int request_interrupt_window; - union { - struct { - /* 0: read, 1: write */ -#define HAX_EXIT_IO_IN 1 -#define HAX_EXIT_IO_OUT 0 - uint8_t _direction; - uint8_t _df; - uint16_t _size; - uint16_t _port; - uint16_t _count; - uint8_t _flags; - uint8_t _pad0; - uint16_t _pad1; - uint32_t _pad2; - uint64_t _vaddr; - } pio; - struct { - uint64_t gla; - } mmio; - struct { - } state; - }; -} __attribute__ ((__packed__)); - -struct hax_module_version { - uint32_t compat_version; - uint32_t cur_version; -} __attribute__ ((__packed__)); - -/* This interface is support only after API version 2 */ -struct hax_qemu_version { - /* Current API version in QEMU */ - uint32_t cur_version; - /* The minimum API version supported by QEMU */ - uint32_t min_version; -} __attribute__ ((__packed__)); - -/* The mac specfic interface to qemu, mostly is ioctl related */ -struct hax_tunnel_info { - uint64_t va; - uint64_t io_va; - uint16_t size; - uint16_t pad[3]; -} __attribute__ ((__packed__)); - -struct hax_alloc_ram_info { - uint32_t size; - uint32_t pad; - uint64_t va; -} __attribute__ ((__packed__)); - -struct hax_ramblock_info { - uint64_t start_va; - uint64_t size; - uint64_t reserved; -} __attribute__ ((__packed__)); - -#define HAX_RAM_INFO_ROM 0x01 /* Read-Only */ -#define HAX_RAM_INFO_INVALID 0x80 /* Unmapped, usually used for MMIO */ -struct hax_set_ram_info { - uint64_t pa_start; - uint32_t size; - uint8_t flags; - uint8_t pad[3]; - uint64_t va; -} __attribute__ ((__packed__)); - -#define HAX_CAP_STATUS_WORKING 0x1 -#define HAX_CAP_STATUS_NOTWORKING 0x0 -#define HAX_CAP_WORKSTATUS_MASK 0x1 - -#define HAX_CAP_FAILREASON_VT 0x1 -#define HAX_CAP_FAILREASON_NX 0x2 - -#define HAX_CAP_MEMQUOTA 0x2 -#define HAX_CAP_UG 0x4 -#define HAX_CAP_64BIT_RAMBLOCK 0x8 - -struct hax_capabilityinfo { - /* bit 0: 1 - working - * 0 - not working, possibly because NT/NX disabled - * bit 1: 1 - memory limitation working - * 0 - no memory limitation - */ - uint16_t wstatus; - /* valid when not working - * bit 0: VT not enabeld - * bit 1: NX not enabled*/ - uint16_t winfo; - uint32_t pad; - uint64_t mem_quota; -} __attribute__ ((__packed__)); - -struct hax_fastmmio { - uint64_t gpa; - union { - uint64_t value; - uint64_t gpa2; /* since HAX API v4 */ - }; - uint8_t size; - uint8_t direction; - uint16_t reg_index; - uint32_t pad0; - uint64_t _cr0; - uint64_t _cr2; - uint64_t _cr3; - uint64_t _cr4; -} __attribute__ ((__packed__)); -#endif diff --git a/target/i386/hax/hax-posix.h b/target/i386/hax/hax-posix.h deleted file mode 100644 index fb7c64426d..0000000000 --- a/target/i386/hax/hax-posix.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef TARGET_I386_HAX_POSIX_H -#define TARGET_I386_HAX_POSIX_H - -#include <sys/ioctl.h> - -#define HAX_INVALID_FD (-1) -static inline int hax_invalid_fd(hax_fd fd) -{ - return fd <= 0; -} - -static inline void hax_mod_close(struct hax_state *hax) -{ - close(hax->fd); -} - -static inline void hax_close_fd(hax_fd fd) -{ - close(fd); -} - -/* HAX model level ioctl */ -#define HAX_IOCTL_VERSION _IOWR(0, 0x20, struct hax_module_version) -#define HAX_IOCTL_CREATE_VM _IOWR(0, 0x21, uint32_t) -#define HAX_IOCTL_DESTROY_VM _IOW(0, 0x22, uint32_t) -#define HAX_IOCTL_CAPABILITY _IOR(0, 0x23, struct hax_capabilityinfo) - -#define HAX_VM_IOCTL_VCPU_CREATE _IOWR(0, 0x80, uint32_t) -#define HAX_VM_IOCTL_ALLOC_RAM _IOWR(0, 0x81, struct hax_alloc_ram_info) -#define HAX_VM_IOCTL_SET_RAM _IOWR(0, 0x82, struct hax_set_ram_info) -#define HAX_VM_IOCTL_VCPU_DESTROY _IOW(0, 0x83, uint32_t) -#define HAX_VM_IOCTL_NOTIFY_QEMU_VERSION _IOW(0, 0x84, struct hax_qemu_version) -#define HAX_VM_IOCTL_ADD_RAMBLOCK _IOW(0, 0x85, struct hax_ramblock_info) - -#define HAX_VCPU_IOCTL_RUN _IO(0, 0xc0) -#define HAX_VCPU_IOCTL_SET_MSRS _IOWR(0, 0xc1, struct hax_msr_data) -#define HAX_VCPU_IOCTL_GET_MSRS _IOWR(0, 0xc2, struct hax_msr_data) - -#define HAX_VCPU_IOCTL_SET_FPU _IOW(0, 0xc3, struct fx_layout) -#define HAX_VCPU_IOCTL_GET_FPU _IOR(0, 0xc4, struct fx_layout) - -#define HAX_VCPU_IOCTL_SETUP_TUNNEL _IOWR(0, 0xc5, struct hax_tunnel_info) -#define HAX_VCPU_IOCTL_INTERRUPT _IOWR(0, 0xc6, uint32_t) -#define HAX_VCPU_SET_REGS _IOWR(0, 0xc7, struct vcpu_state_t) -#define HAX_VCPU_GET_REGS _IOWR(0, 0xc8, struct vcpu_state_t) - -#endif /* TARGET_I386_HAX_POSIX_H */ diff --git a/target/i386/hax/hax-windows.h b/target/i386/hax/hax-windows.h deleted file mode 100644 index b1f5d4f32f..0000000000 --- a/target/i386/hax/hax-windows.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright IBM, Corp. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef TARGET_I386_HAX_WINDOWS_H -#define TARGET_I386_HAX_WINDOWS_H - -#include <winioctl.h> -#include <windef.h> - -#include "hax-accel-ops.h" - -#define HAX_INVALID_FD INVALID_HANDLE_VALUE - -static inline void hax_mod_close(struct hax_state *hax) -{ - CloseHandle(hax->fd); -} - -static inline void hax_close_fd(hax_fd fd) -{ - CloseHandle(fd); -} - -static inline int hax_invalid_fd(hax_fd fd) -{ - return (fd == INVALID_HANDLE_VALUE); -} - -#define HAX_DEVICE_TYPE 0x4000 - -#define HAX_IOCTL_VERSION CTL_CODE(HAX_DEVICE_TYPE, 0x900, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_IOCTL_CREATE_VM CTL_CODE(HAX_DEVICE_TYPE, 0x901, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_IOCTL_CAPABILITY CTL_CODE(HAX_DEVICE_TYPE, 0x910, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VM_IOCTL_VCPU_CREATE CTL_CODE(HAX_DEVICE_TYPE, 0x902, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_ALLOC_RAM CTL_CODE(HAX_DEVICE_TYPE, 0x903, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_SET_RAM CTL_CODE(HAX_DEVICE_TYPE, 0x904, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_VCPU_DESTROY CTL_CODE(HAX_DEVICE_TYPE, 0x905, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_ADD_RAMBLOCK CTL_CODE(HAX_DEVICE_TYPE, 0x913, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VCPU_IOCTL_RUN CTL_CODE(HAX_DEVICE_TYPE, 0x906, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_SET_MSRS CTL_CODE(HAX_DEVICE_TYPE, 0x907, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_GET_MSRS CTL_CODE(HAX_DEVICE_TYPE, 0x908, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_SET_FPU CTL_CODE(HAX_DEVICE_TYPE, 0x909, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_GET_FPU CTL_CODE(HAX_DEVICE_TYPE, 0x90a, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VCPU_IOCTL_SETUP_TUNNEL CTL_CODE(HAX_DEVICE_TYPE, 0x90b, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_INTERRUPT CTL_CODE(HAX_DEVICE_TYPE, 0x90c, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_SET_REGS CTL_CODE(HAX_DEVICE_TYPE, 0x90d, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_GET_REGS CTL_CODE(HAX_DEVICE_TYPE, 0x90e, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VM_IOCTL_NOTIFY_QEMU_VERSION CTL_CODE(HAX_DEVICE_TYPE, 0x910, \ - METHOD_BUFFERED, \ - FILE_ANY_ACCESS) -#endif /* TARGET_I386_HAX_WINDOWS_H */ diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c deleted file mode 100644 index 2fe31aaa9a..0000000000 --- a/accel/stubs/hax-stub.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2015, Intel Corporation - * - * Copyright 2016 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "sysemu/hax.h" - -bool hax_allowed; - -int hax_sync_vcpus(void) -{ - return 0; -} diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 4a34f03047..68ad30e2f5 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -28,7 +28,6 @@ #include "hw/intc/kvm_irqcount.h" #include "trace.h" #include "hw/boards.h" -#include "sysemu/hax.h" #include "sysemu/kvm.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" @@ -271,7 +270,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp) /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && - !hax_enabled() && current_machine->ram_size >= 1024 * 1024) { + current_machine->ram_size >= 1024 * 1024) { vapic = sysbus_create_simple("kvmvapic", -1, NULL); } s->vapic = vapic; diff --git a/softmmu/cpus.c b/softmmu/cpus.c index fed20ffb5d..0848e0dbdb 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -427,12 +427,6 @@ void qemu_wait_io_event(CPUState *cpu) qemu_plugin_vcpu_resume_cb(cpu); } -#ifdef _WIN32 - /* Eat dummy APC queued by cpus_kick_thread. */ - if (hax_enabled()) { - SleepEx(0, TRUE); - } -#endif qemu_wait_io_event_common(cpu); } diff --git a/softmmu/vl.c b/softmmu/vl.c index b0b96f67fa..5a10b3c309 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -86,7 +86,6 @@ #include "migration/colo.h" #include "migration/postcopy-ram.h" #include "sysemu/kvm.h" -#include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" #include "qemu/option.h" #include "qemu/config-file.h" @@ -2546,11 +2545,6 @@ static void qemu_init_board(void) drive_check_orphaned(); realtime_init(); - - if (hax_enabled()) { - /* FIXME: why isn't cpu_synchronize_all_post_init enough? */ - hax_sync_vcpus(); - } } static void qemu_create_cli_devices(void) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-ops.c deleted file mode 100644 index 5031096760..0000000000 --- a/target/i386/hax/hax-accel-ops.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * QEMU HAX support - * - * Copyright IBM, Corp. 2008 - * Red Hat, Inc. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * Glauber Costa <gcosta(a)redhat.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qemu/main-loop.h" -#include "sysemu/runstate.h" -#include "sysemu/cpus.h" -#include "qemu/guest-random.h" - -#include "hax-accel-ops.h" - -static void *hax_cpu_thread_fn(void *arg) -{ - CPUState *cpu = arg; - int r; - - rcu_register_thread(); - qemu_mutex_lock_iothread(); - qemu_thread_get_self(cpu->thread); - - cpu->thread_id = qemu_get_thread_id(); - current_cpu = cpu; - hax_init_vcpu(cpu); - cpu_thread_signal_created(cpu); - qemu_guest_random_seed_thread_part2(cpu->random_seed); - - do { - if (cpu_can_run(cpu)) { - r = hax_smp_cpu_exec(cpu); - if (r == EXCP_DEBUG) { - cpu_handle_guest_debug(cpu); - } - } - - qemu_wait_io_event(cpu); - } while (!cpu->unplug || cpu_can_run(cpu)); - hax_vcpu_destroy(cpu); - cpu_thread_signal_destroyed(cpu); - rcu_unregister_thread(); - return NULL; -} - -static void hax_start_vcpu_thread(CPUState *cpu) -{ - char thread_name[VCPU_THREAD_NAME_SIZE]; - - cpu->thread = g_new0(QemuThread, 1); - cpu->halt_cond = g_new0(QemuCond, 1); - qemu_cond_init(cpu->halt_cond); - - snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX", - cpu->cpu_index); - qemu_thread_create(cpu->thread, thread_name, hax_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); - assert(cpu->accel); -#ifdef _WIN32 - cpu->accel->hThread = qemu_thread_get_handle(cpu->thread); -#endif -} - -static void hax_accel_ops_class_init(ObjectClass *oc, void *data) -{ - AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); - - ops->create_vcpu_thread = hax_start_vcpu_thread; - ops->kick_vcpu_thread = hax_kick_vcpu_thread; - - ops->synchronize_post_reset = hax_cpu_synchronize_post_reset; - ops->synchronize_post_init = hax_cpu_synchronize_post_init; - ops->synchronize_state = hax_cpu_synchronize_state; - ops->synchronize_pre_loadvm = hax_cpu_synchronize_pre_loadvm; -} - -static const TypeInfo hax_accel_ops_type = { - .name = ACCEL_OPS_NAME("hax"), - - .parent = TYPE_ACCEL_OPS, - .class_init = hax_accel_ops_class_init, - .abstract = true, -}; - -static void hax_accel_ops_register_types(void) -{ - type_register_static(&hax_accel_ops_type); -} -type_init(hax_accel_ops_register_types); diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c deleted file mode 100644 index 18d78e5b6b..0000000000 --- a/target/i386/hax/hax-all.c +++ /dev/null @@ -1,1141 +0,0 @@ -/* - * QEMU HAX support - * - * Copyright IBM, Corp. 2008 - * Red Hat, Inc. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * Glauber Costa <gcosta(a)redhat.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* - * HAX common code for both windows and darwin - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/address-spaces.h" - -#include "qemu/accel.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "hw/boards.h" - -#include "hax-accel-ops.h" - -#define DEBUG_HAX 0 - -#define DPRINTF(fmt, ...) \ - do { \ - if (DEBUG_HAX) { \ - fprintf(stdout, fmt, ## __VA_ARGS__); \ - } \ - } while (0) - -/* Current version */ -const uint32_t hax_cur_version = 0x4; /* API v4: unmapping and MMIO moves */ -/* Minimum HAX kernel version */ -const uint32_t hax_min_version = 0x4; /* API v4: supports unmapping */ - -bool hax_allowed; - -struct hax_state hax_global; - -static void hax_vcpu_sync_state(CPUArchState *env, int modified); -static int hax_arch_get_registers(CPUArchState *env); - -int valid_hax_tunnel_size(uint16_t size) -{ - return size >= sizeof(struct hax_tunnel); -} - -hax_fd hax_vcpu_get_fd(CPUArchState *env) -{ - AccelCPUState *vcpu = env_cpu(env)->accel; - if (!vcpu) { - return HAX_INVALID_FD; - } - return vcpu->fd; -} - -static int hax_get_capability(struct hax_state *hax) -{ - int ret; - struct hax_capabilityinfo capinfo, *cap = &capinfo; - - ret = hax_capability(hax, cap); - if (ret) { - return ret; - } - - if ((cap->wstatus & HAX_CAP_WORKSTATUS_MASK) == HAX_CAP_STATUS_NOTWORKING) { - if (cap->winfo & HAX_CAP_FAILREASON_VT) { - DPRINTF - ("VTX feature is not enabled, HAX driver will not work.\n"); - } else if (cap->winfo & HAX_CAP_FAILREASON_NX) { - DPRINTF - ("NX feature is not enabled, HAX driver will not work.\n"); - } - return -ENXIO; - - } - - if (!(cap->winfo & HAX_CAP_UG)) { - fprintf(stderr, "UG mode is not supported by the hardware.\n"); - return -ENOTSUP; - } - - hax->supports_64bit_ramblock = !!(cap->winfo & HAX_CAP_64BIT_RAMBLOCK); - - if (cap->wstatus & HAX_CAP_MEMQUOTA) { - if (cap->mem_quota < hax->mem_quota) { - fprintf(stderr, "The VM memory needed exceeds the driver limit.\n"); - return -ENOSPC; - } - } - return 0; -} - -static int hax_version_support(struct hax_state *hax) -{ - int ret; - struct hax_module_version version; - - ret = hax_mod_version(hax, &version); - if (ret < 0) { - return 0; - } - - if (hax_min_version > version.cur_version) { - fprintf(stderr, "Incompatible HAX module version %d,", - version.cur_version); - fprintf(stderr, "requires minimum version %d\n", hax_min_version); - return 0; - } - if (hax_cur_version < version.compat_version) { - fprintf(stderr, "Incompatible QEMU HAX API version %x,", - hax_cur_version); - fprintf(stderr, "requires minimum HAX API version %x\n", - version.compat_version); - return 0; - } - - return 1; -} - -int hax_vcpu_create(int id) -{ - AccelCPUState *vcpu = NULL; - int ret; - - if (!hax_global.vm) { - fprintf(stderr, "vcpu %x created failed, vm is null\n", id); - return -1; - } - - if (hax_global.vm->vcpus[id]) { - fprintf(stderr, "vcpu %x allocated already\n", id); - return 0; - } - - vcpu = g_new0(AccelCPUState, 1); - - ret = hax_host_create_vcpu(hax_global.vm->fd, id); - if (ret) { - fprintf(stderr, "Failed to create vcpu %x\n", id); - goto error; - } - - vcpu->vcpu_id = id; - vcpu->fd = hax_host_open_vcpu(hax_global.vm->id, id); - if (hax_invalid_fd(vcpu->fd)) { - fprintf(stderr, "Failed to open the vcpu\n"); - ret = -ENODEV; - goto error; - } - - hax_global.vm->vcpus[id] = vcpu; - - ret = hax_host_setup_vcpu_channel(vcpu); - if (ret) { - fprintf(stderr, "Invalid hax tunnel size\n"); - ret = -EINVAL; - goto error; - } - return 0; - - error: - /* vcpu and tunnel will be closed automatically */ - if (vcpu && !hax_invalid_fd(vcpu->fd)) { - hax_close_fd(vcpu->fd); - } - - hax_global.vm->vcpus[id] = NULL; - g_free(vcpu); - return -1; -} - -int hax_vcpu_destroy(CPUState *cpu) -{ - AccelCPUState *vcpu = cpu->accel; - - if (!hax_global.vm) { - fprintf(stderr, "vcpu %x destroy failed, vm is null\n", vcpu->vcpu_id); - return -1; - } - - if (!vcpu) { - return 0; - } - - /* - * 1. The hax_tunnel is also destroyed when vcpu is destroyed - * 2. close fd will cause hax module vcpu be cleaned - */ - hax_close_fd(vcpu->fd); - hax_global.vm->vcpus[vcpu->vcpu_id] = NULL; -#ifdef _WIN32 - CloseHandle(vcpu->hThread); -#endif - g_free(vcpu); - cpu->accel = NULL; - return 0; -} - -int hax_init_vcpu(CPUState *cpu) -{ - int ret; - - ret = hax_vcpu_create(cpu->cpu_index); - if (ret < 0) { - fprintf(stderr, "Failed to create HAX vcpu\n"); - exit(-1); - } - - cpu->accel = hax_global.vm->vcpus[cpu->cpu_index]; - cpu->vcpu_dirty = true; - qemu_register_reset(hax_reset_vcpu_state, cpu->env_ptr); - - return ret; -} - -struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus) -{ - struct hax_vm *vm; - int vm_id = 0, ret, i; - - if (hax_invalid_fd(hax->fd)) { - return NULL; - } - - if (hax->vm) { - return hax->vm; - } - - if (max_cpus > HAX_MAX_VCPU) { - fprintf(stderr, "Maximum VCPU number QEMU supported is %d\n", HAX_MAX_VCPU); - return NULL; - } - - vm = g_new0(struct hax_vm, 1); - - ret = hax_host_create_vm(hax, &vm_id); - if (ret) { - fprintf(stderr, "Failed to create vm %x\n", ret); - goto error; - } - vm->id = vm_id; - vm->fd = hax_host_open_vm(hax, vm_id); - if (hax_invalid_fd(vm->fd)) { - fprintf(stderr, "Failed to open vm %d\n", vm_id); - goto error; - } - - vm->numvcpus = max_cpus; - vm->vcpus = g_new0(AccelCPUState *, vm->numvcpus); - for (i = 0; i < vm->numvcpus; i++) { - vm->vcpus[i] = NULL; - } - - hax->vm = vm; - return vm; - - error: - g_free(vm); - hax->vm = NULL; - return NULL; -} - -int hax_vm_destroy(struct hax_vm *vm) -{ - int i; - - for (i = 0; i < vm->numvcpus; i++) - if (vm->vcpus[i]) { - fprintf(stderr, "VCPU should be cleaned before vm clean\n"); - return -1; - } - hax_close_fd(vm->fd); - vm->numvcpus = 0; - g_free(vm->vcpus); - g_free(vm); - hax_global.vm = NULL; - return 0; -} - -static int hax_init(ram_addr_t ram_size, int max_cpus) -{ - struct hax_state *hax = NULL; - struct hax_qemu_version qversion; - int ret; - - hax = &hax_global; - - memset(hax, 0, sizeof(struct hax_state)); - hax->mem_quota = ram_size; - - hax->fd = hax_mod_open(); - if (hax_invalid_fd(hax->fd)) { - hax->fd = 0; - ret = -ENODEV; - goto error; - } - - ret = hax_get_capability(hax); - - if (ret) { - if (ret != -ENOSPC) { - ret = -EINVAL; - } - goto error; - } - - if (!hax_version_support(hax)) { - ret = -EINVAL; - goto error; - } - - hax->vm = hax_vm_create(hax, max_cpus); - if (!hax->vm) { - fprintf(stderr, "Failed to create HAX VM\n"); - ret = -EINVAL; - goto error; - } - - hax_memory_init(); - - qversion.cur_version = hax_cur_version; - qversion.min_version = hax_min_version; - hax_notify_qemu_version(hax->vm->fd, &qversion); - - return ret; - error: - if (hax->vm) { - hax_vm_destroy(hax->vm); - } - if (hax->fd) { - hax_mod_close(hax); - } - - return ret; -} - -static int hax_accel_init(MachineState *ms) -{ - int ret = hax_init(ms->ram_size, (int)ms->smp.max_cpus); - - if (ret && (ret != -ENOSPC)) { - fprintf(stderr, "No accelerator found.\n"); - } else { - fprintf(stdout, "HAX is %s and emulator runs in %s mode.\n", - !ret ? "working" : "not working", - !ret ? "fast virt" : "emulation"); - fprintf(stdout, - "NOTE: HAX is deprecated and will be removed in a future release.\n" - " Use 'whpx' (on Windows) or 'hvf' (on macOS) instead.\n"); - } - return ret; -} - -static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) -{ - if (hft->direction < 2) { - cpu_physical_memory_rw(hft->gpa, &hft->value, hft->size, - hft->direction); - } else { - /* - * HAX API v4 supports transferring data between two MMIO addresses, - * hft->gpa and hft->gpa2 (instructions such as MOVS require this): - * hft->direction == 2: gpa ==> gpa2 - */ - uint64_t value; - cpu_physical_memory_read(hft->gpa, &value, hft->size); - cpu_physical_memory_write(hft->gpa2, &value, hft->size); - } - - return 0; -} - -static int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port, - int direction, int size, int count, void *buffer) -{ - uint8_t *ptr; - int i; - MemTxAttrs attrs = { 0 }; - - if (!df) { - ptr = buffer; - } else { - ptr = buffer + size * count - size; - } - for (i = 0; i < count; i++) { - address_space_rw(&address_space_io, port, attrs, - ptr, size, direction == HAX_EXIT_IO_OUT); - if (!df) { - ptr += size; - } else { - ptr -= size; - } - } - - return 0; -} - -static int hax_vcpu_interrupt(CPUArchState *env) -{ - CPUState *cpu = env_cpu(env); - AccelCPUState *vcpu = cpu->accel; - struct hax_tunnel *ht = vcpu->tunnel; - - /* - * Try to inject an interrupt if the guest can accept it - * Unlike KVM, HAX kernel check for the eflags, instead of qemu - */ - if (ht->ready_for_interrupt_injection && - (cpu->interrupt_request & CPU_INTERRUPT_HARD)) { - int irq; - - irq = cpu_get_pic_interrupt(env); - if (irq >= 0) { - hax_inject_interrupt(env, irq); - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD; - } - } - - /* If we have an interrupt but the guest is not ready to receive an - * interrupt, request an interrupt window exit. This will - * cause a return to userspace as soon as the guest is ready to - * receive interrupts. */ - if ((cpu->interrupt_request & CPU_INTERRUPT_HARD)) { - ht->request_interrupt_window = 1; - } else { - ht->request_interrupt_window = 0; - } - return 0; -} - -void hax_raise_event(CPUState *cpu) -{ - AccelCPUState *vcpu = cpu->accel; - - if (!vcpu) { - return; - } - vcpu->tunnel->user_event_pending = 1; -} - -/* - * Ask hax kernel module to run the CPU for us till: - * 1. Guest crash or shutdown - * 2. Need QEMU's emulation like guest execute MMIO instruction - * 3. Guest execute HLT - * 4. QEMU have Signal/event pending - * 5. An unknown VMX exit happens - */ -static int hax_vcpu_hax_exec(CPUArchState *env) -{ - int ret = 0; - CPUState *cpu = env_cpu(env); - X86CPU *x86_cpu = X86_CPU(cpu); - AccelCPUState *vcpu = cpu->accel; - struct hax_tunnel *ht = vcpu->tunnel; - - if (!hax_enabled()) { - DPRINTF("Trying to vcpu execute at eip:" TARGET_FMT_lx "\n", env->eip); - return 0; - } - - if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL; - apic_poll_irq(x86_cpu->apic_state); - } - - /* After a vcpu is halted (either because it is an AP and has just been - * reset, or because it has executed the HLT instruction), it will not be - * run (hax_vcpu_run()) until it is unhalted. The next few if blocks check - * for events that may change the halted state of this vcpu: - * a) Maskable interrupt, when RFLAGS.IF is 1; - * Note: env->eflags may not reflect the current RFLAGS state, because - * it is not updated after each hax_vcpu_run(). We cannot afford - * to fail to recognize any unhalt-by-maskable-interrupt event - * (in which case the vcpu will halt forever), and yet we cannot - * afford the overhead of hax_vcpu_sync_state(). The current - * solution is to err on the side of caution and have the HLT - * handler (see case HAX_EXIT_HLT below) unconditionally set the - * IF_MASK bit in env->eflags, which, in effect, disables the - * RFLAGS.IF check. - * b) NMI; - * c) INIT signal; - * d) SIPI signal. - */ - if (((cpu->interrupt_request & CPU_INTERRUPT_HARD) && - (env->eflags & IF_MASK)) || - (cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - cpu->halted = 0; - } - - if (cpu->interrupt_request & CPU_INTERRUPT_INIT) { - DPRINTF("\nhax_vcpu_hax_exec: handling INIT for %d\n", - cpu->cpu_index); - do_cpu_init(x86_cpu); - hax_vcpu_sync_state(env, 1); - } - - if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) { - DPRINTF("hax_vcpu_hax_exec: handling SIPI for %d\n", - cpu->cpu_index); - hax_vcpu_sync_state(env, 0); - do_cpu_sipi(x86_cpu); - hax_vcpu_sync_state(env, 1); - } - - if (cpu->halted) { - /* If this vcpu is halted, we must not ask HAXM to run it. Instead, we - * break out of hax_smp_cpu_exec() as if this vcpu had executed HLT. - * That way, this vcpu thread will be trapped in qemu_wait_io_event(), - * until the vcpu is unhalted. - */ - cpu->exception_index = EXCP_HLT; - return 0; - } - - do { - int hax_ret; - - if (cpu->exit_request) { - ret = 1; - break; - } - - hax_vcpu_interrupt(env); - - qemu_mutex_unlock_iothread(); - cpu_exec_start(cpu); - hax_ret = hax_vcpu_run(vcpu); - cpu_exec_end(cpu); - qemu_mutex_lock_iothread(); - - /* Simply continue the vcpu_run if system call interrupted */ - if (hax_ret == -EINTR || hax_ret == -EAGAIN) { - DPRINTF("io window interrupted\n"); - continue; - } - - if (hax_ret < 0) { - fprintf(stderr, "vcpu run failed for vcpu %x\n", vcpu->vcpu_id); - abort(); - } - switch (ht->_exit_status) { - case HAX_EXIT_IO: - ret = hax_handle_io(env, ht->pio._df, ht->pio._port, - ht->pio._direction, - ht->pio._size, ht->pio._count, vcpu->iobuf); - break; - case HAX_EXIT_FAST_MMIO: - ret = hax_handle_fastmmio(env, (struct hax_fastmmio *) vcpu->iobuf); - break; - /* Guest state changed, currently only for shutdown */ - case HAX_EXIT_STATECHANGE: - fprintf(stdout, "VCPU shutdown request\n"); - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - hax_vcpu_sync_state(env, 0); - ret = 1; - break; - case HAX_EXIT_UNKNOWN_VMEXIT: - fprintf(stderr, "Unknown VMX exit %x from guest\n", - ht->_exit_reason); - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - hax_vcpu_sync_state(env, 0); - cpu_dump_state(cpu, stderr, 0); - ret = -1; - break; - case HAX_EXIT_HLT: - if (!(cpu->interrupt_request & CPU_INTERRUPT_HARD) && - !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - /* hlt instruction with interrupt disabled is shutdown */ - env->eflags |= IF_MASK; - cpu->halted = 1; - cpu->exception_index = EXCP_HLT; - ret = 1; - } - break; - /* these situations will continue to hax module */ - case HAX_EXIT_INTERRUPT: - case HAX_EXIT_PAUSED: - break; - case HAX_EXIT_MMIO: - /* Should not happen on UG system */ - fprintf(stderr, "HAX: unsupported MMIO emulation\n"); - ret = -1; - break; - case HAX_EXIT_REAL: - /* Should not happen on UG system */ - fprintf(stderr, "HAX: unimplemented real mode emulation\n"); - ret = -1; - break; - default: - fprintf(stderr, "Unknown exit %x from HAX\n", ht->_exit_status); - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - hax_vcpu_sync_state(env, 0); - cpu_dump_state(cpu, stderr, 0); - ret = 1; - break; - } - } while (!ret); - - if (cpu->exit_request) { - cpu->exit_request = 0; - cpu->exception_index = EXCP_INTERRUPT; - } - return ret < 0; -} - -static void do_hax_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_arch_get_registers(env); - cpu->vcpu_dirty = true; -} - -void hax_cpu_synchronize_state(CPUState *cpu) -{ - if (!cpu->vcpu_dirty) { - run_on_cpu(cpu, do_hax_cpu_synchronize_state, RUN_ON_CPU_NULL); - } -} - -static void do_hax_cpu_synchronize_post_reset(CPUState *cpu, - run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_vcpu_sync_state(env, 1); - cpu->vcpu_dirty = false; -} - -void hax_cpu_synchronize_post_reset(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_post_reset, RUN_ON_CPU_NULL); -} - -static void do_hax_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_vcpu_sync_state(env, 1); - cpu->vcpu_dirty = false; -} - -void hax_cpu_synchronize_post_init(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_post_init, RUN_ON_CPU_NULL); -} - -static void do_hax_cpu_synchronize_pre_loadvm(CPUState *cpu, run_on_cpu_data arg) -{ - cpu->vcpu_dirty = true; -} - -void hax_cpu_synchronize_pre_loadvm(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_pre_loadvm, RUN_ON_CPU_NULL); -} - -int hax_smp_cpu_exec(CPUState *cpu) -{ - CPUArchState *env = cpu->env_ptr; - int fatal; - int ret; - - while (1) { - if (cpu->exception_index >= EXCP_INTERRUPT) { - ret = cpu->exception_index; - cpu->exception_index = -1; - break; - } - - fatal = hax_vcpu_hax_exec(env); - - if (fatal) { - fprintf(stderr, "Unsupported HAX vcpu return\n"); - abort(); - } - } - - return ret; -} - -static void set_v8086_seg(struct segment_desc_t *lhs, const SegmentCache *rhs) -{ - memset(lhs, 0, sizeof(struct segment_desc_t)); - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->type = 3; - lhs->present = 1; - lhs->dpl = 3; - lhs->operand_size = 0; - lhs->desc = 1; - lhs->long_mode = 0; - lhs->granularity = 0; - lhs->available = 0; -} - -static void get_seg(SegmentCache *lhs, const struct segment_desc_t *rhs) -{ - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->flags = (rhs->type << DESC_TYPE_SHIFT) - | (rhs->present * DESC_P_MASK) - | (rhs->dpl << DESC_DPL_SHIFT) - | (rhs->operand_size << DESC_B_SHIFT) - | (rhs->desc * DESC_S_MASK) - | (rhs->long_mode << DESC_L_SHIFT) - | (rhs->granularity * DESC_G_MASK) | (rhs->available * DESC_AVL_MASK); -} - -static void set_seg(struct segment_desc_t *lhs, const SegmentCache *rhs) -{ - unsigned flags = rhs->flags; - - memset(lhs, 0, sizeof(struct segment_desc_t)); - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->type = (flags >> DESC_TYPE_SHIFT) & 15; - lhs->present = (flags & DESC_P_MASK) != 0; - lhs->dpl = rhs->selector & 3; - lhs->operand_size = (flags >> DESC_B_SHIFT) & 1; - lhs->desc = (flags & DESC_S_MASK) != 0; - lhs->long_mode = (flags >> DESC_L_SHIFT) & 1; - lhs->granularity = (flags & DESC_G_MASK) != 0; - lhs->available = (flags & DESC_AVL_MASK) != 0; -} - -static void hax_getput_reg(uint64_t *hax_reg, target_ulong *qemu_reg, int set) -{ - target_ulong reg = *hax_reg; - - if (set) { - *hax_reg = *qemu_reg; - } else { - *qemu_reg = reg; - } -} - -/* The sregs has been synced with HAX kernel already before this call */ -static int hax_get_segments(CPUArchState *env, struct vcpu_state_t *sregs) -{ - get_seg(&env->segs[R_CS], &sregs->_cs); - get_seg(&env->segs[R_DS], &sregs->_ds); - get_seg(&env->segs[R_ES], &sregs->_es); - get_seg(&env->segs[R_FS], &sregs->_fs); - get_seg(&env->segs[R_GS], &sregs->_gs); - get_seg(&env->segs[R_SS], &sregs->_ss); - - get_seg(&env->tr, &sregs->_tr); - get_seg(&env->ldt, &sregs->_ldt); - env->idt.limit = sregs->_idt.limit; - env->idt.base = sregs->_idt.base; - env->gdt.limit = sregs->_gdt.limit; - env->gdt.base = sregs->_gdt.base; - return 0; -} - -static int hax_set_segments(CPUArchState *env, struct vcpu_state_t *sregs) -{ - if ((env->eflags & VM_MASK)) { - set_v8086_seg(&sregs->_cs, &env->segs[R_CS]); - set_v8086_seg(&sregs->_ds, &env->segs[R_DS]); - set_v8086_seg(&sregs->_es, &env->segs[R_ES]); - set_v8086_seg(&sregs->_fs, &env->segs[R_FS]); - set_v8086_seg(&sregs->_gs, &env->segs[R_GS]); - set_v8086_seg(&sregs->_ss, &env->segs[R_SS]); - } else { - set_seg(&sregs->_cs, &env->segs[R_CS]); - set_seg(&sregs->_ds, &env->segs[R_DS]); - set_seg(&sregs->_es, &env->segs[R_ES]); - set_seg(&sregs->_fs, &env->segs[R_FS]); - set_seg(&sregs->_gs, &env->segs[R_GS]); - set_seg(&sregs->_ss, &env->segs[R_SS]); - - if (env->cr[0] & CR0_PE_MASK) { - /* force ss cpl to cs cpl */ - sregs->_ss.selector = (sregs->_ss.selector & ~3) | - (sregs->_cs.selector & 3); - sregs->_ss.dpl = sregs->_ss.selector & 3; - } - } - - set_seg(&sregs->_tr, &env->tr); - set_seg(&sregs->_ldt, &env->ldt); - sregs->_idt.limit = env->idt.limit; - sregs->_idt.base = env->idt.base; - sregs->_gdt.limit = env->gdt.limit; - sregs->_gdt.base = env->gdt.base; - return 0; -} - -static int hax_sync_vcpu_register(CPUArchState *env, int set) -{ - struct vcpu_state_t regs; - int ret; - memset(&regs, 0, sizeof(struct vcpu_state_t)); - - if (!set) { - ret = hax_sync_vcpu_state(env, &regs, 0); - if (ret < 0) { - return -1; - } - } - - /* generic register */ - hax_getput_reg(&regs._rax, &env->regs[R_EAX], set); - hax_getput_reg(&regs._rbx, &env->regs[R_EBX], set); - hax_getput_reg(&regs._rcx, &env->regs[R_ECX], set); - hax_getput_reg(&regs._rdx, &env->regs[R_EDX], set); - hax_getput_reg(&regs._rsi, &env->regs[R_ESI], set); - hax_getput_reg(&regs._rdi, &env->regs[R_EDI], set); - hax_getput_reg(&regs._rsp, &env->regs[R_ESP], set); - hax_getput_reg(&regs._rbp, &env->regs[R_EBP], set); -#ifdef TARGET_X86_64 - hax_getput_reg(&regs._r8, &env->regs[8], set); - hax_getput_reg(&regs._r9, &env->regs[9], set); - hax_getput_reg(&regs._r10, &env->regs[10], set); - hax_getput_reg(&regs._r11, &env->regs[11], set); - hax_getput_reg(&regs._r12, &env->regs[12], set); - hax_getput_reg(&regs._r13, &env->regs[13], set); - hax_getput_reg(&regs._r14, &env->regs[14], set); - hax_getput_reg(&regs._r15, &env->regs[15], set); -#endif - hax_getput_reg(&regs._rflags, &env->eflags, set); - hax_getput_reg(&regs._rip, &env->eip, set); - - if (set) { - regs._cr0 = env->cr[0]; - regs._cr2 = env->cr[2]; - regs._cr3 = env->cr[3]; - regs._cr4 = env->cr[4]; - hax_set_segments(env, &regs); - } else { - env->cr[0] = regs._cr0; - env->cr[2] = regs._cr2; - env->cr[3] = regs._cr3; - env->cr[4] = regs._cr4; - hax_get_segments(env, &regs); - } - - if (set) { - ret = hax_sync_vcpu_state(env, &regs, 1); - if (ret < 0) { - return -1; - } - } - return 0; -} - -static void hax_msr_entry_set(struct vmx_msr *item, uint32_t index, - uint64_t value) -{ - item->entry = index; - item->value = value; -} - -static int hax_get_msrs(CPUArchState *env) -{ - struct hax_msr_data md; - struct vmx_msr *msrs = md.entries; - int ret, i, n; - - n = 0; - msrs[n++].entry = MSR_IA32_SYSENTER_CS; - msrs[n++].entry = MSR_IA32_SYSENTER_ESP; - msrs[n++].entry = MSR_IA32_SYSENTER_EIP; - msrs[n++].entry = MSR_IA32_TSC; -#ifdef TARGET_X86_64 - msrs[n++].entry = MSR_EFER; - msrs[n++].entry = MSR_STAR; - msrs[n++].entry = MSR_LSTAR; - msrs[n++].entry = MSR_CSTAR; - msrs[n++].entry = MSR_FMASK; - msrs[n++].entry = MSR_KERNELGSBASE; -#endif - md.nr_msr = n; - ret = hax_sync_msr(env, &md, 0); - if (ret < 0) { - return ret; - } - - for (i = 0; i < md.done; i++) { - switch (msrs[i].entry) { - case MSR_IA32_SYSENTER_CS: - env->sysenter_cs = msrs[i].value; - break; - case MSR_IA32_SYSENTER_ESP: - env->sysenter_esp = msrs[i].value; - break; - case MSR_IA32_SYSENTER_EIP: - env->sysenter_eip = msrs[i].value; - break; - case MSR_IA32_TSC: - env->tsc = msrs[i].value; - break; -#ifdef TARGET_X86_64 - case MSR_EFER: - env->efer = msrs[i].value; - break; - case MSR_STAR: - env->star = msrs[i].value; - break; - case MSR_LSTAR: - env->lstar = msrs[i].value; - break; - case MSR_CSTAR: - env->cstar = msrs[i].value; - break; - case MSR_FMASK: - env->fmask = msrs[i].value; - break; - case MSR_KERNELGSBASE: - env->kernelgsbase = msrs[i].value; - break; -#endif - } - } - - return 0; -} - -static int hax_set_msrs(CPUArchState *env) -{ - struct hax_msr_data md; - struct vmx_msr *msrs; - msrs = md.entries; - int n = 0; - - memset(&md, 0, sizeof(struct hax_msr_data)); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_CS, env->sysenter_cs); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip); - hax_msr_entry_set(&msrs[n++], MSR_IA32_TSC, env->tsc); -#ifdef TARGET_X86_64 - hax_msr_entry_set(&msrs[n++], MSR_EFER, env->efer); - hax_msr_entry_set(&msrs[n++], MSR_STAR, env->star); - hax_msr_entry_set(&msrs[n++], MSR_LSTAR, env->lstar); - hax_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar); - hax_msr_entry_set(&msrs[n++], MSR_FMASK, env->fmask); - hax_msr_entry_set(&msrs[n++], MSR_KERNELGSBASE, env->kernelgsbase); -#endif - md.nr_msr = n; - md.done = 0; - - return hax_sync_msr(env, &md, 1); -} - -static int hax_get_fpu(CPUArchState *env) -{ - struct fx_layout fpu; - int i, ret; - - ret = hax_sync_fpu(env, &fpu, 0); - if (ret < 0) { - return ret; - } - - env->fpstt = (fpu.fsw >> 11) & 7; - env->fpus = fpu.fsw; - env->fpuc = fpu.fcw; - for (i = 0; i < 8; ++i) { - env->fptags[i] = !((fpu.ftw >> i) & 1); - } - memcpy(env->fpregs, fpu.st_mm, sizeof(env->fpregs)); - - for (i = 0; i < 8; i++) { - env->xmm_regs[i].ZMM_Q(0) = ldq_p(&fpu.mmx_1[i][0]); - env->xmm_regs[i].ZMM_Q(1) = ldq_p(&fpu.mmx_1[i][8]); - if (CPU_NB_REGS > 8) { - env->xmm_regs[i + 8].ZMM_Q(0) = ldq_p(&fpu.mmx_2[i][0]); - env->xmm_regs[i + 8].ZMM_Q(1) = ldq_p(&fpu.mmx_2[i][8]); - } - } - env->mxcsr = fpu.mxcsr; - - return 0; -} - -static int hax_set_fpu(CPUArchState *env) -{ - struct fx_layout fpu; - int i; - - memset(&fpu, 0, sizeof(fpu)); - fpu.fsw = env->fpus & ~(7 << 11); - fpu.fsw |= (env->fpstt & 7) << 11; - fpu.fcw = env->fpuc; - - for (i = 0; i < 8; ++i) { - fpu.ftw |= (!env->fptags[i]) << i; - } - - memcpy(fpu.st_mm, env->fpregs, sizeof(env->fpregs)); - for (i = 0; i < 8; i++) { - stq_p(&fpu.mmx_1[i][0], env->xmm_regs[i].ZMM_Q(0)); - stq_p(&fpu.mmx_1[i][8], env->xmm_regs[i].ZMM_Q(1)); - if (CPU_NB_REGS > 8) { - stq_p(&fpu.mmx_2[i][0], env->xmm_regs[i + 8].ZMM_Q(0)); - stq_p(&fpu.mmx_2[i][8], env->xmm_regs[i + 8].ZMM_Q(1)); - } - } - - fpu.mxcsr = env->mxcsr; - - return hax_sync_fpu(env, &fpu, 1); -} - -static int hax_arch_get_registers(CPUArchState *env) -{ - int ret; - - ret = hax_sync_vcpu_register(env, 0); - if (ret < 0) { - return ret; - } - - ret = hax_get_fpu(env); - if (ret < 0) { - return ret; - } - - ret = hax_get_msrs(env); - if (ret < 0) { - return ret; - } - - x86_update_hflags(env); - return 0; -} - -static int hax_arch_set_registers(CPUArchState *env) -{ - int ret; - ret = hax_sync_vcpu_register(env, 1); - - if (ret < 0) { - fprintf(stderr, "Failed to sync vcpu reg\n"); - return ret; - } - ret = hax_set_fpu(env); - if (ret < 0) { - fprintf(stderr, "FPU failed\n"); - return ret; - } - ret = hax_set_msrs(env); - if (ret < 0) { - fprintf(stderr, "MSR failed\n"); - return ret; - } - - return 0; -} - -static void hax_vcpu_sync_state(CPUArchState *env, int modified) -{ - if (hax_enabled()) { - if (modified) { - hax_arch_set_registers(env); - } else { - hax_arch_get_registers(env); - } - } -} - -/* - * much simpler than kvm, at least in first stage because: - * We don't need consider the device pass-through, we don't need - * consider the framebuffer, and we may even remove the bios at all - */ -int hax_sync_vcpus(void) -{ - if (hax_enabled()) { - CPUState *cpu; - - cpu = first_cpu; - if (!cpu) { - return 0; - } - - for (; cpu != NULL; cpu = CPU_NEXT(cpu)) { - int ret; - - ret = hax_arch_set_registers(cpu->env_ptr); - if (ret < 0) { - return ret; - } - } - } - - return 0; -} - -void hax_reset_vcpu_state(void *opaque) -{ - CPUState *cpu; - for (cpu = first_cpu; cpu != NULL; cpu = CPU_NEXT(cpu)) { - cpu->accel->tunnel->user_event_pending = 0; - cpu->accel->tunnel->ready_for_interrupt_injection = 0; - } -} - -static void hax_accel_class_init(ObjectClass *oc, void *data) -{ - AccelClass *ac = ACCEL_CLASS(oc); - ac->name = "HAX"; - ac->init_machine = hax_accel_init; - ac->allowed = &hax_allowed; -} - -static const TypeInfo hax_accel_type = { - .name = ACCEL_CLASS_NAME("hax"), - .parent = TYPE_ACCEL, - .class_init = hax_accel_class_init, -}; - -static void hax_type_init(void) -{ - type_register_static(&hax_accel_type); -} - -type_init(hax_type_init); diff --git a/target/i386/hax/hax-mem.c b/target/i386/hax/hax-mem.c deleted file mode 100644 index bb5ffbc9ac..0000000000 --- a/target/i386/hax/hax-mem.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * HAX memory mapping operations - * - * Copyright (c) 2015-16 Intel Corporation - * Copyright 2016 Google, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/address-spaces.h" -#include "qemu/error-report.h" - -#include "hax-accel-ops.h" -#include "qemu/queue.h" - -#define DEBUG_HAX_MEM 0 - -#define DPRINTF(fmt, ...) \ - do { \ - if (DEBUG_HAX_MEM) { \ - fprintf(stdout, fmt, ## __VA_ARGS__); \ - } \ - } while (0) - -/** - * HAXMapping: describes a pending guest physical memory mapping - * - * @start_pa: a guest physical address marking the start of the region; must be - * page-aligned - * @size: a guest physical address marking the end of the region; must be - * page-aligned - * @host_va: the host virtual address of the start of the mapping - * @flags: mapping parameters e.g. HAX_RAM_INFO_ROM or HAX_RAM_INFO_INVALID - * @entry: additional fields for linking #HAXMapping instances together - */ -typedef struct HAXMapping { - uint64_t start_pa; - uint32_t size; - uint64_t host_va; - int flags; - QTAILQ_ENTRY(HAXMapping) entry; -} HAXMapping; - -/* - * A doubly-linked list (actually a tail queue) of the pending page mappings - * for the ongoing memory transaction. - * - * It is used to optimize the number of page mapping updates done through the - * kernel module. For example, it's effective when a driver is digging an MMIO - * hole inside an existing memory mapping. It will get a deletion of the whole - * region, then the addition of the 2 remaining RAM areas around the hole and - * finally the memory transaction commit. During the commit, it will effectively - * send to the kernel only the removal of the pages from the MMIO hole after - * having computed locally the result of the deletion and additions. - */ -static QTAILQ_HEAD(, HAXMapping) mappings = - QTAILQ_HEAD_INITIALIZER(mappings); - -/** - * hax_mapping_dump_list: dumps @mappings to stdout (for debugging) - */ -static void hax_mapping_dump_list(void) -{ - HAXMapping *entry; - - DPRINTF("%s updates:\n", __func__); - QTAILQ_FOREACH(entry, &mappings, entry) { - DPRINTF("\t%c 0x%016" PRIx64 "->0x%016" PRIx64 " VA 0x%016" PRIx64 - "%s\n", entry->flags & HAX_RAM_INFO_INVALID ? '-' : '+', - entry->start_pa, entry->start_pa + entry->size, entry->host_va, - entry->flags & HAX_RAM_INFO_ROM ? " ROM" : ""); - } -} - -static void hax_insert_mapping_before(HAXMapping *next, uint64_t start_pa, - uint32_t size, uint64_t host_va, - uint8_t flags) -{ - HAXMapping *entry; - - entry = g_malloc0(sizeof(*entry)); - entry->start_pa = start_pa; - entry->size = size; - entry->host_va = host_va; - entry->flags = flags; - if (!next) { - QTAILQ_INSERT_TAIL(&mappings, entry, entry); - } else { - QTAILQ_INSERT_BEFORE(next, entry, entry); - } -} - -static bool hax_mapping_is_opposite(HAXMapping *entry, uint64_t host_va, - uint8_t flags) -{ - /* removed then added without change for the read-only flag */ - bool nop_flags = (entry->flags ^ flags) == HAX_RAM_INFO_INVALID; - - return (entry->host_va == host_va) && nop_flags; -} - -static void hax_update_mapping(uint64_t start_pa, uint32_t size, - uint64_t host_va, uint8_t flags) -{ - uint64_t end_pa = start_pa + size; - HAXMapping *entry, *next; - - QTAILQ_FOREACH_SAFE(entry, &mappings, entry, next) { - uint32_t chunk_sz; - if (start_pa >= entry->start_pa + entry->size) { - continue; - } - if (start_pa < entry->start_pa) { - chunk_sz = end_pa <= entry->start_pa ? size - : entry->start_pa - start_pa; - hax_insert_mapping_before(entry, start_pa, chunk_sz, - host_va, flags); - start_pa += chunk_sz; - host_va += chunk_sz; - size -= chunk_sz; - } else if (start_pa > entry->start_pa) { - /* split the existing chunk at start_pa */ - chunk_sz = start_pa - entry->start_pa; - hax_insert_mapping_before(entry, entry->start_pa, chunk_sz, - entry->host_va, entry->flags); - entry->start_pa += chunk_sz; - entry->host_va += chunk_sz; - entry->size -= chunk_sz; - } - /* now start_pa == entry->start_pa */ - chunk_sz = MIN(size, entry->size); - if (chunk_sz) { - bool nop = hax_mapping_is_opposite(entry, host_va, flags); - bool partial = chunk_sz < entry->size; - if (partial) { - /* remove the beginning of the existing chunk */ - entry->start_pa += chunk_sz; - entry->host_va += chunk_sz; - entry->size -= chunk_sz; - if (!nop) { - hax_insert_mapping_before(entry, start_pa, chunk_sz, - host_va, flags); - } - } else { /* affects the full mapping entry */ - if (nop) { /* no change to this mapping, remove it */ - QTAILQ_REMOVE(&mappings, entry, entry); - g_free(entry); - } else { /* update mapping properties */ - entry->host_va = host_va; - entry->flags = flags; - } - } - start_pa += chunk_sz; - host_va += chunk_sz; - size -= chunk_sz; - } - if (!size) { /* we are done */ - break; - } - } - if (size) { /* add the leftover */ - hax_insert_mapping_before(NULL, start_pa, size, host_va, flags); - } -} - -static void hax_process_section(MemoryRegionSection *section, uint8_t flags) -{ - MemoryRegion *mr = section->mr; - hwaddr start_pa = section->offset_within_address_space; - ram_addr_t size = int128_get64(section->size); - unsigned int delta; - uint64_t host_va; - uint32_t max_mapping_size; - - /* We only care about RAM and ROM regions */ - if (!memory_region_is_ram(mr)) { - if (memory_region_is_romd(mr)) { - /* HAXM kernel module does not support ROMD yet */ - warn_report("Ignoring ROMD region 0x%016" PRIx64 "->0x%016" PRIx64, - start_pa, start_pa + size); - } - return; - } - - /* Adjust start_pa and size so that they are page-aligned. (Cf - * kvm_set_phys_mem() in kvm-all.c). - */ - delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask()); - delta &= ~qemu_real_host_page_mask(); - if (delta > size) { - return; - } - start_pa += delta; - size -= delta; - size &= qemu_real_host_page_mask(); - if (!size || (start_pa & ~qemu_real_host_page_mask())) { - return; - } - - host_va = (uintptr_t)memory_region_get_ram_ptr(mr) - + section->offset_within_region + delta; - if (memory_region_is_rom(section->mr)) { - flags |= HAX_RAM_INFO_ROM; - } - - /* - * The kernel module interface uses 32-bit sizes: - * https://github.com/intel/haxm/blob/master/API.md#hax_vm_ioctl_set_ram - * - * If the mapping size is longer than 32 bits, we can't process it in one - * call into the kernel. Instead, we split the mapping into smaller ones, - * and call hax_update_mapping() on each. - */ - max_mapping_size = UINT32_MAX & qemu_real_host_page_mask(); - while (size > max_mapping_size) { - hax_update_mapping(start_pa, max_mapping_size, host_va, flags); - start_pa += max_mapping_size; - size -= max_mapping_size; - host_va += max_mapping_size; - } - /* Now size <= max_mapping_size */ - hax_update_mapping(start_pa, (uint32_t)size, host_va, flags); -} - -static void hax_region_add(MemoryListener *listener, - MemoryRegionSection *section) -{ - memory_region_ref(section->mr); - hax_process_section(section, 0); -} - -static void hax_region_del(MemoryListener *listener, - MemoryRegionSection *section) -{ - hax_process_section(section, HAX_RAM_INFO_INVALID); - memory_region_unref(section->mr); -} - -static void hax_transaction_begin(MemoryListener *listener) -{ - g_assert(QTAILQ_EMPTY(&mappings)); -} - -static void hax_transaction_commit(MemoryListener *listener) -{ - if (!QTAILQ_EMPTY(&mappings)) { - HAXMapping *entry, *next; - - if (DEBUG_HAX_MEM) { - hax_mapping_dump_list(); - } - QTAILQ_FOREACH_SAFE(entry, &mappings, entry, next) { - if (entry->flags & HAX_RAM_INFO_INVALID) { - /* for unmapping, put the values expected by the kernel */ - entry->flags = HAX_RAM_INFO_INVALID; - entry->host_va = 0; - } - if (hax_set_ram(entry->start_pa, entry->size, - entry->host_va, entry->flags)) { - fprintf(stderr, "%s: Failed mapping @0x%016" PRIx64 "+0x%" - PRIx32 " flags %02x\n", __func__, entry->start_pa, - entry->size, entry->flags); - } - QTAILQ_REMOVE(&mappings, entry, entry); - g_free(entry); - } - } -} - -/* currently we fake the dirty bitmap sync, always dirty */ -static void hax_log_sync(MemoryListener *listener, - MemoryRegionSection *section) -{ - MemoryRegion *mr = section->mr; - - if (!memory_region_is_ram(mr)) { - /* Skip MMIO regions */ - return; - } - - memory_region_set_dirty(mr, 0, int128_get64(section->size)); -} - -static MemoryListener hax_memory_listener = { - .name = "hax", - .begin = hax_transaction_begin, - .commit = hax_transaction_commit, - .region_add = hax_region_add, - .region_del = hax_region_del, - .log_sync = hax_log_sync, - .priority = MEMORY_LISTENER_PRIORITY_ACCEL, -}; - -static void hax_ram_block_added(RAMBlockNotifier *n, void *host, size_t size, - size_t max_size) -{ - /* - * We must register each RAM block with the HAXM kernel module, or - * hax_set_ram() will fail for any mapping into the RAM block: - * https://github.com/intel/haxm/blob/master/API.md#hax_vm_ioctl_alloc_ram - * - * Old versions of the HAXM kernel module (< 6.2.0) used to preallocate all - * host physical pages for the RAM block as part of this registration - * process, hence the name hax_populate_ram(). - */ - if (hax_populate_ram((uint64_t)(uintptr_t)host, max_size) < 0) { - fprintf(stderr, "HAX failed to populate RAM\n"); - abort(); - } -} - -static struct RAMBlockNotifier hax_ram_notifier = { - .ram_block_added = hax_ram_block_added, -}; - -void hax_memory_init(void) -{ - ram_block_notifier_add(&hax_ram_notifier); - memory_listener_register(&hax_memory_listener, &address_space_memory); -} diff --git a/target/i386/hax/hax-posix.c b/target/i386/hax/hax-posix.c deleted file mode 100644 index a057a5bd94..0000000000 --- a/target/i386/hax/hax-posix.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* HAX module interface - darwin version */ -#include "qemu/osdep.h" -#include <sys/ioctl.h> - -#include "sysemu/cpus.h" -#include "hax-accel-ops.h" - -hax_fd hax_mod_open(void) -{ - int fd = open("/dev/HAX", O_RDWR); - if (fd == -1) { - fprintf(stderr, "Failed to open the hax module\n"); - } - - qemu_set_cloexec(fd); - - return fd; -} - -int hax_populate_ram(uint64_t va, uint64_t size) -{ - int ret; - - if (!hax_global.vm || !hax_global.vm->fd) { - fprintf(stderr, "Allocate memory before vm create?\n"); - return -EINVAL; - } - - if (hax_global.supports_64bit_ramblock) { - struct hax_ramblock_info ramblock = { - .start_va = va, - .size = size, - .reserved = 0 - }; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ADD_RAMBLOCK, &ramblock); - } else { - struct hax_alloc_ram_info info = { - .size = (uint32_t)size, - .pad = 0, - .va = va - }; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ALLOC_RAM, &info); - } - if (ret < 0) { - fprintf(stderr, "Failed to register RAM block: ret=%d, va=0x%" PRIx64 - ", size=0x%" PRIx64 ", method=%s\n", ret, va, size, - hax_global.supports_64bit_ramblock ? "new" : "legacy"); - return ret; - } - return 0; -} - -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags) -{ - struct hax_set_ram_info info; - int ret; - - info.pa_start = start_pa; - info.size = size; - info.va = host_va; - info.flags = (uint8_t) flags; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_SET_RAM, &info); - if (ret < 0) { - return -errno; - } - return 0; -} - -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap) -{ - int ret; - - ret = ioctl(hax->fd, HAX_IOCTL_CAPABILITY, cap); - if (ret == -1) { - fprintf(stderr, "Failed to get HAX capability\n"); - return -errno; - } - - return 0; -} - -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) -{ - int ret; - - ret = ioctl(hax->fd, HAX_IOCTL_VERSION, version); - if (ret == -1) { - fprintf(stderr, "Failed to get HAX version\n"); - return -errno; - } - - return 0; -} - -static char *hax_vm_devfs_string(int vm_id) -{ - return g_strdup_printf("/dev/hax_vm/vm%02d", vm_id); -} - -static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) -{ - return g_strdup_printf("/dev/hax_vm%02d/vcpu%02d", vm_id, vcpu_id); -} - -int hax_host_create_vm(struct hax_state *hax, int *vmid) -{ - int ret; - int vm_id = 0; - - if (hax_invalid_fd(hax->fd)) { - return -EINVAL; - } - - if (hax->vm) { - return 0; - } - - ret = ioctl(hax->fd, HAX_IOCTL_CREATE_VM, &vm_id); - *vmid = vm_id; - return ret; -} - -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id) -{ - hax_fd fd; - char *vm_name = NULL; - - vm_name = hax_vm_devfs_string(vm_id); - if (!vm_name) { - return -1; - } - - fd = open(vm_name, O_RDWR); - g_free(vm_name); - - qemu_set_cloexec(fd); - - return fd; -} - -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion) -{ - int ret; - - if (hax_invalid_fd(vm_fd)) { - return -EINVAL; - } - - ret = ioctl(vm_fd, HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, qversion); - - if (ret < 0) { - fprintf(stderr, "Failed to notify qemu API version\n"); - return ret; - } - return 0; -} - -/* Simply assume the size should be bigger than the hax_tunnel, - * since the hax_tunnel can be extended later with compatibility considered - */ -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid) -{ - int ret; - - ret = ioctl(vm_fd, HAX_VM_IOCTL_VCPU_CREATE, &vcpuid); - if (ret < 0) { - fprintf(stderr, "Failed to create vcpu %x\n", vcpuid); - } - - return ret; -} - -hax_fd hax_host_open_vcpu(int vmid, int vcpuid) -{ - char *devfs_path = NULL; - hax_fd fd; - - devfs_path = hax_vcpu_devfs_string(vmid, vcpuid); - if (!devfs_path) { - fprintf(stderr, "Failed to get the devfs\n"); - return -EINVAL; - } - - fd = open(devfs_path, O_RDWR); - g_free(devfs_path); - if (fd < 0) { - fprintf(stderr, "Failed to open the vcpu devfs\n"); - } - qemu_set_cloexec(fd); - return fd; -} - -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu) -{ - int ret; - struct hax_tunnel_info info; - - ret = ioctl(vcpu->fd, HAX_VCPU_IOCTL_SETUP_TUNNEL, &info); - if (ret) { - fprintf(stderr, "Failed to setup the hax tunnel\n"); - return ret; - } - - if (!valid_hax_tunnel_size(info.size)) { - fprintf(stderr, "Invalid hax tunnel size %x\n", info.size); - ret = -EINVAL; - return ret; - } - - vcpu->tunnel = (struct hax_tunnel *) (intptr_t) (info.va); - vcpu->iobuf = (unsigned char *) (intptr_t) (info.io_va); - return 0; -} - -int hax_vcpu_run(AccelCPUState *vcpu) -{ - return ioctl(vcpu->fd, HAX_VCPU_IOCTL_RUN, NULL); -} - -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - if (set) { - ret = ioctl(fd, HAX_VCPU_IOCTL_SET_FPU, fl); - } else { - ret = ioctl(fd, HAX_VCPU_IOCTL_GET_FPU, fl); - } - return ret; -} - -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - if (set) { - ret = ioctl(fd, HAX_VCPU_IOCTL_SET_MSRS, msrs); - } else { - ret = ioctl(fd, HAX_VCPU_IOCTL_GET_MSRS, msrs); - } - return ret; -} - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - if (set) { - ret = ioctl(fd, HAX_VCPU_SET_REGS, state); - } else { - ret = ioctl(fd, HAX_VCPU_GET_REGS, state); - } - return ret; -} - -int hax_inject_interrupt(CPUArchState *env, int vector) -{ - int fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - return ioctl(fd, HAX_VCPU_IOCTL_INTERRUPT, &vector); -} - -void hax_kick_vcpu_thread(CPUState *cpu) -{ - /* - * FIXME: race condition with the exit_request check in - * hax_vcpu_hax_exec - */ - cpu->exit_request = 1; - cpus_kick_thread(cpu); -} diff --git a/target/i386/hax/hax-windows.c b/target/i386/hax/hax-windows.c deleted file mode 100644 index 4bf6cc08d2..0000000000 --- a/target/i386/hax/hax-windows.c +++ /dev/null @@ -1,485 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "hax-accel-ops.h" - -/* - * return 0 when success, -1 when driver not loaded, - * other negative value for other failure - */ -static int hax_open_device(hax_fd *fd) -{ - uint32_t errNum = 0; - HANDLE hDevice; - - if (!fd) { - return -2; - } - - hDevice = CreateFile("\\\\.\\HAX", - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hDevice == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Failed to open the HAX device!\n"); - errNum = GetLastError(); - if (errNum == ERROR_FILE_NOT_FOUND) { - return -1; - } - return -2; - } - *fd = hDevice; - return 0; -} - -/* hax_fd hax_mod_open */ - hax_fd hax_mod_open(void) -{ - int ret; - hax_fd fd = NULL; - - ret = hax_open_device(&fd); - if (ret != 0) { - fprintf(stderr, "Open HAX device failed\n"); - } - - return fd; -} - -int hax_populate_ram(uint64_t va, uint64_t size) -{ - int ret; - HANDLE hDeviceVM; - DWORD dSize = 0; - - if (!hax_global.vm || !hax_global.vm->fd) { - fprintf(stderr, "Allocate memory before vm create?\n"); - return -EINVAL; - } - - hDeviceVM = hax_global.vm->fd; - if (hax_global.supports_64bit_ramblock) { - struct hax_ramblock_info ramblock = { - .start_va = va, - .size = size, - .reserved = 0 - }; - - ret = DeviceIoControl(hDeviceVM, - HAX_VM_IOCTL_ADD_RAMBLOCK, - &ramblock, sizeof(ramblock), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } else { - struct hax_alloc_ram_info info = { - .size = (uint32_t) size, - .pad = 0, - .va = va - }; - - ret = DeviceIoControl(hDeviceVM, - HAX_VM_IOCTL_ALLOC_RAM, - &info, sizeof(info), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } - - if (!ret) { - fprintf(stderr, "Failed to register RAM block: va=0x%" PRIx64 - ", size=0x%" PRIx64 ", method=%s\n", va, size, - hax_global.supports_64bit_ramblock ? "new" : "legacy"); - return ret; - } - - return 0; -} - -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags) -{ - struct hax_set_ram_info info; - HANDLE hDeviceVM = hax_global.vm->fd; - DWORD dSize = 0; - int ret; - - info.pa_start = start_pa; - info.size = size; - info.va = host_va; - info.flags = (uint8_t) flags; - - ret = DeviceIoControl(hDeviceVM, HAX_VM_IOCTL_SET_RAM, - &info, sizeof(info), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap) -{ - int ret; - HANDLE hDevice = hax->fd; /* handle to hax module */ - DWORD dSize = 0; - DWORD err = 0; - - if (hax_invalid_fd(hDevice)) { - fprintf(stderr, "Invalid fd for hax device!\n"); - return -ENODEV; - } - - ret = DeviceIoControl(hDevice, HAX_IOCTL_CAPABILITY, NULL, 0, cap, - sizeof(*cap), &dSize, (LPOVERLAPPED) NULL); - - if (!ret) { - err = GetLastError(); - if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) { - fprintf(stderr, "hax capability is too long to hold.\n"); - } - fprintf(stderr, "Failed to get Hax capability:%luu\n", err); - return -EFAULT; - } else { - return 0; - } -} - -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) -{ - int ret; - HANDLE hDevice = hax->fd; /* handle to hax module */ - DWORD dSize = 0; - DWORD err = 0; - - if (hax_invalid_fd(hDevice)) { - fprintf(stderr, "Invalid fd for hax device!\n"); - return -ENODEV; - } - - ret = DeviceIoControl(hDevice, - HAX_IOCTL_VERSION, - NULL, 0, - version, sizeof(*version), &dSize, - (LPOVERLAPPED) NULL); - - if (!ret) { - err = GetLastError(); - if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) { - fprintf(stderr, "hax module verion is too long to hold.\n"); - } - fprintf(stderr, "Failed to get Hax module version:%lu\n", err); - return -EFAULT; - } else { - return 0; - } -} - -static char *hax_vm_devfs_string(int vm_id) -{ - return g_strdup_printf("\\\\.\\hax_vm%02d", vm_id); -} - -static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) -{ - return g_strdup_printf("\\\\.\\hax_vm%02d_vcpu%02d", vm_id, vcpu_id); -} - -int hax_host_create_vm(struct hax_state *hax, int *vmid) -{ - int ret; - int vm_id = 0; - DWORD dSize = 0; - - if (hax_invalid_fd(hax->fd)) { - return -EINVAL; - } - - if (hax->vm) { - return 0; - } - - ret = DeviceIoControl(hax->fd, - HAX_IOCTL_CREATE_VM, - NULL, 0, &vm_id, sizeof(vm_id), &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to create VM. Error code: %lu\n", - GetLastError()); - return -1; - } - *vmid = vm_id; - return 0; -} - -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id) -{ - char *vm_name = NULL; - hax_fd hDeviceVM; - - vm_name = hax_vm_devfs_string(vm_id); - if (!vm_name) { - fprintf(stderr, "Failed to open VM. VM name is null\n"); - return INVALID_HANDLE_VALUE; - } - - hDeviceVM = CreateFile(vm_name, - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hDeviceVM == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Open the vm device error:%s, ec:%lu\n", - vm_name, GetLastError()); - } - - g_free(vm_name); - return hDeviceVM; -} - -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion) -{ - int ret; - DWORD dSize = 0; - if (hax_invalid_fd(vm_fd)) { - return -EINVAL; - } - ret = DeviceIoControl(vm_fd, - HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, - qversion, sizeof(struct hax_qemu_version), - NULL, 0, &dSize, (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to notify qemu API version\n"); - return -1; - } - return 0; -} - -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid) -{ - int ret; - DWORD dSize = 0; - - ret = DeviceIoControl(vm_fd, - HAX_VM_IOCTL_VCPU_CREATE, - &vcpuid, sizeof(vcpuid), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to create vcpu %x\n", vcpuid); - return -1; - } - - return 0; -} - -hax_fd hax_host_open_vcpu(int vmid, int vcpuid) -{ - char *devfs_path = NULL; - hax_fd hDeviceVCPU; - - devfs_path = hax_vcpu_devfs_string(vmid, vcpuid); - if (!devfs_path) { - fprintf(stderr, "Failed to get the devfs\n"); - return INVALID_HANDLE_VALUE; - } - - hDeviceVCPU = CreateFile(devfs_path, - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, - NULL); - - if (hDeviceVCPU == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Failed to open the vcpu devfs\n"); - } - g_free(devfs_path); - return hDeviceVCPU; -} - -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu) -{ - hax_fd hDeviceVCPU = vcpu->fd; - int ret; - struct hax_tunnel_info info; - DWORD dSize = 0; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SETUP_TUNNEL, - NULL, 0, &info, sizeof(info), &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to setup the hax tunnel\n"); - return -1; - } - - if (!valid_hax_tunnel_size(info.size)) { - fprintf(stderr, "Invalid hax tunnel size %x\n", info.size); - ret = -EINVAL; - return ret; - } - vcpu->tunnel = (struct hax_tunnel *) (intptr_t) (info.va); - vcpu->iobuf = (unsigned char *) (intptr_t) (info.io_va); - return 0; -} - -int hax_vcpu_run(AccelCPUState *vcpu) -{ - int ret; - HANDLE hDeviceVCPU = vcpu->fd; - DWORD dSize = 0; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_RUN, - NULL, 0, NULL, 0, &dSize, (LPOVERLAPPED) NULL); - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize = 0; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SET_FPU, - fl, sizeof(*fl), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_GET_FPU, - NULL, 0, fl, sizeof(*fl), &dSize, - (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize = 0; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SET_MSRS, - msrs, sizeof(*msrs), - msrs, sizeof(*msrs), &dSize, (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_GET_MSRS, - msrs, sizeof(*msrs), - msrs, sizeof(*msrs), &dSize, (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_SET_REGS, - state, sizeof(*state), - NULL, 0, &dSize, (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_GET_REGS, - NULL, 0, - state, sizeof(*state), &dSize, - (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_inject_interrupt(CPUArchState *env, int vector) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_INTERRUPT, - &vector, sizeof(vector), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -static void CALLBACK dummy_apc_func(ULONG_PTR unused) -{ -} - -void hax_kick_vcpu_thread(CPUState *cpu) -{ - /* - * FIXME: race condition with the exit_request check in - * hax_vcpu_hax_exec - */ - cpu->exit_request = 1; - if (!qemu_cpu_is_self(cpu)) { - if (!QueueUserAPC(dummy_apc_func, cpu->accel->hThread, 0)) { - fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n", - __func__, GetLastError()); - exit(1); - } - } -} diff --git a/accel/Kconfig b/accel/Kconfig index 8bdedb7d15..a30cf2eb48 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -4,9 +4,6 @@ config WHPX config NVMM bool -config HAX - bool - config HVF bool diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index f7a9486e06..6b0f200efe 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,5 +1,4 @@ sysemu_stubs_ss = ss.source_set() -sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) diff --git a/meson_options.txt b/meson_options.txt index aaea5ddd77..4f3b1ecab0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -69,8 +69,6 @@ option('malloc', type : 'combo', choices : ['system', 'tcmalloc', 'jemalloc'], option('kvm', type: 'feature', value: 'auto', description: 'KVM acceleration support') -option('hax', type: 'feature', value: 'auto', - description: 'HAX acceleration support') option('whpx', type: 'feature', value: 'auto', description: 'WHPX acceleration support') option('hvf', type: 'feature', value: 'auto', diff --git a/qemu-options.hx b/qemu-options.hx index 29b98c3d4c..463f520c57 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -26,7 +26,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=]name[,prop[=value][,...]]\n" " selects emulated machine ('-machine help' for list)\n" " property accel=accel1[:accel2[:...]] selects accelerator\n" - " supported accelerators are kvm, xen, hax, hvf, nvmm, whpx or tcg (default: tcg)\n" + " supported accelerators are kvm, xen, hvf, nvmm, whpx or tcg (default: tcg)\n" " vmport=on|off|auto controls emulation of vmport (default: auto)\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" @@ -59,7 +59,7 @@ SRST ``accel=accels1[:accels2[:...]]`` This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. + architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. @@ -178,7 +178,7 @@ ERST DEF("accel", HAS_ARG, QEMU_OPTION_accel, "-accel [accel=]accelerator[,prop[=value][,...]]\n" - " select accelerator (kvm, xen, hax, hvf, nvmm, whpx or tcg; use 'help' for a list)\n" + " select accelerator (kvm, xen, hvf, nvmm, whpx or tcg; use 'help' for a list)\n" " igd-passthru=on|off (enable Xen integrated Intel graphics passthrough, default=off)\n" " kernel-irqchip=on|off|split controls accelerated irqchip support (default=on)\n" " kvm-shadow-mem=size of KVM shadow MMU in bytes\n" @@ -191,7 +191,7 @@ DEF("accel", HAS_ARG, QEMU_OPTION_accel, SRST ``-accel name[,prop=value[,...]]`` This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. By + architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index d02b09a4b9..131f8ee5f3 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -68,7 +68,6 @@ --disable-gtk \ --disable-guest-agent \ --disable-guest-agent-msi \ ---disable-hax \ --disable-hvf \ --disable-iconv \ --disable-kvm \ diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 9da3fe299b..504a61ad01 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -110,7 +110,6 @@ meson_options_help() { printf "%s\n" ' gtk-clipboard clipboard support for the gtk UI (EXPERIMENTAL, MAY HANG)' printf "%s\n" ' guest-agent Build QEMU Guest Agent' printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Agent' - printf "%s\n" ' hax HAX acceleration support' printf "%s\n" ' hvf HVF acceleration support' printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' @@ -312,8 +311,6 @@ _meson_option_parse() { --disable-guest-agent) printf "%s" -Dguest_agent=disabled ;; --enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;; --disable-guest-agent-msi) printf "%s" -Dguest_agent_msi=disabled ;; - --enable-hax) printf "%s" -Dhax=enabled ;; - --disable-hax) printf "%s" -Dhax=disabled ;; --enable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=true ;; --disable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=false ;; --enable-hvf) printf "%s" -Dhvf=enabled ;; diff --git a/target/i386/hax/meson.build b/target/i386/hax/meson.build deleted file mode 100644 index 6ac314aa35..0000000000 --- a/target/i386/hax/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -i386_system_ss.add(when: 'CONFIG_HAX', if_true: files( - 'hax-all.c', - 'hax-mem.c', - 'hax-accel-ops.c', -)) -i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c')) -i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c')) diff --git a/target/i386/meson.build b/target/i386/meson.build index 1effe1ed9a..6f1036d469 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -25,7 +25,6 @@ i386_system_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files( i386_user_ss = ss.source_set() subdir('kvm') -subdir('hax') subdir('whpx') subdir('nvmm') subdir('hvf') -- 2.41.0

1 0

[libvirt PATCH] rpm: Recommend libvirt-daemon for with_modular_daemons distros
by Andrea Bolognani 31 Aug '23

31 Aug '23

A default deployment on modern distros uses modular daemons but switching back to the monolithic daemon, while not recommended, is still considered a perfectly valid option. For a monolithic daemon deployment, the upgrade to libvirt 9.2.0 or newer works as expected; a subsequent call to dnf autoremove, however, results in the libvirt-daemon package being removed and the deployment no longer working. In order to avoid that situation, mark the libvirt-daemon as recommended. This will unfortunately result in it being included in most installations despite not being necessary, but considering that the alternative is breaking existing setups on upgrade it feels like a reasonable tradeoff. Moreover, since the dependency on libvirt-daemon is just a weak one, it's still possible for people looking to minimize the footprint of their installation to manually remove the package after installation, mitigating the drawbacks of this approach. https://bugzilla.redhat.com/show_bug.cgi?id=2232805 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6bbc7a0e9a..b471afebb1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -830,6 +830,7 @@ Requires: libvirt-daemon-log = %{version}-%{release} Requires: libvirt-daemon-lock = %{version}-%{release} Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -857,6 +858,7 @@ Requires: libvirt-daemon-log = %{version}-%{release} Requires: libvirt-daemon-lock = %{version}-%{release} Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -881,6 +883,7 @@ Summary: Server side daemon & driver required to run LXC guests %if %{with_modular_daemons} Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -906,6 +909,7 @@ Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-daemon-lock = %{version}-%{release} Requires: libvirt-daemon-plugin-lockd = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif @@ -930,6 +934,7 @@ Summary: Server side daemon & driver required to run VirtualBox guests %if %{with_modular_daemons} Requires: libvirt-daemon-common = %{version}-%{release} Requires: libvirt-daemon-proxy = %{version}-%{release} +Recommends: libvirt-daemon = %{version}-%{release} %else Requires: libvirt-daemon = %{version}-%{release} %endif -- 2.41.0

3 8

[PATCH] rpm: Fix typo in daemon name
by Andrea Bolognani 30 Aug '23

30 Aug '23

The name of the virtsecretd daemon was misspelled, resulting in multiple errors during installation: Running scriptlet: libvirt-daemon-driver-secret-9.5.0-6.el9.x86_64 Failed to preset unit: Unit file virsecretd.socket does not exist. Failed to preset unit: Unit file virsecretd-ro.socket does not exist. Failed to preset unit: Unit file virsecretd-admin.socket does not exist. Failed to preset unit: Unit file virsecretd.service does not exist. Spell the name correctly. https://bugzilla.redhat.com/show_bug.cgi?id=2236057 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. libvirt.spec.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 7157cfe3b4..6bbc7a0e9a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1716,14 +1716,14 @@ exit 0 %pre daemon-driver-secret %libvirt_sysconfig_pre virtsecretd -%libvirt_systemd_unix_pre virsecretd +%libvirt_systemd_unix_pre virtsecretd %posttrans daemon-driver-secret %libvirt_sysconfig_posttrans virtsecretd -%libvirt_systemd_unix_posttrans virsecretd +%libvirt_systemd_unix_posttrans virtsecretd %preun daemon-driver-secret -%libvirt_systemd_unix_preun virsecretd +%libvirt_systemd_unix_preun virtsecretd %pre daemon-driver-storage-core %libvirt_sysconfig_pre virtstoraged -- 2.41.0

1 0

[libvirt PATCH] NEWS: document support for reverting external snapshots
by Pavel Hrdina 30 Aug '23

30 Aug '23

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- NEWS.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e40c8ac259..a3be76d6cc 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -28,6 +28,14 @@ v9.7.0 (unreleased) 2) pre-binding the variant driver using the ``--driver`` option of ``virsh nodedev-detach``. + * QEMU: implement reverting external snapshots + + Reverting external snapshots is now possible using the existing API + ``virDomainSnapshotRevert()``. Management application can check host + capabilities for ``<externalSnapshot/>`` element within the list of + guest features to see if the current libvirt supports both deleting + and reverting external snapshots. + * **Improvements** * **Bug fixes** -- 2.41.0

1 0

[PATCH 0/4] vircommand: Various mass close improvements
by Michal Privoznik 30 Aug '23

30 Aug '23

*** BLURB HERE *** Michal Prívozník (4): vircommand: Drop unused arguments from virCommandMassCloseGetFDs*() vircommand: Isolate FD dir parsing into a separate function vircommand: Make sysconf(_SC_OPEN_MAX) failure non-fatal vircommand: Parse /dev/fd on *BSD-like systems when looking for opened FDs src/util/vircommand.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) -- 2.41.0

3 7

[PATCH 0/3] bhyve: Feed hook scripts with domain XML
by Michal Privoznik 29 Aug '23

29 Aug '23

*** BLURB HERE *** Michal Prívozník (3): docs: Document that libxl hooks are also given full domain XML docs: Document bhyve hook scripts bhyve: Feed hook scripts with domain XML docs/hooks.rst | 56 +++++++++++++++++++++++++++++++++++---- src/bhyve/bhyve_process.c | 35 ++++++++++++++++-------- 2 files changed, 75 insertions(+), 16 deletions(-) -- 2.41.0

2 4

[RFC PATCH-for-8.1] accel: Remove HAX accelerator
by Philippe Mathieu-Daudé 29 Aug '23

29 Aug '23

HAX is deprecated since commits 73741fda6c ("MAINTAINERS: Abort HAXM maintenance") and 90c167a1da ("docs/about/deprecated: Mark HAXM in QEMU as deprecated"), released in v8.0.0. Per the QEMU deprecation policy, we shouldn't remove it before QEMU release v8.2.0. However per the latest HAXM release (v7.8), the latest QEMU supported is v7.2: Note: Up to this release, HAXM supports QEMU from 2.9.0 to 7.2.0. (https://github.com/intel/haxm/releases/tag/v7.8.0) The next commit (https://github.com/intel/haxm/commit/da1b8ec072) added: HAXM v7.8.0 is our last release and we will not accept pull requests or respond to issues after this. As of commit b455ce4c2f, it became very hard to build and test HAXM. Its previous maintainers made it clear they won't help. It doesn't seem to be a very good use of QEMU maintainers to spend their time in a dead project. Save our time by removing this orphan zombie code before the QEMU v8.2 release. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- MAINTAINERS | 8 - docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 6 - docs/about/removed-features.rst | 9 +- docs/system/introduction.rst | 3 - meson.build | 7 - include/exec/poison.h | 1 - include/hw/core/cpu.h | 2 +- include/sysemu/hax.h | 49 - include/sysemu/hw_accel.h | 1 - target/i386/hax/hax-accel-ops.h | 31 - target/i386/hax/hax-i386.h | 98 -- target/i386/hax/hax-interface.h | 369 ------ target/i386/hax/hax-posix.h | 61 - target/i386/hax/hax-windows.h | 88 -- accel/stubs/hax-stub.c | 24 - hw/intc/apic_common.c | 3 +- softmmu/cpus.c | 6 - softmmu/vl.c | 6 - target/i386/hax/hax-accel-ops.c | 105 -- target/i386/hax/hax-all.c | 1141 ----------------- target/i386/hax/hax-mem.c | 323 ----- target/i386/hax/hax-posix.c | 305 ----- target/i386/hax/hax-windows.c | 485 ------- accel/stubs/meson.build | 1 - meson_options.txt | 2 - qemu-options.hx | 8 +- .../ci/org.centos/stream/8/x86_64/configure | 1 - scripts/meson-buildoptions.sh | 3 - target/i386/hax/meson.build | 7 - target/i386/meson.build | 1 - 31 files changed, 13 insertions(+), 3143 deletions(-) delete mode 100644 include/sysemu/hax.h delete mode 100644 target/i386/hax/hax-accel-ops.h delete mode 100644 target/i386/hax/hax-i386.h delete mode 100644 target/i386/hax/hax-interface.h delete mode 100644 target/i386/hax/hax-posix.h delete mode 100644 target/i386/hax/hax-windows.h delete mode 100644 accel/stubs/hax-stub.c delete mode 100644 target/i386/hax/hax-accel-ops.c delete mode 100644 target/i386/hax/hax-all.c delete mode 100644 target/i386/hax/hax-mem.c delete mode 100644 target/i386/hax/hax-posix.c delete mode 100644 target/i386/hax/hax-windows.c delete mode 100644 target/i386/hax/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index 1da135b0c8..aa30640670 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -544,14 +544,6 @@ F: include/sysemu/xen.h F: include/sysemu/xen-mapcache.h F: stubs/xen-hw-stub.c -Guest CPU Cores (HAXM) ---------------------- -X86 HAXM CPUs -S: Orphan -F: accel/stubs/hax-stub.c -F: include/sysemu/hax.h -F: target/i386/hax/ - Guest CPU Cores (NVMM) ---------------------- NetBSD Virtual Machine Monitor (NVMM) CPU support diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 0e2cb9e770..f2a7aec56f 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -52,7 +52,7 @@ Those hosts are officially supported, with various accelerators: * - SPARC - tcg * - x86 - - hax, hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen + - hvf (64 bit only), kvm, nvmm, tcg, whpx (64 bit only), xen Other host architectures are not supported. It is possible to build QEMU system emulation on an unsupported host architecture using the configure diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 0743459862..c1d6dde8f7 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -105,12 +105,6 @@ Use ``-machine hpet=off`` instead. The ``-no-acpi`` setting has been turned into a machine property. Use ``-machine acpi=off`` instead. -``-accel hax`` (since 8.0) -'''''''''''''''''''''''''' - -The HAXM project has been retired (see https://github.com/intel/haxm#status) -Use "whpx" (on Windows) or "hvf" (on macOS) instead. - ``-async-teardown`` (since 8.1) ''''''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 5b258b446b..cc8a1e38a9 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -659,15 +659,18 @@ Use ``Icelake-Server`` instead. System accelerators ------------------- -Userspace local APIC with KVM (x86, removed 8.0) +Userspace local APIC with KVM (x86, removed in 8.0) '''''''''''''''''''''''''''''''''''''''''''''''' ``-M kernel-irqchip=off`` cannot be used on KVM if the CPU model includes a local APIC. The ``split`` setting is supported, as is using ``-M kernel-irqchip=off`` when the CPU does not have a local APIC. -System accelerators -------------------- +HAXM (``-accel hax``) (removed in 8.1) +'''''''''''''''''''''''''''''''''''''' + +The HAXM project has been retired (see https://github.com/intel/haxm#status) +Use "whpx" (on Windows) or "hvf" (on macOS) instead. MIPS "Trap-and-Emulate" KVM support (removed in 8.0) '''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/system/introduction.rst b/docs/system/introduction.rst index 3e256f8326..51ac132d6c 100644 --- a/docs/system/introduction.rst +++ b/docs/system/introduction.rst @@ -21,9 +21,6 @@ Tiny Code Generator (TCG) capable of emulating many CPUs. * - Xen - Linux (as dom0) - Arm, x86 - * - Intel HAXM (hax) - - Linux, Windows - - x86 * - Hypervisor Framework (hvf) - MacOS - x86 (64 bit only), Arm (64 bit only) diff --git a/meson.build b/meson.build index 6ef78ea278..5c4c62b41a 100644 --- a/meson.build +++ b/meson.build @@ -141,7 +141,6 @@ if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] endif if cpu in ['x86', 'x86_64'] accelerator_targets += { - 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_NVMM': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], @@ -673,11 +672,6 @@ if get_option('hvf').allowed() accelerators += 'CONFIG_HVF' endif endif -if get_option('hax').allowed() - if get_option('hax').enabled() or targetos in ['windows', 'darwin', 'netbsd'] - accelerators += 'CONFIG_HAX' - endif -endif if targetos == 'netbsd' nvmm = cc.find_library('nvmm', required: get_option('nvmm')) if nvmm.found() @@ -4136,7 +4130,6 @@ endif summary_info = {} if have_system summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')} - summary_info += {'HAX support': config_all.has_key('CONFIG_HAX')} summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')} summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')} summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')} diff --git a/include/exec/poison.h b/include/exec/poison.h index e94ee8dfef..1ea5633eb3 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -81,7 +81,6 @@ #pragma GCC poison CONFIG_SPARC_DIS #pragma GCC poison CONFIG_XTENSA_DIS -#pragma GCC poison CONFIG_HAX #pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 44c91240f2..1b3ae0aabf 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -420,7 +420,7 @@ struct CPUState { int32_t exception_index; AccelCPUState *accel; - /* shared by kvm, hax and hvf */ + /* shared by kvm and hvf */ bool vcpu_dirty; /* Used to keep track of an outstanding cpu throttle thread for migration diff --git a/include/sysemu/hax.h b/include/sysemu/hax.h deleted file mode 100644 index 80fc716f80..0000000000 --- a/include/sysemu/hax.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright IBM, Corp. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * Copyright 2016 Google, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* header to be included in non-HAX-specific code */ - -#ifndef QEMU_HAX_H -#define QEMU_HAX_H - -int hax_sync_vcpus(void); - -#ifdef NEED_CPU_H -# ifdef CONFIG_HAX -# define CONFIG_HAX_IS_POSSIBLE -# endif -#else /* !NEED_CPU_H */ -# define CONFIG_HAX_IS_POSSIBLE -#endif - -#ifdef CONFIG_HAX_IS_POSSIBLE - -extern bool hax_allowed; - -#define hax_enabled() (hax_allowed) - -#else /* !CONFIG_HAX_IS_POSSIBLE */ - -#define hax_enabled() (0) - -#endif /* CONFIG_HAX_IS_POSSIBLE */ - -#endif /* QEMU_HAX_H */ diff --git a/include/sysemu/hw_accel.h b/include/sysemu/hw_accel.h index 22903a55f7..c71b77e71f 100644 --- a/include/sysemu/hw_accel.h +++ b/include/sysemu/hw_accel.h @@ -12,7 +12,6 @@ #define QEMU_HW_ACCEL_H #include "hw/core/cpu.h" -#include "sysemu/hax.h" #include "sysemu/kvm.h" #include "sysemu/hvf.h" #include "sysemu/whpx.h" diff --git a/target/i386/hax/hax-accel-ops.h b/target/i386/hax/hax-accel-ops.h deleted file mode 100644 index 9e357e7b40..0000000000 --- a/target/i386/hax/hax-accel-ops.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Accelerator CPUS Interface - * - * Copyright 2020 SUSE LLC - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#ifndef TARGET_I386_HAX_ACCEL_OPS_H -#define TARGET_I386_HAX_ACCEL_OPS_H - -#include "sysemu/cpus.h" - -#include "hax-interface.h" -#include "hax-i386.h" - -int hax_init_vcpu(CPUState *cpu); -int hax_smp_cpu_exec(CPUState *cpu); -int hax_populate_ram(uint64_t va, uint64_t size); - -void hax_cpu_synchronize_state(CPUState *cpu); -void hax_cpu_synchronize_post_reset(CPUState *cpu); -void hax_cpu_synchronize_post_init(CPUState *cpu); -void hax_cpu_synchronize_pre_loadvm(CPUState *cpu); - -int hax_vcpu_destroy(CPUState *cpu); -void hax_raise_event(CPUState *cpu); -void hax_reset_vcpu_state(void *opaque); - -#endif /* TARGET_I386_HAX_ACCEL_OPS_H */ diff --git a/target/i386/hax/hax-i386.h b/target/i386/hax/hax-i386.h deleted file mode 100644 index 87153f40ab..0000000000 --- a/target/i386/hax/hax-i386.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef HAX_I386_H -#define HAX_I386_H - -#include "cpu.h" -#include "sysemu/hax.h" - -#ifdef CONFIG_POSIX -typedef int hax_fd; -#endif - -#ifdef CONFIG_WIN32 -typedef HANDLE hax_fd; -#endif - -extern struct hax_state hax_global; - -struct AccelCPUState { -#ifdef _WIN32 - HANDLE hThread; -#endif - hax_fd fd; - int vcpu_id; - struct hax_tunnel *tunnel; - unsigned char *iobuf; -}; - -struct hax_state { - hax_fd fd; /* the global hax device interface */ - uint32_t version; - struct hax_vm *vm; - uint64_t mem_quota; - bool supports_64bit_ramblock; -}; - -#define HAX_MAX_VCPU 0x10 - -struct hax_vm { - hax_fd fd; - int id; - int numvcpus; - AccelCPUState **vcpus; -}; - -/* Functions exported to host specific mode */ -hax_fd hax_vcpu_get_fd(CPUArchState *env); -int valid_hax_tunnel_size(uint16_t size); - -/* Host specific functions */ -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version); -int hax_inject_interrupt(CPUArchState *env, int vector); -struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus); -int hax_vcpu_run(AccelCPUState *vcpu); -int hax_vcpu_create(int id); -void hax_kick_vcpu_thread(CPUState *cpu); - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, - int set); -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set); -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set); - -int hax_vm_destroy(struct hax_vm *vm); -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap); -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion); -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags); - -/* Common host function */ -int hax_host_create_vm(struct hax_state *hax, int *vm_id); -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id); -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid); -hax_fd hax_host_open_vcpu(int vmid, int vcpuid); -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu); -hax_fd hax_mod_open(void); -void hax_memory_init(void); - - -#ifdef CONFIG_POSIX -#include "hax-posix.h" -#endif - -#ifdef CONFIG_WIN32 -#include "hax-windows.h" -#endif - -#include "hax-interface.h" - -#endif diff --git a/target/i386/hax/hax-interface.h b/target/i386/hax/hax-interface.h deleted file mode 100644 index 537ae084e9..0000000000 --- a/target/i386/hax/hax-interface.h +++ /dev/null @@ -1,369 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* Interface with HAX kernel module */ - -#ifndef HAX_INTERFACE_H -#define HAX_INTERFACE_H - -/* fx_layout has 3 formats table 3-56, 512bytes */ -struct fx_layout { - uint16_t fcw; - uint16_t fsw; - uint8_t ftw; - uint8_t res1; - uint16_t fop; - union { - struct { - uint32_t fip; - uint16_t fcs; - uint16_t res2; - }; - uint64_t fpu_ip; - }; - union { - struct { - uint32_t fdp; - uint16_t fds; - uint16_t res3; - }; - uint64_t fpu_dp; - }; - uint32_t mxcsr; - uint32_t mxcsr_mask; - uint8_t st_mm[8][16]; - uint8_t mmx_1[8][16]; - uint8_t mmx_2[8][16]; - uint8_t pad[96]; -} __attribute__ ((aligned(8))); - -struct vmx_msr { - uint64_t entry; - uint64_t value; -} __attribute__ ((__packed__)); - -/* - * Fixed array is not good, but it makes Mac support a bit easier by avoiding - * memory map or copyin staff. - */ -#define HAX_MAX_MSR_ARRAY 0x20 -struct hax_msr_data { - uint16_t nr_msr; - uint16_t done; - uint16_t pad[2]; - struct vmx_msr entries[HAX_MAX_MSR_ARRAY]; -} __attribute__ ((__packed__)); - -union interruptibility_state_t { - uint32_t raw; - struct { - uint32_t sti_blocking:1; - uint32_t movss_blocking:1; - uint32_t smi_blocking:1; - uint32_t nmi_blocking:1; - uint32_t reserved:28; - }; - uint64_t pad; -}; - -typedef union interruptibility_state_t interruptibility_state_t; - -/* Segment descriptor */ -struct segment_desc_t { - uint16_t selector; - uint16_t _dummy; - uint32_t limit; - uint64_t base; - union { - struct { - uint32_t type:4; - uint32_t desc:1; - uint32_t dpl:2; - uint32_t present:1; - uint32_t:4; - uint32_t available:1; - uint32_t long_mode:1; - uint32_t operand_size:1; - uint32_t granularity:1; - uint32_t null:1; - uint32_t:15; - }; - uint32_t ar; - }; - uint32_t ipad; -}; - -typedef struct segment_desc_t segment_desc_t; - -struct vcpu_state_t { - union { - uint64_t _regs[16]; - struct { - union { - struct { - uint8_t _al, _ah; - }; - uint16_t _ax; - uint32_t _eax; - uint64_t _rax; - }; - union { - struct { - uint8_t _cl, _ch; - }; - uint16_t _cx; - uint32_t _ecx; - uint64_t _rcx; - }; - union { - struct { - uint8_t _dl, _dh; - }; - uint16_t _dx; - uint32_t _edx; - uint64_t _rdx; - }; - union { - struct { - uint8_t _bl, _bh; - }; - uint16_t _bx; - uint32_t _ebx; - uint64_t _rbx; - }; - union { - uint16_t _sp; - uint32_t _esp; - uint64_t _rsp; - }; - union { - uint16_t _bp; - uint32_t _ebp; - uint64_t _rbp; - }; - union { - uint16_t _si; - uint32_t _esi; - uint64_t _rsi; - }; - union { - uint16_t _di; - uint32_t _edi; - uint64_t _rdi; - }; - - uint64_t _r8; - uint64_t _r9; - uint64_t _r10; - uint64_t _r11; - uint64_t _r12; - uint64_t _r13; - uint64_t _r14; - uint64_t _r15; - }; - }; - - union { - uint32_t _eip; - uint64_t _rip; - }; - - union { - uint32_t _eflags; - uint64_t _rflags; - }; - - segment_desc_t _cs; - segment_desc_t _ss; - segment_desc_t _ds; - segment_desc_t _es; - segment_desc_t _fs; - segment_desc_t _gs; - segment_desc_t _ldt; - segment_desc_t _tr; - - segment_desc_t _gdt; - segment_desc_t _idt; - - uint64_t _cr0; - uint64_t _cr2; - uint64_t _cr3; - uint64_t _cr4; - - uint64_t _dr0; - uint64_t _dr1; - uint64_t _dr2; - uint64_t _dr3; - uint64_t _dr6; - uint64_t _dr7; - uint64_t _pde; - - uint32_t _efer; - - uint32_t _sysenter_cs; - uint64_t _sysenter_eip; - uint64_t _sysenter_esp; - - uint32_t _activity_state; - uint32_t pad; - interruptibility_state_t _interruptibility_state; -}; - -/* HAX exit status */ -enum exit_status { - /* IO port request */ - HAX_EXIT_IO = 1, - /* MMIO instruction emulation */ - HAX_EXIT_MMIO, - /* QEMU emulation mode request, currently means guest enter non-PG mode */ - HAX_EXIT_REAL, - /* - * Interrupt window open, qemu can inject interrupt now - * Also used when signal pending since at that time qemu usually need - * check interrupt - */ - HAX_EXIT_INTERRUPT, - /* Unknown vmexit, mostly trigger reboot */ - HAX_EXIT_UNKNOWN_VMEXIT, - /* HALT from guest */ - HAX_EXIT_HLT, - /* Reboot request, like because of tripple fault in guest */ - HAX_EXIT_STATECHANGE, - /* the vcpu is now only paused when destroy, so simply return to hax */ - HAX_EXIT_PAUSED, - HAX_EXIT_FAST_MMIO, -}; - -/* - * The interface definition: - * 1. vcpu_run execute will return 0 on success, otherwise mean failed - * 2. exit_status return the exit reason, as stated in enum exit_status - * 3. exit_reason is the vmx exit reason - */ -struct hax_tunnel { - uint32_t _exit_reason; - uint32_t _exit_flag; - uint32_t _exit_status; - uint32_t user_event_pending; - int ready_for_interrupt_injection; - int request_interrupt_window; - union { - struct { - /* 0: read, 1: write */ -#define HAX_EXIT_IO_IN 1 -#define HAX_EXIT_IO_OUT 0 - uint8_t _direction; - uint8_t _df; - uint16_t _size; - uint16_t _port; - uint16_t _count; - uint8_t _flags; - uint8_t _pad0; - uint16_t _pad1; - uint32_t _pad2; - uint64_t _vaddr; - } pio; - struct { - uint64_t gla; - } mmio; - struct { - } state; - }; -} __attribute__ ((__packed__)); - -struct hax_module_version { - uint32_t compat_version; - uint32_t cur_version; -} __attribute__ ((__packed__)); - -/* This interface is support only after API version 2 */ -struct hax_qemu_version { - /* Current API version in QEMU */ - uint32_t cur_version; - /* The minimum API version supported by QEMU */ - uint32_t min_version; -} __attribute__ ((__packed__)); - -/* The mac specfic interface to qemu, mostly is ioctl related */ -struct hax_tunnel_info { - uint64_t va; - uint64_t io_va; - uint16_t size; - uint16_t pad[3]; -} __attribute__ ((__packed__)); - -struct hax_alloc_ram_info { - uint32_t size; - uint32_t pad; - uint64_t va; -} __attribute__ ((__packed__)); - -struct hax_ramblock_info { - uint64_t start_va; - uint64_t size; - uint64_t reserved; -} __attribute__ ((__packed__)); - -#define HAX_RAM_INFO_ROM 0x01 /* Read-Only */ -#define HAX_RAM_INFO_INVALID 0x80 /* Unmapped, usually used for MMIO */ -struct hax_set_ram_info { - uint64_t pa_start; - uint32_t size; - uint8_t flags; - uint8_t pad[3]; - uint64_t va; -} __attribute__ ((__packed__)); - -#define HAX_CAP_STATUS_WORKING 0x1 -#define HAX_CAP_STATUS_NOTWORKING 0x0 -#define HAX_CAP_WORKSTATUS_MASK 0x1 - -#define HAX_CAP_FAILREASON_VT 0x1 -#define HAX_CAP_FAILREASON_NX 0x2 - -#define HAX_CAP_MEMQUOTA 0x2 -#define HAX_CAP_UG 0x4 -#define HAX_CAP_64BIT_RAMBLOCK 0x8 - -struct hax_capabilityinfo { - /* bit 0: 1 - working - * 0 - not working, possibly because NT/NX disabled - * bit 1: 1 - memory limitation working - * 0 - no memory limitation - */ - uint16_t wstatus; - /* valid when not working - * bit 0: VT not enabeld - * bit 1: NX not enabled*/ - uint16_t winfo; - uint32_t pad; - uint64_t mem_quota; -} __attribute__ ((__packed__)); - -struct hax_fastmmio { - uint64_t gpa; - union { - uint64_t value; - uint64_t gpa2; /* since HAX API v4 */ - }; - uint8_t size; - uint8_t direction; - uint16_t reg_index; - uint32_t pad0; - uint64_t _cr0; - uint64_t _cr2; - uint64_t _cr3; - uint64_t _cr4; -} __attribute__ ((__packed__)); -#endif diff --git a/target/i386/hax/hax-posix.h b/target/i386/hax/hax-posix.h deleted file mode 100644 index fb7c64426d..0000000000 --- a/target/i386/hax/hax-posix.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef TARGET_I386_HAX_POSIX_H -#define TARGET_I386_HAX_POSIX_H - -#include <sys/ioctl.h> - -#define HAX_INVALID_FD (-1) -static inline int hax_invalid_fd(hax_fd fd) -{ - return fd <= 0; -} - -static inline void hax_mod_close(struct hax_state *hax) -{ - close(hax->fd); -} - -static inline void hax_close_fd(hax_fd fd) -{ - close(fd); -} - -/* HAX model level ioctl */ -#define HAX_IOCTL_VERSION _IOWR(0, 0x20, struct hax_module_version) -#define HAX_IOCTL_CREATE_VM _IOWR(0, 0x21, uint32_t) -#define HAX_IOCTL_DESTROY_VM _IOW(0, 0x22, uint32_t) -#define HAX_IOCTL_CAPABILITY _IOR(0, 0x23, struct hax_capabilityinfo) - -#define HAX_VM_IOCTL_VCPU_CREATE _IOWR(0, 0x80, uint32_t) -#define HAX_VM_IOCTL_ALLOC_RAM _IOWR(0, 0x81, struct hax_alloc_ram_info) -#define HAX_VM_IOCTL_SET_RAM _IOWR(0, 0x82, struct hax_set_ram_info) -#define HAX_VM_IOCTL_VCPU_DESTROY _IOW(0, 0x83, uint32_t) -#define HAX_VM_IOCTL_NOTIFY_QEMU_VERSION _IOW(0, 0x84, struct hax_qemu_version) -#define HAX_VM_IOCTL_ADD_RAMBLOCK _IOW(0, 0x85, struct hax_ramblock_info) - -#define HAX_VCPU_IOCTL_RUN _IO(0, 0xc0) -#define HAX_VCPU_IOCTL_SET_MSRS _IOWR(0, 0xc1, struct hax_msr_data) -#define HAX_VCPU_IOCTL_GET_MSRS _IOWR(0, 0xc2, struct hax_msr_data) - -#define HAX_VCPU_IOCTL_SET_FPU _IOW(0, 0xc3, struct fx_layout) -#define HAX_VCPU_IOCTL_GET_FPU _IOR(0, 0xc4, struct fx_layout) - -#define HAX_VCPU_IOCTL_SETUP_TUNNEL _IOWR(0, 0xc5, struct hax_tunnel_info) -#define HAX_VCPU_IOCTL_INTERRUPT _IOWR(0, 0xc6, uint32_t) -#define HAX_VCPU_SET_REGS _IOWR(0, 0xc7, struct vcpu_state_t) -#define HAX_VCPU_GET_REGS _IOWR(0, 0xc8, struct vcpu_state_t) - -#endif /* TARGET_I386_HAX_POSIX_H */ diff --git a/target/i386/hax/hax-windows.h b/target/i386/hax/hax-windows.h deleted file mode 100644 index b1f5d4f32f..0000000000 --- a/target/i386/hax/hax-windows.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright IBM, Corp. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#ifndef TARGET_I386_HAX_WINDOWS_H -#define TARGET_I386_HAX_WINDOWS_H - -#include <winioctl.h> -#include <windef.h> - -#include "hax-accel-ops.h" - -#define HAX_INVALID_FD INVALID_HANDLE_VALUE - -static inline void hax_mod_close(struct hax_state *hax) -{ - CloseHandle(hax->fd); -} - -static inline void hax_close_fd(hax_fd fd) -{ - CloseHandle(fd); -} - -static inline int hax_invalid_fd(hax_fd fd) -{ - return (fd == INVALID_HANDLE_VALUE); -} - -#define HAX_DEVICE_TYPE 0x4000 - -#define HAX_IOCTL_VERSION CTL_CODE(HAX_DEVICE_TYPE, 0x900, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_IOCTL_CREATE_VM CTL_CODE(HAX_DEVICE_TYPE, 0x901, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_IOCTL_CAPABILITY CTL_CODE(HAX_DEVICE_TYPE, 0x910, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VM_IOCTL_VCPU_CREATE CTL_CODE(HAX_DEVICE_TYPE, 0x902, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_ALLOC_RAM CTL_CODE(HAX_DEVICE_TYPE, 0x903, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_SET_RAM CTL_CODE(HAX_DEVICE_TYPE, 0x904, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_VCPU_DESTROY CTL_CODE(HAX_DEVICE_TYPE, 0x905, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VM_IOCTL_ADD_RAMBLOCK CTL_CODE(HAX_DEVICE_TYPE, 0x913, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VCPU_IOCTL_RUN CTL_CODE(HAX_DEVICE_TYPE, 0x906, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_SET_MSRS CTL_CODE(HAX_DEVICE_TYPE, 0x907, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_GET_MSRS CTL_CODE(HAX_DEVICE_TYPE, 0x908, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_SET_FPU CTL_CODE(HAX_DEVICE_TYPE, 0x909, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_GET_FPU CTL_CODE(HAX_DEVICE_TYPE, 0x90a, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VCPU_IOCTL_SETUP_TUNNEL CTL_CODE(HAX_DEVICE_TYPE, 0x90b, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_IOCTL_INTERRUPT CTL_CODE(HAX_DEVICE_TYPE, 0x90c, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_SET_REGS CTL_CODE(HAX_DEVICE_TYPE, 0x90d, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) -#define HAX_VCPU_GET_REGS CTL_CODE(HAX_DEVICE_TYPE, 0x90e, \ - METHOD_BUFFERED, FILE_ANY_ACCESS) - -#define HAX_VM_IOCTL_NOTIFY_QEMU_VERSION CTL_CODE(HAX_DEVICE_TYPE, 0x910, \ - METHOD_BUFFERED, \ - FILE_ANY_ACCESS) -#endif /* TARGET_I386_HAX_WINDOWS_H */ diff --git a/accel/stubs/hax-stub.c b/accel/stubs/hax-stub.c deleted file mode 100644 index 2fe31aaa9a..0000000000 --- a/accel/stubs/hax-stub.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2015, Intel Corporation - * - * Copyright 2016 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "sysemu/hax.h" - -bool hax_allowed; - -int hax_sync_vcpus(void) -{ - return 0; -} diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 4a34f03047..68ad30e2f5 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -28,7 +28,6 @@ #include "hw/intc/kvm_irqcount.h" #include "trace.h" #include "hw/boards.h" -#include "sysemu/hax.h" #include "sysemu/kvm.h" #include "hw/qdev-properties.h" #include "hw/sysbus.h" @@ -271,7 +270,7 @@ static void apic_common_realize(DeviceState *dev, Error **errp) /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && - !hax_enabled() && current_machine->ram_size >= 1024 * 1024) { + current_machine->ram_size >= 1024 * 1024) { vapic = sysbus_create_simple("kvmvapic", -1, NULL); } s->vapic = vapic; diff --git a/softmmu/cpus.c b/softmmu/cpus.c index fed20ffb5d..0848e0dbdb 100644 --- a/softmmu/cpus.c +++ b/softmmu/cpus.c @@ -427,12 +427,6 @@ void qemu_wait_io_event(CPUState *cpu) qemu_plugin_vcpu_resume_cb(cpu); } -#ifdef _WIN32 - /* Eat dummy APC queued by cpus_kick_thread. */ - if (hax_enabled()) { - SleepEx(0, TRUE); - } -#endif qemu_wait_io_event_common(cpu); } diff --git a/softmmu/vl.c b/softmmu/vl.c index b0b96f67fa..5a10b3c309 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -86,7 +86,6 @@ #include "migration/colo.h" #include "migration/postcopy-ram.h" #include "sysemu/kvm.h" -#include "sysemu/hax.h" #include "qapi/qobject-input-visitor.h" #include "qemu/option.h" #include "qemu/config-file.h" @@ -2546,11 +2545,6 @@ static void qemu_init_board(void) drive_check_orphaned(); realtime_init(); - - if (hax_enabled()) { - /* FIXME: why isn't cpu_synchronize_all_post_init enough? */ - hax_sync_vcpus(); - } } static void qemu_create_cli_devices(void) diff --git a/target/i386/hax/hax-accel-ops.c b/target/i386/hax/hax-accel-ops.c deleted file mode 100644 index 5031096760..0000000000 --- a/target/i386/hax/hax-accel-ops.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * QEMU HAX support - * - * Copyright IBM, Corp. 2008 - * Red Hat, Inc. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * Glauber Costa <gcosta(a)redhat.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qemu/main-loop.h" -#include "sysemu/runstate.h" -#include "sysemu/cpus.h" -#include "qemu/guest-random.h" - -#include "hax-accel-ops.h" - -static void *hax_cpu_thread_fn(void *arg) -{ - CPUState *cpu = arg; - int r; - - rcu_register_thread(); - qemu_mutex_lock_iothread(); - qemu_thread_get_self(cpu->thread); - - cpu->thread_id = qemu_get_thread_id(); - current_cpu = cpu; - hax_init_vcpu(cpu); - cpu_thread_signal_created(cpu); - qemu_guest_random_seed_thread_part2(cpu->random_seed); - - do { - if (cpu_can_run(cpu)) { - r = hax_smp_cpu_exec(cpu); - if (r == EXCP_DEBUG) { - cpu_handle_guest_debug(cpu); - } - } - - qemu_wait_io_event(cpu); - } while (!cpu->unplug || cpu_can_run(cpu)); - hax_vcpu_destroy(cpu); - cpu_thread_signal_destroyed(cpu); - rcu_unregister_thread(); - return NULL; -} - -static void hax_start_vcpu_thread(CPUState *cpu) -{ - char thread_name[VCPU_THREAD_NAME_SIZE]; - - cpu->thread = g_new0(QemuThread, 1); - cpu->halt_cond = g_new0(QemuCond, 1); - qemu_cond_init(cpu->halt_cond); - - snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX", - cpu->cpu_index); - qemu_thread_create(cpu->thread, thread_name, hax_cpu_thread_fn, - cpu, QEMU_THREAD_JOINABLE); - assert(cpu->accel); -#ifdef _WIN32 - cpu->accel->hThread = qemu_thread_get_handle(cpu->thread); -#endif -} - -static void hax_accel_ops_class_init(ObjectClass *oc, void *data) -{ - AccelOpsClass *ops = ACCEL_OPS_CLASS(oc); - - ops->create_vcpu_thread = hax_start_vcpu_thread; - ops->kick_vcpu_thread = hax_kick_vcpu_thread; - - ops->synchronize_post_reset = hax_cpu_synchronize_post_reset; - ops->synchronize_post_init = hax_cpu_synchronize_post_init; - ops->synchronize_state = hax_cpu_synchronize_state; - ops->synchronize_pre_loadvm = hax_cpu_synchronize_pre_loadvm; -} - -static const TypeInfo hax_accel_ops_type = { - .name = ACCEL_OPS_NAME("hax"), - - .parent = TYPE_ACCEL_OPS, - .class_init = hax_accel_ops_class_init, - .abstract = true, -}; - -static void hax_accel_ops_register_types(void) -{ - type_register_static(&hax_accel_ops_type); -} -type_init(hax_accel_ops_register_types); diff --git a/target/i386/hax/hax-all.c b/target/i386/hax/hax-all.c deleted file mode 100644 index 18d78e5b6b..0000000000 --- a/target/i386/hax/hax-all.c +++ /dev/null @@ -1,1141 +0,0 @@ -/* - * QEMU HAX support - * - * Copyright IBM, Corp. 2008 - * Red Hat, Inc. 2008 - * - * Authors: - * Anthony Liguori <aliguori(a)us.ibm.com> - * Glauber Costa <gcosta(a)redhat.com> - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * Xin Xiaohui<xiaohui.xin(a)intel.com> - * Zhang Xiantao<xiantao.zhang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* - * HAX common code for both windows and darwin - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/address-spaces.h" - -#include "qemu/accel.h" -#include "sysemu/reset.h" -#include "sysemu/runstate.h" -#include "hw/boards.h" - -#include "hax-accel-ops.h" - -#define DEBUG_HAX 0 - -#define DPRINTF(fmt, ...) \ - do { \ - if (DEBUG_HAX) { \ - fprintf(stdout, fmt, ## __VA_ARGS__); \ - } \ - } while (0) - -/* Current version */ -const uint32_t hax_cur_version = 0x4; /* API v4: unmapping and MMIO moves */ -/* Minimum HAX kernel version */ -const uint32_t hax_min_version = 0x4; /* API v4: supports unmapping */ - -bool hax_allowed; - -struct hax_state hax_global; - -static void hax_vcpu_sync_state(CPUArchState *env, int modified); -static int hax_arch_get_registers(CPUArchState *env); - -int valid_hax_tunnel_size(uint16_t size) -{ - return size >= sizeof(struct hax_tunnel); -} - -hax_fd hax_vcpu_get_fd(CPUArchState *env) -{ - AccelCPUState *vcpu = env_cpu(env)->accel; - if (!vcpu) { - return HAX_INVALID_FD; - } - return vcpu->fd; -} - -static int hax_get_capability(struct hax_state *hax) -{ - int ret; - struct hax_capabilityinfo capinfo, *cap = &capinfo; - - ret = hax_capability(hax, cap); - if (ret) { - return ret; - } - - if ((cap->wstatus & HAX_CAP_WORKSTATUS_MASK) == HAX_CAP_STATUS_NOTWORKING) { - if (cap->winfo & HAX_CAP_FAILREASON_VT) { - DPRINTF - ("VTX feature is not enabled, HAX driver will not work.\n"); - } else if (cap->winfo & HAX_CAP_FAILREASON_NX) { - DPRINTF - ("NX feature is not enabled, HAX driver will not work.\n"); - } - return -ENXIO; - - } - - if (!(cap->winfo & HAX_CAP_UG)) { - fprintf(stderr, "UG mode is not supported by the hardware.\n"); - return -ENOTSUP; - } - - hax->supports_64bit_ramblock = !!(cap->winfo & HAX_CAP_64BIT_RAMBLOCK); - - if (cap->wstatus & HAX_CAP_MEMQUOTA) { - if (cap->mem_quota < hax->mem_quota) { - fprintf(stderr, "The VM memory needed exceeds the driver limit.\n"); - return -ENOSPC; - } - } - return 0; -} - -static int hax_version_support(struct hax_state *hax) -{ - int ret; - struct hax_module_version version; - - ret = hax_mod_version(hax, &version); - if (ret < 0) { - return 0; - } - - if (hax_min_version > version.cur_version) { - fprintf(stderr, "Incompatible HAX module version %d,", - version.cur_version); - fprintf(stderr, "requires minimum version %d\n", hax_min_version); - return 0; - } - if (hax_cur_version < version.compat_version) { - fprintf(stderr, "Incompatible QEMU HAX API version %x,", - hax_cur_version); - fprintf(stderr, "requires minimum HAX API version %x\n", - version.compat_version); - return 0; - } - - return 1; -} - -int hax_vcpu_create(int id) -{ - AccelCPUState *vcpu = NULL; - int ret; - - if (!hax_global.vm) { - fprintf(stderr, "vcpu %x created failed, vm is null\n", id); - return -1; - } - - if (hax_global.vm->vcpus[id]) { - fprintf(stderr, "vcpu %x allocated already\n", id); - return 0; - } - - vcpu = g_new0(AccelCPUState, 1); - - ret = hax_host_create_vcpu(hax_global.vm->fd, id); - if (ret) { - fprintf(stderr, "Failed to create vcpu %x\n", id); - goto error; - } - - vcpu->vcpu_id = id; - vcpu->fd = hax_host_open_vcpu(hax_global.vm->id, id); - if (hax_invalid_fd(vcpu->fd)) { - fprintf(stderr, "Failed to open the vcpu\n"); - ret = -ENODEV; - goto error; - } - - hax_global.vm->vcpus[id] = vcpu; - - ret = hax_host_setup_vcpu_channel(vcpu); - if (ret) { - fprintf(stderr, "Invalid hax tunnel size\n"); - ret = -EINVAL; - goto error; - } - return 0; - - error: - /* vcpu and tunnel will be closed automatically */ - if (vcpu && !hax_invalid_fd(vcpu->fd)) { - hax_close_fd(vcpu->fd); - } - - hax_global.vm->vcpus[id] = NULL; - g_free(vcpu); - return -1; -} - -int hax_vcpu_destroy(CPUState *cpu) -{ - AccelCPUState *vcpu = cpu->accel; - - if (!hax_global.vm) { - fprintf(stderr, "vcpu %x destroy failed, vm is null\n", vcpu->vcpu_id); - return -1; - } - - if (!vcpu) { - return 0; - } - - /* - * 1. The hax_tunnel is also destroyed when vcpu is destroyed - * 2. close fd will cause hax module vcpu be cleaned - */ - hax_close_fd(vcpu->fd); - hax_global.vm->vcpus[vcpu->vcpu_id] = NULL; -#ifdef _WIN32 - CloseHandle(vcpu->hThread); -#endif - g_free(vcpu); - cpu->accel = NULL; - return 0; -} - -int hax_init_vcpu(CPUState *cpu) -{ - int ret; - - ret = hax_vcpu_create(cpu->cpu_index); - if (ret < 0) { - fprintf(stderr, "Failed to create HAX vcpu\n"); - exit(-1); - } - - cpu->accel = hax_global.vm->vcpus[cpu->cpu_index]; - cpu->vcpu_dirty = true; - qemu_register_reset(hax_reset_vcpu_state, cpu->env_ptr); - - return ret; -} - -struct hax_vm *hax_vm_create(struct hax_state *hax, int max_cpus) -{ - struct hax_vm *vm; - int vm_id = 0, ret, i; - - if (hax_invalid_fd(hax->fd)) { - return NULL; - } - - if (hax->vm) { - return hax->vm; - } - - if (max_cpus > HAX_MAX_VCPU) { - fprintf(stderr, "Maximum VCPU number QEMU supported is %d\n", HAX_MAX_VCPU); - return NULL; - } - - vm = g_new0(struct hax_vm, 1); - - ret = hax_host_create_vm(hax, &vm_id); - if (ret) { - fprintf(stderr, "Failed to create vm %x\n", ret); - goto error; - } - vm->id = vm_id; - vm->fd = hax_host_open_vm(hax, vm_id); - if (hax_invalid_fd(vm->fd)) { - fprintf(stderr, "Failed to open vm %d\n", vm_id); - goto error; - } - - vm->numvcpus = max_cpus; - vm->vcpus = g_new0(AccelCPUState *, vm->numvcpus); - for (i = 0; i < vm->numvcpus; i++) { - vm->vcpus[i] = NULL; - } - - hax->vm = vm; - return vm; - - error: - g_free(vm); - hax->vm = NULL; - return NULL; -} - -int hax_vm_destroy(struct hax_vm *vm) -{ - int i; - - for (i = 0; i < vm->numvcpus; i++) - if (vm->vcpus[i]) { - fprintf(stderr, "VCPU should be cleaned before vm clean\n"); - return -1; - } - hax_close_fd(vm->fd); - vm->numvcpus = 0; - g_free(vm->vcpus); - g_free(vm); - hax_global.vm = NULL; - return 0; -} - -static int hax_init(ram_addr_t ram_size, int max_cpus) -{ - struct hax_state *hax = NULL; - struct hax_qemu_version qversion; - int ret; - - hax = &hax_global; - - memset(hax, 0, sizeof(struct hax_state)); - hax->mem_quota = ram_size; - - hax->fd = hax_mod_open(); - if (hax_invalid_fd(hax->fd)) { - hax->fd = 0; - ret = -ENODEV; - goto error; - } - - ret = hax_get_capability(hax); - - if (ret) { - if (ret != -ENOSPC) { - ret = -EINVAL; - } - goto error; - } - - if (!hax_version_support(hax)) { - ret = -EINVAL; - goto error; - } - - hax->vm = hax_vm_create(hax, max_cpus); - if (!hax->vm) { - fprintf(stderr, "Failed to create HAX VM\n"); - ret = -EINVAL; - goto error; - } - - hax_memory_init(); - - qversion.cur_version = hax_cur_version; - qversion.min_version = hax_min_version; - hax_notify_qemu_version(hax->vm->fd, &qversion); - - return ret; - error: - if (hax->vm) { - hax_vm_destroy(hax->vm); - } - if (hax->fd) { - hax_mod_close(hax); - } - - return ret; -} - -static int hax_accel_init(MachineState *ms) -{ - int ret = hax_init(ms->ram_size, (int)ms->smp.max_cpus); - - if (ret && (ret != -ENOSPC)) { - fprintf(stderr, "No accelerator found.\n"); - } else { - fprintf(stdout, "HAX is %s and emulator runs in %s mode.\n", - !ret ? "working" : "not working", - !ret ? "fast virt" : "emulation"); - fprintf(stdout, - "NOTE: HAX is deprecated and will be removed in a future release.\n" - " Use 'whpx' (on Windows) or 'hvf' (on macOS) instead.\n"); - } - return ret; -} - -static int hax_handle_fastmmio(CPUArchState *env, struct hax_fastmmio *hft) -{ - if (hft->direction < 2) { - cpu_physical_memory_rw(hft->gpa, &hft->value, hft->size, - hft->direction); - } else { - /* - * HAX API v4 supports transferring data between two MMIO addresses, - * hft->gpa and hft->gpa2 (instructions such as MOVS require this): - * hft->direction == 2: gpa ==> gpa2 - */ - uint64_t value; - cpu_physical_memory_read(hft->gpa, &value, hft->size); - cpu_physical_memory_write(hft->gpa2, &value, hft->size); - } - - return 0; -} - -static int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port, - int direction, int size, int count, void *buffer) -{ - uint8_t *ptr; - int i; - MemTxAttrs attrs = { 0 }; - - if (!df) { - ptr = buffer; - } else { - ptr = buffer + size * count - size; - } - for (i = 0; i < count; i++) { - address_space_rw(&address_space_io, port, attrs, - ptr, size, direction == HAX_EXIT_IO_OUT); - if (!df) { - ptr += size; - } else { - ptr -= size; - } - } - - return 0; -} - -static int hax_vcpu_interrupt(CPUArchState *env) -{ - CPUState *cpu = env_cpu(env); - AccelCPUState *vcpu = cpu->accel; - struct hax_tunnel *ht = vcpu->tunnel; - - /* - * Try to inject an interrupt if the guest can accept it - * Unlike KVM, HAX kernel check for the eflags, instead of qemu - */ - if (ht->ready_for_interrupt_injection && - (cpu->interrupt_request & CPU_INTERRUPT_HARD)) { - int irq; - - irq = cpu_get_pic_interrupt(env); - if (irq >= 0) { - hax_inject_interrupt(env, irq); - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD; - } - } - - /* If we have an interrupt but the guest is not ready to receive an - * interrupt, request an interrupt window exit. This will - * cause a return to userspace as soon as the guest is ready to - * receive interrupts. */ - if ((cpu->interrupt_request & CPU_INTERRUPT_HARD)) { - ht->request_interrupt_window = 1; - } else { - ht->request_interrupt_window = 0; - } - return 0; -} - -void hax_raise_event(CPUState *cpu) -{ - AccelCPUState *vcpu = cpu->accel; - - if (!vcpu) { - return; - } - vcpu->tunnel->user_event_pending = 1; -} - -/* - * Ask hax kernel module to run the CPU for us till: - * 1. Guest crash or shutdown - * 2. Need QEMU's emulation like guest execute MMIO instruction - * 3. Guest execute HLT - * 4. QEMU have Signal/event pending - * 5. An unknown VMX exit happens - */ -static int hax_vcpu_hax_exec(CPUArchState *env) -{ - int ret = 0; - CPUState *cpu = env_cpu(env); - X86CPU *x86_cpu = X86_CPU(cpu); - AccelCPUState *vcpu = cpu->accel; - struct hax_tunnel *ht = vcpu->tunnel; - - if (!hax_enabled()) { - DPRINTF("Trying to vcpu execute at eip:" TARGET_FMT_lx "\n", env->eip); - return 0; - } - - if (cpu->interrupt_request & CPU_INTERRUPT_POLL) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL; - apic_poll_irq(x86_cpu->apic_state); - } - - /* After a vcpu is halted (either because it is an AP and has just been - * reset, or because it has executed the HLT instruction), it will not be - * run (hax_vcpu_run()) until it is unhalted. The next few if blocks check - * for events that may change the halted state of this vcpu: - * a) Maskable interrupt, when RFLAGS.IF is 1; - * Note: env->eflags may not reflect the current RFLAGS state, because - * it is not updated after each hax_vcpu_run(). We cannot afford - * to fail to recognize any unhalt-by-maskable-interrupt event - * (in which case the vcpu will halt forever), and yet we cannot - * afford the overhead of hax_vcpu_sync_state(). The current - * solution is to err on the side of caution and have the HLT - * handler (see case HAX_EXIT_HLT below) unconditionally set the - * IF_MASK bit in env->eflags, which, in effect, disables the - * RFLAGS.IF check. - * b) NMI; - * c) INIT signal; - * d) SIPI signal. - */ - if (((cpu->interrupt_request & CPU_INTERRUPT_HARD) && - (env->eflags & IF_MASK)) || - (cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - cpu->halted = 0; - } - - if (cpu->interrupt_request & CPU_INTERRUPT_INIT) { - DPRINTF("\nhax_vcpu_hax_exec: handling INIT for %d\n", - cpu->cpu_index); - do_cpu_init(x86_cpu); - hax_vcpu_sync_state(env, 1); - } - - if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) { - DPRINTF("hax_vcpu_hax_exec: handling SIPI for %d\n", - cpu->cpu_index); - hax_vcpu_sync_state(env, 0); - do_cpu_sipi(x86_cpu); - hax_vcpu_sync_state(env, 1); - } - - if (cpu->halted) { - /* If this vcpu is halted, we must not ask HAXM to run it. Instead, we - * break out of hax_smp_cpu_exec() as if this vcpu had executed HLT. - * That way, this vcpu thread will be trapped in qemu_wait_io_event(), - * until the vcpu is unhalted. - */ - cpu->exception_index = EXCP_HLT; - return 0; - } - - do { - int hax_ret; - - if (cpu->exit_request) { - ret = 1; - break; - } - - hax_vcpu_interrupt(env); - - qemu_mutex_unlock_iothread(); - cpu_exec_start(cpu); - hax_ret = hax_vcpu_run(vcpu); - cpu_exec_end(cpu); - qemu_mutex_lock_iothread(); - - /* Simply continue the vcpu_run if system call interrupted */ - if (hax_ret == -EINTR || hax_ret == -EAGAIN) { - DPRINTF("io window interrupted\n"); - continue; - } - - if (hax_ret < 0) { - fprintf(stderr, "vcpu run failed for vcpu %x\n", vcpu->vcpu_id); - abort(); - } - switch (ht->_exit_status) { - case HAX_EXIT_IO: - ret = hax_handle_io(env, ht->pio._df, ht->pio._port, - ht->pio._direction, - ht->pio._size, ht->pio._count, vcpu->iobuf); - break; - case HAX_EXIT_FAST_MMIO: - ret = hax_handle_fastmmio(env, (struct hax_fastmmio *) vcpu->iobuf); - break; - /* Guest state changed, currently only for shutdown */ - case HAX_EXIT_STATECHANGE: - fprintf(stdout, "VCPU shutdown request\n"); - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); - hax_vcpu_sync_state(env, 0); - ret = 1; - break; - case HAX_EXIT_UNKNOWN_VMEXIT: - fprintf(stderr, "Unknown VMX exit %x from guest\n", - ht->_exit_reason); - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - hax_vcpu_sync_state(env, 0); - cpu_dump_state(cpu, stderr, 0); - ret = -1; - break; - case HAX_EXIT_HLT: - if (!(cpu->interrupt_request & CPU_INTERRUPT_HARD) && - !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { - /* hlt instruction with interrupt disabled is shutdown */ - env->eflags |= IF_MASK; - cpu->halted = 1; - cpu->exception_index = EXCP_HLT; - ret = 1; - } - break; - /* these situations will continue to hax module */ - case HAX_EXIT_INTERRUPT: - case HAX_EXIT_PAUSED: - break; - case HAX_EXIT_MMIO: - /* Should not happen on UG system */ - fprintf(stderr, "HAX: unsupported MMIO emulation\n"); - ret = -1; - break; - case HAX_EXIT_REAL: - /* Should not happen on UG system */ - fprintf(stderr, "HAX: unimplemented real mode emulation\n"); - ret = -1; - break; - default: - fprintf(stderr, "Unknown exit %x from HAX\n", ht->_exit_status); - qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET); - hax_vcpu_sync_state(env, 0); - cpu_dump_state(cpu, stderr, 0); - ret = 1; - break; - } - } while (!ret); - - if (cpu->exit_request) { - cpu->exit_request = 0; - cpu->exception_index = EXCP_INTERRUPT; - } - return ret < 0; -} - -static void do_hax_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_arch_get_registers(env); - cpu->vcpu_dirty = true; -} - -void hax_cpu_synchronize_state(CPUState *cpu) -{ - if (!cpu->vcpu_dirty) { - run_on_cpu(cpu, do_hax_cpu_synchronize_state, RUN_ON_CPU_NULL); - } -} - -static void do_hax_cpu_synchronize_post_reset(CPUState *cpu, - run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_vcpu_sync_state(env, 1); - cpu->vcpu_dirty = false; -} - -void hax_cpu_synchronize_post_reset(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_post_reset, RUN_ON_CPU_NULL); -} - -static void do_hax_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg) -{ - CPUArchState *env = cpu->env_ptr; - - hax_vcpu_sync_state(env, 1); - cpu->vcpu_dirty = false; -} - -void hax_cpu_synchronize_post_init(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_post_init, RUN_ON_CPU_NULL); -} - -static void do_hax_cpu_synchronize_pre_loadvm(CPUState *cpu, run_on_cpu_data arg) -{ - cpu->vcpu_dirty = true; -} - -void hax_cpu_synchronize_pre_loadvm(CPUState *cpu) -{ - run_on_cpu(cpu, do_hax_cpu_synchronize_pre_loadvm, RUN_ON_CPU_NULL); -} - -int hax_smp_cpu_exec(CPUState *cpu) -{ - CPUArchState *env = cpu->env_ptr; - int fatal; - int ret; - - while (1) { - if (cpu->exception_index >= EXCP_INTERRUPT) { - ret = cpu->exception_index; - cpu->exception_index = -1; - break; - } - - fatal = hax_vcpu_hax_exec(env); - - if (fatal) { - fprintf(stderr, "Unsupported HAX vcpu return\n"); - abort(); - } - } - - return ret; -} - -static void set_v8086_seg(struct segment_desc_t *lhs, const SegmentCache *rhs) -{ - memset(lhs, 0, sizeof(struct segment_desc_t)); - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->type = 3; - lhs->present = 1; - lhs->dpl = 3; - lhs->operand_size = 0; - lhs->desc = 1; - lhs->long_mode = 0; - lhs->granularity = 0; - lhs->available = 0; -} - -static void get_seg(SegmentCache *lhs, const struct segment_desc_t *rhs) -{ - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->flags = (rhs->type << DESC_TYPE_SHIFT) - | (rhs->present * DESC_P_MASK) - | (rhs->dpl << DESC_DPL_SHIFT) - | (rhs->operand_size << DESC_B_SHIFT) - | (rhs->desc * DESC_S_MASK) - | (rhs->long_mode << DESC_L_SHIFT) - | (rhs->granularity * DESC_G_MASK) | (rhs->available * DESC_AVL_MASK); -} - -static void set_seg(struct segment_desc_t *lhs, const SegmentCache *rhs) -{ - unsigned flags = rhs->flags; - - memset(lhs, 0, sizeof(struct segment_desc_t)); - lhs->selector = rhs->selector; - lhs->base = rhs->base; - lhs->limit = rhs->limit; - lhs->type = (flags >> DESC_TYPE_SHIFT) & 15; - lhs->present = (flags & DESC_P_MASK) != 0; - lhs->dpl = rhs->selector & 3; - lhs->operand_size = (flags >> DESC_B_SHIFT) & 1; - lhs->desc = (flags & DESC_S_MASK) != 0; - lhs->long_mode = (flags >> DESC_L_SHIFT) & 1; - lhs->granularity = (flags & DESC_G_MASK) != 0; - lhs->available = (flags & DESC_AVL_MASK) != 0; -} - -static void hax_getput_reg(uint64_t *hax_reg, target_ulong *qemu_reg, int set) -{ - target_ulong reg = *hax_reg; - - if (set) { - *hax_reg = *qemu_reg; - } else { - *qemu_reg = reg; - } -} - -/* The sregs has been synced with HAX kernel already before this call */ -static int hax_get_segments(CPUArchState *env, struct vcpu_state_t *sregs) -{ - get_seg(&env->segs[R_CS], &sregs->_cs); - get_seg(&env->segs[R_DS], &sregs->_ds); - get_seg(&env->segs[R_ES], &sregs->_es); - get_seg(&env->segs[R_FS], &sregs->_fs); - get_seg(&env->segs[R_GS], &sregs->_gs); - get_seg(&env->segs[R_SS], &sregs->_ss); - - get_seg(&env->tr, &sregs->_tr); - get_seg(&env->ldt, &sregs->_ldt); - env->idt.limit = sregs->_idt.limit; - env->idt.base = sregs->_idt.base; - env->gdt.limit = sregs->_gdt.limit; - env->gdt.base = sregs->_gdt.base; - return 0; -} - -static int hax_set_segments(CPUArchState *env, struct vcpu_state_t *sregs) -{ - if ((env->eflags & VM_MASK)) { - set_v8086_seg(&sregs->_cs, &env->segs[R_CS]); - set_v8086_seg(&sregs->_ds, &env->segs[R_DS]); - set_v8086_seg(&sregs->_es, &env->segs[R_ES]); - set_v8086_seg(&sregs->_fs, &env->segs[R_FS]); - set_v8086_seg(&sregs->_gs, &env->segs[R_GS]); - set_v8086_seg(&sregs->_ss, &env->segs[R_SS]); - } else { - set_seg(&sregs->_cs, &env->segs[R_CS]); - set_seg(&sregs->_ds, &env->segs[R_DS]); - set_seg(&sregs->_es, &env->segs[R_ES]); - set_seg(&sregs->_fs, &env->segs[R_FS]); - set_seg(&sregs->_gs, &env->segs[R_GS]); - set_seg(&sregs->_ss, &env->segs[R_SS]); - - if (env->cr[0] & CR0_PE_MASK) { - /* force ss cpl to cs cpl */ - sregs->_ss.selector = (sregs->_ss.selector & ~3) | - (sregs->_cs.selector & 3); - sregs->_ss.dpl = sregs->_ss.selector & 3; - } - } - - set_seg(&sregs->_tr, &env->tr); - set_seg(&sregs->_ldt, &env->ldt); - sregs->_idt.limit = env->idt.limit; - sregs->_idt.base = env->idt.base; - sregs->_gdt.limit = env->gdt.limit; - sregs->_gdt.base = env->gdt.base; - return 0; -} - -static int hax_sync_vcpu_register(CPUArchState *env, int set) -{ - struct vcpu_state_t regs; - int ret; - memset(&regs, 0, sizeof(struct vcpu_state_t)); - - if (!set) { - ret = hax_sync_vcpu_state(env, &regs, 0); - if (ret < 0) { - return -1; - } - } - - /* generic register */ - hax_getput_reg(&regs._rax, &env->regs[R_EAX], set); - hax_getput_reg(&regs._rbx, &env->regs[R_EBX], set); - hax_getput_reg(&regs._rcx, &env->regs[R_ECX], set); - hax_getput_reg(&regs._rdx, &env->regs[R_EDX], set); - hax_getput_reg(&regs._rsi, &env->regs[R_ESI], set); - hax_getput_reg(&regs._rdi, &env->regs[R_EDI], set); - hax_getput_reg(&regs._rsp, &env->regs[R_ESP], set); - hax_getput_reg(&regs._rbp, &env->regs[R_EBP], set); -#ifdef TARGET_X86_64 - hax_getput_reg(&regs._r8, &env->regs[8], set); - hax_getput_reg(&regs._r9, &env->regs[9], set); - hax_getput_reg(&regs._r10, &env->regs[10], set); - hax_getput_reg(&regs._r11, &env->regs[11], set); - hax_getput_reg(&regs._r12, &env->regs[12], set); - hax_getput_reg(&regs._r13, &env->regs[13], set); - hax_getput_reg(&regs._r14, &env->regs[14], set); - hax_getput_reg(&regs._r15, &env->regs[15], set); -#endif - hax_getput_reg(&regs._rflags, &env->eflags, set); - hax_getput_reg(&regs._rip, &env->eip, set); - - if (set) { - regs._cr0 = env->cr[0]; - regs._cr2 = env->cr[2]; - regs._cr3 = env->cr[3]; - regs._cr4 = env->cr[4]; - hax_set_segments(env, &regs); - } else { - env->cr[0] = regs._cr0; - env->cr[2] = regs._cr2; - env->cr[3] = regs._cr3; - env->cr[4] = regs._cr4; - hax_get_segments(env, &regs); - } - - if (set) { - ret = hax_sync_vcpu_state(env, &regs, 1); - if (ret < 0) { - return -1; - } - } - return 0; -} - -static void hax_msr_entry_set(struct vmx_msr *item, uint32_t index, - uint64_t value) -{ - item->entry = index; - item->value = value; -} - -static int hax_get_msrs(CPUArchState *env) -{ - struct hax_msr_data md; - struct vmx_msr *msrs = md.entries; - int ret, i, n; - - n = 0; - msrs[n++].entry = MSR_IA32_SYSENTER_CS; - msrs[n++].entry = MSR_IA32_SYSENTER_ESP; - msrs[n++].entry = MSR_IA32_SYSENTER_EIP; - msrs[n++].entry = MSR_IA32_TSC; -#ifdef TARGET_X86_64 - msrs[n++].entry = MSR_EFER; - msrs[n++].entry = MSR_STAR; - msrs[n++].entry = MSR_LSTAR; - msrs[n++].entry = MSR_CSTAR; - msrs[n++].entry = MSR_FMASK; - msrs[n++].entry = MSR_KERNELGSBASE; -#endif - md.nr_msr = n; - ret = hax_sync_msr(env, &md, 0); - if (ret < 0) { - return ret; - } - - for (i = 0; i < md.done; i++) { - switch (msrs[i].entry) { - case MSR_IA32_SYSENTER_CS: - env->sysenter_cs = msrs[i].value; - break; - case MSR_IA32_SYSENTER_ESP: - env->sysenter_esp = msrs[i].value; - break; - case MSR_IA32_SYSENTER_EIP: - env->sysenter_eip = msrs[i].value; - break; - case MSR_IA32_TSC: - env->tsc = msrs[i].value; - break; -#ifdef TARGET_X86_64 - case MSR_EFER: - env->efer = msrs[i].value; - break; - case MSR_STAR: - env->star = msrs[i].value; - break; - case MSR_LSTAR: - env->lstar = msrs[i].value; - break; - case MSR_CSTAR: - env->cstar = msrs[i].value; - break; - case MSR_FMASK: - env->fmask = msrs[i].value; - break; - case MSR_KERNELGSBASE: - env->kernelgsbase = msrs[i].value; - break; -#endif - } - } - - return 0; -} - -static int hax_set_msrs(CPUArchState *env) -{ - struct hax_msr_data md; - struct vmx_msr *msrs; - msrs = md.entries; - int n = 0; - - memset(&md, 0, sizeof(struct hax_msr_data)); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_CS, env->sysenter_cs); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_ESP, env->sysenter_esp); - hax_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip); - hax_msr_entry_set(&msrs[n++], MSR_IA32_TSC, env->tsc); -#ifdef TARGET_X86_64 - hax_msr_entry_set(&msrs[n++], MSR_EFER, env->efer); - hax_msr_entry_set(&msrs[n++], MSR_STAR, env->star); - hax_msr_entry_set(&msrs[n++], MSR_LSTAR, env->lstar); - hax_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar); - hax_msr_entry_set(&msrs[n++], MSR_FMASK, env->fmask); - hax_msr_entry_set(&msrs[n++], MSR_KERNELGSBASE, env->kernelgsbase); -#endif - md.nr_msr = n; - md.done = 0; - - return hax_sync_msr(env, &md, 1); -} - -static int hax_get_fpu(CPUArchState *env) -{ - struct fx_layout fpu; - int i, ret; - - ret = hax_sync_fpu(env, &fpu, 0); - if (ret < 0) { - return ret; - } - - env->fpstt = (fpu.fsw >> 11) & 7; - env->fpus = fpu.fsw; - env->fpuc = fpu.fcw; - for (i = 0; i < 8; ++i) { - env->fptags[i] = !((fpu.ftw >> i) & 1); - } - memcpy(env->fpregs, fpu.st_mm, sizeof(env->fpregs)); - - for (i = 0; i < 8; i++) { - env->xmm_regs[i].ZMM_Q(0) = ldq_p(&fpu.mmx_1[i][0]); - env->xmm_regs[i].ZMM_Q(1) = ldq_p(&fpu.mmx_1[i][8]); - if (CPU_NB_REGS > 8) { - env->xmm_regs[i + 8].ZMM_Q(0) = ldq_p(&fpu.mmx_2[i][0]); - env->xmm_regs[i + 8].ZMM_Q(1) = ldq_p(&fpu.mmx_2[i][8]); - } - } - env->mxcsr = fpu.mxcsr; - - return 0; -} - -static int hax_set_fpu(CPUArchState *env) -{ - struct fx_layout fpu; - int i; - - memset(&fpu, 0, sizeof(fpu)); - fpu.fsw = env->fpus & ~(7 << 11); - fpu.fsw |= (env->fpstt & 7) << 11; - fpu.fcw = env->fpuc; - - for (i = 0; i < 8; ++i) { - fpu.ftw |= (!env->fptags[i]) << i; - } - - memcpy(fpu.st_mm, env->fpregs, sizeof(env->fpregs)); - for (i = 0; i < 8; i++) { - stq_p(&fpu.mmx_1[i][0], env->xmm_regs[i].ZMM_Q(0)); - stq_p(&fpu.mmx_1[i][8], env->xmm_regs[i].ZMM_Q(1)); - if (CPU_NB_REGS > 8) { - stq_p(&fpu.mmx_2[i][0], env->xmm_regs[i + 8].ZMM_Q(0)); - stq_p(&fpu.mmx_2[i][8], env->xmm_regs[i + 8].ZMM_Q(1)); - } - } - - fpu.mxcsr = env->mxcsr; - - return hax_sync_fpu(env, &fpu, 1); -} - -static int hax_arch_get_registers(CPUArchState *env) -{ - int ret; - - ret = hax_sync_vcpu_register(env, 0); - if (ret < 0) { - return ret; - } - - ret = hax_get_fpu(env); - if (ret < 0) { - return ret; - } - - ret = hax_get_msrs(env); - if (ret < 0) { - return ret; - } - - x86_update_hflags(env); - return 0; -} - -static int hax_arch_set_registers(CPUArchState *env) -{ - int ret; - ret = hax_sync_vcpu_register(env, 1); - - if (ret < 0) { - fprintf(stderr, "Failed to sync vcpu reg\n"); - return ret; - } - ret = hax_set_fpu(env); - if (ret < 0) { - fprintf(stderr, "FPU failed\n"); - return ret; - } - ret = hax_set_msrs(env); - if (ret < 0) { - fprintf(stderr, "MSR failed\n"); - return ret; - } - - return 0; -} - -static void hax_vcpu_sync_state(CPUArchState *env, int modified) -{ - if (hax_enabled()) { - if (modified) { - hax_arch_set_registers(env); - } else { - hax_arch_get_registers(env); - } - } -} - -/* - * much simpler than kvm, at least in first stage because: - * We don't need consider the device pass-through, we don't need - * consider the framebuffer, and we may even remove the bios at all - */ -int hax_sync_vcpus(void) -{ - if (hax_enabled()) { - CPUState *cpu; - - cpu = first_cpu; - if (!cpu) { - return 0; - } - - for (; cpu != NULL; cpu = CPU_NEXT(cpu)) { - int ret; - - ret = hax_arch_set_registers(cpu->env_ptr); - if (ret < 0) { - return ret; - } - } - } - - return 0; -} - -void hax_reset_vcpu_state(void *opaque) -{ - CPUState *cpu; - for (cpu = first_cpu; cpu != NULL; cpu = CPU_NEXT(cpu)) { - cpu->accel->tunnel->user_event_pending = 0; - cpu->accel->tunnel->ready_for_interrupt_injection = 0; - } -} - -static void hax_accel_class_init(ObjectClass *oc, void *data) -{ - AccelClass *ac = ACCEL_CLASS(oc); - ac->name = "HAX"; - ac->init_machine = hax_accel_init; - ac->allowed = &hax_allowed; -} - -static const TypeInfo hax_accel_type = { - .name = ACCEL_CLASS_NAME("hax"), - .parent = TYPE_ACCEL, - .class_init = hax_accel_class_init, -}; - -static void hax_type_init(void) -{ - type_register_static(&hax_accel_type); -} - -type_init(hax_type_init); diff --git a/target/i386/hax/hax-mem.c b/target/i386/hax/hax-mem.c deleted file mode 100644 index 05dbe8cce3..0000000000 --- a/target/i386/hax/hax-mem.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * HAX memory mapping operations - * - * Copyright (c) 2015-16 Intel Corporation - * Copyright 2016 Google, Inc. - * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "exec/address-spaces.h" -#include "qemu/error-report.h" - -#include "hax-accel-ops.h" -#include "qemu/queue.h" - -#define DEBUG_HAX_MEM 0 - -#define DPRINTF(fmt, ...) \ - do { \ - if (DEBUG_HAX_MEM) { \ - fprintf(stdout, fmt, ## __VA_ARGS__); \ - } \ - } while (0) - -/** - * HAXMapping: describes a pending guest physical memory mapping - * - * @start_pa: a guest physical address marking the start of the region; must be - * page-aligned - * @size: a guest physical address marking the end of the region; must be - * page-aligned - * @host_va: the host virtual address of the start of the mapping - * @flags: mapping parameters e.g. HAX_RAM_INFO_ROM or HAX_RAM_INFO_INVALID - * @entry: additional fields for linking #HAXMapping instances together - */ -typedef struct HAXMapping { - uint64_t start_pa; - uint32_t size; - uint64_t host_va; - int flags; - QTAILQ_ENTRY(HAXMapping) entry; -} HAXMapping; - -/* - * A doubly-linked list (actually a tail queue) of the pending page mappings - * for the ongoing memory transaction. - * - * It is used to optimize the number of page mapping updates done through the - * kernel module. For example, it's effective when a driver is digging an MMIO - * hole inside an existing memory mapping. It will get a deletion of the whole - * region, then the addition of the 2 remaining RAM areas around the hole and - * finally the memory transaction commit. During the commit, it will effectively - * send to the kernel only the removal of the pages from the MMIO hole after - * having computed locally the result of the deletion and additions. - */ -static QTAILQ_HEAD(, HAXMapping) mappings = - QTAILQ_HEAD_INITIALIZER(mappings); - -/** - * hax_mapping_dump_list: dumps @mappings to stdout (for debugging) - */ -static void hax_mapping_dump_list(void) -{ - HAXMapping *entry; - - DPRINTF("%s updates:\n", __func__); - QTAILQ_FOREACH(entry, &mappings, entry) { - DPRINTF("\t%c 0x%016" PRIx64 "->0x%016" PRIx64 " VA 0x%016" PRIx64 - "%s\n", entry->flags & HAX_RAM_INFO_INVALID ? '-' : '+', - entry->start_pa, entry->start_pa + entry->size, entry->host_va, - entry->flags & HAX_RAM_INFO_ROM ? " ROM" : ""); - } -} - -static void hax_insert_mapping_before(HAXMapping *next, uint64_t start_pa, - uint32_t size, uint64_t host_va, - uint8_t flags) -{ - HAXMapping *entry; - - entry = g_malloc0(sizeof(*entry)); - entry->start_pa = start_pa; - entry->size = size; - entry->host_va = host_va; - entry->flags = flags; - if (!next) { - QTAILQ_INSERT_TAIL(&mappings, entry, entry); - } else { - QTAILQ_INSERT_BEFORE(next, entry, entry); - } -} - -static bool hax_mapping_is_opposite(HAXMapping *entry, uint64_t host_va, - uint8_t flags) -{ - /* removed then added without change for the read-only flag */ - bool nop_flags = (entry->flags ^ flags) == HAX_RAM_INFO_INVALID; - - return (entry->host_va == host_va) && nop_flags; -} - -static void hax_update_mapping(uint64_t start_pa, uint32_t size, - uint64_t host_va, uint8_t flags) -{ - uint64_t end_pa = start_pa + size; - HAXMapping *entry, *next; - - QTAILQ_FOREACH_SAFE(entry, &mappings, entry, next) { - uint32_t chunk_sz; - if (start_pa >= entry->start_pa + entry->size) { - continue; - } - if (start_pa < entry->start_pa) { - chunk_sz = end_pa <= entry->start_pa ? size - : entry->start_pa - start_pa; - hax_insert_mapping_before(entry, start_pa, chunk_sz, - host_va, flags); - start_pa += chunk_sz; - host_va += chunk_sz; - size -= chunk_sz; - } else if (start_pa > entry->start_pa) { - /* split the existing chunk at start_pa */ - chunk_sz = start_pa - entry->start_pa; - hax_insert_mapping_before(entry, entry->start_pa, chunk_sz, - entry->host_va, entry->flags); - entry->start_pa += chunk_sz; - entry->host_va += chunk_sz; - entry->size -= chunk_sz; - } - /* now start_pa == entry->start_pa */ - chunk_sz = MIN(size, entry->size); - if (chunk_sz) { - bool nop = hax_mapping_is_opposite(entry, host_va, flags); - bool partial = chunk_sz < entry->size; - if (partial) { - /* remove the beginning of the existing chunk */ - entry->start_pa += chunk_sz; - entry->host_va += chunk_sz; - entry->size -= chunk_sz; - if (!nop) { - hax_insert_mapping_before(entry, start_pa, chunk_sz, - host_va, flags); - } - } else { /* affects the full mapping entry */ - if (nop) { /* no change to this mapping, remove it */ - QTAILQ_REMOVE(&mappings, entry, entry); - g_free(entry); - } else { /* update mapping properties */ - entry->host_va = host_va; - entry->flags = flags; - } - } - start_pa += chunk_sz; - host_va += chunk_sz; - size -= chunk_sz; - } - if (!size) { /* we are done */ - break; - } - } - if (size) { /* add the leftover */ - hax_insert_mapping_before(NULL, start_pa, size, host_va, flags); - } -} - -static void hax_process_section(MemoryRegionSection *section, uint8_t flags) -{ - MemoryRegion *mr = section->mr; - hwaddr start_pa = section->offset_within_address_space; - ram_addr_t size = int128_get64(section->size); - unsigned int delta; - uint64_t host_va; - uint32_t max_mapping_size; - - /* We only care about RAM and ROM regions */ - if (!memory_region_is_ram(mr)) { - if (memory_region_is_romd(mr)) { - /* HAXM kernel module does not support ROMD yet */ - warn_report("Ignoring ROMD region 0x%016" PRIx64 "->0x%016" PRIx64, - start_pa, start_pa + size); - } - return; - } - - /* Adjust start_pa and size so that they are page-aligned. (Cf - * kvm_set_phys_mem() in kvm-all.c). - */ - delta = qemu_real_host_page_size() - (start_pa & ~qemu_real_host_page_mask()); - delta &= ~qemu_real_host_page_mask(); - if (delta > size) { - return; - } - start_pa += delta; - size -= delta; - size &= qemu_real_host_page_mask(); - if (!size || (start_pa & ~qemu_real_host_page_mask())) { - return; - } - - host_va = (uintptr_t)memory_region_get_ram_ptr(mr) - + section->offset_within_region + delta; - if (memory_region_is_rom(section->mr)) { - flags |= HAX_RAM_INFO_ROM; - } - - /* - * The kernel module interface uses 32-bit sizes: - * https://github.com/intel/haxm/blob/master/API.md#hax_vm_ioctl_set_ram - * - * If the mapping size is longer than 32 bits, we can't process it in one - * call into the kernel. Instead, we split the mapping into smaller ones, - * and call hax_update_mapping() on each. - */ - max_mapping_size = UINT32_MAX & qemu_real_host_page_mask(); - while (size > max_mapping_size) { - hax_update_mapping(start_pa, max_mapping_size, host_va, flags); - start_pa += max_mapping_size; - size -= max_mapping_size; - host_va += max_mapping_size; - } - /* Now size <= max_mapping_size */ - hax_update_mapping(start_pa, (uint32_t)size, host_va, flags); -} - -static void hax_region_add(MemoryListener *listener, - MemoryRegionSection *section) -{ - memory_region_ref(section->mr); - hax_process_section(section, 0); -} - -static void hax_region_del(MemoryListener *listener, - MemoryRegionSection *section) -{ - hax_process_section(section, HAX_RAM_INFO_INVALID); - memory_region_unref(section->mr); -} - -static void hax_transaction_begin(MemoryListener *listener) -{ - g_assert(QTAILQ_EMPTY(&mappings)); -} - -static void hax_transaction_commit(MemoryListener *listener) -{ - if (!QTAILQ_EMPTY(&mappings)) { - HAXMapping *entry, *next; - - if (DEBUG_HAX_MEM) { - hax_mapping_dump_list(); - } - QTAILQ_FOREACH_SAFE(entry, &mappings, entry, next) { - if (entry->flags & HAX_RAM_INFO_INVALID) { - /* for unmapping, put the values expected by the kernel */ - entry->flags = HAX_RAM_INFO_INVALID; - entry->host_va = 0; - } - if (hax_set_ram(entry->start_pa, entry->size, - entry->host_va, entry->flags)) { - fprintf(stderr, "%s: Failed mapping @0x%016" PRIx64 "+0x%" - PRIx32 " flags %02x\n", __func__, entry->start_pa, - entry->size, entry->flags); - } - QTAILQ_REMOVE(&mappings, entry, entry); - g_free(entry); - } - } -} - -/* currently we fake the dirty bitmap sync, always dirty */ -static void hax_log_sync(MemoryListener *listener, - MemoryRegionSection *section) -{ - MemoryRegion *mr = section->mr; - - if (!memory_region_is_ram(mr)) { - /* Skip MMIO regions */ - return; - } - - memory_region_set_dirty(mr, 0, int128_get64(section->size)); -} - -static MemoryListener hax_memory_listener = { - .name = "hax", - .begin = hax_transaction_begin, - .commit = hax_transaction_commit, - .region_add = hax_region_add, - .region_del = hax_region_del, - .log_sync = hax_log_sync, - .priority = 10, -}; - -static void hax_ram_block_added(RAMBlockNotifier *n, void *host, size_t size, - size_t max_size) -{ - /* - * We must register each RAM block with the HAXM kernel module, or - * hax_set_ram() will fail for any mapping into the RAM block: - * https://github.com/intel/haxm/blob/master/API.md#hax_vm_ioctl_alloc_ram - * - * Old versions of the HAXM kernel module (< 6.2.0) used to preallocate all - * host physical pages for the RAM block as part of this registration - * process, hence the name hax_populate_ram(). - */ - if (hax_populate_ram((uint64_t)(uintptr_t)host, max_size) < 0) { - fprintf(stderr, "HAX failed to populate RAM\n"); - abort(); - } -} - -static struct RAMBlockNotifier hax_ram_notifier = { - .ram_block_added = hax_ram_block_added, -}; - -void hax_memory_init(void) -{ - ram_block_notifier_add(&hax_ram_notifier); - memory_listener_register(&hax_memory_listener, &address_space_memory); -} diff --git a/target/i386/hax/hax-posix.c b/target/i386/hax/hax-posix.c deleted file mode 100644 index a057a5bd94..0000000000 --- a/target/i386/hax/hax-posix.c +++ /dev/null @@ -1,305 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -/* HAX module interface - darwin version */ -#include "qemu/osdep.h" -#include <sys/ioctl.h> - -#include "sysemu/cpus.h" -#include "hax-accel-ops.h" - -hax_fd hax_mod_open(void) -{ - int fd = open("/dev/HAX", O_RDWR); - if (fd == -1) { - fprintf(stderr, "Failed to open the hax module\n"); - } - - qemu_set_cloexec(fd); - - return fd; -} - -int hax_populate_ram(uint64_t va, uint64_t size) -{ - int ret; - - if (!hax_global.vm || !hax_global.vm->fd) { - fprintf(stderr, "Allocate memory before vm create?\n"); - return -EINVAL; - } - - if (hax_global.supports_64bit_ramblock) { - struct hax_ramblock_info ramblock = { - .start_va = va, - .size = size, - .reserved = 0 - }; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ADD_RAMBLOCK, &ramblock); - } else { - struct hax_alloc_ram_info info = { - .size = (uint32_t)size, - .pad = 0, - .va = va - }; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_ALLOC_RAM, &info); - } - if (ret < 0) { - fprintf(stderr, "Failed to register RAM block: ret=%d, va=0x%" PRIx64 - ", size=0x%" PRIx64 ", method=%s\n", ret, va, size, - hax_global.supports_64bit_ramblock ? "new" : "legacy"); - return ret; - } - return 0; -} - -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags) -{ - struct hax_set_ram_info info; - int ret; - - info.pa_start = start_pa; - info.size = size; - info.va = host_va; - info.flags = (uint8_t) flags; - - ret = ioctl(hax_global.vm->fd, HAX_VM_IOCTL_SET_RAM, &info); - if (ret < 0) { - return -errno; - } - return 0; -} - -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap) -{ - int ret; - - ret = ioctl(hax->fd, HAX_IOCTL_CAPABILITY, cap); - if (ret == -1) { - fprintf(stderr, "Failed to get HAX capability\n"); - return -errno; - } - - return 0; -} - -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) -{ - int ret; - - ret = ioctl(hax->fd, HAX_IOCTL_VERSION, version); - if (ret == -1) { - fprintf(stderr, "Failed to get HAX version\n"); - return -errno; - } - - return 0; -} - -static char *hax_vm_devfs_string(int vm_id) -{ - return g_strdup_printf("/dev/hax_vm/vm%02d", vm_id); -} - -static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) -{ - return g_strdup_printf("/dev/hax_vm%02d/vcpu%02d", vm_id, vcpu_id); -} - -int hax_host_create_vm(struct hax_state *hax, int *vmid) -{ - int ret; - int vm_id = 0; - - if (hax_invalid_fd(hax->fd)) { - return -EINVAL; - } - - if (hax->vm) { - return 0; - } - - ret = ioctl(hax->fd, HAX_IOCTL_CREATE_VM, &vm_id); - *vmid = vm_id; - return ret; -} - -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id) -{ - hax_fd fd; - char *vm_name = NULL; - - vm_name = hax_vm_devfs_string(vm_id); - if (!vm_name) { - return -1; - } - - fd = open(vm_name, O_RDWR); - g_free(vm_name); - - qemu_set_cloexec(fd); - - return fd; -} - -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion) -{ - int ret; - - if (hax_invalid_fd(vm_fd)) { - return -EINVAL; - } - - ret = ioctl(vm_fd, HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, qversion); - - if (ret < 0) { - fprintf(stderr, "Failed to notify qemu API version\n"); - return ret; - } - return 0; -} - -/* Simply assume the size should be bigger than the hax_tunnel, - * since the hax_tunnel can be extended later with compatibility considered - */ -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid) -{ - int ret; - - ret = ioctl(vm_fd, HAX_VM_IOCTL_VCPU_CREATE, &vcpuid); - if (ret < 0) { - fprintf(stderr, "Failed to create vcpu %x\n", vcpuid); - } - - return ret; -} - -hax_fd hax_host_open_vcpu(int vmid, int vcpuid) -{ - char *devfs_path = NULL; - hax_fd fd; - - devfs_path = hax_vcpu_devfs_string(vmid, vcpuid); - if (!devfs_path) { - fprintf(stderr, "Failed to get the devfs\n"); - return -EINVAL; - } - - fd = open(devfs_path, O_RDWR); - g_free(devfs_path); - if (fd < 0) { - fprintf(stderr, "Failed to open the vcpu devfs\n"); - } - qemu_set_cloexec(fd); - return fd; -} - -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu) -{ - int ret; - struct hax_tunnel_info info; - - ret = ioctl(vcpu->fd, HAX_VCPU_IOCTL_SETUP_TUNNEL, &info); - if (ret) { - fprintf(stderr, "Failed to setup the hax tunnel\n"); - return ret; - } - - if (!valid_hax_tunnel_size(info.size)) { - fprintf(stderr, "Invalid hax tunnel size %x\n", info.size); - ret = -EINVAL; - return ret; - } - - vcpu->tunnel = (struct hax_tunnel *) (intptr_t) (info.va); - vcpu->iobuf = (unsigned char *) (intptr_t) (info.io_va); - return 0; -} - -int hax_vcpu_run(AccelCPUState *vcpu) -{ - return ioctl(vcpu->fd, HAX_VCPU_IOCTL_RUN, NULL); -} - -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - if (set) { - ret = ioctl(fd, HAX_VCPU_IOCTL_SET_FPU, fl); - } else { - ret = ioctl(fd, HAX_VCPU_IOCTL_GET_FPU, fl); - } - return ret; -} - -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - if (set) { - ret = ioctl(fd, HAX_VCPU_IOCTL_SET_MSRS, msrs); - } else { - ret = ioctl(fd, HAX_VCPU_IOCTL_GET_MSRS, msrs); - } - return ret; -} - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, int set) -{ - int ret, fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - if (set) { - ret = ioctl(fd, HAX_VCPU_SET_REGS, state); - } else { - ret = ioctl(fd, HAX_VCPU_GET_REGS, state); - } - return ret; -} - -int hax_inject_interrupt(CPUArchState *env, int vector) -{ - int fd; - - fd = hax_vcpu_get_fd(env); - if (fd <= 0) { - return -1; - } - - return ioctl(fd, HAX_VCPU_IOCTL_INTERRUPT, &vector); -} - -void hax_kick_vcpu_thread(CPUState *cpu) -{ - /* - * FIXME: race condition with the exit_request check in - * hax_vcpu_hax_exec - */ - cpu->exit_request = 1; - cpus_kick_thread(cpu); -} diff --git a/target/i386/hax/hax-windows.c b/target/i386/hax/hax-windows.c deleted file mode 100644 index 4bf6cc08d2..0000000000 --- a/target/i386/hax/hax-windows.c +++ /dev/null @@ -1,485 +0,0 @@ -/* - * QEMU HAXM support - * - * Copyright (c) 2011 Intel Corporation - * Written by: - * Jiang Yunhong<yunhong.jiang(a)intel.com> - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - * - */ - -#include "qemu/osdep.h" -#include "cpu.h" -#include "hax-accel-ops.h" - -/* - * return 0 when success, -1 when driver not loaded, - * other negative value for other failure - */ -static int hax_open_device(hax_fd *fd) -{ - uint32_t errNum = 0; - HANDLE hDevice; - - if (!fd) { - return -2; - } - - hDevice = CreateFile("\\\\.\\HAX", - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - - if (hDevice == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Failed to open the HAX device!\n"); - errNum = GetLastError(); - if (errNum == ERROR_FILE_NOT_FOUND) { - return -1; - } - return -2; - } - *fd = hDevice; - return 0; -} - -/* hax_fd hax_mod_open */ - hax_fd hax_mod_open(void) -{ - int ret; - hax_fd fd = NULL; - - ret = hax_open_device(&fd); - if (ret != 0) { - fprintf(stderr, "Open HAX device failed\n"); - } - - return fd; -} - -int hax_populate_ram(uint64_t va, uint64_t size) -{ - int ret; - HANDLE hDeviceVM; - DWORD dSize = 0; - - if (!hax_global.vm || !hax_global.vm->fd) { - fprintf(stderr, "Allocate memory before vm create?\n"); - return -EINVAL; - } - - hDeviceVM = hax_global.vm->fd; - if (hax_global.supports_64bit_ramblock) { - struct hax_ramblock_info ramblock = { - .start_va = va, - .size = size, - .reserved = 0 - }; - - ret = DeviceIoControl(hDeviceVM, - HAX_VM_IOCTL_ADD_RAMBLOCK, - &ramblock, sizeof(ramblock), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } else { - struct hax_alloc_ram_info info = { - .size = (uint32_t) size, - .pad = 0, - .va = va - }; - - ret = DeviceIoControl(hDeviceVM, - HAX_VM_IOCTL_ALLOC_RAM, - &info, sizeof(info), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } - - if (!ret) { - fprintf(stderr, "Failed to register RAM block: va=0x%" PRIx64 - ", size=0x%" PRIx64 ", method=%s\n", va, size, - hax_global.supports_64bit_ramblock ? "new" : "legacy"); - return ret; - } - - return 0; -} - -int hax_set_ram(uint64_t start_pa, uint32_t size, uint64_t host_va, int flags) -{ - struct hax_set_ram_info info; - HANDLE hDeviceVM = hax_global.vm->fd; - DWORD dSize = 0; - int ret; - - info.pa_start = start_pa; - info.size = size; - info.va = host_va; - info.flags = (uint8_t) flags; - - ret = DeviceIoControl(hDeviceVM, HAX_VM_IOCTL_SET_RAM, - &info, sizeof(info), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_capability(struct hax_state *hax, struct hax_capabilityinfo *cap) -{ - int ret; - HANDLE hDevice = hax->fd; /* handle to hax module */ - DWORD dSize = 0; - DWORD err = 0; - - if (hax_invalid_fd(hDevice)) { - fprintf(stderr, "Invalid fd for hax device!\n"); - return -ENODEV; - } - - ret = DeviceIoControl(hDevice, HAX_IOCTL_CAPABILITY, NULL, 0, cap, - sizeof(*cap), &dSize, (LPOVERLAPPED) NULL); - - if (!ret) { - err = GetLastError(); - if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) { - fprintf(stderr, "hax capability is too long to hold.\n"); - } - fprintf(stderr, "Failed to get Hax capability:%luu\n", err); - return -EFAULT; - } else { - return 0; - } -} - -int hax_mod_version(struct hax_state *hax, struct hax_module_version *version) -{ - int ret; - HANDLE hDevice = hax->fd; /* handle to hax module */ - DWORD dSize = 0; - DWORD err = 0; - - if (hax_invalid_fd(hDevice)) { - fprintf(stderr, "Invalid fd for hax device!\n"); - return -ENODEV; - } - - ret = DeviceIoControl(hDevice, - HAX_IOCTL_VERSION, - NULL, 0, - version, sizeof(*version), &dSize, - (LPOVERLAPPED) NULL); - - if (!ret) { - err = GetLastError(); - if (err == ERROR_INSUFFICIENT_BUFFER || err == ERROR_MORE_DATA) { - fprintf(stderr, "hax module verion is too long to hold.\n"); - } - fprintf(stderr, "Failed to get Hax module version:%lu\n", err); - return -EFAULT; - } else { - return 0; - } -} - -static char *hax_vm_devfs_string(int vm_id) -{ - return g_strdup_printf("\\\\.\\hax_vm%02d", vm_id); -} - -static char *hax_vcpu_devfs_string(int vm_id, int vcpu_id) -{ - return g_strdup_printf("\\\\.\\hax_vm%02d_vcpu%02d", vm_id, vcpu_id); -} - -int hax_host_create_vm(struct hax_state *hax, int *vmid) -{ - int ret; - int vm_id = 0; - DWORD dSize = 0; - - if (hax_invalid_fd(hax->fd)) { - return -EINVAL; - } - - if (hax->vm) { - return 0; - } - - ret = DeviceIoControl(hax->fd, - HAX_IOCTL_CREATE_VM, - NULL, 0, &vm_id, sizeof(vm_id), &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to create VM. Error code: %lu\n", - GetLastError()); - return -1; - } - *vmid = vm_id; - return 0; -} - -hax_fd hax_host_open_vm(struct hax_state *hax, int vm_id) -{ - char *vm_name = NULL; - hax_fd hDeviceVM; - - vm_name = hax_vm_devfs_string(vm_id); - if (!vm_name) { - fprintf(stderr, "Failed to open VM. VM name is null\n"); - return INVALID_HANDLE_VALUE; - } - - hDeviceVM = CreateFile(vm_name, - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hDeviceVM == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Open the vm device error:%s, ec:%lu\n", - vm_name, GetLastError()); - } - - g_free(vm_name); - return hDeviceVM; -} - -int hax_notify_qemu_version(hax_fd vm_fd, struct hax_qemu_version *qversion) -{ - int ret; - DWORD dSize = 0; - if (hax_invalid_fd(vm_fd)) { - return -EINVAL; - } - ret = DeviceIoControl(vm_fd, - HAX_VM_IOCTL_NOTIFY_QEMU_VERSION, - qversion, sizeof(struct hax_qemu_version), - NULL, 0, &dSize, (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to notify qemu API version\n"); - return -1; - } - return 0; -} - -int hax_host_create_vcpu(hax_fd vm_fd, int vcpuid) -{ - int ret; - DWORD dSize = 0; - - ret = DeviceIoControl(vm_fd, - HAX_VM_IOCTL_VCPU_CREATE, - &vcpuid, sizeof(vcpuid), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to create vcpu %x\n", vcpuid); - return -1; - } - - return 0; -} - -hax_fd hax_host_open_vcpu(int vmid, int vcpuid) -{ - char *devfs_path = NULL; - hax_fd hDeviceVCPU; - - devfs_path = hax_vcpu_devfs_string(vmid, vcpuid); - if (!devfs_path) { - fprintf(stderr, "Failed to get the devfs\n"); - return INVALID_HANDLE_VALUE; - } - - hDeviceVCPU = CreateFile(devfs_path, - GENERIC_READ | GENERIC_WRITE, - 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, - NULL); - - if (hDeviceVCPU == INVALID_HANDLE_VALUE) { - fprintf(stderr, "Failed to open the vcpu devfs\n"); - } - g_free(devfs_path); - return hDeviceVCPU; -} - -int hax_host_setup_vcpu_channel(AccelCPUState *vcpu) -{ - hax_fd hDeviceVCPU = vcpu->fd; - int ret; - struct hax_tunnel_info info; - DWORD dSize = 0; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SETUP_TUNNEL, - NULL, 0, &info, sizeof(info), &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - fprintf(stderr, "Failed to setup the hax tunnel\n"); - return -1; - } - - if (!valid_hax_tunnel_size(info.size)) { - fprintf(stderr, "Invalid hax tunnel size %x\n", info.size); - ret = -EINVAL; - return ret; - } - vcpu->tunnel = (struct hax_tunnel *) (intptr_t) (info.va); - vcpu->iobuf = (unsigned char *) (intptr_t) (info.io_va); - return 0; -} - -int hax_vcpu_run(AccelCPUState *vcpu) -{ - int ret; - HANDLE hDeviceVCPU = vcpu->fd; - DWORD dSize = 0; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_RUN, - NULL, 0, NULL, 0, &dSize, (LPOVERLAPPED) NULL); - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_fpu(CPUArchState *env, struct fx_layout *fl, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize = 0; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SET_FPU, - fl, sizeof(*fl), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_GET_FPU, - NULL, 0, fl, sizeof(*fl), &dSize, - (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_msr(CPUArchState *env, struct hax_msr_data *msrs, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize = 0; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_SET_MSRS, - msrs, sizeof(*msrs), - msrs, sizeof(*msrs), &dSize, (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_GET_MSRS, - msrs, sizeof(*msrs), - msrs, sizeof(*msrs), &dSize, (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_sync_vcpu_state(CPUArchState *env, struct vcpu_state_t *state, int set) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - if (set) { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_SET_REGS, - state, sizeof(*state), - NULL, 0, &dSize, (LPOVERLAPPED) NULL); - } else { - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_GET_REGS, - NULL, 0, - state, sizeof(*state), &dSize, - (LPOVERLAPPED) NULL); - } - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -int hax_inject_interrupt(CPUArchState *env, int vector) -{ - int ret; - hax_fd fd; - HANDLE hDeviceVCPU; - DWORD dSize; - - fd = hax_vcpu_get_fd(env); - if (hax_invalid_fd(fd)) { - return -1; - } - - hDeviceVCPU = fd; - - ret = DeviceIoControl(hDeviceVCPU, - HAX_VCPU_IOCTL_INTERRUPT, - &vector, sizeof(vector), NULL, 0, &dSize, - (LPOVERLAPPED) NULL); - if (!ret) { - return -EFAULT; - } else { - return 0; - } -} - -static void CALLBACK dummy_apc_func(ULONG_PTR unused) -{ -} - -void hax_kick_vcpu_thread(CPUState *cpu) -{ - /* - * FIXME: race condition with the exit_request check in - * hax_vcpu_hax_exec - */ - cpu->exit_request = 1; - if (!qemu_cpu_is_self(cpu)) { - if (!QueueUserAPC(dummy_apc_func, cpu->accel->hThread, 0)) { - fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n", - __func__, GetLastError()); - exit(1); - } - } -} diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index f7a9486e06..6b0f200efe 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,5 +1,4 @@ sysemu_stubs_ss = ss.source_set() -sysemu_stubs_ss.add(when: 'CONFIG_HAX', if_false: files('hax-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) diff --git a/meson_options.txt b/meson_options.txt index 90237389e2..8139ef1534 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -69,8 +69,6 @@ option('malloc', type : 'combo', choices : ['system', 'tcmalloc', 'jemalloc'], option('kvm', type: 'feature', value: 'auto', description: 'KVM acceleration support') -option('hax', type: 'feature', value: 'auto', - description: 'HAX acceleration support') option('whpx', type: 'feature', value: 'auto', description: 'WHPX acceleration support') option('hvf', type: 'feature', value: 'auto', diff --git a/qemu-options.hx b/qemu-options.hx index b57489d7ca..f8fd147e42 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -26,7 +26,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=]name[,prop[=value][,...]]\n" " selects emulated machine ('-machine help' for list)\n" " property accel=accel1[:accel2[:...]] selects accelerator\n" - " supported accelerators are kvm, xen, hax, hvf, nvmm, whpx or tcg (default: tcg)\n" + " supported accelerators are kvm, xen, hvf, nvmm, whpx or tcg (default: tcg)\n" " vmport=on|off|auto controls emulation of vmport (default: auto)\n" " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" @@ -59,7 +59,7 @@ SRST ``accel=accels1[:accels2[:...]]`` This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. + architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. @@ -178,7 +178,7 @@ ERST DEF("accel", HAS_ARG, QEMU_OPTION_accel, "-accel [accel=]accelerator[,prop[=value][,...]]\n" - " select accelerator (kvm, xen, hax, hvf, nvmm, whpx or tcg; use 'help' for a list)\n" + " select accelerator (kvm, xen, hvf, nvmm, whpx or tcg; use 'help' for a list)\n" " igd-passthru=on|off (enable Xen integrated Intel graphics passthrough, default=off)\n" " kernel-irqchip=on|off|split controls accelerated irqchip support (default=on)\n" " kvm-shadow-mem=size of KVM shadow MMU in bytes\n" @@ -191,7 +191,7 @@ DEF("accel", HAS_ARG, QEMU_OPTION_accel, SRST ``-accel name[,prop=value[,...]]`` This is used to enable an accelerator. Depending on the target - architecture, kvm, xen, hax, hvf, nvmm, whpx or tcg can be available. By + architecture, kvm, xen, hvf, nvmm, whpx or tcg can be available. By default, tcg is used. If there is more than one accelerator specified, the next one is used if the previous one fails to initialize. diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/org.centos/stream/8/x86_64/configure index d02b09a4b9..131f8ee5f3 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -68,7 +68,6 @@ --disable-gtk \ --disable-guest-agent \ --disable-guest-agent-msi \ ---disable-hax \ --disable-hvf \ --disable-iconv \ --disable-kvm \ diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 5714fd93d9..449d05928f 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -111,7 +111,6 @@ meson_options_help() { printf "%s\n" ' gtk-clipboard clipboard support for the gtk UI (EXPERIMENTAL, MAY HANG)' printf "%s\n" ' guest-agent Build QEMU Guest Agent' printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Agent' - printf "%s\n" ' hax HAX acceleration support' printf "%s\n" ' hvf HVF acceleration support' printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' @@ -313,8 +312,6 @@ _meson_option_parse() { --disable-guest-agent) printf "%s" -Dguest_agent=disabled ;; --enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;; --disable-guest-agent-msi) printf "%s" -Dguest_agent_msi=disabled ;; - --enable-hax) printf "%s" -Dhax=enabled ;; - --disable-hax) printf "%s" -Dhax=disabled ;; --enable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=true ;; --disable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=false ;; --enable-hvf) printf "%s" -Dhvf=enabled ;; diff --git a/target/i386/hax/meson.build b/target/i386/hax/meson.build deleted file mode 100644 index 6ac314aa35..0000000000 --- a/target/i386/hax/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -i386_system_ss.add(when: 'CONFIG_HAX', if_true: files( - 'hax-all.c', - 'hax-mem.c', - 'hax-accel-ops.c', -)) -i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_POSIX'], if_true: files('hax-posix.c')) -i386_system_ss.add(when: ['CONFIG_HAX', 'CONFIG_WIN32'], if_true: files('hax-windows.c')) diff --git a/target/i386/meson.build b/target/i386/meson.build index 1effe1ed9a..6f1036d469 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -25,7 +25,6 @@ i386_system_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files( i386_user_ss = ss.source_set() subdir('kvm') -subdir('hax') subdir('whpx') subdir('nvmm') subdir('hvf') -- 2.38.1

4 4

[PATCH 0/5] Refactor few old-style XML node lookup loops
by Peter Krempa 29 Aug '23

29 Aug '23

Peter Krempa (5): virNetworkDNSHostDefParseXML: Refactor parsing virsh: domain: Refactor XML handling for disk changes virDomainFeaturesCapabilitiesDefParse: Use virXMLNodeGetSubelementList virDomainFeaturesKVMDefParse: Use virXMLNodeGetSubelementList virDomainFeaturesXENDefParse: Use virXMLNodeGetSubelementList src/conf/domain_conf.c | 50 +++++++++++----------- src/conf/network_conf.c | 94 ++++++++++++++++++++--------------------- tools/virsh-domain.c | 63 +++------------------------ 3 files changed, 78 insertions(+), 129 deletions(-) -- 2.41.0

2 6

[PATCH 0/9] qemu: Rework probing of vCPU hotplug support
by Peter Krempa 29 Aug '23

29 Aug '23

Nowadays all qemu's support the command which was used as witness, but was gated on machine type's support of vCPU hotplug. Directly probe the machine type. Peter Krempa (9): qemu: Rename qemuDomainSupportsNewVcpuHotplug to qemuDomainSupportsVcpuHotplug qemu: capabilities: Export functions necessary for probing machine types qemu: process: Probe machine type data on reconnect to qemu qemuxml2argvtest: Modernize 'cpu-hotplug-startup' case tests: qemuhotplugtest: Fix arch-specific parts of 'ppc64' test XMLs qemuhotplugtest: Remove 'modern' field for cpu hotplug tests qemuDomainSupportsVcpuHotplug: Base return value on virQEMUCapsGetMachineHotplugCpus qemu: capabilities: Retire QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS qemu: capabilities: Remove unused 'virQEMUCapsFilterByMachineType' src/qemu/qemu_capabilities.c | 53 ++----------------- src/qemu/qemu_capabilities.h | 18 ++++--- src/qemu/qemu_domain.c | 12 ++--- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_process.c | 41 ++++++++++++-- .../caps_4.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0_ppc64.xml | 1 - .../qemucapabilitiesdata/caps_4.2.0_s390x.xml | 1 - .../caps_4.2.0_x86_64.xml | 1 - .../caps_5.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.0.0_ppc64.xml | 1 - .../caps_5.0.0_riscv64.xml | 1 - .../caps_5.0.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_5.1.0_sparc.xml | 1 - .../caps_5.1.0_x86_64.xml | 1 - .../caps_5.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_ppc64.xml | 1 - .../caps_5.2.0_riscv64.xml | 1 - .../qemucapabilitiesdata/caps_5.2.0_s390x.xml | 1 - .../caps_5.2.0_x86_64.xml | 1 - .../caps_6.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.0.0_s390x.xml | 1 - .../caps_6.0.0_x86_64.xml | 1 - .../caps_6.1.0_x86_64.xml | 1 - .../caps_6.2.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 1 - .../caps_6.2.0_x86_64.xml | 1 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.xml | 1 - .../qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 1 - .../caps_7.0.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 1 - .../caps_7.1.0_x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 - .../caps_7.2.0_x86_64+hvf.xml | 1 - .../caps_7.2.0_x86_64.xml | 1 - .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.xml | 1 - .../qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 - .../caps_8.1.0_x86_64.xml | 1 - tests/qemuhotplugtest.c | 40 +++++--------- .../ppc64-modern-bulk-domain.xml | 4 +- .../ppc64-modern-bulk-result-conf.xml | 18 ++++--- .../ppc64-modern-bulk-result-live.xml | 19 +++---- .../ppc64-modern-individual-domain.xml | 4 +- .../ppc64-modern-individual-result-conf.xml | 18 ++++--- .../ppc64-modern-individual-result-live.xml | 19 +++---- ...=> cpu-hotplug-startup.x86_64-latest.args} | 14 ++--- tests/qemuxml2argvtest.c | 2 +- 50 files changed, 126 insertions(+), 177 deletions(-) rename tests/qemuxml2argvdata/{cpu-hotplug-startup.args => cpu-hotplug-startup.x86_64-latest.args} (55%) -- 2.41.0

2 10

[libvirt PATCH v7 00/35] Use nbdkit for http/ftp/ssh network drives in libvirt
by Jonathon Jongsma 29 Aug '23

29 Aug '23

This is the seventh version of this patch series. See https://bugzilla.redhat.com/show_bug.cgi?id=2016527 for more information. Note that testing this requires selinux policy changes which are not fully done, but there is a new policy in development that has allowed me to run with selinux in enforcing mode for the common cases. See https://bugzilla.redhat.com/show_bug.cgi?id=2182505 for more information. The following scenarios should work now with selinux enabled using the selinux policy from that bug: - http/https disks - ssh disks with password authentication - ssh disks with passwordless keyfile The one major thing that doesn't work and is difficult to get working with selinux enabled is the ssh-agent. This is because there doesn't seem to be any selinux policy for ssh-agent, so by default the ssh-agent socket is labeled unconfined_t. We cannot allow access from the libvirt/qemu to unconfined_t because that would open up access to just about anything on the host. So additional work will likely be necessary for ssh-agent/libvirt interaction in the future. Fortunately ssh-agent is something that never was really supported with the old qemu block driver either, so I think we could potentially merge this patchset either without the ssh-agent patches or with a note that ssh-agent won't work with selinux enabled. Note also that gitlab CI will not work for this series without changes to the ci definitions due to the addition of libnbd dependency. Changes in v7: - rebased to latest master - moved restarting of nbdkit process to per-domain event thread - a few other smaller changes suggested by Peter in v6 Jonathon Jongsma (35): schema: allow 'ssh' as a protocol for network disks qemu: Add functions for determining nbdkit availability qemu: expand nbdkit capabilities util: Allow virFileCache data to be any GObject qemu: implement basic virFileCache for nbdkit caps qemu: implement persistent file cache for nbdkit caps qemu: use file cache for nbdkit caps qemu: Add qemuNbdkitProcess qemu: query nbdkit module dir from binary qemu: add functions to start and stop nbdkit Generalize qemuDomainLogContextNew() qemu: Extract qemuDomainLogContext into a new file qemu: move qemuProcessReadLog() to qemuLogContext qemu: log error output from nbdkit tests: add ability to test various nbdkit capabilities qemu: split qemuDomainSecretStorageSourcePrepare qemu: include nbdkit state in private xml util: secure erase virCommand send buffers qemu: pass sensitive data to nbdkit via pipe qemu: use nbdkit to serve network disks if available util: make virCommandSetSendBuffer testable tests: add tests for nbdkit invocation qemu: add test for authenticating a https network disk qemu: Monitor nbdkit process for exit qemu: Taint domain if nbdkit restart fails qemu: try to connect to nbdkit early to detect errors schema: add password configuration for ssh disk qemu: implement password auth for ssh disks with nbdkit schema: add configuration for host verification of ssh disks qemu: implement knownHosts for ssh disks with nbdkit schema: add keyfile configuration for ssh disks qemu: implement keyfile auth for ssh disks with nbdkit schema: add ssh-agent configuration for ssh disks qemu: implement ssh-agent auth for ssh disks with nbdkit rpm: update spec file for for nbdkit support build-aux/syntax-check.mk | 2 +- docs/formatdomain.rst | 45 +- libvirt.spec.in | 8 + meson.build | 14 + meson_options.txt | 1 + po/POTFILES | 2 + src/conf/domain_conf.c | 38 + src/conf/domain_conf.h | 1 + src/conf/schemas/domaincommon.rng | 55 + src/conf/storage_source_conf.c | 6 + src/conf/storage_source_conf.h | 6 +- src/libvirt_private.syms | 1 + src/qemu/meson.build | 3 + src/qemu/qemu_block.c | 162 ++- src/qemu/qemu_conf.c | 22 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 436 +++--- src/qemu/qemu_domain.h | 31 +- src/qemu/qemu_driver.c | 21 + src/qemu/qemu_extdevice.c | 62 + src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_logcontext.c | 329 +++++ src/qemu/qemu_logcontext.h | 41 + src/qemu/qemu_nbdkit.c | 1277 +++++++++++++++++ src/qemu/qemu_nbdkit.h | 119 ++ src/qemu/qemu_nbdkitpriv.h | 31 + src/qemu/qemu_process.c | 122 +- src/qemu/qemu_process.h | 3 + src/util/vircommand.c | 19 +- src/util/vircommand.h | 8 + src/util/vircommandpriv.h | 4 + src/util/virfilecache.c | 14 +- src/util/virfilecache.h | 2 +- tests/meson.build | 1 + tests/qemublocktest.c | 2 +- ...w2-invalid.json => network-ssh-qcow2.json} | 0 ...cow2-invalid.xml => network-ssh-qcow2.xml} | 0 .../disk-cdrom-network.args.disk0 | 6 + .../disk-cdrom-network.args.disk1 | 8 + .../disk-cdrom-network.args.disk1.pipe.778 | 1 + .../disk-cdrom-network.args.disk2 | 8 + .../disk-cdrom-network.args.disk2.pipe.780 | 1 + .../disk-network-http.args.disk0 | 6 + .../disk-network-http.args.disk1 | 5 + .../disk-network-http.args.disk2 | 6 + .../disk-network-http.args.disk2.pipe.778 | 1 + .../disk-network-http.args.disk3 | 7 + .../disk-network-http.args.disk3.pipe.780 | 1 + ...work-source-curl-nbdkit-backing.args.disk0 | 7 + ...ce-curl-nbdkit-backing.args.disk0.pipe.778 | 1 + .../disk-network-source-curl.args.disk0 | 7 + ...sk-network-source-curl.args.disk0.pipe.778 | 1 + .../disk-network-source-curl.args.disk1 | 9 + ...sk-network-source-curl.args.disk1.pipe.780 | 1 + ...sk-network-source-curl.args.disk1.pipe.782 | 1 + .../disk-network-source-curl.args.disk2 | 7 + ...sk-network-source-curl.args.disk2.pipe.782 | 1 + ...sk-network-source-curl.args.disk2.pipe.784 | 1 + .../disk-network-source-curl.args.disk3 | 6 + .../disk-network-source-curl.args.disk4 | 6 + .../disk-network-ssh-key.args.disk0 | 9 + .../disk-network-ssh-key.args.disk1 | 9 + .../disk-network-ssh-password.args.disk0 | 9 + ...k-network-ssh-password.args.disk0.pipe.778 | 1 + .../disk-network-ssh.args.disk0 | 7 + .../disk-network-ssh.args.disk1 | 8 + .../disk-network-ssh.args.disk1.pipe.778 | 1 + .../disk-network-ssh.args.disk2 | 9 + tests/qemunbdkittest.c | 310 ++++ tests/qemustatusxml2xmldata/modern-in.xml | 4 + ...sk-cdrom-network-nbdkit.x86_64-latest.args | 42 + .../disk-cdrom-network-nbdkit.xml | 1 + ...isk-network-http-nbdkit.x86_64-latest.args | 44 + .../disk-network-http-nbdkit.xml | 1 + ...rce-curl-nbdkit-backing.x86_64-latest.args | 37 + ...isk-network-source-curl-nbdkit-backing.xml | 45 + ...work-source-curl-nbdkit.x86_64-latest.args | 49 + .../disk-network-source-curl-nbdkit.xml | 1 + ...isk-network-source-curl.x86_64-latest.args | 53 + .../disk-network-source-curl.xml | 74 + .../qemuxml2argvdata/disk-network-ssh-key.xml | 44 + ...disk-network-ssh-nbdkit.x86_64-latest.args | 35 + .../disk-network-ssh-nbdkit.xml | 1 + ...sk-network-ssh-password.x86_64-latest.args | 35 + .../disk-network-ssh-password.xml | 35 + .../disk-network-ssh.x86_64-latest.args | 35 + tests/qemuxml2argvdata/disk-network-ssh.xml | 32 + tests/qemuxml2argvtest.c | 19 + tests/testutilsqemu.c | 26 + tests/testutilsqemu.h | 4 + 90 files changed, 3507 insertions(+), 472 deletions(-) create mode 100644 src/qemu/qemu_logcontext.c create mode 100644 src/qemu/qemu_logcontext.h create mode 100644 src/qemu/qemu_nbdkit.c create mode 100644 src/qemu/qemu_nbdkit.h create mode 100644 src/qemu/qemu_nbdkitpriv.h rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.json => network-ssh-qcow2.json} (100%) rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.xml => network-ssh-qcow2.xml} (100%) create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.782 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.782 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.784 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk4 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk2 create mode 100644 tests/qemunbdkittest.c create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-http-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.xml -- 2.41.0

3 38

[PATCH] NEWS: Announcing Network Metadata APIs
by K Shiva Kiran 29 Aug '23

29 Aug '23

Ref to patchset implementing the above: https://listman.redhat.com/archives/libvir-list/2023-August/241250.html Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> --- NEWS.rst | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index 73571f0019..01df22ef03 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -17,6 +17,32 @@ v9.7.0 (unreleased) * **New features** + * network: Support for `<title>` and `<metadata>` fields in Network XML + + The `<title>` attribute can hold a short title defined by the user + and cannot contain newlines. + The `<description>` attribute holds any documentation that the user + wants to store. + + * network: Support to view and modify User defined metadata + + Two new APIs `virNetworkGetMetadata()` and `virNetworkSetMetadata()` + have been introduced. These allow users to view and modify the + contents of `<title>`, `<description>` and `<metadata>`. + + * virsh: Introduces new commands `net-desc` and `net-metadata` + + `net-desc` can be used to view and modify the Network's title and + description attributes. + `net-metadata` can be used to define or modify the custom metadata + attribute of the Network object. + + * virsh: Adds `--title` option to the `net-list` command + + This option prints the <title> attribute of the network in + an extra column. This option is usable only with the default + `--table` output. + * **Improvements** * **Bug fixes** -- 2.42.0

2 1

[PATCH] REFACTOR: Eliminate newlines in messages and fixes a typo
by K Shiva Kiran 29 Aug '23

29 Aug '23

Removes newlines of error message strings in metadata unit tests, libvirt-domain.c and libvirt-network.c Fixes a minor typo in libvirt-domain.c Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> --- include/libvirt/libvirt-domain.h | 2 +- src/libvirt-domain.c | 3 +-- src/libvirt-network.c | 3 +-- tests/metadatatest.c | 9 +++------ tests/networkmetadatatest.c | 9 +++------ 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index a1902546bb..ea36805aa3 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -5184,7 +5184,7 @@ typedef void (*virConnectDomainEventDeviceRemovalFailedCallback)(virConnectPtr c * virConnectDomainEventMetadataChangeCallback: * @conn: connection object * @dom: domain on which the event occurred - * @type: a value from virDomainMetadataTypea + * @type: a value from virDomainMetadataType * @nsuri: XML namespace URI * @opaque: application specified data * diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index ec42bb9a53..80a554a530 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -8585,8 +8585,7 @@ virDomainSetMetadata(virDomainPtr domain, case VIR_DOMAIN_METADATA_TITLE: if (metadata && strchr(metadata, '\n')) { virReportInvalidArg(metadata, "%s", - _("metadata title can't contain " - "newlines")); + _("metadata title can't contain newlines")); goto error; } G_GNUC_FALLTHROUGH; diff --git a/src/libvirt-network.c b/src/libvirt-network.c index c0daea3a60..ef17a8a04d 100644 --- a/src/libvirt-network.c +++ b/src/libvirt-network.c @@ -1974,8 +1974,7 @@ virNetworkSetMetadata(virNetworkPtr network, case VIR_NETWORK_METADATA_TITLE: if (metadata && strchr(metadata, '\n')) { virReportInvalidArg(metadata, "%s", - _("metadata title can't contain " - "newlines")); + _("metadata title can't contain newlines")); goto error; } G_GNUC_FALLTHROUGH; diff --git a/tests/metadatatest.c b/tests/metadatatest.c index b56428fde5..7136730e6a 100644 --- a/tests/metadatatest.c +++ b/tests/metadatatest.c @@ -113,8 +113,7 @@ verifyMetadata(virDomainPtr dom, if (STRNEQ(metadataAPI, expectAPI)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "XML metadata in API doesn't match expected metadata: " - "expected:\n[%s]\ngot:\n[%s]", + "XML metadata in API doesn't match expected metadata: expected:\n[%s]\ngot:\n[%s]", expectAPI, metadataAPI); return false; } @@ -136,8 +135,7 @@ verifyMetadata(virDomainPtr dom, if (STRNEQ(metadataXML, expectXML)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "XML in dump doesn't match expected metadata: " - "expected:\n[%s]\ngot:\n[%s]", + "XML in dump doesn't match expected metadata: expected:\n[%s]\ngot:\n[%s]", expectXML, metadataXML); return false; } @@ -219,8 +217,7 @@ testTextMetadata(const void *data) if (STRNEQ_NULLABLE(test->expect, actual)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "expected metadata doesn't match actual: " - "expected:'%s'\ngot: '%s'", + "expected metadata doesn't match actual: expected:'%s'\ngot: '%s'", NULLSTR(test->data), NULLSTR(actual)); return -1; } diff --git a/tests/networkmetadatatest.c b/tests/networkmetadatatest.c index c309fb29b0..7a1bca4f73 100644 --- a/tests/networkmetadatatest.c +++ b/tests/networkmetadatatest.c @@ -113,8 +113,7 @@ verifyMetadata(virNetworkPtr net, if (STRNEQ(metadataAPI, expectAPI)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "XML metadata in API doesn't match expected metadata: " - "expected:\n[%s]\ngot:\n[%s]", + "XML metadata in API doesn't match expected metadata: expected:\n[%s]\ngot:\n[%s]", expectAPI, metadataAPI); return false; } @@ -136,8 +135,7 @@ verifyMetadata(virNetworkPtr net, if (STRNEQ(metadataXML, expectXML)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "XML in dump doesn't match expected metadata: " - "expected:\n[%s]\ngot:\n[%s]", + "XML in dump doesn't match expected metadata: expected:\n[%s]\ngot:\n[%s]", expectXML, metadataXML); return false; } @@ -219,8 +217,7 @@ testTextMetadata(const void *data) if (STRNEQ_NULLABLE(test->expect, actual)) { virReportError(VIR_ERR_INTERNAL_ERROR, - "expected metadata doesn't match actual: " - "expected:'%s'\ngot: '%s'", + "expected metadata doesn't match actual: expected:'%s'\ngot: '%s'", NULLSTR(test->data), NULLSTR(actual)); return -1; } -- 2.42.0

2 1

[libvirt PATCH] ci: lcitool: Add libvirt-tck+runtime deps list
by Erik Skultety 29 Aug '23

29 Aug '23

This change was supposed to be part of commit 120a674f , but was proposed against the libvirt TCK project instead. Since we're running the TCK test suite as part of this project, this is the right place for the TCK runtime deps list config. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/lcitool/projects/libvirt-tck+runtime.yml | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 ci/lcitool/projects/libvirt-tck+runtime.yml diff --git a/ci/lcitool/projects/libvirt-tck+runtime.yml b/ci/lcitool/projects/libvirt-tck+runtime.yml new file mode 100644 index 0000000000..6872cb8c2c --- /dev/null +++ b/ci/lcitool/projects/libvirt-tck+runtime.yml @@ -0,0 +1,32 @@ +--- +packages: + - bc + - libguestfs-tools + - perl + - perl-Archive-Tar + - perl-Digest + - perl-Digest-MD5 + - perl-File-Slurp + - perl-IO-Compress-Bzip2 + - perl-IO-Interface + - perl-IO-String + - perl-Module-Build + - perl-Net-OpenSSH + - perl-NetAddr-IP + - perl-Sub-Uplevel + - perl-TAP-Formatter-HTML + - perl-TAP-Formatter-JUnit + - perl-TAP-Harness-Archive + - perl-Test-Exception + - perl-Test-LWP-UserAgent + - perl-Test-Pod + - perl-Test-Pod-Coverage + - perl-Test-Simple + - perl-XML-Twig + - perl-XML-Writer + - perl-XML-XPath + - perl-YAML + - perl-accessors + - perl-generators + - rpmbuild + - tcpdump -- 2.41.0

2 1

[RFC] Adding timestamp to guest's serial console log
by Shaleen Bathla 29 Aug '23

29 Aug '23

Hi, Need some comments regarding the following feature : Addition of timestamp support for serial console logs of a guest. We can implement it as a configurable attribute in xml. For example : <serial type='pty'> <log file='$PATH/$GUESTNAME-serial0.log' append='on' timestamp="on/off"/> <target type='isa-serial' port='0'> <model name='isa-serial'/> </target> </serial> We can add a timestamp after every '\n' character received from qemu. Can I have some comments regarding this change like what I should keep in mind while implementing, whether it is a welcome addition or not, issues I might face, any qemu changes required. Thanks and Regards, Shaleen Bathla

4 5

[libvirt PATCH 0/2] tools: some fixes to VMSA construction when validating SEV boot
by Daniel P. Berrangé 29 Aug '23

29 Aug '23

Daniel P. Berrangé (2): tools: fix handling of CPU family/model/stepping in SEV validation tools: fix VMSA construction with explicit CPU family/model/stepping tools/virt-qemu-sev-validate | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) -- 2.41.0

3 7

CPU pinning implementation through libvirt
by xtec＠trimaso.com.mx 28 Aug '23

28 Aug '23

I'll be direct. After learning that QEMU itself has never officially implemented options such as "-vcpu", "-vcpupin", or similar, remaining only as unimplemented commits at their mailing lists, I felt the need of asking here once and for all: How does libvirt actually implements CPU pinning under the hood? There's the xml with the cputune section and all the vcpupins, but does libvirt translates this to QEMU native commands, or what else does it do? Thanks.

2 1

[libvirt PATCH v2 0/7] Introduce new Metadata fields for Network object with corresponding APIs
by K Shiva Kiran 25 Aug '23

25 Aug '23

This commit adds the following: - Introduction of <title> and <description> fields to the Network Object. - Introduction of Get and Set Public APIs for the aforementioned fields. - virsh exposure of the aforementioned Public APIs. - Adds implementation in test driver along with a testcase. - Implementation in bridge driver. This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-July/240828.html Diff to v1: - Corrected placement of structs in remote_protocol-structs. - Removed redundant call to virNetworkObjSetDefTransient() in virNetworkConfigChangeSetup(). - Removed redundant logic in networkUpdate(), substituted by call to newly introduced virNetworkObjUpdateModificationImpact(). - Added virsh exposure of the APIs. - Added bridge driver implementation. Signed-off-by: K Shiva Kiran <shiva_kr(a)riseup.net> K Shiva Kiran (7): Add <title> and <description> for Network Objects Adding Public Get and Set APIs for Network Metadata Implementing Remote Protocol for Network Metadata virsh exposure of Network Metadata APIs Add virNetworkObj Get and Set Methods for Metadata Add Test driver and testcase for Network Metadata change APIs Added bridge driver implementation docs/formatnetwork.rst | 11 + docs/manpages/virsh.rst | 77 ++++++ include/libvirt/libvirt-network.h | 29 +++ include/libvirt/virterror.h | 1 + src/conf/network_conf.c | 21 ++ src/conf/network_conf.h | 2 + src/conf/schemas/basictypes.rng | 15 ++ src/conf/schemas/domaincommon.rng | 15 -- src/conf/schemas/network.rng | 10 + src/conf/virnetworkobj.c | 329 +++++++++++++++++++++++- src/conf/virnetworkobj.h | 21 ++ src/driver-network.h | 16 ++ src/libvirt-network.c | 167 ++++++++++++ src/libvirt_private.syms | 3 + src/libvirt_public.syms | 6 + src/network/bridge_driver.c | 78 +++++- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 36 ++- src/remote_protocol-structs | 19 ++ src/test/test_driver.c | 83 +++++- src/util/virerror.c | 3 + tests/meson.build | 1 + tests/networkmetadatatest.c | 297 +++++++++++++++++++++ tools/virsh-network.c | 411 +++++++++++++++++++++++++++++- tools/virsh-util.c | 25 ++ tools/virsh-util.h | 9 + 26 files changed, 1624 insertions(+), 63 deletions(-) create mode 100644 tests/networkmetadatatest.c -- 2.41.0

3 11

[PATCH v3 0/2] add support for discard_granularity
by Kristina Hanicova 25 Aug '23

25 Aug '23

v3 of: https://listman.redhat.com/archives/libvir-list/2023-August/241452.html diff to v2 (suggested by Peter): * added note to the first commit * enabled qemuxml2xmltest for blockio * moved one hunk to the first commit Kristina Hanicova (2): conf: add support for discard_granularity qemu: add support for discard_granularity docs/formatdomain.rst | 6 ++- src/conf/domain_conf.c | 19 +++++++- src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 3 +- src/conf/schemas/domaincommon.rng | 5 ++ src/qemu/qemu_command.c | 2 + src/qemu/qemu_domain.c | 2 + src/vz/vz_utils.c | 3 +- .../disk-blockio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- .../disk-blockio.x86_64-latest.xml | 48 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 12 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/disk-blockio.x86_64-latest.xml -- 2.41.0

2 3

[PATCH] docs: Improve documentation of <disk type='dir'>
by Peter Krempa 25 Aug '23

25 Aug '23

Note the implications and caveats of <disk type='dir'>. Closes: https://gitlab.com/libvirt/libvirt/-/issues/519 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- docs/formatdomain.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index cd9cb02bf8..9787933d4d 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2634,6 +2634,12 @@ paravirtualized driver is specified via the ``disk`` element. </source> <target dev='sdb' bus='scsi'/> </disk> + <disk type='dir' device='floppy'> + <driver name='qemu' type='fat'/> + <source dir='/var/somefiles'> + <target dev='fda'/> + <readonly/> + </disk> <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='iscsi-pool' volume='unit:0:0:1' mode='host'/> @@ -2757,6 +2763,18 @@ paravirtualized driver is specified via the ``disk`` element. ``dir`` The ``dir`` attribute specifies the fully-qualified path to the directory to use as the disk. :since:`Since 0.7.5` + + Note that most hypervisors that support ``dir`` disks do that by exposing + an emulated block device with an emulated filesystem populated with + contents of the configured directory. As guest operating system may cache + the filesystem metadata, outside changes to the directory may not appear + in the guest and/or may result in corrupted data being observable from + the VM. + + The format of the emulated filesystem is controlled by the ``format`` + attribute of the ``<driver>`` driver element. Currently only the ``fat`` + format is supported. Hypervisors may only support ``<readonly/>`` mode. + ``network`` The ``protocol`` attribute specifies the protocol to access to the requested image. Possible values are "nbd", "iscsi", "rbd", "sheepdog", -- 2.41.0

3 2

[PATCH (pushed)] qemucapabilitiesdata: Final update of capability test data for qemu-8.1.0 release
by Peter Krempa 25 Aug '23

25 Aug '23

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed as trivial. tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies | 6 +++--- tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index e6cc5da1c4..c28073c16c 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 94, - "minor": 0, + "micro": 0, + "minor": 1, "major": 8 }, - "package": "v8.1.0-rc4" + "package": "v8.1.0" }, "id": "libvirt-2" } diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index 313af6a00e..0a9b5d3b46 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -204,9 +204,9 @@ <flag name='rbd-encryption-luks-any'/> <flag name='qcow2-discard-no-unref'/> <flag name='run-with.async-teardown'/> - <version>8000094</version> + <version>8001000</version> <microcodeVersion>43100245</microcodeVersion> - <package>v8.1.0-rc4</package> + <package>v8.1.0</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='avx-ne-convert' type='boolean' value='false'/> -- 2.41.0

1 0

[PATCH v2 0/2] add support for discard_granularity
by Kristina Hanicova 25 Aug '23

25 Aug '23

This is v2 (or rather the first 2 patches) of: https://listman.redhat.com/archives/libvir-list/2023-August/241076.html diff to v1: * added ABI stability check (noticed by Peter) * splitting the series into two parts Kristina Hanicova (2): conf: add support for discard_granularity qemu: add support for discard_granularity docs/formatdomain.rst | 6 +++++- src/conf/domain_conf.c | 19 ++++++++++++++++++- src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 3 ++- src/conf/schemas/domaincommon.rng | 5 +++++ src/qemu/qemu_command.c | 2 ++ src/qemu/qemu_domain.c | 2 ++ src/vz/vz_utils.c | 3 ++- .../disk-blockio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 2 +- 10 files changed, 39 insertions(+), 6 deletions(-) -- 2.41.0

2 4

[PATCH] virsh-network: Drop unused variables in cmdNetworkMetadata()
by Michal Privoznik 25 Aug '23

25 Aug '23

In one of recent commits two variable were introduced (@ctxt and @doc) that are not used. This breaks a build with clang who's able to identify that. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build breaker rules. tools/virsh-network.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index f9fea0a126..5655254699 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -597,7 +597,6 @@ static bool cmdNetworkMetadata(vshControl *ctl, const vshCmd *cmd) { g_autoptr(virshNetwork) net = NULL; - g_autoptr(xmlXPathContext) ctxt = NULL; bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); @@ -661,7 +660,7 @@ cmdNetworkMetadata(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, "%s\n", _("Metadata modified")); } else { g_autofree char *data = NULL; - g_autoptr(xmlDoc) doc = NULL; + /* get */ if (!(data = virNetworkGetMetadata(net, VIR_NETWORK_METADATA_ELEMENT, uri, flags))) -- 2.41.0

1 0

[PATCH 00/27] Move error messages onto a single line
by Michal Privoznik 25 Aug '23

25 Aug '23

This is inspired by the following discussion: https://listman.redhat.com/archives/libvir-list/2023-August/241361.html And ideally I'd present a green pipeline but for some reason, I can't: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/981105262 But the problem is not with my code rather than our CI. Michal Prívozník (27): bhyve: Move error messages onto a single line ch: Move error messages onto a single line conf: Move error messages onto a single line cpu: Move error messages onto a single line esx: Move error messages onto a single line hypervisor: Move error messages onto a single line libxl: Move error messages onto a single line locking: Move error messages onto a single line lxc: Move error messages onto a single line network: Move error messages onto a single line node_device: Move error messages onto a single line nwfilter: Move error messages onto a single line openvz: Move error messages onto a single line qemu: Move error messages onto a single line remote: Move error messages onto a single line rpc: Move error messages onto a single line security: Move error messages onto a single line storage: Move error messages onto a single line storage_file: Move error messages onto a single line test: Move error messages onto a single line util: Move error messages onto a single line vbox: Move error messages onto a single line vmware: Move error messages onto a single line vmx: Move error messages onto a single line vz: Move error messages onto a single line src: Move error messages onto a single line tools: Move error messages onto a single line src/bhyve/bhyve_command.c | 31 +-- src/bhyve/bhyve_domain.c | 3 +- src/bhyve/bhyve_driver.c | 3 +- src/ch/ch_driver.c | 3 +- src/ch/ch_monitor.c | 3 +- src/conf/cpu_conf.c | 9 +- src/conf/domain_addr.c | 3 +- src/conf/domain_conf.c | 138 ++++-------- src/conf/domain_validate.c | 54 ++--- src/conf/netdev_bandwidth_conf.c | 3 +- src/conf/netdev_vlan_conf.c | 6 +- src/conf/network_conf.c | 27 +-- src/conf/node_device_conf.c | 3 +- src/conf/node_device_util.c | 3 +- src/conf/numa_conf.c | 25 +-- src/conf/nwfilter_params.c | 6 +- src/conf/snapshot_conf.c | 3 +- src/conf/storage_adapter_conf.c | 18 +- src/conf/virdomainjob.c | 3 +- src/conf/virnetworkobj.c | 3 +- src/cpu/cpu_x86.c | 6 +- src/esx/esx_driver.c | 21 +- src/esx/esx_network_driver.c | 3 +- src/esx/esx_storage_backend_vmfs.c | 3 +- src/esx/esx_util.c | 3 +- src/esx/esx_vi.c | 19 +- src/esx/esx_vi_types.c | 3 +- src/hypervisor/domain_cgroup.c | 3 +- src/hypervisor/virhostdev.c | 9 +- src/libvirt-domain.c | 54 ++--- src/libxl/libxl_conf.c | 12 +- src/libxl/libxl_driver.c | 6 +- src/libxl/libxl_migration.c | 11 +- src/locking/lock_driver_sanlock.c | 3 +- src/lxc/lxc_container.c | 3 +- src/lxc/lxc_driver.c | 3 +- src/lxc/lxc_native.c | 3 +- src/lxc/lxc_process.c | 3 +- src/network/bridge_driver.c | 14 +- src/network/bridge_driver_linux.c | 10 +- src/node_device/node_device_udev.c | 3 +- src/nwfilter/nwfilter_dhcpsnoop.c | 12 +- src/nwfilter/nwfilter_learnipaddr.c | 8 +- src/openvz/openvz_driver.c | 3 +- src/qemu/qemu_agent.c | 18 +- src/qemu/qemu_capabilities.c | 45 ++-- src/qemu/qemu_command.c | 42 ++-- src/qemu/qemu_conf.c | 5 +- src/qemu/qemu_domain.c | 51 ++--- src/qemu/qemu_domain_address.c | 15 +- src/qemu/qemu_driver.c | 120 ++++------ src/qemu/qemu_hostdev.c | 3 +- src/qemu/qemu_hotplug.c | 18 +- src/qemu/qemu_migration.c | 48 ++-- src/qemu/qemu_migration_params.c | 6 +- src/qemu/qemu_monitor.c | 3 +- src/qemu/qemu_monitor_json.c | 102 +++------ src/qemu/qemu_process.c | 20 +- src/qemu/qemu_snapshot.c | 27 +-- src/qemu/qemu_tpm.c | 4 +- src/qemu/qemu_validate.c | 209 ++++++------------ src/remote/remote_daemon.c | 3 +- src/remote/remote_driver.c | 27 +-- src/remote/remote_sockets.c | 3 +- src/rpc/virnetclient.c | 9 +- src/rpc/virnetlibsshsession.c | 28 +-- src/rpc/virnetserver.c | 9 +- src/rpc/virnetserverclient.c | 3 +- src/rpc/virnetsshsession.c | 45 ++-- src/rpc/virnettlscontext.c | 6 +- src/security/security_dac.c | 3 +- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 3 +- src/storage/storage_backend_zfs.c | 3 +- src/storage/storage_driver.c | 21 +- src/storage/storage_util.c | 48 ++-- src/storage_file/storage_source.c | 3 +- .../storage_source_backingstore.c | 36 +-- src/test/test_driver.c | 39 ++-- src/util/vircgroupv2devices.c | 13 +- src/util/vircommand.c | 3 +- src/util/virfile.c | 3 +- src/util/virhostcpu.c | 3 +- src/util/virhostmem.c | 6 +- src/util/virjson.c | 3 +- src/util/virmdev.c | 3 +- src/util/virnetdev.c | 12 +- src/util/virnetdevbandwidth.c | 6 +- src/util/virnetdevopenvswitch.c | 6 +- src/util/virnetdevvportprofile.c | 6 +- src/util/virnetlink.c | 3 +- src/util/virnuma.c | 6 +- src/util/virpci.c | 3 +- src/util/virprocess.c | 9 +- src/util/virqemu.c | 3 +- src/util/virresctrl.c | 9 +- src/util/virthreadpool.c | 3 +- src/vbox/vbox_snapshot_conf.c | 6 +- src/vmware/vmware_conf.c | 9 +- src/vmware/vmware_driver.c | 6 +- src/vmx/vmx.c | 21 +- src/vz/vz_driver.c | 15 +- src/vz/vz_sdk.c | 135 ++++------- src/vz/vz_utils.c | 66 ++---- tools/virsh-domain-event.c | 15 +- tools/virsh-domain.c | 36 +-- tools/virsh-host.c | 9 +- tools/virsh-network.c | 6 +- tools/virsh-nodedev.c | 3 +- tools/virsh-pool.c | 3 +- tools/virsh.c | 9 +- tools/virt-admin.c | 21 +- tools/virt-host-validate-ch.c | 12 +- tools/virt-host-validate-qemu.c | 15 +- tools/vsh.c | 12 +- 115 files changed, 689 insertions(+), 1403 deletions(-) -- 2.41.0

3 29

[libvirt PATCH 0/2] Document basic VFIO variant driver support
by Laine Stump 25 Aug '23

25 Aug '23

update the manpage for the virsh nodedev-detach --driver option, and add a blurb to the NEWS file for the upcoming release Laine Stump (2): docs: update description of virsh nodedev-detach --driver option NEWS: document support for VFIO variant drivers NEWS.rst | 11 +++++++++++ docs/manpages/virsh.rst | 25 +++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) -- 2.41.0

2 3

[PING] Patches Pending review
by K Shiva Kiran 25 Aug '23

25 Aug '23

A gentle reminder, the following patch set has been pending review since 9 days. Link to Patch set: https://listman.redhat.com/archives/libvir-list/2023-August/241250.html Thanks

1 0

[libvirt PATCH 0/2] ci: Some build.sh fixes
by Andrea Bolognani 25 Aug '23

25 Aug '23

Initially reported in https://listman.redhat.com/archives/libvir-list/2023-August/241307.html Andrea Bolognani (2): ci: Fix precedence between arguments passed to meson ci: Fix quoting and option name ci/build.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -- 2.41.0

2 3

[libvirt PATCH v2 0/2] reword and add external snapshot related capabilities
by Pavel Hrdina 24 Aug '23

24 Aug '23

Pavel Hrdina (2): capabilities: reword disksnapshot feature to mention creating snapshots capabilities: report full external snapshot support docs/formatcaps.rst | 12 +++++++++--- src/conf/capabilities.c | 1 + src/conf/capabilities.h | 1 + src/conf/schemas/capability.rng | 5 +++++ src/qemu/qemu_capabilities.c | 1 + tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml | 1 + tests/qemucaps2xmloutdata/caps.aarch64.xml | 1 + tests/qemucaps2xmloutdata/caps.ppc.xml | 1 + tests/qemucaps2xmloutdata/caps.ppc64.xml | 1 + tests/qemucaps2xmloutdata/caps.riscv64.xml | 1 + tests/qemucaps2xmloutdata/caps.s390x.xml | 1 + tests/qemucaps2xmloutdata/caps.sparc.xml | 1 + tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml | 1 + tests/qemucaps2xmloutdata/caps.x86_64.xml | 1 + 14 files changed, 26 insertions(+), 3 deletions(-) -- 2.41.0

2 4

[libvirt PATCH] capabilities: report full external snapshot support
by Pavel Hrdina 24 Aug '23

24 Aug '23

Now that deleting and reverting external snapshots is implemented we can report that in capabilities so management applications can use that information and start using external snapshots. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- docs/formatcaps.rst | 6 ++++++ src/conf/capabilities.c | 1 + src/conf/capabilities.h | 1 + src/conf/schemas/capability.rng | 5 +++++ src/qemu/qemu_capabilities.c | 1 + tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml | 1 + tests/qemucaps2xmloutdata/caps.aarch64.xml | 1 + tests/qemucaps2xmloutdata/caps.ppc.xml | 1 + tests/qemucaps2xmloutdata/caps.ppc64.xml | 1 + tests/qemucaps2xmloutdata/caps.riscv64.xml | 1 + tests/qemucaps2xmloutdata/caps.s390x.xml | 1 + tests/qemucaps2xmloutdata/caps.sparc.xml | 1 + tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml | 1 + tests/qemucaps2xmloutdata/caps.x86_64.xml | 1 + 14 files changed, 23 insertions(+) diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst index f7e5342654..0e056914b8 100644 --- a/docs/formatcaps.rst +++ b/docs/formatcaps.rst @@ -134,6 +134,11 @@ The ``<guest/>`` element will typically wrap up the following elements: external disk snapshots are supported. If absent, external snapshots may still be supported, but it requires attempting the API and checking for an error to find out for sure. :since:`Since 1.2.3` + ``externalSnapshot`` + If this element is present, the hypervisor supports creating, deleting and + reverting external snapshots including memory state and management + applications can switch from internal snapshots to external snapshots. + :since:`Since 9.7.0` Examples ~~~~~~~~ @@ -318,6 +323,7 @@ capabilities enabled in the chip and BIOS you will see: <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 56768ce6e0..34f04cb7d3 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -508,6 +508,7 @@ static const struct virCapsGuestFeatureInfo virCapsGuestFeatureInfos[VIR_CAPS_GU [VIR_CAPS_GUEST_FEATURE_TYPE_DEVICEBOOT] = { "deviceboot", false }, [VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT] = { "disksnapshot", true }, [VIR_CAPS_GUEST_FEATURE_TYPE_HAP] = { "hap", true }, + [VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT] = { "externalSnapshot", false }, }; diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index c78e3e52fa..9eaf6e2807 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -40,6 +40,7 @@ typedef enum { VIR_CAPS_GUEST_FEATURE_TYPE_DEVICEBOOT, VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT, VIR_CAPS_GUEST_FEATURE_TYPE_HAP, + VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT, VIR_CAPS_GUEST_FEATURE_TYPE_LAST } virCapsGuestFeatureType; diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng index 83b414961a..b1968df258 100644 --- a/src/conf/schemas/capability.rng +++ b/src/conf/schemas/capability.rng @@ -493,6 +493,11 @@ <empty/> </element> </optional> + <optional> + <element name="externalSnapshot"> + <empty/> + </element> + </optional> </interleave> </element> </define> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 40eacf0f4d..05cc11218a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1121,6 +1121,7 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps, virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_DEVICEBOOT); virCapabilitiesAddGuestFeatureWithToggle(guest, VIR_CAPS_GUEST_FEATURE_TYPE_DISKSNAPSHOT, true, false); + virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_EXTERNAL_SNAPSHOT); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) { virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU, diff --git a/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml b/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml index b53a886b90..b9a5b5a1d6 100644 --- a/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml +++ b/tests/qemucaps2xmloutdata/caps.aarch64+hvf.xml @@ -21,6 +21,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.aarch64.xml b/tests/qemucaps2xmloutdata/caps.aarch64.xml index 5dca6d3102..61512ed740 100644 --- a/tests/qemucaps2xmloutdata/caps.aarch64.xml +++ b/tests/qemucaps2xmloutdata/caps.aarch64.xml @@ -21,6 +21,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.ppc.xml b/tests/qemucaps2xmloutdata/caps.ppc.xml index e7ba391795..86d6b85ae0 100644 --- a/tests/qemucaps2xmloutdata/caps.ppc.xml +++ b/tests/qemucaps2xmloutdata/caps.ppc.xml @@ -19,6 +19,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.ppc64.xml b/tests/qemucaps2xmloutdata/caps.ppc64.xml index 85623f3980..90859f9594 100644 --- a/tests/qemucaps2xmloutdata/caps.ppc64.xml +++ b/tests/qemucaps2xmloutdata/caps.ppc64.xml @@ -20,6 +20,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.riscv64.xml b/tests/qemucaps2xmloutdata/caps.riscv64.xml index 09b7eb7f2f..c6fa950211 100644 --- a/tests/qemucaps2xmloutdata/caps.riscv64.xml +++ b/tests/qemucaps2xmloutdata/caps.riscv64.xml @@ -19,6 +19,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.s390x.xml b/tests/qemucaps2xmloutdata/caps.s390x.xml index bb82a15040..6379ab73e6 100644 --- a/tests/qemucaps2xmloutdata/caps.s390x.xml +++ b/tests/qemucaps2xmloutdata/caps.s390x.xml @@ -20,6 +20,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.sparc.xml b/tests/qemucaps2xmloutdata/caps.sparc.xml index 9d977c4102..b5b158e430 100644 --- a/tests/qemucaps2xmloutdata/caps.sparc.xml +++ b/tests/qemucaps2xmloutdata/caps.sparc.xml @@ -19,6 +19,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml b/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml index 356819a6c6..f5e49ba4db 100644 --- a/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml +++ b/tests/qemucaps2xmloutdata/caps.x86_64+hvf.xml @@ -22,6 +22,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> diff --git a/tests/qemucaps2xmloutdata/caps.x86_64.xml b/tests/qemucaps2xmloutdata/caps.x86_64.xml index 35359780c4..8dd1439a80 100644 --- a/tests/qemucaps2xmloutdata/caps.x86_64.xml +++ b/tests/qemucaps2xmloutdata/caps.x86_64.xml @@ -22,6 +22,7 @@ <cpuselection/> <deviceboot/> <disksnapshot default='on' toggle='no'/> + <externalSnapshot/> </features> </guest> -- 2.41.0

2 2

[libvirt PATCH 00/20] ci: Move GitLab build recipes to a standalone script
by Erik Skultety 24 Aug '23

24 Aug '23

This is a follow up to: https://listman.redhat.com/archives/libvir-list/2023-January/237201.html The effort here is to unify the way builds/tests are executed in GitLab CI vs local container executions and make another step forward in terms of reproducibility of (specifically) GitLab environments. Even though code to run all but one (coverity) jobs from GitLab via the build.sh script is added with this series, local behavior remains the same as before this series. The reason for that is that that will require more patches ridding of the Makefile which is currently used and instead integrate usage of lcitool with the ci/helper Python script which is currently the entry point for local container executions. Pipeline: https://gitlab.com/eskultety/libvirt/-/pipelines/768645158 Ubuntu is having some repo connection issues today, so the one failed ^job can be ignored Erik Skultety (20): gitlab-ci.yml: Replace all explicit calls to ninja with meson commands gitlab-ci.yml: potfile: Consolidate the meson compile calls gitlab-ci.yml: Use $HOME for rpmbuild's topdir instead of PWD ci: build.sh: Drop the commentary about CI_BUILD_SCRIPT ci: build.sh: Use 'meson setup' explicitly ci: build.sh: Always assume -Dsystem=true ci: build.sh: Drop the CI prefix from the CI_{MESON,NINJA}_ARGS vars ci: build.sh: Move off of ninja command to directly calling meson ci: build.sh: Join MESON_ARGS and MESON_OPTS ci: build.sh: Break the script functionality into helper functions ci: build.sh: Move the necessary env variables to build.sh ci: build.sh: Add support for individual GitLab jobs ci: build.sh: Wire up the individual job functions to the CLI ci: build.sh: Document CI_CONT_SRCDIR ci: build.sh: Make the build script fail ASAP with 'set -e' ci: build.sh: Update git index in local container environments on 'dist' ci: build.sh: Make the script executable gitlab-ci.yml: Add 'after_script' stage to prep for artifact collection gitlab-ci.yml: Adopt job execution via a Bash script gitlab-ci.yml: Drop the usage of script variables reference .gitlab-ci.yml | 56 ++++++++++------------- ci/Makefile | 16 ++++--- ci/build.sh | 121 +++++++++++++++++++++++++++++++++++++++++++------ ci/helper | 21 ++++++--- 4 files changed, 155 insertions(+), 59 deletions(-) mode change 100644 => 100755 ci/build.sh -- 2.39.1

3 40

[PATCH 0/5] qemuxml2xmltest: Finish modernization of few last forgotten cases
by Peter Krempa 24 Aug '23

24 Aug '23

Peter Krempa (5): qemuxml2xmltest: Rework file name generation in 'testInfoSetPaths' qemuxml2xmltest: Use DO_TEST_CAPS_ARCH_LATEST_FULL for arm GIC tests qemuxml2argvtest: Pass expected state via struct testQemuInfo's 'flags' member qemuxml2xmltest: Modernize rest of 'seclabel-*' tests qemuxml2xmltest: Merge DO_TEST macro into DO_TEST_CAPS_INTERNAL ...amic-baselabel-inactive.x86_64-latest.xml} | 5 +- ...amic-labelskip-inactive.x86_64-latest.xml} | 5 +- ...c-none-relabel-inactive.x86_64-latest.xml} | 5 +- ...namic-override-inactive.x86_64-latest.xml} | 5 +- ...ynamic-relabel-inactive.x86_64-latest.xml} | 5 +- tests/qemuxml2xmltest.c | 149 ++++++------------ tests/testutilsqemu.h | 1 + 7 files changed, 73 insertions(+), 102 deletions(-) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-baselabel-inactive.xml => seclabel-dynamic-baselabel-inactive.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-labelskip-inactive.xml => seclabel-dynamic-labelskip-inactive.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none-relabel-inactive.xml => seclabel-dynamic-none-relabel-inactive.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-override-inactive.xml => seclabel-dynamic-override-inactive.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-relabel-inactive.xml => seclabel-dynamic-relabel-inactive.x86_64-latest.xml} (89%) -- 2.41.0

2 6

[PATCH 0/2] virschematest: Fix schema coverage of 'ch' driver's tests
by Peter Krempa 24 Aug '23

24 Aug '23

Peter Krempa (2): tests: chxml2xmlin: Fix path format for fake paths virschematest: Validate files in 'chxml2xmlin' and 'chxml2xmlout' directories tests/chxml2xmlin/basic.xml | 4 ++-- tests/virschematest.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.41.0

2 3

[PATCH 0/6] Fix one corner case when parsing 'mdevctl' output
by Michal Privoznik 24 Aug '23

24 Aug '23

See 2/6 for explanation. Michal Prívozník (6): nodedevmdevctltest: Rename mdevctl-list-empty test case nodeDeviceParseMdevctlJSON: Accept empty string nodedevmdevctltest: Introduce a test case for empty mdevctl output node_device_driver: Deduplicate mediated devices listing virMdevctlList: Don't check for !output virjsontest: Introduce a test case for an empty array src/node_device/node_device_driver.c | 40 ++++++------------- .../mdevctl-list-empty-array.json | 1 + .../mdevctl-list-empty-array.out.xml | 0 .../mdevctl-list-empty.json | 1 - tests/nodedevmdevctltest.c | 1 + tests/virjsontest.c | 1 + 6 files changed, 16 insertions(+), 28 deletions(-) create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty-array.json create mode 100644 tests/nodedevmdevctldata/mdevctl-list-empty-array.out.xml -- 2.41.0

2 8

[PATCH] conf: add virDomainDiskBlockIoCheckABIStability()
by Kristina Hanicova 24 Aug '23

24 Aug '23

Add missing ABI stability check for blockio properties for disk devices. Signed-off-by: Kristina Hanicova <khanicov(a)redhat.com> --- src/conf/domain_conf.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 2e60927799..71bd49bf95 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19775,6 +19775,28 @@ virDomainVirtioOptionsCheckABIStability(virDomainVirtioOptions *src, } +static bool +virDomainDiskBlockIoCheckABIStability(virDomainDiskDef *src, + virDomainDiskDef *dst) +{ + if (src->blockio.logical_block_size != dst->blockio.logical_block_size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target disk logical_block_size %1$u does not match source %2$u"), + dst->blockio.logical_block_size, src->blockio.logical_block_size); + return false; + } + + if (src->blockio.physical_block_size != dst->blockio.physical_block_size) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target disk physical_block_size %1$u does not match source %2$u"), + dst->blockio.physical_block_size, src->blockio.physical_block_size); + return false; + } + return true; +} + + + static bool virDomainDiskDefCheckABIStability(virDomainDiskDef *src, virDomainDiskDef *dst) @@ -19858,6 +19880,9 @@ virDomainDiskDefCheckABIStability(virDomainDiskDef *src, if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) return false; + if (!virDomainDiskBlockIoCheckABIStability(src, dst)) + return false; + return true; } -- 2.41.0

2 1

[PATCH v2 0/5] Improve closing of FDs for child processes
by Michal Privoznik 24 Aug '23

24 Aug '23

This is a v2 of: https://listman.redhat.com/archives/libvir-list/2023-June/240351.html Hopefully, I've implemented all Dan's suggestions. Michal Prívozník (5): virfile: Introduce virCloseRange() virfile: Introduce virCloseFrom() vircommand: Unify mass FD closing vircommand: Introduce virCommandMassCloseRange() src: Detect close_range syscall during virGlobalInit() src/libvirt.c | 4 + src/libvirt_private.syms | 4 + src/util/vircommand.c | 160 ++++++++++++++++++++++++--------------- src/util/virfile.c | 110 +++++++++++++++++++++++++++ src/util/virfile.h | 5 ++ tests/commandtest.c | 2 + 6 files changed, 222 insertions(+), 63 deletions(-) -- 2.41.0

3 8

[libvirt PATCH v3 0/8] Support for VFIO variant drivers, Part 1
by Laine Stump 24 Aug '23

24 Aug '23

A "VFIO variant" driver is a kernel driver for a device that supports all the APIs of the basic vfio-pci driver (which enables assigning a host PCI device to a QEMU guest) plus "some extra stuff" (e.g. to enable things like saving/restoring device state in order to support live migration.) Way back last year I posted a couple attempts to support VFIO variant drivers; here is V2 (along with a later followup discussion from a couple months ago): https://listman.redhat.com/archives/libvir-list/2022-August/233661.html https://listman.redhat.com/archives/libvir-list/2023-May/240108.html The mlx5-vfio-pci driver has now been upstream for quite awhile (and even in the downstream Fedora 38 kernel, for example), as are the sysfs bits that allow us to determine whether or not a driver is a VFIO variant, and I've updated the patch(es) to use this. I've also been working on auto-binding to the "best-match" VFIO variant driver based on comparing the device's modalias file in sysfs to the contents of the kernel's modules.alias file, but that isn't quite ready (partly code that isn't yet working, but also partly indecision about exactly where in the XML to put the driver name when it is specified; I won't take up more space here with that though). In the meantime, there are people who want to use the mlx5-vfio-pci driver (and Cedric Le Goater also has written vfio-pci-igbvf and vfio-pci-e1000e drivers (which area very useful for testing), although I don't think he has posted them anywhere yet), so I would like to get the basic patches here merged in upstream now while I continue working on "Part 2". These patches provide two improvements that make testing/using VFIO drivers much more convenient: 1) The specific driver can be given in the virsh nodedev-detach command (or the virNodeDeviceDetachFlags() API call), e.g.: virsh nodedev-detach pci_0000_04_11_5 --driver vfio-pci-igbvf 2) If the <hostdev> (or "<interface> ... <type='hostdev'/>" has "managed='no'", then libvirt will recognize any VFIO variant driver (rather than the current behavior of rejecting anything that isn't exactly "vfio-pci") With these two capabilities, it's simple and straightforward to bind a device to a VFIO variant driver, and then start a guest that uses that device. Change in V2: * complete remake, more refactoring * use existence of "vfio-dev" subdirectory of device directory in sysfs to determine whether the currently-bound driver is a vfio variant. * support binding to a user-specified driver during nodedev-detach, rather than only supporting vfio-pci. Laine Stump (8): util: use "stubDriverType" instead of just "stubDriver" util: add stub driver name to virPCIDevice object util: rename virPCIDeviceGetDriverPathAndName util: permit existing binding to VFIO variant driver util: probe stub driver from within function that binds to stub driver util: honor stubDriverName when probing/binding stub driver for a device node_device: support binding other drivers with virNodeDeviceDetachFlags() qemu: turn two multiline log messages into single line src/hypervisor/domain_driver.c | 9 +- src/hypervisor/domain_driver.h | 2 + src/hypervisor/virhostdev.c | 35 +++----- src/libvirt_private.syms | 9 +- src/libxl/libxl_driver.c | 3 +- src/qemu/qemu_driver.c | 37 ++++---- src/util/virnvme.c | 2 +- src/util/virpci.c | 156 +++++++++++++++++++++++++-------- src/util/virpci.h | 18 ++-- tests/virhostdevtest.c | 2 +- tests/virpcitest.c | 10 +-- 11 files changed, 185 insertions(+), 98 deletions(-) -- 2.41.0

3 19

[libvirt PATCH v6 00/36] Use nbdkit for http/ftp/ssh network drives in libvirt
by Jonathon Jongsma 23 Aug '23

23 Aug '23

This is the sixth version of this patch series. See https://bugzilla.redhat.com/show_bug.cgi?id=2016527 for more information about the goal, but the summary is that RHEL does not want to ship the qemu storage plugins for curl and ssh. Handling them outside of the qemu process provides several advantages such as reduced attack surface and stability. Pretty much all of the patches have already been reviewed by Peter but I have been waiting for selinux policy changes before pushing it upstream. The selinux changes are not fully done, but there is a new policy in development that has allowed me to run with selinux in enforcing mode for the common cases. See https://bugzilla.redhat.com/show_bug.cgi?id=2182505 for more information. For me, the following scenarios work now with selinux enabled using the selinux policy from that bug: - http/https disks - ssh disks with password authentication - ssh disks with passwordless keyfile The one major thing that doesn't work and is difficult to get working with selinux enabled is the ssh-agent. This is because there doesn't seem to be any selinux policy for ssh-agent, so by default the ssh-agent socket is labeled unconfined_t. We cannot allow access from the libvirt/qemu to unconfined_t because that would open up access to just about anything on the host. So additional work will likely be necessary for ssh-agent/libvirt interaction in the future. Fortunately ssh-agent is something that never was really supported with the old qemu block driver either, so I think we could potentially merge this patchset either without the ssh-agent patches or with a note that ssh-agent won't work with selinux enabled. Note also that gitlab CI will not work for this series without changes to the ci definitions due to the addition of libnbd dependency. It also will require changes to selinux policy to enable nbdkit to execute in the proper context. Changes in v6: - rebased to latest master - slightly improved error reporting - removed polling fallback if pidfd_open is unavailable - split ssh-agent feature into separate patches - other smaller changes suggested by Peter in v5 Jonathon Jongsma (36): schema: allow 'ssh' as a protocol for network disks qemu: Add functions for determining nbdkit availability qemu: expand nbdkit capabilities util: Allow virFileCache data to be any GObject qemu: implement basic virFileCache for nbdkit caps qemu: implement persistent file cache for nbdkit caps qemu: use file cache for nbdkit caps qemu: Add qemuNbdkitProcess qemu: query nbdkit module dir from binary qemu: add functions to start and stop nbdkit qemu: remove unused 'mode' param from qemuDomainLogContextNew() Generalize qemuDomainLogContextNew() qemu: Extract qemuDomainLogContext into a new file qemu: move qemuProcessReadLog() to qemuLogContext qemu: log error output from nbdkit tests: add ability to test various nbdkit capabilities qemu: split qemuDomainSecretStorageSourcePrepare qemu: include nbdkit state in private xml util: secure erase virCommand send buffers qemu: pass sensitive data to nbdkit via pipe qemu: use nbdkit to serve network disks if available util: make virCommandSetSendBuffer testable tests: add tests for nbdkit invocation qemu: add test for authenticating a https network disk qemu: Monitor nbdkit process for exit qemu: try to connect to nbdkit early to detect errors schema: add password configuration for ssh disk qemu: implement password auth for ssh disks with nbdkit schema: add configuration for host verification of ssh disks qemu: implement knownHosts for ssh disks with nbdkit schema: add keyfile configuration for ssh disks qemu: implement keyfile auth for ssh disks with nbdkit schema: add ssh-agent configuration for ssh disks qemu: implement ssh-agent auth for ssh disks with nbdkit run: add ability to set selinux context rpm: update spec file for for nbdkit support build-aux/syntax-check.mk | 2 +- docs/formatdomain.rst | 45 +- libvirt.spec.in | 8 + meson.build | 14 + meson_options.txt | 1 + po/POTFILES | 2 + run.in | 100 +- src/conf/domain_conf.c | 33 + src/conf/schemas/domaincommon.rng | 55 + src/conf/storage_source_conf.c | 3 + src/conf/storage_source_conf.h | 6 +- src/libvirt_private.syms | 1 + src/qemu/meson.build | 3 + src/qemu/qemu_block.c | 162 ++- src/qemu/qemu_conf.c | 22 + src/qemu/qemu_conf.h | 6 + src/qemu/qemu_domain.c | 439 +++--- src/qemu/qemu_domain.h | 37 +- src/qemu/qemu_driver.c | 3 + src/qemu/qemu_extdevice.c | 62 + src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_logcontext.c | 329 +++++ src/qemu/qemu_logcontext.h | 41 + src/qemu/qemu_nbdkit.c | 1280 +++++++++++++++++ src/qemu/qemu_nbdkit.h | 115 ++ src/qemu/qemu_nbdkitpriv.h | 31 + src/qemu/qemu_process.c | 114 +- src/util/vircommand.c | 19 +- src/util/vircommand.h | 8 + src/util/vircommandpriv.h | 4 + src/util/virfilecache.c | 14 +- src/util/virfilecache.h | 2 +- tests/meson.build | 1 + tests/qemublocktest.c | 2 +- ...w2-invalid.json => network-ssh-qcow2.json} | 0 ...cow2-invalid.xml => network-ssh-qcow2.xml} | 0 .../disk-cdrom-network.args.disk0 | 6 + .../disk-cdrom-network.args.disk1 | 8 + .../disk-cdrom-network.args.disk1.pipe.778 | 1 + .../disk-cdrom-network.args.disk2 | 8 + .../disk-cdrom-network.args.disk2.pipe.780 | 1 + .../disk-network-http.args.disk0 | 6 + .../disk-network-http.args.disk1 | 5 + .../disk-network-http.args.disk2 | 6 + .../disk-network-http.args.disk2.pipe.778 | 1 + .../disk-network-http.args.disk3 | 7 + .../disk-network-http.args.disk3.pipe.780 | 1 + ...work-source-curl-nbdkit-backing.args.disk0 | 7 + ...ce-curl-nbdkit-backing.args.disk0.pipe.778 | 1 + .../disk-network-source-curl.args.disk0 | 7 + ...sk-network-source-curl.args.disk0.pipe.778 | 1 + .../disk-network-source-curl.args.disk1 | 9 + ...sk-network-source-curl.args.disk1.pipe.780 | 1 + ...sk-network-source-curl.args.disk1.pipe.782 | 1 + .../disk-network-source-curl.args.disk2 | 7 + ...sk-network-source-curl.args.disk2.pipe.782 | 1 + ...sk-network-source-curl.args.disk2.pipe.784 | 1 + .../disk-network-source-curl.args.disk3 | 6 + .../disk-network-source-curl.args.disk4 | 6 + .../disk-network-ssh-key.args.disk0 | 9 + .../disk-network-ssh-key.args.disk1 | 9 + .../disk-network-ssh-password.args.disk0 | 9 + ...k-network-ssh-password.args.disk0.pipe.778 | 1 + .../disk-network-ssh.args.disk0 | 7 + .../disk-network-ssh.args.disk1 | 8 + .../disk-network-ssh.args.disk1.pipe.778 | 1 + .../disk-network-ssh.args.disk2 | 9 + tests/qemunbdkittest.c | 310 ++++ tests/qemustatusxml2xmldata/modern-in.xml | 4 + ...sk-cdrom-network-nbdkit.x86_64-latest.args | 42 + .../disk-cdrom-network-nbdkit.xml | 1 + ...isk-network-http-nbdkit.x86_64-latest.args | 44 + .../disk-network-http-nbdkit.xml | 1 + ...rce-curl-nbdkit-backing.x86_64-latest.args | 37 + ...isk-network-source-curl-nbdkit-backing.xml | 45 + ...work-source-curl-nbdkit.x86_64-latest.args | 49 + .../disk-network-source-curl-nbdkit.xml | 1 + ...isk-network-source-curl.x86_64-latest.args | 53 + .../disk-network-source-curl.xml | 74 + .../qemuxml2argvdata/disk-network-ssh-key.xml | 44 + ...disk-network-ssh-nbdkit.x86_64-latest.args | 35 + .../disk-network-ssh-nbdkit.xml | 1 + ...sk-network-ssh-password.x86_64-latest.args | 35 + .../disk-network-ssh-password.xml | 35 + .../disk-network-ssh.x86_64-latest.args | 35 + tests/qemuxml2argvdata/disk-network-ssh.xml | 32 + tests/qemuxml2argvtest.c | 19 + tests/testutilsqemu.c | 26 + tests/testutilsqemu.h | 4 + 89 files changed, 3545 insertions(+), 504 deletions(-) create mode 100644 src/qemu/qemu_logcontext.c create mode 100644 src/qemu/qemu_logcontext.h create mode 100644 src/qemu/qemu_nbdkit.c create mode 100644 src/qemu/qemu_nbdkit.h create mode 100644 src/qemu/qemu_nbdkitpriv.h rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.json => network-ssh-qcow2.json} (100%) rename tests/qemublocktestdata/imagecreate/{network-ssh-qcow2-invalid.xml => network-ssh-qcow2.xml} (100%) create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk1.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-cdrom-network.args.disk2.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk2.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-http.args.disk3.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl-nbdkit-backing.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.780 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk1.pipe.782 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.782 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk2.pipe.784 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk3 create mode 100644 tests/qemunbdkitdata/disk-network-source-curl.args.disk4 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-key.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh-password.args.disk0.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk0 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk1.pipe.778 create mode 100644 tests/qemunbdkitdata/disk-network-ssh.args.disk2 create mode 100644 tests/qemunbdkittest.c create mode 100644 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-cdrom-network-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-http-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-http-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit-backing.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-source-curl-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-source-curl.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-key.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.x86_64-latest.args create mode 120000 tests/qemuxml2argvdata/disk-network-ssh-nbdkit.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh-password.xml create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-ssh.xml -- 2.41.0

3 46

[PATCH] qemuValidateDomainVCpuTopology: Remove misconfiguration warning
by Peter Krempa 23 Aug '23

23 Aug '23

Since commit baca59a5384 the NUMA definition is automatically fixed if the vCPU count mismatches the NUMA cpu count so that this warning will never be triggered. Additionally VIR_WARN of a misconfiguration of a VM would not really be seen in most cases as it's only simply logged. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This was originally in my series reworking qemuxml2xmltest. I've removed it but later figured out that it's dead code. This posting has an updated commit message. src/qemu/qemu_validate.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 28e4a4cc99..9e638894a9 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -761,7 +761,6 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps *qemuCaps) def->os.machine); unsigned int topologycpus; unsigned int granularity; - unsigned int numacpus; if (virDomainDefGetVcpus(def) == 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -785,13 +784,6 @@ qemuValidateDomainVCpuTopology(const virDomainDef *def, virQEMUCaps *qemuCaps) } } - numacpus = virDomainNumaGetCPUCountTotal(def->numa); - if ((numacpus != 0) && (topologycpus != numacpus)) { - VIR_WARN("CPU topology doesn't match numa CPU count; " - "partial NUMA mapping is obsoleted and will " - "be removed in future"); - } - /* vCPU hotplug granularity must be respected */ granularity = qemuValidateDefGetVcpuHotplugGranularity(def); if ((virDomainDefGetVcpus(def) % granularity) != 0) { -- 2.41.0

2 1

[libvirt PATCH v3 00/25] introduce external snapshot revert support
by Pavel Hrdina 22 Aug '23

22 Aug '23

This implements virDomainRevertToSnapshot to work with external snapshots. In addition it modifies virDomainSnapshotDelete to work correctly when we revert to non-leaf snapshot or when there is non-linear snapshot tree with multiple branches. Gitlab repo with the patches: https://gitlab.com/hrdina/libvirt/-/tree/snapshot-revert-external changes in v3: - `revertdisks` is properly freed in virDomainSnapshotDefDispose() - qemuSnapshotCreateQcow2Files() no longer takes `reuse` as argument and was changed to take `virDomainDef *` instead of `virDomainObj *` - proper commit message for `qemu_snapshot: use VIR_ASYNC_JOB_SNAPSHOT when reverting snapshot` - fixed incorrect usage of `ssize_t i` - dropped the weird logic from qemuSnapshotRevertExternalInactive() as we only need offline VM definition and preserve correct error message if creating qcow files fails - qemuSnapshotClearRevertdisks() correctly frees `revertdisks` - added new patches 'qemuDomainGetImageIds: pass domain definition directly` as we need to modify the function to take `virDomainDef *` directly - qemuSnapshotDiskHasBackingDisk() now uses qemuDomainGetImageIds() to get correct UID and GID for virStorageSourceGetMetadata() and also for virCommandRun() as well by storing it in `struct _qemuSnapshotDisksWithBackingStoreData` Pavel Hrdina (25): libvirt_private: list virDomainMomentDefPostParse snapshot_conf: export virDomainSnapshotDiskDefClear snapshot_conf: use alternate domain definition in virDomainSnapshotDefAssignExternalNames snapshot_conf: introduce <revertDisks> metadata element virDomainSnapshotAlignDisks: Allow overriding user-configured snapshot default qemu_snapshot: introduce qemuSnapshotDomainDefUpdateDisk qemu_snapshot: use virDomainDiskByName while updating domain def qemu_snapshot: introduce qemuSnapshotCreateQcow2Files qemuSnapshotCreateQcow2Files: use domain definition directly qemu_snapshot: move external disk prepare to single function qemu_snapshot: use VIR_ASYNC_JOB_SNAPSHOT when reverting snapshot qemu_snapshot: introduce external snapshot revert support qemu_snapshot: rename qemuSnapshotDeleteExternalPrepare qemu_snapshot: extract external snapshot delete prepare to function qemu_snapshot: add merge to external snapshot delete prepare data qemu_snapshot: prepare data for non-active leaf external snapshot deletion qemu_snapshot: add support to delete external snapshot without block commit qemu_snapshot: delete: properly update parent snapshot with revert data qemu_snapshot: remove revertdisks when creating new snapshot virdomainmomentobjlist: introduce virDomainMomentIsAncestor qemuDomainGetImageIds: pass domain definition directly qemu_snapshot: update backing store after deleting external snapshot qemu_snapshot: check only once if snapshot is external qemu_snapshot: add checks for external snapshot deletion qemu_snapshot: allow snapshot revert for external snapshots src/conf/schemas/domainsnapshot.rng | 7 + src/conf/snapshot_conf.c | 55 +- src/conf/snapshot_conf.h | 11 +- src/conf/virdomainmomentobjlist.c | 17 + src/conf/virdomainmomentobjlist.h | 4 + src/libvirt_private.syms | 6 + src/qemu/qemu_backup.c | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_snapshot.c | 973 ++++++++++++++++++++++------ src/test/test_driver.c | 2 +- 12 files changed, 886 insertions(+), 203 deletions(-) -- 2.41.0

2 26

[PATCH 00/24] qemuxml2xmltest: Stop testing with fake capabilities
by Peter Krempa 22 Aug '23

22 Aug '23

The series prepares and then converts all tests in qemuxml2xmltest to real capabilities. Along some tests are converted even in qemuxml2argvtest as the xml2xmltest output files were symlinks into the qemuxml2argvdata directory. Peter Krempa (24): qemuxml2argvtest: Drop 'master-key' test case qemuxml2(argv|xml)test: Modernize 'net-many-models' case qemuxml2argvdata: Replace 'qemu-system-i386' by 'qemu-system-x86_64' in most test files qemuxml2(argv|xml)test: Convert certain tests to DO_TEST_CAPS_LATEST qemuxml2argvdata: Convert 'cpu' test cases to use 'x86_64' testutilsqemu: Drop fake data for VIR_ARCH_I686 qemuxml2xmltest: Modernize all 'DO_TEST_NOCAPS' tests qemuxml2xmloutdata: Workaround wrong detection of 'disk-cdrom-empty-network-invalid' in virschematest virschematest: Improve detection of 'invalid' XMLs qemuxml2xmltest: Use real caps for 'vxhs' disk tests qemuxml2xmltest: Convert rest of 'DO_TEST_NOCAPS' cases to 'DO_TEST_CAPS_LATEST' qemuxml2(argv|xml)test: Modernize 'graphics-dbus*' tests qemuxml2(argv|xml)test: Sanitize testing of default video type on x86_64 qemuValidateDomainVCpuTopology: Remove misconfiguration warning qemuValidateDomainVCpuTopology: Always validate vcpu count against topology qemuxml2(argv|xml)test: Modernize 'fd-memory*' test cases qemuxml2(argv|xml)test: Modernize 'shmem' test cases qemu: Retire 'ivshmem' device qemu: capabilities: Retire unused QEMU_CAPS_DEVICE_IVSHMEM qemuxml2argvtest: Moderinze 'video-*' cases qemuxml2xmltest: Modernize all 'video-*' cases qemuxml2argvtest: Modernize 'net-*' qemuxml2xmltest: Modernize all 'net-' tests qemuxml2xmltest: Modernize all remaining fake capability tests src/qemu/qemu_capabilities.c | 3 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 40 +- src/qemu/qemu_hotplug.c | 14 +- src/qemu/qemu_migration.c | 5 - src/qemu/qemu_validate.c | 60 +- .../440fx-ide-address-conflict.xml | 4 +- tests/qemuxml2argvdata/440fx-wrong-root.xml | 4 +- .../qemuxml2argvdata/balloon-device-auto.args | 2 +- .../qemuxml2argvdata/balloon-device-auto.xml | 4 +- .../balloon-device-deflate-off.args | 2 +- .../balloon-device-deflate-off.xml | 4 +- .../balloon-device-deflate.args | 2 +- .../balloon-device-deflate.xml | 4 +- .../balloon-device-period.args | 2 +- .../balloon-device-period.xml | 4 +- tests/qemuxml2argvdata/balloon-device.args | 2 +- tests/qemuxml2argvdata/balloon-device.xml | 4 +- tests/qemuxml2argvdata/blkiotune-device.args | 2 +- tests/qemuxml2argvdata/blkiotune-device.xml | 4 +- tests/qemuxml2argvdata/blkiotune.args | 2 +- tests/qemuxml2argvdata/blkiotune.xml | 4 +- tests/qemuxml2argvdata/boot-floppy-q35.xml | 16 + tests/qemuxml2argvdata/channel-guestfwd.args | 2 +- tests/qemuxml2argvdata/channel-guestfwd.xml | 4 +- tests/qemuxml2argvdata/channel-spicevmc.args | 2 +- tests/qemuxml2argvdata/channel-spicevmc.xml | 4 +- .../qemuxml2argvdata/channel-virtio-auto.args | 2 +- .../qemuxml2argvdata/channel-virtio-auto.xml | 4 +- .../channel-virtio-autoadd.args | 2 +- .../channel-virtio-autoadd.xml | 4 +- .../channel-virtio-autoassign.args | 2 +- .../channel-virtio-autoassign.xml | 4 +- .../channel-virtio-default.args | 2 +- .../channel-virtio-default.xml | 4 +- .../channel-virtio-state.args | 2 +- .../qemuxml2argvdata/channel-virtio-state.xml | 4 +- .../qemuxml2argvdata/channel-virtio-unix.args | 2 +- .../qemuxml2argvdata/channel-virtio-unix.xml | 4 +- tests/qemuxml2argvdata/channel-virtio.args | 2 +- tests/qemuxml2argvdata/channel-virtio.xml | 4 +- .../chardev-reconnect-generated-path.xml | 4 +- .../chardev-reconnect-invalid-timeout.xml | 4 +- tests/qemuxml2argvdata/chardev-reconnect.args | 2 +- tests/qemuxml2argvdata/chardev-reconnect.xml | 4 +- tests/qemuxml2argvdata/clock-catchup.args | 2 +- tests/qemuxml2argvdata/clock-catchup.xml | 4 +- tests/qemuxml2argvdata/clock-france.args | 2 +- tests/qemuxml2argvdata/clock-france.xml | 4 +- tests/qemuxml2argvdata/clock-hpet-off.args | 2 +- tests/qemuxml2argvdata/clock-hpet-off.xml | 4 +- .../clock-localtime-basis-localtime.args | 2 +- .../clock-localtime-basis-localtime.xml | 4 +- tests/qemuxml2argvdata/clock-localtime.args | 2 +- tests/qemuxml2argvdata/clock-localtime.xml | 4 +- tests/qemuxml2argvdata/clock-realtime.args | 34 - ...args => clock-realtime.x86_64-latest.args} | 20 +- tests/qemuxml2argvdata/clock-realtime.xml | 9 +- .../clock-timer-hyperv-rtc.args | 4 +- .../clock-timer-hyperv-rtc.xml | 4 +- tests/qemuxml2argvdata/clock-utc.args | 2 +- tests/qemuxml2argvdata/clock-utc.xml | 4 +- tests/qemuxml2argvdata/clock-variable.args | 2 +- tests/qemuxml2argvdata/clock-variable.xml | 4 +- tests/qemuxml2argvdata/console-compat2.xml | 4 +- .../qemuxml2argvdata/console-virtio-many.args | 2 +- .../qemuxml2argvdata/console-virtio-many.xml | 4 +- tests/qemuxml2argvdata/console-virtio.args | 2 +- tests/qemuxml2argvdata/console-virtio.xml | 4 +- .../cpu-host-model-features.xml | 4 +- .../cpu-host-passthrough-features.args | 2 +- .../cpu-host-passthrough-features.xml | 4 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.xml | 4 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.xml | 4 +- .../cputune-iothreadsched-toomuch.xml | 4 +- .../cputune-vcpusched-overlap.xml | 4 +- .../default-video-type-x86_64-caps-test-0.err | 1 - .../default-video-type-x86_64-caps-test-1.xml | 16 - ...fault-video-type-x86_64.x86_64-latest.args | 32 + ...st-0.xml => default-video-type-x86_64.xml} | 0 tests/qemuxml2argvdata/disk-active-commit.xml | 4 +- tests/qemuxml2argvdata/disk-mirror-old.xml | 4 +- tests/qemuxml2argvdata/disk-mirror.xml | 4 +- .../disk-virtio-scsi-reservations.xml | 5 +- ...emory-no-numa-topology.x86_64-latest.args} | 16 +- .../fd-memory-no-numa-topology.xml | 5 +- ...d-memory-numa-topology.x86_64-latest.args} | 15 +- .../fd-memory-numa-topology.xml | 5 +- ...-memory-numa-topology2.x86_64-latest.args} | 17 +- .../fd-memory-numa-topology2.xml | 7 +- .../fd-memory-numa-topology3.args | 37 - ...d-memory-numa-topology3.x86_64-latest.args | 38 + .../fd-memory-numa-topology3.xml | 7 +- ... graphics-dbus-address.x86_64-latest.args} | 14 +- .../graphics-dbus-address.xml | 9 +- ...=> graphics-dbus-audio.x86_64-latest.args} | 16 +- .../qemuxml2argvdata/graphics-dbus-audio.xml | 9 +- ... graphics-dbus-chardev.x86_64-latest.args} | 16 +- .../graphics-dbus-chardev.xml | 9 +- tests/qemuxml2argvdata/graphics-dbus-p2p.args | 30 - ...s => graphics-dbus-p2p.x86_64-latest.args} | 18 +- tests/qemuxml2argvdata/graphics-dbus-p2p.xml | 9 +- .../graphics-dbus-usbredir.x86_64-latest.args | 36 + .../graphics-dbus-usbredir.xml | 4 +- ....args => graphics-dbus.x86_64-latest.args} | 14 +- tests/qemuxml2argvdata/graphics-dbus.xml | 9 +- .../graphics-listen-network.xml | 4 +- .../graphics-listen-network2.xml | 4 +- .../graphics-sdl-fullscreen.args | 2 +- .../graphics-sdl-fullscreen.xml | 4 +- tests/qemuxml2argvdata/graphics-sdl.args | 2 +- tests/qemuxml2argvdata/graphics-sdl.xml | 4 +- .../hostdev-mdev-display-missing-graphics.xml | 4 +- .../qemuxml2argvdata/hostdev-mdev-display.xml | 4 +- .../hostdev-mdev-duplicate.xml | 4 +- .../hostdev-mdev-invalid-target-address.xml | 4 +- .../hostdev-mdev-precreated.args | 2 +- .../hostdev-mdev-precreated.xml | 4 +- .../hostdev-mdev-src-address-invalid.xml | 4 +- .../hostdev-pci-duplicate.xml | 4 +- .../hostdev-scsi-autogen-address.xml | 4 +- .../hostdev-scsi-duplicate.xml | 4 +- .../hostdev-scsi-large-unit.xml | 4 +- .../hostdev-scsi-shareable.xml | 4 +- .../hostdev-scsi-vhost-scsi-pci.args | 2 +- .../hostdev-scsi-vhost-scsi-pci.xml | 4 +- .../hostdev-usb-duplicate.xml | 4 +- .../hostdev-vfio-multidomain.args | 2 +- .../hostdev-vfio-multidomain.xml | 4 +- .../hostdev-vfio-zpci-wrong-arch.xml | 4 +- tests/qemuxml2argvdata/hostdev-vfio.args | 2 +- tests/qemuxml2argvdata/hostdev-vfio.xml | 4 +- .../hugepages-default-1G-nodeset-2M.xml | 4 +- .../hugepages-memaccess-invalid.xml | 4 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 2 +- .../qemuxml2argvdata/input-usbmouse-addr.xml | 4 +- tests/qemuxml2argvdata/input-usbmouse.args | 2 +- tests/qemuxml2argvdata/input-usbmouse.xml | 4 +- tests/qemuxml2argvdata/input-usbtablet.args | 2 +- tests/qemuxml2argvdata/input-usbtablet.xml | 4 +- ...gs => kvm-features-off.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/kvm-features-off.xml | 6 +- ...s.args => kvm-features.x86_64-latest.args} | 12 +- tests/qemuxml2argvdata/kvm-features.xml | 6 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +- tests/qemuxml2argvdata/kvm-pit-delay.xml | 4 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +- tests/qemuxml2argvdata/kvm-pit-discard.xml | 4 +- tests/qemuxml2argvdata/kvmclock.args | 4 +- tests/qemuxml2argvdata/kvmclock.xml | 4 +- tests/qemuxml2argvdata/lease.xml | 4 +- tests/qemuxml2argvdata/machine-core-off.args | 2 +- tests/qemuxml2argvdata/machine-core-off.xml | 4 +- tests/qemuxml2argvdata/machine-core-on.args | 2 +- tests/qemuxml2argvdata/machine-core-on.xml | 4 +- .../qemuxml2argvdata/machine-vmport-opt.args | 2 +- tests/qemuxml2argvdata/machine-vmport-opt.xml | 4 +- tests/qemuxml2argvdata/master-key.args | 33 - tests/qemuxml2argvdata/master-key.xml | 30 - tests/qemuxml2argvdata/memory-align-fail.xml | 4 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +- .../qemuxml2argvdata/memory-hotplug-dimm.xml | 4 +- .../memory-hotplug-nonuma.xml | 4 +- .../memory-hotplug-nvdimm-access.xml | 5 +- .../memory-hotplug-nvdimm-align.xml | 5 +- .../memory-hotplug-nvdimm-label.xml | 5 +- .../memory-hotplug-nvdimm-pmem.xml | 5 +- .../memory-hotplug-nvdimm-readonly.xml | 5 +- .../memory-hotplug-nvdimm.xml | 5 +- tests/qemuxml2argvdata/memory-hotplug.args | 2 +- tests/qemuxml2argvdata/memory-hotplug.xml | 4 +- tests/qemuxml2argvdata/memorybacking-set.xml | 4 +- .../qemuxml2argvdata/memorybacking-unset.xml | 4 +- tests/qemuxml2argvdata/memtune-unlimited.args | 2 +- tests/qemuxml2argvdata/memtune-unlimited.xml | 4 +- tests/qemuxml2argvdata/memtune.args | 2 +- tests/qemuxml2argvdata/memtune.xml | 4 +- tests/qemuxml2argvdata/metadata-duplicate.xml | 4 +- tests/qemuxml2argvdata/metadata.xml | 4 +- tests/qemuxml2argvdata/migrate.args | 2 +- tests/qemuxml2argvdata/migrate.xml | 4 +- tests/qemuxml2argvdata/minimal-no-memory.xml | 4 +- tests/qemuxml2argvdata/minimal.args | 2 +- tests/qemuxml2argvdata/minimal.xml | 4 +- tests/qemuxml2argvdata/misc-acpi.args | 2 +- tests/qemuxml2argvdata/misc-acpi.xml | 4 +- tests/qemuxml2argvdata/misc-disable-s3.args | 2 +- tests/qemuxml2argvdata/misc-disable-s3.xml | 4 +- .../misc-disable-suspends.args | 2 +- .../misc-disable-suspends.xml | 4 +- tests/qemuxml2argvdata/misc-enable-s4.args | 2 +- tests/qemuxml2argvdata/misc-enable-s4.xml | 4 +- tests/qemuxml2argvdata/misc-uuid.args | 2 +- tests/qemuxml2argvdata/misc-uuid.xml | 4 +- tests/qemuxml2argvdata/monitor-json.args | 2 +- tests/qemuxml2argvdata/monitor-json.xml | 4 +- .../multifunction-pci-device.args | 2 +- .../multifunction-pci-device.xml | 4 +- .../net-client.x86_64-latest.args | 38 + tests/qemuxml2argvdata/net-client.xml | 4 +- ...args => net-eth-hostip.x86_64-latest.args} | 19 +- tests/qemuxml2argvdata/net-eth-hostip.xml | 4 +- tests/qemuxml2argvdata/net-eth-ifname.args | 35 - .../net-eth-ifname.x86_64-latest.args | 37 + tests/qemuxml2argvdata/net-eth-ifname.xml | 4 +- tests/qemuxml2argvdata/net-eth-names.args | 38 - .../net-eth-names.x86_64-latest.args | 40 + tests/qemuxml2argvdata/net-eth-names.xml | 4 +- .../net-eth-unmanaged-tap.args | 35 - .../net-eth-unmanaged-tap.x86_64-latest.args | 37 + .../net-eth-unmanaged-tap.xml | 4 +- tests/qemuxml2argvdata/net-eth.args | 35 - .../net-eth.x86_64-latest.args | 37 + tests/qemuxml2argvdata/net-eth.xml | 4 +- .../net-hostdev-bootorder.args | 34 - ... net-hostdev-bootorder.x86_64-latest.args} | 15 +- .../net-hostdev-bootorder.xml | 4 +- ...err => net-hostdev-fail.x86_64-latest.err} | 0 tests/qemuxml2argvdata/net-hostdev-fail.xml | 4 +- .../net-hostdev-multidomain.args | 35 - ...net-hostdev-multidomain.x86_64-latest.args | 37 + .../net-hostdev-multidomain.xml | 4 +- .../net-hostdev-vfio-multidomain.args | 35 - ...ostdev-vfio-multidomain.x86_64-latest.args | 37 + .../net-hostdev-vfio-multidomain.xml | 4 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 35 - .../net-hostdev-vfio.x86_64-latest.args | 37 + tests/qemuxml2argvdata/net-hostdev-vfio.xml | 4 +- tests/qemuxml2argvdata/net-hostdev.args | 35 - .../net-hostdev.x86_64-latest.args | 37 + tests/qemuxml2argvdata/net-hostdev.xml | 4 +- tests/qemuxml2argvdata/net-many-models.args | 41 - .../net-many-models.x86_64-latest.args | 43 + tests/qemuxml2argvdata/net-many-models.xml | 2 +- tests/qemuxml2argvdata/net-mcast.args | 36 - .../net-mcast.x86_64-latest.args | 38 + tests/qemuxml2argvdata/net-mcast.xml | 4 +- tests/qemuxml2argvdata/net-midonet.xml | 4 +- tests/qemuxml2argvdata/net-mtu.xml | 5 +- tests/qemuxml2argvdata/net-openvswitch.xml | 4 +- tests/qemuxml2argvdata/net-server.args | 36 - .../net-server.x86_64-latest.args | 38 + tests/qemuxml2argvdata/net-server.xml | 4 +- tests/qemuxml2argvdata/net-udp.args | 36 - .../net-udp.x86_64-latest.args | 38 + tests/qemuxml2argvdata/net-udp.xml | 4 +- tests/qemuxml2argvdata/net-user-addr.args | 35 - .../net-user-addr.x86_64-latest.args | 37 + tests/qemuxml2argvdata/net-user-addr.xml | 9 +- ...r => net-vhostuser-fail.x86_64-latest.err} | 0 tests/qemuxml2argvdata/net-vhostuser-fail.xml | 4 +- .../net-vhostuser-multiq.args | 47 - .../net-vhostuser-multiq.x86_64-latest.args | 49 ++ .../qemuxml2argvdata/net-vhostuser-multiq.xml | 4 +- tests/qemuxml2argvdata/net-vhostuser.args | 38 - tests/qemuxml2argvdata/net-virtio-device.args | 36 - .../net-virtio-device.x86_64-latest.args | 38 + tests/qemuxml2argvdata/net-virtio-device.xml | 4 +- .../net-virtio-disable-offloads.args | 36 - ...virtio-disable-offloads.x86_64-latest.args | 38 + .../net-virtio-disable-offloads.xml | 4 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 36 - .../net-virtio-netdev.x86_64-latest.args | 38 + tests/qemuxml2argvdata/net-virtio-netdev.xml | 4 +- .../net-virtio-network-portgroup.xml | 4 +- ...xqueuesize-invalid-size.x86_64-latest.err} | 0 .../net-virtio-rxqueuesize-invalid-size.xml | 4 +- .../net-virtio-rxtxqueuesize.args | 36 - ...et-virtio-rxtxqueuesize.x86_64-latest.args | 38 + .../net-virtio-rxtxqueuesize.xml | 4 +- .../net-virtio-teaming-hostdev.args | 40 - ...-virtio-teaming-hostdev.x86_64-latest.args | 42 + .../net-virtio-teaming-hostdev.xml | 9 +- .../net-virtio-teaming-network.xml | 4 +- .../qemuxml2argvdata/net-virtio-teaming.args | 40 - .../net-virtio-teaming.x86_64-latest.args | 42 + tests/qemuxml2argvdata/net-virtio-teaming.xml | 4 +- tests/qemuxml2argvdata/net-virtio.args | 35 - ...tip.args => net-virtio.x86_64-latest.args} | 18 +- tests/qemuxml2argvdata/net-virtio.xml | 4 +- tests/qemuxml2argvdata/nosharepages.args | 2 +- tests/qemuxml2argvdata/nosharepages.xml | 4 +- .../numad-auto-memory-vcpu-cpuset.args | 2 +- .../numad-auto-memory-vcpu-cpuset.xml | 4 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 2 +- ...to-memory-vcpu-no-cpuset-and-placement.xml | 4 +- .../numad-auto-vcpu-no-numatune.xml | 4 +- ...d-auto-vcpu-static-numatune-no-nodeset.xml | 4 +- .../numad-auto-vcpu-static-numatune.args | 2 +- .../numad-auto-vcpu-static-numatune.xml | 4 +- .../numad-static-memory-auto-vcpu.args | 2 +- .../numad-static-memory-auto-vcpu.xml | 4 +- .../numad-static-vcpu-no-numatune.xml | 4 +- tests/qemuxml2argvdata/numad.args | 2 +- tests/qemuxml2argvdata/numad.xml | 4 +- .../numatune-auto-nodeset-invalid.args | 2 +- .../numatune-auto-nodeset-invalid.xml | 4 +- tests/qemuxml2argvdata/numatune-hmat.xml | 5 +- .../numatune-memory-invalid-nodeset.xml | 4 +- tests/qemuxml2argvdata/numatune-memory.args | 2 +- tests/qemuxml2argvdata/numatune-memory.xml | 4 +- tests/qemuxml2argvdata/numatune-no-vcpu.args | 36 - .../numatune-no-vcpu.x86_64-latest.args | 44 + tests/qemuxml2argvdata/numatune-no-vcpu.xml | 5 +- ...umatune-static-nodeset-exceed-hostnode.xml | 4 +- tests/qemuxml2argvdata/pages-discard.xml | 5 +- tests/qemuxml2argvdata/pci-bus-invalid.xml | 4 +- tests/qemuxml2argvdata/pci-domain-invalid.xml | 4 +- .../qemuxml2argvdata/pci-function-invalid.xml | 4 +- tests/qemuxml2argvdata/pci-rom.args | 2 +- tests/qemuxml2argvdata/pci-rom.xml | 4 +- tests/qemuxml2argvdata/pci-slot-invalid.xml | 4 +- tests/qemuxml2argvdata/pmu-feature-off.args | 4 +- tests/qemuxml2argvdata/pmu-feature-off.xml | 4 +- tests/qemuxml2argvdata/pmu-feature.args | 4 +- tests/qemuxml2argvdata/pmu-feature.xml | 4 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +- tests/qemuxml2argvdata/qemu-ns-alt.xml | 4 +- .../qemu-ns-commandline-ns0.args | 2 +- .../qemu-ns-commandline-ns0.xml | 4 +- .../qemu-ns-commandline-ns1.args | 2 +- .../qemu-ns-commandline-ns1.xml | 4 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 2 +- .../qemuxml2argvdata/qemu-ns-commandline.xml | 4 +- .../qemu-ns-domain-commandline-ns0.args | 2 +- .../qemu-ns-domain-commandline-ns0.xml | 4 +- .../qemu-ns-domain-commandline.args | 2 +- .../qemu-ns-domain-commandline.xml | 4 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +- tests/qemuxml2argvdata/qemu-ns-domain-ns0.xml | 4 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +- tests/qemuxml2argvdata/qemu-ns-no-env.xml | 4 +- .../reboot-timeout-disabled.args | 2 +- .../reboot-timeout-disabled.xml | 4 +- .../reboot-timeout-enabled.args | 2 +- .../reboot-timeout-enabled.xml | 4 +- tests/qemuxml2argvdata/restore-v2-fd.args | 2 +- tests/qemuxml2argvdata/restore-v2-fd.xml | 4 +- tests/qemuxml2argvdata/restore-v2.args | 2 +- tests/qemuxml2argvdata/restore-v2.xml | 4 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +- tests/qemuxml2argvdata/seclabel-dac-none.xml | 4 +- .../seclabel-device-duplicates.xml | 4 +- .../seclabel-device-multiple.xml | 4 +- .../seclabel-device-relabel-invalid.xml | 4 +- .../seclabel-dynamic-baselabel.args | 2 +- .../seclabel-dynamic-baselabel.xml | 4 +- .../seclabel-dynamic-labelskip.args | 2 +- .../seclabel-dynamic-labelskip.xml | 4 +- .../seclabel-dynamic-none.xml | 4 +- .../seclabel-dynamic-override.args | 2 +- .../seclabel-dynamic-override.xml | 4 +- .../seclabel-dynamic-relabel.args | 2 +- .../seclabel-dynamic-relabel.xml | 4 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +- tests/qemuxml2argvdata/seclabel-dynamic.xml | 4 +- tests/qemuxml2argvdata/seclabel-multiple.xml | 4 +- tests/qemuxml2argvdata/seclabel-none.args | 2 +- tests/qemuxml2argvdata/seclabel-none.xml | 4 +- .../seclabel-static-labelskip.args | 2 +- .../seclabel-static-labelskip.xml | 4 +- .../seclabel-static-relabel.args | 2 +- .../seclabel-static-relabel.xml | 4 +- tests/qemuxml2argvdata/seclabel-static.args | 2 +- tests/qemuxml2argvdata/seclabel-static.xml | 4 +- .../serial-target-port-auto.xml | 4 +- .../serial-tcp-tlsx509-chardev-notls.xml | 5 +- ...> shmem-invalid-address.x86_64-latest.err} | 0 .../shmem-invalid-address.xml | 5 +- ...r => shmem-invalid-size.x86_64-latest.err} | 0 tests/qemuxml2argvdata/shmem-invalid-size.xml | 5 +- ...y.err => shmem-msi-only.x86_64-latest.err} | 0 tests/qemuxml2argvdata/shmem-msi-only.xml | 5 +- .../shmem-plain-doorbell.args | 46 - .../shmem-plain-doorbell.x86_64-latest.args | 48 ++ .../qemuxml2argvdata/shmem-plain-doorbell.xml | 4 +- ...err => shmem-small-size.x86_64-latest.err} | 0 tests/qemuxml2argvdata/shmem-small-size.xml | 5 +- tests/qemuxml2argvdata/shmem.args | 43 - tests/qemuxml2argvdata/shmem.err | 1 - tests/qemuxml2argvdata/shmem.xml | 56 -- .../smartcard-controller.args | 2 +- .../qemuxml2argvdata/smartcard-controller.xml | 4 +- .../smartcard-host-certificates-database.args | 2 +- .../smartcard-host-certificates-database.xml | 4 +- .../smartcard-host-certificates.args | 2 +- .../smartcard-host-certificates.xml | 4 +- tests/qemuxml2argvdata/smartcard-host.args | 2 +- tests/qemuxml2argvdata/smartcard-host.xml | 4 +- .../smartcard-passthrough-spicevmc.args | 2 +- .../smartcard-passthrough-spicevmc.xml | 4 +- .../smartcard-passthrough-tcp.args | 2 +- .../smartcard-passthrough-tcp.xml | 4 +- tests/qemuxml2argvdata/smbios-date.xml | 4 +- .../smbios-multiple-type2.xml | 4 +- ...s => smbios-type-fwcfg.x86_64-latest.args} | 16 +- tests/qemuxml2argvdata/smbios-type-fwcfg.xml | 9 +- tests/qemuxml2argvdata/smbios-uuid-match.xml | 4 +- tests/qemuxml2argvdata/smbios.args | 2 +- tests/qemuxml2argvdata/smbios.xml | 4 +- tests/qemuxml2argvdata/smp-dies.args | 2 +- tests/qemuxml2argvdata/smp-dies.xml | 4 +- tests/qemuxml2argvdata/smp.args | 2 +- tests/qemuxml2argvdata/smp.xml | 4 +- tests/qemuxml2argvdata/usb-bus-missing.xml | 4 +- .../usb-controller-xhci-limit.xml | 4 +- .../qemuxml2argvdata/usb-controller-xhci.args | 2 +- .../qemuxml2argvdata/usb-controller-xhci.xml | 4 +- tests/qemuxml2argvdata/usb-controller.args | 2 +- tests/qemuxml2argvdata/usb-controller.xml | 4 +- .../usb-hub-autoadd-deluxe.args | 2 +- .../usb-hub-autoadd-deluxe.xml | 4 +- tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +- tests/qemuxml2argvdata/usb-hub-autoadd.xml | 4 +- tests/qemuxml2argvdata/usb-hub-conflict.xml | 4 +- .../qemuxml2argvdata/usb-hub-nonexistent.xml | 4 +- tests/qemuxml2argvdata/usb-hub.args | 2 +- tests/qemuxml2argvdata/usb-hub.xml | 4 +- .../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +- .../qemuxml2argvdata/usb-ich9-autoassign.xml | 4 +- .../qemuxml2argvdata/usb-ich9-companion.args | 2 +- tests/qemuxml2argvdata/usb-ich9-companion.xml | 4 +- .../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +- tests/qemuxml2argvdata/usb-ich9-ehci-addr.xml | 4 +- .../usb-ich9-no-companion.xml | 4 +- .../qemuxml2argvdata/usb-long-port-path.args | 2 +- tests/qemuxml2argvdata/usb-long-port-path.xml | 4 +- tests/qemuxml2argvdata/usb-none-hub.xml | 4 +- tests/qemuxml2argvdata/usb-none-other.xml | 4 +- tests/qemuxml2argvdata/usb-none-usbtablet.xml | 4 +- tests/qemuxml2argvdata/usb-none.args | 2 +- tests/qemuxml2argvdata/usb-none.xml | 4 +- .../usb-piix3-controller.args | 2 +- .../qemuxml2argvdata/usb-piix3-controller.xml | 4 +- .../qemuxml2argvdata/usb-port-autoassign.args | 2 +- .../qemuxml2argvdata/usb-port-autoassign.xml | 4 +- tests/qemuxml2argvdata/usb-port-missing.args | 2 +- tests/qemuxml2argvdata/usb-port-missing.xml | 4 +- .../usb-ports-out-of-range.xml | 4 +- tests/qemuxml2argvdata/usb-ports.args | 2 +- tests/qemuxml2argvdata/usb-ports.xml | 4 +- tests/qemuxml2argvdata/usb-redir-boot.args | 2 +- tests/qemuxml2argvdata/usb-redir-boot.xml | 4 +- .../usb-redir-filter-version.args | 2 +- .../usb-redir-filter-version.xml | 4 +- tests/qemuxml2argvdata/usb-redir-filter.args | 2 +- tests/qemuxml2argvdata/usb-redir-filter.xml | 4 +- tests/qemuxml2argvdata/usb-redir.args | 2 +- tests/qemuxml2argvdata/usb-redir.xml | 4 +- .../usb-too-long-port-path-invalid.xml | 4 +- .../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +- .../qemuxml2argvdata/usb-xhci-autoassign.xml | 4 +- tests/qemuxml2argvdata/usb1-usb2.args | 2 +- tests/qemuxml2argvdata/usb1-usb2.xml | 4 +- .../video-device-pciaddr-default.args | 37 - ...-device-pciaddr-default.x86_64-latest.args | 39 + ...nvalid-multiple-devices.x86_64-latest.err} | 0 .../video-invalid-multiple-devices.xml | 4 +- ...ideo-multiple-primaries.x86_64-latest.err} | 0 .../video-multiple-primaries.xml | 4 +- ...s => video-none-device.x86_64-latest.args} | 16 +- tests/qemuxml2argvdata/video-none-device.xml | 4 +- ...video-qxl-device-vgamem.x86_64-latest.args | 37 + .../video-qxl-device-vgamem.xml | 4 +- .../video-qxl-device.x86_64-latest.args | 37 + tests/qemuxml2argvdata/video-qxl-device.xml | 4 +- tests/qemuxml2argvdata/video-qxl-heads.args | 37 - .../video-qxl-heads.x86_64-latest.args | 39 + tests/qemuxml2argvdata/video-qxl-heads.xml | 4 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 35 - .../video-qxl-noheads.x86_64-latest.args | 37 + tests/qemuxml2argvdata/video-qxl-noheads.xml | 4 +- .../video-qxl-resolution.args | 35 - .../video-qxl-resolution.x86_64-latest.args | 37 + .../qemuxml2argvdata/video-qxl-resolution.xml | 9 +- ...o-qxl-sec-device-vgamem.x86_64-latest.args | 38 + .../video-qxl-sec-device-vgamem.xml | 4 +- .../video-qxl-sec-device.x86_64-latest.args | 38 + .../qemuxml2argvdata/video-qxl-sec-device.xml | 4 +- .../video-vga-device-vgamem.args | 35 - ...ideo-vga-device-vgamem.x86_64-latest.args} | 18 +- .../video-vga-device-vgamem.xml | 4 +- tests/qemuxml2argvdata/video-vga-device.args | 35 - ...gs => video-vga-device.x86_64-latest.args} | 18 +- tests/qemuxml2argvdata/video-vga-device.xml | 4 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 37 - .../video-vga-qxl-heads.x86_64-latest.args | 39 + .../qemuxml2argvdata/video-vga-qxl-heads.xml | 4 +- .../video-virtio-gpu-device.args | 35 - ...ideo-virtio-gpu-device.x86_64-latest.args} | 19 +- .../video-virtio-gpu-device.xml | 4 +- ...ideo-virtio-gpu-sdl-gl.x86_64-latest.args} | 18 +- .../video-virtio-gpu-sdl-gl.xml | 4 +- ...o-virtio-gpu-secondary.x86_64-latest.args} | 16 +- ...eo-virtio-gpu-spice-gl.x86_64-latest.args} | 18 +- .../video-virtio-gpu-spice-gl.xml | 4 +- .../video-virtio-gpu-virgl.args | 35 - .../video-virtio-gpu-virgl.x86_64-latest.args | 37 + .../video-virtio-gpu-virgl.xml | 4 +- tests/qemuxml2argvdata/video-virtio-vga.args | 35 - ...gs => video-virtio-vga.x86_64-latest.args} | 19 +- tests/qemuxml2argvdata/video-virtio-vga.xml | 4 +- .../virtio-input-passthrough.args | 2 +- .../virtio-input-passthrough.xml | 4 +- tests/qemuxml2argvdata/virtio-input.args | 2 +- tests/qemuxml2argvdata/virtio-input.xml | 4 +- .../qemuxml2argvdata/virtio-rng-default.args | 2 +- tests/qemuxml2argvdata/virtio-rng-default.xml | 4 +- .../qemuxml2argvdata/virtio-rng-egd-crash.xml | 4 +- tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +- tests/qemuxml2argvdata/virtio-rng-egd.xml | 4 +- .../qemuxml2argvdata/virtio-rng-multiple.args | 2 +- .../qemuxml2argvdata/virtio-rng-multiple.xml | 4 +- tests/qemuxml2argvdata/virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/virtio-rng-random.xml | 4 +- tests/qemuxml2argvdata/vmcoreinfo.args | 2 +- tests/qemuxml2argvdata/vmcoreinfo.xml | 4 +- tests/qemuxml2argvtest.c | 196 ++--- ...table.xml => acpi-table.x86_64-latest.xml} | 5 +- ...oindex.xml => autoindex.x86_64-latest.xml} | 5 +- .../balloon-device-auto.x86_64-latest.xml | 40 + .../balloon-device-auto.xml | 37 - ...> balloon-device-period.x86_64-latest.xml} | 9 +- ...xml => blkiotune-device.x86_64-latest.xml} | 9 +- ...iotune.xml => blkiotune.x86_64-latest.xml} | 9 +- ...cdrom.xml => boot-cdrom.x86_64-latest.xml} | 5 +- ....xml => boot-floppy-q35.x86_64-latest.xml} | 0 ...oppy.xml => boot-floppy.x86_64-latest.xml} | 5 +- ...nu-disable-with-timeout.x86_64-latest.xml} | 5 +- ...ml => boot-menu-disable.x86_64-latest.xml} | 5 +- ...enu-enable-with-timeout.x86_64-latest.xml} | 5 +- ...multi.xml => boot-multi.x86_64-latest.xml} | 5 +- ...ork.xml => boot-network.x86_64-latest.xml} | 5 +- ...order.xml => boot-order.x86_64-latest.xml} | 5 +- ...xml => channel-guestfwd.x86_64-latest.xml} | 9 +- ...unix-source-path-active.x86_64-latest.xml} | 5 +- ...ix-source-path-inactive.x86_64-latest.xml} | 5 +- ... => channel-virtio-auto.x86_64-latest.xml} | 9 +- ...nel-virtio-state-active.x86_64-latest.xml} | 9 +- ...l-virtio-state-inactive.x86_64-latest.xml} | 9 +- ...o.xml => channel-virtio.x86_64-latest.xml} | 9 +- ...el.xml => chardev-label.x86_64-latest.xml} | 5 +- ...up.xml => clock-catchup.x86_64-latest.xml} | 9 +- .../clock-localtime.x86_64-latest.xml | 38 + tests/qemuxml2xmloutdata/clock-localtime.xml | 35 - ...e.xml => clock-realtime.x86_64-latest.xml} | 0 .../clock-timer-hyperv-rtc.x86_64-latest.xml | 36 + .../clock-timer-hyperv-rtc.xml | 33 - .../clock-utc.x86_64-latest.xml | 38 + tests/qemuxml2xmloutdata/clock-utc.xml | 35 - ... => console-compat-auto.x86_64-latest.xml} | 5 +- ...t.xml => console-compat.x86_64-latest.xml} | 5 +- ....xml => console-compat2.x86_64-latest.xml} | 9 +- ... => console-virtio-many.x86_64-latest.xml} | 9 +- ...o.xml => console-virtio.x86_64-latest.xml} | 9 +- ... controller-virtio-scsi.x86_64-latest.xml} | 5 +- ... cpu-check-default-none.x86_64-latest.xml} | 4 +- ...cpu-check-default-none2.x86_64-latest.xml} | 2 +- ...u-check-default-partial.x86_64-latest.xml} | 2 +- ...-check-default-partial2.x86_64-latest.xml} | 2 +- ...l.xml => cpu-check-full.x86_64-latest.xml} | 2 +- ...e.xml => cpu-check-none.x86_64-latest.xml} | 2 +- ...ml => cpu-check-partial.x86_64-latest.xml} | 2 +- ...-empty.xml => cpu-empty.x86_64-latest.xml} | 5 +- ...xml => cpu-eoi-disabled.x86_64-latest.xml} | 2 +- ....xml => cpu-eoi-enabled.x86_64-latest.xml} | 2 +- ...ml => cpu-host-kvmclock.x86_64-latest.xml} | 4 +- ...cpu-host-model-features.x86_64-latest.xml} | 6 +- ...> cpu-host-model-vendor.x86_64-latest.xml} | 2 +- ...st-passthrough-features.x86_64-latest.xml} | 8 +- ...ock.xml => cpu-kvmclock.x86_64-latest.xml} | 6 +- ...ml => cpu-numa-disjoint.x86_64-latest.xml} | 5 +- ... => cpu-numa-disordered.x86_64-latest.xml} | 5 +- ...l => cpu-numa-memshared.x86_64-latest.xml} | 5 +- ...-numa-no-memory-element.x86_64-latest.xml} | 5 +- ...-numa1.xml => cpu-numa1.x86_64-latest.xml} | 5 +- ...lement.xml => cpu-numa2.x86_64-latest.xml} | 5 +- ...> default-kvm-host-arch.x86_64-latest.xml} | 7 +- ... default-qemu-host-arch.x86_64-latest.xml} | 7 +- .../default-video-type-x86_64-caps-test-0.xml | 31 - ...fault-video-type-x86_64.x86_64-latest.xml} | 3 + ...sk-active-commit-active.x86_64-latest.xml} | 9 +- ...-active-commit-inactive.x86_64-latest.xml} | 9 +- ...isk-aio.xml => disk-aio.x86_64-latest.xml} | 5 +- ...ing-chains-index-active.x86_64-latest.xml} | 5 +- ...g-chains-index-inactive.x86_64-latest.xml} | 5 +- ...-backing-chains-noindex.x86_64-latest.xml} | 5 +- ....xml => disk-boot-cdrom.x86_64-latest.xml} | 5 +- ...k.xml => disk-boot-disk.x86_64-latest.xml} | 5 +- ...=> disk-cdrom-bus-other.x86_64-latest.xml} | 5 +- ...-network-invalid-active.x86_64-latest.xml} | 0 ...network-invalid-inactive.x86_64-latest.xml | 1 + ...cdrom.xml => disk-cdrom.x86_64-latest.xml} | 5 +- ...ml => disk-copy_on_read.x86_64-latest.xml} | 5 +- ...ml => disk-error-policy.x86_64-latest.xml} | 5 +- ...oppy.xml => disk-floppy.x86_64-latest.xml} | 5 +- ...ow.xml => disk-fmt-qcow.x86_64-latest.xml} | 5 +- ...l => disk-mirror-active.x86_64-latest.xml} | 9 +- ...=> disk-mirror-inactive.x86_64-latest.xml} | 9 +- ... disk-mirror-old-active.x86_64-latest.xml} | 9 +- ...isk-mirror-old-inactive.x86_64-latest.xml} | 9 +- ...=> disk-network-gluster.x86_64-latest.xml} | 5 +- ...l => disk-network-iscsi.x86_64-latest.xml} | 5 +- ...xml => disk-network-nbd.x86_64-latest.xml} | 5 +- ...xml => disk-network-rbd.x86_64-latest.xml} | 5 +- ...> disk-network-sheepdog.x86_64-latest.xml} | 5 +- ...isk-network-source-auth.x86_64-latest.xml} | 5 +- ...isk-network-tlsx509-nbd.x86_64-latest.xml} | 5 +- ...isk-network-tlsx509-vxhs.x86_64-5.0.0.xml} | 7 +- ...xml => disk-network-vxhs.x86_64-5.0.0.xml} | 7 +- ...> disk-scsi-device-auto.x86_64-latest.xml} | 5 +- ...l => disk-scsi-disk-vpd.x86_64-latest.xml} | 5 +- ...rial.xml => disk-serial.x86_64-latest.xml} | 5 +- ...> disk-source-pool-mode.x86_64-latest.xml} | 5 +- ...xml => disk-source-pool.x86_64-latest.xml} | 5 +- ....xml => disk-usb-device.x86_64-latest.xml} | 5 +- ...irtio-scsi-reservations.x86_64-latest.xml} | 0 ...rtio.xml => disk-virtio.x86_64-latest.xml} | 5 +- ...cript.xml => downscript.x86_64-latest.xml} | 0 ...led.xml => eoi-disabled.x86_64-latest.xml} | 5 +- ...bled.xml => eoi-enabled.x86_64-latest.xml} | 5 +- ...nt_idx.xml => event_idx.x86_64-latest.xml} | 5 +- ...memory-no-numa-topology.x86_64-latest.xml} | 0 ...fd-memory-numa-topology.x86_64-latest.xml} | 0 ...d-memory-numa-topology2.x86_64-latest.xml} | 0 ...d-memory-numa-topology3.x86_64-latest.xml} | 0 ...xml => floppy-drive-fat.x86_64-latest.xml} | 5 +- ...> graphics-dbus-address.x86_64-latest.xml} | 0 ... => graphics-dbus-audio.x86_64-latest.xml} | 0 ...> graphics-dbus-chardev.x86_64-latest.xml} | 0 ...ml => graphics-dbus-p2p.x86_64-latest.xml} | 0 ...us.xml => graphics-dbus.x86_64-latest.xml} | 0 ...egl-headless-rendernode.x86_64-latest.xml} | 5 +- ...graphics-listen-network.x86_64-latest.xml} | 9 +- ...raphics-listen-network2.x86_64-latest.xml} | 9 +- ...graphics-sdl-fullscreen.x86_64-latest.xml} | 9 +- ...sdl.xml => graphics-sdl.x86_64-latest.xml} | 9 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.xml} | 5 +- ...raphics-vnc-auto-socket.x86_64-latest.xml} | 5 +- ...aphics-vnc-egl-headless.x86_64-latest.xml} | 5 +- ...hics-vnc-no-listen-attr.x86_64-latest.xml} | 5 +- ...generated-socket-active.x86_64-latest.xml} | 5 +- ...nerated-socket-inactive.x86_64-latest.xml} | 5 +- ...ml => graphics-vnc-sasl.x86_64-latest.xml} | 5 +- ... => graphics-vnc-socket.x86_64-latest.xml} | 5 +- ...xml => graphics-vnc-tls.x86_64-latest.xml} | 5 +- ... graphics-vnc-websocket.x86_64-latest.xml} | 5 +- ...ttr.xml => graphics-vnc.x86_64-latest.xml} | 5 +- ...=> hostdev-mdev-display.x86_64-latest.xml} | 9 +- ...hostdev-mdev-precreated.x86_64-latest.xml} | 11 +- ...-pci-address-unassigned.x86_64-latest.xml} | 5 +- ...stdev-pci-multifunction.x86_64-latest.xml} | 5 +- ...ev-scsi-autogen-address.x86_64-latest.xml} | 9 +- ...hostdev-scsi-large-unit.x86_64-latest.xml} | 9 +- ...xml => hostdev-scsi-lsi.x86_64-latest.xml} | 5 +- ... hostdev-scsi-shareable.x86_64-latest.xml} | 9 +- ...dev-scsi-vhost-scsi-pci.x86_64-latest.xml} | 9 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.xml} | 5 +- ...fio.xml => hostdev-vfio.x86_64-latest.xml} | 9 +- ...v-off.xml => hyperv-off.x86_64-latest.xml} | 5 +- ...nic.xml => hyperv-panic.x86_64-latest.xml} | 5 +- ...l => hyperv-passthrough.x86_64-latest.xml} | 5 +- ...=> hyperv-stimer-direct.x86_64-latest.xml} | 5 +- .../{hyperv.xml => hyperv.x86_64-latest.xml} | 5 +- ...e.xml => input-usbmouse.x86_64-latest.xml} | 9 +- ....xml => input-usbtablet.x86_64-latest.xml} | 9 +- ...xml => interface-driver.x86_64-latest.xml} | 5 +- ...xml => kvm-features-off.x86_64-latest.xml} | 0 ...res.xml => kvm-features.x86_64-latest.xml} | 0 ...vmclock.xml => kvmclock.x86_64-latest.xml} | 9 +- .../{lease.xml => lease.x86_64-latest.xml} | 9 +- ...xml => machine-core-off.x86_64-latest.xml} | 9 +- ....xml => machine-core-on.x86_64-latest.xml} | 9 +- ... => memory-hotplug-dimm.x86_64-latest.xml} | 9 +- ...y-hotplug-nvdimm-access.x86_64-latest.xml} | 0 ...ry-hotplug-nvdimm-align.x86_64-latest.xml} | 0 ...ry-hotplug-nvdimm-label.x86_64-latest.xml} | 0 ...ory-hotplug-nvdimm-pmem.x86_64-latest.xml} | 0 ...hotplug-nvdimm-readonly.x86_64-latest.xml} | 0 ...> memory-hotplug-nvdimm.x86_64-latest.xml} | 0 ...g.xml => memory-hotplug.x86_64-latest.xml} | 9 +- ...ml => memorybacking-set.x86_64-latest.xml} | 9 +- ... => memorybacking-unset.x86_64-latest.xml} | 9 +- .../memtune-unlimited.x86_64-latest.xml | 40 + .../qemuxml2xmloutdata/memtune-unlimited.xml | 37 - ...{memtune.xml => memtune.x86_64-latest.xml} | 9 +- ...l => metadata-duplicate.x86_64-latest.xml} | 9 +- ...etadata.xml => metadata.x86_64-latest.xml} | 9 +- ...{migrate.xml => migrate.x86_64-latest.xml} | 9 +- ...{minimal.xml => minimal.x86_64-latest.xml} | 9 +- ...c-acpi.xml => misc-acpi.x86_64-latest.xml} | 9 +- ....xml => misc-disable-s3.x86_64-latest.xml} | 9 +- ...> misc-disable-suspends.x86_64-latest.xml} | 9 +- ...4.xml => misc-enable-s4.x86_64-latest.xml} | 9 +- ...t.xml => misc-no-reboot.x86_64-latest.xml} | 5 +- ...c-uuid.xml => misc-uuid.x86_64-latest.xml} | 9 +- ...th.xml => net-bandwidth.x86_64-latest.xml} | 5 +- ...2.xml => net-bandwidth2.x86_64-latest.xml} | 5 +- ...sce.xml => net-coalesce.x86_64-latest.xml} | 5 +- ...p.xml => net-eth-hostip.x86_64-latest.xml} | 9 +- ...e.xml => net-eth-ifname.x86_64-latest.xml} | 9 +- ...> net-eth-unmanaged-tap.x86_64-latest.xml} | 9 +- ...{net-eth.xml => net-eth.x86_64-latest.xml} | 9 +- ...> net-hostdev-bootorder.x86_64-latest.xml} | 9 +- ...xml => net-hostdev-vfio.x86_64-latest.xml} | 9 +- ...tdev.xml => net-hostdev.x86_64-latest.xml} | 9 +- ....xml => net-many-models.x86_64-latest.xml} | 7 +- ...onet.xml => net-midonet.x86_64-latest.xml} | 9 +- ...{net-mtu.xml => net-mtu.x86_64-latest.xml} | 0 ....xml => net-openvswitch.x86_64-latest.xml} | 9 +- ...erver.xml => net-server.x86_64-latest.xml} | 9 +- ...{net-udp.xml => net-udp.x86_64-latest.xml} | 9 +- ...dr.xml => net-user-addr.x86_64-latest.xml} | 0 tests/qemuxml2xmloutdata/net-user-passt.xml | 1 - ...et-user.xml => net-user.x86_64-latest.xml} | 5 +- ... => net-vdpa-multiqueue.x86_64-latest.xml} | 5 +- ...et-vdpa.xml => net-vdpa.x86_64-latest.xml} | 5 +- ...er.xml => net-vhostuser.x86_64-latest.xml} | 5 +- ...ml => net-virtio-device.x86_64-latest.xml} | 9 +- ...virtio-disable-offloads.x86_64-latest.xml} | 9 +- ...irtio-network-portgroup.x86_64-latest.xml} | 9 +- ...et-virtio-rxtxqueuesize.x86_64-latest.xml} | 9 +- ...-virtio-teaming-hostdev.x86_64-latest.xml} | 0 ...-virtio-teaming-network.x86_64-latest.xml} | 9 +- ...l => net-virtio-teaming.x86_64-latest.xml} | 9 +- ...irtio.xml => net-virtio.x86_64-latest.xml} | 9 +- ...ges.xml => nosharepages.x86_64-latest.xml} | 9 +- ...auto-memory-vcpu-cpuset.x86_64-latest.xml} | 9 +- ...no-cpuset-and-placement.x86_64-latest.xml} | 9 +- ...d-auto-vcpu-no-numatune.x86_64-latest.xml} | 9 +- ...static-vcpu-no-numatune.x86_64-latest.xml} | 9 +- ...=> numatune-auto-prefer.x86_64-latest.xml} | 5 +- ...l => numatune-distances.x86_64-latest.xml} | 5 +- ...at.xml => numatune-hmat.x86_64-latest.xml} | 0 ...atune-memnode-no-memory.x86_64-latest.xml} | 5 +- ...xml => numatune-memnode.x86_64-latest.xml} | 5 +- ...xml => numatune-no-vcpu.x86_64-latest.xml} | 0 ...rd.xml => pages-discard.x86_64-latest.xml} | 0 ...ble.xml => panic-double.x86_64-latest.xml} | 5 +- ...xml => panic-no-address.x86_64-latest.xml} | 5 +- .../{panic.xml => panic.x86_64-latest.xml} | 5 +- ...xml => pci-autoadd-addr.x86_64-latest.xml} | 5 +- ....xml => pci-autoadd-idx.x86_64-latest.xml} | 5 +- ...ml => pci-autofill-addr.x86_64-latest.xml} | 5 +- ...> pci-bridge-many-disks.x86_64-latest.xml} | 5 +- ...ridge.xml => pci-bridge.x86_64-latest.xml} | 5 +- ...xml => pci-expander-bus.x86_64-latest.xml} | 3 +- ...ci-many.xml => pci-many.x86_64-latest.xml} | 5 +- ...ci-rom-disabled-invalid.x86_64-latest.xml} | 3 + ...xml => pci-rom-disabled.x86_64-latest.xml} | 3 + ...{pci-rom.xml => pci-rom.x86_64-latest.xml} | 9 +- ... pci-serial-dev-chardev.x86_64-latest.xml} | 5 +- ...ml => pcie-expander-bus.x86_64-latest.xml} | 13 +- ...root-port-model-generic.x86_64-latest.xml} | 6 + ...root-port-model-ioh3420.x86_64-latest.xml} | 8 +- ...t.xml => pcie-root-port.x86_64-latest.xml} | 8 +- .../pcie-root.x86_64-latest.xml | 43 + tests/qemuxml2xmloutdata/pcie-root.xml | 27 - ...-switch-downstream-port.x86_64-latest.xml} | 8 +- ...cie-switch-upstream-port.x86_64-latest.xml | 66 ++ ...ib.xml => pcihole64-gib.x86_64-latest.xml} | 5 +- ...35.xml => pcihole64-q35.x86_64-latest.xml} | 31 +- tests/qemuxml2xmloutdata/pcihole64-q35.xml | 39 - ...hole64.xml => pcihole64.x86_64-latest.xml} | 5 +- .../pmu-feature-off.x86_64-latest.xml | 33 + tests/qemuxml2xmloutdata/pmu-feature-off.xml | 30 - .../pmu-feature.x86_64-latest.xml | 33 + tests/qemuxml2xmloutdata/pmu-feature.xml | 30 - ...=> pv-spinlock-disabled.x86_64-latest.xml} | 5 +- ... => pv-spinlock-enabled.x86_64-latest.xml} | 5 +- ...> q35-pci-force-address.x86_64-latest.xml} | 5 +- ...r.xml => q35-usb2-multi.x86_64-latest.xml} | 23 +- ...xml => q35-usb2-reorder.x86_64-latest.xml} | 23 +- ...35-usb2.xml => q35-usb2.x86_64-latest.xml} | 3 + ...pstream-port.xml => q35.x86_64-latest.xml} | 24 +- ...v.xml => qemu-ns-no-env.x86_64-latest.xml} | 9 +- .../reboot-timeout-disabled.x86_64-latest.xml | 30 + .../reboot-timeout-disabled.xml | 27 - .../reboot-timeout-enabled.x86_64-latest.xml | 30 + .../reboot-timeout-enabled.xml | 27 - .../restore-v2.x86_64-latest.xml | 38 + tests/qemuxml2xmloutdata/restore-v2.xml | 35 - ...ml => seclabel-dac-none.x86_64-latest.xml} | 9 +- ...eclabel-device-multiple.x86_64-latest.xml} | 9 +- .../seclabel-dynamic-baselabel-inactive.xml | 4 +- .../seclabel-dynamic-labelskip-inactive.xml | 4 +- ...> seclabel-dynamic-none.x86_64-latest.xml} | 9 +- .../seclabel-dynamic-override-inactive.xml | 4 +- .../seclabel-dynamic-relabel-inactive.xml | 4 +- ...ne.xml => seclabel-none.x86_64-latest.xml} | 9 +- ...static-labelskip-active.x86_64-latest.xml} | 9 +- ...atic-labelskip-inactive.x86_64-latest.xml} | 9 +- ....xml => seclabel-static.x86_64-latest.xml} | 9 +- ....xml => serial-debugcon.x86_64-latest.xml} | 5 +- ...xml => serial-spiceport.x86_64-latest.xml} | 5 +- ...serial-target-port-auto.x86_64-latest.xml} | 9 +- ...p-tlsx509-chardev-notls.x86_64-latest.xml} | 0 ...ial-tcp-tlsx509-chardev.x86_64-latest.xml} | 5 +- ...=> shmem-plain-doorbell.x86_64-latest.xml} | 9 +- tests/qemuxml2xmloutdata/shmem.xml | 74 -- ...=> smartcard-controller.x86_64-latest.xml} | 11 +- ...t-certificates-database.x86_64-latest.xml} | 9 +- ...tcard-host-certificates.x86_64-latest.xml} | 9 +- ...r.xml => smartcard-host.x86_64-latest.xml} | 11 +- ...rd-passthrough-spicevmc.x86_64-latest.xml} | 9 +- ...artcard-passthrough-tcp.x86_64-latest.xml} | 9 +- ...> smbios-multiple-type2.x86_64-latest.xml} | 9 +- ...ml => smbios-type-fwcfg.x86_64-latest.xml} | 0 .../{smbios.xml => smbios.x86_64-latest.xml} | 9 +- .../{smp.xml => smp.x86_64-latest.xml} | 9 +- ... => tap-vhost-incorrect.x86_64-latest.xml} | 5 +- ...-vhost.xml => tap-vhost.x86_64-latest.xml} | 5 +- ...-controller-default-q35.x86_64-latest.xml} | 3 + ...controller-explicit-q35.x86_64-latest.xml} | 3 + ...r.xml => usb-controller.x86_64-latest.xml} | 7 +- ...l => usb-ich9-ehci-addr.x86_64-latest.xml} | 7 +- ...sb-none.xml => usb-none.x86_64-latest.xml} | 7 +- ...=> usb-piix3-controller.x86_64-latest.xml} | 9 +- ...xml => usb-port-missing.x86_64-latest.xml} | 9 +- ...sb-redir-filter-version.x86_64-latest.xml} | 9 +- ...xml => usb-redir-filter.x86_64-latest.xml} | 7 +- ...-redir.xml => usb-redir.x86_64-latest.xml} | 7 +- ...ues.xml => vhost_queues.x86_64-latest.xml} | 5 +- ...-device-pciaddr-default.x86_64-latest.xml} | 5 +- ...ml => video-none-device.x86_64-latest.xml} | 9 +- ....xml => video-qxl-heads.x86_64-latest.xml} | 9 +- ...ml => video-qxl-noheads.x86_64-latest.xml} | 9 +- ...=> video-qxl-resolution.x86_64-latest.xml} | 0 ...video-virtio-gpu-device.x86_64-latest.xml} | 9 +- ...video-virtio-gpu-sdl-gl.x86_64-latest.xml} | 9 +- ...eo-virtio-gpu-secondary.x86_64-latest.xml} | 5 +- ...deo-virtio-gpu-spice-gl.x86_64-latest.xml} | 9 +- ... video-virtio-gpu-virgl.x86_64-latest.xml} | 9 +- ...irtio-input-passthrough.x86_64-latest.xml} | 9 +- ...put.xml => virtio-input.x86_64-latest.xml} | 9 +- ...o-lun.xml => virtio-lun.x86_64-latest.xml} | 5 +- ...d.xml => virtio-rng-egd.x86_64-latest.xml} | 9 +- ...ml => virtio-rng-random.x86_64-latest.xml} | 9 +- ...einfo.xml => vmcoreinfo.x86_64-latest.xml} | 9 +- ...atchdog.xml => watchdog.x86_64-latest.xml} | 5 +- tests/qemuxml2xmltest.c | 815 +++++++----------- tests/testutilsqemu.c | 7 - tests/virschematest.c | 4 +- 845 files changed, 4496 insertions(+), 4214 deletions(-) delete mode 100644 tests/qemuxml2argvdata/clock-realtime.args rename tests/qemuxml2argvdata/{serial-tcp-tlsx509-chardev-notls.args => clock-realtime.x86_64-latest.args} (60%) delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-0.err delete mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64-caps-test-1.xml create mode 100644 tests/qemuxml2argvdata/default-video-type-x86_64.x86_64-latest.args rename tests/qemuxml2argvdata/{default-video-type-x86_64-caps-test-0.xml => default-video-type-x86_64.xml} (100%) rename tests/qemuxml2argvdata/{fd-memory-no-numa-topology.args => fd-memory-no-numa-topology.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{fd-memory-numa-topology.args => fd-memory-numa-topology.x86_64-latest.args} (55%) rename tests/qemuxml2argvdata/{fd-memory-numa-topology2.args => fd-memory-numa-topology2.x86_64-latest.args} (51%) delete mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.args create mode 100644 tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-dbus-address.args => graphics-dbus-address.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{graphics-dbus-audio.args => graphics-dbus-audio.x86_64-latest.args} (61%) rename tests/qemuxml2argvdata/{graphics-dbus-chardev.args => graphics-dbus-chardev.x86_64-latest.args} (54%) delete mode 100644 tests/qemuxml2argvdata/graphics-dbus-p2p.args rename tests/qemuxml2argvdata/{graphics-dbus-usbredir.args => graphics-dbus-p2p.x86_64-latest.args} (56%) create mode 100644 tests/qemuxml2argvdata/graphics-dbus-usbredir.x86_64-latest.args rename tests/qemuxml2argvdata/{graphics-dbus.args => graphics-dbus.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{kvm-features-off.args => kvm-features-off.x86_64-latest.args} (59%) rename tests/qemuxml2argvdata/{kvm-features.args => kvm-features.x86_64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/master-key.args delete mode 100644 tests/qemuxml2argvdata/master-key.xml create mode 100644 tests/qemuxml2argvdata/net-client.x86_64-latest.args rename tests/qemuxml2argvdata/{net-client.args => net-eth-hostip.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/net-eth-ifname.args create mode 100644 tests/qemuxml2argvdata/net-eth-ifname.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-eth-names.args create mode 100644 tests/qemuxml2argvdata/net-eth-names.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.args create mode 100644 tests/qemuxml2argvdata/net-eth-unmanaged-tap.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-eth.args create mode 100644 tests/qemuxml2argvdata/net-eth.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-hostdev-bootorder.args rename tests/qemuxml2argvdata/{net-user.args => net-hostdev-bootorder.x86_64-latest.args} (60%) rename tests/qemuxml2argvdata/{net-hostdev-fail.err => net-hostdev-fail.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/net-hostdev-multidomain.args create mode 100644 tests/qemuxml2argvdata/net-hostdev-multidomain.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args create mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio.args create mode 100644 tests/qemuxml2argvdata/net-hostdev-vfio.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-hostdev.args create mode 100644 tests/qemuxml2argvdata/net-hostdev.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-many-models.args create mode 100644 tests/qemuxml2argvdata/net-many-models.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-mcast.args create mode 100644 tests/qemuxml2argvdata/net-mcast.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-server.args create mode 100644 tests/qemuxml2argvdata/net-server.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-udp.args create mode 100644 tests/qemuxml2argvdata/net-udp.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-user-addr.args create mode 100644 tests/qemuxml2argvdata/net-user-addr.x86_64-latest.args rename tests/qemuxml2argvdata/{net-vhostuser-fail.err => net-vhostuser-fail.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.args create mode 100644 tests/qemuxml2argvdata/net-vhostuser-multiq.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-vhostuser.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-device.args create mode 100644 tests/qemuxml2argvdata/net-virtio-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-disable-offloads.args create mode 100644 tests/qemuxml2argvdata/net-virtio-disable-offloads.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-netdev.args create mode 100644 tests/qemuxml2argvdata/net-virtio-netdev.x86_64-latest.args rename tests/qemuxml2argvdata/{net-virtio-rxqueuesize-invalid-size.err => net-virtio-rxqueuesize-invalid-size.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args create mode 100644 tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming-hostdev.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.args create mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/net-virtio.args rename tests/qemuxml2argvdata/{net-eth-hostip.args => net-virtio.x86_64-latest.args} (56%) delete mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.args create mode 100644 tests/qemuxml2argvdata/numatune-no-vcpu.x86_64-latest.args rename tests/qemuxml2argvdata/{shmem-invalid-address.err => shmem-invalid-address.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{shmem-invalid-size.err => shmem-invalid-size.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{shmem-msi-only.err => shmem-msi-only.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.args create mode 100644 tests/qemuxml2argvdata/shmem-plain-doorbell.x86_64-latest.args rename tests/qemuxml2argvdata/{shmem-small-size.err => shmem-small-size.x86_64-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/shmem.args delete mode 100644 tests/qemuxml2argvdata/shmem.err delete mode 100644 tests/qemuxml2argvdata/shmem.xml rename tests/qemuxml2argvdata/{smbios-type-fwcfg.args => smbios-type-fwcfg.x86_64-latest.args} (68%) delete mode 100644 tests/qemuxml2argvdata/video-device-pciaddr-default.args create mode 100644 tests/qemuxml2argvdata/video-device-pciaddr-default.x86_64-latest.args rename tests/qemuxml2argvdata/{video-invalid-multiple-devices.err => video-invalid-multiple-devices.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{video-multiple-primaries.err => video-multiple-primaries.x86_64-latest.err} (100%) rename tests/qemuxml2argvdata/{video-none-device.args => video-none-device.x86_64-latest.args} (60%) create mode 100644 tests/qemuxml2argvdata/video-qxl-device-vgamem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-qxl-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/video-qxl-heads.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-noheads.args create mode 100644 tests/qemuxml2argvdata/video-qxl-noheads.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.args create mode 100644 tests/qemuxml2argvdata/video-qxl-resolution.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/video-qxl-sec-device.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-vga-device-vgamem.args rename tests/qemuxml2argvdata/{video-qxl-device-vgamem.args => video-vga-device-vgamem.x86_64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/video-vga-device.args rename tests/qemuxml2argvdata/{video-qxl-device.args => video-vga-device.x86_64-latest.args} (58%) delete mode 100644 tests/qemuxml2argvdata/video-vga-qxl-heads.args create mode 100644 tests/qemuxml2argvdata/video-vga-qxl-heads.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-device.args rename tests/qemuxml2argvdata/{video-qxl-sec-device-vgamem.args => video-virtio-gpu-device.x86_64-latest.args} (57%) rename tests/qemuxml2argvdata/{video-virtio-gpu-sdl-gl.args => video-virtio-gpu-sdl-gl.x86_64-latest.args} (56%) rename tests/qemuxml2argvdata/{video-virtio-gpu-secondary.args => video-virtio-gpu-secondary.x86_64-latest.args} (51%) rename tests/qemuxml2argvdata/{video-virtio-gpu-spice-gl.args => video-virtio-gpu-spice-gl.x86_64-latest.args} (59%) delete mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-virgl.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/video-virtio-vga.args rename tests/qemuxml2argvdata/{video-qxl-sec-device.args => video-virtio-vga.x86_64-latest.args} (57%) rename tests/qemuxml2xmloutdata/{acpi-table.xml => acpi-table.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{autoindex.xml => autoindex.x86_64-latest.xml} (98%) create mode 100644 tests/qemuxml2xmloutdata/balloon-device-auto.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/balloon-device-auto.xml rename tests/qemuxml2xmloutdata/{balloon-device-period.xml => balloon-device-period.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{blkiotune-device.xml => blkiotune-device.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{blkiotune.xml => blkiotune.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{boot-cdrom.xml => boot-cdrom.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{boot-floppy-q35.xml => boot-floppy-q35.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{boot-floppy.xml => boot-floppy.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{boot-menu-disable-with-timeout.xml => boot-menu-disable-with-timeout.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{boot-menu-disable.xml => boot-menu-disable.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{boot-menu-enable-with-timeout.xml => boot-menu-enable-with-timeout.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{boot-multi.xml => boot-multi.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{boot-network.xml => boot-network.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{boot-order.xml => boot-order.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{channel-guestfwd.xml => channel-guestfwd.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{channel-unix-source-path-active.xml => channel-unix-source-path-active.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{channel-unix-source-path-inactive.xml => channel-unix-source-path-inactive.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{channel-virtio-auto.xml => channel-virtio-auto.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{channel-virtio-state-active.xml => channel-virtio-state-active.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{channel-virtio-state-inactive.xml => channel-virtio-state-inactive.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{channel-virtio.xml => channel-virtio.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{chardev-label.xml => chardev-label.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{clock-catchup.xml => clock-catchup.x86_64-latest.xml} (84%) create mode 100644 tests/qemuxml2xmloutdata/clock-localtime.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/clock-localtime.xml rename tests/qemuxml2xmloutdata/{clock-realtime.xml => clock-realtime.x86_64-latest.xml} (100%) create mode 100644 tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml create mode 100644 tests/qemuxml2xmloutdata/clock-utc.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/clock-utc.xml rename tests/qemuxml2xmloutdata/{console-compat-auto.xml => console-compat-auto.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{console-compat.xml => console-compat.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{console-compat2.xml => console-compat2.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{console-virtio-many.xml => console-virtio-many.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{console-virtio.xml => console-virtio.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{controller-virtio-scsi.xml => controller-virtio-scsi.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{cpu-check-default-none.xml => cpu-check-default-none.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{cpu-check-default-none2.xml => cpu-check-default-none2.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-check-default-partial.xml => cpu-check-default-partial.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-check-partial.xml => cpu-check-default-partial2.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-check-full.xml => cpu-check-full.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-check-none.xml => cpu-check-none.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-check-default-partial2.xml => cpu-check-partial.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-empty.xml => cpu-empty.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{cpu-eoi-disabled.xml => cpu-eoi-disabled.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{cpu-eoi-enabled.xml => cpu-eoi-enabled.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{cpu-host-kvmclock.xml => cpu-host-kvmclock.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{cpu-host-model-features.xml => cpu-host-model-features.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{cpu-host-model-vendor.xml => cpu-host-model-vendor.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{cpu-host-passthrough-features.xml => cpu-host-passthrough-features.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{cpu-kvmclock.xml => cpu-kvmclock.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{cpu-numa-disjoint.xml => cpu-numa-disjoint.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{cpu-numa-disordered.xml => cpu-numa-disordered.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{cpu-numa-memshared.xml => cpu-numa-memshared.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{cpu-numa2.xml => cpu-numa-no-memory-element.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{cpu-numa1.xml => cpu-numa1.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{cpu-numa-no-memory-element.xml => cpu-numa2.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{default-kvm-host-arch.xml => default-kvm-host-arch.x86_64-latest.xml} (79%) rename tests/qemuxml2xmloutdata/{default-qemu-host-arch.xml => default-qemu-host-arch.x86_64-latest.xml} (79%) delete mode 100644 tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml rename tests/qemuxml2xmloutdata/{default-video-type-x86_64-caps-test-1.xml => default-video-type-x86_64.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{disk-active-commit-active.xml => disk-active-commit-active.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{disk-active-commit-inactive.xml => disk-active-commit-inactive.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{disk-aio.xml => disk-aio.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-active.xml => disk-backing-chains-index-active.x86_64-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{disk-backing-chains-index-inactive.xml => disk-backing-chains-index-inactive.x86_64-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{disk-backing-chains-noindex.xml => disk-backing-chains-noindex.x86_64-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{disk-boot-cdrom.xml => disk-boot-cdrom.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-boot-disk.xml => disk-boot-disk.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-cdrom-bus-other.xml => disk-cdrom-bus-other.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{disk-cdrom-empty-network-invalid.x86_64-latest.xml => disk-cdrom-empty-network-invalid-active.x86_64-latest.xml} (100%) create mode 120000 tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid-inactive.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{disk-cdrom.xml => disk-cdrom.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{disk-copy_on_read.xml => disk-copy_on_read.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{disk-error-policy.xml => disk-error-policy.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{disk-floppy.xml => disk-floppy.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{disk-fmt-qcow.xml => disk-fmt-qcow.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-mirror-active.xml => disk-mirror-active.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{disk-mirror-inactive.xml => disk-mirror-inactive.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{disk-mirror-old-active.xml => disk-mirror-old-active.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-mirror-old-inactive.xml => disk-mirror-old-inactive.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{disk-network-gluster.xml => disk-network-gluster.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{disk-network-iscsi.xml => disk-network-iscsi.x86_64-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{disk-network-nbd.xml => disk-network-nbd.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{disk-network-rbd.xml => disk-network-rbd.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{disk-network-sheepdog.xml => disk-network-sheepdog.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-network-source-auth.xml => disk-network-source-auth.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-nbd.xml => disk-network-tlsx509-nbd.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{disk-network-tlsx509-vxhs.xml => disk-network-tlsx509-vxhs.x86_64-5.0.0.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-network-vxhs.xml => disk-network-vxhs.x86_64-5.0.0.xml} (84%) rename tests/qemuxml2xmloutdata/{disk-scsi-device-auto.xml => disk-scsi-device-auto.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{disk-scsi-disk-vpd.xml => disk-scsi-disk-vpd.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{disk-serial.xml => disk-serial.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{disk-source-pool-mode.xml => disk-source-pool-mode.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{disk-source-pool.xml => disk-source-pool.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{disk-usb-device.xml => disk-usb-device.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{disk-virtio-scsi-reservations.xml => disk-virtio-scsi-reservations.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{disk-virtio.xml => disk-virtio.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{downscript.xml => downscript.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{eoi-disabled.xml => eoi-disabled.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{eoi-enabled.xml => eoi-enabled.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{event_idx.xml => event_idx.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{fd-memory-no-numa-topology.xml => fd-memory-no-numa-topology.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology.xml => fd-memory-numa-topology.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology2.xml => fd-memory-numa-topology2.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{fd-memory-numa-topology3.xml => fd-memory-numa-topology3.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{floppy-drive-fat.xml => floppy-drive-fat.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{graphics-dbus-address.xml => graphics-dbus-address.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus-audio.xml => graphics-dbus-audio.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus-chardev.xml => graphics-dbus-chardev.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus-p2p.xml => graphics-dbus-p2p.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-dbus.xml => graphics-dbus.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{graphics-egl-headless-rendernode.xml => graphics-egl-headless-rendernode.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{graphics-listen-network.xml => graphics-listen-network.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{graphics-listen-network2.xml => graphics-listen-network2.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{graphics-sdl-fullscreen.xml => graphics-sdl-fullscreen.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{graphics-sdl.xml => graphics-sdl.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{graphics-vnc-auto-socket-cfg.xml => graphics-vnc-auto-socket-cfg.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{graphics-vnc-auto-socket.xml => graphics-vnc-auto-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-vnc-egl-headless.xml => graphics-vnc-egl-headless.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{graphics-vnc.xml => graphics-vnc-no-listen-attr.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-active.xml => graphics-vnc-remove-generated-socket-active.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{graphics-vnc-remove-generated-socket-inactive.xml => graphics-vnc-remove-generated-socket-inactive.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{graphics-vnc-sasl.xml => graphics-vnc-sasl.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{graphics-vnc-socket.xml => graphics-vnc-socket.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-vnc-tls.xml => graphics-vnc-tls.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{graphics-vnc-websocket.xml => graphics-vnc-websocket.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{graphics-vnc-no-listen-attr.xml => graphics-vnc.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{hostdev-mdev-display.xml => hostdev-mdev-display.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{hostdev-mdev-precreated.xml => hostdev-mdev-precreated.x86_64-latest.xml} (79%) rename tests/qemuxml2xmloutdata/{hostdev-pci-address-unassigned.xml => hostdev-pci-address-unassigned.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-pci-multifunction.xml => hostdev-pci-multifunction.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-autogen-address.xml => hostdev-scsi-autogen-address.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-large-unit.xml => hostdev-scsi-large-unit.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-lsi.xml => hostdev-scsi-lsi.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-shareable.xml => hostdev-scsi-shareable.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-pci.xml => hostdev-scsi-vhost-scsi-pci.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-virtio-scsi.xml => hostdev-scsi-virtio-scsi.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{hostdev-vfio.xml => hostdev-vfio.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hyperv-off.xml => hyperv-off.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{hyperv-panic.xml => hyperv-panic.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{hyperv-passthrough.xml => hyperv-passthrough.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hyperv-stimer-direct.xml => hyperv-stimer-direct.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{hyperv.xml => hyperv.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{input-usbmouse.xml => input-usbmouse.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{input-usbtablet.xml => input-usbtablet.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{interface-driver.xml => interface-driver.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{kvm-features-off.xml => kvm-features-off.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{kvm-features.xml => kvm-features.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{kvmclock.xml => kvmclock.x86_64-latest.xml} (75%) rename tests/qemuxml2xmloutdata/{lease.xml => lease.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{machine-core-off.xml => machine-core-off.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{machine-core-on.xml => machine-core-on.x86_64-latest.xml} (80%) rename tests/qemuxml2xmloutdata/{memory-hotplug-dimm.xml => memory-hotplug-dimm.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-access.xml => memory-hotplug-nvdimm-access.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-align.xml => memory-hotplug-nvdimm-align.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-label.xml => memory-hotplug-nvdimm-label.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-pmem.xml => memory-hotplug-nvdimm-pmem.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-readonly.xml => memory-hotplug-nvdimm-readonly.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm.xml => memory-hotplug-nvdimm.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug.xml => memory-hotplug.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{memorybacking-set.xml => memorybacking-set.x86_64-latest.xml} (78%) rename tests/qemuxml2xmloutdata/{memorybacking-unset.xml => memorybacking-unset.x86_64-latest.xml} (78%) create mode 100644 tests/qemuxml2xmloutdata/memtune-unlimited.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/memtune-unlimited.xml rename tests/qemuxml2xmloutdata/{memtune.xml => memtune.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{metadata-duplicate.xml => metadata-duplicate.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{metadata.xml => metadata.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{migrate.xml => migrate.x86_64-latest.xml} (80%) rename tests/qemuxml2xmloutdata/{minimal.xml => minimal.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{misc-acpi.xml => misc-acpi.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{misc-disable-s3.xml => misc-disable-s3.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{misc-disable-suspends.xml => misc-disable-suspends.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{misc-enable-s4.xml => misc-enable-s4.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{misc-no-reboot.xml => misc-no-reboot.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{misc-uuid.xml => misc-uuid.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{net-bandwidth.xml => net-bandwidth.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{net-bandwidth2.xml => net-bandwidth2.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{net-coalesce.xml => net-coalesce.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{net-eth-hostip.xml => net-eth-hostip.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{net-eth-ifname.xml => net-eth-ifname.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{net-eth-unmanaged-tap.xml => net-eth-unmanaged-tap.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{net-eth.xml => net-eth.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{net-hostdev-bootorder.xml => net-hostdev-bootorder.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{net-hostdev-vfio.xml => net-hostdev-vfio.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{net-hostdev.xml => net-hostdev.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{net-many-models.xml => net-many-models.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{net-midonet.xml => net-midonet.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{net-mtu.xml => net-mtu.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{net-openvswitch.xml => net-openvswitch.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{net-server.xml => net-server.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{net-udp.xml => net-udp.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{net-user-addr.xml => net-user-addr.x86_64-latest.xml} (100%) delete mode 120000 tests/qemuxml2xmloutdata/net-user-passt.xml rename tests/qemuxml2xmloutdata/{net-user.xml => net-user.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{net-vdpa-multiqueue.xml => net-vdpa-multiqueue.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{net-vdpa.xml => net-vdpa.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{net-vhostuser.xml => net-vhostuser.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{net-virtio-device.xml => net-virtio-device.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{net-virtio-disable-offloads.xml => net-virtio-disable-offloads.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{net-virtio-network-portgroup.xml => net-virtio-network-portgroup.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{net-virtio-rxtxqueuesize.xml => net-virtio-rxtxqueuesize.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{net-virtio-teaming-hostdev.xml => net-virtio-teaming-hostdev.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{net-virtio-teaming-network.xml => net-virtio-teaming-network.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{net-virtio-teaming.xml => net-virtio-teaming.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{net-virtio.xml => net-virtio.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{nosharepages.xml => nosharepages.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{numad-auto-memory-vcpu-cpuset.xml => numad-auto-memory-vcpu-cpuset.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{numad-auto-memory-vcpu-no-cpuset-and-placement.xml => numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{numad-auto-vcpu-no-numatune.xml => numad-auto-vcpu-no-numatune.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{numad-static-vcpu-no-numatune.xml => numad-static-vcpu-no-numatune.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{numatune-auto-prefer.xml => numatune-auto-prefer.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{numatune-distances.xml => numatune-distances.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{numatune-hmat.xml => numatune-hmat.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{numatune-memnode-no-memory.xml => numatune-memnode-no-memory.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{numatune-memnode.xml => numatune-memnode.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{numatune-no-vcpu.xml => numatune-no-vcpu.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{pages-discard.xml => pages-discard.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{panic-double.xml => panic-double.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{panic-no-address.xml => panic-no-address.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{panic.xml => panic.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{pci-autoadd-addr.xml => pci-autoadd-addr.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{pci-autoadd-idx.xml => pci-autoadd-idx.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{pci-autofill-addr.xml => pci-autofill-addr.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{pci-bridge-many-disks.xml => pci-bridge-many-disks.x86_64-latest.xml} (99%) rename tests/qemuxml2xmloutdata/{pci-bridge.xml => pci-bridge.x86_64-latest.xml} (98%) rename tests/qemuxml2xmloutdata/{pci-expander-bus.xml => pci-expander-bus.x86_64-latest.xml} (98%) rename tests/qemuxml2xmloutdata/{pci-many.xml => pci-many.x86_64-latest.xml} (98%) rename tests/qemuxml2xmloutdata/{pci-rom-disabled-invalid.xml => pci-rom-disabled-invalid.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{pci-rom-disabled.xml => pci-rom-disabled.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{pci-rom.xml => pci-rom.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{pci-serial-dev-chardev.xml => pci-serial-dev-chardev.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{pcie-expander-bus.xml => pcie-expander-bus.x86_64-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{pcie-root-port-model-generic.xml => pcie-root-port-model-generic.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{pcie-root-port-model-ioh3420.xml => pcie-root-port-model-ioh3420.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{pcie-root-port.xml => pcie-root-port.x86_64-latest.xml} (85%) create mode 100644 tests/qemuxml2xmloutdata/pcie-root.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/pcie-root.xml rename tests/qemuxml2xmloutdata/{pcie-switch-downstream-port.xml => pcie-switch-downstream-port.x86_64-latest.xml} (92%) create mode 100644 tests/qemuxml2xmloutdata/pcie-switch-upstream-port.x86_64-latest.xml rename tests/qemuxml2xmloutdata/{pcihole64-gib.xml => pcihole64-gib.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{q35.xml => pcihole64-q35.x86_64-latest.xml} (65%) delete mode 100644 tests/qemuxml2xmloutdata/pcihole64-q35.xml rename tests/qemuxml2xmloutdata/{pcihole64.xml => pcihole64.x86_64-latest.xml} (86%) create mode 100644 tests/qemuxml2xmloutdata/pmu-feature-off.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/pmu-feature-off.xml create mode 100644 tests/qemuxml2xmloutdata/pmu-feature.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/pmu-feature.xml rename tests/qemuxml2xmloutdata/{pv-spinlock-disabled.xml => pv-spinlock-disabled.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{pv-spinlock-enabled.xml => pv-spinlock-enabled.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{q35-pci-force-address.xml => q35-pci-force-address.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{q35-usb2-reorder.xml => q35-usb2-multi.x86_64-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{q35-usb2-multi.xml => q35-usb2-reorder.x86_64-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{q35-usb2.xml => q35-usb2.x86_64-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{pcie-switch-upstream-port.xml => q35.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{qemu-ns-no-env.xml => qemu-ns-no-env.x86_64-latest.xml} (82%) create mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml create mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-enabled.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml create mode 100644 tests/qemuxml2xmloutdata/restore-v2.x86_64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/restore-v2.xml rename tests/qemuxml2xmloutdata/{seclabel-dac-none.xml => seclabel-dac-none.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{seclabel-device-multiple.xml => seclabel-device-multiple.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{seclabel-dynamic-none.xml => seclabel-dynamic-none.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{seclabel-none.xml => seclabel-none.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-active.xml => seclabel-static-labelskip-active.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{seclabel-static-labelskip-inactive.xml => seclabel-static-labelskip-inactive.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{seclabel-static.xml => seclabel-static.x86_64-latest.xml} (83%) rename tests/qemuxml2xmloutdata/{serial-debugcon.xml => serial-debugcon.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{serial-spiceport.xml => serial-spiceport.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{serial-target-port-auto.xml => serial-target-port-auto.x86_64-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev-notls.xml => serial-tcp-tlsx509-chardev-notls.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{serial-tcp-tlsx509-chardev.xml => serial-tcp-tlsx509-chardev.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{shmem-plain-doorbell.xml => shmem-plain-doorbell.x86_64-latest.xml} (90%) delete mode 100644 tests/qemuxml2xmloutdata/shmem.xml rename tests/qemuxml2xmloutdata/{smartcard-host.xml => smartcard-controller.x86_64-latest.xml} (78%) rename tests/qemuxml2xmloutdata/{smartcard-host-certificates-database.xml => smartcard-host-certificates-database.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{smartcard-host-certificates.xml => smartcard-host-certificates.x86_64-latest.xml} (80%) rename tests/qemuxml2xmloutdata/{smartcard-controller.xml => smartcard-host.x86_64-latest.xml} (78%) rename tests/qemuxml2xmloutdata/{smartcard-passthrough-spicevmc.xml => smartcard-passthrough-spicevmc.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{smartcard-passthrough-tcp.xml => smartcard-passthrough-tcp.x86_64-latest.xml} (80%) rename tests/qemuxml2xmloutdata/{smbios-multiple-type2.xml => smbios-multiple-type2.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{smbios-type-fwcfg.xml => smbios-type-fwcfg.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{smbios.xml => smbios.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{smp.xml => smp.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{tap-vhost-incorrect.xml => tap-vhost-incorrect.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{tap-vhost.xml => tap-vhost.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{usb-controller-default-q35.xml => usb-controller-default-q35.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{usb-controller-explicit-q35.xml => usb-controller-explicit-q35.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{usb-piix3-controller.xml => usb-controller.x86_64-latest.xml} (81%) rename tests/qemuxml2xmloutdata/{usb-ich9-ehci-addr.xml => usb-ich9-ehci-addr.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{usb-none.xml => usb-none.x86_64-latest.xml} (79%) rename tests/qemuxml2xmloutdata/{usb-controller.xml => usb-piix3-controller.x86_64-latest.xml} (75%) rename tests/qemuxml2xmloutdata/{usb-port-missing.xml => usb-port-missing.x86_64-latest.xml} (79%) rename tests/qemuxml2xmloutdata/{usb-redir-filter-version.xml => usb-redir-filter-version.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{usb-redir-filter.xml => usb-redir-filter.x86_64-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{usb-redir.xml => usb-redir.x86_64-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{vhost_queues.xml => vhost_queues.x86_64-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{video-device-pciaddr-default.xml => video-device-pciaddr-default.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{video-none-device.xml => video-none-device.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{video-qxl-heads.xml => video-qxl-heads.x86_64-latest.xml} (87%) rename tests/qemuxml2xmloutdata/{video-qxl-noheads.xml => video-qxl-noheads.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{video-qxl-resolution.xml => video-qxl-resolution.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-device.xml => video-virtio-gpu-device.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-sdl-gl.xml => video-virtio-gpu-sdl-gl.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-secondary.xml => video-virtio-gpu-secondary.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-spice-gl.xml => video-virtio-gpu-spice-gl.x86_64-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-virgl.xml => video-virtio-gpu-virgl.x86_64-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{virtio-input-passthrough.xml => virtio-input-passthrough.x86_64-latest.xml} (79%) rename tests/qemuxml2xmloutdata/{virtio-input.xml => virtio-input.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{virtio-lun.xml => virtio-lun.x86_64-latest.xml} (92%) rename tests/qemuxml2xmloutdata/{virtio-rng-egd.xml => virtio-rng-egd.x86_64-latest.xml} (80%) rename tests/qemuxml2xmloutdata/{virtio-rng-random.xml => virtio-rng-random.x86_64-latest.xml} (80%) rename tests/qemuxml2xmloutdata/{vmcoreinfo.xml => vmcoreinfo.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{watchdog.xml => watchdog.x86_64-latest.xml} (88%) -- 2.41.0

3 50

[libvirt PATCH] ci: lcitool: Maintain project package deps lists here
by Erik Skultety 22 Aug '23

22 Aug '23

Each respective project that lcitool knows about and currently maintains its list of package dependencies knows best what packages they actually depend on. If a new dependency is currently needed, first a change in lcitool is necessary before GitLab jobs and containers can be updated. Provided a mapping already exists in lcitool (which can quickly be added as an override via mappings.yml temporarily) we speed up the whole CI update process by one step. This patch adds all libvirt deps lists lcitool currently maintains for libvirt. Note that as with any overrides (since commit f199dd50) lcitool must be invoked as '$ lcitool -d/--data-dir ci/lcitool ...' Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- ci/lcitool/projects/libvirt+dist.yml | 3 + ci/lcitool/projects/libvirt+minimal.yml | 23 +++++++ ci/lcitool/projects/libvirt.yml | 80 +++++++++++++++++++++++++ 3 files changed, 106 insertions(+) create mode 100644 ci/lcitool/projects/libvirt+dist.yml create mode 100644 ci/lcitool/projects/libvirt+minimal.yml create mode 100644 ci/lcitool/projects/libvirt.yml diff --git a/ci/lcitool/projects/libvirt+dist.yml b/ci/lcitool/projects/libvirt+dist.yml new file mode 100644 index 0000000000..1fc1b2c971 --- /dev/null +++ b/ci/lcitool/projects/libvirt+dist.yml @@ -0,0 +1,3 @@ +--- +packages: + - libvirt diff --git a/ci/lcitool/projects/libvirt+minimal.yml b/ci/lcitool/projects/libvirt+minimal.yml new file mode 100644 index 0000000000..dbb83a1e36 --- /dev/null +++ b/ci/lcitool/projects/libvirt+minimal.yml @@ -0,0 +1,23 @@ +--- +packages: + - ccache + - cpp + - gcc + - gettext + - glib2 + - gnutls + - libc + - libnl3 + - libnlroute3 + - libtirpc + - libxml2 + - make + - meson + - ninja + - perl + - pkg-config + - python3 + - python3-docutils + - rpcgen + - xmllint + - xsltproc diff --git a/ci/lcitool/projects/libvirt.yml b/ci/lcitool/projects/libvirt.yml new file mode 100644 index 0000000000..0234a1cae3 --- /dev/null +++ b/ci/lcitool/projects/libvirt.yml @@ -0,0 +1,80 @@ +--- +packages: + - apparmor + - augeas + - augeas-lenses + - bash-completion + - ccache + - clang + - codespell + - cpp + - cppi + - cyrus-sasl + - device-mapper + - diffutils + - dlfcn + - dtrace + - dwarves + - ebtables + - firewalld-filesystem + - flake8 + - fuse + - gcc + - gettext + - glib2 + - glusterfs + - gnutls + - grep + - ip + - iptables + - iscsiadm + - libacl + - libattr + - libaudit + - libblkid + - libc + - libcap-ng + - libcurl + - libiscsi + - libnl3 + - libnlroute3 + - libnuma + - libparted + - libpcap + - libpciaccess + - librbd + - libselinux + - libssh + - libssh2 + - libtirpc + - libudev + - libxml2 + - lvm2 + - make + - meson + - modprobe + - netcf + - ninja + - numad + - openwsman + - perl + - pkg-config + - polkit + - portablexdr + - python3 + - python3-docutils + - qemu-img + - readline + - rpcgen + - rpmbuild + - sanlock + - scrub + - sed + - showmount + - systemd-rpm-macros + - tc + - wireshark + - xen + - xmllint + - xsltproc + - yajl -- 2.41.0

2 1

[PATCH 0/9] Clean up _virDomainMemoryDef struct
by Michal Privoznik 21 Aug '23

21 Aug '23

*** BLURB HERE *** Michal Prívozník (9): virt-aa-helper: Rework setting virDomainMemoryDef labels virt-aa-helper: Set label on VIRTIO_PMEM device too qemu_hotplug: validate address on memory device change qemu_hotplug: Don't validate inaccessible fields in qemuDomainChangeMemoryLiveValidateChange() conf: Compare memory device address in virDomainMemoryFindByDefInternal() qemu_driver: validate mem->model on MEMORY_DEVICE_SIZE_CHANGE event src: Move _virDomainMemoryDef source nodes into an union src: Move _virDomainMemoryDef target nodes into an union src: Rename some members of _virDomainMemoryDef struct src/conf/domain_conf.c | 285 +++++++++++++++++++++---------- src/conf/domain_conf.h | 72 +++++--- src/conf/domain_postparse.c | 6 +- src/conf/domain_validate.c | 18 +- src/qemu/qemu_cgroup.c | 12 +- src/qemu/qemu_command.c | 131 ++++++++++---- src/qemu/qemu_domain.c | 13 +- src/qemu/qemu_driver.c | 15 +- src/qemu/qemu_hotplug.c | 62 ++----- src/qemu/qemu_namespace.c | 4 +- src/qemu/qemu_process.c | 14 +- src/qemu/qemu_validate.c | 6 +- src/security/security_apparmor.c | 24 ++- src/security/security_dac.c | 9 +- src/security/security_selinux.c | 52 +++--- src/security/virt-aa-helper.c | 19 ++- 16 files changed, 474 insertions(+), 268 deletions(-) -- 2.41.0

2 11

[libvirt PATCH] qemu: remove pointless qemuDomainLogContextMode
by Ján Tomko 21 Aug '23

21 Aug '23

Since its introduction in 4d1b771fbb610537b7425e649a490143588b8ed3 it has only been used to differentiate between START and non-START. Last use of QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH was removed by: commit f709377301b919a9fcbfc366e33057f7848bee28 qemu: Fix qemuDomainObjTaint with virtlogd QEMU_DOMAIN_LOG_CONTEXT_MODE_STOP is unused since: commit cf3ea0769c54a328733bcb0cd27f546e70090c89 qemu: process: Append the "shutting down" message using the new APIs Now, the only caller passes QEMU_DOMAIN_LOG_CONTEXT_MODE_START. Assume that's always the case and remove the 'mode' argument. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_domain.c | 26 +++++++++++--------------- src/qemu/qemu_domain.h | 9 +-------- src/qemu/qemu_process.c | 3 +-- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 029238a9d7..1269636ce1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7075,8 +7075,7 @@ void qemuDomainObjCheckNetTaint(virQEMUDriver *driver, qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver, - virDomainObj *vm, - qemuDomainLogContextMode mode) + virDomainObj *vm) { g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); qemuDomainLogContext *ctxt = QEMU_DOMAIN_LOG_CONTEXT(g_object_new(QEMU_TYPE_DOMAIN_LOG_CONTEXT, NULL)); @@ -7117,25 +7116,22 @@ qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver, /* For unprivileged startup we must truncate the file since * we can't rely on logrotate. We don't use O_TRUNC since * it is better for SELinux policy if we truncate afterwards */ - if (mode == QEMU_DOMAIN_LOG_CONTEXT_MODE_START && - !driver->privileged && + if (!driver->privileged && ftruncate(ctxt->writefd, 0) < 0) { virReportSystemError(errno, _("failed to truncate %1$s"), ctxt->path); goto error; } - if (mode == QEMU_DOMAIN_LOG_CONTEXT_MODE_START) { - if ((ctxt->readfd = open(ctxt->path, O_RDONLY)) < 0) { - virReportSystemError(errno, _("failed to open logfile %1$s"), - ctxt->path); - goto error; - } - if (virSetCloseExec(ctxt->readfd) < 0) { - virReportSystemError(errno, _("failed to set close-on-exec flag on %1$s"), - ctxt->path); - goto error; - } + if ((ctxt->readfd = open(ctxt->path, O_RDONLY)) < 0) { + virReportSystemError(errno, _("failed to open logfile %1$s"), + ctxt->path); + goto error; + } + if (virSetCloseExec(ctxt->readfd) < 0) { + virReportSystemError(errno, _("failed to set close-on-exec flag on %1$s"), + ctxt->path); + goto error; } if ((ctxt->pos = lseek(ctxt->writefd, 0, SEEK_END)) < 0) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 999190e381..5f42e11428 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -652,15 +652,8 @@ void qemuDomainObjCheckNetTaint(virQEMUDriver *driver, virDomainNetDef *net, qemuDomainLogContext *logCtxt); -typedef enum { - QEMU_DOMAIN_LOG_CONTEXT_MODE_START, - QEMU_DOMAIN_LOG_CONTEXT_MODE_ATTACH, - QEMU_DOMAIN_LOG_CONTEXT_MODE_STOP, -} qemuDomainLogContextMode; - qemuDomainLogContext *qemuDomainLogContextNew(virQEMUDriver *driver, - virDomainObj *vm, - qemuDomainLogContextMode mode); + virDomainObj *vm); int qemuDomainLogContextWrite(qemuDomainLogContext *ctxt, const char *fmt, ...) G_GNUC_PRINTF(2, 3); ssize_t qemuDomainLogContextRead(qemuDomainLogContext *ctxt, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0644f80161..63be899bf1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7612,8 +7612,7 @@ qemuProcessLaunch(virConnectPtr conn, hookData.cfg = cfg; VIR_DEBUG("Creating domain log file"); - if (!(logCtxt = qemuDomainLogContextNew(driver, vm, - QEMU_DOMAIN_LOG_CONTEXT_MODE_START))) { + if (!(logCtxt = qemuDomainLogContextNew(driver, vm))) { virLastErrorPrefixMessage("%s", _("can't connect to virtlogd")); goto cleanup; } -- 2.41.0

2 1

[PATCH] test: qemu: Update qemu-8.1 test data on x86_64
by Peter Krempa 21 Aug '23

21 Aug '23

Update to v8.1.0-rc2-114-g64d3be986f Notable changes: - 'dirty-limit' migration feature added - 'vcpu-dirty-limit', 'x-vcpu-dirty-limit-period' parameters added - 'dirty-limit-ring-full-time', 'dirty-limit-throttle-time-per-round' statistics added - migration statistic of number of skipped zero pages is now deprecated Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .../caps_8.1.0_x86_64.replies | 55 +++++++++++++++++-- .../caps_8.1.0_x86_64.xml | 4 +- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies index ed296e05cd..9c5194f629 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.replies @@ -17,11 +17,11 @@ { "return": { "qemu": { - "micro": 50, + "micro": 92, "minor": 0, "major": 8 }, - "package": "v8.0.0-2835-g361d539735" + "package": "v8.1.0-rc2-114-g64d3be986f" }, "id": "libvirt-2" } @@ -5554,6 +5554,16 @@ "name": "socket-address", "default": null, "type": "[377]" + }, + { + "name": "dirty-limit-throttle-time-per-round", + "default": null, + "type": "int" + }, + { + "name": "dirty-limit-ring-full-time", + "default": null, + "type": "int" } ], "meta-type": "object" @@ -5727,6 +5737,19 @@ "name": "block-bitmap-mapping", "default": null, "type": "[421]" + }, + { + "name": "x-vcpu-dirty-limit-period", + "default": null, + "type": "int", + "features": [ + "unstable" + ] + }, + { + "name": "vcpu-dirty-limit", + "default": null, + "type": "int" } ], "meta-type": "object" @@ -5871,6 +5894,19 @@ "name": "block-bitmap-mapping", "default": null, "type": "[421]" + }, + { + "name": "x-vcpu-dirty-limit-period", + "default": null, + "type": "int", + "features": [ + "unstable" + ] + }, + { + "name": "vcpu-dirty-limit", + "default": null, + "type": "int" } ], "meta-type": "object" @@ -13515,7 +13551,10 @@ }, { "name": "skipped", - "type": "int" + "type": "int", + "features": [ + "deprecated" + ] }, { "name": "normal", @@ -13721,6 +13760,9 @@ }, { "name": "switchover-ack" + }, + { + "name": "dirty-limit" } ], "meta-type": "enum", @@ -13746,7 +13788,8 @@ "background-snapshot", "zero-copy-send", "postcopy-preempt", - "switchover-ack" + "switchover-ack", + "dirty-limit" ] }, { @@ -36928,6 +36971,10 @@ { "state": false, "capability": "switchover-ack" + }, + { + "state": false, + "capability": "dirty-limit" } ], "id": "libvirt-45" diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml index e656a2024a..d1bf1a3f7e 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -204,9 +204,9 @@ <flag name='rbd-encryption-luks-any'/> <flag name='qcow2-discard-no-unref'/> <flag name='run-with.async-teardown'/> - <version>8000050</version> + <version>8000092</version> <microcodeVersion>43100245</microcodeVersion> - <package>v8.0.0-2835-g361d539735</package> + <package>v8.1.0-rc2-114-g64d3be986f</package> <arch>x86_64</arch> <hostCPU type='kvm' model='base' migratability='yes'> <property name='avx-ne-convert' type='boolean' value='false'/> -- 2.41.0

2 2

[PATCH] qemu_domain: Drop unused variables from qemuDomainChrDefDropDefaultPath()
by Michal Privoznik 17 Aug '23

17 Aug '23

In mu previous commits I've moved internals of qemuDomainChrDefDropDefaultPath() into a separate function (qemuDomainChrMatchDefaultPath()) but forgot to remove @buf and @regexp variables which are now unused. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_domain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d46516856e..f64836fbb1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5452,8 +5452,6 @@ qemuDomainChrDefDropDefaultPath(virDomainChrDef *chr, virQEMUDriver *driver) { g_autoptr(virQEMUDriverConfig) cfg = NULL; - g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; - g_autofree char *regexp = NULL; if (chr->deviceType != VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL || chr->targetType != VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO || -- 2.41.0

1 0

[PATCH RESEND 0/2] qemu: generate shorter channel target paths
by Michal Privoznik 17 Aug '23

17 Aug '23

This is a resend of: https://listman.redhat.com/archives/libvir-list/2023-July/240904.html Diff to previous version: - s/9.6.0/9.7.0/ because of missed release Michal Prívozník (2): qemu: Generate shorter channel target paths qemu: Move channelTargetDir into stateDir libvirt.spec.in | 2 - src/qemu/qemu_conf.c | 9 +-- src/qemu/qemu_domain.c | 65 ++++++++++++++++--- .../qemuhotplug-qemu-agent-detach.xml | 2 +- .../qemuhotplug-base+qemu-agent-detach.xml | 2 +- .../qemuhotplug-base+qemu-agent.xml | 2 +- ...emuhotplug-base-live+qemu-agent-detach.xml | 2 +- .../qemuhotplug-base-live+qemu-agent.xml | 2 +- .../channel-unix-source-path.xml | 8 +++ .../channel-unix-source-path-active.xml | 10 +++ .../channel-unix-source-path-inactive.xml | 8 +++ tests/testutilsqemu.c | 2 +- 12 files changed, 90 insertions(+), 24 deletions(-) -- 2.41.0

2 3

Plans for 9.7.0 release (freeze on Monday 28 Aug)
by Jiri Denemark 17 Aug '23

17 Aug '23

We are getting close to 9.7.0 release of libvirt. To aim for the release on Friday 01 Sep I suggest entering the freeze on Monday 28 Aug and tagging RC2 on Wednesday 30 Aug. I hope this works for everyone. Jirka

1 0

[PATCH 0/5] Allow 'optional' on async-teardown
by Boris Fiuczynski 17 Aug '23

17 Aug '23

Adding the value 'optional' to attribute 'enabled' on the element async-teardown to provide the optional use of the feature if it is provided by QEMU. Boris Fiuczynski (5): schemas: Add virYesNoOptional util: Add virQuadstateOption and helpers virxml: Add virXMLPropQuadstateOption conf: Add 'optional' to feature async-teardown conf: Ensure migratability if enabled is 'optional' docs/formatdomain.rst | 7 +-- src/conf/domain_conf.c | 22 +++++---- src/conf/schemas/basictypes.rng | 8 ++++ src/conf/schemas/domaincommon.rng | 2 +- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 6 ++- src/qemu/qemu_process.c | 18 ++++++++ src/qemu/qemu_validate.c | 2 +- src/util/virenum.c | 46 +++++++++++++++++++ src/util/virenum.h | 15 ++++++ src/util/virxml.c | 28 +++++++++++ src/util/virxml.h | 7 +++ ...0-async-teardown-optional.s390x-6.0.0.args | 35 ++++++++++++++ ...-async-teardown-optional.s390x-latest.args | 36 +++++++++++++++ .../s390-async-teardown-optional.xml | 24 ++++++++++ tests/qemuxml2argvtest.c | 2 + 16 files changed, 243 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-optional.s390x-6.0.0.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-optional.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-optional.xml -- 2.41.0

2 6

[libvirt PATCH 00/21] qemu: Various fixes to firmware selection
by Andrea Bolognani 16 Aug '23

16 Aug '23

Also available from GitLab: $ git fetch https://gitlab.com/abologna/libvirt.git firmware Patch 11/21 is kind of an unreviewable mess, but it can't really be split into more reasonably-sized pieces while preserving bisectability. I have pushed an alternative version that should make things a bit less painful, grab it with: $ git fetch https://gitlab.com/abologna/libvirt.git firmware-reviewable Details are included in the various patches or in the relevant issues: https://bugzilla.redhat.com/show_bug.cgi?id=2196178 https://gitlab.com/libvirt/libvirt/-/issues/500 but the tl;dr is that the changes made to firmware selection in libvirt 9.2.0 have unfortunately introduced a number of regression, which this series addresses. The first few patches are preparatory / tangential cleanups, while the last few implement quality of life improvements rather than actual fixes. They all touch the same areas, so it seemed reasonable to bundle them. Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/962320409 Andrea Bolognani (21): tests: Use DO_TEST_CAPS_*_ABI_UPDATE() for ppc64 tests: Switch to firmware autoselection for hvf tests: Use virt-4.0 machine type for aarch64 tests: Consistently use /path/to/guest_VARS.fd tests: Turn abi-update.xml into a symlink tests: Rename firmware-auto-efi-nvram-path qemu: Fix return value for qemuFirmwareFillDomainLegacy() qemu: Fix lookup against stateless/combined pflash tests: Add some more DO_TEST*ABI_UPDATE* macros tests: Add more tests for firmware selection tests: Update firmware descriptor files tests: Drop tags from BIOS firmware descriptor tests: Include microvm in firmwaretest qemu: Don't overwrite NVRAM template for legacy firmware qemu: Generate NVRAM path in more cases qemu: Filter firmware based on loader.readonly qemu: Match NVRAM template extension for new domains conf: Don't default to raw format for loader/NVRAM tests: Rename firmware-auto-efi-format-loader-qcow2-nvram-path tests: Reintroduce firmware-auto-efi-format-mismatch NEWS: Mention fixes to firmware selection NEWS.rst | 6 + src/bhyve/bhyve_firmware.c | 3 + src/conf/domain_conf.c | 21 ++- src/libxl/libxl_conf.c | 15 +- src/libxl/xen_xl.c | 2 + src/libxl/xen_xm.c | 1 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_firmware.c | 158 ++++++++++++++---- src/qemu/qemu_firmware.h | 3 +- src/qemu/qemu_process.c | 2 +- .../etc/qemu/firmware/20-bios.json | 1 + .../etc/qemu/firmware/40-ovmf-sb-keys.json | 1 - .../etc/qemu/firmware/59-combined.json | 1 + .../{42-masked.json => 92-masked.json} | 0 ...ovmf.json => 60-edk2-ovmf-x64-amdsev.json} | 11 +- .../firmware/60-edk2-ovmf-x64-inteltdx.json} | 9 +- ...0-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json} | 10 +- ... 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json} | 6 +- .../40-edk2-ovmf-4m-qcow2-x64-sb.json} | 16 +- ...b.json => 41-edk2-ovmf-2m-raw-x64-sb.json} | 7 +- ...-qcow2.json => 50-edk2-aarch64-qcow2.json} | 14 +- ...on => 50-edk2-ovmf-4m-qcow2-x64-nosb.json} | 9 +- .../firmware/50-edk2-ovmf-x64-microvm.json | 22 +++ ...70-aavmf.json => 51-edk2-aarch64-raw.json} | 11 +- ...json => 51-edk2-ovmf-2m-raw-x64-nosb.json} | 8 +- ...son => 52-edk2-aarch64-verbose-qcow2.json} | 16 +- .../53-edk2-aarch64-verbose-raw.json} | 10 +- ...less.json => 60-edk2-ovmf-x64-amdsev.json} | 6 +- ...ss.json => 60-edk2-ovmf-x64-inteltdx.json} | 8 +- ...ovmf-sb-combined.json => 90-combined.json} | 4 +- .../firmware/{40-bios.json => 91-bios.json} | 3 - .../{42-masked.json => 92-masked.json} | 0 tests/qemufirmwaretest.c | 79 +++++---- .../aarch64-virt-graphics.aarch64-latest.args | 6 +- .../aarch64-virt-graphics.xml | 6 +- .../aarch64-virt-headless.aarch64-latest.args | 6 +- .../aarch64-virt-headless.xml | 6 +- ...mware-auto-efi-aarch64.aarch64-latest.args | 2 +- ...efi-abi-update-aarch64.aarch64-latest.args | 2 +- .../firmware-auto-efi-abi-update-aarch64.xml | 18 +- ...re-auto-efi-abi-update.x86_64-latest.args} | 5 +- .../firmware-auto-efi-abi-update.xml | 1 + ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 +- ...oader-qcow2-nvram-path.x86_64-latest.args} | 5 +- ...to-efi-format-loader-qcow2-nvram-path.xml} | 2 +- ...efi-format-loader-qcow2.x86_64-latest.args | 5 +- ...loader-raw-abi-update.aarch64-latest.args} | 4 +- ...-auto-efi-format-loader-raw-abi-update.xml | 1 + ...-efi-format-loader-raw.aarch64-latest.args | 2 +- .../firmware-auto-efi-format-mismatch.xml | 2 +- ...nvram-qcow2-network-nbd.x86_64-latest.args | 2 +- ...format-nvram-qcow2-path.x86_64-latest.args | 5 +- ...-efi-format-nvram-qcow2.x86_64-latest.args | 5 +- ...uto-efi-loader-insecure.x86_64-latest.args | 2 +- ...re-auto-efi-loader-path.x86_64-latest.args | 2 +- .../firmware-auto-efi-loader-path.xml | 2 +- ...ader-secure-abi-update.x86_64-latest.args} | 5 +- ...ware-auto-efi-loader-secure-abi-update.xml | 1 + ...-auto-efi-loader-secure.x86_64-latest.args | 2 +- ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 +- ...are-auto-efi-no-secboot.x86_64-latest.args | 2 +- ...are-auto-efi-nvram-file.x86_64-latest.args | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...o-efi-nvram-network-nbd.x86_64-latest.args | 2 +- ...re-auto-efi-nvram-path.x86_64-latest.args} | 2 +- ...m.xml => firmware-auto-efi-nvram-path.xml} | 0 ...ram-template-nonstandard.x86_64-latest.err | 1 + ...e-auto-efi-nvram-template-nonstandard.xml} | 4 +- ...uto-efi-nvram-template.x86_64-latest.args} | 2 +- ...l => firmware-auto-efi-nvram-template.xml} | 2 +- ...e-auto-efi-rw-abi-update.x86_64-latest.err | 1 + .../firmware-auto-efi-rw-abi-update.xml | 1 + .../firmware-auto-efi-rw.x86_64-latest.err | 1 + ...efi-nvram.xml => firmware-auto-efi-rw.xml} | 2 +- ...rmware-auto-efi-secboot.x86_64-latest.args | 2 +- ...rmware-auto-efi-smm-off.x86_64-latest.args | 2 +- ...ware-auto-efi-stateless.x86_64-latest.args | 2 +- .../firmware-auto-efi.x86_64-latest.args | 2 +- ...-aarch64-legacy-paths.aarch64-latest.args} | 0 ...mware-manual-efi-aarch64-legacy-paths.xml} | 2 +- ...anual-efi-acpi-aarch64.aarch64-latest.args | 4 +- .../firmware-manual-efi-acpi-aarch64.xml | 4 +- ...are-manual-efi-acpi-q35.x86_64-latest.args | 2 +- .../firmware-manual-efi-acpi-q35.xml | 2 +- ...are-manual-efi-features.x86_64-latest.args | 2 +- .../firmware-manual-efi-features.xml | 2 +- ...oader-path-nonstandard.x86_64-latest.args} | 4 +- ...re-manual-efi-loader-path-nonstandard.xml} | 4 +- ...anual-efi-loader-secure.x86_64-latest.args | 2 +- .../firmware-manual-efi-loader-secure.xml | 2 +- ...lled-keys-legacy-paths.x86_64-latest.args} | 2 +- ...ual-efi-no-enrolled-keys-legacy-paths.xml} | 2 +- ...al-efi-no-enrolled-keys.x86_64-latest.args | 2 +- .../firmware-manual-efi-no-enrolled-keys.xml | 4 +- ...o-secboot-legacy-paths.x86_64-latest.args} | 2 +- ...re-manual-efi-no-secboot-legacy-paths.xml} | 2 +- ...e-manual-efi-no-secboot.x86_64-latest.args | 2 +- .../firmware-manual-efi-no-secboot.xml | 4 +- ...ual-efi-noacpi-aarch64.aarch64-latest.args | 4 +- .../firmware-manual-efi-noacpi-aarch64.xml | 4 +- .../firmware-manual-efi-noacpi-q35.xml | 2 +- ...e-manual-efi-nvram-file.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-file.xml | 2 +- ...efi-nvram-network-iscsi.x86_64-latest.args | 2 +- ...irmware-manual-efi-nvram-network-iscsi.xml | 2 +- ...l-efi-nvram-network-nbd.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-network-nbd.xml | 2 +- .../firmware-manual-efi-nvram-stateless.xml | 2 +- ...m-template-nonstandard.x86_64-latest.args} | 2 +- ...manual-efi-nvram-template-nonstandard.xml} | 6 +- ...re-manual-efi-nvram-template-stateless.xml | 4 +- ...nual-efi-nvram-template.x86_64-latest.args | 2 +- .../firmware-manual-efi-nvram-template.xml | 4 +- ...al-efi-rw-legacy-paths.x86_64-latest.args} | 6 +- ...> firmware-manual-efi-rw-legacy-paths.xml} | 6 +- ...al-efi-rw-modern-paths.x86_64-latest.args} | 6 +- ...> firmware-manual-efi-rw-modern-paths.xml} | 6 +- ...i-secboot-legacy-paths.x86_64-latest.args} | 2 +- ...mware-manual-efi-secboot-legacy-paths.xml} | 2 +- ...ware-manual-efi-secboot.x86_64-latest.args | 2 +- .../firmware-manual-efi-secboot.xml | 4 +- ...re-manual-efi-stateless.x86_64-latest.args | 2 +- .../firmware-manual-efi-stateless.xml | 2 +- .../firmware-manual-efi.x86_64-latest.args | 2 +- .../qemuxml2argvdata/firmware-manual-efi.xml | 2 +- ...-aarch64-virt-headless.aarch64-latest.args | 4 +- .../hvf-aarch64-virt-headless.xml | 6 +- ...hvf-x86_64-q35-headless.x86_64-latest.args | 7 +- .../hvf-x86_64-q35-headless.xml | 4 +- ...nvdimm-ppc64-abi-update.ppc64-latest.args} | 0 ...ppc64-nonuma-abi-update.ppc64-latest.args} | 0 ...sb-controller-qemu-xhci.ppc64-latest.args} | 0 .../pvpanic-pci-aarch64.aarch64-latest.args | 2 +- ...pci-no-address-aarch64.aarch64-latest.args | 2 +- .../virtio-iommu-aarch64.aarch64-latest.args | 2 +- tests/qemuxml2argvtest.c | 54 ++++-- .../aarch64-virt-graphics.aarch64-latest.xml | 12 +- .../aarch64-virt-headless.aarch64-latest.xml | 12 +- ...rmware-auto-efi-aarch64.aarch64-latest.xml | 4 +- ...-efi-abi-update-aarch64.aarch64-latest.xml | 4 +- ...are-auto-efi-abi-update.x86_64-latest.xml} | 4 +- ...e-auto-efi-enrolled-keys.x86_64-latest.xml | 4 +- ...loader-qcow2-nvram-path.x86_64-latest.xml} | 4 +- ...-efi-format-loader-qcow2.x86_64-latest.xml | 9 +- ...-loader-raw-abi-update.aarch64-latest.xml} | 4 +- ...o-efi-format-loader-raw.aarch64-latest.xml | 4 +- ...-nvram-qcow2-network-nbd.x86_64-latest.xml | 2 +- ...-format-nvram-qcow2-path.x86_64-latest.xml | 9 +- ...o-efi-format-nvram-qcow2.x86_64-latest.xml | 9 +- ...auto-efi-loader-insecure.x86_64-latest.xml | 4 +- ...are-auto-efi-loader-path.x86_64-latest.xml | 4 +- ...oader-secure-abi-update.x86_64-latest.xml} | 4 +- ...e-auto-efi-loader-secure.x86_64-latest.xml | 4 +- ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 4 +- ...ware-auto-efi-no-secboot.x86_64-latest.xml | 4 +- ...ware-auto-efi-nvram-file.x86_64-latest.xml | 4 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- ...to-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- ...are-auto-efi-nvram-path.x86_64-latest.xml} | 4 +- ...am-template-nonstandard.x86_64-latest.xml} | 7 +- ...auto-efi-nvram-template.x86_64-latest.xml} | 4 +- ...=> firmware-auto-efi-rw.x86_64-latest.xml} | 6 +- ...irmware-auto-efi-secboot.x86_64-latest.xml | 4 +- ...irmware-auto-efi-smm-off.x86_64-latest.xml | 4 +- ...mware-auto-efi-stateless.x86_64-latest.xml | 2 +- .../firmware-auto-efi.x86_64-latest.xml | 4 +- ...i-aarch64-legacy-paths.aarch64-latest.xml} | 6 +- ...manual-efi-acpi-aarch64.aarch64-latest.xml | 4 +- ...ware-manual-efi-acpi-q35.x86_64-latest.xml | 4 +- ...ware-manual-efi-features.x86_64-latest.xml | 4 +- ...loader-path-nonstandard.x86_64-latest.xml} | 11 +- ...manual-efi-loader-secure.x86_64-latest.xml | 4 +- ...olled-keys-legacy-paths.x86_64-latest.xml} | 8 +- ...ual-efi-no-enrolled-keys.x86_64-latest.xml | 4 +- ...no-secboot-legacy-paths.x86_64-latest.xml} | 8 +- ...re-manual-efi-no-secboot.x86_64-latest.xml | 4 +- ...nual-efi-noacpi-aarch64.aarch64-latest.xml | 4 +- ...re-manual-efi-nvram-file.x86_64-latest.xml | 4 +- ...-efi-nvram-network-iscsi.x86_64-latest.xml | 2 +- ...al-efi-nvram-network-nbd.x86_64-latest.xml | 2 +- ...am-template-nonstandard.x86_64-latest.xml} | 9 +- ...anual-efi-nvram-template.x86_64-latest.xml | 4 +- ...ual-efi-rw-legacy-paths.x86_64-latest.xml} | 10 +- ...ual-efi-rw-modern-paths.x86_64-latest.xml} | 10 +- ...fi-secboot-legacy-paths.x86_64-latest.xml} | 8 +- ...mware-manual-efi-secboot.x86_64-latest.xml | 4 +- ...are-manual-efi-stateless.x86_64-latest.xml | 2 +- .../firmware-manual-efi.x86_64-latest.xml | 4 +- ...f-aarch64-virt-headless.aarch64-latest.xml | 10 +- .../hvf-x86_64-q35-headless.x86_64-latest.xml | 11 +- ...-nvdimm-ppc64-abi-update.ppc64-latest.xml} | 0 ...-ppc64-nonuma-abi-update.ppc64-latest.xml} | 0 .../pvpanic-pci-aarch64.aarch64-latest.xml | 4 +- ...-pci-no-address-aarch64.aarch64-latest.xml | 4 +- .../virtio-iommu-aarch64.aarch64-latest.xml | 4 +- tests/qemuxml2xmltest.c | 30 +++- 196 files changed, 655 insertions(+), 491 deletions(-) create mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/20-bios.json delete mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/40-ovmf-sb-keys.json create mode 120000 tests/qemufirmwaredata/etc/qemu/firmware/59-combined.json rename tests/qemufirmwaredata/etc/qemu/firmware/{42-masked.json => 92-masked.json} (100%) rename tests/qemufirmwaredata/out/usr/share/qemu/firmware/{61-ovmf.json => 60-edk2-ovmf-x64-amdsev.json} (60%) copy tests/qemufirmwaredata/{usr/share/qemu/firmware/45-ovmf-sev-stateless.json => out/usr/share/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json} (63%) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{50-ovmf-sb-keys.json => 30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json} (70%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{50-ovmf-sb-keys.json => 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json} (78%) rename tests/qemufirmwaredata/{out/usr/share/qemu/firmware/50-ovmf-sb-keys.json => usr/share/qemu/firmware/40-edk2-ovmf-4m-qcow2-x64-sb.json} (59%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{60-ovmf-sb.json => 41-edk2-ovmf-2m-raw-x64-sb.json} (77%) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{66-aavmf-qcow2.json => 50-edk2-aarch64-qcow2.json} (53%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{65-ovmf-qcow2.json => 50-edk2-ovmf-4m-qcow2-x64-nosb.json} (68%) create mode 100644 tests/qemufirmwaredata/usr/share/qemu/firmware/50-edk2-ovmf-x64-microvm.json rename tests/qemufirmwaredata/usr/share/qemu/firmware/{70-aavmf.json => 51-edk2-aarch64-raw.json} (64%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{61-ovmf.json => 51-edk2-ovmf-2m-raw-x64-nosb.json} (69%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{66-aavmf-qcow2.json => 52-edk2-aarch64-verbose-qcow2.json} (53%) rename tests/qemufirmwaredata/{out/usr/share/qemu/firmware/70-aavmf.json => usr/share/qemu/firmware/53-edk2-aarch64-verbose-raw.json} (57%) copy tests/qemufirmwaredata/usr/share/qemu/firmware/{45-ovmf-sev-stateless.json => 60-edk2-ovmf-x64-amdsev.json} (73%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{45-ovmf-sev-stateless.json => 60-edk2-ovmf-x64-inteltdx.json} (66%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{55-ovmf-sb-combined.json => 90-combined.json} (85%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{40-bios.json => 91-bios.json} (87%) rename tests/qemufirmwaredata/usr/share/qemu/firmware/{42-masked.json => 92-masked.json} (100%) mode change 100644 => 120000 tests/qemuxml2argvdata/firmware-auto-efi-abi-update-aarch64.xml copy tests/qemuxml2argvdata/{firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args => firmware-auto-efi-abi-update.x86_64-latest.args} (80%) create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-abi-update.xml copy tests/qemuxml2argvdata/{firmware-auto-efi-format-nvram-qcow2-path.x86_64-latest.args => firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.args} (80%) copy tests/qemuxml2argvdata/{firmware-auto-efi-format-mismatch.xml => firmware-auto-efi-format-loader-qcow2-nvram-path.xml} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-format-loader-raw.aarch64-latest.args => firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.args} (84%) create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-format-loader-raw-abi-update.xml copy tests/qemuxml2argvdata/{firmware-auto-efi-format-nvram-qcow2.x86_64-latest.args => firmware-auto-efi-loader-secure-abi-update.x86_64-latest.args} (80%) create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-loader-secure-abi-update.xml rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.x86_64-latest.args => firmware-auto-efi-nvram-path.x86_64-latest.args} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-nvram-path.xml} (100%) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.err copy tests/qemuxml2argvdata/{firmware-auto-efi-format-mismatch.xml => firmware-auto-efi-nvram-template-nonstandard.xml} (77%) copy tests/qemuxml2argvdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.args => firmware-auto-efi-nvram-template.x86_64-latest.args} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-nvram-template.xml} (88%) create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.x86_64-latest.err create mode 120000 tests/qemuxml2argvdata/firmware-auto-efi-rw-abi-update.xml create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-rw.x86_64-latest.err copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-auto-efi-rw.xml} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-aarch64.aarch64-latest.args => firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.args} (100%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-aarch64.xml => firmware-manual-efi-aarch64-legacy-paths.xml} (90%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.args => firmware-manual-efi-loader-path-nonstandard.x86_64-latest.args} (90%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.xml => firmware-manual-efi-loader-path-nonstandard.xml} (78%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.args} (99%) copy tests/qemuxml2argvdata/{firmware-manual-efi-loader-secure.xml => firmware-manual-efi-no-enrolled-keys-legacy-paths.xml} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.args => firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.args} (99%) copy tests/qemuxml2argvdata/{firmware-manual-efi-acpi-q35.xml => firmware-manual-efi-no-secboot-legacy-paths.xml} (90%) copy tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.args => firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.args} (91%) copy tests/qemuxml2argvdata/{firmware-auto-efi-format-mismatch.xml => firmware-manual-efi-nvram-template-nonstandard.xml} (75%) copy tests/qemuxml2argvdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-manual-efi-rw-legacy-paths.x86_64-latest.args} (81%) copy tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-manual-efi-rw-legacy-paths.xml} (79%) copy tests/qemuxml2argvdata/{firmware-auto-efi-stateless.x86_64-latest.args => firmware-manual-efi-rw-modern-paths.x86_64-latest.args} (80%) rename tests/qemuxml2argvdata/{firmware-auto-efi-nvram.xml => firmware-manual-efi-rw-modern-paths.xml} (78%) copy tests/qemuxml2argvdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.args => firmware-manual-efi-secboot-legacy-paths.x86_64-latest.args} (99%) copy tests/qemuxml2argvdata/{firmware-manual-efi-loader-secure.xml => firmware-manual-efi-secboot-legacy-paths.xml} (90%) rename tests/qemuxml2argvdata/{memory-hotplug-nvdimm-ppc64-abi-update.args => memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args} (100%) rename tests/qemuxml2argvdata/{memory-hotplug-ppc64-nonuma-abi-update.args => memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.args} (100%) rename tests/qemuxml2argvdata/{ppc64-usb-controller-qemu-xhci.args => ppc64-usb-controller-qemu-xhci.ppc64-latest.args} (100%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-abi-update.x86_64-latest.xml} (82%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-format-loader-qcow2-nvram-path.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-auto-efi-format-loader-raw-abi-update.aarch64-latest.xml} (81%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-loader-secure-abi-update.x86_64-latest.xml} (82%) rename tests/qemuxml2xmloutdata/{firmware-auto-efi-nvram.x86_64-latest.xml => firmware-auto-efi-nvram-path.x86_64-latest.xml} (90%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-nvram-template-nonstandard.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml => firmware-auto-efi-nvram-template.x86_64-latest.xml} (90%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-auto-efi-rw.x86_64-latest.xml} (83%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-aarch64.aarch64-latest.xml => firmware-manual-efi-aarch64-legacy-paths.aarch64-latest.xml} (87%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-loader-path-nonstandard.x86_64-latest.xml} (80%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-no-enrolled-keys.x86_64-latest.xml => firmware-manual-efi-no-enrolled-keys-legacy-paths.x86_64-latest.xml} (88%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-loader-path.x86_64-latest.xml => firmware-manual-efi-no-secboot-legacy-paths.x86_64-latest.xml} (87%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-nvram-template-nonstandard.x86_64-latest.xml} (81%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-rw-legacy-paths.x86_64-latest.xml} (80%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-stateless.x86_64-latest.xml => firmware-manual-efi-rw-modern-paths.x86_64-latest.xml} (80%) copy tests/qemuxml2xmloutdata/{firmware-auto-efi-secboot.x86_64-latest.xml => firmware-manual-efi-secboot-legacy-paths.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{memory-hotplug-nvdimm-ppc64-abi-update.xml => memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memory-hotplug-ppc64-nonuma-abi-update.xml => memory-hotplug-ppc64-nonuma-abi-update.ppc64-latest.xml} (100%) -- 2.41.0

2 22

[PATCH 0/3] meson: Drop python3_prog
by Michal Privoznik 16 Aug '23

16 Aug '23

Found these on a forgotten local branch. I only vaguely recall the reasoning, but hey - some lines are removed. Michal Prívozník (3): scripts: Avoid spawning yet another process in meson-python.sh scripts: Make standalone python scripts executable meson: Drop python3_prog docs/meson.build | 7 ++--- meson.build | 4 +-- scripts/check-drivername.py | 0 scripts/check-remote-protocol.py | 0 scripts/header-ifdef.py | 0 scripts/meson-install-dirs.py | 0 scripts/meson-install-symlink.py | 0 scripts/meson-python.sh | 2 +- scripts/mock-noinline.py | 0 scripts/prohibit-duplicate-header.py | 0 src/access/meson.build | 6 ++-- src/meson.build | 43 +++++++++++++--------------- src/network/meson.build | 2 +- src/qemu/meson.build | 2 +- tests/meson.build | 2 +- 15 files changed, 32 insertions(+), 36 deletions(-) mode change 100644 => 100755 scripts/check-drivername.py mode change 100644 => 100755 scripts/check-remote-protocol.py mode change 100644 => 100755 scripts/header-ifdef.py mode change 100644 => 100755 scripts/meson-install-dirs.py mode change 100644 => 100755 scripts/meson-install-symlink.py mode change 100644 => 100755 scripts/mock-noinline.py mode change 100644 => 100755 scripts/prohibit-duplicate-header.py -- 2.41.0

4 9

[libvirt PATCH 0/2] ci: Introduce Debian 12 target
by Erik Skultety 16 Aug '23

16 Aug '23

This miniseries also moves the CI workloads from Debian 11 to 12 and marks 11 jobs as optional (just like we did for Debian 10 in the past). Erik Skultety (2): ci: Add Debian-12 target ci: Move Debian-11 workloads to Debian-12 ci/buildenv/debian-12-cross-aarch64.sh | 115 ++++++++++ ci/buildenv/debian-12-cross-armv6l.sh | 114 +++++++++ ci/buildenv/debian-12-cross-armv7l.sh | 115 ++++++++++ ci/buildenv/debian-12-cross-i686.sh | 114 +++++++++ ci/buildenv/debian-12-cross-mips64el.sh | 114 +++++++++ ci/buildenv/debian-12-cross-mipsel.sh | 114 +++++++++ ci/buildenv/debian-12-cross-ppc64le.sh | 114 +++++++++ ci/buildenv/debian-12-cross-s390x.sh | 114 +++++++++ ci/buildenv/debian-12.sh | 97 ++++++++ .../debian-12-cross-aarch64.Dockerfile | 121 ++++++++++ .../debian-12-cross-armv6l.Dockerfile | 120 ++++++++++ .../debian-12-cross-armv7l.Dockerfile | 121 ++++++++++ ci/containers/debian-12-cross-i686.Dockerfile | 120 ++++++++++ .../debian-12-cross-mips64el.Dockerfile | 120 ++++++++++ .../debian-12-cross-mipsel.Dockerfile | 120 ++++++++++ .../debian-12-cross-ppc64le.Dockerfile | 120 ++++++++++ .../debian-12-cross-s390x.Dockerfile | 120 ++++++++++ ci/containers/debian-12.Dockerfile | 100 ++++++++ ci/gitlab/builds.yml | 216 ++++++++++++++++++ ci/gitlab/containers.yml | 72 ++++++ ci/manifest.yml | 40 ++++ 21 files changed, 2401 insertions(+) create mode 100644 ci/buildenv/debian-12-cross-aarch64.sh create mode 100644 ci/buildenv/debian-12-cross-armv6l.sh create mode 100644 ci/buildenv/debian-12-cross-armv7l.sh create mode 100644 ci/buildenv/debian-12-cross-i686.sh create mode 100644 ci/buildenv/debian-12-cross-mips64el.sh create mode 100644 ci/buildenv/debian-12-cross-mipsel.sh create mode 100644 ci/buildenv/debian-12-cross-ppc64le.sh create mode 100644 ci/buildenv/debian-12-cross-s390x.sh create mode 100644 ci/buildenv/debian-12.sh create mode 100644 ci/containers/debian-12-cross-aarch64.Dockerfile create mode 100644 ci/containers/debian-12-cross-armv6l.Dockerfile create mode 100644 ci/containers/debian-12-cross-armv7l.Dockerfile create mode 100644 ci/containers/debian-12-cross-i686.Dockerfile create mode 100644 ci/containers/debian-12-cross-mips64el.Dockerfile create mode 100644 ci/containers/debian-12-cross-mipsel.Dockerfile create mode 100644 ci/containers/debian-12-cross-ppc64le.Dockerfile create mode 100644 ci/containers/debian-12-cross-s390x.Dockerfile create mode 100644 ci/containers/debian-12.Dockerfile -- 2.41.0

2 4

[libvirt PATCH 0/2] Fix the failing FreeBSD 13.1 CI build job
by Erik Skultety 16 Aug '23

16 Aug '23

failing CI job reference: https://gitlab.com/libvirt/libvirt/-/jobs/4880861477 Even though 13.1 has been marked as EOL and we are rightfully permitted to bump the version, we can't/shouldn't fix this directly in lcitool just yet, because libosinfo hasn't caught up on this fact yet and if we just bumped the cirrus version in the lcitool target OS config without updating the libosinfo ID we'd create a consistency problem. However, thanks to Paolo Bonzini's work on lcitool we have an easy workaround fix at hand where we can override many data-related things in lcitool. Erik Skultety (2): ci: Introduce a new 'lcitool' data directory ci: Udate FreeBSD-13 image with lcitool manifest ci/gitlab/builds.yml | 2 +- ci/lcitool/targets/freebsd-13.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 ci/lcitool/targets/freebsd-13.yml -- 2.41.0

2 4

Does libvirt support intra-host migration?
by Eric Wheeler 15 Aug '23

15 Aug '23

Hello all: I looked around for documentation on intra-host KVM migration but haven't found much. For example, this could be useful to "migrate" VM to run on an upgraded version of `qemu-kvm` without migrating to a different host and migrating back. We tested migrating a VM to the same host on an old version of libvirt (el7), and it complained about UUID conflicts if the destination already hosts the same VM. Changing the name or the UUID in the destination XML during migration (`virsh migrate --xml`) gives an error that the UUID or name does not match during migration: UUID change: error: unsupported configuration: Target domain uuid 66a113f4-a101-4db1-8478-49cf088fedb9 does not match source b5256b25-e137-45b8-bddb-78545ab55fc4 Name change: error: unsupported configuration: Target domain name 'diskless2' does not match source 'diskless' Questions before we do more testing: - Do modern versions of libvirt support intra-host migration? - If so, which version? - Documentation? Any help you can provide would be greatly appreciated! -- Eric Wheeler

1 0