diff options
| -rw-r--r-- | docs/devel/atomics.rst | 2 | ||||
| -rw-r--r-- | docs/devel/ci-jobs.rst.inc | 2 | ||||
| -rw-r--r-- | docs/devel/clocks.rst | 2 | ||||
| -rw-r--r-- | docs/system/i386/sgx.rst | 2 | ||||
| -rw-r--r-- | fpu/softfloat-specialize.c.inc | 2 | ||||
| -rw-r--r-- | hmp-commands.hx | 2 | ||||
| -rw-r--r-- | hw/usb/dev-audio.c | 4 | ||||
| -rw-r--r-- | qapi/qom.json | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/docs/devel/atomics.rst b/docs/devel/atomics.rst index ff9b5ee30c..b77c6e13e1 100644 --- a/docs/devel/atomics.rst +++ b/docs/devel/atomics.rst @@ -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 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 - accesses, or perform other similar optimzations. + accesses, or perform other similar optimizations. - acquire operations will appear to happen, with respect to the other components of the system, before all the LOAD or STORE operations diff --git a/docs/devel/ci-jobs.rst.inc b/docs/devel/ci-jobs.rst.inc index ec33e6ee2b..be06322279 100644 --- a/docs/devel/ci-jobs.rst.inc +++ b/docs/devel/ci-jobs.rst.inc @@ -115,7 +115,7 @@ CI pipeline. 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 be a temporary marker until the problems can be addressed, or the job permanently removed. diff --git a/docs/devel/clocks.rst b/docs/devel/clocks.rst index b2d1148cdb..177ee1c90d 100644 --- a/docs/devel/clocks.rst +++ b/docs/devel/clocks.rst @@ -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 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 or both were changed by the call. diff --git a/docs/system/i386/sgx.rst b/docs/system/i386/sgx.rst index 0f0a73f758..ab58b29392 100644 --- a/docs/system/i386/sgx.rst +++ b/docs/system/i386/sgx.rst @@ -6,7 +6,7 @@ Overview Intel Software Guard eXtensions (SGX) is a set of instructions and mechanisms 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 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, diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc index 1610472cfc..1c85c48a73 100644 --- a/fpu/softfloat-specialize.c.inc +++ b/fpu/softfloat-specialize.c.inc @@ -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, * 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)) { /* set all bits other than msb */ diff --git a/hmp-commands.hx b/hmp-commands.hx index 17b5ea839d..2e2a3bcf98 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1412,7 +1412,7 @@ ERST { .name = "watchdog_action", .args_type = "action:s", - .params = "[reset|shutdown|poweroff|pause|debug|none]", + .params = "[reset|shutdown|poweroff|pause|debug|none|inject-nmi]", .help = "change watchdog action", .cmd = hmp_watchdog_action, .command_completion = watchdog_action_completion, diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c index d5ac1f8962..1897fff9e6 100644 --- a/hw/usb/dev-audio.c +++ b/hw/usb/dev-audio.c @@ -124,7 +124,6 @@ static const USBDescIface desc_iface[] = { .bNumEndpoints = 0, .bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL, - .bInterfaceProtocol = 0x04, .iInterface = STRING_USBAUDIO_CONTROL, .ndesc = 4, .descs = (USBDescOther[]) { @@ -282,7 +281,6 @@ static const USBDescIface desc_iface_multi[] = { .bNumEndpoints = 0, .bInterfaceClass = USB_CLASS_AUDIO, .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL, - .bInterfaceProtocol = 0x04, .iInterface = STRING_USBAUDIO_CONTROL, .ndesc = 4, .descs = (USBDescOther[]) { @@ -293,7 +291,7 @@ static const USBDescIface desc_iface_multi[] = { USB_DT_CS_INTERFACE, /* u8 bDescriptorType */ DST_AC_HEADER, /* u8 bDescriptorSubtype */ U16(0x0100), /* u16 bcdADC */ - U16(0x38), /* u16 wTotalLength */ + U16(0x37), /* u16 wTotalLength */ 0x01, /* u8 bInCollection */ 0x01, /* u8 baInterfaceNr */ } diff --git a/qapi/qom.json b/qapi/qom.json index 8d4ca8ed92..85e6b4f84a 100644 --- a/qapi/qom.json +++ b/qapi/qom.json @@ -802,7 +802,7 @@ # # @fd: file descriptor name previously passed via 'getfd' command, # 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 # process, e.g. DPDK. (default: QEMU opens /dev/iommu by itself) # |