Commit 5a93d5c2 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mjt/trivial-patches' into staging 



# By Stefan Weil (6) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  aio / timers: use g_usleep() not sleep()
  adlib: sort offsets in portio registration
  qmp: fix integer usage in examples
  tci: Remove function tcg_out64 (fix broken build)
  target-arm: Report unimplemented opcodes (LOG_UNIMP)
  pflash_cfi02.c: fix debug macro
  configure: Remove unneeded redirections of stderr (pkg-config --exists)
  configure: Remove unneeded redirections of stderr (pkg-config --cflags, --libs)
  configure: Don't write .pyc files by default (python -B)
  curl: qemu_bh_new() can never return NULL
  slirp/arp_table.c: Avoid shifting into sign bit of signed integers
  configure: disable clang -Wstring-plus-int warning
  rdma: silly ipv6 bugfix
  misc: Fix some typos in names and comments
  slirp: Port redirection option behave differently on Linux and Windows

Message-id: 1378119695-14568-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 9ea0f58f fcdda211

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static void coroutine_fn backup_run(void *opaque) 


                for (i = 0; i < BACKUP_SECTORS_PER_CLUSTER;) {

                    /* bdrv_co_is_allocated() only returns true/false based

                     * on the first set of sectors it comes accross that

                     * on the first set of sectors it comes across that

                     * are are all in the same state.

                     * For that reason we must verify each sector in the

                     * backup cluster length.  We end up copying more than

block/curl.c

+0 −6
Original line number Diff line number Diff line
@@ -572,12 +572,6 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, 
    acb->nb_sectors = nb_sectors;



    acb->bh = qemu_bh_new(curl_readv_bh_cb, acb);



    if (!acb->bh) {

        DPRINTF("CURL: qemu_bh_new failed\n");

        return NULL;

    }



    qemu_bh_schedule(acb->bh);

    return &acb->common;

}

configure

+35 −36
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ fi 


: ${make=${MAKE-make}}

: ${install=${INSTALL-install}}

: ${python=${PYTHON-python}}

: ${python=${PYTHON-python -B}}

: ${smbd=${SMBD-/usr/sbin/smbd}}



# Default objcc to clang if available, otherwise use CC
@@ -1213,6 +1213,7 @@ gcc_flags="-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers $gcc_ 
gcc_flags="-Wmissing-include-dirs -Wempty-body -Wnested-externs $gcc_flags"

gcc_flags="-Wendif-labels $gcc_flags"

gcc_flags="-Wno-initializer-overrides $gcc_flags"

gcc_flags="-Wno-string-plus-int $gcc_flags"

# Note that we do not add -Werror to gcc_flags here, because that would

# enable it for all configure tests. If a configure test failed due

# to -Werror this would just silently disable some features,
@@ -1357,7 +1358,7 @@ fi 


# Note that if the Python conditional here evaluates True we will exit

# with status 1 which is a shell 'false' value.

if ! "$python" -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_info >= (3,))'; then

if ! $python -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_info >= (3,))'; then

  error_exit "Cannot use '$python', Python 2.4 or later is required." \

      "Note that Python 3 or later is not yet supported." \

      "Use --python=/path/to/python to specify a supported Python."
@@ -1478,7 +1479,7 @@ libs_softmmu="$libs_softmmu -lz" 
# libseccomp check



if test "$seccomp" != "no" ; then

    if $pkg_config --atleast-version=2.1.0 libseccomp --modversion >/dev/null 2>&1; then

    if $pkg_config --atleast-version=2.1.0 libseccomp; then

        libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`"

        QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`"

	seccomp="yes"
@@ -1712,10 +1713,10 @@ if test "$gtk" != "no"; then 
        fi

        gtk="no"

    else

	gtk_cflags=`$pkg_config --cflags $gtkpackage 2>/dev/null`

	gtk_libs=`$pkg_config --libs $gtkpackage 2>/dev/null`

	vte_cflags=`$pkg_config --cflags $vtepackage 2>/dev/null`

	vte_libs=`$pkg_config --libs $vtepackage 2>/dev/null`

	gtk_cflags=`$pkg_config --cflags $gtkpackage`

	gtk_libs=`$pkg_config --libs $gtkpackage`

	vte_cflags=`$pkg_config --cflags $vtepackage`

	vte_libs=`$pkg_config --libs $vtepackage`

	libs_softmmu="$gtk_libs $vte_libs $libs_softmmu"

	gtk="yes"

    fi
@@ -1730,7 +1731,7 @@ if test "`basename $sdl_config`" != sdl-config && ! has ${sdl_config}; then 
  sdl_config=sdl-config

fi



if $pkg_config sdl --modversion >/dev/null 2>&1; then

if $pkg_config sdl --exists; then

  sdlconfig="$pkg_config sdl"

  _sdlversion=`$sdlconfig --modversion 2>/dev/null | sed 's/[^0-9]//g'`

elif has ${sdl_config}; then
@@ -1916,9 +1917,9 @@ int main(void) { 
    return png_ptr != 0;

}

EOF

  if $pkg_config libpng --modversion >/dev/null 2>&1; then

    vnc_png_cflags=`$pkg_config libpng --cflags 2> /dev/null`

    vnc_png_libs=`$pkg_config libpng --libs 2> /dev/null`

  if $pkg_config libpng --exists; then

    vnc_png_cflags=`$pkg_config libpng --cflags`

    vnc_png_libs=`$pkg_config libpng --libs`

  else

    vnc_png_cflags=""

    vnc_png_libs="-lpng"
@@ -2195,7 +2196,7 @@ fi 
##########################################

# curl probe

if test "$curl" != "no" ; then

  if $pkg_config libcurl --modversion >/dev/null 2>&1; then

  if $pkg_config libcurl --exists; then

    curlconfig="$pkg_config libcurl"

  else

    curlconfig=curl-config
@@ -2247,10 +2248,9 @@ if test "$mingw32" = yes; then 
else

    glib_req_ver=2.12

fi

if $pkg_config --atleast-version=$glib_req_ver gthread-2.0 > /dev/null 2>&1

then

    glib_cflags=`$pkg_config --cflags gthread-2.0 2>/dev/null`

    glib_libs=`$pkg_config --libs gthread-2.0 2>/dev/null`

if $pkg_config --atleast-version=$glib_req_ver gthread-2.0; then

    glib_cflags=`$pkg_config --cflags gthread-2.0`

    glib_libs=`$pkg_config --libs gthread-2.0`

    LIBS="$glib_libs $LIBS"

    libs_qga="$glib_libs $libs_qga"

else
@@ -2279,8 +2279,8 @@ if test "$pixman" = "none"; then 
  pixman_cflags=

  pixman_libs=

elif test "$pixman" = "system"; then

  pixman_cflags=`$pkg_config --cflags pixman-1 2>/dev/null`

  pixman_libs=`$pkg_config --libs pixman-1 2>/dev/null`

  pixman_cflags=`$pkg_config --cflags pixman-1`

  pixman_libs=`$pkg_config --libs pixman-1`

else

  if test ! -d ${source_path}/pixman/pixman; then

    error_exit "pixman not present. Your options:" \
@@ -2379,8 +2379,7 @@ fi 
# libssh2 probe

min_libssh2_version=1.2.8

if test "$libssh2" != "no" ; then

  if $pkg_config --atleast-version=$min_libssh2_version libssh2 >/dev/null 2>&1

  then

  if $pkg_config --atleast-version=$min_libssh2_version libssh2; then

    libssh2_cflags=`$pkg_config libssh2 --cflags`

    libssh2_libs=`$pkg_config libssh2 --libs`

    libssh2=yes
@@ -2598,14 +2597,14 @@ fi 
##########################################

# glusterfs probe

if test "$glusterfs" != "no" ; then

  if $pkg_config --atleast-version=3 glusterfs-api >/dev/null 2>&1; then

  if $pkg_config --atleast-version=3 glusterfs-api; then

    glusterfs="yes"

    glusterfs_cflags=`$pkg_config --cflags glusterfs-api 2>/dev/null`

    glusterfs_libs=`$pkg_config --libs glusterfs-api 2>/dev/null`

    glusterfs_cflags=`$pkg_config --cflags glusterfs-api`

    glusterfs_libs=`$pkg_config --libs glusterfs-api`

    CFLAGS="$CFLAGS $glusterfs_cflags"

    libs_tools="$glusterfs_libs $libs_tools"

    libs_softmmu="$glusterfs_libs $libs_softmmu"

    if $pkg_config --atleast-version=5 glusterfs-api >/dev/null 2>&1; then

    if $pkg_config --atleast-version=5 glusterfs-api; then

      glusterfs_discard="yes"

    fi

  else
@@ -2968,10 +2967,10 @@ if test "$libiscsi" != "no" ; then 
#include <iscsi/iscsi.h>

int main(void) { iscsi_unmap_sync(NULL,0,0,0,NULL,0); return 0; }

EOF

  if $pkg_config --atleast-version=1.7.0 libiscsi --modversion >/dev/null 2>&1; then

  if $pkg_config --atleast-version=1.7.0 libiscsi; then

    libiscsi="yes"

    libiscsi_cflags=$($pkg_config --cflags libiscsi 2>/dev/null)

    libiscsi_libs=$($pkg_config --libs libiscsi 2>/dev/null)

    libiscsi_cflags=$($pkg_config --cflags libiscsi)

    libiscsi_libs=$($pkg_config --libs libiscsi)

    CFLAGS="$CFLAGS $libiscsi_cflags"

    LIBS="$LIBS $libiscsi_libs"

  elif compile_prog "" "-liscsi" ; then
@@ -3038,8 +3037,8 @@ int main(void) { spice_server_new(); return 0; } 
EOF

  spice_cflags=$($pkg_config --cflags spice-protocol spice-server 2>/dev/null)

  spice_libs=$($pkg_config --libs spice-protocol spice-server 2>/dev/null)

  if $pkg_config --atleast-version=0.12.0 spice-server >/dev/null 2>&1 && \

     $pkg_config --atleast-version=0.12.3 spice-protocol > /dev/null 2>&1 && \

  if $pkg_config --atleast-version=0.12.0 spice-server && \

     $pkg_config --atleast-version=0.12.3 spice-protocol && \

     compile_prog "$spice_cflags" "$spice_libs" ; then

    spice="yes"

    libs_softmmu="$libs_softmmu $spice_libs"
@@ -3074,7 +3073,7 @@ EOF 
        test_cflags="-Werror $test_cflags"

    fi

    if test -n "$libtool" &&

            $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \

       $pkg_config --atleast-version=3.12.8 nss && \

      compile_prog "$test_cflags" "$libcacard_libs"; then

        smartcard_nss="yes"

        QEMU_CFLAGS="$QEMU_CFLAGS $libcacard_cflags"
@@ -3090,11 +3089,11 @@ fi 


# check for libusb

if test "$libusb" != "no" ; then

    if $pkg_config --atleast-version=1.0.13 libusb-1.0 >/dev/null 2>&1 ; then

    if $pkg_config --atleast-version=1.0.13 libusb-1.0; then

        libusb="yes"

	usb="libusb"

        libusb_cflags=$($pkg_config --cflags libusb-1.0 2>/dev/null)

        libusb_libs=$($pkg_config --libs libusb-1.0 2>/dev/null)

        libusb_cflags=$($pkg_config --cflags libusb-1.0)

        libusb_libs=$($pkg_config --libs libusb-1.0)

        QEMU_CFLAGS="$QEMU_CFLAGS $libusb_cflags"

        libs_softmmu="$libs_softmmu $libusb_libs"

    else
@@ -3107,10 +3106,10 @@ fi 


# check for usbredirparser for usb network redirection support

if test "$usb_redir" != "no" ; then

    if $pkg_config --atleast-version=0.6 libusbredirparser-0.5 >/dev/null 2>&1 ; then

    if $pkg_config --atleast-version=0.6 libusbredirparser-0.5; then

        usb_redir="yes"

        usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)

        usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)

        usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5)

        usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5)

        QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"

        libs_softmmu="$libs_softmmu $usb_redir_libs"

    else

hw/audio/adlib.c

+1 −1
Original line number Diff line number Diff line
@@ -284,9 +284,9 @@ static void Adlib_fini (AdlibState *s) 
}



static MemoryRegionPortio adlib_portio_list[] = {

    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },

    { 0, 4, 1, .read = adlib_read, .write = adlib_write, },

    { 0, 2, 1, .read = adlib_read, .write = adlib_write, },

    { 0x388, 4, 1, .read = adlib_read, .write = adlib_write, },

    PORTIO_END_OF_LIST(),

};

hw/block/pflash_cfi02.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#ifdef PFLASH_DEBUG

#define DPRINTF(fmt, ...)                                  \

do {                                                       \

    fprintf(stderr "PFLASH: " fmt , ## __VA_ARGS__);       \

    fprintf(stderr, "PFLASH: " fmt , ## __VA_ARGS__);       \

} while (0)

#else

#define DPRINTF(fmt, ...) do { } while (0)