Commit 01eb3139 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



trivial patches for 2014-09-03

# gpg: Signature made Wed 03 Sep 2014 06:53:42 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-09-03:
  slirp: Honour vlan/stack in hostfwd_remove commands
  hmp: fix MemdevList memory leak
  qom/object.c, hmp.c: fix string_output_get_string() memory leak
  query-memdev: fix potential memory leaks
  MAINTAINERS: Add VMWare devices maintainer
  device_tree.c: dump all err mesages with error_report
  device_tree.c: redirect load_device_tree err message to stderr
  scripts: Remove scripts/qtest
  Fix debug print warning
  curl: The macro that you have to uncomment to get debugging is DEBUG_CURL.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b27e37d4 70381662

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -684,6 +684,12 @@ S: Maintained 
F: hw/*/xilinx_*

F: include/hw/xilinx.h



Vmware

M: Dmitry Fleytman <dmitry@daynix.com>

S: Maintained

F: hw/net/vmxnet*

F: hw/scsi/vmw_pvscsi*



Subsystems

----------

Audio

block/curl.c

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

#include <curl/curl.h>



// #define DEBUG

// #define DEBUG_CURL

// #define DEBUG_VERBOSE



#ifdef DEBUG_CURL

device_tree.c

+28 −27
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "config.h"

#include "qemu-common.h"

#include "qemu/error-report.h"

#include "sysemu/device_tree.h"

#include "sysemu/sysemu.h"

#include "hw/loader.h"
@@ -59,13 +60,13 @@ void *create_device_tree(int *sizep) 
    }

    ret = fdt_open_into(fdt, fdt, *sizep);

    if (ret) {

        fprintf(stderr, "Unable to copy device tree in memory\n");

        error_report("Unable to copy device tree in memory");

        exit(1);

    }



    return fdt;

fail:

    fprintf(stderr, "%s Couldn't create dt: %s\n", __func__, fdt_strerror(ret));

    error_report("%s Couldn't create dt: %s", __func__, fdt_strerror(ret));

    exit(1);

}
@@ -79,7 +80,7 @@ void *load_device_tree(const char *filename_path, int *sizep) 
    *sizep = 0;

    dt_size = get_image_size(filename_path);

    if (dt_size < 0) {

        printf("Unable to get size of device tree file '%s'\n",

        error_report("Unable to get size of device tree file '%s'",

                     filename_path);

        goto fail;

    }
@@ -92,20 +93,20 @@ void *load_device_tree(const char *filename_path, int *sizep) 


    dt_file_load_size = load_image(filename_path, fdt);

    if (dt_file_load_size < 0) {

        printf("Unable to open device tree file '%s'\n",

        error_report("Unable to open device tree file '%s'",

                     filename_path);

        goto fail;

    }



    ret = fdt_open_into(fdt, fdt, dt_size);

    if (ret) {

        printf("Unable to copy device tree in memory\n");

        error_report("Unable to copy device tree in memory");

        goto fail;

    }



    /* Check sanity of device tree */

    if (fdt_check_header(fdt)) {

        printf ("Device tree file loaded into memory is invalid: %s\n",

        error_report("Device tree file loaded into memory is invalid: %s",

                     filename_path);

        goto fail;

    }
@@ -123,7 +124,7 @@ static int findnode_nofail(void *fdt, const char *node_path) 


    offset = fdt_path_offset(fdt, node_path);

    if (offset < 0) {

        fprintf(stderr, "%s Couldn't find node %s: %s\n", __func__, node_path,

        error_report("%s Couldn't find node %s: %s", __func__, node_path,

                     fdt_strerror(offset));

        exit(1);

    }
@@ -138,7 +139,7 @@ int qemu_fdt_setprop(void *fdt, const char *node_path, 


    r = fdt_setprop(fdt, findnode_nofail(fdt, node_path), property, val, size);

    if (r < 0) {

        fprintf(stderr, "%s: Couldn't set %s/%s: %s\n", __func__, node_path,

        error_report("%s: Couldn't set %s/%s: %s", __func__, node_path,

                     property, fdt_strerror(r));

        exit(1);

    }
@@ -153,7 +154,7 @@ int qemu_fdt_setprop_cell(void *fdt, const char *node_path, 


    r = fdt_setprop_cell(fdt, findnode_nofail(fdt, node_path), property, val);

    if (r < 0) {

        fprintf(stderr, "%s: Couldn't set %s/%s = %#08x: %s\n", __func__,

        error_report("%s: Couldn't set %s/%s = %#08x: %s", __func__,

                     node_path, property, val, fdt_strerror(r));

        exit(1);

    }
@@ -175,7 +176,7 @@ int qemu_fdt_setprop_string(void *fdt, const char *node_path, 


    r = fdt_setprop_string(fdt, findnode_nofail(fdt, node_path), property, string);

    if (r < 0) {

        fprintf(stderr, "%s: Couldn't set %s/%s = %s: %s\n", __func__,

        error_report("%s: Couldn't set %s/%s = %s: %s", __func__,

                     node_path, property, string, fdt_strerror(r));

        exit(1);

    }
@@ -193,7 +194,7 @@ const void *qemu_fdt_getprop(void *fdt, const char *node_path, 
    }

    r = fdt_getprop(fdt, findnode_nofail(fdt, node_path), property, lenp);

    if (!r) {

        fprintf(stderr, "%s: Couldn't get %s/%s: %s\n", __func__,

        error_report("%s: Couldn't get %s/%s: %s", __func__,

                     node_path, property, fdt_strerror(*lenp));

        exit(1);

    }
@@ -206,7 +207,7 @@ uint32_t qemu_fdt_getprop_cell(void *fdt, const char *node_path, 
    int len;

    const uint32_t *p = qemu_fdt_getprop(fdt, node_path, property, &len);

    if (len != 4) {

        fprintf(stderr, "%s: %s/%s not 4 bytes long (not a cell?)\n",

        error_report("%s: %s/%s not 4 bytes long (not a cell?)",

                     __func__, node_path, property);

        exit(1);

    }
@@ -219,7 +220,7 @@ uint32_t qemu_fdt_get_phandle(void *fdt, const char *path) 


    r = fdt_get_phandle(fdt, findnode_nofail(fdt, path));

    if (r == 0) {

        fprintf(stderr, "%s: Couldn't get phandle for %s: %s\n", __func__,

        error_report("%s: Couldn't get phandle for %s: %s", __func__,

                     path, fdt_strerror(r));

        exit(1);

    }
@@ -265,7 +266,7 @@ int qemu_fdt_nop_node(void *fdt, const char *node_path) 


    r = fdt_nop_node(fdt, findnode_nofail(fdt, node_path));

    if (r < 0) {

        fprintf(stderr, "%s: Couldn't nop node %s: %s\n", __func__, node_path,

        error_report("%s: Couldn't nop node %s: %s", __func__, node_path,

                     fdt_strerror(r));

        exit(1);

    }
@@ -294,7 +295,7 @@ int qemu_fdt_add_subnode(void *fdt, const char *name) 


    retval = fdt_add_subnode(fdt, parent, basename);

    if (retval < 0) {

        fprintf(stderr, "FDT: Failed to create subnode %s: %s\n", name,

        error_report("FDT: Failed to create subnode %s: %s", name,

                     fdt_strerror(retval));

        exit(1);

    }

hmp.c

+6 −2
Original line number Diff line number Diff line
@@ -1687,6 +1687,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 
    MemdevList *memdev_list = qmp_query_memdev(&err);

    MemdevList *m = memdev_list;

    StringOutputVisitor *ov;

    char *str;

    int i = 0;
@@ -1704,13 +1705,16 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict) 
                       m->value->prealloc ? "true" : "false");

        monitor_printf(mon, "  policy: %s\n",

                       HostMemPolicy_lookup[m->value->policy]);

        monitor_printf(mon, "  host nodes: %s\n",

                       string_output_get_string(ov));

        str = string_output_get_string(ov);

        monitor_printf(mon, "  host nodes: %s\n", str);



        g_free(str);

        string_output_visitor_cleanup(ov);

        m = m->next;

        i++;

    }



    monitor_printf(mon, "\n");



    qapi_free_MemdevList(memdev_list);

}

hw/i2c/pm_smbus.c

+3 −2
Original line number Diff line number Diff line
@@ -139,7 +139,8 @@ static void smb_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    PMSMBus *s = opaque;



    SMBUS_DPRINTF("SMB writeb port=0x%04x val=0x%02x\n", addr, val);

    SMBUS_DPRINTF("SMB writeb port=0x%04" HWADDR_PRIx

                  " val=0x%02" PRIx64 "\n", addr, val);

    switch(addr) {

    case SMBHSTSTS:

        s->smb_stat = (~(val & 0xff)) & s->smb_stat;
@@ -206,7 +207,7 @@ static uint64_t smb_ioport_readb(void *opaque, hwaddr addr, unsigned width) 
        val = 0;

        break;

    }

    SMBUS_DPRINTF("SMB readb port=0x%04x val=0x%02x\n", addr, val);

    SMBUS_DPRINTF("SMB readb port=0x%04" HWADDR_PRIx " val=0x%02x\n", addr, val);

    return val;

}