Commit 67b9c5d4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



* qemu-thread portability improvement (Fam)
* virtio-scsi IOMMU fix (Jason)
* poisoning and common-obj-y cleanups (Thomas)
* initial Hypervisor.framework refactoring (Sergio)
* x86 TCG interrupt injection fixes (Wu Xiang, me)
* --disable-tcg support for x86 (Yang Zhong, me)
* various other bugfixes and cleanups (Daniel, Peter, Thomas)

# gpg: Signature made Wed 05 Jul 2017 08:12:56 BST
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (42 commits)
  target/i386: add the CONFIG_TCG into Makefiles
  target/i386: add the tcg_enabled() in target/i386/
  target/i386: move TLB refill function out of helper.c
  target/i386: split cpu_set_mxcsr() and make cpu_set_fpuc() inline
  target/i386: make cpu_get_fp80()/cpu_set_fp80() static
  target/i386: move cpu_sync_bndcs_hflags() function
  tcg: add the CONFIG_TCG into Makefiles
  tcg: add CONFIG_TCG guards in headers
  exec: elide calls to tb_lock and tb_unlock
  tcg: move tb_lock out of translate-all.h
  tcg: add the tcg-stub.c file into accel/stubs/
  vapic: use tcg_enabled
  monitor: disable "info jit" and "info opcount" if !TCG
  tcg: make tcg_allowed global
  cpu: move interrupt handling out of translate-common.c
  tcg: move page_size_init() function
  vl: add tcg_enabled() for tcg related code
  vl: convert -tb-size to qemu_strtoul
  configure: add --disable-tcg configure option
  configure: early test for supported targets
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2185c93b 44eff673

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ io-obj-y = io/ 


ifeq ($(CONFIG_SOFTMMU),y)

common-obj-y = blockdev.o blockdev-nbd.o block/

common-obj-y += iothread.o

common-obj-y += bootdevice.o iothread.o

common-obj-y += net/

common-obj-y += qdev-monitor.o device-hotplug.o

common-obj-$(CONFIG_WIN32) += os-win32.o

Makefile.target

+3 −3
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ all: $(PROGS) stap 
# cpu emulator library

obj-y += exec.o

obj-y += accel/

obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o

obj-y += tcg/tcg-common.o tcg/tcg-runtime.o

obj-$(CONFIG_TCG) += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o

obj-$(CONFIG_TCG) += tcg/tcg-common.o tcg/tcg-runtime.o

obj-$(CONFIG_TCG_INTERPRETER) += tcg/tci.o

obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o

obj-y += fpu/softfloat.o
@@ -137,7 +137,7 @@ endif #CONFIG_BSD_USER 
# System emulator target

ifdef CONFIG_SOFTMMU

obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o

obj-y += qtest.o bootdevice.o

obj-y += qtest.o

obj-y += hw/

obj-y += memory.o

obj-y += memory_mapping.o

accel/Makefile.objs

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

obj-y += kvm/

obj-y += tcg/

obj-$(CONFIG_TCG) += tcg/

obj-y += stubs/

accel/kvm/kvm-all.c

+9 −20
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ int kvm_init_vcpu(CPUState *cpu) 


    cpu->kvm_fd = ret;

    cpu->kvm_state = s;

    cpu->kvm_vcpu_dirty = true;

    cpu->vcpu_dirty = true;



    mmap_size = kvm_ioctl(s, KVM_GET_VCPU_MMAP_SIZE, 0);

    if (mmap_size < 0) {
@@ -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:
@@ -1864,15 +1853,15 @@ void kvm_flush_coalesced_mmio_buffer(void) 


static void do_kvm_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg)

{

    if (!cpu->kvm_vcpu_dirty) {

    if (!cpu->vcpu_dirty) {

        kvm_arch_get_registers(cpu);

        cpu->kvm_vcpu_dirty = true;

        cpu->vcpu_dirty = true;

    }

}



void kvm_cpu_synchronize_state(CPUState *cpu)

{

    if (!cpu->kvm_vcpu_dirty) {

    if (!cpu->vcpu_dirty) {

        run_on_cpu(cpu, do_kvm_cpu_synchronize_state, RUN_ON_CPU_NULL);

    }

}
@@ -1880,7 +1869,7 @@ void kvm_cpu_synchronize_state(CPUState *cpu) 
static void do_kvm_cpu_synchronize_post_reset(CPUState *cpu, run_on_cpu_data arg)

{

    kvm_arch_put_registers(cpu, KVM_PUT_RESET_STATE);

    cpu->kvm_vcpu_dirty = false;

    cpu->vcpu_dirty = false;

}



void kvm_cpu_synchronize_post_reset(CPUState *cpu)
@@ -1891,7 +1880,7 @@ void kvm_cpu_synchronize_post_reset(CPUState *cpu) 
static void do_kvm_cpu_synchronize_post_init(CPUState *cpu, run_on_cpu_data arg)

{

    kvm_arch_put_registers(cpu, KVM_PUT_FULL_STATE);

    cpu->kvm_vcpu_dirty = false;

    cpu->vcpu_dirty = false;

}



void kvm_cpu_synchronize_post_init(CPUState *cpu)
@@ -1901,7 +1890,7 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) 


static void do_kvm_cpu_synchronize_pre_loadvm(CPUState *cpu, run_on_cpu_data arg)

{

    cpu->kvm_vcpu_dirty = true;

    cpu->vcpu_dirty = true;

}



void kvm_cpu_synchronize_pre_loadvm(CPUState *cpu)
@@ -1982,9 +1971,9 @@ int kvm_cpu_exec(CPUState *cpu) 
    do {

        MemTxAttrs attrs;



        if (cpu->kvm_vcpu_dirty) {

        if (cpu->vcpu_dirty) {

            kvm_arch_put_registers(cpu, KVM_PUT_RUNTIME_STATE);

            cpu->kvm_vcpu_dirty = false;

            cpu->vcpu_dirty = false;

        }



        kvm_arch_pre_run(cpu, run);

accel/stubs/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o

obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o