Commit 518352b6 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



trivial patches for 2016-09-15

# gpg: Signature made Thu 15 Sep 2016 13:40:55 BST
# gpg:                using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* remotes/mjt/tags/trivial-patches-fetch: (21 commits)
  mptsas: change .realize function name
  linux-user/qemu.h: change malloc to g_malloc, free to g_free
  win32: don't run subprocess tests on Mingw32 platform
  sheepdog: remove useless casts
  fw_cfg: remove useless casts
  tricore: remove useless cast
  s390x: remove useless cast
  linux-user,s390x: remove useless cast
  coccinelle: add a script to remove useless casts
  curl: Operate on zero-length file
  Remove unused function declarations
  ivshmem: Delete duplicate debug message
  sh4: fix broken link to documentation
  MAINTAINERS: Fix up F: entry bit rot
  MAINTAINERS: Add include/sysemu/cpus.h
  MAINTAINERS: Add include/hw/sh4/ to SH4 section
  MAINTAINERS: Add include/hw/tricore/ to TriCore section
  MAINTAINERS: Add include/hw/unicore32/ to UniCore32 section
  ui/console: Fix non-working backspace key in monitor of gtk UI
  tcg: Remove duplicate header includes
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9f16390c afe4c953

MAINTAINERS

+7 −13
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ F: include/exec/cpu*.h 
F: include/exec/exec-all.h

F: include/exec/helper*.h

F: include/exec/tb-hash.h

F: include/sysemu/cpus.h



FPU emulation

M: Aurelien Jarno <aurelien@aurel32.net>
@@ -187,6 +188,7 @@ S: Odd Fixes 
F: target-sh4/

F: hw/sh4/

F: disas/sh4.c

F: include/hw/sh4/



SPARC

M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
@@ -202,6 +204,7 @@ M: Guan Xuetao <gxt@mprc.pku.edu.cn> 
S: Maintained

F: target-unicore32/

F: hw/unicore32/

F: include/hw/unicore32/



X86

M: Paolo Bonzini <pbonzini@redhat.com>
@@ -225,6 +228,7 @@ M: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> 
S: Maintained

F: target-tricore/

F: hw/tricore/

F: include/hw/tricore/



Guest CPU Cores (KVM):

----------------------
@@ -456,7 +460,6 @@ S: Maintained 
F: hw/*/xilinx_*

F: hw/*/cadence_*

F: hw/misc/zynq_slcr.c

F: include/hw/xilinx.h

X: hw/ssi/xilinx_*



Xilinx ZynqMP
@@ -465,7 +468,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com> 
L: qemu-arm@nongnu.org

S: Maintained

F: hw/*/xlnx*.c

F: include/hw/*/xlnx*.c

F: include/hw/*/xlnx*.h



ARM ACPI Subsystem

M: Shannon Zhao <zhaoshenglong@huawei.com>
@@ -695,7 +698,7 @@ F: hw/i2c/smbus_ich9.c 
F: hw/acpi/piix4.c

F: hw/acpi/ich9.c

F: include/hw/acpi/ich9.h

F: include/hw/acpi/piix.h

F: include/hw/acpi/piix4.h

F: hw/misc/sga.c



PC Chipset
@@ -801,10 +804,8 @@ F: hw/mem/* 
F: hw/acpi/*

F: hw/smbios/*

F: hw/i386/acpi-build.[hc]

F: hw/i386/*dsl

F: hw/arm/virt-acpi-build.c

F: include/hw/arm/virt-acpi-build.h

F: scripts/acpi*py



ppc4xx

M: Alexander Graf <agraf@suse.de>
@@ -906,7 +907,6 @@ L: qemu-block@nongnu.org 
S: Supported

F: hw/block/virtio-blk.c

F: hw/block/dataplane/*

F: hw/virtio/dataplane/*

T: git git://github.com/stefanha/qemu.git block



virtio-ccw
@@ -1068,12 +1068,6 @@ S: Supported 
F: qom/cpu.c

F: include/qom/cpu.h



ICC Bus

M: Igor Mammedov <imammedo@redhat.com>

S: Supported

F: include/hw/cpu/icc_bus.h

F: hw/cpu/icc_bus.c



Device Tree

M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

M: Alexander Graf <agraf@suse.de>
@@ -1589,7 +1583,7 @@ M: Kevin Wolf <kwolf@redhat.com> 
L: qemu-block@nongnu.org

S: Supported

F: block/linux-aio.c

F: block/raw-aio.h

F: include/block/raw-aio.h

F: block/raw-posix.c

F: block/raw-win32.c

F: block/raw_bsd.c

block/curl.c

+21 −4
Original line number Diff line number Diff line
@@ -675,11 +675,28 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, 
    curl_easy_setopt(state->curl, CURLOPT_HEADERDATA, s);

    if (curl_easy_perform(state->curl))

        goto out;

    curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d);

    if (d)

        s->len = (size_t)d;

    else if(!s->len)

    if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) {

        goto out;

    }

    /* Prior CURL 7.19.4 return value of 0 could mean that the file size is not

     * know or the size is zero. From 7.19.4 CURL returns -1 if size is not

     * known and zero if it is realy zero-length file. */

#if LIBCURL_VERSION_NUM >= 0x071304

    if (d < 0) {

        pstrcpy(state->errmsg, CURL_ERROR_SIZE,

                "Server didn't report file size.");

        goto out;

    }

#else

    if (d <= 0) {

        pstrcpy(state->errmsg, CURL_ERROR_SIZE,

                "Unknown file size or zero-length file.");

        goto out;

    }

#endif



    s->len = (size_t)d;



    if ((!strncasecmp(s->url, "http://", strlen("http://"))

        || !strncasecmp(s->url, "https://", strlen("https://")))

        && !s->accept_range) {

block/qcow2.h

+0 −1
Original line number Diff line number Diff line
@@ -530,7 +530,6 @@ int qcow2_change_refcount_order(BlockDriverState *bs, int refcount_order, 
int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,

                        bool exact_size);

int qcow2_write_l1_entry(BlockDriverState *bs, int l1_index);

void qcow2_l2_cache_reset(BlockDriverState *bs);

int qcow2_decompress_cluster(BlockDriverState *bs, uint64_t cluster_offset);

int qcow2_encrypt_sectors(BDRVQcow2State *s, int64_t sector_num,

                          uint8_t *out_buf, const uint8_t *in_buf,

block/sheepdog.c

+2 −2
Original line number Diff line number Diff line
@@ -1049,7 +1049,7 @@ static int parse_vdiname(BDRVSheepdogState *s, const char *filename, 
    const char *host_spec, *vdi_spec;

    int nr_sep, ret;



    strstart(filename, "sheepdog:", (const char **)&filename);

    strstart(filename, "sheepdog:", &filename);

    p = q = g_strdup(filename);



    /* count the number of separators */
@@ -2652,7 +2652,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) 
    req.opcode = SD_OP_READ_VDIS;

    req.data_length = max;



    ret = do_req(fd, s->aio_context, (SheepdogReq *)&req,

    ret = do_req(fd, s->aio_context, &req,

                 vdi_inuse, &wlen, &rlen);



    closesocket(fd);

configure

+1 −6
Original line number Diff line number Diff line
@@ -511,8 +511,6 @@ elif check_define __arm__ ; then 
  cpu="arm"

elif check_define __aarch64__ ; then

  cpu="aarch64"

elif check_define __hppa__ ; then

  cpu="hppa"

else

  cpu=$(uname -m)

fi
@@ -3016,7 +3014,7 @@ fi 


# g_test_trap_subprocess added in 2.38. Used by some tests.

glib_subprocess=yes

if ! $pkg_config --atleast-version=2.38 glib-2.0; then

if test "$mingw32" = "yes" || ! $pkg_config --atleast-version=2.38 glib-2.0; then

    glib_subprocess=no

fi
@@ -5899,9 +5897,6 @@ for i in $ARCH $TARGET_BASE_ARCH ; do 
  cris)

    disas_config "CRIS"

  ;;

  hppa)

    disas_config "HPPA"

  ;;

  i386|x86_64|x32)

    disas_config "I386"

  ;;