Commit 116dc18d authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Alexander Graf
Browse files

kvm_ppc: remove kvmppc_timer_hack 



QEMU does have an I/O thread now, that can be interrupted at any time
because the VCPU thread runs outside the iothread mutex.

Therefore, the kvmppc_timer_hack is obsolete.  Remove it.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 18640989

hw/ppc/e500.c

+0 −4
Original line number Diff line number Diff line
@@ -1048,10 +1048,6 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) 
    boot_info->entry = bios_entry;

    boot_info->dt_base = dt_base;

    boot_info->dt_size = dt_size;



    if (kvm_enabled()) {

        kvmppc_init();

    }

}



static int e500_ccsr_initfn(SysBusDevice *dev)

hw/ppc/ppc440_bamboo.c

+0 −3
Original line number Diff line number Diff line
@@ -288,9 +288,6 @@ static void bamboo_init(MachineState *machine) 
            exit(1);

        }

    }



    if (kvm_enabled())

        kvmppc_init();

}



static void bamboo_machine_init(MachineClass *mc)

target-ppc/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ ifeq ($(CONFIG_SOFTMMU),y) 
obj-y += machine.o mmu_helper.o mmu-hash32.o monitor.o

obj-$(TARGET_PPC64) += mmu-hash64.o arch_dump.o

endif

obj-$(CONFIG_KVM) += kvm.o kvm_ppc.o

obj-$(CONFIG_KVM) += kvm.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o

obj-y += dfp_helper.o

obj-y += excp_helper.o

target-ppc/kvm_ppc.c

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
/*

 * PowerPC KVM support

 *

 * Copyright IBM Corp. 2008

 *

 * Authors:

 *  Hollis Blanchard <hollisb@us.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 *

 */



#include "qemu-common.h"

#include "qemu/timer.h"

#include "kvm_ppc.h"

#include "sysemu/device_tree.h"

#include "qemu/main-loop.h"



#define PROC_DEVTREE_PATH "/proc/device-tree"



static QEMUTimer *kvmppc_timer;

static unsigned int kvmppc_timer_rate;



static void kvmppc_timer_hack(void *opaque)

{

    qemu_notify_event();

    timer_mod(kvmppc_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + kvmppc_timer_rate);

}



void kvmppc_init(void)

{

    /* XXX The only reason KVM yields control back to qemu is device IO. Since

     * an idle guest does no IO, qemu's device model will never get a chance to

     * run. So, until QEMU gains IO threads, we create this timer to ensure

     * that the device model gets a chance to run. */

    kvmppc_timer_rate = get_ticks_per_sec() / 10;

    kvmppc_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, &kvmppc_timer_hack, NULL);

    timer_mod(kvmppc_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + kvmppc_timer_rate);

}

target-ppc/kvm_ppc.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 


#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU



void kvmppc_init(void);



#ifdef CONFIG_KVM



uint32_t kvmppc_get_tbfreq(void);