Skip to content

Commit

Permalink
Merge tag 'pull-request-2022-05-06' of https://gitlab.com/thuth/qemu
Browse files Browse the repository at this point in the history
…into staging

* Remove redundant/obsolete x86 and arm disassemblers (Capstone is better)
* Limit some Xen-related code to builds where Xen is really available
* Remove hxtool-conv.pl
* Update MinGW and OpenBSD to a more recent version in the CI
* Warn user if the -vga flag is passed but no vga device is created

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmJ1MQYRHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbXIixAAp1hzkOKD8e0GtEDMFom0a8OJsYebIq6r
# K5hkMCjwjrNoUpP3OO4zdZ+ZInOCAoT/Nr+F+Jj9VYTSK5yiGdU7Oojqpjl5JThY
# I9PMpyjQ4M02WLl3jkz4FxL0Hu/6w+Nh5FjGBsgMzhMlfFHORKC03lZZZlBZ9KY1
# geoTVobkvPD1NvVECuUEyd3QhFJMf0qas6ceuwExlrscsNXWLwKikbEZhmLDT0QV
# OnmRp/fKs3TGQYJ28H9CwgYm1gzF+HBMxCBLjOABAcYa2JtAytz5+wZM/uQLFS3u
# HUx/eMP14r7h2NUIi30WY8GySR7McDz+0+tQY9LMvNhi7NqDTDPOYst4+kuwOIIu
# No2+xzG6gid336i3I6IIpgvilS9WM192QdnpMG28vQFOQB4JOP24hfPMozcCln5C
# oLYg7AJZJ8ucJGvBabRUjI3wqPLP0Hk/zKyv8lGC7cN1SV3eI05PwgM6KrKXNen7
# u1mFsv43YxafixSM1N3sjB5JSDzGmxOGMDFwJhUcE3Pc7tj9AcjSb4H2CJsZqV9v
# vH3TRDi2Pa+whiFwz78s4vs5CnJ8fxafm+ucpnN+EEWD+MSy6g0hSQT9XiqSIj5o
# v/A30xsM8iCuTL3noh6msoB+WlWP8LY0Ul5OXDk731vDBsmnKwhIzKt0SVCZ+ZK1
# ICfdzIrRXn8=
# =tzMv
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 06 May 2022 09:30:30 AM CDT
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [undefined]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [undefined]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2022-05-06' of https://gitlab.com/thuth/qemu:
  Warn user if the vga flag is passed but no vga device is created
  tests/vm: update openbsd to release 7.1
  gitlab-ci: Upgrade mingw base package.
  cirrus/win32: upgrade mingw base packages
  doc: remove hxtool-conv.pl
  qemu-options: Limit the -xen options to x86 and arm
  softmmu/vl: Fence 'xenfb' if Xen support is not compiled in
  disas: Remove old libopcode i386 disassembler
  disas: Remove old libopcode arm disassembler

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
rth7680 committed May 6, 2022
2 parents 31abf61 + 0660402 commit a660cf3
Show file tree
Hide file tree
Showing 24 changed files with 27 additions and 10,947 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Expand Up @@ -12,7 +12,7 @@ windows_msys2_task:
CIRRUS_SHELL: powershell
MSYS: winsymlinks:nativestrict
MSYSTEM: MINGW64
MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-05-03/msys2-base-x86_64-20220503.sfx.exe
MSYS2_FINGERPRINT: 0
MSYS2_PACKAGES: "
diffutils git grep make pkg-config sed
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.d/windows.yml
Expand Up @@ -16,7 +16,7 @@
}
- If ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
Invoke-WebRequest
"https://github.com/msys2/msys2-installer/releases/download/2021-07-25/msys2-base-x86_64-20210725.sfx.exe"
"https://github.com/msys2/msys2-installer/releases/download/2022-05-03/msys2-base-x86_64-20220503.sfx.exe"
-outfile "msys64\var\cache\msys2.exe"
}
- msys64\var\cache\msys2.exe -y
Expand Down
4 changes: 0 additions & 4 deletions MAINTAINERS
Expand Up @@ -165,7 +165,6 @@ F: tests/qtest/arm-cpu-features.c
F: hw/arm/
F: hw/cpu/a*mpcore.c
F: include/hw/cpu/a*mpcore.h
F: disas/arm.c
F: disas/arm-a64.cc
F: disas/libvixl/
F: docs/system/target-arm.rst
Expand Down Expand Up @@ -335,7 +334,6 @@ F: target/i386/tcg/
F: tests/tcg/i386/
F: tests/tcg/x86_64/
F: hw/i386/
F: disas/i386.c
F: docs/system/cpu-models-x86*
T: git https://gitlab.com/ehabkost/qemu.git x86-next

Expand Down Expand Up @@ -3267,13 +3265,11 @@ M: Richard Henderson <richard.henderson@linaro.org>
S: Maintained
L: qemu-arm@nongnu.org
F: tcg/arm/
F: disas/arm.c

i386 TCG target
M: Richard Henderson <richard.henderson@linaro.org>
S: Maintained
F: tcg/i386/
F: disas/i386.c

LoongArch64 TCG target
M: WANG Xuerui <git@xen0n.name>
Expand Down
3 changes: 0 additions & 3 deletions disas.c
Expand Up @@ -153,14 +153,12 @@ static void initialize_debug_host(CPUDebug *s)
s->info.print_insn = print_insn_tci;
#elif defined(__i386__)
s->info.mach = bfd_mach_i386_i386;
s->info.print_insn = print_insn_i386;
s->info.cap_arch = CS_ARCH_X86;
s->info.cap_mode = CS_MODE_32;
s->info.cap_insn_unit = 1;
s->info.cap_insn_split = 8;
#elif defined(__x86_64__)
s->info.mach = bfd_mach_x86_64;
s->info.print_insn = print_insn_i386;
s->info.cap_arch = CS_ARCH_X86;
s->info.cap_mode = CS_MODE_64;
s->info.cap_insn_unit = 1;
Expand Down Expand Up @@ -192,7 +190,6 @@ static void initialize_debug_host(CPUDebug *s)
s->info.mach = bfd_mach_sparc_v9b;
#elif defined(__arm__)
/* TCG only generates code for arm mode. */
s->info.print_insn = print_insn_arm;
s->info.cap_arch = CS_ARCH_ARM;
#elif defined(__MIPSEB__)
s->info.print_insn = print_insn_big_mips;
Expand Down
4,012 changes: 0 additions & 4,012 deletions disas/arm.c

This file was deleted.

0 comments on commit a660cf3

Please sign in to comment.