mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mjt/trivial-patches' into staging

Browse Source 
* mjt/trivial-patches:
  audio/mixeng_template.h: fix inline declaration
  misc: Spelling and grammar fixes in comments
  docs/ccid.txt: fix the typo
  qapi: fix documentation example
  .gitignore: ignore qmp-commands.txt
  misc: New spelling fixes in comments
  configure: create fsdev/ directory

Message-id: 1382779887-15971-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
This commit is contained in:
Anthony Liguori 2013-10-31 17:01:43 +01:00
commit ef5cfe5bbd
12 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -44,7 +44,7 @@ qemu-ga
qemu-bridge-helper qemu-bridge-helper
qemu-monitor.texi qemu-monitor.texi
vscclient vscclient
QMP/qmp-commands.txt qmp-commands.txt
test-bitops test-bitops
test-coroutine test-coroutine
test-int128 test-int128

4
audio/mixeng_template.h
View File

@ -35,7 +35,7 @@
#define IN_T glue (glue (ITYPE, BSIZE), _t) #define IN_T glue (glue (ITYPE, BSIZE), _t)
#ifdef FLOAT_MIXENG #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); IN_T nv = ENDIAN_CONVERT (v);
@ -54,7 +54,7 @@ static mixeng_real inline glue (conv_, ET) (IN_T v)
#endif #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) { if (v >= 0.5) {
return IN_MAX; return IN_MAX;

2
block/iscsi.c
View File

@ -866,7 +866,7 @@ retry:
/* in case the get_lba_status_callout fails (i.e. /* in case the get_lba_status_callout fails (i.e.
* because the device is busy or the cmd is not * because the device is busy or the cmd is not
* supported) we pretend all blocks are allocated * supported) we pretend all blocks are allocated
* for backwards compatiblity */ * for backwards compatibility */
goto out; goto out;
} }

1
configure vendored
View File

@ -4654,6 +4654,7 @@ fi
# build tree in object directory in case the source is not in the current directory # 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="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 pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS qapi-generated" DIRS="$DIRS qapi-generated"

2
docs/ccid.txt
View File

@ -52,7 +52,7 @@ Configuring and building:
Assuming you have a working smartcard on the host with the current 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: 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 4. Using ccid-card-emulated with certificates

2
docs/qapi-code-gen.txt
View File

@ -164,7 +164,7 @@ This example allows using both of the following example objects:
{ "file": "my_existing_block_device_id" } { "file": "my_existing_block_device_id" }
{ "file": { "driver": "file", { "file": { "driver": "file",
"readonly": false, "readonly": false,
'filename': "/tmp/mydisk.qcow2" } } "filename": "/tmp/mydisk.qcow2" } }
=== Commands === === Commands ===

2
hw/ppc/spapr.c
View File

@ -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 * it has to be aligned to num to support multiple
* MSI vectors. MSI-X is not affected by this. * MSI vectors. MSI-X is not affected by this.
* The hint is used for the first IRQ, the rest should * The hint is used for the first IRQ, the rest should
* be allocated continously. * be allocated continuously.
*/ */
if (msi) { if (msi) {
assert((num == 1) || (num == 2) || (num == 4) || assert((num == 1) || (num == 2) || (num == 4) ||

2
qapi-schema.json
View File

@ -1914,7 +1914,7 @@
# #
# Since: 0.14.0 # 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. # discouraged. The semantics of this command are not guaranteed.
# #
# Known limitations: # Known limitations:

2
slirp/if.c
View File

@ -142,7 +142,7 @@ diddit:
/* /*
* Send a packet * 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 * If there are packets on the fastq, they are sent FIFO, before
* everything else. Otherwise we choose the first packet from the * everything else. Otherwise we choose the first packet from the
* batchq and send it. the next packet chosen will be from the session * batchq and send it. the next packet chosen will be from the session

2
target-alpha/translate.c
View File

@ -1601,7 +1601,7 @@ static ExitStatus gen_call_pal(DisasContext *ctx, int palcode)
tcg_temp_free(pc); tcg_temp_free(pc);
/* Since the destination is running in PALmode, we don't really /* 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 the page when we create the TB, and we'll flush all TBs if
we change the PAL base register. */ we change the PAL base register. */
if (!ctx->singlestep_enabled && !(ctx->tb->cflags & CF_LAST_IO)) { if (!ctx->singlestep_enabled && !(ctx->tb->cflags & CF_LAST_IO)) {

4
tests/test-throttle.c
View File

@ -18,7 +18,7 @@ LeakyBucket bkt;
ThrottleConfig cfg; ThrottleConfig cfg;
ThrottleState ts; ThrottleState ts;
/* usefull function */ /* useful function */
static bool double_cmp(double x, double y) static bool double_cmp(double x, double y)
{ {
return fabsl(x - y) < 1e-6; return fabsl(x - y) < 1e-6;
@ -320,7 +320,7 @@ static void test_have_timer(void)
/* zero the structure */ /* zero the structure */
memset(&ts, 0, sizeof(ts)); memset(&ts, 0, sizeof(ts));
/* no timer set shoudl return false */ /* no timer set should return false */
g_assert(!throttle_have_timer(&ts)); g_assert(!throttle_have_timer(&ts));
/* init the structure */ /* init the structure */

2
ui/vnc-enc-zywrle.h
View File

@ -305,7 +305,7 @@ static inline void harr(int8_t *px0, int8_t *px1)
|L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1 |L1H0H1H0|L1H0H1H0|L1H0H1H0|L1H0H1H0| : level 1
In this method, H/L and X0/X1 is always same position. 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 Of cause, the result of both method is quite same
because it's only difference that coefficient position. because it's only difference that coefficient position.
*/ */