Commit 86e121ae authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Thread Sanitizer fixes (Alex)
* Coverity fixes (David)
* test-qht fixes (Emilio)
* QOM interface for info irq/info pic (Hervé)
* -rtc clock=rt fix (Junlian)
* mux chardev fixes (Marc-André)
* nicer report on death by signal (Michal)
* qemu-tech TLC (Paolo)
* MSI support for edu device (Peter)
* qemu-nbd --offset fix (Tomáš)

# gpg: Signature made Fri 07 Oct 2016 17:25:10 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: (39 commits)
  qemu-doc: merge qemu-tech and qemu-doc
  qemu-tech: rewrite some parts
  qemu-tech: reorganize content
  qemu-tech: move TCG test documentation to tests/tcg/README
  qemu-tech: move user mode emulation features from qemu-tech
  qemu-tech: document lazy condition code evaluation in cpu.h
  qemu-tech: move text from qemu-tech to tcg/README
  qemu-doc: drop installation and compilation notes
  qemu-doc: replace introduction with the one from the internals manual
  qemu-tech: drop index
  test-qht: perform lookups under rcu_read_lock
  qht: fix unlock-after-free segfault upon resizing
  qht: simplify qht_reset_size
  qemu-nbd: Shrink image size by specified offset
  qemu_kill_report: Report PID name too
  util: Introduce qemu_get_pid_name
  char: update read handler in all cases
  char: use a fixed idx for child muxed chr
  i8259: give ISA device when registering ISA ioports
  .travis.yml: add gcc sanitizer build
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 48f59211 78e87797

.gitignore

+0 −2
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ 
/qmp-introspect.[ch]

/qmp-marshal.c

/qemu-doc.html

/qemu-tech.html

/qemu-doc.info

/qemu-tech.info

/qemu-img

/qemu-nbd

/qemu-options.def

.travis.yml

+45 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ cache: ccache 
addons:

  apt:

    packages:

      # Build dependencies

      - libaio-dev

      - libattr1-dev

      - libbrlapi-dev
@@ -89,6 +90,7 @@ matrix: 
    - env: CONFIG=""

      os: osx

      compiler: clang

    # Plain Trusty Build

    - env: CONFIG=""

      sudo: required

      addons:
@@ -99,3 +101,46 @@ matrix: 
        - sudo apt-get build-dep -qq qemu

        - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ

        - git submodule update --init --recursive

    # Using newer GCC with sanitizers

    - addons:

        apt:

          sources:

            # PPAs for newer toolchains

            - ubuntu-toolchain-r-test

          packages:

            # Extra toolchains

            - gcc-5

            - g++-5

            # Build dependencies

            - libaio-dev

            - libattr1-dev

            - libbrlapi-dev

            - libcap-ng-dev

            - libgnutls-dev

            - libgtk-3-dev

            - libiscsi-dev

            - liblttng-ust-dev

            - libnfs-dev

            - libncurses5-dev

            - libnss3-dev

            - libpixman-1-dev

            - libpng12-dev

            - librados-dev

            - libsdl1.2-dev

            - libseccomp-dev

            - libspice-protocol-dev

            - libspice-server-dev

            - libssh2-1-dev

            - liburcu-dev

            - libusb-1.0-0-dev

            - libvte-2.90-dev

            - sparse

            - uuid-dev

      language: generic

      compiler: none

      env:

        - COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5

        - CONFIG="--cc=gcc-5 --cxx=g++-5 --disable-pie --disable-linux-user --with-coroutine=gthread"

        - TEST_CMD=""

      before_script:

        - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || cat config.log

Makefile

+6 −7
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ LIBS+=-lz $(LIBS_TOOLS) 
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)



ifdef BUILD_DOCS

DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8

DOCS=qemu-doc.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8

ifdef CONFIG_VIRTFS

DOCS+=fsdev/virtfs-proxy-helper.1

endif
@@ -398,7 +398,6 @@ distclean: clean 
	rm -f qemu-doc.vr

	rm -f config.log

	rm -f linux-headers/asm

	rm -f qemu-tech.info qemu-tech.aux qemu-tech.cp qemu-tech.dvi qemu-tech.fn qemu-tech.info qemu-tech.ky qemu-tech.log qemu-tech.pdf qemu-tech.pg qemu-tech.toc qemu-tech.tp qemu-tech.vr

	for d in $(TARGET_DIRS); do \

	rm -rf $$d || exit 1 ; \

        done
@@ -434,7 +433,7 @@ endif 


install-doc: $(DOCS)

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"

	$(INSTALL_DATA) $(SRC_PATH)/docs/qmp-commands.txt "$(DESTDIR)$(qemu_docdir)"

ifdef CONFIG_POSIX

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
@@ -592,10 +591,10 @@ qemu-ga.8: qemu-ga.texi 
	  $(POD2MAN) --section=8 --center=" " --release=" " qemu-ga.pod > $@, \

	  "GEN","$@")



dvi: qemu-doc.dvi qemu-tech.dvi

html: qemu-doc.html qemu-tech.html

info: qemu-doc.info qemu-tech.info

pdf: qemu-doc.pdf qemu-tech.pdf

dvi: qemu-doc.dvi

html: qemu-doc.html

info: qemu-doc.info

pdf: qemu-doc.pdf



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

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

README

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ of other UNIX targets. The simple steps to build QEMU are: 
  ../configure

  make



Complete details of the process for building and configuring QEMU for

all supported host platforms can be found in the qemu-tech.html file.

Additional information can also be found online via the QEMU website:



  http://qemu-project.org/Hosts/Linux

cpu-exec.c

+4 −4
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) 
        /* We were asked to stop executing TBs (probably a pending

         * interrupt. We've now stopped, so clear the flag.

         */

        cpu->tcg_exit_req = 0;

        atomic_set(&cpu->tcg_exit_req, 0);

    }

    return ret;

}
@@ -490,8 +490,8 @@ static inline void cpu_handle_interrupt(CPUState *cpu, 
            *last_tb = NULL;

        }

    }

    if (unlikely(cpu->exit_request || replay_has_interrupt())) {

        cpu->exit_request = 0;

    if (unlikely(atomic_read(&cpu->exit_request) || replay_has_interrupt())) {

        atomic_set(&cpu->exit_request, 0);

        cpu->exception_index = EXCP_INTERRUPT;

        cpu_loop_exit(cpu);

    }
@@ -503,7 +503,7 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb, 
{

    uintptr_t ret;



    if (unlikely(cpu->exit_request)) {

    if (unlikely(atomic_read(&cpu->exit_request))) {

        return;

    }