diff options
| -rw-r--r-- | .mailmap | 4 | ||||
| -rw-r--r-- | docs/about/deprecated.rst | 3 | ||||
| -rw-r--r-- | hmp-commands.hx | 4 | ||||
| -rw-r--r-- | hw/char/goldfish_tty.c | 2 | ||||
| -rw-r--r-- | hw/intc/goldfish_pic.c | 2 | ||||
| -rw-r--r-- | hw/intc/m68k_irqc.c | 2 | ||||
| -rw-r--r-- | hw/m68k/virt.c | 2 | ||||
| -rw-r--r-- | hw/misc/virt_ctrl.c | 2 | ||||
| -rw-r--r-- | include/hw/char/goldfish_tty.h | 2 | ||||
| -rw-r--r-- | include/hw/intc/goldfish_pic.h | 2 | ||||
| -rw-r--r-- | include/hw/intc/m68k_irqc.h | 2 | ||||
| -rw-r--r-- | include/hw/misc/virt_ctrl.h | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | tests/qtest/virtio-net-test.c | 2 |
14 files changed, 17 insertions, 16 deletions
@@ -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> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 56f9ad15ab..5e514fb443 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -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 ----------------------- diff --git a/hmp-commands.hx b/hmp-commands.hx index 3a5aeba3fe..70a9136ac2 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -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 diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c index 8365a18761..20b77885c1 100644 --- a/hw/char/goldfish_tty.c +++ b/hw/char/goldfish_tty.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Goldfish TTY * diff --git a/hw/intc/goldfish_pic.c b/hw/intc/goldfish_pic.c index e3b43a69f1..dfd53275f6 100644 --- a/hw/intc/goldfish_pic.c +++ b/hw/intc/goldfish_pic.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Goldfish PIC * diff --git a/hw/intc/m68k_irqc.c b/hw/intc/m68k_irqc.c index 2133d2a698..0c515e4ecb 100644 --- a/hw/intc/m68k_irqc.c +++ b/hw/intc/m68k_irqc.c @@ -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 * diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index 978c26e025..0efa4a45c7 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * QEMU Vitual M68K Machine * diff --git a/hw/misc/virt_ctrl.c b/hw/misc/virt_ctrl.c index 3552d7a09a..e75d1e7e17 100644 --- a/hw/misc/virt_ctrl.c +++ b/hw/misc/virt_ctrl.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Virt system Controller */ diff --git a/include/hw/char/goldfish_tty.h b/include/hw/char/goldfish_tty.h index b9dd67362a..7503d2fa1e 100644 --- a/include/hw/char/goldfish_tty.h +++ b/include/hw/char/goldfish_tty.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Goldfish TTY * diff --git a/include/hw/intc/goldfish_pic.h b/include/hw/intc/goldfish_pic.h index ad13ab37fc..e9d552f796 100644 --- a/include/hw/intc/goldfish_pic.h +++ b/include/hw/intc/goldfish_pic.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Goldfish PIC * diff --git a/include/hw/intc/m68k_irqc.h b/include/hw/intc/m68k_irqc.h index dbcfcfc2e0..ef91f21812 100644 --- a/include/hw/intc/m68k_irqc.h +++ b/include/hw/intc/m68k_irqc.h @@ -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 * diff --git a/include/hw/misc/virt_ctrl.h b/include/hw/misc/virt_ctrl.h index edfadc4695..25a237e518 100644 --- a/include/hw/misc/virt_ctrl.h +++ b/include/hw/misc/virt_ctrl.h @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifer: GPL-2.0-or-later + * SPDX-License-Identifier: GPL-2.0-or-later * * Virt system Controller */ diff --git a/meson.build b/meson.build index 6bfed294d0..9702fdce6d 100644 --- a/meson.build +++ b/meson.build @@ -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') diff --git a/tests/qtest/virtio-net-test.c b/tests/qtest/virtio-net-test.c index a08e2ffe12..8bf74e516c 100644 --- a/tests/qtest/virtio-net-test.c +++ b/tests/qtest/virtio-net-test.c @@ -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); |