From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CD4BFEE4996 for ; Mon, 21 Aug 2023 08:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233932AbjHUI2m (ORCPT ); Mon, 21 Aug 2023 04:28:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233325AbjHUI2m (ORCPT ); Mon, 21 Aug 2023 04:28:42 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B2AD99 for ; Mon, 21 Aug 2023 01:27:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1692606473; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=dDjls7+ILiWbqhXYks55zfDhfY7DM1MGCD/3Cd5UPU8=; b=B4gj1GvvsjbSj6Crq+L/c2vm198i2TbhdCSLWhRq+kPfPuRqbLfRuZqPsVtTNrnoNtWjFs lYsOqItPA4k2yS6qiGVN7H34zEjhdCtEodCFspYlCtUye0Axk9313tShDTk1JJHxRkhrq1 nvYgyZVxvNzcYH6zSkYLOdST38K23D4= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-478-vR_qHInePkKdzT03Xem86g-1; Mon, 21 Aug 2023 04:27:49 -0400 X-MC-Unique: vR_qHInePkKdzT03Xem86g-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE0BF3C02B66; Mon, 21 Aug 2023 08:27:48 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E4DF63F6C; Mon, 21 Aug 2023 08:27:45 +0000 (UTC) Date: Mon, 21 Aug 2023 09:27:43 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Xiaoyao Li Cc: Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Ani Sinha , Peter Xu , David Hildenbrand , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Cornelia Huck , Eric Blake , Markus Armbruster , Marcelo Tosatti , Gerd Hoffmann , qemu-devel@nongnu.org, kvm@vger.kernel.org, Eduardo Habkost , Laszlo Ersek , Isaku Yamahata , erdemaktas@google.com, Chenyi Qiang Subject: Re: [PATCH v2 03/58] target/i386: Parse TDX vm type Message-ID: Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20230818095041.1973309-1-xiaoyao.li@intel.com> <20230818095041.1973309-4-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230818095041.1973309-4-xiaoyao.li@intel.com> User-Agent: Mutt/2.2.9 (2022-11-12) X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Fri, Aug 18, 2023 at 05:49:46AM -0400, Xiaoyao Li wrote: > TDX VM requires VM type KVM_X86_TDX_VM to be passed to > kvm_ioctl(KVM_CREATE_VM). > > If tdx-guest object is specified to confidential-guest-support, like, > > qemu -machine ...,confidential-guest-support=tdx0 \ > -object tdx-guest,id=tdx0,... > > it parses VM type as KVM_X86_TDX_VM. > > Signed-off-by: Xiaoyao Li > --- > target/i386/kvm/kvm.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c > index 62f237068a3a..77f4772afe6c 100644 > --- a/target/i386/kvm/kvm.c > +++ b/target/i386/kvm/kvm.c > @@ -32,6 +32,7 @@ > #include "sysemu/runstate.h" > #include "kvm_i386.h" > #include "sev.h" > +#include "tdx.h" > #include "xen-emu.h" > #include "hyperv.h" > #include "hyperv-proto.h" > @@ -158,6 +159,7 @@ static int kvm_get_one_msr(X86CPU *cpu, int index, uint64_t *value); > static const char* vm_type_name[] = { > [KVM_X86_DEFAULT_VM] = "default", > [KVM_X86_SW_PROTECTED_VM] = "sw-protected-vm", > + [KVM_X86_TDX_VM] = "tdx", > }; > > int kvm_get_vm_type(MachineState *ms, const char *vm_type) > @@ -170,12 +172,18 @@ int kvm_get_vm_type(MachineState *ms, const char *vm_type) > kvm_type = KVM_X86_DEFAULT_VM; > } else if (!g_ascii_strcasecmp(vm_type, "sw-protected-vm")) { > kvm_type = KVM_X86_SW_PROTECTED_VM; > - } else { > + } else if (!g_ascii_strcasecmp(vm_type, "tdx")) { > + kvm_type = KVM_X86_TDX_VM; > + }else { > error_report("Unknown kvm-type specified '%s'", vm_type); > exit(1); > } > } This whole block of code should go away - as this should not exist as a user visible property. It should be sufficient to use the tdx-guest object type to identify use of TDX. > > + if (ms->cgs && object_dynamic_cast(OBJECT(ms->cgs), TYPE_TDX_GUEST)) { > + kvm_type = KVM_X86_TDX_VM; > + } > + > /* > * old KVM doesn't support KVM_CAP_VM_TYPES and KVM_X86_DEFAULT_VM > * is always supported > -- > 2.34.1 > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|