CA-181428: Tapdisk should remember xlvhd parameters on unpause

In case of unpause (resume) operation the -T and -q parameters
are not passed and the ones from open/create should be used.

This is saving in the vbd structure the xlvhd_allocation_quantum
for future use during unpause.

Signed-off-by: Stefano Panella <[email protected]>
Reviewed-by: Germano Percossi <[email protected]>

Author: stefanopanella

drivers/tapdisk-control.c

@@ -749,8 +749,10 @@ tapdisk_control_open_image(struct tapdisk_ctl_conn *conn,
 		goto out;
 
 	if (request->u.params.flags & TAPDISK_MESSAGE_FLAG_THIN) {
+		/* Save parameters in vbd for unpause */
+		vbd->xlvhd_alloc_quantum = request->u.params.alloc_quantum;
 		/* Set allocation Quantum only to the leaf */
-		tapdisk_vbd_set_quantum(vbd, request->u.params.alloc_quantum);
+		tapdisk_vbd_set_quantum(vbd);
 	}
 
 	err = tapdisk_vbd_get_disk_info(vbd, &vbd->disk_info);

drivers/tapdisk-vbd.c

@@ -634,9 +634,10 @@ tapdisk_vbd_open_vdi(td_vbd_t *vbd, const char *name, td_flag_t flags, int prt_d
 }
 
 int
-tapdisk_vbd_set_quantum(td_vbd_t *vbd, int alloc_quantum)
+tapdisk_vbd_set_quantum(td_vbd_t *vbd)
 {
-	return td_set_quantum(tapdisk_vbd_first_image(vbd), alloc_quantum);
+	return td_set_quantum(tapdisk_vbd_first_image(vbd),
+			      vbd->xlvhd_alloc_quantum);
 }
 
 void
@@ -942,6 +943,10 @@ tapdisk_vbd_resume(td_vbd_t *vbd, const char *name)
 
 	for (i = 0; i < TD_VBD_EIO_RETRIES; i++) {
 		err = tapdisk_vbd_open_vdi(vbd, name, vbd->flags | TD_OPEN_STRICT, -1);
+		if (vbd->flags & TD_OPEN_THIN) {
+			/* Set allocation Quantum only to the leaf */
+			tapdisk_vbd_set_quantum(vbd);
+		}
 		if (!err)
 			break;
 

drivers/tapdisk-vbd.h

@@ -147,6 +147,7 @@ struct td_vbd_handle {
 
     struct td_vbd_rrd           rrd;
     stats_t vdi_stats;
+	int                         xlvhd_alloc_quantum;
 };
 
 #define tapdisk_vbd_for_each_request(vreq, tmp, list)	                \
@@ -186,7 +187,7 @@ int tapdisk_vbd_close(td_vbd_t *);
  */
 int tapdisk_vbd_open_vdi(td_vbd_t * vbd, const char *params, td_flag_t flags,
         int prt_devnum);
-int tapdisk_vbd_set_quantum(td_vbd_t *vbd, int alloc_quantum);
+int tapdisk_vbd_set_quantum(td_vbd_t *vbd);
 void tapdisk_vbd_close_vdi(td_vbd_t *);
 
 int tapdisk_vbd_attach(td_vbd_t *, const char *, int);