From 2b170effc7a0bb27f019727e5be02cd989e54e7d Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Mon, 21 Oct 2013 12:33:58 +0400 Subject: [PATCH 1/7] configure: create fsdev/ directory In some cases when building with parallelism (make -jN), build fails because the directory where output files are supposed to be does not exist. In particular, when make decides to build virtfs-proxy-helper.1 before other files in fsdev/, build will fail with the following error: perl -Ww -- BUILDDIR/scripts/texi2pod.pl BUILDDIR/fsdev/virtfs-proxy-helper.texi fsdev/virtfs-proxy-helper.pod && pod2man --utf8 --section=1 --center=" " --release=" " fsdev/virtfs-proxy-helper.pod > fsdev/virtfs-proxy-helper.1 opening "fsdev/virtfs-proxy-helper.pod": No such file or directory Signed-off-by: Michael Tokarev Acked-by: Paolo Bonzini --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 57ee62a696..61bb27caa1 100755 --- a/configure +++ b/configure @@ -4647,6 +4647,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" From 73f395fa88d87ae14f38ad0aa7f863148d98eef2 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 10 Oct 2013 20:53:40 +0200 Subject: [PATCH 2/7] misc: New spelling fixes in comments compatiblity -> compatibility continously -> continuously existance -> existence usefull -> useful shoudl -> should Signed-off-by: Stefan Weil Signed-off-by: Michael Tokarev --- block/iscsi.c | 2 +- hw/ppc/spapr.c | 2 +- target-alpha/translate.c | 2 +- tests/test-throttle.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) 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; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 004184d841..74aa5cce51 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/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 */ From eb02dc0b118c87a366002e3a725ab3373e1738db Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Tue, 15 Oct 2013 10:58:39 +0800 Subject: [PATCH 3/7] .gitignore: ignore qmp-commands.txt This file is moved out from QMP/ to BUILD dir, change the ignore file too. Signed-off-by: Fam Zheng Reviewed-by: Luiz Capitulino Signed-off-by: Michael Tokarev --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 63922c647730eba01865e05bf1e80dd7d682e287 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Sat, 19 Oct 2013 17:52:33 +0100 Subject: [PATCH 4/7] qapi: fix documentation example The QMP wire format uses "", not '', around strings. * docs/qapi-code-gen.txt: Fix typo. Signed-off-by: Eric Blake Signed-off-by: Michael Tokarev --- docs/qapi-code-gen.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 === From 5f32804c79ba9554e62c9699db83ee34df8a46c1 Mon Sep 17 00:00:00 2001 From: WengFan Date: Fri, 25 Oct 2013 11:18:22 -0400 Subject: [PATCH 5/7] docs/ccid.txt: fix the typo Signed-off-by: WengFan Reviewed-by: Eric Blake Signed-off-by: Michael Tokarev --- docs/ccid.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 59b00962136f5621895bee7c96b2a1d9271b9dc5 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 11 Oct 2013 21:34:33 +0200 Subject: [PATCH 6/7] misc: Spelling and grammar fixes in comments * it's -> its * grammar fix in ui/vnc-enc-zywrle.h Signed-off-by: Stefan Weil Reviewed-by: Don Koch Reviewed-by: Peter Maydell Signed-off-by: Michael Tokarev --- qapi-schema.json | 2 +- slirp/if.c | 2 +- ui/vnc-enc-zywrle.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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. */ From 203cea22a3d33ac86d170af74f8c655f119c8c62 Mon Sep 17 00:00:00 2001 From: Alex Bligh Date: Tue, 22 Oct 2013 10:26:28 +0100 Subject: [PATCH 7/7] audio/mixeng_template.h: fix inline declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix error: ‘inline’ is not at beginning of declaration [-Werror=old-style-declaration] Signed-off-by: Alex Bligh Signed-off-by: Michael Tokarev --- audio/mixeng_template.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;