Commit 7a9a5e72 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



trivial patches for 2015-03-19

# gpg: Signature made Thu Mar 19 08:57:54 2015 GMT 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-03-19: (24 commits)
  qga/commands-posix: Fix resource leak
  elf-loader: Add missing error handling for call of lseek
  elf-loader: Fix truncation warning from coverity
  hmp: Fix texinfo documentation
  Fix typos in comments
  qtest/ahci: Fix a bit mask expression
  vl: fix resource leak with monitor_fdset_add_fd
  smbios: add max speed comdline option for type-17 (meory device) structure
  pc-dimm: Add description for device list.
  configure: enable kvm on x32
  error: Replace error_report() & error_free() with error_report_err()
  arm: fix memory leak
  qmp: Drop unused .user_print from command definitions
  hmp: Fix definition of command quit
  target-moxie: Fix warnings from Sparse (one-bit signed bitfield)
  block/qapi: Fix Sparse warning
  Fix remaining warnings from Sparse (void return)
  qom: Fix warning from Sparse
  target-mips: Fix warning from Sparse
  arm/nseries: Fix warnings from Sparse
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d88aec88 8ce1ee46

backends/tpm.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void tpm_backend_destroy(TPMBackend *s) 
{

    TPMBackendClass *k = TPM_BACKEND_GET_CLASS(s);



    return k->ops->destroy(s);

    k->ops->destroy(s);

}



int tpm_backend_init(TPMBackend *s, TPMState *state,

block/qapi.c

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ BlockStatsList *qmp_query_blockstats(bool has_query_nodes, 


static char *get_human_readable_size(char *buf, int buf_size, int64_t size)

{

    static const char suffixes[NB_SUFFIXES] = "KMGT";

    static const char suffixes[NB_SUFFIXES] = {'K', 'M', 'G', 'T'};

    int64_t base;

    int i;

configure

+3 −1
Original line number Diff line number Diff line
@@ -5268,7 +5268,9 @@ case "$target_name" in 
      \( "$target_name" = "ppcemb" -a "$cpu" = "ppc64" \) -o \

      \( "$target_name" = "mipsel" -a "$cpu" = "mips" \) -o \

      \( "$target_name" = "x86_64" -a "$cpu" = "i386"   \) -o \

      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) \) ; then

      \( "$target_name" = "i386"   -a "$cpu" = "x86_64" \) -o \

      \( "$target_name" = "x86_64" -a "$cpu" = "x32"   \) -o \

      \( "$target_name" = "i386"   -a "$cpu" = "x32" \) \) ; then

      echo "CONFIG_KVM=y" >> $config_target_mak

      if test "$vhost_net" = "yes" ; then

        echo "CONFIG_VHOST_NET=y" >> $config_target_mak

disas/cris.c

+1 −12
Original line number Diff line number Diff line
@@ -1210,21 +1210,10 @@ cris_cc_strings[] = 
  "le",

  "a",

  /* This is a placeholder.  In v0, this would be "ext".  In v32, this

     is "sb".  See cris_conds15.  */

     is "sb". */

  "wf"

};



/* Different names and semantics for condition 1111 (0xf).  */

const struct cris_cond15 cris_cond15s[] =

{

  /* FIXME: In what version did condition "ext" disappear?  */

  {"ext", cris_ver_v0_3},

  {"wf", cris_ver_v10},

  {"sb", cris_ver_v32p},

  {NULL, 0}

};





/*

 * Local variables:

 * eval: (c-set-style "gnu")

fsdev/virtfs-proxy-helper.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ error: 


static int init_capabilities(void)

{

    /* helper needs following capbabilities only */

    /* helper needs following capabilities only */

    cap_value_t cap_list[] = {

        CAP_CHOWN,

        CAP_DAC_OVERRIDE,