aboutsummaryrefslogtreecommitdiff
path: root/accel
diff options
context:
space:
mode:
Diffstat (limited to 'accel')
-rw-r--r--accel/kvm/kvm-all.c14
-rw-r--r--accel/kvm/sev-stub.c4
2 files changed, 2 insertions, 16 deletions
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 226e155..e72a19a 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2180,20 +2180,6 @@ static int kvm_init(MachineState *ms)
kvm_state = s;
- /*
- * if memory encryption object is specified then initialize the memory
- * encryption context.
- */
- if (ms->cgs) {
- Error *local_err = NULL;
- /* FIXME handle mechanisms other than SEV */
- ret = sev_kvm_init(ms->cgs, &local_err);
- if (ret < 0) {
- error_report_err(local_err);
- goto err;
- }
- }
-
ret = kvm_arch_init(ms, s);
if (ret < 0) {
goto err;
diff --git a/accel/kvm/sev-stub.c b/accel/kvm/sev-stub.c
index 512e205..9587d1b 100644
--- a/accel/kvm/sev-stub.c
+++ b/accel/kvm/sev-stub.c
@@ -17,6 +17,6 @@
int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
{
- /* SEV can't be selected if it's not compiled */
- g_assert_not_reached();
+ /* If we get here, cgs must be some non-SEV thing */
+ return 0;
}