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

Pull request trivial branch 20221103-v2

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmNmvt8SHGxhdXJlbnRA
 dml2aWVyLmV1AAoJEPMMOL0/L748HOMP/35HpUyXmjtpHegSgIQ43KLFNG+lBbj8
 83W6HmOnd1ogSxiTmAx15a0jbcdfOPlloelG91GqptJsDBuwVBJ3wt2rDN4AseZe
 GTt4pXJPBITp+UGlz6BkGB1WrDTAB8xieijx6sXhyAfLYt1EwNx6qkWnTQh0sQjT
 jqjCTpF6V2odaxHJ7zmhhtlOea84q017ookhguDpOHbzzVEG5ma9YJwW2B5SPMUy
 IWrBEgV48S9epYX1o7HWqRbWN0gP0tuPaTIf+QSEwopqFkaArfBgwgGbPmU2njg6
 NY8TnEwmgEbcK8nxWUSpSWlFJ2YPhKTV1BqpcNSmZkVtG0bLxvLaMJu8TC+p4B90
 vepn7rysQqENCbcSaWUuVDtlhvi8LtRyaGtmeEzu6CrvMhsjzEIsRriVbFmHhDVh
 cmoePVPu4Ypn2QSoT2a8ZXT2KzgB92/9jKCoHpC8K5eR69NH1QAb+YrlmTjum+DE
 XZ5OhuI/nSY6xTR1nU4oRjq0MRHoS4OFR8c82wbA/XhMFju7Ej2Fj2tCeOdKK/IH
 /jFXwkx3GJbwuq1RetCmJdYStJ3K7F9gNDkgCYYSZoW6FsVUheWRakH8Ujyhk7Xb
 xnuOxrEGOw9A2cDjmRiDHqd3ErRJskzFGPtd2XIDr1loOwyWbYKRLd8A6W7HcQiU
 y3W6uHedI1ZL
 =PYU9
 -----END PGP SIGNATURE-----

Merge tag 'trivial-branch-for-7.2-pull-request' of https://gitlab.com/laurent_vivier/qemu into staging

Pull request trivial branch 20221103-v2

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmNmvt8SHGxhdXJlbnRA
# dml2aWVyLmV1AAoJEPMMOL0/L748HOMP/35HpUyXmjtpHegSgIQ43KLFNG+lBbj8
# 83W6HmOnd1ogSxiTmAx15a0jbcdfOPlloelG91GqptJsDBuwVBJ3wt2rDN4AseZe
# GTt4pXJPBITp+UGlz6BkGB1WrDTAB8xieijx6sXhyAfLYt1EwNx6qkWnTQh0sQjT
# jqjCTpF6V2odaxHJ7zmhhtlOea84q017ookhguDpOHbzzVEG5ma9YJwW2B5SPMUy
# IWrBEgV48S9epYX1o7HWqRbWN0gP0tuPaTIf+QSEwopqFkaArfBgwgGbPmU2njg6
# NY8TnEwmgEbcK8nxWUSpSWlFJ2YPhKTV1BqpcNSmZkVtG0bLxvLaMJu8TC+p4B90
# vepn7rysQqENCbcSaWUuVDtlhvi8LtRyaGtmeEzu6CrvMhsjzEIsRriVbFmHhDVh
# cmoePVPu4Ypn2QSoT2a8ZXT2KzgB92/9jKCoHpC8K5eR69NH1QAb+YrlmTjum+DE
# XZ5OhuI/nSY6xTR1nU4oRjq0MRHoS4OFR8c82wbA/XhMFju7Ej2Fj2tCeOdKK/IH
# /jFXwkx3GJbwuq1RetCmJdYStJ3K7F9gNDkgCYYSZoW6FsVUheWRakH8Ujyhk7Xb
# xnuOxrEGOw9A2cDjmRiDHqd3ErRJskzFGPtd2XIDr1loOwyWbYKRLd8A6W7HcQiU
# y3W6uHedI1ZL
# =PYU9
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 05 Nov 2022 15:51:59 EDT
# 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]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* tag 'trivial-branch-for-7.2-pull-request' of https://gitlab.com/laurent_vivier/qemu:
  tests/unit: simpler variable sequence for test-io-channel
  target/tricore: Rename csfr.def -> csfr.h.inc
  target/s390x: Rename insn-data/format.def -> insn-data/format.h.inc
  target/m68k: Rename qregs.def -> qregs.h.inc
  xen/pt: fix syntax error that causes FTBFS in some configurations
  Fix some typos in documentation and comments
  qapi: virtio: Fix the introduced version

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2022-11-07 05:44:26 -05:00
commit 64be791d3c
19 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/devel/testing.rst
View File

@ -99,7 +99,7 @@ successfully on various hosts. The following list shows some best practices:
* If your test cases uses the blkdebug feature, use relative path to pass
the config and image file paths in the command line as Windows absolute
path contains the delimiter ":" which will confuse the blkdebug parser.
* Use double quotes in your extra QEMU commmand line in your test cases
* Use double quotes in your extra QEMU command line in your test cases
instead of single quotes, as Windows does not drop single quotes when
passing the command line to QEMU.
* Windows opens a file in text mode by default, while a POSIX compliant

2
docs/system/arm/cpu-features.rst
View File

@ -433,7 +433,7 @@ additional constraints on the set of vector lengths supported by SME.
SME User-mode Default Vector Length Property
--------------------------------------------
For qemu-aarch64, the cpu propery ``sme-default-vector-length=N`` is
For qemu-aarch64, the cpu property ``sme-default-vector-length=N`` is
defined to mirror the Linux kernel parameter file
``/proc/sys/abi/sme_default_vector_length``. The default length, ``N``,
is in units of bytes and must be between 16 and 8192.

2
docs/tools/virtiofsd.rst
View File

@ -232,7 +232,7 @@ e.g.:
``:ok:server::security.:``
will pass 'securty.' xattr's in listxattr from the server
will pass 'security.' xattr's in listxattr from the server
and ignore following rules.
``:ok:all:::``

2
hw/xen/meson.build
View File

@ -18,7 +18,7 @@ if have_xen_pci_passthrough
'xen_pt_msi.c',
))
else
xen_specific_ss.add('xen_pt_stub.c')
xen_specific_ss.add(files('xen_pt_stub.c'))
endif
specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)

2
include/exec/memory.h
View File

@ -1970,7 +1970,7 @@ void memory_region_clear_dirty_bitmap(MemoryRegion *mr, hwaddr start,
* querying the same page multiple times, which is especially useful for
* display updates where the scanlines often are not page aligned.
*
* The dirty bitmap region which gets copyed into the snapshot (and
* The dirty bitmap region which gets copied into the snapshot (and
* cleared afterwards) can be larger than requested. The boundaries
* are rounded up/down so complete bitmap longs (covering 64 pages on
* 64bit hosts) can be copied over into the bitmap snapshot. Which

2
qapi/qom.json
View File

@ -589,7 +589,7 @@
#
# @size: size of the memory region in bytes
#
# @x-use-canonical-path-for-ramblock-id: if true, the canoncial path is used
# @x-use-canonical-path-for-ramblock-id: if true, the canonical path is used
# for ramblock-id. Disable this for 4.0
# machine types or older to allow
# migration with newer QEMU versions.

34
qapi/virtio.json
View File

@ -15,7 +15,7 @@
#
# @name: Name of the VirtIODevice
#
# Since: 7.1
# Since: 7.2
#
##
{ 'struct': 'VirtioInfo',
@ -32,7 +32,7 @@
#
# Returns: List of gathered VirtIODevices
#
# Since: 7.1
# Since: 7.2
#
# Example:
#
@ -97,7 +97,7 @@
#
# @log-size: vhost_dev log_size
#
# Since: 7.1
# Since: 7.2
#
##
@ -167,7 +167,7 @@
# Present if the given VirtIODevice has an active vhost
# device.
#
# Since: 7.1
# Since: 7.2
#
##
@ -206,7 +206,7 @@
#
# Returns: VirtioStatus of the virtio device
#
# Since: 7.1
# Since: 7.2
#
# Examples:
#
@ -452,7 +452,7 @@
#
# @unknown-statuses: Virtio device statuses bitmap that have not been decoded
#
# Since: 7.1
# Since: 7.2
##
{ 'struct': 'VirtioDeviceStatus',
@ -471,7 +471,7 @@
# @unknown-protocols: Vhost user device protocol features bitmap that
# have not been decoded
#
# Since: 7.1
# Since: 7.2
##
{ 'struct': 'VhostDeviceProtocols',
@ -492,7 +492,7 @@
# @unknown-dev-features: Virtio device features bitmap that have not
# been decoded
#
# Since: 7.1
# Since: 7.2
##
{ 'struct': 'VirtioDeviceFeatures',
@ -535,7 +535,7 @@
#
# @signalled-used-valid: VirtQueue signalled_used_valid flag
#
# Since: 7.1
# Since: 7.2
#
##
@ -576,7 +576,7 @@
# shadow_avail_idx will not be displayed in the case where
# the selected VirtIODevice has a running vhost device.
#
# Since: 7.1
# Since: 7.2
#
# Examples:
#
@ -666,7 +666,7 @@
#
# @used-size: vhost_virtqueue used_size
#
# Since: 7.1
# Since: 7.2
#
##
@ -699,7 +699,7 @@
#
# Returns: VirtVhostQueueStatus of the vhost_virtqueue
#
# Since: 7.1
# Since: 7.2
#
# Examples:
#
@ -767,7 +767,7 @@
#
# @flags: List of descriptor flags
#
# Since: 7.1
# Since: 7.2
#
##
@ -787,7 +787,7 @@
#
# @ring: VRingAvail ring[] entry at provided index
#
# Since: 7.1
# Since: 7.2
#
##
@ -805,7 +805,7 @@
#
# @idx: VRingUsed index
#
# Since: 7.1
# Since: 7.2
#
##
@ -829,7 +829,7 @@
#
# @used: VRingUsed info
#
# Since: 7.1
# Since: 7.2
#
##
@ -857,7 +857,7 @@
#
# Returns: VirtioQueueElement information
#
# Since: 7.1
# Since: 7.2
#
# Examples:
#

10
qemu-options.hx
View File

@ -1051,7 +1051,7 @@ SRST
details on the external interface.
``-device isa-ipmi-kcs,bmc=id[,ioport=val][,irq=val]``
Add a KCS IPMI interafce on the ISA bus. This also adds a
Add a KCS IPMI interface on the ISA bus. This also adds a
corresponding ACPI and SMBIOS entries, if appropriate.
``bmc=id``
@ -1071,7 +1071,7 @@ SRST
is 0xe4 and the default interrupt is 5.
``-device pci-ipmi-kcs,bmc=id``
Add a KCS IPMI interafce on the PCI bus.
Add a KCS IPMI interface on the PCI bus.
``bmc=id``
The BMC to connect to, one of ipmi-bmc-sim or ipmi-bmc-extern above.
@ -5283,8 +5283,8 @@ SRST
read the colo-compare git log.
``-object cryptodev-backend-builtin,id=id[,queues=queues]``
Creates a cryptodev backend which executes crypto opreation from
the QEMU cipher APIS. The id parameter is a unique ID that will
Creates a cryptodev backend which executes crypto operations from
the QEMU cipher APIs. The id parameter is a unique ID that will
be used to reference this cryptodev backend from the
``virtio-crypto`` device. The queues parameter is optional,
which specify the queue number of cryptodev backend, the default
@ -5551,7 +5551,7 @@ SRST
file=/etc/qemu/vnc.allow
Finally the ``/etc/qemu/vnc.allow`` file would contain the list
of x509 distingished names that are permitted access
of x509 distinguished names that are permitted access
::

2
qga/qapi-schema.json
View File

@ -392,7 +392,7 @@
##
# @guest-file-flush:
#
# Write file changes bufferred in userspace to disk/kernel buffers
# Write file changes buffered in userspace to disk/kernel buffers
#
# @handle: filehandle returned by guest-file-open
#

0
target/m68k/qregs.def → target/m68k/qregs.h.inc
View File

4
target/m68k/translate.c
View File

@ -39,7 +39,7 @@
#define DEFO32(name, offset) static TCGv QREG_##name;
#define DEFO64(name, offset) static TCGv_i64 QREG_##name;
#include "qregs.def"
#include "qregs.h.inc"
#undef DEFO32
#undef DEFO64
@ -75,7 +75,7 @@ void m68k_tcg_init(void)
#define DEFO64(name, offset) \
QREG_##name = tcg_global_mem_new_i64(cpu_env, \
offsetof(CPUM68KState, offset), #name);
#include "qregs.def"
#include "qregs.h.inc"
#undef DEFO32
#undef DEFO64

2
target/s390x/tcg/insn-data.def → target/s390x/tcg/insn-data.h.inc
View File

@ -8,7 +8,7 @@
*
* OPC = (op << 8) | op2 where op is the major, op2 the minor opcode
* NAME = name of the opcode, used internally
* FMT = format of the opcode (defined in insn-format.def)
* FMT = format of the opcode (defined in insn-format.h.inc)
* FAC = facility the opcode is available in (defined in DisasFacility)
* I1 = func in1_xx fills o->in1
* I2 = func in2_xx fills o->in2

0
target/s390x/tcg/insn-format.def → target/s390x/tcg/insn-format.h.inc
View File

10
target/s390x/tcg/translate.c
View File

@ -1011,7 +1011,7 @@ static void free_compare(DisasCompare *c)
#define F6(N, X1, X2, X3, X4, X5, X6) F0(N)
typedef enum {
#include "insn-format.def"
#include "insn-format.h.inc"
} DisasFormat;
#undef F0
@ -1076,7 +1076,7 @@ typedef struct DisasFormatInfo {
#define F6(N, X1, X2, X3, X4, X5, X6) { { X1, X2, X3, X4, X5, X6 } },
static const DisasFormatInfo format_info[] = {
#include "insn-format.def"
#include "insn-format.h.inc"
};
#undef F0
@ -6143,7 +6143,7 @@ static void in2_insn(DisasContext *s, DisasOps *o)
#define E(OPC, NM, FT, FC, I1, I2, P, W, OP, CC, D, FL) insn_ ## NM,
enum DisasInsnEnum {
#include "insn-data.def"
#include "insn-data.h.inc"
};
#undef E
@ -6223,7 +6223,7 @@ enum DisasInsnEnum {
#define FAC_MIE3 S390_FEAT_MISC_INSTRUCTION_EXT3 /* miscellaneous-instruction-extensions facility 3 */
static const DisasInsn insn_info[] = {
#include "insn-data.def"
#include "insn-data.h.inc"
};
#undef E
@ -6233,7 +6233,7 @@ static const DisasInsn insn_info[] = {
static const DisasInsn *lookup_opc(uint16_t opc)
{
switch (opc) {
#include "insn-data.def"
#include "insn-data.h.inc"
default:
return NULL;
}

0
target/tricore/csfr.def → target/tricore/csfr.h.inc
View File

4
target/tricore/translate.c
View File

@ -388,7 +388,7 @@ static inline void gen_mfcr(DisasContext *ctx, TCGv ret, int32_t offset)
gen_helper_psw_read(ret, cpu_env);
} else {
switch (offset) {
#include "csfr.def"
#include "csfr.h.inc"
}
}
}
@ -418,7 +418,7 @@ static inline void gen_mtcr(DisasContext *ctx, TCGv r1,
gen_helper_psw_write(cpu_env, r1);
} else {
switch (offset) {
#include "csfr.def"
#include "csfr.h.inc"
}
}
} else {

2
tests/qtest/libqtest.h
View File

@ -736,7 +736,7 @@ bool qtest_has_device(const char *device);
* qtest_qmp_device_add_qdict:
* @qts: QTestState instance to operate on
* @drv: Name of the device that should be added
* @arguments: QDict with properties for the device to intialize
* @arguments: QDict with properties for the device to initialize
*
* Generic hot-plugging test via the device_add QMP command with properties
* supplied in form of QDict. Use NULL for empty properties list.

14
tests/unit/test-io-channel-command.c
View File

@ -33,19 +33,13 @@ static void test_io_channel_command_fifo(bool async)
{
g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL);
g_autofree gchar *fifo = g_strdup_printf("%s/%s", tmpdir, TEST_FIFO);
g_autoptr(GString) srcargs = g_string_new(socat);
g_autoptr(GString) dstargs = g_string_new(socat);
g_auto(GStrv) srcargv;
g_auto(GStrv) dstargv;
g_autofree gchar *srcargs = g_strdup_printf("%s - PIPE:%s,wronly", socat, fifo);
g_autofree gchar *dstargs = g_strdup_printf("%s PIPE:%s,rdonly -", socat, fifo);
g_auto(GStrv) srcargv = g_strsplit(srcargs, " ", -1);
g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1);
QIOChannel *src, *dst;
QIOChannelTest *test;
g_string_append_printf(srcargs, " - PIPE:%s,wronly", fifo);
g_string_append_printf(dstargs, " PIPE:%s,rdonly -", fifo);
srcargv = g_strsplit(srcargs->str, " ", -1);
dstargv = g_strsplit(dstargs->str, " ", -1);
src = QIO_CHANNEL(qio_channel_command_new_spawn((const char **) srcargv,
O_WRONLY,
&error_abort));