Commit 6fffa262 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-03-15' into staging 



trivial patches for 2014-03-15

# gpg: Signature made Sat 15 Mar 2014 09:54:30 GMT using RSA key ID 74F0C838
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: E190 8639 3B10 B51B AC2C  8B73 5253 C5AD 74F0 C838

* remotes/mjt/tags/trivial-patches-2014-03-15:
  FSL eTSEC: Fix typo in rx ring
  scripts/make-release: Don't distribute .git directories
  configure: Don't use __int128_t for clang versions before 3.2
  audio: Add 'static' attributes to several variables
  tests: Fix 'make test' for i686 hosts (build regression)
  misc: Fix typos in comments
  Add qga/qapi-generated to .gitignore
  hw/timer/grlib_gptimer: Avoid integer overflows
  .travis.yml: add IRC notifications for build failures
  .travis.yml: trivial whitespace fixup
  .travis.yml: re-enable lttng user space trace test
  .travis.yml: add a new build target with non-core devlibs
  sasl: Avoid 'Could not find keytab file' in syslog

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e6383080 9c749e4d

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
libdis*

libuser

/linux-headers/asm

/qga/qapi-generated

/qapi-generated

/qapi-types.[ch]

/qapi-visit.[ch]

.travis.yml

+31 −22
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ python: 
compiler:

  - gcc

  - clang

notifications:

  irc:

    channels:

      - "irc.oftc.net#qemu"

    on_success: change

    on_failure: always

env:

  global:

    - TEST_CMD="make check"
@@ -46,6 +52,10 @@ matrix: 
    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter"

      compiler: gcc

    # All the extra -dev packages

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_PKGS="libaio-dev libcap-ng-dev libattr1-dev libbrlapi-dev uuid-dev libusb-1.0.0-dev"

      compiler: gcc

    # Currently configure doesn't force --disable-pie

    - env: TARGETS=i386-softmmu,x86_64-softmmu

           EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie"
@@ -65,8 +75,7 @@ matrix: 
           EXTRA_CONFIG="--enable-trace-backend=ftrace"

           TEST_CMD=""

      compiler: gcc

    # This disabled make check for the ftrace backend which needs more setting up

    # Currently broken on 12.04 due to mis-packaged liburcu and changed API, will be pulled.

    #- env: TARGETS=i386-softmmu,x86_64-softmmu

    #       EXTRA_PKGS="liblttng-ust-dev liburcu-dev"

    #       EXTRA_CONFIG="--enable-trace-backend=ust"
 
    - env: TARGETS=i386-softmmu,x86_64-softmmu

          EXTRA_PKGS="liblttng-ust-dev liburcu-dev"

          EXTRA_CONFIG="--enable-trace-backend=ust"

      compiler: gcc

configure

+5 −0
Original line number Diff line number Diff line
@@ -3822,6 +3822,11 @@ fi 


int128=no

cat > $TMPC << EOF

#if defined(__clang_major__) && defined(__clang_minor__)

# if ((__clang_major__ < 3) || (__clang_major__ == 3) && (__clang_minor__ < 2))

#  error __int128_t does not work in CLANG before 3.2

# endif

#endif

__int128_t a;

__uint128_t b;

int main (void) {

hw/audio/fmopl.c

+3 −3
Original line number Diff line number Diff line
@@ -223,13 +223,13 @@ static void *cur_chip = NULL; /* current chip point */ 
/* static OPLSAMPLE  *bufL,*bufR; */

static OPL_CH *S_CH;

static OPL_CH *E_CH;

OPL_SLOT *SLOT7_1,*SLOT7_2,*SLOT8_1,*SLOT8_2;

static OPL_SLOT *SLOT7_1, *SLOT7_2, *SLOT8_1, *SLOT8_2;



static INT32 outd[1];

static INT32 ams;

static INT32 vib;

INT32  *ams_table;

INT32  *vib_table;

static INT32 *ams_table;

static INT32 *vib_table;

static INT32 amsIncr;

static INT32 vibIncr;

static INT32 feedback2;		/* connect for SLOT 2 */

hw/intc/arm_gic_kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ typedef void (*vgic_translate_fn)(GICState *s, int irq, int cpu, 
                                  uint32_t *field, bool to_kernel);



/* synthetic translate function used for clear/set registers to completely

 * clear a setting using a clear-register before setting the remaing bits

 * clear a setting using a clear-register before setting the remaining bits

 * using a set-register */

static void translate_clear(GICState *s, int irq, int cpu,

                            uint32_t *field, bool to_kernel)