From nobody Fri May 3 12:16:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502142156833943.6453699646881; Mon, 7 Aug 2017 14:42:36 -0700 (PDT) Received: from localhost ([::1]:39694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1depnH-0006Mv-Gt for importer@patchew.org; Mon, 07 Aug 2017 17:42:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48210) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deplX-0005Hb-5M for qemu-devel@nongnu.org; Mon, 07 Aug 2017 17:40:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1deplS-0006Sy-Gv for qemu-devel@nongnu.org; Mon, 07 Aug 2017 17:40:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55194) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1deplS-0006Sb-Ag for qemu-devel@nongnu.org; Mon, 07 Aug 2017 17:40:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 33CC161462; Mon, 7 Aug 2017 21:40:41 +0000 (UTC) Received: from redhat.com (ovpn-122-166.rdu2.redhat.com [10.10.122.166]) by smtp.corp.redhat.com (Postfix) with SMTP id EB87E60BEB; Mon, 7 Aug 2017 21:40:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 33CC161462 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=mst@redhat.com Date: Tue, 8 Aug 2017 00:40:35 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1502142009-9370-2-git-send-email-mst@redhat.com> References: <1502142009-9370-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1502142009-9370-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 07 Aug 2017 21:40:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/2] hw/i386: allow SHPC for Q35 machine X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Aleksandr Bezzubikov , Igor Mammedov , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Aleksandr Bezzubikov Unmask previously masked SHPC feature in _OSC method. Signed-off-by: Aleksandr Bezzubikov Reviewed-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b9c245c..98dd424 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1862,9 +1862,9 @@ static Aml *build_q35_osc_method(void) =20 /* * Always allow native PME, AER (no dependencies) - * Never allow SHPC (no SHPC controller in this system) + * Allow SHPC (PCI bridges can have SHPC controller) */ - aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1D), a_ctrl)); + aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1F), a_ctrl)); =20 if_ctx2 =3D aml_if(aml_lnot(aml_equal(aml_arg(1), aml_int(1)))); /* Unknown revision */ --=20 MST From nobody Fri May 3 12:16:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150214216923566.16721239686285; Mon, 7 Aug 2017 14:42:49 -0700 (PDT) Received: from localhost ([::1]:39695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1depnT-0006VJ-N8 for importer@patchew.org; Mon, 07 Aug 2017 17:42:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1deplb-0005Jv-N1 for qemu-devel@nongnu.org; Mon, 07 Aug 2017 17:40:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1deplW-0006Xj-RP for qemu-devel@nongnu.org; Mon, 07 Aug 2017 17:40:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55256) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1deplW-0006XM-Ij for qemu-devel@nongnu.org; Mon, 07 Aug 2017 17:40:46 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 34D5B61470; Mon, 7 Aug 2017 21:40:45 +0000 (UTC) Received: from redhat.com (ovpn-122-166.rdu2.redhat.com [10.10.122.166]) by smtp.corp.redhat.com (Postfix) with SMTP id B705A60BEB; Mon, 7 Aug 2017 21:40:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 34D5B61470 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=mst@redhat.com Date: Tue, 8 Aug 2017 00:40:40 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1502142009-9370-3-git-send-email-mst@redhat.com> References: <1502142009-9370-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1502142009-9370-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 07 Aug 2017 21:40:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/2] cpu: add APIs to allocate/free CPU environment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , "Emilio G. Cota" , Stefan Hajnoczi , Paolo Bonzini , Alex =?utf-8?Q?Benn=C3=A9e?= , =?utf-8?B?TGx1w61z?= Vilanova , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These will be implemented and then used by follow-up patches. Signed-off-by: Michael S. Tsirkin --- include/qom/cpu.h | 31 +++++++++++++++++++++++++++++++ qom/cpu.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 25eefea..e9d30c5 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -162,6 +162,10 @@ typedef struct CPUClass { void (*dump_statistics)(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, int flags); int64_t (*get_arch_id)(CPUState *cpu); + void * (*alloc_env)(CPUState *cpu); + void (*get_env)(CPUState *cpu, void *env); + void (*set_env)(CPUState *cpu, void *env); + void (*free_env)(CPUState *cpu, void *env); bool (*get_paging_enabled)(const CPUState *cpu); void (*get_memory_mapping)(CPUState *cpu, MemoryMappingList *list, Error **errp); @@ -440,6 +444,33 @@ extern bool mttcg_enabled; #define qemu_tcg_mttcg_enabled() (mttcg_enabled) =20 /** + * cpu_alloc_env: allocate CPU environment structure + * @cpu: allocate environment structure for this CPU + */ +void *cpu_alloc_env(CPUState *cpu); + +/** + * cpu_get_env: retrieve CPU environment structure + * @cpu: CPU to use + * @env: environment structure to use + */ +void cpu_get_env(CPUState *cpu, void *env); + +/** + * cpu_set_env: switch to given CPU environment + * @cpu: CPU to use + * @env: environment structure to use + */ +void cpu_set_env(CPUState *cpu, void *env); + +/** + * cpu_free_env: free CPU environment structure + * @cpu: free environment structure for this CPU + * @env: structure to free + */ +void cpu_free_env(CPUState *cpu, void *env); + +/** * cpu_paging_enabled: * @cpu: The CPU whose state is to be inspected. * diff --git a/qom/cpu.c b/qom/cpu.c index 4f38db0..9201fd9 100644 --- a/qom/cpu.c +++ b/qom/cpu.c @@ -89,6 +89,40 @@ out: return cpu; } =20 +void *cpu_alloc_env(CPUState *cpu) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + return cc->alloc_env ? cc->alloc_env(cpu) : NULL; +} + +void cpu_get_env(CPUState *cpu, void *env) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + if (cc->get_env) { + cc->get_env(cpu, env); + } +} + +void cpu_set_env(CPUState *cpu, void *env) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + if (cc->set_env) { + cc->set_env(cpu, env); + } +} + +void cpu_free_env(CPUState *cpu, void *env) +{ + CPUClass *cc =3D CPU_GET_CLASS(cpu); + + if (cc->free_env) { + cc->free_env(cpu, env); + } +} + bool cpu_paging_enabled(const CPUState *cpu) { CPUClass *cc =3D CPU_GET_CLASS(cpu); --=20 MST