Strip image_t.

There is td_disk_info_t for drivers, so remove the glue.

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/drivers/tapdisk-control.c b/drivers/tapdisk-control.c
index 95322ea763d2afc2c8caab409ba62b6a4942def7..6d243a32eb9c67837545e429ad013f7c8358d360 100644 (file)
--- a/drivers/tapdisk-control.c
+++ b/drivers/tapdisk-control.c
@@ -589,7 +589,6 @@ tapdisk_control_attach_vbd(struct tapdisk_ctl_conn *conn,
        tapdisk_message_t response;
        char *devname;
        td_vbd_t *vbd;
-       image_t image;
        int minor, err;
 
        /*
@@ -685,7 +684,7 @@ tapdisk_control_open_image(struct tapdisk_ctl_conn *conn,
                           tapdisk_message_t *request)
 {
        int err, type, secondary_type;
-       image_t image;
+       td_disk_info_t image;
        td_vbd_t *vbd;
        td_flag_t flags;
        tapdisk_message_t response;
@@ -750,14 +749,14 @@ tapdisk_control_open_image(struct tapdisk_ctl_conn *conn,
        if (err)
                goto out;
 
-       err = tapdisk_vbd_get_image_info(vbd, &image);
+       err = tapdisk_vbd_get_disk_info(vbd, &image);
        if (err)
                goto fail_close;
 
        memset(&info, 0, sizeof(info));
        info.capacity = image.size;
-       info.sector_size = image.secsize;
-       info.physical_sector_size = image.secsize;
+       info.sector_size = image.sector_size;
+       info.physical_sector_size = image.sector_size;
        info.flags  = 0;
        info.flags |= flags & TD_OPEN_RDONLY ? BLKTAP_DEVICE_RO : 0;
 
@@ -795,7 +794,7 @@ out:
                response.u.response.error    = -err;
        } else {
                response.u.image.sectors     = image.size;
-               response.u.image.sector_size = image.secsize;
+               response.u.image.sector_size = image.sector_size;
                response.u.image.info        = image.info;
                response.type                = TAPDISK_MESSAGE_OPEN_RSP;
        }

diff --git a/drivers/tapdisk-diff.c b/drivers/tapdisk-diff.c
index e383d074c99ff8798b1b05d5af4e6e4138eda25e..bf23d61286608a66f83b1ba00e76367b445938fd 100644 (file)
--- a/drivers/tapdisk-diff.c
+++ b/drivers/tapdisk-diff.c
@@ -555,7 +555,7 @@ static int
 tapdisk_stream_open_image(struct tapdisk_stream *s, const char *path, int type)
 {
        int err;
-       image_t image;
+       td_disk_info_t info;
 
        s->id = tapdisk_stream_count++;
 
@@ -576,7 +576,7 @@ tapdisk_stream_open_image(struct tapdisk_stream *s, const char *path, int type)
        if (err)
                goto out;
 
-       err = tapdisk_vbd_get_image_info(s->vbd, &image);
+       err = tapdisk_vbd_get_disk_info(s->vbd, &info);
        if (err) {
                fprintf(stderr, "failed getting image size: %d\n", err);
                return err;
@@ -584,7 +584,7 @@ tapdisk_stream_open_image(struct tapdisk_stream *s, const char *path, int type)
 
        s->start = 0;
        s->cur   = s->start;
-       s->end   = image.size;
+       s->end   = info.size;
 
        err = 0;
 

diff --git a/drivers/tapdisk-stream.c b/drivers/tapdisk-stream.c
index 095160d724269bb3470f1ed2227314e74fd333ec..5852eac87489ea5790c1b8c9e7a5ce8f4d7e4285 100644 (file)
--- a/drivers/tapdisk-stream.c
+++ b/drivers/tapdisk-stream.c
@@ -385,20 +385,20 @@ tapdisk_stream_set_position(struct tapdisk_stream *s,
                            uint64_t count, uint64_t skip)
 {
        int err;
-       image_t image;
+       td_disk_info_t info;
 
-       err = tapdisk_vbd_get_image_info(s->vbd, &image);
+       err = tapdisk_vbd_get_disk_info(s->vbd, &info);
        if (err) {
                fprintf(stderr, "failed getting image size: %d\n", err);
                return err;
        }
 
        if (count == (uint64_t)-1)
-               count = image.size - skip;
+               count = info.size - skip;
 
-       if (count + skip > image.size) {
+       if (count + skip > info.size) {
                fprintf(stderr, "0x%llx past end of image 0x%llx\n",
-                       count + skip, image.size);
+                       count + skip, info.size);
                return -EINVAL;
        }
 

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index 125e4526f84a257d7c2a5bf9b770e229a8c1c5d7..1bdad262b8400a6bc5d1debc074cce2005e1966d 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -908,19 +908,17 @@ tapdisk_vbd_drop_log(td_vbd_t *vbd)
 }
 
 int
-tapdisk_vbd_get_image_info(td_vbd_t *vbd, image_t *img)
+tapdisk_vbd_get_disk_info(td_vbd_t *vbd, td_disk_info_t *img)
 {
        td_image_t *image;
 
-       memset(img, 0, sizeof(image_t));
+       memset(img, 0, sizeof(*img));
 
        if (list_empty(&vbd->images))
                return -EINVAL;
 
        image        = tapdisk_vbd_first_image(vbd);
-       img->size    = image->info.size;
-       img->secsize = image->info.sector_size;
-       img->info    = image->info.info;
+       *img         = image->info;
 
        return 0;
 }
@@ -1805,14 +1803,14 @@ tapdisk_vbd_resume_ring(td_vbd_t *vbd)
        err = __tapdisk_vbd_open_vdi(vbd, TD_OPEN_STRICT);
 out:
        if (!err) {
-               image_t image;
                struct blktap2_params params;
+               td_disk_info_t info;
 
                memset(&params, 0, sizeof(params));
-               tapdisk_vbd_get_image_info(vbd, &image);
+               tapdisk_vbd_get_disk_info(vbd, &info);
 
-               params.sector_size = image.secsize;
-               params.capacity    = image.size;
+               params.sector_size = info.sector_size;
+               params.capacity    = info.size;
                snprintf(params.name, sizeof(params.name) - 1, "%s", message);
 
                ioctl(vbd->ring.fd, BLKTAP2_IOCTL_SET_PARAMS, &params);

diff --git a/drivers/tapdisk-vbd.h b/drivers/tapdisk-vbd.h
index e1c3ef57587e0e700c08b8e59dfcfaada5980998..3559ec97cdbaf9b7879116ce2c8afe91882e6241 100644 (file)
--- a/drivers/tapdisk-vbd.h
+++ b/drivers/tapdisk-vbd.h
@@ -200,13 +200,7 @@ void tapdisk_vbd_detach(td_vbd_t *);
 
 void tapdisk_vbd_forward_request(td_request_t);
 
-typedef struct image {
-       unsigned long long size;
-       unsigned long secsize;
-       unsigned int info;
-} image_t;
-
-int tapdisk_vbd_get_image_info(td_vbd_t *, image_t *);
+int tapdisk_vbd_get_disk_info(td_vbd_t *, td_disk_info_t *);
 int tapdisk_vbd_retry_needed(td_vbd_t *);
 int tapdisk_vbd_quiesce_queue(td_vbd_t *);
 int tapdisk_vbd_start_queue(td_vbd_t *);