CA-46079: Remove the image reopen hack.

Used to reopen the image chain on the first request, thereby detecting
guest activation after migration. Obsolete since tapdisk is
spawned/resumed after VM stop/copy now.

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

diff --git a/drivers/tapdisk-diff.c b/drivers/tapdisk-diff.c
index 77f5ad653b6d9c97094b74df88b1f8fac14e4664..56cbe2993291ed19eff396c6beee5a1b85910c61 100644 (file)
--- a/drivers/tapdisk-diff.c
+++ b/drivers/tapdisk-diff.c
@@ -577,8 +577,6 @@ tapdisk_stream_open_image(struct tapdisk_stream *s, const char *path, int type)
        if (err)
                goto out;
 
-       s->vbd->reopened = 1;
-
        err = tapdisk_vbd_get_image_info(s->vbd, &image);
        if (err) {
                fprintf(stderr, "failed getting image size: %d\n", err);

diff --git a/drivers/tapdisk-stream.c b/drivers/tapdisk-stream.c
index 816ef96a7034ed66bd8306309f483006757d1ba0..20c000998c625016101b5bca054edf6fff383240 100644 (file)
--- a/drivers/tapdisk-stream.c
+++ b/drivers/tapdisk-stream.c
@@ -356,7 +356,6 @@ tapdisk_stream_open_image(struct tapdisk_stream *s, const char *path, int type)
        if (err)
                goto out;
 
-       s->vbd->reopened = 1;
        err = 0;
 
 out:

diff --git a/drivers/tapdisk-vbd.c b/drivers/tapdisk-vbd.c
index 77aa4f11b29262452283aca05272086b95673587..47ab167f92957946af29ba4a06f90d172c105280 100644 (file)
--- a/drivers/tapdisk-vbd.c
+++ b/drivers/tapdisk-vbd.c
@@ -1596,34 +1596,6 @@ tapdisk_vbd_check_queue(td_vbd_t *vbd)
        if (!tapdisk_vbd_queue_ready(vbd))
                return -EAGAIN;
 
-       if (!vbd->reopened) {
-               if (td_flag_test(vbd->state, TD_VBD_LOCKING)) {
-                       err = tapdisk_vbd_lock(vbd);
-                       if (err)
-                               return err;
-               }
-
-               image = tapdisk_vbd_first_image(vbd);
-               td_flag_set(image->flags, TD_OPEN_STRICT);
-
-               if (tapdisk_vbd_close_and_reopen_image(vbd, image))
-                       EPRINTF("reopening disks failed\n");
-               else {
-                       DPRINTF("reopening disks succeeded\n");
-                       vbd->reopened = 1;
-               }
-
-               if (vbd->secondary) {
-                       td_flag_set(vbd->secondary->flags, TD_OPEN_STRICT);
-                       if (tapdisk_vbd_close_and_reopen_image(vbd,
-                                               vbd->secondary)) {
-                               EPRINTF("reopening secondary image failed\n");
-                               vbd->reopened = 0;
-                       } else
-                               DPRINTF("reopening secondary image succeeded\n");
-               }
-       }
-
        return 0;
 }
 

diff --git a/drivers/tapdisk-vbd.h b/drivers/tapdisk-vbd.h
index dc7b908e5700bd3b91acccf8d83920ab61443653..d0f1c50b2b9b94458dff3bd219bffc90a5c77e78 100644 (file)
--- a/drivers/tapdisk-vbd.h
+++ b/drivers/tapdisk-vbd.h
@@ -92,7 +92,6 @@ struct td_vbd_handle {
 
        int                         storage;
 
-       uint8_t                     reopened;
        uint8_t                     reactivated;
        td_flag_t                   flags;
        td_flag_t                   state;