target-mips: optimize gen_muldiv()

[qemu] / block-cloop.c

diff --git a/block-cloop.c b/block-cloop.c
index 4dfe766..9414d10 100644 (file)
--- a/block-cloop.c
+++ b/block-cloop.c
@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "vl.h"
+#include "qemu-common.h"
 #include "block_int.h"
 #include <zlib.h>
 
@@ -75,8 +75,7 @@ cloop_close:
 
     /* read offsets */
     offsets_size=s->n_blocks*sizeof(uint64_t);
-    if(!(s->offsets=(uint64_t*)malloc(offsets_size)))
-       goto cloop_close;
+    s->offsets=(uint64_t*)qemu_malloc(offsets_size);
     if(read(s->fd,s->offsets,offsets_size)<offsets_size)
        goto cloop_close;
     for(i=0;i<s->n_blocks;i++) {
@@ -89,14 +88,12 @@ cloop_close:
     }
 
     /* initialize zlib engine */
-    if(!(s->compressed_block = malloc(max_compressed_block_size+1)))
-       goto cloop_close;
-    if(!(s->uncompressed_block = malloc(s->block_size)))
-       goto cloop_close;
+    s->compressed_block = qemu_malloc(max_compressed_block_size+1);
+    s->uncompressed_block = qemu_malloc(s->block_size);
     if(inflateInit(&s->zstream) != Z_OK)
        goto cloop_close;
     s->current_block=s->n_blocks;
-   
+
     s->sectors_per_block = s->block_size/512;
     bs->total_sectors = s->n_blocks*s->sectors_per_block;
     return 0;
@@ -107,7 +104,7 @@ static inline int cloop_read_block(BDRVCloopState *s,int block_num)
     if(s->current_block != block_num) {
        int ret;
         uint32_t bytes = s->offsets[block_num+1]-s->offsets[block_num];
-          
+
        lseek(s->fd, s->offsets[block_num], SEEK_SET);
         ret = read(s->fd, s->compressed_block, bytes);
         if (ret != bytes)
@@ -157,13 +154,10 @@ static void cloop_close(BlockDriverState *bs)
 }
 
 BlockDriver bdrv_cloop = {
-    "cloop",
-    sizeof(BDRVCloopState),
-    cloop_probe,
-    cloop_open,
-    cloop_read,
-    NULL,
-    cloop_close,
+    .format_name       = "cloop",
+    .instance_size     = sizeof(BDRVCloopState),
+    .bdrv_probe                = cloop_probe,
+    .bdrv_open         = cloop_open,
+    .bdrv_read         = cloop_read,
+    .bdrv_close                = cloop_close,
 };
-
-