[kvm-unit-tests PATCH] x86: Allow xapic ID writes to silently fail

[nadav.amit@xxxxxxxxx]

From: Nadav Amit <nadav.amit@xxxxxxxxx>

According to Intel SDM: "Some processors permit software to modify the
APIC ID.  However, the ability of software to modify the APIC ID is
processor model specific."

Allow this behavior not to cause failures.

Cc: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
Signed-off-by: Nadav Amit <nadav.amit@xxxxxxxxx>
---
 x86/apic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x86/apic.c b/x86/apic.c
index d1ed5ea..6772f3f 100644
--- a/x86/apic.c
+++ b/x86/apic.c
@@ -210,7 +210,7 @@ static void __test_apic_id(void * unused)
     newid = (id + 1) << 24;
     report("writeable xapic id",
             !test_for_exception(GP_VECTOR, do_write_apic_id, &newid) &&
-            id + 1 == apic_id());
+	    (id == apic_id() || id + 1 == apic_id()));
 
     if (!enable_x2apic())
         goto out;
-- 
2.19.1