From nobody Mon Feb 9 12:10:20 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608247828; cv=none; d=zohomail.com; s=zohoarc; b=h5L23jUbRvqZw5OWb1TUaFSNecwbmp9EcvBTpq82Yoy5qz+4DHHgnXdb4s6ZAB29p+rnph/5IJffWWvj/DIw4rHC28UxN3OoreWtb2dh7aWbqvhn8segA4S7N6O3ZDedhXI4SAxqtc+GiCWBpSXzmawbLfMYB8/uPuyIO7WFjx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608247828; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OAt2PQwtOKb6Jwet1hwkOWJo76hWPhrPGWC9/GBwdls=; b=FoVyafW4fqACKRPsPiKR23Di81pCJs5xqCKJRBwePyqeBCAWIpCJaleZJAXruPhVPUXM3LVgX2HRGEM8g+LBXbGUsG3dX8VIHXNkK59bZzzrJ1lqBh6AmYB4MGMSqVNen681nmUW97t8UVSco9kcFfCrpz1M/Al4QdTXFpu7zoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160824782884487.7799635298694; Thu, 17 Dec 2020 15:30:28 -0800 (PST) Received: from localhost ([::1]:45278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpyNr-00044m-PJ for importer@patchew.org; Thu, 17 Dec 2020 13:52:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpyIT-0006Mq-Vq for qemu-devel@nongnu.org; Thu, 17 Dec 2020 13:46:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpyIP-0001yD-3W for qemu-devel@nongnu.org; Thu, 17 Dec 2020 13:46:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-32-63LDWuZ4O8akI05KT9Axpw-1; Thu, 17 Dec 2020 13:46:33 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 50179107ACE3; Thu, 17 Dec 2020 18:46:32 +0000 (UTC) Received: from localhost (ovpn-115-226.rdu2.redhat.com [10.10.115.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14FCA5D9CD; Thu, 17 Dec 2020 18:46:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608230795; 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=OAt2PQwtOKb6Jwet1hwkOWJo76hWPhrPGWC9/GBwdls=; b=hVh9eyOuyoH6vfkZmyap5kVjoSv71DZplTcwEPz8KPxWHv1De9LzigUOVSfPaywwKKUIYk TfnlWTYbjTOt/JsPE4vS6enJagFiLCcGnb9QWXBPgiIomppRBm7lDD/LyxblTwM41qzjSj dmoQtHENx+xZjtt8WnPFMpdoqxtmk5g= X-MC-Unique: 63LDWuZ4O8akI05KT9Axpw-1 From: Eduardo Habkost To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 08/17] i386: move hyperv_interface_id initialization to x86_cpu_realizefn() Date: Thu, 17 Dec 2020 13:46:11 -0500 Message-Id: <20201217184620.3945917-9-ehabkost@redhat.com> In-Reply-To: <20201217184620.3945917-1-ehabkost@redhat.com> References: <20201217184620.3945917-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ehabkost@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=ehabkost@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Vitaly Kuznetsov , Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vitaly Kuznetsov As a preparation to expanding Hyper-V CPU features early, move hyperv_interface_id initialization to x86_cpu_realizefn(). Signed-off-by: Vitaly Kuznetsov Message-Id: <20201119103221.1665171-3-vkuznets@redhat.com> Signed-off-by: Eduardo Habkost --- target/i386/cpu.h | 1 + target/i386/cpu.c | 6 ++++++ target/i386/kvm/kvm.c | 18 ++++++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index ad9ef559fc..fd29afebc9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1665,6 +1665,7 @@ struct X86CPU { bool hyperv_passthrough; OnOffAuto hyperv_no_nonarch_cs; uint32_t hyperv_vendor_id[3]; + uint32_t hyperv_interface_id[4]; =20 bool check_cpuid; bool enforce_cpuid; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 599526406a..ab10c0225d 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6561,6 +6561,12 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu) memset(cpu->hyperv_vendor_id, 0, 12); memcpy(cpu->hyperv_vendor_id, cpu->hyperv_vendor, len); } + + /* 'Hv#1' interface identification*/ + cpu->hyperv_interface_id[0] =3D 0x31237648; + cpu->hyperv_interface_id[1] =3D 0; + cpu->hyperv_interface_id[2] =3D 0; + cpu->hyperv_interface_id[3] =3D 0; } =20 static void x86_cpu_realizefn(DeviceState *dev, Error **errp) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 6a5d91e39f..d3aa7ca281 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1171,7 +1171,6 @@ static int hyperv_handle_properties(CPUState *cs, CPUX86State *env =3D &cpu->env; struct kvm_cpuid2 *cpuid; struct kvm_cpuid_entry2 *c; - uint32_t signature[3]; uint32_t cpuid_i =3D 0; int r; =20 @@ -1215,6 +1214,14 @@ static int hyperv_handle_properties(CPUState *cs, cpu->hyperv_vendor_id[2] =3D c->edx; } =20 + c =3D cpuid_find_entry(cpuid, HV_CPUID_INTERFACE, 0); + if (c) { + cpu->hyperv_interface_id[0] =3D c->eax; + cpu->hyperv_interface_id[1] =3D c->ebx; + cpu->hyperv_interface_id[2] =3D c->ecx; + cpu->hyperv_interface_id[3] =3D c->edx; + } + c =3D cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0); if (c) { env->features[FEAT_HYPERV_EAX] =3D c->eax; @@ -1297,11 +1304,10 @@ static int hyperv_handle_properties(CPUState *cs, =20 c =3D &cpuid_ent[cpuid_i++]; c->function =3D HV_CPUID_INTERFACE; - memcpy(signature, "Hv#1\0\0\0\0\0\0\0\0", 12); - c->eax =3D signature[0]; - c->ebx =3D 0; - c->ecx =3D 0; - c->edx =3D 0; + c->eax =3D cpu->hyperv_interface_id[0]; + c->ebx =3D cpu->hyperv_interface_id[1]; + c->ecx =3D cpu->hyperv_interface_id[2]; + c->edx =3D cpu->hyperv_interface_id[3]; =20 c =3D &cpuid_ent[cpuid_i++]; c->function =3D HV_CPUID_VERSION; --=20 2.28.0