Commit 8be6e623 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-10-08' into staging 



trivial patches for 2015-10-08

# gpg: Signature made Thu 08 Oct 2015 17:51:05 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2015-10-08:
  tests: Unique test path for /string-visitor/output
  linux-user: Remove type casts to union type
  linux-user: Use g_new() & friends where that makes obvious sense
  rocker: Use g_new() & friends where that makes obvious sense
  .travis.yml: Run make check for all targets, not just some
  hw: char: Remove unnecessary variable
  hw: timer: Remove unnecessary variable
  qapi: add missing @
  MAINTAINERS: Add NSIS file for W32, W64 hosts
  target-ppc: Remove unnecessary variable
  target-microblaze: Remove unnecessary variable
  s/cpu_get_real_ticks/cpu_get_host_ticks/
  pc: check for underflow in load_linux
  pci-assign: do not include sys/io.h
  block/ssh: remove dead code
  imx_serial: Generate interrupt on tx empty if enabled
  sdhci: Change debug prints to compile unconditionally
  sdhci: use PRIx64 for uint64_t type
  Add .dir-locals.el file to configure emacs coding style

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1d27b917 deb847bf

.dir-locals.el

0 → 100644
+2 −0
Original line number Diff line number Diff line 
((c-mode . ((c-file-style . "stroustrup")

	    (indent-tabs-mode . nil))))

.travis.yml

+1 −9
Original line number Diff line number Diff line
@@ -54,15 +54,7 @@ matrix: 
  include:

    # Make check target (we only do this once)

    - env:

        - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,

                  i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu,

                  microblazeel-softmmu,mips-softmmu,mips64-softmmu,

                  mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu,

                  ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu,

                  sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,

                  unicore32-softmmu,unicore32-linux-user,

                  lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,

                  xtensaeb-softmmu

        - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu,microblazeel-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu,sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,unicore32-softmmu,unicore32-linux-user,lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu

          TEST_CMD="make check"

      compiler: gcc

    # Debug related options

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ L: qemu-devel@nongnu.org 
M: Stefan Weil <sw@weilnetz.de>

S: Maintained

F: *win32*

F: qemu.nsi



ARM Machines

------------

block/ssh.c

+1 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ sftp_error_report(BDRVSSHState *s, const char *fs, ...) 
static int parse_uri(const char *filename, QDict *options, Error **errp)

{

    URI *uri = NULL;

    QueryParams *qp = NULL;

    QueryParams *qp;

    int i;



    uri = uri_parse(filename);
@@ -249,9 +249,6 @@ static int parse_uri(const char *filename, QDict *options, Error **errp) 
    return 0;



 err:

    if (qp) {

      query_params_free(qp);

    }

    if (uri) {

      uri_free(uri);

    }

bsd-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ void cpu_list_unlock(void) 


uint64_t cpu_get_tsc(CPUX86State *env)

{

    return cpu_get_real_ticks();

    return cpu_get_host_ticks();

}



static void write_dt(void *ptr, unsigned long addr, unsigned long limit,