diff mbox series

[PULL,45/53] target/i386/kvm.c: Handle renaming of KVM_HINTS_DEDICATED

Message ID 20180531171606.21604-7-pbonzini@redhat.com
State Accepted
Commit 2af1acadc22e86b9fff7b2cd73ea9c779ba1a065
Headers show
Series None | expand

Commit Message

Paolo Bonzini May 31, 2018, 5:15 p.m. UTC 
From: Peter Maydell <peter.maydell@linaro.org>


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>

---
 target/i386/kvm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

-- 
2.17.0
diff mbox series

Patch

diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 9d8f80f4c0..8eae654991 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -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;
     }