diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | audio/mixeng_template.h | 4 | ||||
| -rw-r--r-- | block/iscsi.c | 2 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | docs/ccid.txt | 2 | ||||
| -rw-r--r-- | docs/qapi-code-gen.txt | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 2 | ||||
| -rw-r--r-- | qapi-schema.json | 2 | ||||
| -rw-r--r-- | slirp/if.c | 2 | ||||
| -rw-r--r-- | target-alpha/translate.c | 2 | ||||
| -rw-r--r-- | tests/test-throttle.c | 4 | ||||
| -rw-r--r-- | ui/vnc-enc-zywrle.h | 2 |
12 files changed, 14 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index 8e1b73f622..5584b5fcb0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ qemu-ga qemu-bridge-helper qemu-monitor.texi vscclient -QMP/qmp-commands.txt +qmp-commands.txt test-bitops test-coroutine test-int128 diff --git a/audio/mixeng_template.h b/audio/mixeng_template.h index 30849a62a1..77cc89b9e8 100644 --- a/audio/mixeng_template.h +++ b/audio/mixeng_template.h @@ -35,7 +35,7 @@ #define IN_T glue (glue (ITYPE, BSIZE), _t) #ifdef FLOAT_MIXENG -static mixeng_real inline glue (conv_, ET) (IN_T v) +static inline mixeng_real glue (conv_, ET) (IN_T v) { IN_T nv = ENDIAN_CONVERT (v); @@ -54,7 +54,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v) #endif } -static IN_T inline glue (clip_, ET) (mixeng_real v) +static inline IN_T glue (clip_, ET) (mixeng_real v) { if (v >= 0.5) { return IN_MAX; diff --git a/block/iscsi.c b/block/iscsi.c index a2a961e163..a2d578c0a7 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -866,7 +866,7 @@ retry: /* in case the get_lba_status_callout fails (i.e. * because the device is busy or the cmd is not * supported) we pretend all blocks are allocated - * for backwards compatiblity */ + * for backwards compatibility */ goto out; } @@ -4654,6 +4654,7 @@ fi # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests" +DIRS="$DIRS fsdev" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" diff --git a/docs/ccid.txt b/docs/ccid.txt index 8bbaa940c3..83c174db26 100644 --- a/docs/ccid.txt +++ b/docs/ccid.txt @@ -52,7 +52,7 @@ Configuring and building: Assuming you have a working smartcard on the host with the current user, using NSS, qemu acts as another NSS client using ccid-card-emulated: - qemu -usb -device usb-ccid -device ccid-card-emualated + qemu -usb -device usb-ccid -device ccid-card-emulated 4. Using ccid-card-emulated with certificates diff --git a/docs/qapi-code-gen.txt b/docs/qapi-code-gen.txt index 91f44d01b9..0728f36c65 100644 --- a/docs/qapi-code-gen.txt +++ b/docs/qapi-code-gen.txt @@ -164,7 +164,7 @@ This example allows using both of the following example objects: { "file": "my_existing_block_device_id" } { "file": { "driver": "file", "readonly": false, - 'filename': "/tmp/mydisk.qcow2" } } + "filename": "/tmp/mydisk.qcow2" } } === Commands === diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index f76b355150..7e53a5f977 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -120,7 +120,7 @@ int spapr_allocate_irq_block(int num, bool lsi, bool msi) * it has to be aligned to num to support multiple * MSI vectors. MSI-X is not affected by this. * The hint is used for the first IRQ, the rest should - * be allocated continously. + * be allocated continuously. */ if (msi) { assert((num == 1) || (num == 2) || (num == 4) || diff --git a/qapi-schema.json b/qapi-schema.json index 60f3fd1db6..a003aa1763 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1914,7 +1914,7 @@ # # Since: 0.14.0 # -# Notes: This command only exists as a stop-gap. It's use is highly +# Notes: This command only exists as a stop-gap. Its use is highly # discouraged. The semantics of this command are not guaranteed. # # Known limitations: diff --git a/slirp/if.c b/slirp/if.c index 87ca8a53a9..fb7acf87dd 100644 --- a/slirp/if.c +++ b/slirp/if.c @@ -142,7 +142,7 @@ diddit: /* * Send a packet - * We choose a packet based on it's position in the output queues; + * We choose a packet based on its position in the output queues; * If there are packets on the fastq, they are sent FIFO, before * everything else. Otherwise we choose the first packet from the * batchq and send it. the next packet chosen will be from the session diff --git a/target-alpha/translate.c b/target-alpha/translate.c index c24910f6a1..1155e86e29 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1601,7 +1601,7 @@ static ExitStatus gen_call_pal(DisasContext *ctx, int palcode) tcg_temp_free(pc); /* Since the destination is running in PALmode, we don't really - need the page permissions check. We'll see the existance of + need the page permissions check. We'll see the existence of the page when we create the TB, and we'll flush all TBs if we change the PAL base register. */ if (!ctx->singlestep_enabled && !(ctx->tb->cflags & CF_LAST_IO)) { diff --git a/tests/test-throttle.c b/tests/test-throttle.c index 760812645b..1d4ffd3603 100644 --- a/tests/test-throttle.c +++ b/tests/test-throttle.c @@ -18,7 +18,7 @@ LeakyBucket bkt; ThrottleConfig cfg; ThrottleState ts; -/* usefull function */ +/* useful function */ static bool double_cmp(double x, double y) { return fabsl(x - y) < 1e-6; @@ -320,7 +320,7 @@ static void test_have_timer(void) /* zero the structure */ memset(&ts, 0, sizeof(ts)); - /* no timer set shoudl return false */ + /* no timer set should return false */ g_assert(!throttle_have_timer(&ts)); /* init the structure */ diff --git a/ui/vnc-enc-zywrle.h b/ui/vnc-enc-zywrle.h index 1ff40b1f40..d436d588fc 100644 --- a/ui/vnc-enc-zywrle.h +++ b/ui/vnc-enc-zywrle.h @@ -305,7 +305,7 @@ static inline void harr(int8_t *px0, int8_t *px1) |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 In this method, H/L and X0/X1 is always same position. - This lead us to more speed and less memory. + This leads us to more speed and less memory. Of cause, the result of both method is quite same because it's only difference that coefficient position. */ |