From: Don Zickus <[email protected]>

Upstream status: RHEL only

The variable x86_hyper_type is hidden behind a macro and not available
when guest mode is not config'd enabled.

Update to use hypervisor_is_type() macro, available since

commit 79cc74155218316b9a5d28577c7077b2adba8e58
Author: Thomas Gleixner <[email protected]>
Date:   Mon Dec 4 15:07:31 2017 +0100

    x86/paravirt: Provide a way to check for hypervisors

Test compiled with HYPERVISOR_GUEST enabled/disabled.

Signed-off-by: Don Zickus <[email protected]>
---
 arch/x86/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 505ed44d4e31..00fa8139b069 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -822,7 +822,7 @@ static void rh_check_supported(void)
 {
        bool guest;
 
-       guest = (x86_hyper_type != X86_HYPER_NATIVE || 
boot_cpu_has(X86_FEATURE_HYPERVISOR));
+       guest = (!hypervisor_is_type(X86_HYPER_NATIVE) || 
boot_cpu_has(X86_FEATURE_HYPERVISOR));
 
        /* RHEL supports single cpu on guests only */
        if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
-- 
2.26.2
_______________________________________________
kernel mailing list -- [email protected]
To unsubscribe send an email to [email protected]
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/[email protected]

Reply via email to