From: Glauber Costa <[email protected]> KVM will 24-shift bits in addr 0x20 (APIC_ID) before actually using it. We currently load phys_id as "s->id". After shifted by 24 bits, it will result in a meaningless value. We should really be doing "s->id << 24", which, after shifted, will lead to the correct value.
This is for the load function. save has the invert problem. Signed-off-by: Glauber Costa <[email protected]> Signed-off-by: Avi Kivity <[email protected]> diff --git a/hw/apic.c b/hw/apic.c index 8c059f6..466fb7e 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -835,7 +835,7 @@ static void kvm_kernel_lapic_save_to_user(APICState *s) kvm_get_lapic(kvm_context, s->cpu_env->cpu_index, kapic); - s->id = kapic_reg(kapic, 0x2); + s->id = kapic_reg(kapic, 0x2) >> 24; s->tpr = kapic_reg(kapic, 0x8); s->arb_id = kapic_reg(kapic, 0x9); s->log_dest = kapic_reg(kapic, 0xd) >> 24; @@ -868,7 +868,7 @@ static void kvm_kernel_lapic_load_from_user(APICState *s) int i; memset(klapic, 0, sizeof apic); - kapic_set_reg(klapic, 0x2, s->id); + kapic_set_reg(klapic, 0x2, s->id << 24); kapic_set_reg(klapic, 0x8, s->tpr); kapic_set_reg(klapic, 0xd, s->log_dest << 24); kapic_set_reg(klapic, 0xe, s->dest_mode << 28 | 0x0fffffff); -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
