Commit dafd9505 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* configure fix for environment variables (Daniel)
* fix memory leaks (Alex)
* x86_64 MTTCG fixes (Emilio)
* introduce atomic64 (Emilio)
* Fix for virtio hang (Fam, myself)
* SH serial port fix (Geert)
* Deprecate rotation_rate for scsi-block (Fam)
* Extend memory-backend-file availability to all POSIX hosts (Hikaru)
* Memory API cleanups and fixes (Igor, Li Qiang, Peter, Philippe)
* MSI/IOMMU fix (Jan)
* Socket reconnection fixes (Marc-André)
* icount fixes (Emilio, myself)
* QSP fixes for Coverity (myself)
* Some record/replay improovements (Pavel)
* Packed struct fixes (Peter)
* Windows dump fixes and elf2dmp (Viktor)
* kbmclock fix (Yongji)

# gpg: Signature made Tue 02 Oct 2018 18:13:12 BST
# 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: (80 commits)
  hw/scsi/mptendian: Avoid taking address of fields in packed structs
  cpus: fix TCG kick timer leak
  docs/devel/memory.txt: Document _with_attrs accessors
  hw/nvram/fw_cfg: Use memberwise copy of MemoryRegionOps struct
  memory: Remove old_mmio accessors
  memory: Fix access_with_adjusted_size(small size) on big-endian memory regions
  memory: Refactor common shifting code from accessors
  memory: Use MAKE_64BIT_MASK()
  virtio: do not take address of packed members
  replay: replay BH for IDE trim operation
  hostmem-file: make available memory-backend-file on POSIX-based hosts
  target/i386: fix translation for icount mode
  hvf: drop unused variable
  qom/object: add some interface asserts
  accel/tcg: Remove dead code
  lsi53c895a: convert to trace-events
  scsi-block: Deprecate rotation_rate
  kvmclock: run KVM_KVMCLOCK_CTRL ioctl in vcpu thread
  MAINTAINERS: add myself as elf2dmp maintainer
  contrib: add elf2dmp tool
  ...

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

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -1903,6 +1903,11 @@ S: Maintained 
F: include/qemu/iova-tree.h

F: util/iova-tree.c



elf2dmp

M: Viktor Prutyanov <viktor.prutyanov@phystech.edu>

S: Maintained

F: contrib/elf2dmp/



Usermode Emulation

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

Overall

Makefile

+5 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ dummy := $(call unnest-vars,, \ 
                chardev-obj-y \

                util-obj-y \

                qga-obj-y \

                elf2dmp-obj-y \

                ivshmem-client-obj-y \

                ivshmem-server-obj-y \

                libvhost-user-obj-y \
@@ -710,6 +711,10 @@ ifneq ($(EXESUF),) 
qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI)

endif



elf2dmp: LIBS = $(CURL_LIBS)

elf2dmp: $(elf2dmp-obj-y)

	$(call LINK, $^)



ifdef CONFIG_IVSHMEM

ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)

	$(call LINK, $^)

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ qga-vss-dll-obj-y = qga/ 


######################################################################

# contrib

elf2dmp-obj-y = contrib/elf2dmp/

ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/

ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/

libvhost-user-obj-y = contrib/libvhost-user/

accel/tcg/translate-all.c

+0 −9
Original line number Diff line number Diff line
@@ -2009,15 +2009,6 @@ void tb_invalidate_phys_page_fast(struct page_collection *pages, 
{

    PageDesc *p;



#if 0

    if (1) {

        qemu_log("modifying code at 0x%x size=%d EIP=%x PC=%08x\n",

                  cpu_single_env->mem_io_vaddr, len,

                  cpu_single_env->eip,

                  cpu_single_env->eip +

                  (intptr_t)cpu_single_env->segs[R_CS].base);

    }

#endif

    assert_memory_lock();



    p = page_find(start >> TARGET_PAGE_BITS);

accel/tcg/translator.c

+6 −2
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ void translator_loop_temp_check(DisasContextBase *db) 
void translator_loop(const TranslatorOps *ops, DisasContextBase *db,

                     CPUState *cpu, TranslationBlock *tb)

{

    int bp_insn = 0;



    /* Initialize DisasContext */

    db->tb = tb;

    db->pc_first = tb->pc;
@@ -71,11 +73,13 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, 
        tcg_debug_assert(db->is_jmp == DISAS_NEXT);  /* no early exit */



        /* Pass breakpoint hits to target for further processing */

        if (unlikely(!QTAILQ_EMPTY(&cpu->breakpoints))) {

        if (!db->singlestep_enabled

            && unlikely(!QTAILQ_EMPTY(&cpu->breakpoints))) {

            CPUBreakpoint *bp;

            QTAILQ_FOREACH(bp, &cpu->breakpoints, entry) {

                if (bp->pc == db->pc_next) {

                    if (ops->breakpoint_check(db, cpu, bp)) {

                        bp_insn = 1;

                        break;

                    }

                }
@@ -118,7 +122,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, 


    /* Emit code to exit the TB, as indicated by db->is_jmp.  */

    ops->tb_stop(db, cpu);

    gen_tb_end(db->tb, db->num_insns);

    gen_tb_end(db->tb, db->num_insns - bp_insn);



    /* The disas_log hook may use these values rather than recompute.  */

    db->tb->size = db->pc_next - db->pc_first;