* [PULL 1/8] Adding ani's email as an individual contributor
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 2/8] contrib/gitdm: Add more individual contributors Alex Bennée
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell
Cc: Ani Sinha, Alex Bennée, qemu-devel,
Philippe Mathieu-Daudé
From: Ani Sinha <ani@anisinha.ca>
Ani is an individual contributor into qemu project. Adding my email into the
correct file to reflect so.
Signed-off-by: Ani Sinha <ani@anisinha.ca>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201007161940.1478-1-ani@anisinha.ca>
Message-Id: <20201021163136.27324-2-alex.bennee@linaro.org>
diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index 641169fa63..d135f4b143 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -23,3 +23,4 @@ vr_qemu@t-online.de
nieklinnenbank@gmail.com
devnexen@gmail.com
pauldzim@gmail.com
+ani@anisinha.ca
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 2/8] contrib/gitdm: Add more individual contributors
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
2020-10-27 9:59 ` [PULL 1/8] Adding ani's email as an individual contributor Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 3/8] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 Alex Bennée
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell
Cc: Thomas Huth, James Hogan, qemu-devel, Subbaraya Sundeep,
Michael Rolnik, Alex Bennée, Artyom Tarasenko,
Philippe Mathieu-Daudé
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Subbaraya Sundeep <sundeep.lkml@gmail.com>
Acked-by: Michael Rolnik <mrolnik@gmail.com>
Acked-by: Thomas Huth <huth@tuxfamily.org>
Acked-by: James Hogan <jhogan@kernel.org>
Acked-by: Artyom Tarasenko <atar4qemu@gmail.com>
Message-id: <20201004182506.2038515-1-f4bug@amsat.org>
Message-Id: <20201021163136.27324-3-alex.bennee@linaro.org>
diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index d135f4b143..36bbb77c39 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -24,3 +24,8 @@ nieklinnenbank@gmail.com
devnexen@gmail.com
pauldzim@gmail.com
ani@anisinha.ca
+sundeep.lkml@gmail.com
+mrolnik@gmail.com
+huth@tuxfamily.org
+jhogan@kernel.org
+atar4qemu@gmail.com
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 3/8] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
2020-10-27 9:59 ` [PULL 1/8] Adding ani's email as an individual contributor Alex Bennée
2020-10-27 9:59 ` [PULL 2/8] contrib/gitdm: Add more individual contributors Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch Alex Bennée
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell
Cc: Fam Zheng, Thomas Huth, Daniel P . Berrangé,
Alex Bennée, qemu-devel, Philippe Mathieu-Daudé
From: Thomas Huth <thuth@redhat.com>
We do not support SDL1 in QEMU anymore. Use SDL2 instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201021072308.9224-1-thuth@redhat.com>
Message-Id: <20201021163136.27324-4-alex.bennee@linaro.org>
diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker
index 8b273725ee..6f11af1989 100644
--- a/tests/docker/dockerfiles/centos7.docker
+++ b/tests/docker/dockerfiles/centos7.docker
@@ -31,7 +31,7 @@ ENV PACKAGES \
perl-Test-Harness \
pixman-devel \
python3 \
- SDL-devel \
+ SDL2-devel \
spice-glib-devel \
spice-server-devel \
tar \
diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index a589142114..54bc6d54cd 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -2,7 +2,7 @@ FROM centos:8.1.1911
RUN dnf -y update
ENV PACKAGES \
- SDL-devel \
+ SDL2-devel \
bzip2 \
bzip2-devel \
dbus-daemon \
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
` (2 preceding siblings ...)
2020-10-27 9:59 ` [PULL 3/8] tests/docker/dockerfiles/centos: Use SDL2 instead of SDL1 Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 5/8] scripts: fix error from checkpatch.pl when no commits are found Alex Bennée
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell
Cc: Thomas Huth, Daniel P. Berrangé, Philippe Mathieu-Daudé,
qemu-devel, Wainer dos Santos Moschetta, Alex Bennée
From: Daniel P. Berrangé <berrange@redhat.com>
If the current branch is synced to the current upstream git master,
there are no commits that need checking. This causes checkpatch.pl
to print an error that it found no commits. We need to avoid calling
checkpatch.pl in this case.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201019143537.283094-2-berrange@redhat.com>
Message-Id: <20201021163136.27324-5-alex.bennee@linaro.org>
diff --git a/.gitlab-ci.d/check-patch.py b/.gitlab-ci.d/check-patch.py
index 5a14a25b13..0ff30ee077 100755
--- a/.gitlab-ci.d/check-patch.py
+++ b/.gitlab-ci.d/check-patch.py
@@ -33,8 +33,16 @@ ancestor = subprocess.check_output(["git", "merge-base",
ancestor = ancestor.strip()
+log = subprocess.check_output(["git", "log", "--format=%H %s",
+ ancestor + "..."],
+ universal_newlines=True)
+
subprocess.check_call(["git", "remote", "rm", "check-patch"])
+if log == "":
+ print("\nNo commits since %s, skipping checks\n" % ancestor)
+ sys.exit(0)
+
errors = False
print("\nChecking all commits since %s...\n" % ancestor)
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 5/8] scripts: fix error from checkpatch.pl when no commits are found
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
` (3 preceding siblings ...)
2020-10-27 9:59 ` [PULL 4/8] gitlab: skip checkpatch.pl checks if no commit delta on branch Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 6/8] tests/acceptance: pick a random gdb port for reverse debugging Alex Bennée
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell; +Cc: Alex Bennée, Daniel P. Berrangé, qemu-devel
From: Daniel P. Berrangé <berrange@redhat.com>
The error message was supposed to mention the input revision list start
point, not the branch flag.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201019143537.283094-3-berrange@redhat.com>
Message-Id: <20201021163136.27324-6-alex.bennee@linaro.org>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 6ed34970f9..88c858f67c 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -392,7 +392,7 @@ if ($chk_branch) {
close $HASH;
- die "$P: no revisions returned for revlist '$chk_branch'\n"
+ die "$P: no revisions returned for revlist '$ARGV[0]'\n"
unless @patches;
my $i = 1;
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 6/8] tests/acceptance: pick a random gdb port for reverse debugging
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
` (4 preceding siblings ...)
2020-10-27 9:59 ` [PULL 5/8] scripts: fix error from checkpatch.pl when no commits are found Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 7/8] gitlab-ci: Clone from GitLab itself Alex Bennée
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell
Cc: Thomas Huth, Pavel Dovgalyuk, Philippe Mathieu-Daudé,
qemu-devel, Wainer dos Santos Moschetta,
Philippe Mathieu-Daudé, Pavel Dovgalyuk, Cleber Rosa,
Paolo Bonzini, Alex Bennée
Currently the test randomly fails if you are using a shared machine
due to contention on the well known port 1234. We can ameliorate this
a bit by picking a random non-ephemeral port although it doesn't
totally avoid the problem. While we could use a totally unique socket
address for debugging it is fiddly to probe for gdb support. While gdb
socket debugging is not yet ubiquitous this a sub-optimal but workable
option.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20201021163136.27324-7-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/tests/acceptance/reverse_debugging.py b/tests/acceptance/reverse_debugging.py
index b72fdf6cdc..be01aca217 100644
--- a/tests/acceptance/reverse_debugging.py
+++ b/tests/acceptance/reverse_debugging.py
@@ -14,6 +14,7 @@ from avocado import skipIf
from avocado_qemu import BUILD_DIR
from avocado.utils import gdb
from avocado.utils import process
+from avocado.utils.network.ports import find_free_port
from avocado.utils.path import find_command
from boot_linux_console import LinuxKernelTest
@@ -33,7 +34,7 @@ class ReverseDebugging(LinuxKernelTest):
STEPS = 10
endian_is_le = True
- def run_vm(self, record, shift, args, replay_path, image_path):
+ def run_vm(self, record, shift, args, replay_path, image_path, port):
logger = logging.getLogger('replay')
vm = self.get_vm()
vm.set_console()
@@ -43,7 +44,7 @@ class ReverseDebugging(LinuxKernelTest):
else:
logger.info('replaying the execution...')
mode = 'replay'
- vm.add_args('-s', '-S')
+ vm.add_args('-gdb', 'tcp::%d' % port, '-S')
vm.add_args('-icount', 'shift=%s,rr=%s,rrfile=%s,rrsnapshot=init' %
(shift, mode, replay_path),
'-net', 'none')
@@ -109,9 +110,10 @@ class ReverseDebugging(LinuxKernelTest):
process.run(cmd)
replay_path = os.path.join(self.workdir, 'replay.bin')
+ port = find_free_port()
# record the log
- vm = self.run_vm(True, shift, args, replay_path, image_path)
+ vm = self.run_vm(True, shift, args, replay_path, image_path, port)
while self.vm_get_icount(vm) <= self.STEPS:
pass
last_icount = self.vm_get_icount(vm)
@@ -120,9 +122,9 @@ class ReverseDebugging(LinuxKernelTest):
logger.info("recorded log with %s+ steps" % last_icount)
# replay and run debug commands
- vm = self.run_vm(False, shift, args, replay_path, image_path)
+ vm = self.run_vm(False, shift, args, replay_path, image_path, port)
logger.info('connecting to gdbstub')
- g = gdb.GDBRemote('127.0.0.1', 1234, False, False)
+ g = gdb.GDBRemote('127.0.0.1', port, False, False)
g.connect()
r = g.cmd(b'qSupported')
if b'qXfer:features:read+' in r:
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 7/8] gitlab-ci: Clone from GitLab itself
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
` (5 preceding siblings ...)
2020-10-27 9:59 ` [PULL 6/8] tests/acceptance: pick a random gdb port for reverse debugging Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-27 9:59 ` [PULL 8/8] makefile: handle -n / -k / -q correctly Alex Bennée
2020-10-29 10:03 ` [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell
Cc: Thomas Huth, Philippe Mathieu-Daudé, qemu-devel,
Wainer dos Santos Moschetta, Paolo Bonzini, Alex Bennée
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Let GitLab runners use GitLab repository directly.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20201022123302.2884788-1-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d6773efd2..3b15ae5c30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ include:
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
before_script:
- JOBS=$(expr $(nproc) + 1)
+ - sed -i s,git.qemu.org/git,gitlab.com/qemu-project, .gitmodules
script:
- mkdir build
- cd build
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PULL 8/8] makefile: handle -n / -k / -q correctly
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
` (6 preceding siblings ...)
2020-10-27 9:59 ` [PULL 7/8] gitlab-ci: Clone from GitLab itself Alex Bennée
@ 2020-10-27 9:59 ` Alex Bennée
2020-10-29 10:03 ` [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Alex Bennée @ 2020-10-27 9:59 UTC (permalink / raw)
To: peter.maydell; +Cc: Paolo Bonzini, Alex Bennée, qemu-devel
From: Paolo Bonzini <pbonzini@redhat.com>
Use $(findstring) instead of $(filter) to detect -n/-k
as different versions of MAKE fill in $(MAKEFLAGS) differently.
Do not bother running ninja at all if -nq is passed.
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20201026155854.3074290-1-pbonzini@redhat.com>
diff --git a/Makefile b/Makefile
index 4d1fa8bb3d..e7c1000f5c 100644
--- a/Makefile
+++ b/Makefile
@@ -146,9 +146,12 @@ endif
# 4. Rules to bridge to other makefiles
ifneq ($(NINJA),)
-NINJAFLAGS = $(if $V,-v,) \
+MAKE.n = $(findstring n,$(firstword $(MAKEFLAGS)))
+MAKE.k = $(findstring k,$(firstword $(MAKEFLAGS)))
+MAKE.q = $(findstring q,$(firstword $(MAKEFLAGS)))
+MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
+NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
$(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
- $(subst -k, -k0, $(filter -n -k,$(MAKEFLAGS)))
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
ninja-cmd-goals += $(foreach t, $(.tests), $(.test.deps.$t))
@@ -165,7 +168,8 @@ $(ninja-targets): run-ninja
# --output-sync line.
run-ninja: config-host.mak
ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),)
- +@$(NINJA) $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat
+ +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) \
+ $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat)
endif
endif
--
2.20.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PULL 0/8] testing and misc (gitdm, gitlab, docker, make)
2020-10-27 9:59 [PULL 0/8] testing and misc (gitdm, gitlab, docker, make) Alex Bennée
` (7 preceding siblings ...)
2020-10-27 9:59 ` [PULL 8/8] makefile: handle -n / -k / -q correctly Alex Bennée
@ 2020-10-29 10:03 ` Peter Maydell
8 siblings, 0 replies; 10+ messages in thread
From: Peter Maydell @ 2020-10-29 10:03 UTC (permalink / raw)
To: Alex Bennée; +Cc: QEMU Developers
On Tue, 27 Oct 2020 at 09:59, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 1dc887329a10903940501b43e8c0cc67af7c06d5:
>
> Merge remote-tracking branch 'remotes/philmd-gitlab/tags/sd-next-20201026' into staging (2020-10-26 17:19:26 +0000)
>
> are available in the Git repository at:
>
> https://github.com/stsquad/qemu.git tags/pull-testing-and-misc-271020-1
>
> for you to fetch changes up to c8e6cfba1291df2202bf406bb5137c9d365505d1:
>
> makefile: handle -n / -k / -q correctly (2020-10-27 09:53:51 +0000)
>
> ----------------------------------------------------------------
> Testing and gitdm updates
>
> - add some more individual contributors
> - include SDL2 in centos images
> - skip checkpatch check when no commits found
> - use random port for gdb reverse debugging
> - make gitlab use it's own mirrors to clone
> - fix detection of make -nqp
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 10+ messages in thread