Skip to content

Commit c5ea91d

Browse files
committed
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2023-09-08 # -----BEGIN PGP SIGNATURE----- # # iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmT68tMPHG1qdEB0bHMu # bXNrLnJ1AAoJEHAbT2saaT5ZbEwH/2XcX1f4KcEJbgUn0JVhGQ5GH2c2jepZlkTZ # 2dhvdEECbOPMg73hty0fyyWlyuLWdJ9cMpONfMtzmHTH8RKEOAbpn/zusyo3H+48 # 6cunyUpBqbmb7MHPchrN+JmvtvaSPSazsj2Zdkh+Y4WlfEYj+yVysQ4zQlBlRyHv # iOTi6OdjxXg1QcbtJxAUhp+tKaRJzagiCpLkoyW2m8DIuV9cLVHMJsE3OMgfKNgK # /S+O1fLcaDhuSCrHAbZzArF3Tr4bfLqSwDtGCJfQpqKeIQDJuI+41GLIlm1nYY70 # IFJzEWMOrX/rcMG1CQnUFZOOyDSO+NfILwNnU+eyM49MUekmY54= # =mmPS # -----END PGP SIGNATURE----- # gpg: Signature made Fri 08 Sep 2023 06:09:23 EDT # gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59 # gpg: issuer "[email protected]" # gpg: Good signature from "Michael Tokarev <[email protected]>" [full] # gpg: aka "Michael Tokarev <[email protected]>" [full] # gpg: aka "Michael Tokarev <[email protected]>" [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: (22 commits) qxl: don't assert() if device isn't yet initialized hw/net/vmxnet3: Fix guest-triggerable assert() tests/qtest/usb-hcd: Remove the empty "init" tests target/ppc: use g_free() in test_opcode_table() hw/ppc: use g_free() in spapr_tce_table_post_load() trivial: Simplify the spots that use TARGET_BIG_ENDIAN as a numeric value accel/tcg: Fix typo in translator_io_start() description tests/qtest/test-hmp: Fix migrate_set_parameter xbzrle-cache-size test docs tests: Fix use of migrate_set_parameter qemu-options.hx: Rephrase the descriptions of the -hd* and -cdrom options hw/display/xlnx_dp: update comments block: spelling fixes misc/other: spelling fixes qga/: spelling fixes tests/: spelling fixes scripts/: spelling fixes include/: spelling fixes audio: spelling fixes xen: spelling fix riscv: spelling fixes ... Signed-off-by: Stefan Hajnoczi <[email protected]>
2 parents 0b63052 + 95bef68 commit c5ea91d

File tree

164 files changed

+272
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+272
-327
lines changed

audio/mixeng.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef struct st_sample st_sample;
3838
typedef void (t_sample) (struct st_sample *dst, const void *src, int samples);
3939
typedef void (f_sample) (void *dst, const struct st_sample *src, int samples);
4040

41-
/* indices: [stereo][signed][swap endiannes][8, 16 or 32-bits] */
41+
/* indices: [stereo][signed][swap endianness][8, 16 or 32-bits] */
4242
extern t_sample *mixeng_conv[2][2][2][3];
4343
extern f_sample *mixeng_clip[2][2][2][3];
4444

backends/tpm/tpm_ioctl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ struct ptm_lockstorage {
238238
} req; /* request */
239239
struct {
240240
ptm_res tpm_result;
241-
} resp; /* reponse */
241+
} resp; /* response */
242242
} u;
243243
};
244244

block.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7589,7 +7589,7 @@ int bdrv_try_change_aio_context(BlockDriverState *bs, AioContext *ctx,
75897589
/*
75907590
* Recursion phase: go through all nodes of the graph.
75917591
* Take care of checking that all nodes support changing AioContext
7592-
* and drain them, builing a linear list of callbacks to run if everything
7592+
* and drain them, building a linear list of callbacks to run if everything
75937593
* is successful (the transaction itself).
75947594
*/
75957595
tran = tran_new();

block/block-copy.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ typedef struct BlockCopyCallState {
6767
QLIST_ENTRY(BlockCopyCallState) list;
6868

6969
/*
70-
* Fields that report information about return values and erros.
70+
* Fields that report information about return values and errors.
7171
* Protected by lock in BlockCopyState.
7272
*/
7373
bool error_is_read;
@@ -462,7 +462,7 @@ static coroutine_fn int block_copy_task_run(AioTaskPool *pool,
462462
* Do copy of cluster-aligned chunk. Requested region is allowed to exceed
463463
* s->len only to cover last cluster when s->len is not aligned to clusters.
464464
*
465-
* No sync here: nor bitmap neighter intersecting requests handling, only copy.
465+
* No sync here: neither bitmap nor intersecting requests handling, only copy.
466466
*
467467
* @method is an in-out argument, so that copy_range can be either extended to
468468
* a full-size buffer or disabled if the copy_range attempt fails. The output

block/export/vduse-blk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static void vduse_blk_enable_queue(VduseDev *dev, VduseVirtq *vq)
138138

139139
aio_set_fd_handler(vblk_exp->export.ctx, vduse_queue_get_fd(vq),
140140
on_vduse_vq_kick, NULL, NULL, NULL, vq);
141-
/* Make sure we don't miss any kick afer reconnecting */
141+
/* Make sure we don't miss any kick after reconnecting */
142142
eventfd_write(vduse_queue_get_fd(vq), 1);
143143
}
144144

block/export/vhost-user-blk-server.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Sharing QEMU block devices via vhost-user protocal
2+
* Sharing QEMU block devices via vhost-user protocol
33
*
44
* Parts of the code based on nbd/server.c.
55
*

block/export/vhost-user-blk-server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Sharing QEMU block devices via vhost-user protocal
2+
* Sharing QEMU block devices via vhost-user protocol
33
*
44
* Copyright (c) Coiby Xu <[email protected]>.
55
* Copyright (c) 2020 Red Hat, Inc.

block/file-posix.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1159,9 +1159,9 @@ static int raw_reopen_prepare(BDRVReopenState *state,
11591159
* As part of reopen prepare we also want to create new fd by
11601160
* raw_reconfigure_getfd(). But it wants updated "perm", when in
11611161
* bdrv_reopen_multiple() .bdrv_reopen_prepare() callback called prior to
1162-
* permission update. Happily, permission update is always a part (a seprate
1163-
* stage) of bdrv_reopen_multiple() so we can rely on this fact and
1164-
* reconfigure fd in raw_check_perm().
1162+
* permission update. Happily, permission update is always a part
1163+
* (a separate stage) of bdrv_reopen_multiple() so we can rely on this
1164+
* fact and reconfigure fd in raw_check_perm().
11651165
*/
11661166

11671167
s->reopen_state = state;
@@ -3374,7 +3374,7 @@ static void raw_account_discard(BDRVRawState *s, uint64_t nbytes, int ret)
33743374
* of an array of zone descriptors.
33753375
* zones is an array of zone descriptors to hold zone information on reply;
33763376
* offset can be any byte within the entire size of the device;
3377-
* nr_zones is the maxium number of sectors the command should operate on.
3377+
* nr_zones is the maximum number of sectors the command should operate on.
33783378
*/
33793379
#if defined(CONFIG_BLKZONED)
33803380
static int coroutine_fn raw_co_zone_report(BlockDriverState *bs, int64_t offset,

block/graph-lock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static uint32_t reader_count(void)
9595

9696
QEMU_LOCK_GUARD(&aio_context_list_lock);
9797

98-
/* rd can temporarly be negative, but the total will *always* be >= 0 */
98+
/* rd can temporarily be negative, but the total will *always* be >= 0 */
9999
rd = orphaned_reader_count;
100100
QTAILQ_FOREACH(brdv_graph, &aio_context_list, next_aio) {
101101
rd += qatomic_read(&brdv_graph->reader_count);

block/io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs,
342342
* timer callback), it is a bug in the caller that should be fixed. */
343343
assert(data.done);
344344

345-
/* Reaquire the AioContext of bs if we dropped it */
345+
/* Reacquire the AioContext of bs if we dropped it */
346346
if (ctx != co_ctx) {
347347
aio_context_acquire(ctx);
348348
}

0 commit comments

Comments
 (0)