* [PULL 1/5] meson: use dependency() to find libjpeg
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
@ 2020-11-26 7:59 ` Paolo Bonzini
2020-11-26 7:59 ` [PULL 2/5] configure: remove python pkg_resources check Paolo Bonzini
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2020-11-26 7:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Weil
Prefer pkg-config to find_library because some installations of libjpeg
may place it outside the default search path.
Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 5062407c70..360623ece9 100644
--- a/meson.build
+++ b/meson.build
@@ -654,9 +654,8 @@ if get_option('vnc').enabled()
vnc = declare_dependency() # dummy dependency
png = dependency('libpng', required: get_option('vnc_png'),
method: 'pkg-config', static: enable_static)
- jpeg = cc.find_library('jpeg', has_headers: ['jpeglib.h'],
- required: get_option('vnc_jpeg'),
- static: enable_static)
+ jpeg = dependency('libjpeg', required: get_option('vnc_jpeg'),
+ method: 'pkg-config', static: enable_static)
sasl = cc.find_library('sasl2', has_headers: ['sasl/sasl.h'],
required: get_option('vnc_sasl'),
static: enable_static)
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 2/5] configure: remove python pkg_resources check
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
2020-11-26 7:59 ` [PULL 1/5] meson: use dependency() to find libjpeg Paolo Bonzini
@ 2020-11-26 7:59 ` Paolo Bonzini
2020-11-26 7:59 ` [PULL 3/5] tests/docker, tests/vm: remove setuptools from images Paolo Bonzini
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2020-11-26 7:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Olaf Hering, Thomas Huth
From: Olaf Hering <olaf@aepfle.de>
Since meson.git#0240d760c7699a059cc89e584363c6431cdd2b61 setuptools is not required anymore.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201124211925.4194-1-olaf@aepfle.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 3 ---
1 file changed, 3 deletions(-)
diff --git a/configure b/configure
index 796cec14de..18c26e0389 100755
--- a/configure
+++ b/configure
@@ -1912,9 +1912,6 @@ fi
case "$meson" in
git | internal)
- if ! $python -c 'import pkg_resources' > /dev/null 2>&1; then
- error_exit "Python setuptools not found"
- fi
meson="$python ${source_path}/meson/meson.py"
;;
*) meson=$(command -v "$meson") ;;
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 3/5] tests/docker, tests/vm: remove setuptools from images
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
2020-11-26 7:59 ` [PULL 1/5] meson: use dependency() to find libjpeg Paolo Bonzini
2020-11-26 7:59 ` [PULL 2/5] configure: remove python pkg_resources check Paolo Bonzini
@ 2020-11-26 7:59 ` Paolo Bonzini
2020-11-26 7:59 ` [PULL 4/5] target/i386: fix operand order for PDEP and PEXT Paolo Bonzini
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2020-11-26 7:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth
Setuptools is not needed anymore by the bundled copy of meson,
remove it.
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.cirrus.yml | 1 -
tests/docker/dockerfiles/debian10.docker | 1 -
tests/docker/dockerfiles/fedora-win32-cross.docker | 1 -
tests/docker/dockerfiles/fedora-win64-cross.docker | 1 -
tests/vm/freebsd | 1 -
tests/vm/haiku.x86_64 | 1 -
tests/vm/netbsd | 1 -
tests/vm/openbsd | 1 -
8 files changed, 8 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index f0209b7a3e..2e45b3254f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -85,7 +85,6 @@ windows_msys2_task:
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed \
diffutils git grep make pkg-config sed \
mingw-w64-x86_64-python \
- mingw-w64-x86_64-python-setuptools \
mingw-w64-x86_64-toolchain \
mingw-w64-x86_64-SDL2 \
mingw-w64-x86_64-SDL2_image \
diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker
index 21cc671d71..73a3caac9c 100644
--- a/tests/docker/dockerfiles/debian10.docker
+++ b/tests/docker/dockerfiles/debian10.docker
@@ -30,7 +30,6 @@ RUN apt update && \
pkg-config \
psmisc \
python3 \
- python3-setuptools \
python3-sphinx \
$(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2)
diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker
index 5903e1b0b4..087df598a0 100644
--- a/tests/docker/dockerfiles/fedora-win32-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win32-cross.docker
@@ -30,7 +30,6 @@ ENV PACKAGES \
perl-Test-Harness \
python3 \
python3-PyYAML \
- python3-setuptools \
tar \
which
diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker
index 7f03cd8ffc..d5d2f5f00d 100644
--- a/tests/docker/dockerfiles/fedora-win64-cross.docker
+++ b/tests/docker/dockerfiles/fedora-win64-cross.docker
@@ -26,7 +26,6 @@ ENV PACKAGES \
perl-Test-Harness \
python3 \
python3-PyYAML \
- python3-setuptools \
tar \
which
diff --git a/tests/vm/freebsd b/tests/vm/freebsd
index 04ee793381..09f3ee6cb8 100755
--- a/tests/vm/freebsd
+++ b/tests/vm/freebsd
@@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM):
"pkgconf",
"bzip2",
"python37",
- "py37-setuptools",
"ninja",
# gnu tools
diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64
index 37af48bf1b..2eb736dae1 100755
--- a/tests/vm/haiku.x86_64
+++ b/tests/vm/haiku.x86_64
@@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM):
"devel:libusb_1.0",
"devel:libz",
"ninja",
- "setuptools_python3"
]
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)
diff --git a/tests/vm/netbsd b/tests/vm/netbsd
index 596717cc76..b9efc269d2 100755
--- a/tests/vm/netbsd
+++ b/tests/vm/netbsd
@@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM):
"pkgconf",
"xz",
"python37",
- "py37-setuptools",
"ninja-build",
# gnu tools
diff --git a/tests/vm/openbsd b/tests/vm/openbsd
index 386b2c72f7..4d1399378e 100755
--- a/tests/vm/openbsd
+++ b/tests/vm/openbsd
@@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM):
"git",
"pkgconf",
"bzip2", "xz",
- "py3-setuptools",
"ninja",
# gnu tools
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 4/5] target/i386: fix operand order for PDEP and PEXT
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
` (2 preceding siblings ...)
2020-11-26 7:59 ` [PULL 3/5] tests/docker, tests/vm: remove setuptools from images Paolo Bonzini
@ 2020-11-26 7:59 ` Paolo Bonzini
2020-11-26 7:59 ` [PULL 5/5] nsis: Fix build for 64 bit installer Paolo Bonzini
` (3 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2020-11-26 7:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Lenard Szolnoki, Richard Henderson
For PDEP and PEXT, the mask is provided in the memory (mod+r/m)
operand, and therefore is loaded in s->T0 by gen_ldst_modrm.
The source is provided in the second source operand (VEX.vvvv)
and therefore is loaded in s->T1. Fix the order in which
they are passed to the helpers.
Reported-by: Lenard Szolnoki <blog@lenardszolnoki.com>
Analyzed-by: Lenard Szolnoki <blog@lenardszolnoki.com>
Fixes: https://bugs.launchpad.net/qemu/+bug/1605123
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/translate.c | 8 +++----
tests/tcg/i386/Makefile.target | 3 +++
tests/tcg/i386/test-i386-bmi2.c | 40 +++++++++++++++++++++++++++++++++
3 files changed, 47 insertions(+), 4 deletions(-)
create mode 100644 tests/tcg/i386/test-i386-bmi2.c
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 4c57307e42..e8f5f5803a 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -3936,14 +3936,14 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
}
ot = mo_64_32(s->dflag);
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0);
- /* Note that by zero-extending the mask operand, we
+ /* Note that by zero-extending the source operand, we
automatically handle zero-extending the result. */
if (ot == MO_64) {
tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]);
} else {
tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]);
}
- gen_helper_pdep(cpu_regs[reg], s->T0, s->T1);
+ gen_helper_pdep(cpu_regs[reg], s->T1, s->T0);
break;
case 0x2f5: /* pext Gy, By, Ey */
@@ -3954,14 +3954,14 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
}
ot = mo_64_32(s->dflag);
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0);
- /* Note that by zero-extending the mask operand, we
+ /* Note that by zero-extending the source operand, we
automatically handle zero-extending the result. */
if (ot == MO_64) {
tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]);
} else {
tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]);
}
- gen_helper_pext(cpu_regs[reg], s->T0, s->T1);
+ gen_helper_pext(cpu_regs[reg], s->T1, s->T0);
break;
case 0x1f6: /* adcx Gy, Ey */
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index a66232a67d..ad187cb2c9 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -18,6 +18,9 @@ test-i386-pcmpistri: CFLAGS += -msse4.2
run-test-i386-pcmpistri: QEMU_OPTS += -cpu max
run-plugin-test-i386-pcmpistri-%: QEMU_OPTS += -cpu max
+run-test-i386-bmi2: QEMU_OPTS += -cpu max
+run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max
+
#
# hello-i386 is a barebones app
#
diff --git a/tests/tcg/i386/test-i386-bmi2.c b/tests/tcg/i386/test-i386-bmi2.c
new file mode 100644
index 0000000000..e7a93b88b4
--- /dev/null
+++ b/tests/tcg/i386/test-i386-bmi2.c
@@ -0,0 +1,40 @@
+/* See if various BMI2 instructions give expected results */
+#include <assert.h>
+#include <stdint.h>
+
+int main(int argc, char *argv[]) {
+ char hello[16];
+ uint64_t ehlo = 0x202020204f4c4845ull;
+ uint64_t mask = 0xa080800302020001ull;
+ uint64_t result64;
+ uint32_t result32;
+
+ /* 64 bits */
+ asm volatile ("pextq %2, %1, %0" : "=r"(result64) : "r"(ehlo), "m"(mask));
+ assert(result64 == 133);
+
+ asm volatile ("pdepq %2, %1, %0" : "=r"(result64) : "r"(result64), "m"(mask));
+ assert(result64 == (ehlo & mask));
+
+ asm volatile ("pextq %2, %1, %0" : "=r"(result64) : "r"(-1ull), "m"(mask));
+ assert(result64 == 511); /* mask has 9 bits set */
+
+ asm volatile ("pdepq %2, %1, %0" : "=r"(result64) : "r"(-1ull), "m"(mask));
+ assert(result64 == mask);
+
+ /* 32 bits */
+ asm volatile ("pextl %2, %k1, %k0" : "=r"(result32) : "r"(ehlo), "m"(mask));
+ assert(result32 == 5);
+
+ asm volatile ("pdepl %2, %k1, %k0" : "=r"(result32) : "r"(result32), "m"(mask));
+ assert(result32 == (uint32_t)(ehlo & mask));
+
+ asm volatile ("pextl %2, %k1, %k0" : "=r"(result32) : "r"(-1ull), "m"(mask));
+ assert(result32 == 7); /* mask has 3 bits set */
+
+ asm volatile ("pdepl %2, %k1, %k0" : "=r"(result32) : "r"(-1ull), "m"(mask));
+ assert(result32 == (uint32_t)mask);
+
+ return 0;
+}
+
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 5/5] nsis: Fix build for 64 bit installer
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
` (3 preceding siblings ...)
2020-11-26 7:59 ` [PULL 4/5] target/i386: fix operand order for PDEP and PEXT Paolo Bonzini
@ 2020-11-26 7:59 ` Paolo Bonzini
2020-11-26 8:12 ` [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 no-reply
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2020-11-26 7:59 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Weil, Marc-André Lureau
From: Stefan Weil <sw@weilnetz.de>
Pass cpu instead of cpu_family to the NSIS installer script.
That script checks for "x86_64" which is the cpu value,
while cpu_family is "x86".
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201125191833.964753-1-sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 360623ece9..e3386196ba 100644
--- a/meson.build
+++ b/meson.build
@@ -1955,7 +1955,7 @@ if host_machine.system() == 'windows'
'@OUTPUT@',
get_option('prefix'),
meson.current_source_dir(),
- host_machine.cpu_family(),
+ host_machine.cpu(),
'--',
'-DDISPLAYVERSION=' + meson.project_version(),
]
--
2.26.2
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
` (4 preceding siblings ...)
2020-11-26 7:59 ` [PULL 5/5] nsis: Fix build for 64 bit installer Paolo Bonzini
@ 2020-11-26 8:12 ` no-reply
2020-11-26 10:10 ` Peter Maydell
2020-11-26 14:12 ` Peter Maydell
7 siblings, 0 replies; 10+ messages in thread
From: no-reply @ 2020-11-26 8:12 UTC (permalink / raw)
To: pbonzini; +Cc: qemu-devel
Patchew URL: https://patchew.org/QEMU/20201126075921.3116321-1-pbonzini@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20201126075921.3116321-1-pbonzini@redhat.com
Subject: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/20201126075921.3116321-1-pbonzini@redhat.com -> patchew/20201126075921.3116321-1-pbonzini@redhat.com
Switched to a new branch 'test'
b995d60 nsis: Fix build for 64 bit installer
9e5be66 target/i386: fix operand order for PDEP and PEXT
7fd39a5 tests/docker, tests/vm: remove setuptools from images
a10f1b0 configure: remove python pkg_resources check
9fa2f63 meson: use dependency() to find libjpeg
=== OUTPUT BEGIN ===
1/5 Checking commit 9fa2f638020f (meson: use dependency() to find libjpeg)
2/5 Checking commit a10f1b02f345 (configure: remove python pkg_resources check)
3/5 Checking commit 7fd39a5eb4e0 (tests/docker, tests/vm: remove setuptools from images)
4/5 Checking commit 9e5be6648e96 (target/i386: fix operand order for PDEP and PEXT)
WARNING: Block comments use a leading /* on a separate line
#29: FILE: target/i386/translate.c:3939:
+ /* Note that by zero-extending the source operand, we
WARNING: Block comments use a leading /* on a separate line
#46: FILE: target/i386/translate.c:3957:
+ /* Note that by zero-extending the source operand, we
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#73:
new file mode 100644
ERROR: open brace '{' following function declarations go on the next line
#82: FILE: tests/tcg/i386/test-i386-bmi2.c:5:
+int main(int argc, char *argv[]) {
WARNING: line over 80 characters
#93: FILE: tests/tcg/i386/test-i386-bmi2.c:16:
+ asm volatile ("pdepq %2, %1, %0" : "=r"(result64) : "r"(result64), "m"(mask));
WARNING: line over 80 characters
#96: FILE: tests/tcg/i386/test-i386-bmi2.c:19:
+ asm volatile ("pextq %2, %1, %0" : "=r"(result64) : "r"(-1ull), "m"(mask));
WARNING: line over 80 characters
#99: FILE: tests/tcg/i386/test-i386-bmi2.c:22:
+ asm volatile ("pdepq %2, %1, %0" : "=r"(result64) : "r"(-1ull), "m"(mask));
WARNING: line over 80 characters
#103: FILE: tests/tcg/i386/test-i386-bmi2.c:26:
+ asm volatile ("pextl %2, %k1, %k0" : "=r"(result32) : "r"(ehlo), "m"(mask));
WARNING: line over 80 characters
#106: FILE: tests/tcg/i386/test-i386-bmi2.c:29:
+ asm volatile ("pdepl %2, %k1, %k0" : "=r"(result32) : "r"(result32), "m"(mask));
WARNING: line over 80 characters
#109: FILE: tests/tcg/i386/test-i386-bmi2.c:32:
+ asm volatile ("pextl %2, %k1, %k0" : "=r"(result32) : "r"(-1ull), "m"(mask));
WARNING: line over 80 characters
#112: FILE: tests/tcg/i386/test-i386-bmi2.c:35:
+ asm volatile ("pdepl %2, %k1, %k0" : "=r"(result32) : "r"(-1ull), "m"(mask));
total: 1 errors, 10 warnings, 81 lines checked
Patch 4/5 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
5/5 Checking commit b995d60446aa (nsis: Fix build for 64 bit installer)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20201126075921.3116321-1-pbonzini@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
` (5 preceding siblings ...)
2020-11-26 8:12 ` [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 no-reply
@ 2020-11-26 10:10 ` Peter Maydell
2020-11-26 10:53 ` Paolo Bonzini
2020-11-26 14:12 ` Peter Maydell
7 siblings, 1 reply; 10+ messages in thread
From: Peter Maydell @ 2020-11-26 10:10 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 26 Nov 2020 at 08:02, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 8cc30eb1400fc01f2b139cdd3dc524f8b84dbe07:
>
> Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20201122' into staging (2020-11-22 15:02:52 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to dae3916d846cd88aff038a56b82fa687fd6d02a3:
>
> nsis: Fix build for 64 bit installer (2020-11-25 17:39:12 -0500)
>
> ----------------------------------------------------------------
> Bug fixes + removing the setuptools dependency
Hi. We've passed rc3 now, so the only things going in should
be absolutely release-critical bugs that oblige us to put
out an rc4. That means pull requests need to have more
explanation and justification of why these are release-critical
issues; just "bug fixes" isn't enough detail...
thanks
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2
2020-11-26 10:10 ` Peter Maydell
@ 2020-11-26 10:53 ` Paolo Bonzini
0 siblings, 0 replies; 10+ messages in thread
From: Paolo Bonzini @ 2020-11-26 10:53 UTC (permalink / raw)
To: Peter Maydell; +Cc: QEMU Developers
On 26/11/20 11:10, Peter Maydell wrote:
> On Thu, 26 Nov 2020 at 08:02, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> The following changes since commit 8cc30eb1400fc01f2b139cdd3dc524f8b84dbe07:
>>
>> Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20201122' into staging (2020-11-22 15:02:52 +0000)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to dae3916d846cd88aff038a56b82fa687fd6d02a3:
>>
>> nsis: Fix build for 64 bit installer (2020-11-25 17:39:12 -0500)
>>
>> ----------------------------------------------------------------
>> Bug fixes + removing the setuptools dependency
>
> Hi. We've passed rc3 now, so the only things going in should
> be absolutely release-critical bugs that oblige us to put
> out an rc4. That means pull requests need to have more
> explanation and justification of why these are release-critical
> issues; just "bug fixes" isn't enough detail...
The only one that isn't quite release critical is the target/i386 fix
(though PDEP/PEXT are completely broken without it). For the rest, two
patches fix bugs that block Stefan's Win32 builds; the other two remove
an unnecessary build dependency, and all they do is remove the code to
check that python setuptools is there.
Paolo
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2
2020-11-26 7:59 [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2 Paolo Bonzini
` (6 preceding siblings ...)
2020-11-26 10:10 ` Peter Maydell
@ 2020-11-26 14:12 ` Peter Maydell
7 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2020-11-26 14:12 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 26 Nov 2020 at 08:02, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 8cc30eb1400fc01f2b139cdd3dc524f8b84dbe07:
>
> Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20201122' into staging (2020-11-22 15:02:52 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to dae3916d846cd88aff038a56b82fa687fd6d02a3:
>
> nsis: Fix build for 64 bit installer (2020-11-25 17:39:12 -0500)
>
> ----------------------------------------------------------------
> Bug fixes + removing the setuptools dependency
>
> ----------------------------------------------------------------
This fails 'make check-tcg':
make[2]: Entering directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user'
/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py --engine
auto cc --cc gcc -i qemu/fedora-i386-cross -s /home/p
etmay01/linaro/qemu-for-merges -- -Wall -O0 -g -fno-strict-aliasing
-m32 /home/petmay01/linaro/qemu-for-merges/tests/tcg/
i386/test-i386-bmi2.c -o test-i386-bmi2 -static
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:
In function 'main':
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:6:10:
warning: unused variable 'hello' [-Wunused-vari
able]
6 | char hello[16];
| ^~~~~
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
39 | }
| ^
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:39:1:
warning: unsupported size for integer register
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:
Assembler messages:
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:13:
Error: invalid instruction suffix for `pext'
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:16:
Error: invalid instruction suffix for `pdep'
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:19:
Error: invalid instruction suffix for `pext'
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:22:
Error: invalid instruction suffix for `pdep'
Traceback (most recent call last):
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 709, in <module>
sys.exit(main())
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 705, in main
return args.cmdobj.run(args, argv)
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 627, in run
as_user=True)
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 382, in run
quiet=quiet)
File "/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py",
line 244, in _do_check
return subprocess.check_call(self._command + cmd, **kwargs)
File "/usr/lib/python3.6/subprocess.py", line 311, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['docker', 'run', '--rm',
'--label', 'com.qemu.instance.uuid=caf11ccb0f2a4871a6dc2813f93f23ca',
'-u', '1000', '-w',
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user',
'-v', '/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user:/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user:rw',
'-v', '/home/petmay01/linaro/qemu-for-merges:/home/petmay01/linaro/qemu-for-merges:ro,z',
'qemu/fedora-i386-cross', 'gcc', '-Wall', '-O0', '-g',
'-fno-strict-aliasing', '-m32',
'/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c',
'-o', 'test-i386-bmi2', '-static']' returned non-zero exit status 1.
filter=--filter=label=com.qemu.instance.uuid=caf11ccb0f2a4871a6dc2813f93f23ca
../Makefile.target:103: recipe for target 'test-i386-bmi2' failed
make[2]: *** [test-i386-bmi2] Error 1
make[2]: Leaving directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user'
/home/petmay01/linaro/qemu-for-merges/tests/tcg/Makefile.qemu:64:
recipe for target 'docker-build-guest-tests' failed
make[1]: *** [docker-build-guest-tests] Error 2
/home/petmay01/linaro/qemu-for-merges/tests/Makefile.include:54:
recipe for target 'build-tcg-tests-i386-linux-user' failed
make: *** [build-tcg-tests-i386-linux-user] Error 2
thanks
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread