Commit 598cf1c8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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

* QOM interface fix (Eduardo)
* RTC fixes (Gaohuai, Igor)
* Memory leak fixes (Li Qiang, me)
* Ctrl-a b regression (Marc-André)
* Stubs cleanups and fixes (Leif, me)
* hxtool tweak (me)
* HAX support (Vincent)
* QemuThread, exec.c and SCSI fixes (Roman, Xinhua, me)
* PC_COMPAT_2_8 fix (Marcelo)
* stronger bitmap assertions (Peter)

# gpg: Signature made Fri 20 Jan 2017 12:49:01 GMT
# 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: (35 commits)
  pc.h: move x-mach-use-reliable-get-clock compat entry to PC_COMPAT_2_8
  bitmap: assert that start and nr are non negative
  Revert "win32: don't run subprocess tests on Mingw32 platform"
  hax: add Darwin support
  Plumb the HAXM-based hardware acceleration support
  target/i386: Add Intel HAX files
  kvm: move cpu synchronization code
  KVM: PPC: eliminate unnecessary duplicate constants
  ramblock-notifier: new
  char: fix ctrl-a b not working
  exec: Add missing rcu_read_unlock
  x86: ioapic: fix fail migration when irqchip=split
  x86: ioapic: dump version for "info ioapic"
  x86: ioapic: add traces for ioapic
  hxtool: emit Texinfo headings as @subsection
  qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create()
  serial: fix memory leak in serial exit
  scsi-block: fix direction of BYTCHK test for VERIFY commands
  pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged
  acpi: filter based on CONFIG_ACPI_X86 rather than TARGET
  ...

# Conflicts:
#	include/hw/i386/pc.h
parents d1c82f7c abc62c89

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1501,6 +1501,7 @@ M: Riku Voipio <riku.voipio@iki.fi> 
S: Maintained

F: thunk.c

F: user-exec.c

F: user-exec-stub.c



BSD user

S: Orphan

Makefile.target

+3 −2
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ obj-y += target/$(TARGET_BASE_ARCH)/ 
obj-y += disas.o

obj-y += tcg-runtime.o

obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o

obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o

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



obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/decContext.o
@@ -115,7 +116,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \ 
             -I$(SRC_PATH)/linux-user



obj-y += linux-user/

obj-y += gdbstub.o thunk.o user-exec.o

obj-y += gdbstub.o thunk.o user-exec.o user-exec-stub.o



endif #CONFIG_LINUX_USER
@@ -128,7 +129,7 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ 
			 -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR)



obj-y += bsd-user/

obj-y += gdbstub.o user-exec.o

obj-y += gdbstub.o user-exec.o user-exec-stub.o



endif #CONFIG_BSD_USER

arch_init.c

+0 −21
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include "sysemu/arch_init.h"

#include "hw/pci/pci.h"

#include "hw/audio/audio.h"

#include "hw/smbios/smbios.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

#include "qmp-commands.h"
@@ -235,26 +234,6 @@ void audio_init(void) 
    }

}



void do_acpitable_option(const QemuOpts *opts)

{

#ifdef TARGET_I386

    Error *err = NULL;



    acpi_table_add(opts, &err);

    if (err) {

        error_reportf_err(err, "Wrong acpi table provided: ");

        exit(1);

    }

#endif

}



void do_smbios_option(QemuOpts *opts)

{

#ifdef TARGET_I386

    smbios_entry_add(opts);

#endif

}



int kvm_available(void)

{

#ifdef CONFIG_KVM

configure

+17 −10
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ vhost_net="no" 
vhost_scsi="no"

vhost_vsock="no"

kvm="no"

colo="yes"

hax="no"

rdma=""

gprof="no"

debug_tcg="no"
@@ -562,6 +562,7 @@ CYGWIN*) 
;;

MINGW32*)

  mingw32="yes"

  hax="yes"

  audio_possible_drivers="dsound sdl"

  if check_include dsound.h; then

    audio_drv_list="dsound"
@@ -611,6 +612,7 @@ OpenBSD) 
Darwin)

  bsd="yes"

  darwin="yes"

  hax="yes"

  LDFLAGS_SHARED="-bundle -undefined dynamic_lookup"

  if [ "$cpu" = "x86_64" ] ; then

    QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS"
@@ -920,9 +922,9 @@ for opt do 
  ;;

  --enable-kvm) kvm="yes"

  ;;

  --disable-colo) colo="no"

  --disable-hax) hax="no"

  ;;

  --enable-colo) colo="yes"

  --enable-hax) hax="yes"

  ;;

  --disable-tcg-interpreter) tcg_interpreter="no"

  ;;
@@ -1372,7 +1374,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  fdt             fdt device tree

  bluez           bluez stack connectivity

  kvm             KVM acceleration support

  colo            COarse-grain LOck-stepping VM for Non-stop Service

  hax             HAX acceleration support

  rdma            RDMA-based migration support

  vde             support for vde network

  netmap          support for netmap network
@@ -3077,7 +3079,7 @@ fi 


# g_test_trap_subprocess added in 2.38. Used by some tests.

glib_subprocess=yes

if test "$mingw32" = "yes" || ! $pkg_config --atleast-version=2.38 glib-2.0; then

if ! $pkg_config --atleast-version=2.38 glib-2.0; then

    glib_subprocess=no

fi
@@ -5062,7 +5064,7 @@ echo "Linux AIO support $linux_aio" 
echo "ATTR/XATTR support $attr"

echo "Install blobs     $blobs"

echo "KVM support       $kvm"

echo "COLO support      $colo"

echo "HAX support       $hax"

echo "RDMA support      $rdma"

echo "TCG interpreter   $tcg_interpreter"

echo "fdt support       $fdt"
@@ -5701,10 +5703,6 @@ if have_backend "syslog"; then 
fi

echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak



if test "$colo" = "yes"; then

  echo "CONFIG_COLO=y" >> $config_host_mak

fi



if test "$rdma" = "yes" ; then

  echo "CONFIG_RDMA=y" >> $config_host_mak

fi
@@ -6050,6 +6048,15 @@ case "$target_name" in 
      fi

    fi

esac

if test "$hax" = "yes" ; then

  if test "$target_softmmu" = "yes" ; then

    case "$target_name" in

    i386|x86_64)

      echo "CONFIG_HAX=y" >> $config_target_mak

    ;;

    esac

  fi

fi

if test "$target_bigendian" = "yes" ; then

  echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak

fi

cpus.c

+78 −1
Original line number Diff line number Diff line
@@ -33,7 +33,9 @@ 
#include "sysemu/block-backend.h"

#include "exec/gdbstub.h"

#include "sysemu/dma.h"

#include "sysemu/hw_accel.h"

#include "sysemu/kvm.h"

#include "sysemu/hax.h"

#include "qmp-commands.h"

#include "exec/exec-all.h"
@@ -1220,6 +1222,46 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) 
    return NULL;

}



static void *qemu_hax_cpu_thread_fn(void *arg)

{

    CPUState *cpu = arg;

    int r;

    qemu_thread_get_self(cpu->thread);

    qemu_mutex_lock(&qemu_global_mutex);



    cpu->thread_id = qemu_get_thread_id();

    cpu->created = true;

    cpu->halted = 0;

    current_cpu = cpu;



    hax_init_vcpu(cpu);

    qemu_cond_signal(&qemu_cpu_cond);



    while (1) {

        if (cpu_can_run(cpu)) {

            r = hax_smp_cpu_exec(cpu);

            if (r == EXCP_DEBUG) {

                cpu_handle_guest_debug(cpu);

            }

        }



        while (cpu_thread_is_idle(cpu)) {

            qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex);

        }

#ifdef _WIN32

        SleepEx(0, TRUE);

#endif

        qemu_wait_io_event_common(cpu);

    }

    return NULL;

}



#ifdef _WIN32

static void CALLBACK dummy_apc_func(ULONG_PTR unused)

{

}

#endif



static void qemu_cpu_kick_thread(CPUState *cpu)

{

#ifndef _WIN32
@@ -1235,7 +1277,13 @@ static void qemu_cpu_kick_thread(CPUState *cpu) 
        exit(1);

    }

#else /* _WIN32 */

    abort();

    if (!qemu_cpu_is_self(cpu)) {

        if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) {

            fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n",

                    __func__, GetLastError());

            exit(1);

        }

    }

#endif

}
@@ -1258,6 +1306,13 @@ void qemu_cpu_kick(CPUState *cpu) 
    if (tcg_enabled()) {

        qemu_cpu_kick_no_halt();

    } else {

        if (hax_enabled()) {

            /*

             * FIXME: race condition with the exit_request check in

             * hax_vcpu_hax_exec

             */

            cpu->exit_request = 1;

        }

        qemu_cpu_kick_thread(cpu);

    }

}
@@ -1418,6 +1473,26 @@ static void qemu_tcg_init_vcpu(CPUState *cpu) 
    }

}



static void qemu_hax_start_vcpu(CPUState *cpu)

{

    char thread_name[VCPU_THREAD_NAME_SIZE];



    cpu->thread = g_malloc0(sizeof(QemuThread));

    cpu->halt_cond = g_malloc0(sizeof(QemuCond));

    qemu_cond_init(cpu->halt_cond);



    snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX",

             cpu->cpu_index);

    qemu_thread_create(cpu->thread, thread_name, qemu_hax_cpu_thread_fn,

                       cpu, QEMU_THREAD_JOINABLE);

#ifdef _WIN32

    cpu->hThread = qemu_thread_get_handle(cpu->thread);

#endif

    while (!cpu->created) {

        qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);

    }

}



static void qemu_kvm_start_vcpu(CPUState *cpu)

{

    char thread_name[VCPU_THREAD_NAME_SIZE];
@@ -1468,6 +1543,8 @@ void qemu_init_vcpu(CPUState *cpu) 


    if (kvm_enabled()) {

        qemu_kvm_start_vcpu(cpu);

    } else if (hax_enabled()) {

        qemu_hax_start_vcpu(cpu);

    } else if (tcg_enabled()) {

        qemu_tcg_init_vcpu(cpu);

    } else {