Commit 6c263e26 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging 

* qemu-kvm/uq/master:
  apic: Fix legacy vmstate loading for KVM
  kvm: Implement kvm_irqchip_in_kernel like kvm_enabled
  kvm: Allow to set shadow MMU size
parents cf5cfe04 a4aecd28

hw/apic_common.c

+6 −1
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ static void apic_reset_common(DeviceState *d) 
static int apic_load_old(QEMUFile *f, void *opaque, int version_id)

{

    APICCommonState *s = opaque;

    APICCommonClass *info = APIC_COMMON_GET_CLASS(s);

    int i;



    if (version_id > 2) {
@@ -220,7 +221,11 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) 
    s->next_time = qemu_get_be64(f);



    if (version_id >= 2) {

        qemu_get_timer(f, s->timer);

        s->timer_expiry = qemu_get_be64(f);

    }



    if (info->post_load) {

        info->post_load(s);

    }

    return 0;

}

hw/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -890,7 +890,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) 
    DeviceState *dev;

    static int apic_mapped;



    if (kvm_enabled() && kvm_irqchip_in_kernel()) {

    if (kvm_irqchip_in_kernel()) {

        dev = qdev_create(NULL, "kvm-apic");

    } else {

        dev = qdev_create(NULL, "apic");
@@ -909,7 +909,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id) 
    }



    /* KVM does not support MSI yet. */

    if (!kvm_enabled() || !kvm_irqchip_in_kernel()) {

    if (!kvm_irqchip_in_kernel()) {

        msi_supported = true;

    }

hw/pc_piix.c

+3 −3
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void ioapic_init(GSIState *gsi_state) 
    SysBusDevice *d;

    unsigned int i;



    if (kvm_enabled() && kvm_irqchip_in_kernel()) {

    if (kvm_irqchip_in_kernel()) {

        dev = qdev_create(NULL, "kvm-ioapic");

    } else {

        dev = qdev_create(NULL, "ioapic");
@@ -183,7 +183,7 @@ static void pc_init1(MemoryRegion *system_memory, 
    }



    gsi_state = g_malloc0(sizeof(*gsi_state));

    if (kvm_enabled() && kvm_irqchip_in_kernel()) {

    if (kvm_irqchip_in_kernel()) {

        kvm_piix3_setup_irq_routing(pci_enabled);

        gsi = qemu_allocate_irqs(kvm_piix3_gsi_handler, gsi_state,

                                 GSI_NUM_PINS);
@@ -209,7 +209,7 @@ static void pc_init1(MemoryRegion *system_memory, 
    }

    isa_bus_irqs(isa_bus, gsi);



    if (kvm_enabled() && kvm_irqchip_in_kernel()) {

    if (kvm_irqchip_in_kernel()) {

        i8259 = kvm_i8259_init(isa_bus);

    } else if (xen_enabled()) {

        i8259 = xen_interrupt_controller_init();

kvm-all.c

+4 −9
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ struct KVMState 
#ifdef KVM_CAP_SET_GUEST_DEBUG

    struct kvm_sw_breakpoint_head kvm_sw_breakpoints;

#endif

    int irqchip_in_kernel;

    int pit_in_kernel;

    int xsave, xcrs;

    int many_ioeventfds;
@@ -88,6 +87,7 @@ struct KVMState 
};



KVMState *kvm_state;

bool kvm_kernel_irqchip;



static const KVMCapabilityInfo kvm_required_capabilites[] = {

    KVM_CAP_INFO(USER_MEMORY),
@@ -193,11 +193,6 @@ static void kvm_reset_vcpu(void *opaque) 
    kvm_arch_reset_vcpu(env);

}



int kvm_irqchip_in_kernel(void)

{

    return kvm_state->irqchip_in_kernel;

}



int kvm_pit_in_kernel(void)

{

    return kvm_state->pit_in_kernel;
@@ -742,7 +737,7 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level) 
    struct kvm_irq_level event;

    int ret;



    assert(s->irqchip_in_kernel);

    assert(kvm_irqchip_in_kernel());



    event.level = level;

    event.irq = irq;
@@ -862,7 +857,7 @@ static int kvm_irqchip_create(KVMState *s) 
    if (kvm_check_extension(s, KVM_CAP_IRQ_INJECT_STATUS)) {

        s->irqchip_inject_ioctl = KVM_IRQ_LINE_STATUS;

    }

    s->irqchip_in_kernel = 1;

    kvm_kernel_irqchip = true;



    kvm_init_irq_routing(s);
@@ -1315,7 +1310,7 @@ int kvm_has_gsi_routing(void) 


int kvm_allows_irq0_override(void)

{

    return !kvm_enabled() || !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();

    return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing();

}



void kvm_setup_guest_memory(void *start, size_t size)

kvm-stub.c

+0 −5
Original line number Diff line number Diff line
@@ -16,11 +16,6 @@ 
#include "gdbstub.h"

#include "kvm.h"



int kvm_irqchip_in_kernel(void)

{

    return 0;

}



int kvm_pit_in_kernel(void)

{

    return 0;