All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
	x86@kernel.org, gleb@redhat.com, pbonzini@redhat.com,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Jason Wang <jasowang@redhat.com>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
	Jeremy Fitzhardinge <jeremy@goop.org>,
	xen-devel@lists.xensource.com,
	virtualization@lists.linux-foundation.org
Subject: [PATCH 2/4] xen: switch to use hypervisor_cpuid_base()
Date: Tue, 23 Jul 2013 17:41:03 +0800	[thread overview]
Message-ID: <1374572465-15278-2-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1374572465-15278-1-git-send-email-jasowang@redhat.com>

Switch to use hypervisor_cpuid_base() to detect Xen.

Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: xen-devel@lists.xensource.com
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 arch/x86/include/asm/xen/hypervisor.h |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index 125f344..d866959 100644
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@ -40,21 +40,7 @@ extern struct start_info *xen_start_info;
 
 static inline uint32_t xen_cpuid_base(void)
 {
-	uint32_t base, eax, ebx, ecx, edx;
-	char signature[13];
-
-	for (base = 0x40000000; base < 0x40010000; base += 0x100) {
-		cpuid(base, &eax, &ebx, &ecx, &edx);
-		*(uint32_t *)(signature + 0) = ebx;
-		*(uint32_t *)(signature + 4) = ecx;
-		*(uint32_t *)(signature + 8) = edx;
-		signature[12] = 0;
-
-		if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2))
-			return base;
-	}
-
-	return 0;
+	return hypervisor_cpuid_base("XenVMMXenVMM", 2);
 }
 
 #ifdef CONFIG_XEN
-- 
1.7.1


WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com>
To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
	x86@kernel.org, gleb@redhat.com, pbonzini@redhat.com,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: xen-devel@lists.xensource.com,
	virtualization@lists.linux-foundation.org,
	Jeremy Fitzhardinge <jeremy@goop.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 2/4] xen: switch to use hypervisor_cpuid_base()
Date: Tue, 23 Jul 2013 17:41:03 +0800	[thread overview]
Message-ID: <1374572465-15278-2-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1374572465-15278-1-git-send-email-jasowang@redhat.com>

Switch to use hypervisor_cpuid_base() to detect Xen.

Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: xen-devel@lists.xensource.com
Cc: virtualization@lists.linux-foundation.org
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 arch/x86/include/asm/xen/hypervisor.h |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index 125f344..d866959 100644
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@ -40,21 +40,7 @@ extern struct start_info *xen_start_info;
 
 static inline uint32_t xen_cpuid_base(void)
 {
-	uint32_t base, eax, ebx, ecx, edx;
-	char signature[13];
-
-	for (base = 0x40000000; base < 0x40010000; base += 0x100) {
-		cpuid(base, &eax, &ebx, &ecx, &edx);
-		*(uint32_t *)(signature + 0) = ebx;
-		*(uint32_t *)(signature + 4) = ecx;
-		*(uint32_t *)(signature + 8) = edx;
-		signature[12] = 0;
-
-		if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2))
-			return base;
-	}
-
-	return 0;
+	return hypervisor_cpuid_base("XenVMMXenVMM", 2);
 }
 
 #ifdef CONFIG_XEN
-- 
1.7.1

  reply	other threads:[~2013-07-23  9:52 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-23  9:41 [PATCH 1/4] x86: introduce hypervisor_cpuid_base() Jason Wang
2013-07-23  9:41 ` Jason Wang [this message]
2013-07-23  9:41   ` [PATCH 2/4] xen: switch to use hypervisor_cpuid_base() Jason Wang
2013-07-23 11:16   ` Paolo Bonzini
2013-07-23 11:16     ` Paolo Bonzini
2013-07-23 15:55   ` Konrad Rzeszutek Wilk
2013-07-23 15:55     ` Konrad Rzeszutek Wilk
2013-07-23  9:41 ` [PATCH 3/4] kvm: " Jason Wang
2013-07-23 11:16   ` Paolo Bonzini
2013-07-23  9:41 ` [PATCH 4/4] x86: properly handle kvm emulation of hyperv Jason Wang
2013-07-23 11:17   ` Paolo Bonzini
2013-07-23 13:55   ` KY Srinivasan
2013-07-23 14:48     ` H. Peter Anvin
2013-07-23 17:45       ` KY Srinivasan
2013-07-23 18:45         ` H. Peter Anvin
2013-07-23 22:42           ` KY Srinivasan
2013-07-24  4:37       ` Jason Wang
2013-07-24  4:48         ` H. Peter Anvin
2013-07-24  6:54           ` Jason Wang
2013-07-24  7:06             ` Paolo Bonzini
2013-07-24 14:01               ` KY Srinivasan
2013-07-24 15:14                 ` H. Peter Anvin
2013-07-24 19:05                   ` KY Srinivasan
2013-07-24 19:05                     ` KY Srinivasan
2013-07-24 21:37                     ` H. Peter Anvin
2013-07-25  7:59                       ` Paolo Bonzini
2013-07-25  8:12                         ` Jason Wang
2013-07-23 10:04 ` [PATCH 1/4] x86: introduce hypervisor_cpuid_base() H. Peter Anvin
2013-07-23 11:16   ` Paolo Bonzini
2013-07-23 16:03     ` H. Peter Anvin
2013-07-24  4:44       ` Jason Wang
2013-07-24  4:47         ` H. Peter Anvin
2013-07-23 13:48 ` Gleb Natapov
2013-07-24  4:34   ` Jason Wang

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=1374572465-15278-2-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=gleb@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jeremy@goop.org \
    --cc=konrad.wilk@oracle.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=virtualization@lists.linux-foundation.org \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /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.