mirror of https://github.com/xemu-project/xemu.git
Trivial branch patches pull request 20211109
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmGKO2QSHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L7489PQP/ix3YftSzh4pBG2fRvRGg9RUDAAhCeWX xarkWqLTr47LB45IEXXzxR/LkzaNHaK167AJ3Z8W+bhZD9Rp/Zj2XProtrMhWn/B jOgYiwhGrPohphLhZziz2PkPA7yNZNyAvon3a632B2Wif4OInSghy6K1vyXbxzoT C2tECAeLpdc5kwtlSib5NW8dSd0g60aw0QzwKxgNIoKNYuhAUWqGTuO7BZqEvKmf xD2Ug5Ywhjb5c3MuZ3G5oPmDqQNHrSafkailJ5+61TPgSVJ3C6kRlt6kJPKHBzAs YlQDvtu7AXx6qV84xqlhc0zaZziq3qd1brHj+WGL5olNXvR3ni3DZ9nVS9OQOO3D Ak00EZWSVk3O/NuJlxstQc/heANEtAw6qB0HUJkBDzsP1I1FkwtLsK3i6ErTad5L 7K8qR/hOBLwZG2lVgvDWCGKzKyAVjG1D7cc6CbgzjS119u6OlLfuOPZOgnrpckp2 Qei8eEgcyNYSUyznF/zSmIvZwSvtKiP/e2aBb8iyt7qxcqtFmnou/QaWjC+gaOT+ wABsv0FVA1QrrzmWa99dA6d8/Nrh36aMJUxsU+rbOr6MUbDYaAX1a4RuWjweZoWX 473W/J32rGzSaVKiq2Qb2jI2WZfLEaYecn1pY+kglV6WI8nPLMJpVzrtuv+xfsdH qdR9VY4QnRqS =H9Q9 -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/vivier/tags/trivial-branch-for-6.2-pull-request' into staging Trivial branch patches pull request 20211109 # gpg: Signature made Tue 09 Nov 2021 10:12:04 AM CET # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] * remotes/vivier/tags/trivial-branch-for-6.2-pull-request: docs/about/deprecated: Remove empty 'related binaries' section tests/qtest/virtio-net: fix hotplug test case meson: Fix 'interpretor' typo .mailmap: Fix more contributor entries hw/m68k: Fix typo in SPDX tag hmp: Add shortcut to stop command to match cont Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
commit
21cc2bda7f
4
.mailmap
4
.mailmap
|
@ -69,6 +69,7 @@ Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
|
|||
# git author config, or had utf8/latin1 encoding issues.
|
||||
Aaron Lindsay <aaron@os.amperecomputing.com>
|
||||
Alexey Gerasimenko <x1917x@gmail.com>
|
||||
Alex Chen <alex.chen@huawei.com>
|
||||
Alex Ivanov <void@aleksoft.net>
|
||||
Andreas Färber <afaerber@suse.de>
|
||||
Bandan Das <bsd@redhat.com>
|
||||
|
@ -99,9 +100,11 @@ 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>
|
||||
Haibin Zhang <haibinzhang@tencent.com>
|
||||
Hailiang Zhang <zhang.zhanghailiang@huawei.com>
|
||||
Hanna Reitz <hreitz@redhat.com> <mreitz@redhat.com>
|
||||
Hervé Poussineau <hpoussin@reactos.org>
|
||||
Hyman Huang <huangy81@chinatelecom.cn>
|
||||
Jakub Jermář <jakub@jermar.eu>
|
||||
Jakub Jermář <jakub.jermar@kernkonzept.com>
|
||||
Jean-Christophe Dubois <jcd@tribudubois.net>
|
||||
|
@ -135,6 +138,7 @@ Nicholas Thomas <nick@bytemark.co.uk>
|
|||
Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
|
||||
Orit Wasserman <owasserm@redhat.com>
|
||||
Paolo Bonzini <pbonzini@redhat.com>
|
||||
Pan Nengyuan <pannengyuan@huawei.com>
|
||||
Pavel Dovgaluk <dovgaluk@ispras.ru>
|
||||
Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
|
||||
Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
|
||||
|
|
|
@ -370,9 +370,6 @@ The ``I7200`` guest CPU relies on the nanoMIPS ISA, which is deprecated
|
|||
(the ISA has never been upstreamed to a compiler toolchain). Therefore
|
||||
this CPU is also deprecated.
|
||||
|
||||
Related binaries
|
||||
----------------
|
||||
|
||||
Backwards compatibility
|
||||
-----------------------
|
||||
|
||||
|
|
|
@ -382,7 +382,7 @@ SRST
|
|||
ERST
|
||||
|
||||
{
|
||||
.name = "stop",
|
||||
.name = "stop|s",
|
||||
.args_type = "",
|
||||
.params = "",
|
||||
.help = "stop emulation",
|
||||
|
@ -390,7 +390,7 @@ ERST
|
|||
},
|
||||
|
||||
SRST
|
||||
``stop``
|
||||
``stop`` or ``s``
|
||||
Stop emulation.
|
||||
ERST
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Goldfish TTY
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Goldfish PIC
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* QEMU Motorola 680x0 IRQ Controller
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* QEMU Vitual M68K Machine
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Virt system Controller
|
||||
*/
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Goldfish TTY
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Goldfish PIC
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* QEMU Motorola 680x0 IRQ Controller
|
||||
*
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* SPDX-License-Identifer: GPL-2.0-or-later
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* Virt system Controller
|
||||
*/
|
||||
|
|
|
@ -340,7 +340,7 @@ if not get_option('tcg').disabled()
|
|||
error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu))
|
||||
endif
|
||||
elif get_option('tcg_interpreter')
|
||||
warning('Use of the TCG interpretor is not recommended on this host')
|
||||
warning('Use of the TCG interpreter is not recommended on this host')
|
||||
warning('architecture. There is a native TCG execution backend available')
|
||||
warning('which provides substantially better performance and reliability.')
|
||||
warning('It is strongly recommended to remove the --enable-tcg-interpreter')
|
||||
|
|
|
@ -319,7 +319,7 @@ static void register_virtio_net_test(void)
|
|||
.before = virtio_net_test_setup,
|
||||
};
|
||||
|
||||
qos_add_test("hotplug", "virtio-pci", hotplug, &opts);
|
||||
qos_add_test("hotplug", "virtio-net-pci", hotplug, &opts);
|
||||
#ifndef _WIN32
|
||||
qos_add_test("basic", "virtio-net", send_recv_test, &opts);
|
||||
qos_add_test("rx_stop_cont", "virtio-net", stop_cont_test, &opts);
|
||||
|
|
Loading…
Reference in New Issue