You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
110 lines
3.6 KiB
110 lines
3.6 KiB
From 4ebc58d4a7a3d4a20f20f1cd3f21082b80097fe2 Mon Sep 17 00:00:00 2001
|
|
From: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Date: Thu, 29 Feb 2024 01:00:38 -0500
|
|
Subject: [PATCH 014/100] s390: Switch to use confidential_guest_kvm_init()
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 245: SEV-SNP support
|
|
RH-Jira: RHEL-39544
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
|
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
|
|
RH-Commit: [14/91] 8c9e09ec9976c00b41c02868fff034286a341468 (bonzini/rhel-qemu-kvm)
|
|
|
|
Use unified confidential_guest_kvm_init() for consistency with
|
|
other architectures.
|
|
|
|
Signed-off-by: Xiaoyao Li <xiaoyao.li@intel.com>
|
|
Message-Id: <20240229060038.606591-1-xiaoyao.li@intel.com>
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit a14a2b0148e657cc526b7a75f2a1937628764e7a)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
hw/s390x/s390-virtio-ccw.c | 5 ++++-
|
|
target/s390x/kvm/pv.c | 10 +++++++++-
|
|
target/s390x/kvm/pv.h | 14 --------------
|
|
3 files changed, 13 insertions(+), 16 deletions(-)
|
|
|
|
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
index 9ad54682c6..828ce6e87e 100644
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
@@ -14,6 +14,7 @@
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "exec/ram_addr.h"
|
|
+#include "exec/confidential-guest-support.h"
|
|
#include "hw/s390x/s390-virtio-hcall.h"
|
|
#include "hw/s390x/sclp.h"
|
|
#include "hw/s390x/s390_flic.h"
|
|
@@ -260,7 +261,9 @@ static void ccw_init(MachineState *machine)
|
|
s390_init_cpus(machine);
|
|
|
|
/* Need CPU model to be determined before we can set up PV */
|
|
- s390_pv_init(machine->cgs, &error_fatal);
|
|
+ if (machine->cgs) {
|
|
+ confidential_guest_kvm_init(machine->cgs, &error_fatal);
|
|
+ }
|
|
|
|
s390_flic_init();
|
|
|
|
diff --git a/target/s390x/kvm/pv.c b/target/s390x/kvm/pv.c
|
|
index 7ca7faec73..dde836d21a 100644
|
|
--- a/target/s390x/kvm/pv.c
|
|
+++ b/target/s390x/kvm/pv.c
|
|
@@ -334,12 +334,17 @@ static bool s390_pv_guest_check(ConfidentialGuestSupport *cgs, Error **errp)
|
|
return s390_pv_check_cpus(errp);
|
|
}
|
|
|
|
-int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
|
|
+static int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
|
|
{
|
|
if (!object_dynamic_cast(OBJECT(cgs), TYPE_S390_PV_GUEST)) {
|
|
return 0;
|
|
}
|
|
|
|
+ if (!kvm_enabled()) {
|
|
+ error_setg(errp, "Protected Virtualization requires KVM");
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
if (!s390_has_feat(S390_FEAT_UNPACK)) {
|
|
error_setg(errp,
|
|
"CPU model does not support Protected Virtualization");
|
|
@@ -364,6 +369,9 @@ OBJECT_DEFINE_TYPE_WITH_INTERFACES(S390PVGuest,
|
|
|
|
static void s390_pv_guest_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
+ ConfidentialGuestSupportClass *klass = CONFIDENTIAL_GUEST_SUPPORT_CLASS(oc);
|
|
+
|
|
+ klass->kvm_init = s390_pv_kvm_init;
|
|
}
|
|
|
|
static void s390_pv_guest_init(Object *obj)
|
|
diff --git a/target/s390x/kvm/pv.h b/target/s390x/kvm/pv.h
|
|
index 5877d28ff1..4b40817439 100644
|
|
--- a/target/s390x/kvm/pv.h
|
|
+++ b/target/s390x/kvm/pv.h
|
|
@@ -80,18 +80,4 @@ static inline int kvm_s390_dump_mem_state(uint64_t addr, size_t len,
|
|
static inline int kvm_s390_dump_completion_data(void *buff) { return 0; }
|
|
#endif /* CONFIG_KVM */
|
|
|
|
-int s390_pv_kvm_init(ConfidentialGuestSupport *cgs, Error **errp);
|
|
-static inline int s390_pv_init(ConfidentialGuestSupport *cgs, Error **errp)
|
|
-{
|
|
- if (!cgs) {
|
|
- return 0;
|
|
- }
|
|
- if (kvm_enabled()) {
|
|
- return s390_pv_kvm_init(cgs, errp);
|
|
- }
|
|
-
|
|
- error_setg(errp, "Protected Virtualization requires KVM");
|
|
- return -1;
|
|
-}
|
|
-
|
|
#endif /* HW_S390_PV_H */
|
|
--
|
|
2.39.3
|
|
|