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

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-02-11' into staging 



trivial patches for 2016-02-11

# gpg: Signature made Thu 11 Feb 2016 12:16:04 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-2016-02-11:
  w32: include winsock2.h before windows.h
  Adds keycode 86 to the hid_usage_keys translation table.
  s390x: remove s390-zipl.rom
  Passthru CCID card: QOMify
  Emulated CCID card: QOMify
  ES1370: QOMify
  char: fix parameter name / type in BSD codepath
  qmp-spec: fix index in doc
  rdma: remove check on time_spent when calculating mbs
  qemu-sockets: simplify error handling
  cpu: cpu_save/cpu_load is no more
  qom: Correct object_property_get_int() description
  man: virtfs-proxy-helper: Rework awkward sentence
  remove libtool support

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f1636845 1834ed3a

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -400,7 +400,6 @@ efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ 
qemu-icon.bmp qemu_logo_no_text.svg \

bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \

multiboot.bin linuxboot.bin kvmvapic.bin \

s390-zipl.rom \

s390-ccw.img \

spapr-rtas.bin slof.bin \

palcode-clipper \

configure

+2 −84
Original line number Diff line number Diff line
@@ -116,38 +116,6 @@ compile_prog() { 
  do_cc $QEMU_CFLAGS $local_cflags -o $TMPE $TMPC $LDFLAGS $local_ldflags

}



do_libtool() {

    local mode=$1

    shift

    # Run the compiler, capturing its output to the log.

    echo $libtool $mode --tag=CC $cc "$@" >> config.log

    $libtool $mode --tag=CC $cc "$@" >> config.log 2>&1 || return $?

    # Test passed. If this is an --enable-werror build, rerun

    # the test with -Werror and bail out if it fails. This

    # makes warning-generating-errors in configure test code

    # obvious to developers.

    if test "$werror" != "yes"; then

        return 0

    fi

    # Don't bother rerunning the compile if we were already using -Werror

    case "$*" in

        *-Werror*)

           return 0

        ;;

    esac

    echo $libtool $mode --tag=CC $cc -Werror "$@" >> config.log

    $libtool $mode --tag=CC $cc -Werror "$@" >> config.log 2>&1 && return $?

    error_exit "configure test passed without -Werror but failed with -Werror." \

        "This is probably a bug in the configure script. The failing command" \

        "will be at the bottom of config.log." \

        "You can run configure with --disable-werror to bypass this check."

}



libtool_prog() {

    do_libtool --mode=compile $QEMU_CFLAGS -c -fPIE -DPIE -o $TMPO $TMPC || return $?

    do_libtool --mode=link $LDFLAGS -o $TMPA $TMPL -rpath /usr/local/lib

}



# symbolically link $1 to $2.  Portable version of "ln -sf".

symlink() {

  rm -rf "$2"
@@ -398,7 +366,6 @@ as="${AS-${cross_prefix}as}" 
cpp="${CPP-$cc -E}"

objcopy="${OBJCOPY-${cross_prefix}objcopy}"

ld="${LD-${cross_prefix}ld}"

libtool="${LIBTOOL-${cross_prefix}libtool}"

nm="${NM-${cross_prefix}nm}"

strip="${STRIP-${cross_prefix}strip}"

windres="${WINDRES-${cross_prefix}windres}"
@@ -1514,7 +1481,6 @@ EOF 
    if do_cc $QEMU_CFLAGS -Werror $flag -c -o $TMPO $TMPC &&

       compile_prog "-Werror $flag" ""; then

      QEMU_CFLAGS="$QEMU_CFLAGS $flag"

      LIBTOOLFLAGS="$LIBTOOLFLAGS -Wc,$flag"

      sp_on=1

      break

    fi
@@ -1609,32 +1575,6 @@ EOF 
  fi

fi



# check for broken gcc and libtool in RHEL5

if test -n "$libtool" -a "$pie" != "no" ; then

  cat > $TMPC <<EOF



void *f(unsigned char *buf, int len);

void *g(unsigned char *buf, int len);



void *

f(unsigned char *buf, int len)

{

    return (void*)0L;

}



void *

g(unsigned char *buf, int len)

{

    return f(buf, len);

}



EOF

  if ! libtool_prog; then

    echo "Disabling libtool due to broken toolchain support"

    libtool=

  fi

fi



##########################################

# __sync_fetch_and_and requires at least -march=i486. Many toolchains

# use i686 as default anyway, but for those that don't, an explicit
@@ -2240,21 +2180,6 @@ if test "$xen_pv_domain_build" = "yes" && 
	       "which requires Xen support."

fi



##########################################

# libtool probe



if ! has $libtool; then

    libtool=

fi



# MacOSX ships with a libtool which isn't the GNU one; weed this

# out by checking whether libtool supports the --version switch

if test -n "$libtool"; then

  if ! "$libtool" --version >/dev/null 2>&1; then

    libtool=

  fi

fi



##########################################

# Sparse probe

if test "$sparse" != "no" ; then
@@ -5525,13 +5450,8 @@ echo "MAKE=$make" >> $config_host_mak 
echo "INSTALL=$install" >> $config_host_mak

echo "INSTALL_DIR=$install -d -m 0755" >> $config_host_mak

echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak

if test -n "$libtool"; then

  echo "INSTALL_PROG=\$(LIBTOOL) --mode=install $install -c -m 0755" >> $config_host_mak

  echo "INSTALL_LIB=\$(LIBTOOL) --mode=install $install -c -m 0644" >> $config_host_mak

else

echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak

echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak

fi

echo "PYTHON=$python" >> $config_host_mak

echo "CC=$cc" >> $config_host_mak

if $iasl -h > /dev/null 2>&1; then
@@ -5549,7 +5469,6 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak 
echo "LD=$ld" >> $config_host_mak

echo "NM=$nm" >> $config_host_mak

echo "WINDRES=$windres" >> $config_host_mak

echo "LIBTOOL=$libtool" >> $config_host_mak

echo "CFLAGS=$CFLAGS" >> $config_host_mak

echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak

echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
@@ -5568,7 +5487,6 @@ else 
fi

echo "LDFLAGS=$LDFLAGS" >> $config_host_mak

echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak

echo "LIBTOOLFLAGS=$LIBTOOLFLAGS" >> $config_host_mak

echo "LIBS+=$LIBS" >> $config_host_mak

echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak

echo "EXESUF=$EXESUF" >> $config_host_mak

docs/qmp-spec.txt

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ Some events are rate-limited to at most one per second. If additional 
dropped, and the last one is delayed.  "Similar" normally means same

event type.  See qmp-events.txt for details.



2.5 QGA Synchronization

2.6 QGA Synchronization

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



When using QGA, an additional synchronization feature is built into

exec.c

+0 −6
Original line number Diff line number Diff line
@@ -661,12 +661,6 @@ void cpu_exec_init(CPUState *cpu, Error **errp) 
    if (qdev_get_vmsd(DEVICE(cpu)) == NULL) {

        vmstate_register(NULL, cpu_index, &vmstate_cpu_common, cpu);

    }

#if defined(CPU_SAVE_VERSION) && !defined(CONFIG_USER_ONLY)

    register_savevm(NULL, "cpu", cpu_index, CPU_SAVE_VERSION,

                    cpu_save, cpu_load, cpu->env_ptr);

    assert(cc->vmsd == NULL);

    assert(qdev_get_vmsd(DEVICE(cpu)) == NULL);

#endif

    if (cc->vmsd != NULL) {

        vmstate_register(NULL, cpu_index, cc->vmsd, cpu);

    }

fsdev/virtfs-proxy-helper.texi

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ QEMU and proxy helper communicate using this socket. QEMU proxy fs 
driver sends filesystem request to proxy helper and receives the

response from it.



Proxy helper is designed so that it can drop the root privilege with

retaining capbilities needed for doing filesystem operations only.

The proxy helper is designed so that it can drop root privileges except

for the capabilities needed for doing filesystem operations.



@end table

@c man end