ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

trivial patches for 2024-04-02 

-----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmYL4EQPHG1qdEB0bHMu
 bXNrLnJ1AAoJEHAbT2saaT5ZyhIH/1sz3OeyczgPeMsICXpCnkQps8cDKuzUMkHA
 BHZGQ9AvFNZVw0YzgY+h1u2zPnsN0WNpWuxe8dbZODHcBjeJVZ5yOyJ6TWVVuKDn
 6TzOfhGOeaUthNphpfZaM1q7fJfwU8zW3/pe6OCsD92Czxb8Eao3T4ONzVNZVXU9
 3KPXPD9weWnY/sozXDqPFJmwn0LDL5o6IhPz+Ypp5xFrOTC+5+C/UmgTGIsuKTcO
 kQ96gVwCr3tm1YeJtEGfNOar/lt75jHHV2wbizaz2Jpwv9GHwtHXJOtQ38fIYxlm
 UPZ+L982SjfgaIHLCGOtLYJWSXsK5xI31HDSK1ZIiJquocZE1jU=
 =ZGw+
 -----END PGP SIGNATURE-----

Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

trivial patches for 2024-04-02

# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmYL4EQPHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5ZyhIH/1sz3OeyczgPeMsICXpCnkQps8cDKuzUMkHA
# BHZGQ9AvFNZVw0YzgY+h1u2zPnsN0WNpWuxe8dbZODHcBjeJVZ5yOyJ6TWVVuKDn
# 6TzOfhGOeaUthNphpfZaM1q7fJfwU8zW3/pe6OCsD92Czxb8Eao3T4ONzVNZVXU9
# 3KPXPD9weWnY/sozXDqPFJmwn0LDL5o6IhPz+Ypp5xFrOTC+5+C/UmgTGIsuKTcO
# kQ96gVwCr3tm1YeJtEGfNOar/lt75jHHV2wbizaz2Jpwv9GHwtHXJOtQ38fIYxlm
# UPZ+L982SjfgaIHLCGOtLYJWSXsK5xI31HDSK1ZIiJquocZE1jU=
# =ZGw+
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 02 Apr 2024 11:39:00 BST
# gpg:                using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg:                issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu:
  hmp: Add help information for watchdog action: inject-nmi
  Fix some typos in documentation (found by codespell)
  fpu/softfloat: Remove mention of TILE-Gx target
  usb-audio: Fix invalid values in AudioControl descriptors

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-04-02 12:58:22 +01:00
parent 7fcf7575f3 7805132bc3
commit 2fd8df9362
8 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/devel/atomics.rst
View File

@ -119,7 +119,7 @@ The only guarantees that you can rely upon in this case are:
ordinary accesses instead cause data races if they are concurrent with ordinary accesses instead cause data races if they are concurrent with
other accesses of which at least one is a write. In order to ensure this, other accesses of which at least one is a write. In order to ensure this,
the compiler will not optimize accesses out of existence, create unsolicited the compiler will not optimize accesses out of existence, create unsolicited
accesses, or perform other similar optimzations. accesses, or perform other similar optimizations.
- acquire operations will appear to happen, with respect to the other - acquire operations will appear to happen, with respect to the other
components of the system, before all the LOAD or STORE operations components of the system, before all the LOAD or STORE operations

2
docs/devel/ci-jobs.rst.inc
View File

@ -115,7 +115,7 @@ CI pipeline.
QEMU_JOB_SKIPPED QEMU_JOB_SKIPPED
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~
The job is not reliably successsful in general, so is not The job is not reliably successful in general, so is not
currently suitable to be run by default. Ideally this should currently suitable to be run by default. Ideally this should
be a temporary marker until the problems can be addressed, or be a temporary marker until the problems can be addressed, or
the job permanently removed. the job permanently removed.

2
docs/devel/clocks.rst
View File

@ -279,7 +279,7 @@ You can change the multiplier and divider of a clock at runtime,
so you can use this to model clock controller devices which so you can use this to model clock controller devices which
have guest-programmable frequency multipliers or dividers. have guest-programmable frequency multipliers or dividers.
Similary to ``clock_set()``, ``clock_set_mul_div()`` returns ``true`` if Similarly to ``clock_set()``, ``clock_set_mul_div()`` returns ``true`` if
the clock state was modified; that is, if the multiplier or the diviser the clock state was modified; that is, if the multiplier or the diviser
or both were changed by the call. or both were changed by the call.

2
docs/system/i386/sgx.rst
View File

@ -6,7 +6,7 @@ Overview
Intel Software Guard eXtensions (SGX) is a set of instructions and mechanisms Intel Software Guard eXtensions (SGX) is a set of instructions and mechanisms
for memory accesses in order to provide security accesses for sensitive for memory accesses in order to provide security accesses for sensitive
applications and data. SGX allows an application to use it's pariticular applications and data. SGX allows an application to use its particular
address space as an *enclave*, which is a protected area provides confidentiality address space as an *enclave*, which is a protected area provides confidentiality
and integrity even in the presence of privileged malware. Accesses to the and integrity even in the presence of privileged malware. Accesses to the
enclave memory area from any software not resident in the enclave are prevented, enclave memory area from any software not resident in the enclave are prevented,

2
fpu/softfloat-specialize.c.inc
View File

@ -152,7 +152,7 @@ static void parts64_default_nan(FloatParts64 *p, float_status *status)
/* /*
* This case is true for Alpha, ARM, MIPS, OpenRISC, PPC, RISC-V, * This case is true for Alpha, ARM, MIPS, OpenRISC, PPC, RISC-V,
* S390, SH4, TriCore, and Xtensa. Our other supported targets, * S390, SH4, TriCore, and Xtensa. Our other supported targets,
* CRIS, Nios2, and Tile, do not have floating-point. * CRIS and Nios2, do not have floating-point.
*/ */
if (snan_bit_is_one(status)) { if (snan_bit_is_one(status)) {
/* set all bits other than msb */ /* set all bits other than msb */

2
hmp-commands.hx
View File

@ -1412,7 +1412,7 @@ ERST
{ {
.name = "watchdog_action", .name = "watchdog_action",
.args_type = "action:s", .args_type = "action:s",
.params = "[reset|shutdown|poweroff|pause|debug|none]", .params = "[reset|shutdown|poweroff|pause|debug|none|inject-nmi]",
.help = "change watchdog action", .help = "change watchdog action",
.cmd = hmp_watchdog_action, .cmd = hmp_watchdog_action,
.command_completion = watchdog_action_completion, .command_completion = watchdog_action_completion,

4
hw/usb/dev-audio.c
View File

@ -124,7 +124,6 @@ static const USBDescIface desc_iface[] = {
.bNumEndpoints = 0, .bNumEndpoints = 0,
.bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceClass = USB_CLASS_AUDIO,
.bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL, .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL,
.bInterfaceProtocol = 0x04,
.iInterface = STRING_USBAUDIO_CONTROL, .iInterface = STRING_USBAUDIO_CONTROL,
.ndesc = 4, .ndesc = 4,
.descs = (USBDescOther[]) { .descs = (USBDescOther[]) {
@ -282,7 +281,6 @@ static const USBDescIface desc_iface_multi[] = {
.bNumEndpoints = 0, .bNumEndpoints = 0,
.bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceClass = USB_CLASS_AUDIO,
.bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL, .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL,
.bInterfaceProtocol = 0x04,
.iInterface = STRING_USBAUDIO_CONTROL, .iInterface = STRING_USBAUDIO_CONTROL,
.ndesc = 4, .ndesc = 4,
.descs = (USBDescOther[]) { .descs = (USBDescOther[]) {
@ -293,7 +291,7 @@ static const USBDescIface desc_iface_multi[] = {
USB_DT_CS_INTERFACE, /* u8 bDescriptorType */ USB_DT_CS_INTERFACE, /* u8 bDescriptorType */
DST_AC_HEADER, /* u8 bDescriptorSubtype */ DST_AC_HEADER, /* u8 bDescriptorSubtype */
U16(0x0100), /* u16 bcdADC */ U16(0x0100), /* u16 bcdADC */
U16(0x38), /* u16 wTotalLength */ U16(0x37), /* u16 wTotalLength */
0x01, /* u8 bInCollection */ 0x01, /* u8 bInCollection */
0x01, /* u8 baInterfaceNr */ 0x01, /* u8 baInterfaceNr */
} }

2
qapi/qom.json
View File

@ -802,7 +802,7 @@
# #
# @fd: file descriptor name previously passed via 'getfd' command, # @fd: file descriptor name previously passed via 'getfd' command,
# which represents a pre-opened /dev/iommu. This allows the # which represents a pre-opened /dev/iommu. This allows the
# iommufd object to be shared accross several subsystems (VFIO, # iommufd object to be shared across several subsystems (VFIO,
# VDPA, ...), and the file descriptor to be shared with other # VDPA, ...), and the file descriptor to be shared with other
# process, e.g. DPDK. (default: QEMU opens /dev/iommu by itself) # process, e.g. DPDK. (default: QEMU opens /dev/iommu by itself)
# #