From nobody Mon Feb 9 16:12:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633623502; cv=none; d=zohomail.com; s=zohoarc; b=czXFj2u1Y0oiMJ38uocpmjjpERtyM5h8IBmS/BG3HqCbxv8AYc8kkapKvu18/OEOZ8hVRUeKYL/BnWd+/0w3TDvUKKYAvJ3gyjgouQvdTAmMhJPWAsrNCsG1vfZwpRaC+PpXw9xOzxFpj0NrRfb7zFTjtpiFeZDmtFXOgWvJwWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633623502; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=89V0d1PNFsuCxWRiRzeXMO8a63XAoQ+evMckrwIv15E=; b=f7OmVUSLuWMXqi4xDIGbTOhyxPxXOj4J6HE1Gut5iARWQf5Ysa0cP+cQg/VoRp37M4IyY5+PqQO3rhV6dqTRQFZfd4f3po/eDJ9DPMOYeLf/XBhqD/b8EB8ny8tFvN3oSGNE34zQJirqxa5GNDEBV4uwplyuKjAODX5aynnfvnI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1633623502285707.9632972085284; Thu, 7 Oct 2021 09:18:22 -0700 (PDT) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-61-ZtOnBimuO2u_ULs9asMtSg-1; Thu, 07 Oct 2021 12:18:19 -0400 Received: by mail-wr1-f71.google.com with SMTP id a10-20020a5d508a000000b00160723ce588so5116281wrt.23 for ; Thu, 07 Oct 2021 09:18:19 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id c5sm9181006wml.9.2021.10.07.09.18.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 09:18:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633623501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=89V0d1PNFsuCxWRiRzeXMO8a63XAoQ+evMckrwIv15E=; b=A6v4XVbSCofAYoUF8+AvvL5BhAk/cBzkJhPivOqYmSGCOXwchxyNb+vkDjqXjvxP7bLpYf g5UGN9WeroYlBY1U5a+hh2C/hrxaj9hrHY920xlmZ6kMJCSCbf8tpG9FXSI2fKix4+HiG5 SjOP7WXjQxlTvQe7mnKEZZoK236vSZ0= X-MC-Unique: ZtOnBimuO2u_ULs9asMtSg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=89V0d1PNFsuCxWRiRzeXMO8a63XAoQ+evMckrwIv15E=; b=YFSHvRP8z9af1jmbQEm2/AfrJ6pmgXBHIu+Ac86plXUNzMYWrwrUznxTxWKKNMDTIk XzERhAKCaznDtVPHzKTKWmj4KvI7p9Z8+UdkTrSQI5Nd1oP+ZxhTG1qRYnop9Wk5js0I 4tBAJQQQSlUCWXL7iRGAO672ZmS2INWHNPeomscla68m1TBMFlZ//+583jm4mz7SHjIC NA82Jay6faTfcrCae1dUpsIiqau7dkJUZ4BYRUJ3gIXuuioFO8Qq+xrjsvOzlRraaWFH hwvtXdin+dJvP7ywRT4cxYcRWJzXfpcOpf2Y2xto/NCGCZ/EtobRzPXuTPTKZ3KGTcwz gIqg== X-Gm-Message-State: AOAM531uyzFrhoW4MdbJAIcNwucFO7aoJkOtrbEM6ELh7zCO1raxnZmF svvfoVon20gmiCqLh3mf8lMI2sCVzl90k5W6PPFHJvXlw5uSvksW+80lEg/UmcdiKxLXHN+AXRQ 0fMXhZNJaowPZpQ== X-Received: by 2002:a1c:2:: with SMTP id 2mr17491468wma.87.1633623498397; Thu, 07 Oct 2021 09:18:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybbjnGgx9aPwaHiTsiUUeAUcDEXJV3VetZXPeXIxDRjX+nW5gqW/S5HCcW3+GX4C5xkS0GDg== X-Received: by 2002:a1c:2:: with SMTP id 2mr17491444wma.87.1633623498131; Thu, 07 Oct 2021 09:18:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , James Bottomley , Brijesh Singh , Sergio Lopez , Dov Murik , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 13/23] target/i386/sev: Restrict SEV to system emulation Date: Thu, 7 Oct 2021 18:17:06 +0200 Message-Id: <20211007161716.453984-14-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007161716.453984-1-philmd@redhat.com> References: <20211007161716.453984-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633623504132100001 SEV is irrelevant on user emulation, so restrict it to sysemu. Some stubs are still required because used in cpu.c by x86_register_cpudef_types(), so move the sysemu specific stubs to sev-sysemu-stub.c instead. This will allow us to simplify monitor.c (which is not available in user emulation) in the next commit. Reviewed-by: Paolo Bonzini Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/i386/sev-stub.c | 43 ------------------------- target/i386/sev-sysemu-stub.c | 60 +++++++++++++++++++++++++++++++++++ target/i386/meson.build | 4 ++- 3 files changed, 63 insertions(+), 44 deletions(-) create mode 100644 target/i386/sev-sysemu-stub.c diff --git a/target/i386/sev-stub.c b/target/i386/sev-stub.c index 55f1ec74196..170e9f50fee 100644 --- a/target/i386/sev-stub.c +++ b/target/i386/sev-stub.c @@ -15,11 +15,6 @@ #include "qapi/error.h" #include "sev_i386.h" =20 -SevInfo *sev_get_info(void) -{ - return NULL; -} - bool sev_enabled(void) { return false; @@ -35,49 +30,11 @@ uint32_t sev_get_reduced_phys_bits(void) return 0; } =20 -char *sev_get_launch_measurement(void) -{ - return NULL; -} - -SevCapability *sev_get_capabilities(Error **errp) -{ - error_setg(errp, "SEV is not available in this QEMU"); - return NULL; -} - -int sev_inject_launch_secret(const char *hdr, const char *secret, - uint64_t gpa, Error **errp) -{ - return 1; -} - -int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp) -{ - g_assert_not_reached(); -} - bool sev_es_enabled(void) { return false; } =20 -void sev_es_set_reset_vector(CPUState *cpu) -{ -} - -int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size) -{ - g_assert_not_reached(); -} - -SevAttestationReport * -sev_get_attestation_report(const char *mnonce, Error **errp) -{ - error_setg(errp, "SEV is not available in this QEMU"); - return NULL; -} - bool sev_add_kernel_loader_hashes(SevKernelLoaderContext *ctx, Error **err= p) { g_assert_not_reached(); diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c new file mode 100644 index 00000000000..d556b4f091f --- /dev/null +++ b/target/i386/sev-sysemu-stub.c @@ -0,0 +1,60 @@ +/* + * QEMU SEV system stub + * + * Copyright Advanced Micro Devices 2018 + * + * Authors: + * Brijesh Singh + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-commands-misc-target.h" +#include "qapi/error.h" +#include "sev_i386.h" + +SevInfo *sev_get_info(void) +{ + return NULL; +} + +char *sev_get_launch_measurement(void) +{ + return NULL; +} + +SevCapability *sev_get_capabilities(Error **errp) +{ + error_setg(errp, "SEV is not available in this QEMU"); + return NULL; +} + +int sev_inject_launch_secret(const char *hdr, const char *secret, + uint64_t gpa, Error **errp) +{ + return 1; +} + +int sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp) +{ + g_assert_not_reached(); +} + +void sev_es_set_reset_vector(CPUState *cpu) +{ +} + +int sev_es_save_reset_vector(void *flash_ptr, uint64_t flash_size) +{ + g_assert_not_reached(); +} + +SevAttestationReport *sev_get_attestation_report(const char *mnonce, + Error **errp) +{ + error_setg(errp, "SEV is not available in this QEMU"); + return NULL; +} diff --git a/target/i386/meson.build b/target/i386/meson.build index dac19ec00d4..a4f45c3ec1d 100644 --- a/target/i386/meson.build +++ b/target/i386/meson.build @@ -6,7 +6,7 @@ 'xsave_helper.c', 'cpu-dump.c', )) -i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c', 'sev.c'), if_= false: files('sev-stub.c')) +i386_ss.add(when: 'CONFIG_SEV', if_true: files('host-cpu.c'), if_false: fi= les('sev-stub.c')) =20 # x86 cpu type i386_ss.add(when: 'CONFIG_KVM', if_true: files('host-cpu.c')) @@ -20,6 +20,8 @@ 'monitor.c', 'cpu-sysemu.c', )) +i386_softmmu_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false:= files('sev-sysemu-stub.c')) + i386_user_ss =3D ss.source_set() =20 subdir('kvm') --=20 2.31.1