Commit 290dae46 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

cpu: move interrupt handling out of translate-common.c 



translate-common.c will not be available anymore with --disable-tcg,
so we cannot leave cpu_interrupt_handler there.

Move the TCG-specific handler to accel/tcg/tcg-all.c, and adopt
KVM's handler as the default one, since it works just as well for
Xen and qtest.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a0be0c58

accel/kvm/kvm-all.c

+0 −11
Original line number Diff line number Diff line
@@ -981,15 +981,6 @@ static MemoryListener kvm_io_listener = { 
    .priority = 10,

};



static void kvm_handle_interrupt(CPUState *cpu, int mask)

{

    cpu->interrupt_request |= mask;



    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

    }

}



int kvm_set_irq(KVMState *s, int irq, int level)

{

    struct kvm_irq_level event;
@@ -1774,8 +1765,6 @@ static int kvm_init(MachineState *ms) 


    s->many_ioeventfds = kvm_check_many_ioeventfds();



    cpu_interrupt_handler = kvm_handle_interrupt;



    return 0;



err:

accel/tcg/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_SOFTMMU) += tcg-all.o

obj-$(CONFIG_SOFTMMU) += cputlb.o

obj-y += cpu-exec.o cpu-exec-common.o translate-all.o translate-common.o
 
obj-y += cpu-exec.o cpu-exec-common.o translate-all.o

accel/tcg/tcg-all.c

+32 −0
Original line number Diff line number Diff line
@@ -27,13 +27,45 @@ 
#include "sysemu/accel.h"

#include "sysemu/sysemu.h"

#include "qom/object.h"

#include "qemu-common.h"

#include "qom/cpu.h"

#include "sysemu/cpus.h"

#include "qemu/main-loop.h"



unsigned long tcg_tb_size;

static bool tcg_allowed = true;



#ifndef CONFIG_USER_ONLY

/* mask must never be zero, except for A20 change call */

static void tcg_handle_interrupt(CPUState *cpu, int mask)

{

    int old_mask;

    g_assert(qemu_mutex_iothread_locked());



    old_mask = cpu->interrupt_request;

    cpu->interrupt_request |= mask;



    /*

     * If called from iothread context, wake the target cpu in

     * case its halted.

     */

    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

    } else {

        cpu->icount_decr.u16.high = -1;

        if (use_icount &&

            !cpu->can_do_io

            && (mask & ~old_mask) != 0) {

            cpu_abort(cpu, "Raised interrupt while not in I/O function");

        }

    }

}

#endif



static int tcg_init(MachineState *ms)

{

    tcg_exec_init(tcg_tb_size * 1024 * 1024);

    cpu_interrupt_handler = tcg_handle_interrupt;

    return 0;

}

accel/tcg/translate-common.c

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

 *  Host code generation common components

 *

 *  Copyright (c) 2015 Peter Crosthwaite <crosthwaite.peter@gmail.com>

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qom/cpu.h"

#include "sysemu/cpus.h"

#include "qemu/main-loop.h"



#ifndef CONFIG_USER_ONLY

/* mask must never be zero, except for A20 change call */

static void tcg_handle_interrupt(CPUState *cpu, int mask)

{

    int old_mask;

    g_assert(qemu_mutex_iothread_locked());



    old_mask = cpu->interrupt_request;

    cpu->interrupt_request |= mask;



    /*

     * If called from iothread context, wake the target cpu in

     * case its halted.

     */

    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

    } else {

        cpu->icount_decr.u16.high = -1;

        if (use_icount &&

            !cpu->can_do_io

            && (mask & ~old_mask) != 0) {

            cpu_abort(cpu, "Raised interrupt while not in I/O function");

        }

    }

}



CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt;

#endif

qom/cpu.c

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include "hw/qdev-properties.h"

#include "trace-root.h"



CPUInterruptHandler cpu_interrupt_handler;



bool cpu_exists(int64_t id)

{

    CPUState *cpu;
@@ -417,6 +419,17 @@ static vaddr cpu_adjust_watchpoint_address(CPUState *cpu, vaddr addr, int len) 
    return addr;

}



static void generic_handle_interrupt(CPUState *cpu, int mask)

{

    cpu->interrupt_request |= mask;



    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

    }

}



CPUInterruptHandler cpu_interrupt_handler = generic_handle_interrupt;



static void cpu_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);