mirror of https://github.com/proxmox/mirror_qemu
* Remove TABs in hw/ide and hw/block
* Two fixes for GCC 13 * MSYS2 CI job improvements -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmQdwwkRHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbXnWg//TcpLes6b30dTFJ3NwTYaL+ElGvcfQiXx DNUdmCuxH+2YJGORvVutbVslxFAXgYn8z6lmjgTSx+HziwmY3WhtWSQNOAxRrpoj Rq1r59q7FPKY/qoLjTMeQDe3O+jrGte7dX14TbKRpPDSZxxJjpswACDgCsGWqE8x 0SGSLRlqqqnrQE0H1RfmP++0yAtHmGSN3TK0/bFmY4B+mMpj8beAq020h2iCCdbP 7qWMI0o96lAl/D/wA55BNKuWsdXdIeQjPPoxxGEtiXN27Xk7oyQS47JkZdz6C1Lq V8/lF2Pa/eC6uPjnxpQDGp1IkaBE7/rn4450h9EMESrjL50As2yPUkw3BecqimHA fYMbSXrGe9urIflkZcY7Nx2PaBB5v1ZR3iiemjd8qahjgiT8DJYWtjFYKbuFsqJ+ Ra13Ey9PEX13dROXBAFeX+rdaMiRQEkyQv8GSwPlnNW7OzFJc/qr8EIQOuu1flmm 7KLYp6h45Os/fN90Lnn5N9LhjUET+2XDqEljAyyziTjsIuc1i3mPjR45j0KSq7tv eBp6SXpHkXrpKDrXSsJMa4SzSfK6VOHrtseE4b2XCKQLr4oSpr8d6eembKGyvNzs zh4TtsC+WfTu4HY5Dcbat34QAtAfGUr7ERX4/s+bnvQd944/7skOAqM7Ia9tOMKH ABuxJ8A7PIY= =myGG -----END PGP SIGNATURE----- Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging * Remove TABs in hw/ide and hw/block * Two fixes for GCC 13 * MSYS2 CI job improvements # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmQdwwkRHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbXnWg//TcpLes6b30dTFJ3NwTYaL+ElGvcfQiXx # DNUdmCuxH+2YJGORvVutbVslxFAXgYn8z6lmjgTSx+HziwmY3WhtWSQNOAxRrpoj # Rq1r59q7FPKY/qoLjTMeQDe3O+jrGte7dX14TbKRpPDSZxxJjpswACDgCsGWqE8x # 0SGSLRlqqqnrQE0H1RfmP++0yAtHmGSN3TK0/bFmY4B+mMpj8beAq020h2iCCdbP # 7qWMI0o96lAl/D/wA55BNKuWsdXdIeQjPPoxxGEtiXN27Xk7oyQS47JkZdz6C1Lq # V8/lF2Pa/eC6uPjnxpQDGp1IkaBE7/rn4450h9EMESrjL50As2yPUkw3BecqimHA # fYMbSXrGe9urIflkZcY7Nx2PaBB5v1ZR3iiemjd8qahjgiT8DJYWtjFYKbuFsqJ+ # Ra13Ey9PEX13dROXBAFeX+rdaMiRQEkyQv8GSwPlnNW7OzFJc/qr8EIQOuu1flmm # 7KLYp6h45Os/fN90Lnn5N9LhjUET+2XDqEljAyyziTjsIuc1i3mPjR45j0KSq7tv # eBp6SXpHkXrpKDrXSsJMa4SzSfK6VOHrtseE4b2XCKQLr4oSpr8d6eembKGyvNzs # zh4TtsC+WfTu4HY5Dcbat34QAtAfGUr7ERX4/s+bnvQd944/7skOAqM7Ia9tOMKH # ABuxJ8A7PIY= # =myGG # -----END PGP SIGNATURE----- # gpg: Signature made Fri 24 Mar 2023 15:34:33 GMT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu: Revert "docs/about/deprecated: Deprecate 32-bit arm hosts for system emulation" cirrus-ci: Remove MSYS2 jobs duplicated with gitlab-ci gitlab-ci: Cover SPICE in the MSYS2 job ui/spice: fix compilation on win32 target/ppc: Fix helper_pminsn() prototype target/s390x: Fix float_comp_to_cc() prototype hw/block: replace TABs with space hw/ide: replace TABs with space Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
commit
e3debd5e7d
111
.cirrus.yml
111
.cirrus.yml
|
@ -1,111 +0,0 @@
|
||||||
env:
|
|
||||||
CIRRUS_CLONE_DEPTH: 1
|
|
||||||
|
|
||||||
windows_msys2_task:
|
|
||||||
timeout_in: 90m
|
|
||||||
windows_container:
|
|
||||||
image: cirrusci/windowsservercore:2019
|
|
||||||
os_version: 2019
|
|
||||||
cpu: 8
|
|
||||||
memory: 8G
|
|
||||||
env:
|
|
||||||
CIRRUS_SHELL: powershell
|
|
||||||
MSYS: winsymlinks:native
|
|
||||||
MSYSTEM: MINGW64
|
|
||||||
MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-06-03/msys2-base-x86_64-20220603.sfx.exe
|
|
||||||
MSYS2_FINGERPRINT: 0
|
|
||||||
MSYS2_PACKAGES: "
|
|
||||||
diffutils git grep make pkg-config sed
|
|
||||||
mingw-w64-x86_64-python
|
|
||||||
mingw-w64-x86_64-python-sphinx
|
|
||||||
mingw-w64-x86_64-toolchain
|
|
||||||
mingw-w64-x86_64-SDL2
|
|
||||||
mingw-w64-x86_64-SDL2_image
|
|
||||||
mingw-w64-x86_64-gtk3
|
|
||||||
mingw-w64-x86_64-glib2
|
|
||||||
mingw-w64-x86_64-ninja
|
|
||||||
mingw-w64-x86_64-jemalloc
|
|
||||||
mingw-w64-x86_64-lzo2
|
|
||||||
mingw-w64-x86_64-zstd
|
|
||||||
mingw-w64-x86_64-libjpeg-turbo
|
|
||||||
mingw-w64-x86_64-pixman
|
|
||||||
mingw-w64-x86_64-libgcrypt
|
|
||||||
mingw-w64-x86_64-libpng
|
|
||||||
mingw-w64-x86_64-libssh
|
|
||||||
mingw-w64-x86_64-snappy
|
|
||||||
mingw-w64-x86_64-libusb
|
|
||||||
mingw-w64-x86_64-usbredir
|
|
||||||
mingw-w64-x86_64-libtasn1
|
|
||||||
mingw-w64-x86_64-nettle
|
|
||||||
mingw-w64-x86_64-cyrus-sasl
|
|
||||||
mingw-w64-x86_64-curl
|
|
||||||
mingw-w64-x86_64-gnutls
|
|
||||||
mingw-w64-x86_64-libnfs
|
|
||||||
"
|
|
||||||
CHERE_INVOKING: 1
|
|
||||||
msys2_cache:
|
|
||||||
folder: C:\tools\archive
|
|
||||||
reupload_on_changes: false
|
|
||||||
# These env variables are used to generate fingerprint to trigger the cache procedure
|
|
||||||
# If wanna to force re-populate msys2, increase MSYS2_FINGERPRINT
|
|
||||||
fingerprint_script:
|
|
||||||
- |
|
|
||||||
echo $env:CIRRUS_TASK_NAME
|
|
||||||
echo $env:MSYS2_URL
|
|
||||||
echo $env:MSYS2_FINGERPRINT
|
|
||||||
echo $env:MSYS2_PACKAGES
|
|
||||||
populate_script:
|
|
||||||
- |
|
|
||||||
md -Force C:\tools\archive\pkg
|
|
||||||
$start_time = Get-Date
|
|
||||||
bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND $env:MSYS2_URL C:\tools\archive\base.exe
|
|
||||||
Write-Output "Download time taken: $((Get-Date).Subtract($start_time))"
|
|
||||||
cd C:\tools
|
|
||||||
C:\tools\archive\base.exe -y
|
|
||||||
del -Force C:\tools\archive\base.exe
|
|
||||||
Write-Output "Base install time taken: $((Get-Date).Subtract($start_time))"
|
|
||||||
$start_time = Get-Date
|
|
||||||
|
|
||||||
((Get-Content -path C:\tools\msys64\etc\\post-install\\07-pacman-key.post -Raw) -replace '--refresh-keys', '--version') | Set-Content -Path C:\tools\msys64\etc\\post-install\\07-pacman-key.post
|
|
||||||
C:\tools\msys64\usr\bin\bash.exe -lc "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf"
|
|
||||||
C:\tools\msys64\usr\bin\bash.exe -lc "export"
|
|
||||||
C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Sy
|
|
||||||
echo Y | C:\tools\msys64\usr\bin\pacman.exe --noconfirm -Suu --overwrite=*
|
|
||||||
taskkill /F /FI "MODULES eq msys-2.0.dll"
|
|
||||||
tasklist
|
|
||||||
C:\tools\msys64\usr\bin\bash.exe -lc "mv -f /etc/pacman.conf.pacnew /etc/pacman.conf || true"
|
|
||||||
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Syuu --overwrite=*"
|
|
||||||
Write-Output "Core install time taken: $((Get-Date).Subtract($start_time))"
|
|
||||||
$start_time = Get-Date
|
|
||||||
|
|
||||||
C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed $env:MSYS2_PACKAGES"
|
|
||||||
Write-Output "Package install time taken: $((Get-Date).Subtract($start_time))"
|
|
||||||
$start_time = Get-Date
|
|
||||||
|
|
||||||
del -Force -ErrorAction SilentlyContinue C:\tools\msys64\etc\mtab
|
|
||||||
del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\fd
|
|
||||||
del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stderr
|
|
||||||
del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdin
|
|
||||||
del -Force -ErrorAction SilentlyContinue C:\tools\msys64\dev\stdout
|
|
||||||
del -Force -Recurse -ErrorAction SilentlyContinue C:\tools\msys64\var\cache\pacman\pkg
|
|
||||||
tar cf C:\tools\archive\msys64.tar -C C:\tools\ msys64
|
|
||||||
|
|
||||||
Write-Output "Package archive time taken: $((Get-Date).Subtract($start_time))"
|
|
||||||
del -Force -Recurse -ErrorAction SilentlyContinue c:\tools\msys64
|
|
||||||
install_script:
|
|
||||||
- |
|
|
||||||
$start_time = Get-Date
|
|
||||||
cd C:\tools
|
|
||||||
ls C:\tools\archive\msys64.tar
|
|
||||||
tar xf C:\tools\archive\msys64.tar
|
|
||||||
Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))"
|
|
||||||
script:
|
|
||||||
- mkdir build
|
|
||||||
- cd build
|
|
||||||
- C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=python3
|
|
||||||
--target-list-exclude=i386-softmmu,ppc64-softmmu,aarch64-softmmu,mips64-softmmu,mipsel-softmmu,sh4-softmmu"
|
|
||||||
- C:\tools\msys64\usr\bin\bash.exe -lc "make -j8"
|
|
||||||
- exit $LastExitCode
|
|
||||||
test_script:
|
|
||||||
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"
|
|
||||||
- exit $LastExitCode
|
|
|
@ -59,6 +59,7 @@ msys2-64bit:
|
||||||
mingw-w64-x86_64-SDL2
|
mingw-w64-x86_64-SDL2
|
||||||
mingw-w64-x86_64-SDL2_image
|
mingw-w64-x86_64-SDL2_image
|
||||||
mingw-w64-x86_64-snappy
|
mingw-w64-x86_64-snappy
|
||||||
|
mingw-w64-x86_64-spice
|
||||||
mingw-w64-x86_64-usbredir
|
mingw-w64-x86_64-usbredir
|
||||||
mingw-w64-x86_64-zstd "
|
mingw-w64-x86_64-zstd "
|
||||||
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
|
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
|
||||||
|
@ -108,6 +109,7 @@ msys2-32bit:
|
||||||
mingw-w64-i686-SDL2
|
mingw-w64-i686-SDL2
|
||||||
mingw-w64-i686-SDL2_image
|
mingw-w64-i686-SDL2_image
|
||||||
mingw-w64-i686-snappy
|
mingw-w64-i686-snappy
|
||||||
|
mingw-w64-i686-spice
|
||||||
mingw-w64-i686-usbredir
|
mingw-w64-i686-usbredir
|
||||||
mingw-w64-i686-zstd "
|
mingw-w64-i686-zstd "
|
||||||
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
|
- $env:CHERE_INVOKING = 'yes' # Preserve the current working directory
|
||||||
|
|
|
@ -3818,8 +3818,7 @@ W: https://cirrus-ci.com/github/qemu/qemu
|
||||||
Windows Hosted Continuous Integration
|
Windows Hosted Continuous Integration
|
||||||
M: Yonggang Luo <luoyonggang@gmail.com>
|
M: Yonggang Luo <luoyonggang@gmail.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: .cirrus.yml
|
F: .gitlab-ci.d/windows.yml
|
||||||
W: https://cirrus-ci.com/github/qemu/qemu
|
|
||||||
|
|
||||||
Guest Test Compilation Support
|
Guest Test Compilation Support
|
||||||
M: Alex Bennée <alex.bennee@linaro.org>
|
M: Alex Bennée <alex.bennee@linaro.org>
|
||||||
|
|
|
@ -206,15 +206,6 @@ be an effective use of its limited resources, and thus intends to discontinue
|
||||||
it. Since all recent x86 hardware from the past >10 years is capable of the
|
it. Since all recent x86 hardware from the past >10 years is capable of the
|
||||||
64-bit x86 extensions, a corresponding 64-bit OS should be used instead.
|
64-bit x86 extensions, a corresponding 64-bit OS should be used instead.
|
||||||
|
|
||||||
System emulation on 32-bit arm hosts (since 8.0)
|
|
||||||
''''''''''''''''''''''''''''''''''''''''''''''''
|
|
||||||
|
|
||||||
Since QEMU needs a strong host machine for running full system emulation, and
|
|
||||||
all recent powerful arm hosts support 64-bit, the QEMU project deprecates the
|
|
||||||
support for running any system emulation on 32-bit arm hosts in general. Use
|
|
||||||
64-bit arm hosts for system emulation instead. (Note: "user" mode emulation
|
|
||||||
continues to be supported on 32-bit arm hosts, too)
|
|
||||||
|
|
||||||
|
|
||||||
QEMU API (QAPI) events
|
QEMU API (QAPI) events
|
||||||
----------------------
|
----------------------
|
||||||
|
|
|
@ -412,11 +412,11 @@ static void onenand_command(OneNANDState *s)
|
||||||
sec = (s->addr[page] & 3) + \
|
sec = (s->addr[page] & 3) + \
|
||||||
((((s->addr[page] >> 2) & 0x3f) + \
|
((((s->addr[page] >> 2) & 0x3f) + \
|
||||||
(((s->addr[block] & 0xfff) | \
|
(((s->addr[block] & 0xfff) | \
|
||||||
(s->addr[block] >> 15 ? \
|
(s->addr[block] >> 15 ? s->density_mask : 0)) \
|
||||||
s->density_mask : 0)) << 6)) << (PAGE_SHIFT - 9));
|
<< 6)) \
|
||||||
|
<< (PAGE_SHIFT - 9));
|
||||||
#define SETBUF_M() \
|
#define SETBUF_M() \
|
||||||
buf = (s->bufaddr & 8) ? \
|
buf = (s->bufaddr & 8) ? s->data[(s->bufaddr >> 2) & 1][0] : s->boot[0]; \
|
||||||
s->data[(s->bufaddr >> 2) & 1][0] : s->boot[0]; \
|
|
||||||
buf += (s->bufaddr & 3) << 9;
|
buf += (s->bufaddr & 3) << 9;
|
||||||
#define SETBUF_S() \
|
#define SETBUF_S() \
|
||||||
buf = (s->bufaddr & 8) ? \
|
buf = (s->bufaddr & 8) ? \
|
||||||
|
|
|
@ -2622,7 +2622,7 @@ void helper_scv(CPUPPCState *env, uint32_t lev)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn)
|
void helper_pminsn(CPUPPCState *env, uint32_t insn)
|
||||||
{
|
{
|
||||||
CPUState *cs;
|
CPUState *cs;
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#define S390X_INTERNAL_H
|
#define S390X_INTERNAL_H
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
|
#include "fpu/softfloat.h"
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
typedef struct LowCore {
|
typedef struct LowCore {
|
||||||
|
@ -299,7 +300,7 @@ uint32_t set_cc_nz_f128(float128 v);
|
||||||
uint8_t s390_softfloat_exc_to_ieee(unsigned int exc);
|
uint8_t s390_softfloat_exc_to_ieee(unsigned int exc);
|
||||||
int s390_swap_bfp_rounding_mode(CPUS390XState *env, int m3);
|
int s390_swap_bfp_rounding_mode(CPUS390XState *env, int m3);
|
||||||
void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode);
|
void s390_restore_bfp_rounding_mode(CPUS390XState *env, int old_mode);
|
||||||
int float_comp_to_cc(CPUS390XState *env, int float_compare);
|
int float_comp_to_cc(CPUS390XState *env, FloatRelation float_compare);
|
||||||
|
|
||||||
#define DCMASK_ZERO 0x0c00
|
#define DCMASK_ZERO 0x0c00
|
||||||
#define DCMASK_NORMAL 0x0300
|
#define DCMASK_NORMAL 0x0300
|
||||||
|
|
|
@ -149,7 +149,7 @@ static void watch_remove(SpiceWatch *watch)
|
||||||
qemu_set_fd_handler(watch->fd, NULL, NULL, NULL);
|
qemu_set_fd_handler(watch->fd, NULL, NULL, NULL);
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
/* SOCKET is owned by spice */
|
/* SOCKET is owned by spice */
|
||||||
qemu_close_to_socket(watch->fd);
|
qemu_close_socket_osfhandle(watch->fd);
|
||||||
#endif
|
#endif
|
||||||
g_free(watch);
|
g_free(watch);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue