* [Qemu-devel] [PULL 0/7] Trivial patches patches
@ 2019-02-06 15:28 Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019 Laurent Vivier
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland
The following changes since commit 47994e16b1d66411953623e7c0bf0cdcd50bd507:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190205' into staging (2019-02-05 18:25:07 +0000)
are available in the Git repository at:
git://github.com/vivier/qemu.git tags/trivial-patches-pull-request
for you to fetch changes up to e67e91b4b55331973f783ca89790ee9f7861ced1:
hw/input/tsc210x: Fix building with no verbosity (2019-02-06 15:57:06 +0100)
----------------------------------------------------------------
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
----------------------------------------------------------------
Eric Blake (1):
configure: Avoid non-portable 'test -o/-a'
Peter Maydell (1):
qemu-common.h: Update copyright string for 2019
Philippe Mathieu-Daudé (3):
hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h"
hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h"
hw/input/tsc210x: Fix building with no verbosity
Thomas Huth (2):
target/moxie: Fix LGPL information in the file headers
hw/cpu/cluster: Mark the cpu-cluster device with user_creatable =
false
configure | 63 +++++++++++++++++++++-------------------
hw/cpu/cluster.c | 3 ++
hw/input/tsc210x.c | 18 ++++--------
hw/sparc64/sun4u.c | 1 -
hw/unicore32/puv3.c | 1 -
include/qemu-common.h | 2 +-
target/moxie/cpu.c | 2 +-
target/moxie/cpu.h | 4 +--
target/moxie/helper.c | 4 +--
target/moxie/mmu.c | 4 +--
target/moxie/translate.c | 4 +--
11 files changed, 52 insertions(+), 54 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 2/7] target/moxie: Fix LGPL information in the file headers Laurent Vivier
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Eric Blake, Stefan Hajnoczi, Alex Bennée
From: Peter Maydell <peter.maydell@linaro.org>
Update the copyright string we use in version/help output,
since we're well into the new year now.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20190201173655.4567-1-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/qemu-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/qemu-common.h b/include/qemu-common.h
index ed60ba251d..a102245519 100644
--- a/include/qemu-common.h
+++ b/include/qemu-common.h
@@ -17,7 +17,7 @@
#define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
/* Copyright string for -version arguments, About dialogs, etc */
-#define QEMU_COPYRIGHT "Copyright (c) 2003-2018 " \
+#define QEMU_COPYRIGHT "Copyright (c) 2003-2019 " \
"Fabrice Bellard and the QEMU Project developers"
/* Bug reporting information for --help arguments, About dialogs, etc */
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 2/7] target/moxie: Fix LGPL information in the file headers
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019 Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 3/7] configure: Avoid non-portable 'test -o/-a' Laurent Vivier
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Thomas Huth, Richard Henderson
From: Thomas Huth <thuth@redhat.com>
It's either "GNU *Library* General Public License version 2" or "GNU
Lesser General Public License version *2.1*", but there was no "version
2.0" of the "Lesser" license. So assume that version 2.1 is meant here.
Also the files mentioned the GPL instead of the LGPL after declaring
that the files are licensed under the LGPL, so change these spots to
use LGPL, too.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <1549266858-5043-1-git-send-email-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/moxie/cpu.c | 2 +-
target/moxie/cpu.h | 4 ++--
target/moxie/helper.c | 4 ++--
target/moxie/mmu.c | 4 ++--
target/moxie/translate.c | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/target/moxie/cpu.c b/target/moxie/cpu.c
index 8d67eb6727..46434e65ba 100644
--- a/target/moxie/cpu.c
+++ b/target/moxie/cpu.c
@@ -13,7 +13,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/target/moxie/cpu.h b/target/moxie/cpu.h
index d40f1e6c45..080df4ee6f 100644
--- a/target/moxie/cpu.h
+++ b/target/moxie/cpu.h
@@ -6,14 +6,14 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/target/moxie/helper.c b/target/moxie/helper.c
index 5b1532b837..f3d8ee7d6b 100644
--- a/target/moxie/helper.c
+++ b/target/moxie/helper.c
@@ -6,14 +6,14 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/target/moxie/mmu.c b/target/moxie/mmu.c
index bd90b1eebc..87783a36f8 100644
--- a/target/moxie/mmu.c
+++ b/target/moxie/mmu.c
@@ -6,14 +6,14 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/target/moxie/translate.c b/target/moxie/translate.c
index 29da02bc05..68ca223e22 100644
--- a/target/moxie/translate.c
+++ b/target/moxie/translate.c
@@ -5,7 +5,7 @@
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2 of
+ * as published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but
@@ -13,7 +13,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 3/7] configure: Avoid non-portable 'test -o/-a'
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019 Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 2/7] target/moxie: Fix LGPL information in the file headers Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 4/7] hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h" Laurent Vivier
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Eric Blake, Philippe Mathieu-Daudé
From: Eric Blake <eblake@redhat.com>
POSIX says that it is better to use &&/|| and two separate test
invocations than it is to try and use -a and -o (in fact, there
are some tests that are inherently ambiguous to parse if the
user passes in corner-case input like "(").
Since we cannot guarantee which shell runs configure, we cannot
rely on -o/-a always following bash's parser rules.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190205023937.18245-1-eblake@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
configure | 63 +++++++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/configure b/configure
index 3d89870d99..61bc70708e 100755
--- a/configure
+++ b/configure
@@ -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
@@ -4612,8 +4612,8 @@ elif compile_prog "" "$pthread_lib -lrt" ; then
libs_qga="$libs_qga -lrt"
fi
-if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
- "$haiku" != "yes" ; then
+if test "$darwin" != "yes" && test "$mingw32" != "yes" && \
+ test "$solaris" != yes && test "$haiku" != "yes" ; then
libs_softmmu="-lutil $libs_softmmu"
fi
@@ -4688,7 +4688,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
@@ -4727,7 +4728,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"
@@ -4743,7 +4745,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>
@@ -4790,7 +4792,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
@@ -5162,7 +5164,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")
@@ -5220,7 +5222,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)
{
@@ -5893,9 +5895,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.
@@ -5907,7 +5909,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
@@ -6373,7 +6375,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
@@ -6568,7 +6570,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
@@ -6963,11 +6965,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"
@@ -7384,7 +7386,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
@@ -7506,7 +7508,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
@@ -7518,7 +7520,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
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 4/7] hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h"
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
` (2 preceding siblings ...)
2019-02-06 15:28 ` [Qemu-devel] [PULL 3/7] configure: Avoid non-portable 'test -o/-a' Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 5/7] hw/unicore32/puv3: " Laurent Vivier
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Philippe Mathieu-Daudé,
Thomas Huth
From: Philippe Mathieu-Daudé <philmd@redhat.com>
In 47973a2dbf we split the last generic chipset out of the PC
board, but forgot to remove the include of "hw/i386/pc.h".
Since it is now unused, remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20190204210433.26088-2-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/sparc64/sun4u.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index f76b19e4e9..fdf3f14a29 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -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"
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 5/7] hw/unicore32/puv3: Drop useless inclusion of "hw/i386/pc.h"
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
` (3 preceding siblings ...)
2019-02-06 15:28 ` [Qemu-devel] [PULL 4/7] hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h" Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 6/7] hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false Laurent Vivier
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Philippe Mathieu-Daudé,
Thomas Huth
From: Philippe Mathieu-Daudé <philmd@redhat.com>
In 47973a2dbf we split the last generic chipset out of the PC
board, but forgot to remove the include of "hw/i386/pc.h".
Since it is now unused, remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190204210433.26088-3-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/unicore32/puv3.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 830fe3face..b42e600f74 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -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
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 6/7] hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
` (4 preceding siblings ...)
2019-02-06 15:28 ` [Qemu-devel] [PULL 5/7] hw/unicore32/puv3: " Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 7/7] hw/input/tsc210x: Fix building with no verbosity Laurent Vivier
2019-02-07 16:49 ` [Qemu-devel] [PULL 0/7] Trivial patches patches Peter Maydell
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Thomas Huth, Philippe Mathieu-Daudé,
Luc Michel, Alistair Francis
From: Thomas Huth <thuth@redhat.com>
The device can not be instantiated by the user and QEMU currently
aborts when you try to use it:
$ x86_64-softmmu/qemu-system-x86_64 -device cpu-cluster
qemu-system-x86_64: hw/cpu/cluster.c:73: cpu_cluster_realize:
Assertion `cbdata.cpu_count > 0' failed.
Aborted (core dumped)
Since this is an internal device only, mark it with user_creatable = false.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Luc Michel <luc.michel@greensocs.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <1549371525-29899-1-git-send-email-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/cpu/cluster.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c
index 25f90702b1..6f5f037b3c 100644
--- a/hw/cpu/cluster.c
+++ b/hw/cpu/cluster.c
@@ -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 = {
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Qemu-devel] [PULL 7/7] hw/input/tsc210x: Fix building with no verbosity
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
` (5 preceding siblings ...)
2019-02-06 15:28 ` [Qemu-devel] [PULL 6/7] hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false Laurent Vivier
@ 2019-02-06 15:28 ` Laurent Vivier
2019-02-07 16:49 ` [Qemu-devel] [PULL 0/7] Trivial patches patches Peter Maydell
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2019-02-06 15:28 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Eduardo Habkost, qemu-trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Peter Maydell, Artyom Tarasenko,
Mark Cave-Ayland, Philippe Mathieu-Daudé,
Thomas Huth, Stefano Garzarella
From: Philippe Mathieu-Daudé <philmd@redhat.com>
When building with TSC_VERBOSE not defined, we get:
CC arm-softmmu/hw/input/tsc210x.o
hw/input/tsc210x.c: In function ‘tsc2102_data_register_write’:
hw/input/tsc210x.c:554:5: error: label at end of compound statement
default:
^~~~~~~
hw/input/tsc210x.c: In function ‘tsc2102_control_register_write’:
hw/input/tsc210x.c:638:5: error: label at end of compound statement
bad_reg:
^~~~~~~
hw/input/tsc210x.c: In function ‘tsc2102_audio_register_write’:
hw/input/tsc210x.c:766:5: error: label at end of compound statement
default:
^~~~~~~
make[1]: *** [rules.mak:69: hw/input/tsc210x.o] Error 1
Fix this by replacing the culprit fprintf(stderr) calls by a more
recent API: qemu_log_mask(LOG_GUEST_ERROR). Other fprintf() calls
are left untouched.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20190204204517.23698-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/input/tsc210x.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index ded0db9351..2eb3cb9518 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -552,10 +552,8 @@ static void tsc2102_data_register_write(
return;
default:
-#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_data_register_write: "
- "no such register: 0x%02x\n", reg);
-#endif
+ qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_data_register_write: "
+ "no such register: 0x%02x\n", reg);
}
}
@@ -636,10 +634,8 @@ static void tsc2102_control_register_write(
default:
bad_reg:
-#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_control_register_write: "
- "no such register: 0x%02x\n", reg);
-#endif
+ qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_control_register_write: "
+ "no such register: 0x%02x\n", reg);
}
}
@@ -764,10 +760,8 @@ static void tsc2102_audio_register_write(
return;
default:
-#ifdef TSC_VERBOSE
- fprintf(stderr, "tsc2102_audio_register_write: "
- "no such register: 0x%02x\n", reg);
-#endif
+ qemu_log_mask(LOG_GUEST_ERROR, "tsc2102_audio_register_write: "
+ "no such register: 0x%02x\n", reg);
}
}
--
2.20.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [Qemu-devel] [PULL 0/7] Trivial patches patches
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
` (6 preceding siblings ...)
2019-02-06 15:28 ` [Qemu-devel] [PULL 7/7] hw/input/tsc210x: Fix building with no verbosity Laurent Vivier
@ 2019-02-07 16:49 ` Peter Maydell
7 siblings, 0 replies; 9+ messages in thread
From: Peter Maydell @ 2019-02-07 16:49 UTC (permalink / raw)
To: Laurent Vivier
Cc: QEMU Developers, Eduardo Habkost, QEMU Trivial, Anthony Green,
Marcel Apfelbaum, qemu-arm, Andrzej Zaborowski, Guan Xuetao,
Michael Tokarev, Artyom Tarasenko, Mark Cave-Ayland
On Wed, 6 Feb 2019 at 15:28, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 47994e16b1d66411953623e7c0bf0cdcd50bd507:
>
> Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20190205' into staging (2019-02-05 18:25:07 +0000)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/trivial-patches-pull-request
>
> for you to fetch changes up to e67e91b4b55331973f783ca89790ee9f7861ced1:
>
> hw/input/tsc210x: Fix building with no verbosity (2019-02-06 15:57:06 +0100)
>
> ----------------------------------------------------------------
> 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
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-02-07 16:49 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-06 15:28 [Qemu-devel] [PULL 0/7] Trivial patches patches Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 1/7] qemu-common.h: Update copyright string for 2019 Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 2/7] target/moxie: Fix LGPL information in the file headers Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 3/7] configure: Avoid non-portable 'test -o/-a' Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 4/7] hw/sparc64/sun4u: Drop useless inclusion of "hw/i386/pc.h" Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 5/7] hw/unicore32/puv3: " Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 6/7] hw/cpu/cluster: Mark the cpu-cluster device with user_creatable = false Laurent Vivier
2019-02-06 15:28 ` [Qemu-devel] [PULL 7/7] hw/input/tsc210x: Fix building with no verbosity Laurent Vivier
2019-02-07 16:49 ` [Qemu-devel] [PULL 0/7] Trivial patches patches Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.