From nobody Tue Feb 10 02:55:10 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1597180459; cv=none; d=zohomail.com; s=zohoarc; b=PxK+kB3H7Y0SaCkrnwDztP/w7zV9vS8FCRb63HRXohyYNhaMweepu/3nTxWPHlsyiui5e1fkJHBa5klVQuVIUwUziYLoZDLGFwTLEMjfpP/o8Bn/XT21WI04XAlSXH06euSNmeQtXYDx6b2NWcUMoVwQQqgA1x2R8Yl9BaYe5p8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597180459; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=J9kKjayryjNvJ8DOJUf0DPXvhhgl7a2+oCfBe7cm7z0=; b=LdQkamRfq04kLsFsnacCURIeIwyZJ9LPrz0mceElpNKZIS/8LhO5wzjMRSXi/Nfe9mypbrh4Dfxrhk2p6QBIioWzvNrF8quUwVEsZi1lKqeGAaCXvXSQKxMn6crsbrsX35CGDWdQct4mnBOuk/8szlR9QJ6jLwjrW/8SiaWSBpw= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597180459893810.6571321783243; Tue, 11 Aug 2020 14:14:19 -0700 (PDT) Received: from localhost ([::1]:60120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5bb8-0000nq-PI for importer@patchew.org; Tue, 11 Aug 2020 17:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5bR2-0002mY-H8 for qemu-devel@nongnu.org; Tue, 11 Aug 2020 17:03:52 -0400 Received: from mx2.suse.de ([195.135.220.15]:57860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5bQy-0001eO-GW for qemu-devel@nongnu.org; Tue, 11 Aug 2020 17:03:52 -0400 Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 41C66AF96; Tue, 11 Aug 2020 21:03:57 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Claudio Fontana To: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Roman Bolshakov Subject: [RFC v4 12/14] whpx: remove whpx specific functions from global includes Date: Tue, 11 Aug 2020 23:03:24 +0200 Message-Id: <20200811210326.4425-13-cfontana@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200811210326.4425-1-cfontana@suse.de> References: <20200811210326.4425-1-cfontana@suse.de> 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=195.135.220.15; envelope-from=cfontana@suse.de; helo=mx2.suse.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/11 02:05:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x (no timestamps) [generic] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Laurent Vivier , Thomas Huth , Eduardo Habkost , Pavel Dovgalyuk , Marcelo Tosatti , qemu-devel@nongnu.org, Markus Armbruster , Wenchao Wang , Colin Xu , Claudio Fontana , haxm-team@intel.com, Sunil Muthuswamy , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Claudio Fontana --- accel/stubs/Makefile.objs | 1 - accel/stubs/whpx-stub.c | 47 -------------------------------------------= ---- include/sysemu/whpx.h | 19 ------------------- target/i386/whpx-all.c | 1 + target/i386/whpx-cpus.c | 1 + target/i386/whpx-int.h | 32 ++++++++++++++++++++++++++++++++ 6 files changed, 34 insertions(+), 67 deletions(-) delete mode 100644 accel/stubs/whpx-stub.c create mode 100644 target/i386/whpx-int.h diff --git a/accel/stubs/Makefile.objs b/accel/stubs/Makefile.objs index 6630954f30..3c2a2fedc4 100644 --- a/accel/stubs/Makefile.objs +++ b/accel/stubs/Makefile.objs @@ -1,5 +1,4 @@ obj-$(call lnot,$(CONFIG_HAX)) +=3D hax-stub.o -obj-$(call lnot,$(CONFIG_WHPX)) +=3D whpx-stub.o obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o obj-$(call lnot,$(CONFIG_TCG)) +=3D tcg-stub.o obj-$(call lnot,$(CONFIG_XEN)) +=3D xen-stub.o diff --git a/accel/stubs/whpx-stub.c b/accel/stubs/whpx-stub.c deleted file mode 100644 index 1efb89f25e..0000000000 --- a/accel/stubs/whpx-stub.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * QEMU Windows Hypervisor Platform accelerator (WHPX) stub - * - * Copyright Microsoft Corp. 2017 - * - * 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 "cpu.h" -#include "sysemu/whpx.h" - -int whpx_init_vcpu(CPUState *cpu) -{ - return -1; -} - -int whpx_vcpu_exec(CPUState *cpu) -{ - return -1; -} - -void whpx_destroy_vcpu(CPUState *cpu) -{ -} - -void whpx_vcpu_kick(CPUState *cpu) -{ -} - -void whpx_cpu_synchronize_state(CPUState *cpu) -{ -} - -void whpx_cpu_synchronize_post_reset(CPUState *cpu) -{ -} - -void whpx_cpu_synchronize_post_init(CPUState *cpu) -{ -} - -void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu) -{ -} diff --git a/include/sysemu/whpx.h b/include/sysemu/whpx.h index a84b49e749..59edf13742 100644 --- a/include/sysemu/whpx.h +++ b/include/sysemu/whpx.h @@ -13,18 +13,6 @@ #ifndef QEMU_WHPX_H #define QEMU_WHPX_H =20 - -int whpx_init_vcpu(CPUState *cpu); -int whpx_vcpu_exec(CPUState *cpu); -void whpx_destroy_vcpu(CPUState *cpu); -void whpx_vcpu_kick(CPUState *cpu); - - -void whpx_cpu_synchronize_state(CPUState *cpu); -void whpx_cpu_synchronize_post_reset(CPUState *cpu); -void whpx_cpu_synchronize_post_init(CPUState *cpu); -void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu); - #ifdef CONFIG_WHPX =20 int whpx_enabled(void); @@ -35,11 +23,4 @@ int whpx_enabled(void); =20 #endif /* CONFIG_WHPX */ =20 -/* state subset only touched by the VCPU itself during runtime */ -#define WHPX_SET_RUNTIME_STATE 1 -/* state subset modified during VCPU reset */ -#define WHPX_SET_RESET_STATE 2 -/* full state set, modified during initialization or on vmload */ -#define WHPX_SET_FULL_STATE 3 - #endif /* QEMU_WHPX_H */ diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index b3d17fbe04..75c3139535 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -25,6 +25,7 @@ #include "whp-dispatch.h" =20 #include "whpx-cpus.h" +#include "whpx-int.h" =20 #include #include diff --git a/target/i386/whpx-cpus.c b/target/i386/whpx-cpus.c index 3a0b69f771..83400abee9 100644 --- a/target/i386/whpx-cpus.c +++ b/target/i386/whpx-cpus.c @@ -16,6 +16,7 @@ =20 #include "sysemu/whpx.h" #include "whpx-cpus.h" +#include "whpx-int.h" =20 #include #include diff --git a/target/i386/whpx-int.h b/target/i386/whpx-int.h new file mode 100644 index 0000000000..0c18fbdf54 --- /dev/null +++ b/target/i386/whpx-int.h @@ -0,0 +1,32 @@ +/* + * QEMU Windows Hypervisor Platform accelerator (WHPX) support + * + * Copyright Microsoft, Corp. 2017 + * + * Authors: + * + * 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. + * + */ +#ifndef WHPX_INT_H +#define WHPX_INT_H + +int whpx_init_vcpu(CPUState *cpu); +int whpx_vcpu_exec(CPUState *cpu); +void whpx_destroy_vcpu(CPUState *cpu); +void whpx_vcpu_kick(CPUState *cpu); + +void whpx_cpu_synchronize_state(CPUState *cpu); +void whpx_cpu_synchronize_post_reset(CPUState *cpu); +void whpx_cpu_synchronize_post_init(CPUState *cpu); +void whpx_cpu_synchronize_pre_loadvm(CPUState *cpu); + +/* state subset only touched by the VCPU itself during runtime */ +#define WHPX_SET_RUNTIME_STATE 1 +/* state subset modified during VCPU reset */ +#define WHPX_SET_RESET_STATE 2 +/* full state set, modified during initialization or on vmload */ +#define WHPX_SET_FULL_STATE 3 + +#endif /* WHPX_INT_H */ --=20 2.16.4