Commit e391c009 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

pc: kvm_apic: Pass APIC ID depending on xAPIC/x2APIC mode 



Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent facb07cd

hw/i386/kvm/apic.c

+10 −2
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ static void kvm_put_apic_state(APICCommonState *s, struct kvm_lapic_state *kapic 
    int i;



    memset(kapic, 0, sizeof(*kapic));

    if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) {

        kvm_apic_set_reg(kapic, 0x2, s->initial_apic_id);

    } else {

        kvm_apic_set_reg(kapic, 0x2, s->id << 24);

    }

    kvm_apic_set_reg(kapic, 0x8, s->tpr);

    kvm_apic_set_reg(kapic, 0xd, s->log_dest << 24);

    kvm_apic_set_reg(kapic, 0xe, s->dest_mode << 28 | 0x0fffffff);
@@ -59,7 +63,11 @@ void kvm_get_apic_state(DeviceState *dev, struct kvm_lapic_state *kapic) 
    APICCommonState *s = APIC_COMMON(dev);

    int i, v;



    if (kvm_has_x2apic_api() && s->apicbase & MSR_IA32_APICBASE_EXTD) {

        assert(kvm_apic_get_reg(kapic, 0x2) == s->initial_apic_id);

    } else {

        s->id = kvm_apic_get_reg(kapic, 0x2) >> 24;

    }

    s->tpr = kvm_apic_get_reg(kapic, 0x8);

    s->arb_id = kvm_apic_get_reg(kapic, 0x9);

    s->log_dest = kvm_apic_get_reg(kapic, 0xd) >> 24;

target-i386/kvm.c

+10 −3
Original line number Diff line number Diff line
@@ -129,9 +129,8 @@ static bool kvm_x2apic_api_set_flags(uint64_t flags) 
    return !kvm_vm_enable_cap(s, KVM_CAP_X2APIC_API, 0, flags);

}



#define MEMORIZE(fn) \

#define MEMORIZE(fn, _result) \

    ({ \

        static typeof(fn) _result; \

        static bool _memorized; \

        \

        if (_memorized) { \
@@ -141,11 +140,19 @@ static bool kvm_x2apic_api_set_flags(uint64_t flags) 
        _result = fn; \

    })



static bool has_x2apic_api;



bool kvm_has_x2apic_api(void)

{

    return has_x2apic_api;

}



bool kvm_enable_x2apic(void)

{

    return MEMORIZE(

             kvm_x2apic_api_set_flags(KVM_X2APIC_API_USE_32BIT_IDS |

                                      KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK));

                                      KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK),

             has_x2apic_api);

}



static int kvm_get_tsc(CPUState *cs)

target-i386/kvm_i386.h

+1 −0
Original line number Diff line number Diff line
@@ -44,4 +44,5 @@ int kvm_device_msix_deassign(KVMState *s, uint32_t dev_id); 
void kvm_put_apicbase(X86CPU *cpu, uint64_t value);



bool kvm_enable_x2apic(void);

bool kvm_has_x2apic_api(void);

#endif