From nobody Fri May 10 02:24:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710799035; cv=none; d=zohomail.com; s=zohoarc; b=XPfHmVW7BU5PlNlrxPm2F11ZjQCoFJaNFOdzjy6iGKVbdPV8GLA5JTJc593dyd8f1FYN9aBUtQhjAXllJcv4oHPLs0MyX7SEzbwGglYIMj/8FNnPk+Oce06ck9j5PEaEQNMZ4lKO880Ij8Mw/EB2iC+BN3IZptRfpUkIElFlw2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710799035; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=GU2caHA6H/AsbGTUlLtiOuPd2bZq9k4hdY8c2GBcE0vJDbf9v+U4hCcXELPiw239zykUenMWvDfBmLYMlJTLDzqUp17cFhhjlRvtOT1ZDcjTqB5A3g+WhjpC+ddfSERDUMR44Iv6dNVYaDRHAfeVbQkkgYXKAbtp2NV6CIv3p/s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710799035282208.61147193350632; Mon, 18 Mar 2024 14:57:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmKyT-00083Q-EZ; Mon, 18 Mar 2024 17:56:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmKyS-000839-Bu for qemu-devel@nongnu.org; Mon, 18 Mar 2024 17:56:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmKyP-0008D1-V1 for qemu-devel@nongnu.org; Mon, 18 Mar 2024 17:56:52 -0400 Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-323-pqyYP6A2MuWBiwNHk31ywA-1; Mon, 18 Mar 2024 17:56:47 -0400 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2d4af32be9fso12357581fa.2 for ; Mon, 18 Mar 2024 14:56:46 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id dn16-20020a05640222f000b005645961ad39sm5080274edb.47.2024.03.18.14.56.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710799008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=gscntFD+xomgQrPRGbI+7X4qLFkvNh+dNAjJ3Kgwb2KxpI9UYPOGmwOFvHvzjBiHFr9zq2 HSByQSzUvWO8pdIEnveO1H5SHt8LE/VYFc39EFGk76h2eyc/yL/fjQXqRCXxA8TL+uDm/D 35BV1V3GCOrmtOzggJR0ouD0y0VsR6o= X-MC-Unique: pqyYP6A2MuWBiwNHk31ywA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710799004; x=1711403804; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WNPPEhUqNxc++TdG1DRwfNWJJ5hRnAz956SbDwj5H6w=; b=PFMUYakUNzudt8ZO4gQXOhMd84Kdg1nFTfFjKvbEZhetV0cRiNWpWRUoDwXGggXkAJ yqyMrrqPDZV0CeSspF/f+z7fVOIJs3D49meV6Jv3MoPfT0hSh1Ek3MvZsxY70Nw2RUrL /kFNQCSvo8oUScplKGvBWq41+GkUTbZhjPdo0nzDpGJbpSY40qncSMEXWycWtn8VrCJb WlP3wfeEocQDHXkCQ78j2Ea8CPCH8QbyAjFcbybj74NbmdIS0Hiv529rV1+F2zLq/TtD cZAIRTXQ2LUVQg+BsvNtkHZUkNZtLnUdA1tl8cH2qcjpsffsCy9qBckvnb/21hf3Eenq tDiw== X-Gm-Message-State: AOJu0YzAtAvsEDErDAHoshoCgf5nXXdetHzw3/QEN2aWy5O0aMN6w0Hg GHFTJWxkmOovJCN777uww+ACcJbfjfCcwPh+eN/jc4cUMPhzuJXpLOuu9SrCycv8FMnKo2MH75U tj0t8m1o7C47kGNn2guz21Oop4itM0y7+wkdx0Aovlv3K/Mh/9ReyZzFZWt0C/q20eiSZN8kuYP fYNZpRN1aMERjimOMbvgRDJjLxdisoJIFwpioK X-Received: by 2002:a2e:8518:0:b0:2d4:764f:87ea with SMTP id j24-20020a2e8518000000b002d4764f87eamr538475lji.34.1710799004087; Mon, 18 Mar 2024 14:56:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFoIAQ+CuS1p8W1inemfwajWwojkk43ajj6PFNvreaEW06qZqhx7MNrAKw1wMYtdrIli4TjjA== X-Received: by 2002:a2e:8518:0:b0:2d4:764f:87ea with SMTP id j24-20020a2e8518000000b002d4764f87eamr538467lji.34.1710799003602; Mon, 18 Mar 2024 14:56:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/2] vl: convert qemu_machine_creation_done() to Error ** Date: Mon, 18 Mar 2024 22:56:40 +0100 Message-ID: <20240318215641.978308-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318215641.978308-1-pbonzini@redhat.com> References: <20240318215641.978308-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710799036056100001 Content-Type: text/plain; charset="utf-8" Allow using Error ** to pass an error string up to qmp_x_exit_preconfig() and possibly main(). Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- system/vl.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/system/vl.c b/system/vl.c index 70f4cece7f9..0c970cf0203 100644 --- a/system/vl.c +++ b/system/vl.c @@ -2653,7 +2653,7 @@ static void qemu_create_cli_devices(void) rom_reset_order_override(); } =20 -static void qemu_machine_creation_done(void) +static bool qemu_machine_creation_done(Error **errp) { MachineState *machine =3D MACHINE(qdev_get_machine()); =20 @@ -2684,7 +2684,8 @@ static void qemu_machine_creation_done(void) } =20 if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { - exit(1); + error_setg(errp, "could not start gdbserver"); + return false; } if (!vga_interface_created && !default_vga && vga_interface_type !=3D VGA_NONE) { @@ -2692,6 +2693,7 @@ static void qemu_machine_creation_done(void) "type does not use that option; " "No VGA device has been created"); } + return true; } =20 void qmp_x_exit_preconfig(Error **errp) @@ -2703,7 +2705,9 @@ void qmp_x_exit_preconfig(Error **errp) =20 qemu_init_board(); qemu_create_cli_devices(); - qemu_machine_creation_done(); + if (!qemu_machine_creation_done(errp)) { + return; + } =20 if (loadvm) { RunState state =3D autostart ? RUN_STATE_RUNNING : runstate_get(); --=20 2.44.0 From nobody Fri May 10 02:24:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1710799054; cv=none; d=zohomail.com; s=zohoarc; b=JC7b3KVCQEzkNkH8d/Gwup2fDS5xeXalGMMlulZOvG9rbaeAHX0aKTXJIpyI2pDKFe8f5jPVNsTfyA8imxtUZKpvBBn2nMFFofwxcsBIh7+PHRaMveBT+1j2fZAMqDDQvJt6CbHovRQvcD1IyNWXyea1atheKiLS3YafIpKRUyU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1710799054; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=FlEJBT2gp4bGZ2HK1o00F2WSlkkp6bVIhmUBdGTu8YA=; b=NwFoufaHObES9njURBoctzuAqGilVTnUc9ResZBqa3Km9SUv/ATrjGEsDqVFuivLmIDO+2LhXykW8ad+jMPjy1+WAFP5Tmc46n23njKEf/MRZ0yB16AyZh2YgBw9anrJWJMry08EI+qK6wiICbX0K/57R2HCOdewjrDPr1sQOfo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1710799054512482.7025841247262; Mon, 18 Mar 2024 14:57:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rmKyW-00084C-6R; Mon, 18 Mar 2024 17:56:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmKyT-00083f-SJ for qemu-devel@nongnu.org; Mon, 18 Mar 2024 17:56:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rmKyS-0008D8-FB for qemu-devel@nongnu.org; Mon, 18 Mar 2024 17:56:53 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-433-1XYr8a9fOKS5x4gP1x9akA-1; Mon, 18 Mar 2024 17:56:49 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a35ef7abe08so214556366b.2 for ; Mon, 18 Mar 2024 14:56:48 -0700 (PDT) Received: from [192.168.10.118] ([151.95.49.219]) by smtp.gmail.com with ESMTPSA id en6-20020a17090728c600b00a465a012cf1sm5344926ejc.18.2024.03.18.14.56.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 14:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710799010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FlEJBT2gp4bGZ2HK1o00F2WSlkkp6bVIhmUBdGTu8YA=; b=iEIqCZ0r8EFZ6dMbwc8Lmx9Rm5F538LhaXfNSjaPf4RINNV30j5dxJcgSzSwKCtcIzg016 6xnRtu8qWHOzbr9K7/HxzJSwl4qWdYWQvegVXfr+E87lQsUYCIzIlbWBQVaFojndyNqgHB 8xY41yhtIh0tK/dKrCVLYwXIL21WjGU= X-MC-Unique: 1XYr8a9fOKS5x4gP1x9akA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710799007; x=1711403807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FlEJBT2gp4bGZ2HK1o00F2WSlkkp6bVIhmUBdGTu8YA=; b=kpXGS7VXiyd9uqJHQI5aSwWazmsyOAUabyK9BN9MxnedQ4prukrotzmB6Z9UwxJOyk dU3kpa1X9JKIz7+GHq1/mGeZd4yvtHnJbq5y6dWYKoJNb/azomvgPCEaStQA5PySUvd3 D+AMP3ewv9b9oP32zSOO2M7pzmRdt/2kMmVcufBimyze1xiPHgqmNZolBoYxps2Flch6 hB7f+LwC1a1BeJO9wTiDU6H5vvHdaIInVvvVPAKWuKQHTLBlaNR2VU+2w2iRJhAuOGaF jiN9FfBDKp3YGHLpi8NMfKlWwe3W404wQcSlFCVivsSOqShQOET4EF9nnx9NarTkJHeM ZZ9w== X-Gm-Message-State: AOJu0YyWgC7nVn3TcExBytJj47sP5uA7Ht3PetRKk8WVG1dHvWwjyn71 7EbC+f3M2ZQ83Cg1skUjPk5aV+OvsnD68Fan1rRm6eol9IinkdjJK0/miu8MBY2JFadHiOnvNfo z52PONlGkOgLS+cvo9JgEqvxvrL1/pRKDFcHna6qVE43Pf+9IRCBwkM0+PyqpB3raHkUrlzZLG+ B4+q1eq25AT23qGN8+IAMGUeyUUcfIRsuosUn1 X-Received: by 2002:a17:906:6958:b0:a46:7794:2c00 with SMTP id c24-20020a170906695800b00a4677942c00mr393799ejs.40.1710799007242; Mon, 18 Mar 2024 14:56:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIPW4rCF4aPootATgErChZD+CV13lGc12JpTMgNWBnGbpL5q9p4DbwJT3zAdW55GNwA1OZnA== X-Received: by 2002:a17:906:6958:b0:a46:7794:2c00 with SMTP id c24-20020a170906695800b00a4677942c00mr393789ejs.40.1710799006915; Mon, 18 Mar 2024 14:56:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/2] vl: do not assert if sev-guest is used together with TCG Date: Mon, 18 Mar 2024 22:56:41 +0100 Message-ID: <20240318215641.978308-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240318215641.978308-1-pbonzini@redhat.com> References: <20240318215641.978308-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.374, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1710799056088100004 Content-Type: text/plain; charset="utf-8" cgs->ready can be false if the accelerator does not look at current_machine->cgs altogether. Assume that the lack of initialization is due to this, and report a nicer error instead of an assertion failure: $ qemu-system-x86_64 -object sev-guest,id=3Dsev0,policy=3D0x5,id=3Dsev0= ,cbitpos=3D51,reduced-phys-bits=3D1 -M confidential-guest-support=3Dsev0 qemu-system-x86_64: ../softmmu/vl.c:2619: qemu_machine_creation_done: A= ssertion `machine->cgs->ready' failed. Signed-off-by: Paolo Bonzini --- 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) =20 qdev_machine_creation_done(); =20 - if (machine->cgs) { - /* - * Verify that Confidential Guest Support has actually been initia= lized - */ - 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); } =20 if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) { --=20 2.44.0