All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wei Liu <wl@xen.org>
To: Xen Development List <xen-devel@lists.xenproject.org>
Cc: "Wei Liu" <liuwe@microsoft.com>, "Wei Liu" <wl@xen.org>,
	"Andrew Cooper" <andrew.cooper3@citrix.com>,
	"Michael Kelley" <mikelley@microsoft.com>,
	"Jan Beulich" <jbeulich@suse.com>,
	"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH for-next v2 3/9] x86: drop hypervisor_cpuid_base
Date: Mon, 30 Sep 2019 16:00:37 +0100	[thread overview]
Message-ID: <20190930150044.5734-4-liuwe@microsoft.com> (raw)
In-Reply-To: <20190930150044.5734-1-liuwe@microsoft.com>

The only user is Xen specific code in PV shim. We can therefore export
the variable directly.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
---
 xen/arch/x86/guest/xen/xen.c    | 7 +------
 xen/arch/x86/pv/shim.c          | 2 +-
 xen/include/asm-x86/guest/xen.h | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/xen/arch/x86/guest/xen/xen.c b/xen/arch/x86/guest/xen/xen.c
index 7b7a5badab..78fc603996 100644
--- a/xen/arch/x86/guest/xen/xen.c
+++ b/xen/arch/x86/guest/xen/xen.c
@@ -37,7 +37,7 @@
 
 bool __read_mostly xen_guest;
 
-static __read_mostly uint32_t xen_cpuid_base;
+__read_mostly uint32_t xen_cpuid_base;
 extern char hypercall_page[];
 static struct rangeset *mem;
 
@@ -301,11 +301,6 @@ int hypervisor_free_unused_page(mfn_t mfn)
     return rangeset_remove_range(mem, mfn_x(mfn), mfn_x(mfn));
 }
 
-uint32_t hypervisor_cpuid_base(void)
-{
-    return xen_cpuid_base;
-}
-
 static void ap_resume(void *unused)
 {
     map_vcpuinfo();
diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c
index 5edbcd9ac5..5441e89de2 100644
--- a/xen/arch/x86/pv/shim.c
+++ b/xen/arch/x86/pv/shim.c
@@ -990,7 +990,7 @@ domid_t get_initial_domain_id(void)
     if ( !pv_shim )
         return 0;
 
-    cpuid(hypervisor_cpuid_base() + 4, &eax, &ebx, &ecx, &edx);
+    cpuid(xen_cpuid_base + 4, &eax, &ebx, &ecx, &edx);
 
     return (eax & XEN_HVM_CPUID_DOMID_PRESENT) ? ecx : 1;
 }
diff --git a/xen/include/asm-x86/guest/xen.h b/xen/include/asm-x86/guest/xen.h
index 7e04e4a7ab..b015ed1883 100644
--- a/xen/include/asm-x86/guest/xen.h
+++ b/xen/include/asm-x86/guest/xen.h
@@ -30,13 +30,13 @@
 
 extern bool xen_guest;
 extern bool pv_console;
+extern uint32_t xen_cpuid_base;
 
 void probe_hypervisor(void);
 void hypervisor_setup(void);
 void hypervisor_ap_setup(void);
 int hypervisor_alloc_unused_page(mfn_t *mfn);
 int hypervisor_free_unused_page(mfn_t mfn);
-uint32_t hypervisor_cpuid_base(void);
 void hypervisor_resume(void);
 
 DECLARE_PER_CPU(unsigned int, vcpu_id);
-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

  parent reply	other threads:[~2019-09-30 15:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-30 15:00 [Xen-devel] [PATCH for-next v2 0/9] Port Xen to Hyper-V Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 1/9] x86: introduce CONFIG_GUEST and move code Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 2/9] x86: include asm_defns.h directly in hypercall.h Wei Liu
2019-09-30 15:00 ` Wei Liu [this message]
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 4/9] x86: include xen/lib.h in guest/hypercall.h Wei Liu
2019-10-21  9:02   ` Roger Pau Monné
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 5/9] x86: introduce hypervisor framework Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 6/9] x86: rename hypervisor_{alloc, free}_unused_page Wei Liu
2019-10-21  9:11   ` Roger Pau Monné
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 7/9] x86: switch xen implementation to use hypervisor framework Wei Liu
2019-10-21  9:56   ` Roger Pau Monné
2019-10-21 14:35     ` Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 8/9] x86: be more verbose when running on a hypervisor Wei Liu
2019-10-21 10:00   ` Roger Pau Monné
2019-10-21 14:35     ` Wei Liu
2019-10-23 13:22     ` Jan Beulich
2019-11-05 11:17       ` Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next v2 9/9] x86: introduce CONFIG_HYPERV and detection code Wei Liu
2019-09-30 15:04   ` Wei Liu
2019-10-21 10:22   ` Roger Pau Monné
2019-10-21 10:26     ` Roger Pau Monné
2019-10-21 15:02       ` Andrew Cooper
2019-10-21 15:26         ` Wei Liu
2019-10-21 14:56     ` Wei Liu
2019-10-21 15:11       ` Roger Pau Monné
2019-10-21 15:20         ` Wei Liu
2019-09-30 15:00 ` [Xen-devel] [PATCH for-next RFC 0/8] Port Xen to Hyper-V Wei Liu
2019-10-21  8:58 ` [Xen-devel] [PATCH for-next v2 0/9] " Wei Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190930150044.5734-4-liuwe@microsoft.com \
    --to=wl@xen.org \
    --cc=andrew.cooper3@citrix.com \
    --cc=jbeulich@suse.com \
    --cc=liuwe@microsoft.com \
    --cc=mikelley@microsoft.com \
    --cc=roger.pau@citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.