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

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



trivial patches for 2015-09-11

# gpg: Signature made Fri 11 Sep 2015 12:02:43 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>"

* remotes/mjt/tags/pull-trivial-patches-2015-09-11: (26 commits)
  virtio-vga: enable for i386
  hw/arm/spitz: Remove meaningless blank Property
  hw/gpio/zaurus: Remove meaningless blank Property
  hw/virtio/virtio-pci: Remove meaningless blank Property
  hw/s390x/s390-virtio-bus: Remove meaningless blank Property
  typofixes - v4
  qapi-schema: remove legacy<> from doc
  disas/microblaze: Remove unused code
  help: dd missing newline
  Target-ppc: Remove unnecessary variable
  baum: Fix build with debugging enabled
  linux-user: Fix warnings caused by missing 'static' attribute
  opts: produce valid command line in qemu_opts_print
  docs: fix a qga/qapi-schema.json comment
  trivial: remove trailing newline from error_report
  maint: avoid useless "if (foo) free(foo)" pattern
  maint: avoid useless "if (foo) free(foo)" pattern
  maint: remove unused include for strings.h
  maint: remove unused include for signal.h
  maint: remove unused include for dirent.h
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7b9c09f7 af5b83d7

backends/baum.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static int baum_eat_packet(BaumDriverState *baum, const uint8_t *buf, int len) 
                return 0;

            cur++;

        }

        DPRINTF("Dropped %d bytes!\n", cur - buf);

        DPRINTF("Dropped %td bytes!\n", cur - buf);

    }



#define EAT(c) do {\

backends/hostmem-file.c

+1 −3
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ static void set_mem_path(Object *o, const char *str, Error **errp) 
        error_setg(errp, "cannot change property value");

        return;

    }

    if (fb->mem_path) {

    g_free(fb->mem_path);

    }

    fb->mem_path = g_strdup(str);

}

block/qcow2-cluster.c

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ int qcow2_get_cluster_offset(BlockDriverState *bs, uint64_t offset, 


    *cluster_offset = 0;



    /* seek the the l2 offset in the l1 table */

    /* seek to the l2 offset in the l1 table */



    l1_index = offset >> l1_bits;

    if (l1_index >= s->l1_size) {
@@ -612,7 +612,7 @@ static int get_cluster_table(BlockDriverState *bs, uint64_t offset, 
    uint64_t *l2_table = NULL;

    int ret;



    /* seek the the l2 offset in the l1 table */

    /* seek to the l2 offset in the l1 table */



    l1_index = offset >> (s->l2_bits + s->cluster_bits);

    if (l1_index >= s->l1_size) {

block/qcow2-refcount.c

+1 −1
Original line number Diff line number Diff line
@@ -1294,7 +1294,7 @@ static int realloc_refcount_array(BDRVQcowState *s, void **array, 
/*

 * Increases the refcount for a range of clusters in a given refcount table.

 * This is used to construct a temporary refcount table out of L1 and L2 tables

 * which can be compared the the refcount table saved in the image.

 * which can be compared to the refcount table saved in the image.

 *

 * Modifies the number of errors in res.

 */

block/vhdx.c

+1 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,7 @@ static int vhdx_create_new_metadata(BlockDriverState *bs, 
    uint32_t offset = 0;

    void *buffer = NULL;

    void *entry_buffer;

    VHDXMetadataTableHeader *md_table;;

    VHDXMetadataTableHeader *md_table;

    VHDXMetadataTableEntry  *md_table_entry;



    /* Metadata entries */