From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 18 Mar 2024 21:20:46 +0000 (-0400)
Subject: vl: do not assert if sev-guest is used together with TCG
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3343f296ff9474ce2c3b73ff25b6eece18799216;p=qemu.git

vl: do not assert if sev-guest is used together with TCG

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/system/vl.c b/system/vl.c
index 0c970cf020..c644222982 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -2676,11 +2676,10 @@ static bool qemu_machine_creation_done(Error **errp)
 
     qdev_machine_creation_done();
 
-    if (machine->cgs) {
-        /*
-         * Verify that Confidential Guest Support has actually been initialized
-         */
-        assert(machine->cgs->ready);
+    if (machine->cgs && !machine->cgs->ready) {
+        error_setg(errp, "accelerator does not support confidential guest %s",
+                   object_get_typename(OBJECT(machine->cgs)));
+        exit(1);
     }
 
     if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {