rbd.c: replace QEMUOptionParameter with QemuOpts

[qemu.git] / block / vmdk.c

diff --git a/block/vmdk.c b/block/vmdk.c
index 480ea37d7cfb5219b264593c9f2e4443174f2fb3..b653f5ecef67372069005787b6abcb2731284b83 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1534,12 +1534,12 @@ static int vmdk_create_extent(const char *filename, int64_t filesize,
     int ret, i;
     BlockDriverState *bs = NULL;
     VMDK4Header header;
     int ret, i;
     BlockDriverState *bs = NULL;
     VMDK4Header header;

-    Error *local_err;
+    Error *local_err = NULL;

     uint32_t tmp, magic, grains, gd_sectors, gt_size, gt_count;
     uint32_t *gd_buf = NULL;
     int gd_buf_size;
 
     uint32_t tmp, magic, grains, gd_sectors, gt_size, gt_count;
     uint32_t *gd_buf = NULL;
     int gd_buf_size;
 

-    ret = bdrv_create_file(filename, NULL, &local_err);
+    ret = bdrv_create_file(filename, NULL, NULL, &local_err);

     if (ret < 0) {
         error_propagate(errp, local_err);
         goto exit;
     if (ret < 0) {
         error_propagate(errp, local_err);
         goto exit;


@@ -1700,7 +1700,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options,
 {
     int idx = 0;
     BlockDriverState *new_bs = NULL;
 {
     int idx = 0;
     BlockDriverState *new_bs = NULL;

-    Error *local_err;
+    Error *local_err = NULL;

     char *desc = NULL;
     int64_t total_size = 0, filesize;
     const char *adapter_type = NULL;
     char *desc = NULL;
     int64_t total_size = 0, filesize;
     const char *adapter_type = NULL;


@@ -1879,9 +1879,9 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options,
     if (!split && !flat) {
         desc_offset = 0x200;
     } else {
     if (!split && !flat) {
         desc_offset = 0x200;
     } else {

-        ret = bdrv_create_file(filename, options, &local_err);
+        ret = bdrv_create_file(filename, options, NULL, &local_err);

         if (ret < 0) {
         if (ret < 0) {

-            error_setg_errno(errp, -ret, "Could not create image file");
+            error_propagate(errp, local_err);

             goto exit;
         }
     }
             goto exit;
         }
     }


@@ -1889,7 +1889,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options,
     ret = bdrv_open(&new_bs, filename, NULL, NULL,
                     BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);
     if (ret < 0) {
     ret = bdrv_open(&new_bs, filename, NULL, NULL,
                     BDRV_O_RDWR | BDRV_O_PROTOCOL, NULL, &local_err);
     if (ret < 0) {

-        error_setg_errno(errp, -ret, "Could not write description");
+        error_propagate(errp, local_err);

         goto exit;
     }
     ret = bdrv_pwrite(new_bs, desc_offset, desc, desc_len);
         goto exit;
     }
     ret = bdrv_pwrite(new_bs, desc_offset, desc, desc_len);


@@ -2096,6 +2096,27 @@ static int vmdk_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
     return 0;
 }
 
     return 0;
 }
 

+static void vmdk_detach_aio_context(BlockDriverState *bs)
+{
+    BDRVVmdkState *s = bs->opaque;
+    int i;
+
+    for (i = 0; i < s->num_extents; i++) {
+        bdrv_detach_aio_context(s->extents[i].file);
+    }
+}
+
+static void vmdk_attach_aio_context(BlockDriverState *bs,
+                                    AioContext *new_context)
+{
+    BDRVVmdkState *s = bs->opaque;
+    int i;
+
+    for (i = 0; i < s->num_extents; i++) {
+        bdrv_attach_aio_context(s->extents[i].file, new_context);
+    }
+}
+

 static QEMUOptionParameter vmdk_create_options[] = {
     {
         .name = BLOCK_OPT_SIZE,
 static QEMUOptionParameter vmdk_create_options[] = {
     {
         .name = BLOCK_OPT_SIZE,


@@ -2153,6 +2174,8 @@ static BlockDriver bdrv_vmdk = {
     .bdrv_get_specific_info       = vmdk_get_specific_info,
     .bdrv_refresh_limits          = vmdk_refresh_limits,
     .bdrv_get_info                = vmdk_get_info,
     .bdrv_get_specific_info       = vmdk_get_specific_info,
     .bdrv_refresh_limits          = vmdk_refresh_limits,
     .bdrv_get_info                = vmdk_get_info,

+    .bdrv_detach_aio_context      = vmdk_detach_aio_context,
+    .bdrv_attach_aio_context      = vmdk_attach_aio_context,

 
     .create_options               = vmdk_create_options,
 };
 
     .create_options               = vmdk_create_options,
 };