Commit 9ba1733a authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Don't silently truncate extremely long words in the command line
* dtc configure fixes
* MemoryRegionCache second try
* Deprecated option removal
* add support for Hyper-V reenlightenment MSRs

# gpg: Signature made Fri 11 May 2018 13:33:46 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: (29 commits)
  rename included C files to foo.inc.c, remove osdep.h
  pc-dimm: fix error messages if no slots were defined
  build: Silence dtc directory creation
  shippable: Remove Debian 8 libfdt kludge
  configure: Display if libfdt is from system or git
  configure: Really use local libfdt if the system one is too old
  i386/kvm: add support for Hyper-V reenlightenment MSRs
  qemu-doc: provide details of supported build platforms
  qemu-options: Remove deprecated -no-kvm-irqchip
  qemu-options: Remove deprecated -no-kvm-pit-reinjection
  qemu-options: Bail out on unsupported options instead of silently ignoring them
  qemu-options: Remove remainders of the -tdf option
  qemu-options: Mark -virtioconsole as deprecated
  target/i386: sev: fix memory leaks
  opts: don't silently truncate long option values
  opts: don't silently truncate long parameter keys
  accel: use g_strsplit for parsing accelerator names
  update-linux-headers: drop hyperv.h
  qemu-thread: always keep the posix wrapper layer
  exec: reintroduce MemoryRegion caching
  ...

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

.shippable.yml

+0 −8
Original line number Diff line number Diff line
@@ -35,13 +35,5 @@ build: 
    options: "-e HOME=/root"

  ci:

    - unset CC

    # some targets require newer up to date packages, for example TARGET_LIST matching

    # aarch64*-softmmu|arm*-softmmu|ppc*-softmmu|microblaze*-softmmu|mips64el-softmmu)

    # see the configure script:

    #    error_exit "DTC (libfdt) version >= 1.4.2 not present. Your options:"

    #    "  (1) Preferred: Install the DTC (libfdt) devel package"

    #    "  (2) Fetch the DTC submodule, using:"

    #    "      git submodule update --init dtc"

    - dpkg --compare-versions `dpkg-query --showformat='${Version}' --show libfdt-dev` ge 1.4.2 || git submodule update --init dtc

    - ./configure ${QEMU_CONFIGURE_OPTS} --target-list=${TARGET_LIST}

    - make -j$(($(getconf _NPROCESSORS_ONLN) + 1))

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ subdir-dtc: .git-submodule-status dtc/libfdt dtc/tests 
	$(call quiet-command,$(MAKE) $(DTC_MAKE_ARGS) CPPFLAGS="$(DTC_CPPFLAGS)" CFLAGS="$(DTC_CFLAGS)" LDFLAGS="$(LDFLAGS)" ARFLAGS="$(ARFLAGS)" CC="$(CC)" AR="$(AR)" LD="$(LD)" $(SUBDIR_MAKEFLAGS) libfdt/libfdt.a,)



dtc/%: .git-submodule-status

	mkdir -p $@

	@mkdir -p $@



# Overriding CFLAGS causes us to lose defines added in the sub-makefile.

# Not overriding CFLAGS leads to mis-matches between compilation modes.

accel/accel.c

+7 −9
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) 


void configure_accelerator(MachineState *ms)

{

    const char *accel, *p;

    char buf[10];

    const char *accel;

    char **accel_list, **tmp;

    int ret;

    bool accel_initialised = false;

    bool init_failed = false;
@@ -83,13 +83,10 @@ void configure_accelerator(MachineState *ms) 
        accel = "tcg";

    }



    p = accel;

    while (!accel_initialised && *p != '\0') {

        if (*p == ':') {

            p++;

        }

        p = get_opt_name(buf, sizeof(buf), p, ':');

        acc = accel_find(buf);

    accel_list = g_strsplit(accel, ":", 0);



    for (tmp = accel_list; !accel_initialised && tmp && *tmp; tmp++) {

        acc = accel_find(*tmp);

        if (!acc) {

            continue;

        }
@@ -107,6 +104,7 @@ void configure_accelerator(MachineState *ms) 
            accel_initialised = true;

        }

    }

    g_strfreev(accel_list);



    if (!accel_initialised) {

        if (!init_failed) {

backends/hostmem.c

+0 −26
Original line number Diff line number Diff line
@@ -369,24 +369,6 @@ host_memory_backend_can_be_deleted(UserCreatable *uc) 
    }

}



static char *get_id(Object *o, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);



    return g_strdup(backend->id);

}



static void set_id(Object *o, const char *str, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);



    if (backend->id) {

        error_setg(errp, "cannot change property value");

        return;

    }

    backend->id = g_strdup(str);

}



static bool host_memory_backend_get_share(Object *o, Error **errp)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);
@@ -434,18 +416,11 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) 
        &HostMemPolicy_lookup,

        host_memory_backend_get_policy,

        host_memory_backend_set_policy, &error_abort);

    object_class_property_add_str(oc, "id", get_id, set_id, &error_abort);

    object_class_property_add_bool(oc, "share",

        host_memory_backend_get_share, host_memory_backend_set_share,

        &error_abort);

}



static void host_memory_backend_finalize(Object *o)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(o);

    g_free(backend->id);

}



static const TypeInfo host_memory_backend_info = {

    .name = TYPE_MEMORY_BACKEND,

    .parent = TYPE_OBJECT,
@@ -454,7 +429,6 @@ static const TypeInfo host_memory_backend_info = { 
    .class_init = host_memory_backend_class_init,

    .instance_size = sizeof(HostMemoryBackend),

    .instance_init = host_memory_backend_init,

    .instance_finalize = host_memory_backend_finalize,

    .interfaces = (InterfaceInfo[]) {

        { TYPE_USER_CREATABLE },

        { }

configure

+11 −6
Original line number Diff line number Diff line
@@ -964,6 +964,8 @@ for opt do 
  ;;

  --firmwarepath=*) firmwarepath="$optarg"

  ;;

  --host=*|--build=*|\

  --disable-dependency-tracking|\

  --sbindir=*|--sharedstatedir=*|\

  --oldincludedir=*|--datarootdir=*|--infodir=*|--localedir=*|\

  --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*)
@@ -3787,22 +3789,22 @@ int main(void) { fdt_first_subnode(0, 0); return 0; } 
EOF

  if compile_prog "" "$fdt_libs" ; then

    # system DTC is good - use it

    fdt=yes

    fdt=system

  else

      # have GIT checkout, so activate dtc submodule

      if test -e "${source_path}/.git" ; then

          git_submodules="${git_submodules} dtc"

      fi

      if test -d "${source_path}/dtc/libfdt" || test -e "${source_path}/.git" ; then

          fdt=yes

          dtc_internal="yes"

          fdt=git

          mkdir -p dtc

          if [ "$pwd_is_source_path" != "y" ] ; then

              symlink "$source_path/dtc/Makefile" "dtc/Makefile"

              symlink "$source_path/dtc/scripts" "dtc/scripts"

          fi

          fdt_cflags="-I\$(SRC_PATH)/dtc/libfdt"

          fdt_libs="-L\$(BUILD_DIR)/dtc/libfdt $fdt_libs"

          fdt_ldflags="-L\$(BUILD_DIR)/dtc/libfdt"

          fdt_libs="$fdt_libs"

      elif test "$fdt" = "yes" ; then

          # Not a git build & no libfdt found, prompt for system install

          error_exit "DTC (libfdt) version >= 1.4.2 not present." \
@@ -5744,6 +5746,7 @@ echo_version() { 


# prepend pixman and ftd flags after all config tests are done

QEMU_CFLAGS="$pixman_cflags $fdt_cflags $QEMU_CFLAGS"

QEMU_LDFLAGS="$fdt_ldflags $QEMU_LDFLAGS"

libs_softmmu="$pixman_libs $libs_softmmu"



echo "Install prefix    $prefix"
@@ -5774,6 +5777,7 @@ echo "ARFLAGS $ARFLAGS" 
echo "CFLAGS            $CFLAGS"

echo "QEMU_CFLAGS       $QEMU_CFLAGS"

echo "LDFLAGS           $LDFLAGS"

echo "QEMU_LDFLAGS      $QEMU_LDFLAGS"

echo "make              $make"

echo "install           $install"

echo "python            $python"
@@ -6333,7 +6337,7 @@ fi 
if test "$preadv" = "yes" ; then

  echo "CONFIG_PREADV=y" >> $config_host_mak

fi

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

if test "$fdt" != "no" ; then

  echo "CONFIG_FDT=y" >> $config_host_mak

fi

if test "$membarrier" = "yes" ; then
@@ -6708,6 +6712,7 @@ else 
fi

echo "LDFLAGS=$LDFLAGS" >> $config_host_mak

echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak

echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak

echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak

echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak

echo "LIBS+=$LIBS" >> $config_host_mak
@@ -7134,7 +7139,7 @@ echo "QEMU_CFLAGS+=$cflags" >> $config_target_mak 


done # for target in $targets



if [ "$dtc_internal" = "yes" ]; then

if [ "$fdt" = "git" ]; then

  echo "config-host.h: subdir-dtc" >> $config_host_mak

fi

if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then