Commit 6ed5546f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



trivial patches for 2016-06-07

# gpg: Signature made Tue 07 Jun 2016 16:20:52 BST
# gpg:                using RSA key 0xBEE59D74A4C3D7DB
# 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-06-07: (51 commits)
  hbitmap: Use DIV_ROUND_UP
  qemu-timer: Use DIV_ROUND_UP
  linux-user: Use DIV_ROUND_UP
  slirp: Use DIV_ROUND_UP
  usb: Use DIV_ROUND_UP
  rocker: Use DIV_ROUND_UP
  SPICE: Use DIV_ROUND_UP
  audio: Use DIV_ROUND_UP
  xen: Use DIV_ROUND_UP
  crypto: Use DIV_ROUND_UP
  block: Use DIV_ROUND_UP
  qed: Use DIV_ROUND_UP
  qcow/qcow2: Use DIV_ROUND_UP
  parallels: Use DIV_ROUND_UP
  coccinelle: use macro DIV_ROUND_UP instead of (((n) + (d) - 1) /(d))
  thunk: Rename args and fields in host-target bitmask conversion code
  thunk: Drop unused NO_THUNK_TYPE_SIZE guards
  qemu-common.h: Drop WORDS_ALIGNED define
  host-utils: Prefer 'false' for bool type
  docs/multi-thread-compression: Fix wrong command string
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 40eeb397 30f549c2

block/dmg.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#ifdef CONFIG_BZIP2

#include <bzlib.h>

#endif

#include <glib.h>



enum {

    /* Limit chunk sizes to prevent unreasonable amounts of memory being used

block/parallels.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int64_t allocate_clusters(BlockDriverState *bs, int64_t sector_num, 
        return -EINVAL;

    }



    to_allocate = (sector_num + *pnum + s->tracks - 1) / s->tracks - idx;

    to_allocate = DIV_ROUND_UP(sector_num + *pnum, s->tracks) - idx;

    space = to_allocate * s->tracks;

    if (s->data_end + space > bdrv_getlength(bs->file->bs) >> BDRV_SECTOR_BITS) {

        int ret;

block/qcow.c

+2 −2
Original line number Diff line number Diff line
@@ -868,8 +868,8 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) 
    }



    tmp = g_malloc0(BDRV_SECTOR_SIZE);

    for (i = 0; i < ((sizeof(uint64_t)*l1_size + BDRV_SECTOR_SIZE - 1)/

        BDRV_SECTOR_SIZE); i++) {

    for (i = 0; i < DIV_ROUND_UP(sizeof(uint64_t) * l1_size, BDRV_SECTOR_SIZE);

         i++) {

        ret = blk_pwrite(qcow_blk, header_size + BDRV_SECTOR_SIZE * i,

                         tmp, BDRV_SECTOR_SIZE, 0);

        if (ret != BDRV_SECTOR_SIZE) {

block/qcow2-cluster.c

+2 −2
Original line number Diff line number Diff line
@@ -1868,8 +1868,8 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs, 
    }



    for (i = 0; i < s->nb_snapshots; i++) {

        int l1_sectors = (s->snapshots[i].l1_size * sizeof(uint64_t) +

                BDRV_SECTOR_SIZE - 1) / BDRV_SECTOR_SIZE;

        int l1_sectors = DIV_ROUND_UP(s->snapshots[i].l1_size *

                                      sizeof(uint64_t), BDRV_SECTOR_SIZE);



        l1_table = g_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE);

block/qcow2-refcount.c

+2 −4
Original line number Diff line number Diff line
@@ -490,14 +490,12 @@ static int alloc_refcount_block(BlockDriverState *bs, 
        uint64_t table_clusters =

            size_to_clusters(s, table_size * sizeof(uint64_t));

        blocks_clusters = 1 +

            ((table_clusters + s->refcount_block_size - 1)

            / s->refcount_block_size);

            DIV_ROUND_UP(table_clusters, s->refcount_block_size);

        uint64_t meta_clusters = table_clusters + blocks_clusters;



        last_table_size = table_size;

        table_size = next_refcount_table_size(s, blocks_used +

            ((meta_clusters + s->refcount_block_size - 1)

            / s->refcount_block_size));

            DIV_ROUND_UP(meta_clusters, s->refcount_block_size));



    } while (last_table_size != table_size);