fda7fbcd8d
- kvm-i386-Resolve-CPU-models-to-v1-by-default.patch [bz#1779078 bz#1787291 bz#1779078 bz#1779078] - kvm-iotests-Support-job-complete-in-run_job.patch [bz#1781637] - kvm-iotests-Create-VM.blockdev_create.patch [bz#1781637] - kvm-block-Activate-recursively-even-for-already-active-n.patch [bz#1781637] - kvm-hmp-Allow-using-qdev-ID-for-qemu-io-command.patch [bz#1781637] - kvm-iotests-Test-external-snapshot-with-VM-state.patch [bz#1781637] - kvm-iotests.py-Let-wait_migration-wait-even-more.patch [bz#1781637] - kvm-blockdev-fix-coding-style-issues-in-drive_backup_pre.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-blockdev-unify-qmp_drive_backup-and-drive-backup-tra.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-blockdev-unify-qmp_blockdev_backup-and-blockdev-back.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-blockdev-honor-bdrv_try_set_aio_context-context-requ.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-backup-top-Begin-drain-earlier.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-block-backup-top-Don-t-acquire-context-while-droppin.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-blockdev-Acquire-AioContext-on-dirty-bitmap-function.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-blockdev-Return-bs-to-the-proper-context-on-snapshot.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-iotests-Test-handling-of-AioContexts-with-some-block.patch [bz#1745606 bz#1746217 bz#1773517 bz#1779036 bz#1782111 bz#1782175 bz#1783965] - kvm-target-arm-monitor-query-cpu-model-expansion-crashed.patch [bz#1801320] - kvm-docs-arm-cpu-features-Make-kvm-no-adjvtime-comment-c.patch [bz#1801320] - Resolves: bz#1745606 (Qemu hang when do incremental live backup in transaction mode without bitmap) - Resolves: bz#1746217 (Src qemu hang when do storage vm migration during guest installation) - Resolves: bz#1773517 (Src qemu hang when do storage vm migration with dataplane enable) - Resolves: bz#1779036 (Qemu coredump when do snapshot in transaction mode with one snapshot path not exist) - Resolves: bz#1779078 (RHVH 4.4: Failed to run VM on 4.3/4.4 engine (Exit message: the CPU is incompatible with host CPU: Host CPU does not provide required features: hle, rtm)) - Resolves: bz#1781637 (qemu crashed when do mem and disk snapshot) - Resolves: bz#1782111 (Qemu hang when do full backup on multi-disks with one job's 'job-id' missed in transaction mode(data plane enable)) - Resolves: bz#1782175 (Qemu core dump when add persistent bitmap(data plane enable)) - Resolves: bz#1783965 (Qemu core dump when do backup with sync: bitmap and no bitmap provided) - Resolves: bz#1787291 (RHVH 4.4: Failed to run VM on 4.3/4.4 engine (Exit message: the CPU is incompatible with host CPU: Host CPU does not provide required features: hle, rtm) [rhel-8.1.0.z]) - Resolves: bz#1801320 (aarch64: backport query-cpu-model-expansion and adjvtime document fixes)
82 lines
3.2 KiB
Diff
82 lines
3.2 KiB
Diff
From c82cf5c08617c947b34eb490d1714729103e3379 Mon Sep 17 00:00:00 2001
|
|
From: Andrew Jones <drjones@redhat.com>
|
|
Date: Mon, 10 Feb 2020 17:33:57 +0000
|
|
Subject: [PATCH 17/18] target/arm/monitor: query-cpu-model-expansion crashed
|
|
qemu when using machine type none
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Andrew Jones <drjones@redhat.com>
|
|
Message-id: <20200210173358.16896-2-drjones@redhat.com>
|
|
Patchwork-id: 93773
|
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/2] target/arm/monitor: query-cpu-model-expansion crashed qemu when using machine type none
|
|
Bugzilla: 1801320
|
|
RH-Acked-by: Auger Eric <eric.auger@redhat.com>
|
|
RH-Acked-by: Gavin Shan <gshan@redhat.com>
|
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1801320
|
|
|
|
Author: Liang Yan <lyan@suse.com>
|
|
Date: Fri, 07 Feb 2020 14:04:21 +0000
|
|
|
|
target/arm/monitor: query-cpu-model-expansion crashed qemu when using machine type none
|
|
|
|
Commit e19afd566781 mentioned that target-arm only supports queryable
|
|
cpu models 'max', 'host', and the current type when KVM is in use.
|
|
The logic works well until using machine type none.
|
|
|
|
For machine type none, cpu_type will be null if cpu option is not
|
|
set by command line, strlen(cpu_type) will terminate process.
|
|
So We add a check above it.
|
|
|
|
This won't affect i386 and s390x since they do not use current_cpu.
|
|
|
|
Signed-off-by: Liang Yan <lyan@suse.com>
|
|
Message-id: 20200203134251.12986-1-lyan@suse.com
|
|
Reviewed-by: Andrew Jones <drjones@redhat.com>
|
|
Tested-by: Andrew Jones <drjones@redhat.com>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
(cherry picked from commit 0999a4ba8718aa96105b978d3567fc7e90244c7e)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
target/arm/monitor.c | 15 +++++++++------
|
|
1 file changed, 9 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
|
|
index 9725dff..c2dc790 100644
|
|
--- a/target/arm/monitor.c
|
|
+++ b/target/arm/monitor.c
|
|
@@ -137,17 +137,20 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
|
|
}
|
|
|
|
if (kvm_enabled()) {
|
|
- const char *cpu_type = current_machine->cpu_type;
|
|
- int len = strlen(cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX);
|
|
bool supported = false;
|
|
|
|
if (!strcmp(model->name, "host") || !strcmp(model->name, "max")) {
|
|
/* These are kvmarm's recommended cpu types */
|
|
supported = true;
|
|
- } else if (strlen(model->name) == len &&
|
|
- !strncmp(model->name, cpu_type, len)) {
|
|
- /* KVM is enabled and we're using this type, so it works. */
|
|
- supported = true;
|
|
+ } else if (current_machine->cpu_type) {
|
|
+ const char *cpu_type = current_machine->cpu_type;
|
|
+ int len = strlen(cpu_type) - strlen(ARM_CPU_TYPE_SUFFIX);
|
|
+
|
|
+ if (strlen(model->name) == len &&
|
|
+ !strncmp(model->name, cpu_type, len)) {
|
|
+ /* KVM is enabled and we're using this type, so it works. */
|
|
+ supported = true;
|
|
+ }
|
|
}
|
|
if (!supported) {
|
|
error_setg(errp, "We cannot guarantee the CPU type '%s' works "
|
|
--
|
|
1.8.3.1
|
|
|