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

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



* New KVM PV features (Marcelo, Wanpeng)
* valgrind fixes (Andrey)
* Remove clock reset notifiers (David)
* KConfig and Makefile cleanups (Paolo)
* Replay and icount improvements (Pavel)
* x86 FP fixes (Peter M.)
* TCG locking assertions (Roman)
* x86 support for mmap-ed -kernel/-initrd (Stefano)
* Other cleanups (Wei Yang, Yan Zhao, Tony)
* LSI fix for infinite loop (Prasad)
* ARM migration fix (Catherine)
* AVX512_BF16 feature (Jing)

# gpg: Signature made Tue 20 Aug 2019 19:00:54 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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: (33 commits)
  x86: Intel AVX512_BF16 feature enabling
  scsi: lsi: exit infinite loop while executing script (CVE-2019-12068)
  test-bitmap: test set 1 bit case for bitmap_set
  migration: do not rom_reset() during incoming migration
  HACKING: Document 'struct' keyword usage
  kvm: vmxcap: Enhance with latest features
  cpus-common: nuke finish_safe_work
  icount: remove unnecessary gen_io_end calls
  icount: clean up cpu_can_io at the entry to the block
  replay: rename step-related variables and functions
  replay: refine replay-time module
  replay: fix replay shutdown
  util/qemu-timer: refactor deadline calculation for external timers
  replay: document development rules
  replay: add missing fix for internal function
  timer: last, remove last bits of last
  replay: Remove host_clock_last
  timer: Remove reset notifiers
  mc146818rtc: Remove reset notifiers
  memory: fix race between TCG and accesses to dirty bitmap
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 17dc5799 80db491d

HACKING

+13 −1
Original line number Diff line number Diff line
@@ -100,7 +100,19 @@ pointer, you're guaranteed that it is used to modify the storage 
it points to, or it is aliased to another pointer that is.



2.3. Typedefs

Typedefs are used to eliminate the redundant 'struct' keyword.



Typedefs are used to eliminate the redundant 'struct' keyword, since type

names have a different style than other identifiers ("CamelCase" versus

"snake_case").  Each named struct type should have a CamelCase name and a

corresponding typedef.



Since certain C compilers choke on duplicated typedefs, you should avoid

them and declare a typedef only in one header file.  For common types,

you can use "include/qemu/typedefs.h" for example.  However, as a matter

of convenience it is also perfectly fine to use forward struct

definitions instead of typedefs in headers and function prototypes; this

avoids problems with duplicated typedefs and reduces the need to include

headers from other headers.



2.4. Reserved namespaces in C and POSIX

Underscore capital, double underscore, and underscore 't' suffixes should be

Kconfig.host

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ config VHOST_USER 


config XEN

    bool

    select FSDEV_9P if VIRTFS



config VIRTFS

    bool

accel/tcg/cpu-exec.c

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb) 
    }

#endif /* DEBUG_DISAS */



    cpu->can_do_io = !use_icount;

    ret = tcg_qemu_tb_exec(env, tb_ptr);

    cpu->can_do_io = 1;

    last_tb = (TranslationBlock *)(ret & ~TB_EXIT_MASK);

accel/tcg/translator.c

+0 −1
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, 
            /* Accept I/O on the last instruction.  */

            gen_io_start();

            ops->translate_insn(db, cpu);

            gen_io_end();

        } else {

            ops->translate_insn(db, cpu);

        }

configure

+10 −2
Original line number Diff line number Diff line
@@ -7431,11 +7431,16 @@ for target in $target_list; do 
target_dir="$target"

config_target_mak=$target_dir/config-target.mak

target_name=$(echo $target | cut -d '-' -f 1)

target_aligned_only="no"

case "$target_name" in

  alpha|hppa|mips64el|mips64|mipsel|mips|mipsn32|mipsn32el|sh4|sh4eb|sparc|sparc64|sparc32plus|xtensa|xtensaeb)

  target_aligned_only="yes"

  ;;

esac

target_bigendian="no"



case "$target_name" in

  armeb|aarch64_be|hppa|lm32|m68k|microblaze|mips|mipsn32|mips64|moxie|or1k|ppc|ppc64|ppc64abi32|s390x|sh4eb|sparc|sparc64|sparc32plus|xtensaeb)

  target_bigendian=yes

  target_bigendian="yes"

  ;;

esac

target_softmmu="no"
@@ -7717,6 +7722,9 @@ fi 
if supported_whpx_target $target; then

    echo "CONFIG_WHPX=y" >> $config_target_mak

fi

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

  echo "TARGET_ALIGNED_ONLY=y" >> $config_target_mak

fi

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

  echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak

fi