From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>,
kvm@vger.kernel.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Michael Tokarev" <mjt@tls.msk.ru>,
"Kevin Wolf" <kwolf@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Daniel Henrique Barboza" <dbarboza@ventanamicro.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v5 1/6] target/i386: Check kvm_hyperv_expand_features() return value
Date: Wed, 13 Sep 2023 11:30:03 +0200 [thread overview]
Message-ID: <20230913093009.83520-2-philmd@linaro.org> (raw)
In-Reply-To: <20230913093009.83520-1-philmd@linaro.org>
In case more code is added after the kvm_hyperv_expand_features()
call, check its return value (since it can fail).
Fixes: 071ce4b03b ("i386: expand Hyper-V features during CPU feature expansion time")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/i386/cpu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 24ee67b42d..bd6a932d08 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7121,8 +7121,8 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
env->cpuid_xlevel2 = env->cpuid_min_xlevel2;
}
- if (kvm_enabled()) {
- kvm_hyperv_expand_features(cpu, errp);
+ if (kvm_enabled() && !kvm_hyperv_expand_features(cpu, errp)) {
+ return;
}
}
--
2.41.0
next prev parent reply other threads:[~2023-09-13 9:31 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-13 9:30 [PATCH v5 0/6] target/i386: Restrict system-specific features from user emulation Philippe Mathieu-Daudé
2023-09-13 9:30 ` Philippe Mathieu-Daudé [this message]
2023-09-13 9:30 ` [PATCH v5 2/6] target/i386: Drop accel_uses_host_cpuid before x86_cpu_get_supported_cpuid Philippe Mathieu-Daudé
2023-09-13 9:30 ` [PATCH v5 3/6] target/i386: Call accel-agnostic x86_cpu_get_supported_cpuid() Philippe Mathieu-Daudé
2023-09-13 10:59 ` Michael Tokarev
2023-09-13 11:01 ` Philippe Mathieu-Daudé
2023-09-13 9:30 ` [PATCH v5 4/6] target/i386: Move x86_cpu_get_migratable_flags() around Philippe Mathieu-Daudé
2023-09-13 9:30 ` [RFC PATCH v5 5/6] target/i386: Restrict system-specific code from user emulation Philippe Mathieu-Daudé
2023-09-13 9:30 ` [PATCH v5 6/6] target/i386: Prohibit target specific KVM prototypes on " Philippe Mathieu-Daudé
2023-09-13 10:29 ` [PATCH v5 0/6] target/i386: Restrict system-specific features from " Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230913093009.83520-2-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=berrange@redhat.com \
--cc=dbarboza@ventanamicro.com \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=mjt@tls.msk.ru \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).