Commit ac458e12 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



trivial patches for 2014-03-04

# gpg: Signature made Tue 04 Mar 2014 06:13:56 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-04:
  vl: Remove unneeded include file
  qga: Remove unneeded include file
  qemu-img: Remove unneeded include files
  exec: Remove unneeded include files
  util/iov: Use qemu/sockets.h instead of conditional code
  qjson.h: Remove spurious GCC_FMT_ATTR markup from qobject_from_json() declaration
  tests/test-int128: Don't use __noclone__ attribute on clang
  stubs: Optimize dependencies for gdbstub.c
  tcg: Fix typo in comment (dependancies -> dependencies)
  bswap: Modify prototypes of st[wl]_{le, be}_p (avoid type conversions)
  bswap: Modify prototype of stb_p (avoid type conversions)
  object: Report type in error when not user creatable.
  include/qemu/host-utils.h: Trivial typo: ctz->cto

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e00ef747 25254a71

exec.c

+1 −3
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */

#include "config.h"

#ifdef _WIN32

#include <windows.h>

#else

#ifndef _WIN32

#include <sys/types.h>

#include <sys/mman.h>

#endif

include/qapi/qmp/qjson.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "qapi/qmp/qobject.h"

#include "qapi/qmp/qstring.h"



QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);

QObject *qobject_from_json(const char *string);

QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);

QObject *qobject_from_jsonv(const char *string, va_list *ap) GCC_FMT_ATTR(1, 0);

include/qemu/bswap.h

+5 −5
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static inline int ldsb_p(const void *ptr) 
    return *(int8_t *)ptr;

}



static inline void stb_p(void *ptr, int v)

static inline void stb_p(void *ptr, uint8_t v)

{

    *(uint8_t *)ptr = v;

}
@@ -300,12 +300,12 @@ static inline uint64_t ldq_le_p(const void *ptr) 
    return le_bswap(ldq_p(ptr), 64);

}



static inline void stw_le_p(void *ptr, int v)

static inline void stw_le_p(void *ptr, uint16_t v)

{

    stw_p(ptr, le_bswap(v, 16));

}



static inline void stl_le_p(void *ptr, int v)

static inline void stl_le_p(void *ptr, uint32_t v)

{

    stl_p(ptr, le_bswap(v, 32));

}
@@ -365,12 +365,12 @@ static inline uint64_t ldq_be_p(const void *ptr) 
    return be_bswap(ldq_p(ptr), 64);

}



static inline void stw_be_p(void *ptr, int v)

static inline void stw_be_p(void *ptr, uint16_t v)

{

    stw_p(ptr, be_bswap(v, 16));

}



static inline void stl_be_p(void *ptr, int v)

static inline void stl_be_p(void *ptr, uint32_t v)

{

    stl_p(ptr, be_bswap(v, 32));

}

include/qemu/host-utils.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static inline int ctz64(uint64_t val) 
}



/**

 * ctz64 - count trailing ones in a 64-bit value.

 * cto64 - count trailing ones in a 64-bit value.

 * @val: The value to search

 *

 * Returns 64 if the value is -1.

qemu-img.c

+0 −6
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ 
#include "block/block_int.h"

#include "block/qapi.h"

#include <getopt.h>

#include <stdio.h>

#include <stdarg.h>



#ifdef _WIN32

#include <windows.h>

#endif



typedef struct img_cmd_t {

    const char *name;