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

Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-05-07' into staging 



trivial patches for 2014-05-07

# gpg: Signature made Wed 07 May 2014 18:01:15 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>"
# 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: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB

* remotes/mjt/tags/trivial-patches-2014-05-07: (21 commits)
  libcacard: remove unnecessary EOL from debug prints
  docs/memory.txt: Fix document on MMIO operations
  readline: Sort completions before printing them.
  readline: use g_strndup instead of open-coding it
  qmp: report path ambiguity error
  libcacard: replace pstrcpy() with memcpy()
  glib: move g_poll() replacement into glib-compat.h
  do not call g_thread_init() for glib >= 2.31
  hw/9pfs: Add include file for exported symbol
  xen: remove unused global, xen_xcg
  hw: Add missing 'static' attributes
  qemu-timer: Add missing 'static' attribute
  ui: Add missing 'static' attribute
  monitor: Add missing 'static' attribute
  hw/s390x: Add missing 'static' attribute
  hw/mips: Add missing 'static' and 'const' attributes
  hw/9pfs: Add missing 'static' attributes
  arch_init: Be sure of only one exit entry with DPRINTF() for ram_load()
  tests/tcg: Fix compilation of test_path
  qga: Fix typo (plural) in comment
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5894145a 8e25c274

arch_init.c

+8 −4
Original line number Diff line number Diff line
@@ -1036,7 +1036,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 
    seq_iter++;



    if (version_id != 4) {

        return -EINVAL;

        ret = -EINVAL;

        goto done;

    }



    do {
@@ -1091,7 +1092,8 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 


            host = host_from_stream_offset(f, addr, flags);

            if (!host) {

                return -EINVAL;

                ret = -EINVAL;

                goto done;

            }



            ch = qemu_get_byte(f);
@@ -1101,14 +1103,16 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 


            host = host_from_stream_offset(f, addr, flags);

            if (!host) {

                return -EINVAL;

                ret = -EINVAL;

                goto done;

            }



            qemu_get_buffer(f, host, TARGET_PAGE_SIZE);

        } else if (flags & RAM_SAVE_FLAG_XBZRLE) {

            void *host = host_from_stream_offset(f, addr, flags);

            if (!host) {

                return -EINVAL;

                ret = -EINVAL;

                goto done;

            }



            if (load_xbzrle(f, addr, host) < 0) {

configure

+1 −1
Original line number Diff line number Diff line
@@ -2632,7 +2632,7 @@ done 
if test "$modules" = yes; then

    shacmd_probe="sha1sum sha1 shasum"

    for c in $shacmd_probe; do

        if which $c &>/dev/null; then

        if which $c >/dev/null 2>&1; then

            shacmd="$c"

            break

        fi

coroutine-gthread.c

+2 −5
Original line number Diff line number Diff line
@@ -115,14 +115,11 @@ static inline GThread *create_thread(GThreadFunc func, gpointer data) 


static void __attribute__((constructor)) coroutine_init(void)

{

    if (!g_thread_supported()) {

#if !GLIB_CHECK_VERSION(2, 31, 0)

    if (!g_thread_supported()) {

        g_thread_init(NULL);

#else

        fprintf(stderr, "glib threading failed to initialize.\n");

        exit(1);

#endif

    }

#endif



    init_coroutine_cond();

}

docs/memory.txt

+5 −5
Original line number Diff line number Diff line
@@ -232,8 +232,8 @@ various constraints can be supplied to control how these callbacks are called: 
   (in bytes) supported by the *implementation*; other access sizes will be

   emulated using the ones available.  For example a 4-byte write will be

   emulated using four 1-byte writes, if .impl.max_access_size = 1.

 - .impl.valid specifies that the *implementation* only supports unaligned

   accesses; unaligned accesses will be emulated by two aligned accesses.

 - .old_portio and .old_mmio can be used to ease porting from code using

   cpu_register_io_memory() and register_ioport().  They should not be used

   in new code.
 
 - .impl.unaligned specifies that the *implementation* supports unaligned

   accesses; if false, unaligned accesses will be emulated by two aligned

   accesses.

 - .old_mmio can be used to ease porting from code using

   cpu_register_io_memory(). It should not be used in new code.

hw/9pfs/virtio-9p-local.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "hw/virtio/virtio.h"

#include "virtio-9p.h"

#include "virtio-9p-xattr.h"

#include "fsdev/qemu-fsdev.h"   /* local_ops */

#include <arpa/inet.h>

#include <pwd.h>

#include <grp.h>