Commit 1814eab6 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

x86/cpu: use standard-headers/asm-x86.kvm_para.h 



Switch to the header we imported from Linux,
this allows us to drop a hack in kvm_i386.h.
More code will be dropped in the next patch.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent d49bd359

hw/i386/kvm/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include "qapi/error.h"



#include <linux/kvm.h>

#include <linux/kvm_para.h>

#include "standard-headers/asm-x86/kvm_para.h"



#define TYPE_KVM_CLOCK "kvmclock"

#define KVM_CLOCK(obj) OBJECT_CHECK(KVMClockState, (obj), TYPE_KVM_CLOCK)

include/sysemu/kvm.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#ifdef NEED_CPU_H

# ifdef CONFIG_KVM

#  include <linux/kvm.h>

#  include <linux/kvm_para.h>

#  define CONFIG_KVM_IS_POSSIBLE

# endif

#else

target/i386/cpu.c

+1 −3
Original line number Diff line number Diff line
@@ -40,9 +40,7 @@ 
#include "qom/qom-qobject.h"

#include "sysemu/arch_init.h"



#if defined(CONFIG_KVM)

#include <linux/kvm_para.h>

#endif

#include "standard-headers/asm-x86/kvm_para.h"



#include "sysemu/sysemu.h"

#include "hw/qdev-properties.h"

target/i386/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -688,8 +688,6 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS]; 
#define CPUID_7_0_EDX_SPEC_CTRL     (1U << 26) /* Speculation Control */

#define CPUID_7_0_EDX_SPEC_CTRL_SSBD  (1U << 31) /* Speculative Store Bypass Disable */



#define KVM_HINTS_DEDICATED (1U << 0)



#define CPUID_8000_0008_EBX_IBPB    (1U << 12) /* Indirect Branch Prediction Barrier */



#define CPUID_XSAVE_XSAVEOPT   (1U << 0)

target/i386/kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <sys/utsname.h>



#include <linux/kvm.h>

#include <linux/kvm_para.h>

#include "standard-headers/asm-x86/kvm_para.h"



#include "qemu-common.h"

#include "cpu.h"
@@ -387,7 +387,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function, 
            ret &= ~(1U << KVM_FEATURE_PV_UNHALT);

        }

    } else if (function == KVM_CPUID_FEATURES && reg == R_EDX) {

        ret |= KVM_HINTS_DEDICATED;

        ret |= 1U << KVM_HINTS_DEDICATED;

        found = 1;

    }