Commit 1c9f03b8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Linux header update and cleanup
* Support for HyperV crash report
* Cleanup of target-specific HMP commands
* Multiarch batch
* Checkpatch fix for Perl 5.22
* NBD fix
* Revert incorrect commit 52437223

# gpg: Signature made Wed 16 Sep 2015 16:39:01 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream: (24 commits)
  nbd: release exp->blk after all clients are closed
  checkpatch: Escape left braces in regex
  monitor: uninclude cpu_ldst
  include/exec: Move cputlb exec.c defs out
  cputlb: Change tlb_set_dirty() arg to cpu
  cputlb: move CPU_LOOP() for tlb_reset() to exec.c
  translate: move real_host_page setting to -common
  tcg: Move tci_tb_ptr to -common
  tcg: split tcg_op_defs to -common
  translate-all: Move tcg_handle_interrupt() to -common
  cpu-exec: Migrate some generic fns to cpu-exec-common
  qemu-char: Use g_new() & friends where that makes obvious sense
  monitor: added generation of documentation for hmp-commands-info.hx
  hmp-commands.hx: fix end of table info
  monitor: remove target-specific code from monitor.c
  hmp-commands-info: move info_cmds content out of monitor.c
  i386/kvm: Hyper-v crash msrs set/get'ers and migration
  kvm: Add kvm system event crash handler
  cpu: Add crash_occurred flag into CPUState
  target-i386: move asm-x86/hyperv.h to standard-headers
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3c4698d0 d6268348

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
/qemu-ga

/qemu-bridge-helper

/qemu-monitor.texi

/qemu-monitor-info.texi

/qmp-commands.txt

/vscclient

/fsdev/virtfs-proxy-helper

Makefile

+7 −3
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ qemu-%.tar.bz2: 
	$(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)"



distclean: clean

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi

	rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi qemu-monitor-info.texi

	rm -f config-all-devices.mak config-all-disas.mak config.status

	rm -f po/*.mo tests/qemu-iotests/common.env

	rm -f roms/seabios/config.mak roms/vgabios/config.mak
@@ -516,13 +516,16 @@ qemu-options.texi: $(SRC_PATH)/qemu-options.hx 
qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")



qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")



qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  GEN   $@")



qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  GEN   $@")



qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi

qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-info.texi

	$(call quiet-command, \

	  perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu.pod && \

	  $(POD2MAN) --section=1 --center=" " --release=" " qemu.pod > $@, \
@@ -565,7 +568,8 @@ pdf: qemu-doc.pdf qemu-tech.pdf 


qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \

	qemu-img.texi qemu-nbd.texi qemu-options.texi \

	qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi

	qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \

	qemu-monitor-info.texi



ifdef CONFIG_WIN32

Makefile.target

+7 −1
Original line number Diff line number Diff line
@@ -85,8 +85,11 @@ all: $(PROGS) stap 
#########################################################

# cpu emulator library

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

obj-y += translate-common.o

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

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

obj-$(CONFIG_TCG_INTERPRETER) += tci.o

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

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

obj-y += fpu/softfloat.o

obj-y += target-$(TARGET_BASE_ARCH)/
@@ -151,7 +154,7 @@ else 
obj-y += hw/$(TARGET_BASE_ARCH)/

endif



GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h

GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h qmp-commands-old.h



endif # CONFIG_SOFTMMU
@@ -199,6 +202,9 @@ gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh 
hmp-commands.h: $(SRC_PATH)/hmp-commands.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")

backends/testdev.c

+2 −2
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ CharDriverState *chr_testdev_init(void) 
    TestdevCharState *testdev;

    CharDriverState *chr;



    testdev = g_malloc0(sizeof(TestdevCharState));

    testdev->chr = chr = g_malloc0(sizeof(CharDriverState));

    testdev = g_new0(TestdevCharState, 1);

    testdev->chr = chr = g_new0(CharDriverState, 1);



    chr->opaque = testdev;

    chr->chr_write = testdev_write;

cpu-exec-common.c

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 *  emulator main execution loop

 *

 *  Copyright (c) 2003-2005 Fabrice Bellard

 *

 * 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 "config.h"

#include "cpu.h"

#include "sysemu/cpus.h"

#include "exec/memory-internal.h"



bool exit_request;

CPUState *tcg_current_cpu;



/* exit the current TB from a signal handler. The host registers are

   restored in a state compatible with the CPU emulator

 */

#if defined(CONFIG_SOFTMMU)

void cpu_resume_from_signal(CPUState *cpu, void *puc)

{

    /* XXX: restore cpu registers saved in host registers */



    cpu->exception_index = -1;

    siglongjmp(cpu->jmp_env, 1);

}



void cpu_reload_memory_map(CPUState *cpu)

{

    AddressSpaceDispatch *d;



    if (qemu_in_vcpu_thread()) {

        /* Do not let the guest prolong the critical section as much as it

         * as it desires.

         *

         * Currently, this is prevented by the I/O thread's periodinc kicking

         * of the VCPU thread (iothread_requesting_mutex, qemu_cpu_kick_thread)

         * but this will go away once TCG's execution moves out of the global

         * mutex.

         *

         * This pair matches cpu_exec's rcu_read_lock()/rcu_read_unlock(), which

         * only protects cpu->as->dispatch.  Since we reload it below, we can

         * split the critical section.

         */

        rcu_read_unlock();

        rcu_read_lock();

    }



    /* The CPU and TLB are protected by the iothread lock.  */

    d = atomic_rcu_read(&cpu->as->dispatch);

    cpu->memory_dispatch = d;

    tlb_flush(cpu, 1);

}

#endif



void cpu_loop_exit(CPUState *cpu)

{

    cpu->current_tb = NULL;

    siglongjmp(cpu->jmp_env, 1);

}



void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc)

{

    if (pc) {

        cpu_restore_state(cpu, pc);

    }

    cpu->current_tb = NULL;

    siglongjmp(cpu->jmp_env, 1);

}