mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Testing, gitdm and plugin fixes:

Browse Source 
- fix acceptance regressions in MIPS and IDE
   - speed up cirrus msys2/mingw builds
   - add genisoimage to more docker images
   - slew of gitdb updates
   - fix some windows compile issues for plugins
   - add V=1 to cirrus output
   - disable rxsim in gitlab CI
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAl+AkCUACgkQ+9DbCVqe
 KkSYaQf/YnnAjygh01oUkxaXfCYuEojjYxzAPp5ZlKoejEVBh5j+Yqht5Xxsgm3V
 ODTp/VW9TKvniaaXnPcFj5msparB2fZ2qlCP9hrQQ4YiSHkoPqVjMBC1w8o/GQjq
 Divhj6ui6/C0N97KbjslgZqJXkYw9dcl1ATCo1+sNwmBzXhzOmcYqOeJCdlcAja2
 71R3R2HNSflDICk42NfGN47LcG0flhRAnDZR4FbE8xorVoqquukVVxNEJgOk5VPn
 KOSc7ieAbR+7n552r1LeVuR/QaIaqPplTIrqDVFTjhjwOwmObhwqVUlMlhtKZx5O
 tQ54PtSIyWdXY7Am2VUWace6SHGfOg==
 =ORpZ
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/stsquad/tags/pull-various-091020-1' into staging

Testing, gitdm and plugin fixes:

  - fix acceptance regressions in MIPS and IDE
  - speed up cirrus msys2/mingw builds
  - add genisoimage to more docker images
  - slew of gitdb updates
  - fix some windows compile issues for plugins
  - add V=1 to cirrus output
  - disable rxsim in gitlab CI

# gpg: Signature made Fri 09 Oct 2020 17:30:29 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-various-091020-1: (22 commits)
  tests/acceptance: disable machine_rx_gdbsim on GitLab
  cirrus: use V=1 when running tests on FreeBSD and macOS
  plugin: Fixes compiling errors on msys2/mingw
  plugins: Fixes a issue when dlsym failed, the handle not closed
  .mailmap: Fix more contributor entries
  contrib/gitdm: Add Yandex to the domain map
  contrib/gitdm: Add Yadro to the domain map
  contrib/gitdm: Add SUSE to the domain map
  contrib/gitdm: Add Nir Soffer to Red Hat domain
  contrib/gitdm: Add Qualcomm to the domain map
  contrib/gitdm: Add Nuvia to the domain map
  contrib/gitdm: Add Google to the domain map
  contrib/gitdm: Add ByteDance to the domain map
  contrib/gitdm: Add Baidu to the domain map
  contrib/gitdm: Add more individual contributors
  contrib/gitdm: Add more academic domains
  tests/docker: Add genisoimage to the docker file
  cirrus: msys2/mingw speed is up, add excluded target back
  cirrus: Fixing and speedup the msys2/mingw CI
  hw/ide: restore replay support of IDE
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2020-10-11 14:34:07 +01:00
commit 48a340d9b2
17 changed files with 107 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
.cirrus.yml
View File

@ -15,7 +15,7 @@ freebsd_12_task:
- cd build
- ../configure --enable-werror || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake -j$(sysctl -n hw.ncpu) check
- gmake -j$(sysctl -n hw.ncpu) check V=1
macos_task:
osx_instance:
@ -29,7 +29,7 @@ macos_task:
--extra-cflags='-Wno-error=deprecated-declarations'
|| { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake check
- gmake check V=1
macos_xcode_task:
osx_instance:
@ -43,67 +43,88 @@ macos_xcode_task:
- ../configure --extra-cflags='-Wno-error=deprecated-declarations'
--enable-werror --cc=clang || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
- gmake check
- gmake check V=1
windows_msys2_task:
timeout_in: 90m
windows_container:
image: cirrusci/windowsservercore:cmake
image: cirrusci/windowsservercore:2019
os_version: 2019
cpu: 8
memory: 8G
env:
CIRRUS_SHELL: powershell
MSYS: winsymlinks:nativestrict
MSYSTEM: MINGW64
CHERE_INVOKING: 1
printenv_script:
- C:\tools\msys64\usr\bin\bash.exe -lc 'printenv'
setup_script:
- choco install -y --no-progress 7zip
- Write-Output $env:PATH
msys2_cache:
folder: C:\tools\archive
reupload_on_changes: false
fingerprint_script: cat .cirrus.yml
populate_script:
- |
md C:\tools
md C:\tools\archive
$start_time = Get-Date
cd C:\tools
bitsadmin /transfer msys_download /dynamic /download /priority FOREGROUND https://github.com/msys2/msys2-installer/releases/download/2020-09-03/msys2-base-x86_64-20200903.sfx.exe C:\tools\base.exe
Write-Output "Download time taken: $((Get-Date).Subtract($start_time).Seconds) second(s)"
C:\tools\base.exe -y
((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\bash.exe -lc "grep -rl 'repo.msys2.org/' /etc/pacman.d/mirrorlist.* | xargs sed -i 's/repo.msys2.org\//mirrors.tuna.tsinghua.edu.cn\/msys2\//g'"
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 -Suu --overwrite=*"
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 \
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-libxml2 \
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 \
"
C:\tools\msys64\usr\bin\bash.exe -lc "rm -rf /var/cache/pacman/pkg/*"
cd C:\tools\msys64
echo "Start archive"
cmd /C "7z a -ttar . -so | 7z a -txz -simsys2-x86_64.tar C:\tools\archive\msys2-x86_64.tar.xz"
install_script:
- C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools &&
curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools &&
curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools &&
pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Sy"
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed
bash pacman pacman-mirrors msys2-runtime"
- taskkill /F /IM gpg-agent.exe
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Su"
- C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed
base-devel
git
mingw-w64-x86_64-python
mingw-w64-x86_64-python-setuptools
mingw-w64-x86_64-toolchain
mingw-w64-x86_64-capstone
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-make
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-libxml2
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-zstd"
- |
cd C:\tools
cmd /C "7z x C:\tools\archive\msys2-x86_64.tar.xz -so | 7z x -aoa -simsys2-x86_64.tar -ttar -omsys64"
C:\tools\msys64\usr\bin\bash.exe -lc "export"
script:
- C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure
--python=python3 --ninja=ninja
--target-list-exclude=i386-softmmu,arm-softmmu,ppc-softmmu,mips-softmmu"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j$NUMBER_OF_PROCESSORS"
--python=python3 --ninja=ninja"
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8"
test_script:
- C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"

2
.mailmap
View File

@ -85,6 +85,7 @@ Christophe Lyon <christophe.lyon@st.com>
Collin L. Walling <walling@linux.ibm.com>
Daniel P. Berrangé <berrange@redhat.com>
Eduardo Otubo <otubo@redhat.com>
Erik Smit <erik.lucas.smit@gmail.com>
Fabrice Desclaux <fabrice.desclaux@cea.fr>
Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
@ -142,6 +143,7 @@ Roger Pau Monné <roger.pau@citrix.com>
Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Sochin Jiang <sochin.jiang@huawei.com>
Stefan Berger <stefanb@linux.vnet.ibm.com> <stefanb@linux.ibm.com>
Takashi Yoshii <takasi-y@ops.dti.ne.jp>
Thomas Huth <thuth@redhat.com>
Thomas Knych <thomaswk@google.com>

1
configure vendored
View File

@ -7209,6 +7209,7 @@ NINJA=${ninja:-$PWD/ninjatool} $meson setup \
-Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \
-Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
-Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
-Db_staticpic=$(if test "$pie" = yes; then echo true; else echo false; fi) \
-Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
-Dmalloc=$malloc -Dmalloc_trim=$malloc_trim -Dsparse=$sparse \
-Dkvm=$kvm -Dhax=$hax -Dwhpx=$whpx -Dhvf=$hvf \

10
contrib/gitdm/domain-map
View File

@ -5,10 +5,13 @@
#
amd.com AMD
baidu.com Baidu
bytedance.com ByteDance
cmss.chinamobile.com China Mobile
citrix.com Citrix
greensocs.com GreenSocs
fujitsu.com Fujitsu
google.com Google
greensocs.com GreenSocs
huawei.com Huawei
ibm.com IBM
igalia.com Igalia
@ -16,13 +19,18 @@ intel.com Intel
linaro.org Linaro
microsoft.com Microsoft
nokia.com Nokia
nuviainc.com NUVIA
oracle.com Oracle
proxmox.com Proxmox
quicinc.com Qualcomm Innovation Center
redhat.com Red Hat
rt-rk.com RT-RK
siemens.com Siemens
sifive.com SiFive
suse.com SUSE
suse.de SUSE
virtuozzo.com Virtuozzo
wdc.com Western Digital
xilinx.com Xilinx
yadro.com YADRO
yandex-team.ru Yandex

4
contrib/gitdm/group-map-academics
View File

@ -12,3 +12,7 @@ ispras.ru
# Columbia University
cs.columbia.edu
cota@braap.org
uni-paderborn.de
edu
edu.cn

7
contrib/gitdm/group-map-individuals
View File

@ -16,3 +16,10 @@ aurelien@aurel32.net
balaton@eik.bme.hu
e.emanuelegiuseppe@gmail.com
andrew.smirnov@gmail.com
sw@weilnetz.de
deller@gmx.de
fthain@telegraphics.com.au
vr_qemu@t-online.de
nieklinnenbank@gmail.com
devnexen@gmail.com
pauldzim@gmail.com

1
contrib/gitdm/group-map-redhat
View File

@ -6,3 +6,4 @@ david@gibson.dropbear.id.au
laurent@vivier.eu
pjp@fedoraproject.org
armbru@pond.sub.org
nirsof@gmail.com

2
contrib/plugins/hotblocks.c
View File

@ -102,7 +102,7 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{
ExecCount *cnt;
uint64_t pc = qemu_plugin_tb_vaddr(tb);
unsigned long insns = qemu_plugin_tb_n_insns(tb);
size_t insns = qemu_plugin_tb_n_insns(tb);
uint64_t hash = pc ^ insns;
g_mutex_lock(&lock);

4
hw/ide/core.c
View File

@ -2289,8 +2289,8 @@ void ide_ctrl_write(void *opaque, uint32_t addr, uint32_t val)
s = &bus->ifs[i];
s->status |= BUSY_STAT;
}
aio_bh_schedule_oneshot(qemu_get_aio_context(),
ide_bus_perform_srst, bus);
replay_bh_schedule_oneshot_event(qemu_get_aio_context(),
ide_bus_perform_srst, bus);
}
bus->cmd = val;

1
hw/misc/mips_cpc.c
View File

@ -38,6 +38,7 @@ static void mips_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
MIPSCPCState *cpc = (MIPSCPCState *) data.host_ptr;
cpu_reset(cs);
cs->halted = 0;
cpc->vp_running |= 1ULL << cs->cpu_index;
}

1
plugins/loader.c
View File

@ -235,6 +235,7 @@ static int plugin_load(struct qemu_plugin_desc *desc, const qemu_info_t *info)
return rc;
err_symbol:
g_module_close(ctx->handle);
err_dlopen:
qemu_vfree(ctx);
return 1;

1
tests/acceptance/machine_rx_gdbsim.py
View File

@ -22,6 +22,7 @@ class RxGdbSimMachine(Test):
timeout = 30
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_uboot(self):
"""
U-Boot and checks that the console is operational.

1
tests/docker/dockerfiles/centos8.docker
View File

@ -8,6 +8,7 @@ ENV PACKAGES \
dbus-daemon \
gcc \
gcc-c++ \
genisoimage \
gettext \
git \
glib2-devel \

1
tests/docker/dockerfiles/debian-amd64.docker
View File

@ -14,6 +14,7 @@ RUN apt update && \
RUN apt update && \
DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
genisoimage \
libbz2-dev \
liblzo2-dev \
libgcrypt20-dev \

1
tests/docker/dockerfiles/fedora.docker
View File

@ -15,6 +15,7 @@ ENV PACKAGES \
findutils \
gcc \
gcc-c++ \
genisoimage \
gettext \
git \
glib2-devel \

1
tests/docker/dockerfiles/ubuntu2004.docker
View File

@ -3,6 +3,7 @@ ENV PACKAGES flex bison \
ccache \
clang-10\
gcc \
genisoimage \
gettext \
git \
glusterfs-common \

4
tests/plugin/bb.c
View File

@ -72,7 +72,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
CPUCount *count = max_cpus ?
g_ptr_array_index(counts, cpu_index) : &inline_count;
unsigned long n_insns = (unsigned long)udata;
uintptr_t n_insns = (uintptr_t)udata;
g_mutex_lock(&count->lock);
count->insn_count += n_insns;
count->bb_count++;
@ -81,7 +81,7 @@ static void vcpu_tb_exec(unsigned int cpu_index, void *udata)
static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb)
{
unsigned long n_insns = qemu_plugin_tb_n_insns(tb);
size_t n_insns = qemu_plugin_tb_n_insns(tb);
if (do_inline) {
qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64,