Commit 4f0444fc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging 



Trivial patches:
* Update copyright
* Fix LGPL in target/moxie
* configure portability fix
* Drop useless inclusion of "hw/i386/pc.h"
* Mark the cpu-cluster device with user_creatable = false
* tsc210x: Fix building with no verbosity

# gpg: Signature made Wed 06 Feb 2019 15:27:35 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request:
  hw/input/tsc210x: Fix building with no verbosity
  hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false
  hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h"
  hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h"
  configure: Avoid non-portable 'test -o/-a'
  target/moxie: Fix LGPL information in the file headers
  qemu-common.h: Update copyright string for 2019

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 632351e0 e67e91b4

configure

+31 −28
Original line number Diff line number Diff line
@@ -1834,8 +1834,8 @@ fi 
# Consult white-list to determine whether to enable werror

# by default.  Only enable by default for git builds

if test -z "$werror" ; then

    if test -d "$source_path/.git" -a \

        \( "$linux" = "yes" -o "$mingw32" = "yes" \) ; then

    if test -d "$source_path/.git" && \

        { test "$linux" = "yes" || test "$mingw32" = "yes"; }; then

        werror="yes"

    else

        werror="no"
@@ -2940,7 +2940,7 @@ EOF 
    sdl=yes



    # static link with sdl ? (note: sdl.pc's --static --libs is broken)

    if test "$sdl" = "yes" -a "$static" = "yes" ; then

    if test "$sdl" = "yes" && test "$static" = "yes" ; then

      if test $? = 0 && echo $sdl_libs | grep -- -laa > /dev/null; then

         sdl_libs="$sdl_libs $(aalib-config --static-libs 2>/dev/null)"

         sdl_cflags="$sdl_cflags $(aalib-config --cflags 2>/dev/null)"
@@ -3082,7 +3082,7 @@ fi 


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

# VNC SASL detection

if test "$vnc" = "yes" -a "$vnc_sasl" != "no" ; then

if test "$vnc" = "yes" && test "$vnc_sasl" != "no" ; then

  cat > $TMPC <<EOF

#include <sasl/sasl.h>

#include <stdio.h>
@@ -3105,7 +3105,7 @@ fi 


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

# VNC JPEG detection

if test "$vnc" = "yes" -a "$vnc_jpeg" != "no" ; then

if test "$vnc" = "yes" && test "$vnc_jpeg" != "no" ; then

cat > $TMPC <<EOF

#include <stdio.h>

#include <jpeglib.h>
@@ -3127,7 +3127,7 @@ fi 


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

# VNC PNG detection

if test "$vnc" = "yes" -a "$vnc_png" != "no" ; then

if test "$vnc" = "yes" && test "$vnc_png" != "no" ; then

cat > $TMPC <<EOF

//#include <stdio.h>

#include <png.h>
@@ -3491,7 +3491,7 @@ fi 
# This workaround is required due to a bug in pkg-config file for glib as it

# doesn't define GLIB_STATIC_COMPILATION for pkg-config --static



if test "$static" = yes -a "$mingw32" = yes; then

if test "$static" = yes && test "$mingw32" = yes; then

    QEMU_CFLAGS="-DGLIB_STATIC_COMPILATION $QEMU_CFLAGS"

fi
@@ -3584,7 +3584,7 @@ fi 
##########################################

# pixman support probe



if test "$want_tools" = "no" -a "$softmmu" = "no"; then

if test "$want_tools" = "no" && test "$softmmu" = "no"; then

  pixman_cflags=

  pixman_libs=

elif $pkg_config --atleast-version=0.21.8 pixman-1 > /dev/null 2>&1; then
@@ -3699,7 +3699,7 @@ else 
  done

fi



if test "$mingw32" != yes -a "$pthread" = no; then

if test "$mingw32" != yes && test "$pthread" = no; then

  error_exit "pthread check failed" \

      "Make sure to have the pthread libs and headers installed."

fi
@@ -3826,7 +3826,7 @@ fi 
##########################################

# TPM passthrough is only on x86 Linux



if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then

if test "$targetos" = Linux && { test "$cpu" = i386 || test "$cpu" = x86_64; }; then

  tpm_passthrough=$tpm

else

  tpm_passthrough=no
@@ -3992,7 +3992,7 @@ EOF 
  fi

fi



if test "$opengl" = "yes" -a "$have_x11" = "yes"; then

if test "$opengl" = "yes" && test "$have_x11" = "yes"; then

  for target in $target_list; do

    case $target in

      lm32-softmmu) # milkymist-tmu2 requires X11 and OpenGL
@@ -4696,7 +4696,8 @@ fi 
##########################################

# check if we have VSS SDK headers for win



if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a "$vss_win32_sdk" != "no" ; then

if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \

        test "$vss_win32_sdk" != "no" ; then

  case "$vss_win32_sdk" in

    "")   vss_win32_include="-isystem $source_path" ;;

    *\ *) # The SDK is installed in "Program Files" by default, but we cannot
@@ -4735,7 +4736,8 @@ fi 
# VSS provider from the source. It is usually unnecessary because the

# pre-compiled .tlb file is included.



if test "$mingw32" = "yes" -a "$guest_agent" != "no" -a "$guest_agent_with_vss" = "yes" ; then

if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \

        test "$guest_agent_with_vss" = "yes" ; then

  if test -z "$win_sdk"; then

    programfiles="$PROGRAMFILES"

    test -n "$PROGRAMW6432" && programfiles="$PROGRAMW6432"
@@ -4751,7 +4753,7 @@ fi 


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

# check if mingw environment provides a recent ntddscsi.h

if test "$mingw32" = "yes" -a "$guest_agent" != "no"; then

if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then

  cat > $TMPC << EOF

#include <windows.h>

#include <ntddscsi.h>
@@ -4798,7 +4800,7 @@ case "$capstone" in 
  "" | yes)

    if $pkg_config capstone; then

      capstone=system

    elif test -e "${source_path}/.git" -a $git_update = 'yes' ; then

    elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then

      capstone=git

    elif test -e "${source_path}/capstone/Makefile" ; then

      capstone=internal
@@ -5170,7 +5172,7 @@ fi 
# There is no point enabling this if cpuid.h is not usable,

# since we won't be able to select the new routines.



if test "$cpuid_h" = "yes" -a "$avx2_opt" != "no"; then

if test "$cpuid_h" = "yes" && test "$avx2_opt" != "no"; then

  cat > $TMPC << EOF

#pragma GCC push_options

#pragma GCC target("avx2")
@@ -5228,7 +5230,7 @@ EOF 
fi



cmpxchg128=no

if test "$int128" = yes -a "$atomic128" = no; then

if test "$int128" = yes && test "$atomic128" = no; then

  cat > $TMPC << EOF

int main(void)

{
@@ -5901,9 +5903,9 @@ fi 


# Mac OS X ships with a broken assembler

roms=

if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \

        "$targetos" != "Darwin" -a "$targetos" != "SunOS" -a \

        "$softmmu" = yes ; then

if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \

        test "$targetos" != "Darwin" && test "$targetos" != "SunOS" && \

        test "$softmmu" = yes ; then

    # Different host OS linkers have different ideas about the name of the ELF

    # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd

    # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe.
@@ -5915,7 +5917,7 @@ if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \ 
        fi

    done

fi

if test "$cpu" = "ppc64" -a "$targetos" != "Darwin" ; then

if test "$cpu" = "ppc64" && test "$targetos" != "Darwin" ; then

  roms="$roms spapr-rtas"

fi
@@ -6381,7 +6383,7 @@ if test "$modules" = "yes"; then 
  echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) | $shacmd - | cut -f1 -d\ )" >> $config_host_mak

  echo "CONFIG_MODULES=y" >> $config_host_mak

fi

if test "$have_x11" = "yes" -a "$need_x11" = "yes"; then

if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then

  echo "CONFIG_X11=y" >> $config_host_mak

  echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak

  echo "X11_LIBS=$x11_libs" >> $config_host_mak
@@ -6576,7 +6578,7 @@ fi 
if test "$vhost_scsi" = "yes" ; then

  echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak

fi

if test "$vhost_net" = "yes" -a "$vhost_user" = "yes"; then

if test "$vhost_net" = "yes" && test "$vhost_user" = "yes"; then

  echo "CONFIG_VHOST_NET_USED=y" >> $config_host_mak

fi

if test "$vhost_crypto" = "yes" ; then
@@ -6971,11 +6973,11 @@ elif test "$ARCH" = "sparc64" ; then 
  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/sparc $QEMU_INCLUDES"

elif test "$ARCH" = "s390x" ; then

  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES"

elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then

elif test "$ARCH" = "x86_64" || test "$ARCH" = "x32" ; then

  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"

elif test "$ARCH" = "ppc64" ; then

  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES"

elif test "$ARCH" = "riscv32" -o "$ARCH" = "riscv64" ; then

elif test "$ARCH" = "riscv32" || test "$ARCH" = "riscv64" ; then

  QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/riscv $QEMU_INCLUDES"

else

  QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
@@ -7392,7 +7394,7 @@ if test ! -z "$gdb_xml_files" ; then 
  echo "TARGET_XML_FILES=$list" >> $config_target_mak

fi



if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then

if test "$target_user_only" = "yes" && test "$bflt" = "yes"; then

  echo "TARGET_HAS_BFLT=y" >> $config_target_mak

fi

if test "$target_bsd_user" = "yes" ; then
@@ -7514,7 +7516,7 @@ if test "$gprof" = "yes" ; then 
  fi

fi



if test "$target_linux_user" = "yes" -o "$target_bsd_user" = "yes" ; then

if test "$target_linux_user" = "yes" || test "$target_bsd_user" = "yes" ; then

  ldflags="$ldflags $textseg_ldflags"

fi
@@ -7526,7 +7528,8 @@ fi 
#  - we build the system emulation for s390x (qemu-system-s390x)

#  - KVM is enabled

#  - the linker supports --s390-pgste

if test "$TARGET_ARCH" = "s390x" -a "$target_softmmu" = "yes"  -a "$ARCH" = "s390x" -a "$kvm" = "yes"; then

if test "$TARGET_ARCH" = "s390x" && test "$target_softmmu" = "yes" && \

        test "$ARCH" = "s390x" && test "$kvm" = "yes"; then

    if ld_has --s390-pgste ; then

        ldflags="-Wl,--s390-pgste $ldflags"

    fi

hw/cpu/cluster.c

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ static void cpu_cluster_class_init(ObjectClass *klass, void *data) 


    dc->props = cpu_cluster_properties;

    dc->realize = cpu_cluster_realize;



    /* This is not directly for users, CPU children must be attached by code */

    dc->user_creatable = false;

}



static const TypeInfo cpu_cluster_type_info = {

hw/input/tsc210x.c

+6 −12
Original line number Diff line number Diff line
@@ -552,10 +552,8 @@ static void tsc2102_data_register_write( 
        return;



    default:

#ifdef TSC_VERBOSE

        fprintf(stderr, "tsc2102_data_register_write: "

        qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_data_register_write: "

                                       "no such register: 0x%02x\n", reg);

#endif

    }

}
@@ -636,10 +634,8 @@ static void tsc2102_control_register_write( 


    default:

    bad_reg:

#ifdef TSC_VERBOSE

        fprintf(stderr, "tsc2102_control_register_write: "

        qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_control_register_write: "

                                       "no such register: 0x%02x\n", reg);

#endif

    }

}
@@ -764,10 +760,8 @@ static void tsc2102_audio_register_write( 
        return;



    default:

#ifdef TSC_VERBOSE

        fprintf(stderr, "tsc2102_audio_register_write: "

        qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_audio_register_write: "

                                       "no such register: 0x%02x\n", reg);

#endif

    }

}

hw/sparc64/sun4u.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "hw/pci/pci_bus.h"

#include "hw/pci/pci_host.h"

#include "hw/pci-host/sabre.h"

#include "hw/i386/pc.h"

#include "hw/char/serial.h"

#include "hw/char/parallel.h"

#include "hw/timer/m48t59.h"

hw/unicore32/puv3.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "ui/console.h"

#include "hw/boards.h"

#include "hw/loader.h"

#include "hw/i386/pc.h"

#include "sysemu/qtest.h"



#undef DEBUG_PUV3