All the mail mirrored from lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 3/6] vl: do not assert if sev-guest is used together with TCG
Date: Wed, 20 Mar 2024 11:32:10 +0100	[thread overview]
Message-ID: <20240320103213.1048405-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20240320103213.1048405-1-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 system/vl.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/system/vl.c b/system/vl.c
index 0c970cf0203..c6442229824 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) {
-- 
2.44.0



  parent reply	other threads:[~2024-03-20 10:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-20 10:32 [PULL 0/6] QEMU bug fixes for 20240320 Paolo Bonzini
2024-03-20 10:32 ` [PULL 1/6] target/i386: fix direction of "32-bit MMU" test Paolo Bonzini
2024-03-20 10:32 ` [PULL 2/6] vl: convert qemu_machine_creation_done() to Error ** Paolo Bonzini
2024-03-20 10:32 ` Paolo Bonzini [this message]
2024-03-20 10:32 ` [PULL 4/6] target/i386: Revert monitor_puts() in do_inject_x86_mce() Paolo Bonzini
2024-03-20 10:32 ` [PULL 5/6] tests/plugins: fix use-after-free bug Paolo Bonzini
2024-03-20 10:32 ` [PULL 6/6] meson: remove dead dictionary access Paolo Bonzini
2024-03-20 16:58 ` [PULL 0/6] QEMU bug fixes for 20240320 Peter Maydell

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=20240320103213.1048405-4-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.