← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to block-cloop.c

  • Committer: Bazaar Package Importer
  • Author(s): Aurelien Jarno, Aurelien Jarno
  • Date: 2009-03-22 10:13:17 UTC
  • mfrom: (1.2.1 upstream) (6.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090322101317-iigjtnu5qil35dtb
Tags: 0.10.1-1
http://bugs.debian.org/501400
[ Aurelien Jarno ]
* New upstream stable release:
  - patches/80_stable-branch.patch: remove.
* debian/control: 
  - Remove depends on proll.
  - Move depends on device-tree-compiler to build-depends.
  - Bump Standards-Version to 3.8.1 (no changes).
* patches/82_qemu-img_decimal.patch: new patch from upstream to make
  qemu-img accept sizes with decimal values (closes: bug#501400).

Show diffs side-by-side

added added

removed removed

Lines of Context:
block-cloop.c
75
75
 
76
76
    /* read offsets */
77
77
    offsets_size=s->n_blocks*sizeof(uint64_t);
78
 
    if(!(s->offsets=(uint64_t*)malloc(offsets_size)))
79
 
        goto cloop_close;
 
78
    s->offsets=(uint64_t*)qemu_malloc(offsets_size);
80
79
    if(read(s->fd,s->offsets,offsets_size)<offsets_size)
81
80
        goto cloop_close;
82
81
    for(i=0;i<s->n_blocks;i++) {
89
88
    }
90
89
 
91
90
    /* initialize zlib engine */
92
 
    if(!(s->compressed_block = malloc(max_compressed_block_size+1)))
93
 
        goto cloop_close;
94
 
    if(!(s->uncompressed_block = malloc(s->block_size)))
95
 
        goto cloop_close;
 
91
    s->compressed_block = qemu_malloc(max_compressed_block_size+1);
 
92
    s->uncompressed_block = qemu_malloc(s->block_size);
96
93
    if(inflateInit(&s->zstream) != Z_OK)
97
94
        goto cloop_close;
98
95
    s->current_block=s->n_blocks;
165
162
    NULL,
166
163
    cloop_close,
167
164
};
168
 
 
169