Various maintainer updates
- fixes for gdbstub regressions
- bunch of gitdm/mailmap updates
- module fixes for Travis
- docker fixes for shippable
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAl1s7JgACgkQ+9DbCVqe
KkTcWQf/YMEMRvYiY3H2xwMX4kLZalRB7e+QYu0cSOqnzzUw80FhPS2/GxwPu37v
OANtB07RXtxLolAD4Bvf4wpMfxWypHJM1jRgZSDpJmDLa1MQ8w4KS6G0+lbwo5n6
UYfCscPOzu7LdFzy5lFtdA0eVAmHRQlXR6tPNYFecXvd5PIZXuysVpH3w2M6LajX
fNft1kKZ0xeAarnt5oHH7yUWgqW49te9o501IYsqXHQJmbtpVNIlgZpOGh1bSjRC
P9hpL7dXJDIlu7pFszPUTZneKqaaxxupi45v4UfR28wdxSJg+WrY/nxmL5jRREmn
WUrNqiHdnQH7pUJCtGf8+Gp1G5p8Qw==
=xNoN
-----END PGP SIGNATURE-----
Merge remote-tracking branch 'remotes/stsquad/tags/pull-gdbstub-gitdm-testing-020919-1' into staging
Various maintainer updates
- fixes for gdbstub regressions
- bunch of gitdm/mailmap updates
- module fixes for Travis
- docker fixes for shippable
# gpg: Signature made Mon 02 Sep 2019 11:19:04 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-gdbstub-gitdm-testing-020919-1:
tests/docker: upgrade docker.py to python3
tests: fix modules-test with no default machine
build-sys: build ui-spice-app as a module
contrib/gitdm: Add RT-RK to the domain-map
.mailmap/aliases: add some further commentary
mailmap: Add many entries to improve 'git shortlog' statistics
mailmap: Update philmd email address
mailmap: Reorder by sections
contrib/gitdm: Add armbru@pond.sub.org to group-map-redhat
contrib/gitdm: filetype interface is not in order, fix
gdbstub: Fix handler for 'F' packet
gdbstub: Fix handling of '!' packet with new infra
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
d371479971
137
.mailmap
137
.mailmap
@ -1,23 +1,29 @@
|
||||
# This mailmap fixes up author names/addresses.
|
||||
#
|
||||
# If you are adding to this file consider if a similar change needs to
|
||||
# be made to contrib/gitdm/aliases. They are not however completely
|
||||
# analogous. .mailmap is concerned with fixing up damaged author
|
||||
# fields where as the gitdm equivalent is more concerned with making
|
||||
# sure multiple email addresses get mapped onto the same author.
|
||||
#
|
||||
# From man git-shortlog the forms are:
|
||||
#
|
||||
# Proper Name <commit@email.xx>
|
||||
# <proper@email.xx> <commit@email.xx>
|
||||
# Proper Name <proper@email.xx> <commit@email.xx>
|
||||
# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
|
||||
#
|
||||
|
||||
# The first section translates weird addresses from the original git import
|
||||
# into proper addresses so that they are counted properly by git shortlog.
|
||||
Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
|
||||
Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
|
||||
Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
|
||||
Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
|
||||
Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
|
||||
Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
|
||||
|
||||
@ -32,8 +38,123 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu
|
||||
Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
|
||||
Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
|
||||
|
||||
# Next, replace old addresses by a more recent one.
|
||||
Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
|
||||
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
|
||||
Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
|
||||
Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
|
||||
Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
|
||||
Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
|
||||
Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
|
||||
|
||||
# Also list preferred name forms where people have changed their
|
||||
# git author config, or had utf8/latin1 encoding issues.
|
||||
Aaron Lindsay <aaron@os.amperecomputing.com>
|
||||
Alexey Gerasimenko <x1917x@gmail.com>
|
||||
Alex Ivanov <void@aleksoft.net>
|
||||
Andreas Färber <afaerber@suse.de>
|
||||
Bandan Das <bsd@redhat.com>
|
||||
Benjamin MARSILI <mlspirat42@gmail.com>
|
||||
Benoît Canet <benoit.canet@gmail.com>
|
||||
Benoît Canet <benoit.canet@irqsave.net>
|
||||
Benoît Canet <benoit.canet@nodalink.com>
|
||||
Boqun Feng <boqun.feng@gmail.com>
|
||||
Boqun Feng <boqun.feng@intel.com>
|
||||
Brad Smith <brad@comstyle.com>
|
||||
Brijesh Singh <brijesh.singh@amd.com>
|
||||
Brilly Wu <brillywu@viatech.com.cn>
|
||||
Cédric Vincent <cedric.vincent@st.com>
|
||||
CheneyLin <linzc@zju.edu.cn>
|
||||
Chen Gang <chengang@emindsoft.com.cn>
|
||||
Chen Gang <gang.chen.5i5j@gmail.com>
|
||||
Chen Gang <gang.chen@sunrus.com.cn>
|
||||
Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
|
||||
Christophe Lyon <christophe.lyon@st.com>
|
||||
Collin L. Walling <walling@linux.ibm.com>
|
||||
Daniel P. Berrangé <berrange@redhat.com>
|
||||
Eduardo Otubo <otubo@redhat.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>
|
||||
Gautham R. Shenoy <ego@in.ibm.com>
|
||||
Gautham R. Shenoy <ego@linux.vnet.ibm.com>
|
||||
Gonglei (Arei) <arei.gonglei@huawei.com>
|
||||
Guang Wang <wang.guang55@zte.com.cn>
|
||||
Hailiang Zhang <zhang.zhanghailiang@huawei.com>
|
||||
Hervé Poussineau <hpoussin@reactos.org>
|
||||
Jakub Jermář <jakub@jermar.eu>
|
||||
Jakub Jermář <jakub.jermar@kernkonzept.com>
|
||||
Jean-Christophe Dubois <jcd@tribudubois.net>
|
||||
Jindřich Makovička <makovick@gmail.com>
|
||||
John Arbuckle <programmingkidx@gmail.com>
|
||||
Juha Riihimäki <juha.riihimaki@nokia.com>
|
||||
Juha Riihimäki <Juha.Riihimaki@nokia.com>
|
||||
Jun Li <junmuzi@gmail.com>
|
||||
Laurent Vivier <Laurent@lvivier.info>
|
||||
Leandro Lupori <leandro.lupori@gmail.com>
|
||||
Li Guang <lig.fnst@cn.fujitsu.com>
|
||||
Liming Wang <walimisdev@gmail.com>
|
||||
linzhecheng <linzc@zju.edu.cn>
|
||||
Liran Schour <lirans@il.ibm.com>
|
||||
Liu Yu <yu.liu@freescale.com>
|
||||
Liu Yu <Yu.Liu@freescale.com>
|
||||
Li Zhang <zhlcindy@gmail.com>
|
||||
Li Zhang <zhlcindy@linux.vnet.ibm.com>
|
||||
Lluís Vilanova <vilanova@ac.upc.edu>
|
||||
Lluís Vilanova <xscript@gmx.net>
|
||||
Longpeng (Mike) <longpeng2@huawei.com>
|
||||
Luc Michel <luc.michel@git.antfield.fr>
|
||||
Luc Michel <luc.michel@greensocs.com>
|
||||
Marc Marí <marc.mari.barcelo@gmail.com>
|
||||
Marc Marí <markmb@redhat.com>
|
||||
Michael Avdienko <whitearchey@gmail.com>
|
||||
Michael S. Tsirkin <mst@redhat.com>
|
||||
Munkyu Im <munkyu.im@samsung.com>
|
||||
Nicholas Bellinger <nab@linux-iscsi.org>
|
||||
Nicholas Thomas <nick@bytemark.co.uk>
|
||||
Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
|
||||
Orit Wasserman <owasserm@redhat.com>
|
||||
Paolo Bonzini <pbonzini@redhat.com>
|
||||
Pavel Dovgaluk <dovgaluk@ispras.ru>
|
||||
Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
|
||||
Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
|
||||
Peter Crosthwaite <crosthwaite.peter@gmail.com>
|
||||
Peter Crosthwaite <peter.crosthwaite@petalogix.com>
|
||||
Peter Crosthwaite <peter.crosthwaite@xilinx.com>
|
||||
Prasad J Pandit <pjp@fedoraproject.org>
|
||||
Prasad J Pandit <ppandit@redhat.com>
|
||||
Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
|
||||
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
|
||||
Remy Noel <remy.noel@blade-group.com>
|
||||
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>
|
||||
Takashi Yoshii <takasi-y@ops.dti.ne.jp>
|
||||
Thomas Huth <thuth@redhat.com>
|
||||
Thomas Knych <thomaswk@google.com>
|
||||
Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
|
||||
Tony Nguyen <tony.nguyen@bt.com>
|
||||
Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
|
||||
Vibi Sreenivasan <vibi_sreenivasan@cms.com>
|
||||
Vijaya Kumar K <vijayak@cavium.com>
|
||||
Vijaya Kumar K <Vijaya.Kumar@cavium.com>
|
||||
Vijay Kumar <vijaykumar@bravegnu.org>
|
||||
Vijay Kumar <vijaykumar@zilogic.com>
|
||||
Wang Guang <wang.guang55@zte.com.cn>
|
||||
Wenchao Xia <xiawenc@linux.vnet.ibm.com>
|
||||
Wenshuang Ma <kevinnma@tencent.com>
|
||||
Xiaoqiang Zhao <zxq_yx_007@163.com>
|
||||
Xinhua Cao <caoxinhua@huawei.com>
|
||||
Xiong Zhang <xiong.y.zhang@intel.com>
|
||||
Yin Yin <yin.yin@cs2c.com.cn>
|
||||
yuchenlin <npes87184@gmail.com>
|
||||
YunQiang Su <syq@debian.org>
|
||||
YunQiang Su <ysu@wavecomp.com>
|
||||
Yuri Pudgorodskiy <yur@virtuozzo.com>
|
||||
Zhengui Li <lizhengui@huawei.com>
|
||||
Zhenwei Pi <pizhenwei@bytedance.com>
|
||||
Zhenwei Pi <zhenwei.pi@youruncloud.com>
|
||||
Zhuang Yanying <ann.zhuangyanying@huawei.com>
|
||||
|
||||
@ -1,6 +1,22 @@
|
||||
#
|
||||
# This is the email aliases file, mapping secondary addresses
|
||||
# onto a single, canonical address. Duplicates some info from .mailmap
|
||||
# This is the email aliases file, mapping secondary addresses onto a
|
||||
# single, canonical address. It duplicates some info from .mailmap so
|
||||
# if you are adding something here also consider if the .mailmap needs
|
||||
# updating.
|
||||
#
|
||||
# If you just want to avoid gitdm complaining about author fields
|
||||
# which are actually email addresses with the message:
|
||||
#
|
||||
# "...is an author name, probably not what you want"
|
||||
#
|
||||
# you can just apply --use-mailmap to you git-log command, e.g:
|
||||
#
|
||||
# git log --use-mailmap --numstat --since "last 2 years" | $GITDM
|
||||
#
|
||||
# however that will have the effect of squashing multiple addresses to
|
||||
# a canonical address which will distort the stats of those who
|
||||
# contribute in both personal and professional capacities from
|
||||
# different addresses.
|
||||
#
|
||||
|
||||
# weird commits
|
||||
|
||||
@ -18,6 +18,7 @@ nokia.com Nokia
|
||||
oracle.com Oracle
|
||||
proxmox.com Proxmox
|
||||
redhat.com Red Hat
|
||||
rt-rk.com RT-RK
|
||||
siemens.com Siemens
|
||||
sifive.com SiFive
|
||||
suse.de SUSE
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
# If there is an filetype which is not in order but has values, it will
|
||||
# be added at the end.
|
||||
#
|
||||
order build,tests,code,documentation,devel-doc,blobs
|
||||
order build,interface,tests,code,documentation,devel-doc,blobs
|
||||
|
||||
#
|
||||
#
|
||||
|
||||
@ -2,7 +2,8 @@
|
||||
# Individual and personal contributors
|
||||
#
|
||||
# This is simply to allow prolific developers with no company
|
||||
# affiliations to be grouped together in the summary stats.
|
||||
# affiliations (or non-company related personal work) to be grouped
|
||||
# together in the summary stats.
|
||||
#
|
||||
|
||||
f4bug@amsat.org
|
||||
|
||||
@ -5,3 +5,4 @@
|
||||
david@gibson.dropbear.id.au
|
||||
laurent@vivier.eu
|
||||
pjp@fedoraproject.org
|
||||
armbru@pond.sub.org
|
||||
|
||||
12
gdbstub.c
12
gdbstub.c
@ -1820,11 +1820,15 @@ static void handle_read_all_regs(GdbCmdContext *gdb_ctx, void *user_ctx)
|
||||
|
||||
static void handle_file_io(GdbCmdContext *gdb_ctx, void *user_ctx)
|
||||
{
|
||||
if (gdb_ctx->num_params >= 2 && gdb_ctx->s->current_syscall_cb) {
|
||||
if (gdb_ctx->num_params >= 1 && gdb_ctx->s->current_syscall_cb) {
|
||||
target_ulong ret, err;
|
||||
|
||||
ret = (target_ulong)gdb_ctx->params[0].val_ull;
|
||||
err = (target_ulong)gdb_ctx->params[1].val_ull;
|
||||
if (gdb_ctx->num_params >= 2) {
|
||||
err = (target_ulong)gdb_ctx->params[1].val_ull;
|
||||
} else {
|
||||
err = 0;
|
||||
}
|
||||
gdb_ctx->s->current_syscall_cb(gdb_ctx->s->c_cpu, ret, err);
|
||||
gdb_ctx->s->current_syscall_cb = NULL;
|
||||
}
|
||||
@ -2588,7 +2592,9 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
|
||||
break;
|
||||
}
|
||||
|
||||
run_cmd_parser(s, line_buf, cmd_parser);
|
||||
if (cmd_parser) {
|
||||
run_cmd_parser(s, line_buf, cmd_parser);
|
||||
}
|
||||
|
||||
return RS_IDLE;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python2
|
||||
#!/usr/bin/env python3
|
||||
#
|
||||
# Docker controlling module
|
||||
#
|
||||
@ -11,7 +11,6 @@
|
||||
# or (at your option) any later version. See the COPYING file in
|
||||
# the top-level directory.
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
@ -25,10 +24,7 @@ import tempfile
|
||||
import re
|
||||
import signal
|
||||
from tarfile import TarFile, TarInfo
|
||||
try:
|
||||
from StringIO import StringIO
|
||||
except ImportError:
|
||||
from io import StringIO
|
||||
from io import StringIO
|
||||
from shutil import copy, rmtree
|
||||
from pwd import getpwuid
|
||||
from datetime import datetime, timedelta
|
||||
@ -62,11 +58,13 @@ USE_ENGINE = EngineEnum.AUTO
|
||||
|
||||
def _text_checksum(text):
|
||||
"""Calculate a digest string unique to the text content"""
|
||||
return hashlib.sha1(text).hexdigest()
|
||||
return hashlib.sha1(text.encode('utf-8')).hexdigest()
|
||||
|
||||
def _read_dockerfile(path):
|
||||
return open(path, 'rt', encoding='utf-8').read()
|
||||
|
||||
def _file_checksum(filename):
|
||||
return _text_checksum(open(filename, 'rb').read())
|
||||
return _text_checksum(_read_dockerfile(filename))
|
||||
|
||||
|
||||
def _guess_engine_command():
|
||||
@ -192,7 +190,7 @@ def _read_qemu_dockerfile(img_name):
|
||||
|
||||
df = os.path.join(os.path.dirname(__file__), "dockerfiles",
|
||||
img_name + ".docker")
|
||||
return open(df, "r").read()
|
||||
return _read_dockerfile(df)
|
||||
|
||||
|
||||
def _dockerfile_preprocess(df):
|
||||
@ -262,6 +260,7 @@ class Docker(object):
|
||||
def _output(self, cmd, **kwargs):
|
||||
return subprocess.check_output(self._command + cmd,
|
||||
stderr=subprocess.STDOUT,
|
||||
encoding='utf-8',
|
||||
**kwargs)
|
||||
|
||||
def inspect_tag(self, tag):
|
||||
@ -283,7 +282,9 @@ class Docker(object):
|
||||
if argv is None:
|
||||
argv = []
|
||||
|
||||
tmp_df = tempfile.NamedTemporaryFile(dir=docker_dir, suffix=".docker")
|
||||
tmp_df = tempfile.NamedTemporaryFile(mode="w+t",
|
||||
encoding='utf-8',
|
||||
dir=docker_dir, suffix=".docker")
|
||||
tmp_df.write(dockerfile)
|
||||
|
||||
if user:
|
||||
@ -396,7 +397,7 @@ class BuildCommand(SubCommand):
|
||||
help="Dockerfile name")
|
||||
|
||||
def run(self, args, argv):
|
||||
dockerfile = open(args.dockerfile, "rb").read()
|
||||
dockerfile = _read_dockerfile(args.dockerfile)
|
||||
tag = args.tag
|
||||
|
||||
dkr = Docker()
|
||||
@ -442,7 +443,7 @@ class BuildCommand(SubCommand):
|
||||
cksum += [(filename, _file_checksum(filename))]
|
||||
|
||||
argv += ["--build-arg=" + k.lower() + "=" + v
|
||||
for k, v in os.environ.iteritems()
|
||||
for k, v in os.environ.items()
|
||||
if k.lower() in FILTERED_ENV_NAMES]
|
||||
dkr.build_image(tag, docker_dir, dockerfile,
|
||||
quiet=args.quiet, user=args.user, argv=argv,
|
||||
@ -611,7 +612,7 @@ class CheckCommand(SubCommand):
|
||||
print("Need a dockerfile for tag:%s" % (tag))
|
||||
return 1
|
||||
|
||||
dockerfile = open(args.dockerfile, "rb").read()
|
||||
dockerfile = _read_dockerfile(args.dockerfile)
|
||||
|
||||
if dkr.image_matches_dockerfile(tag, dockerfile):
|
||||
if not args.quiet:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user