[v1] Final (?) batch of misc patches for QEMU 5.2

[PULL 0/5] Final (?) batch of misc patches for QEMU 5.2

Posted by Paolo Bonzini 5 years, 2 months ago

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

----------------------------------------------------------------
Olaf Hering (1):
      configure: remove python pkg_resources check

Paolo Bonzini (3):
      meson: use dependency() to find libjpeg
      tests/docker, tests/vm: remove setuptools from images
      target/i386: fix operand order for PDEP and PEXT

Stefan Weil (1):
      nsis: Fix build for 64 bit installer

 .cirrus.yml                                        |  1 -
 configure                                          |  3 --
 meson.build                                        |  7 ++--
 target/i386/translate.c                            |  8 ++---
 tests/docker/dockerfiles/debian10.docker           |  1 -
 tests/docker/dockerfiles/fedora-win32-cross.docker |  1 -
 tests/docker/dockerfiles/fedora-win64-cross.docker |  1 -
 tests/tcg/i386/Makefile.target                     |  3 ++
 tests/tcg/i386/test-i386-bmi2.c                    | 40 ++++++++++++++++++++++
 tests/vm/freebsd                                   |  1 -
 tests/vm/haiku.x86_64                              |  1 -
 tests/vm/netbsd                                    |  1 -
 tests/vm/openbsd                                   |  1 -
 13 files changed, 50 insertions(+), 19 deletions(-)
 create mode 100644 tests/tcg/i386/test-i386-bmi2.c
-- 
2.26.2

Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2

Posted by no-reply@patchew.org 5 years, 2 months ago

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

Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2

Posted by Peter Maydell 5 years, 2 months ago

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

Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2

Posted by Peter Maydell 5 years, 2 months ago

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

Re: [PULL 0/5] Final (?) batch of misc patches for QEMU 5.2

Posted by Paolo Bonzini 5 years, 2 months ago

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