OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/i386/kvm.c: Handle renaming of KVM_HINTS_DEDICATED 

In kernel header commit 633711e8287, the define KVM_HINTS_DEDICATED
was renamed to KVM_HINTS_REALTIME. Work around this compatibility
break by (a) using the new constant name, and (b) defining it
if the headers don't.

Part (b) can be removed once we've updated our copy of the kernel
headers to a version that defines KVM_HINTS_REALTIME.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180525132755.21839-5-peter.maydell@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Maydell 2018-05-25 14:27:53 +01:00 committed by Paolo Bonzini
parent f5bba4ca92
commit 2af1acadc2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
target/i386/kvm.c
View File

@ -47,6 +47,11 @@
#include "exec/memattrs.h"
#include "trace.h"
/* Work around this kernel header constant changing its name */
#ifndef KVM_HINTS_REALTIME
#define KVM_HINTS_REALTIME KVM_HINTS_DEDICATED
#endif
//#define DEBUG_KVM
#ifdef DEBUG_KVM
@ -386,7 +391,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 |= 1U << KVM_HINTS_DEDICATED;
ret |= 1U << KVM_HINTS_REALTIME;
found = 1;
}