Commit 3788c7b6 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Record-replay lockstep execution, log dumper and fixes (Alex, Pavel)
* SCSI fix to pass maximum transfer size (Daniel Barboza)
* chardev fixes and improved iothread support (Daniel Berrangé, Peter)
* checkpatch tweak (Eric)
* make help tweak (Marc-André)
* make more PCI NICs available with -net or -nic (myself)
* change default q35 NIC to e1000e (myself)
* SCSI support for NDOB bit (myself)
* membarrier system call support (myself)
* SuperIO refactoring (Philippe)
* miscellaneous cleanups and fixes (Thomas)

# gpg: Signature made Mon 12 Mar 2018 16:10:52 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# 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: (69 commits)
  tcg: fix cpu_io_recompile
  replay: update documentation
  replay: save vmstate of the asynchronous events
  replay: don't process async events when warping the clock
  scripts/replay-dump.py: replay log dumper
  replay: avoid recursive call of checkpoints
  replay: check return values of fwrite
  replay: push replay_mutex_lock up the call tree
  replay: don't destroy mutex at exit
  replay: make locking visible outside replay code
  replay/replay-internal.c: track holding of replay_lock
  replay/replay.c: bump REPLAY_VERSION again
  replay: save prior value of the host clock
  replay: added replay log format description
  replay: fix save/load vm for non-empty queue
  replay: fixed replay_enable_events
  replay: fix processing async events
  cpu-exec: fix exception_index handling
  hw/i386/pc: Factor out the superio code
  hw/alpha/dp264: Use the TYPE_SMC37C669_SUPERIO
  ...

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

# Conflicts:
#	default-configs/i386-softmmu.mak
#	default-configs/x86_64-softmmu.mak
parents a57946ff 0790f868

MAINTAINERS

+16 −4
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ Alpha 
M: Richard Henderson <rth@twiddle.net>

S: Maintained

F: target/alpha/

F: hw/alpha/

F: tests/tcg/alpha/

F: disas/alpha.c
@@ -413,6 +412,12 @@ F: include/*/*win32* 
X: qga/*win32*

F: qemu.nsi



Alpha Machines

M: Richard Henderson <rth@twiddle.net>

S: Maintained

F: hw/alpha/

F: hw/isa/smc37c669-superio.c



ARM Machines

------------

Allwinner-a10
@@ -700,6 +705,8 @@ Fulong 2E 
M: Yongbok Kim <yongbok.kim@mips.com>

S: Odd Fixes

F: hw/mips/mips_fulong2e.c

F: hw/isa/vt82c686.c

F: include/hw/isa/vt82c686.h



Boston

M: Paul Burton <paul.burton@mips.com>
@@ -776,9 +783,10 @@ F: hw/ppc/prep_systemio.c 
F: hw/ppc/rs6000_mc.c

F: hw/pci-host/prep.[hc]

F: hw/isa/i82378.c

F: hw/isa/pc87312.[hc]

F: hw/isa/pc87312.c

F: hw/dma/i82374.c

F: hw/timer/m48t59-isa.c

F: include/hw/isa/pc87312.h

F: include/hw/timer/m48t59.h

F: pc-bios/ppc_rom.bin
@@ -924,7 +932,7 @@ M: Michael S. Tsirkin <mst@redhat.com> 
M: Paolo Bonzini <pbonzini@redhat.com>

S: Supported

F: hw/char/debugcon.c

F: hw/char/parallel.c

F: hw/char/parallel*

F: hw/char/serial*

F: hw/dma/i8257*

F: hw/i2c/pm_smbus.c
@@ -932,6 +940,7 @@ F: hw/input/pckbd.c 
F: hw/intc/apic*

F: hw/intc/ioapic*

F: hw/intc/i8259*

F: hw/isa/isa-superio.c

F: hw/misc/debugexit.c

F: hw/misc/pc-testdev.c

F: hw/timer/hpet*
@@ -939,8 +948,11 @@ F: hw/timer/i8254* 
F: hw/timer/mc146818rtc*

F: hw/watchdog/wdt_ib700.c

F: include/hw/display/vga.h

F: include/hw/char/parallel.h

F: include/hw/dma/i8257.h

F: include/hw/i2c/pm_smbus.h

F: include/hw/isa/i8257.h

F: include/hw/input/i8042.h

F: include/hw/isa/superio.h

F: include/hw/timer/hpet.h

F: include/hw/timer/i8254*

F: include/hw/timer/mc146818rtc*

Makefile

+14 −9
Original line number Diff line number Diff line
@@ -438,21 +438,23 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules 
qemu-version.h: FORCE

	$(call quiet-command, \

		(cd $(SRC_PATH); \

		printf '#define QEMU_PKGVERSION '; \

		if test -n "$(PKGVERSION)"; then \

			printf '"$(PKGVERSION)"\n'; \

			pkgvers="$(PKGVERSION)"; \

		else \

			if test -d .git; then \

				printf '" ('; \

				git describe --match 'v*' 2>/dev/null | tr -d '\n'; \

				pkgvers=$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\

				if ! git diff-index --quiet HEAD &>/dev/null; then \

					printf -- '-dirty'; \

					pkgvers="$${pkgvers}-dirty"; \

				fi; \

				printf ')"\n'; \

			fi; \

		fi; \

		printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \

		if test -n "$${pkgvers}"; then \

			printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"\n'; \

		else \

				printf '""\n'; \

			printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \

		fi; \

		fi) > $@.tmp)

		) > $@.tmp)

	$(call quiet-command, if ! cmp -s $@ $@.tmp; then \

	  mv $@.tmp $@; \

	 else \
@@ -1050,6 +1052,9 @@ include $(SRC_PATH)/tests/vm/Makefile.include 
help:

	@echo  'Generic targets:'

	@echo  '  all             - Build all'

ifdef CONFIG_MODULES

	@echo  '  modules         - Build all modules'

endif

	@echo  '  dir/file.o      - Build specified target only'

	@echo  '  install         - Install QEMU, documentation and tools'

	@echo  '  ctags/TAGS      - Generate tags file for editors'

accel/tcg/cpu-exec.c

+4 −1
Original line number Diff line number Diff line
@@ -585,6 +585,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, 
        else {

            if (cc->cpu_exec_interrupt(cpu, interrupt_request)) {

                replay_interrupt();

                cpu->exception_index = -1;

                *last_tb = NULL;

            }

            /* The target hook may have updated the 'cpu->interrupt_request';
@@ -606,7 +607,9 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, 
    if (unlikely(atomic_read(&cpu->exit_request)

        || (use_icount && cpu->icount_decr.u16.low + cpu->icount_extra == 0))) {

        atomic_set(&cpu->exit_request, 0);

        if (cpu->exception_index == -1) {

            cpu->exception_index = EXCP_INTERRUPT;

        }

        return true;

    }

accel/tcg/translate-all.c

+15 −3
Original line number Diff line number Diff line
@@ -1728,7 +1728,8 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
    CPUArchState *env = cpu->env_ptr;

#endif

    TranslationBlock *tb;

    uint32_t n;

    uint32_t n, flags;

    target_ulong pc, cs_base;



    tb_lock();

    tb = tb_find_pc(retaddr);
@@ -1766,8 +1767,14 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
        cpu_abort(cpu, "TB too big during recompile");

    }



    /* Adjust the execution state of the next TB.  */

    cpu->cflags_next_tb = curr_cflags() | CF_LAST_IO | n;

    pc = tb->pc;

    cs_base = tb->cs_base;

    flags = tb->flags;

    tb_phys_invalidate(tb, -1);



    /* Execute one IO instruction without caching

       instead of creating large TB. */

    cpu->cflags_next_tb = curr_cflags() | CF_LAST_IO | CF_NOCACHE | 1;



    if (tb->cflags & CF_NOCACHE) {

        if (tb->orig_tb) {
@@ -1778,6 +1785,11 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
        tb_remove(tb);

    }



    /* Generate new TB instead of the current one. */

    /* FIXME: In theory this could raise an exception.  In practice

       we have already translated the block once so it's probably ok.  */

    tb_gen_code(cpu, pc, cs_base, flags, curr_cflags() | CF_LAST_IO | n);



    /* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not

     * the first in the TB) then we end up generating a whole new TB and

     *  repeating the fault, which is horribly inefficient.

bsd-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ void cpu_loop(CPUSPARCState *env) 


static void usage(void)

{

    printf("qemu-" TARGET_NAME " version " QEMU_VERSION QEMU_PKGVERSION

    printf("qemu-" TARGET_NAME " version " QEMU_FULL_VERSION

           "\n" QEMU_COPYRIGHT "\n"

           "usage: qemu-" TARGET_NAME " [options] program [arguments...]\n"

           "BSD CPU emulator (compiled for %s emulation)\n"