Commit ef5cfe5b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



* 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: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 1ba1905a 203cea22

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -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

audio/mixeng_template.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

configure

+1 −0
Original line number Diff line number Diff line
@@ -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"

docs/ccid.txt

+1 −1
Original line number Diff line number Diff line
@@ -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