Commit 223cd0e1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/elmarco/tags/tidy-pull-request' into staging 



# gpg: Signature made Thu 31 Aug 2017 11:29:33 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/tidy-pull-request: (29 commits)
  eepro100: replace g_malloc()+memcpy() with g_memdup()
  test-iov: replace g_malloc()+memcpy() with g_memdup()
  i386: replace g_malloc()+memcpy() with g_memdup()
  i386: introduce ELF_NOTE_SIZE macro
  decnumber: use DIV_ROUND_UP
  kvm: use DIV_ROUND_UP
  i386/dump: use DIV_ROUND_UP
  ppc: use DIV_ROUND_UP
  msix: use DIV_ROUND_UP
  usb-hub: use DIV_ROUND_UP
  q35: use DIV_ROUND_UP
  piix: use DIV_ROUND_UP
  virtio-serial: use DIV_ROUND_UP
  console: use DIV_ROUND_UP
  monitor: use DIV_ROUND_UP
  virtio-gpu: use DIV_ROUND_UP
  vga: use DIV_ROUND_UP
  ui: use DIV_ROUND_UP
  vnc: use DIV_ROUND_UP
  vvfat: use DIV_ROUND_UP
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1d2a8e06 e4d67e4f

block/dmg.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void update_max_chunk_size(BDRVDMGState *s, uint32_t chunk, 
        uncompressed_sectors = s->sectorcounts[chunk];

        break;

    case 1: /* copy */

        uncompressed_sectors = (s->lengths[chunk] + 511) / 512;

        uncompressed_sectors = DIV_ROUND_UP(s->lengths[chunk], 512);

        break;

    case 2: /* zero */

        /* as the all-zeroes block may be large, it is treated specially: the

block/qcow2-cluster.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size, 
            new_l1_size = 1;

        }

        while (min_size > new_l1_size) {

            new_l1_size = (new_l1_size * 3 + 1) / 2;

            new_l1_size = DIV_ROUND_UP(new_l1_size * 3, 2);

        }

    }

block/vhdx-log.c

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ static int vhdx_log_write(BlockDriverState *bs, BDRVVHDXState *s, 
    }



    sector_offset = offset % VHDX_LOG_SECTOR_SIZE;

    file_offset = (offset / VHDX_LOG_SECTOR_SIZE) * VHDX_LOG_SECTOR_SIZE;

    file_offset = QEMU_ALIGN_DOWN(offset, VHDX_LOG_SECTOR_SIZE);



    aligned_length = length;

block/vpc.c

+2 −2
Original line number Diff line number Diff line
@@ -783,7 +783,7 @@ static int calculate_geometry(int64_t total_sectors, uint16_t* cyls, 
    } else {

        *secs_per_cyl = 17;

        cyls_times_heads = total_sectors / *secs_per_cyl;

        *heads = (cyls_times_heads + 1023) / 1024;

        *heads = DIV_ROUND_UP(cyls_times_heads, 1024);



        if (*heads < 4) {

            *heads = 4;
@@ -836,7 +836,7 @@ static int create_dynamic_disk(BlockBackend *blk, uint8_t *buf, 
    offset = 3 * 512;



    memset(buf, 0xFF, 512);

    for (i = 0; i < (num_bat_entries * 4 + 511) / 512; i++) {

    for (i = 0; i < DIV_ROUND_UP(num_bat_entries * 4, 512); i++) {

        ret = blk_pwrite(blk, offset, buf, 512, 0);

        if (ret < 0) {

            goto fail;

block/vvfat.c

+2 −2
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static direntry_t *create_long_filename(BDRVVVFATState *s, const char *filename) 
        return NULL;

    }



    number_of_entries = (length * 2 + 25) / 26;

    number_of_entries = DIV_ROUND_UP(length * 2, 26);



    for(i=0;i<number_of_entries;i++) {

        entry=array_get_next(&(s->directory));
@@ -2554,7 +2554,7 @@ static int commit_one_file(BDRVVVFATState* s, 
                (size > offset && c >=2 && !fat_eof(s, c)));



        ret = vvfat_read(s->bs, cluster2sector(s, c),

            (uint8_t*)cluster, (rest_size + 0x1ff) / 0x200);

            (uint8_t*)cluster, DIV_ROUND_UP(rest_size, 0x200));



        if (ret < 0) {

            qemu_close(fd);