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

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



* Support for jemalloc
* qemu_mutex_lock_iothread "No such process" fix
* cutils: qemu_strto* wrappers
* iohandler.c simplification
* Many other fixes and misc patches.

And some MTTCG work (with Emilio's fixes squashed):
* Signal-free TCG kick
* Removing spinlock in favor of QemuMutex
* User-mode emulation multi-threading fixes/docs

# gpg: Signature made Thu 10 Sep 2015 09:03:07 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: (44 commits)
  cutils: work around platform differences in strto{l,ul,ll,ull}
  cpu-exec: fix lock hierarchy for user-mode emulation
  exec: make mmap_lock/mmap_unlock globally available
  tcg: comment on which functions have to be called with mmap_lock held
  tcg: add memory barriers in page_find_alloc accesses
  remove unused spinlock.
  replace spinlock by QemuMutex.
  cpus: remove tcg_halt_cond and tcg_cpu_thread globals
  cpus: protect work list with work_mutex
  scripts/dump-guest-memory.py: fix after RAMBlock change
  configure: Add support for jemalloc
  add macro file for coccinelle
  configure: factor out adding disas configure
  vhost-scsi: fix wrong vhost-scsi firmware path
  checkpatch: remove tests that are not relevant outside the kernel
  checkpatch: adapt some tests to QEMU
  CODING_STYLE: update mixed declaration rules
  qmp: Add example usage of strto*l() qemu wrapper
  cutils: Add qemu_strtoull() wrapper
  cutils: Add qemu_strtoll() wrapper
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7e4804da 47d4be12

CODING_STYLE

+9 −4
Original line number Diff line number Diff line
@@ -87,10 +87,15 @@ Furthermore, it is the QEMU coding style. 


5. Declarations



Mixed declarations (interleaving statements and declarations within blocks)

are not allowed; declarations should be at the beginning of blocks.  In other

words, the code should not generate warnings if using GCC's

-Wdeclaration-after-statement option.

Mixed declarations (interleaving statements and declarations within

blocks) are generally not allowed; declarations should be at the beginning

of blocks.



Every now and then, an exception is made for declarations inside a

#ifdef or #ifndef block: if the code looks nicer, such declarations can

be placed at the top of the block even if there are statements above.

On the other hand, however, it's often best to move that #ifdef/#ifndef

block to a separate function altogether.



6. Conditional statements

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ include config-target.mak 
include config-devices.mak

include $(SRC_PATH)/rules.mak



$(call set-vpath, $(SRC_PATH))

$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))

ifdef CONFIG_LINUX

QEMU_CFLAGS += -I../linux-headers

endif

block/iscsi.c

+4 −0
Original line number Diff line number Diff line
@@ -1214,6 +1214,10 @@ static void iscsi_readcapacity_sync(IscsiLun *iscsilun, Error **errp) 


    if (task == NULL || task->status != SCSI_STATUS_GOOD) {

        error_setg(errp, "iSCSI: failed to send readcapacity10 command.");

    } else if (!iscsilun->block_size ||

               iscsilun->block_size % BDRV_SECTOR_SIZE) {

        error_setg(errp, "iSCSI: the target returned an invalid "

                   "block size of %d.", iscsilun->block_size);

    }

    if (task) {

        scsi_free_scsi_task(task);

bsd-user/qemu.h

+0 −2
Original line number Diff line number Diff line
@@ -211,8 +211,6 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, 
                       abi_ulong new_addr);

int target_msync(abi_ulong start, abi_ulong len, int flags);

extern unsigned long last_brk;

void mmap_lock(void);

void mmap_unlock(void);

void cpu_list_lock(void);

void cpu_list_unlock(void);

#if defined(CONFIG_USE_NPTL)

configure

+53 −40
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ libssh2="" 
vhdx=""

numa=""

tcmalloc="no"

jemalloc="no"



# parse CC options first

for opt do
@@ -1143,6 +1144,10 @@ for opt do 
  ;;

  --enable-tcmalloc) tcmalloc="yes"

  ;;

  --disable-jemalloc) jemalloc="no"

  ;;

  --enable-jemalloc) jemalloc="yes"

  ;;

  *)

      echo "ERROR: unknown option $opt"

      echo "Try '$0 --help' for more information"
@@ -1367,6 +1372,7 @@ disabled with --disable-FEATURE, default is enabled if available: 
  vhdx            support for the Microsoft VHDX image format

  numa            libnuma support

  tcmalloc        tcmalloc support

  jemalloc        jemalloc support



NOTE: The object files are built at the place where configure is launched

EOF
@@ -3395,6 +3401,11 @@ EOF 
  fi

fi



if test "$tcmalloc" = "yes" && test "$jemalloc" = "yes" ; then

    echo "ERROR: tcmalloc && jemalloc can't be used at the same time"

    exit 1

fi



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

# tcmalloc probe
@@ -3411,6 +3422,22 @@ EOF 
  fi

fi



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

# jemalloc probe



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

  cat > $TMPC << EOF

#include <stdlib.h>

int main(void) { malloc(1); return 0; }

EOF



  if compile_prog "" "-ljemalloc" ; then

    LIBS="-ljemalloc $LIBS"

  else

    feature_not_found "jemalloc" "install jemalloc devel"

  fi

fi



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

# signalfd probe

signalfd="no"
@@ -4629,6 +4656,7 @@ echo "snappy support $snappy" 
echo "bzip2 support     $bzip2"

echo "NUMA host support $numa"

echo "tcmalloc support  $tcmalloc"

echo "jemalloc support  $jemalloc"



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

echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -5519,91 +5547,76 @@ fi 
cflags=""

ldflags=""



disas_config() {

  echo "CONFIG_${1}_DIS=y" >> $config_target_mak

  echo "CONFIG_${1}_DIS=y" >> config-all-disas.mak

}



for i in $ARCH $TARGET_BASE_ARCH ; do

  case "$i" in

  alpha)

    echo "CONFIG_ALPHA_DIS=y"  >> $config_target_mak

    echo "CONFIG_ALPHA_DIS=y"  >> config-all-disas.mak

    disas_config "ALPHA"

  ;;

  aarch64)

    if test -n "${cxx}"; then

      echo "CONFIG_ARM_A64_DIS=y"  >> $config_target_mak

      echo "CONFIG_ARM_A64_DIS=y"  >> config-all-disas.mak

      disas_config "ARM_A64"

    fi

  ;;

  arm)

    echo "CONFIG_ARM_DIS=y"  >> $config_target_mak

    echo "CONFIG_ARM_DIS=y"  >> config-all-disas.mak

    disas_config "ARM"

    if test -n "${cxx}"; then

      echo "CONFIG_ARM_A64_DIS=y"  >> $config_target_mak

      echo "CONFIG_ARM_A64_DIS=y"  >> config-all-disas.mak

      disas_config "ARM_A64"

    fi

  ;;

  cris)

    echo "CONFIG_CRIS_DIS=y"  >> $config_target_mak

    echo "CONFIG_CRIS_DIS=y"  >> config-all-disas.mak

    disas_config "CRIS"

  ;;

  hppa)

    echo "CONFIG_HPPA_DIS=y"  >> $config_target_mak

    echo "CONFIG_HPPA_DIS=y"  >> config-all-disas.mak

    disas_config "HPPA"

  ;;

  i386|x86_64|x32)

    echo "CONFIG_I386_DIS=y"  >> $config_target_mak

    echo "CONFIG_I386_DIS=y"  >> config-all-disas.mak

    disas_config "I386"

  ;;

  ia64*)

    echo "CONFIG_IA64_DIS=y"  >> $config_target_mak

    echo "CONFIG_IA64_DIS=y"  >> config-all-disas.mak

    disas_config "IA64"

  ;;

  lm32)

    echo "CONFIG_LM32_DIS=y"  >> $config_target_mak

    echo "CONFIG_LM32_DIS=y"  >> config-all-disas.mak

    disas_config "LM32"

  ;;

  m68k)

    echo "CONFIG_M68K_DIS=y"  >> $config_target_mak

    echo "CONFIG_M68K_DIS=y"  >> config-all-disas.mak

    disas_config "M68K"

  ;;

  microblaze*)

    echo "CONFIG_MICROBLAZE_DIS=y"  >> $config_target_mak

    echo "CONFIG_MICROBLAZE_DIS=y"  >> config-all-disas.mak

    disas_config "MICROBLAZE"

  ;;

  mips*)

    echo "CONFIG_MIPS_DIS=y"  >> $config_target_mak

    echo "CONFIG_MIPS_DIS=y"  >> config-all-disas.mak

    disas_config "MIPS"

  ;;

  moxie*)

    echo "CONFIG_MOXIE_DIS=y"  >> $config_target_mak

    echo "CONFIG_MOXIE_DIS=y"  >> config-all-disas.mak

    disas_config "MOXIE"

  ;;

  or32)

    echo "CONFIG_OPENRISC_DIS=y"  >> $config_target_mak

    echo "CONFIG_OPENRISC_DIS=y"  >> config-all-disas.mak

    disas_config "OPENRISC"

  ;;

  ppc*)

    echo "CONFIG_PPC_DIS=y"  >> $config_target_mak

    echo "CONFIG_PPC_DIS=y"  >> config-all-disas.mak

    disas_config "PPC"

  ;;

  s390*)

    echo "CONFIG_S390_DIS=y"  >> $config_target_mak

    echo "CONFIG_S390_DIS=y"  >> config-all-disas.mak

    disas_config "S390"

  ;;

  sh4)

    echo "CONFIG_SH4_DIS=y"  >> $config_target_mak

    echo "CONFIG_SH4_DIS=y"  >> config-all-disas.mak

    disas_config "SH4"

  ;;

  sparc*)

    echo "CONFIG_SPARC_DIS=y"  >> $config_target_mak

    echo "CONFIG_SPARC_DIS=y"  >> config-all-disas.mak

    disas_config "SPARC"

  ;;

  xtensa*)

    echo "CONFIG_XTENSA_DIS=y"  >> $config_target_mak

    echo "CONFIG_XTENSA_DIS=y"  >> config-all-disas.mak

    disas_config "XTENSA"

  ;;

  esac

done

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

  echo "CONFIG_TCI_DIS=y"  >> $config_target_mak

  echo "CONFIG_TCI_DIS=y"  >> config-all-disas.mak

  disas_config "TCI"

fi



case "$ARCH" in