← Back to branch summary

~davewalker/ubuntu/maverick/qemu-kvm/623830

« back to all changes in this revision

Viewing changes to qemu-img.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2010-08-10 08:51:54 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810085154-ok0jzlkr75dplmc7
Tags: 0.12.5+noroms-0ubuntu1
* New upstream release
* Removed patch which is now upstream:
  0001-Fix-missing-symbols-in-.rel-.rela.plt-sections.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu-img.c
537
537
    BlockDriverState **bs, *out_bs;
538
538
    int64_t total_sectors, nb_sectors, sector_num, bs_offset;
539
539
    uint64_t bs_sectors;
540
 
    uint8_t buf[IO_BUF_SIZE];
 
540
    uint8_t * buf;
541
541
    const uint8_t *buf1;
542
542
    BlockDriverInfo bdi;
543
543
    QEMUOptionParameter *param = NULL;
656
656
    bs_i = 0;
657
657
    bs_offset = 0;
658
658
    bdrv_get_geometry(bs[0], &bs_sectors);
 
659
    buf = qemu_malloc(IO_BUF_SIZE);
659
660
 
660
661
    if (flags & BLOCK_FLAG_COMPRESS) {
661
662
        if (bdrv_get_info(out_bs, &bdi) < 0)
788
789
            }
789
790
        }
790
791
    }
 
792
    qemu_free(buf);
791
793
    bdrv_delete(out_bs);
792
794
    for (bs_i = 0; bs_i < bs_n; bs_i++)
793
795
        bdrv_delete(bs[bs_i]);