Merge tag 'pull-maintainer-may24-160524-2' of https://gitlab.com/stsquad/qemu into...

[mirror_qemu.git] / blockdev.c

diff --git a/blockdev.c b/blockdev.c
index 3a5e7222eca6b6ff3a9fd5f0d7179cd902fdfc7c..08eccc9052d742bb1bc08a41c96e22fb5aa072b0 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -1395,7 +1395,8 @@ static void external_snapshot_action(TransactionAction *action,
     bdrv_drained_begin(state->old_bs);
 
     if (!bdrv_is_inserted(state->old_bs)) {
     bdrv_drained_begin(state->old_bs);
 
     if (!bdrv_is_inserted(state->old_bs)) {

-        error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
+        error_setg(errp, "Device '%s' has no medium",
+                   bdrv_get_device_or_node_name(state->old_bs));

         return;
     }
 
         return;
     }
 


@@ -2252,8 +2253,7 @@ void coroutine_fn qmp_block_resize(const char *device, const char *node_name,
     }
 
     bdrv_graph_co_rdlock();
     }
 
     bdrv_graph_co_rdlock();

-    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, NULL)) {
-        error_setg(errp, QERR_DEVICE_IN_USE, device);
+    if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_RESIZE, errp)) {

         bdrv_graph_co_rdunlock();
         return;
     }
         bdrv_graph_co_rdunlock();
         return;
     }


@@ -2278,6 +2278,8 @@ void qmp_block_stream(const char *job_id, const char *device,
                       const char *base,
                       const char *base_node,
                       const char *backing_file,
                       const char *base,
                       const char *base_node,
                       const char *backing_file,

+                      bool has_backing_mask_protocol,
+                      bool backing_mask_protocol,

                       const char *bottom,
                       bool has_speed, int64_t speed,
                       bool has_on_error, BlockdevOnError on_error,
                       const char *bottom,
                       bool has_speed, int64_t speed,
                       bool has_on_error, BlockdevOnError on_error,


@@ -2313,6 +2315,10 @@ void qmp_block_stream(const char *job_id, const char *device,
         return;
     }
 
         return;
     }
 

+    if (!has_backing_mask_protocol) {
+        backing_mask_protocol = false;
+    }
+

     if (!has_on_error) {
         on_error = BLOCKDEV_ON_ERROR_REPORT;
     }
     if (!has_on_error) {
         on_error = BLOCKDEV_ON_ERROR_REPORT;
     }


@@ -2400,6 +2406,7 @@ void qmp_block_stream(const char *job_id, const char *device,
     }
 
     stream_start(job_id, bs, base_bs, backing_file,
     }
 
     stream_start(job_id, bs, base_bs, backing_file,

+                 backing_mask_protocol,

                  bottom_bs, job_flags, has_speed ? speed : 0, on_error,
                  filter_node_name, &local_err);
     if (local_err) {
                  bottom_bs, job_flags, has_speed ? speed : 0, on_error,
                  filter_node_name, &local_err);
     if (local_err) {


@@ -2420,6 +2427,8 @@ void qmp_block_commit(const char *job_id, const char *device,
                       const char *top_node,
                       const char *top,
                       const char *backing_file,
                       const char *top_node,
                       const char *top,
                       const char *backing_file,

+                      bool has_backing_mask_protocol,
+                      bool backing_mask_protocol,

                       bool has_speed, int64_t speed,
                       bool has_on_error, BlockdevOnError on_error,
                       const char *filter_node_name,
                       bool has_speed, int64_t speed,
                       bool has_on_error, BlockdevOnError on_error,
                       const char *filter_node_name,


@@ -2450,6 +2459,9 @@ void qmp_block_commit(const char *job_id, const char *device,
     if (has_auto_dismiss && !auto_dismiss) {
         job_flags |= JOB_MANUAL_DISMISS;
     }
     if (has_auto_dismiss && !auto_dismiss) {
         job_flags |= JOB_MANUAL_DISMISS;
     }

+    if (!has_backing_mask_protocol) {
+        backing_mask_protocol = false;
+    }

 
     /* Important Note:
      *  libvirt relies on the DeviceNotFound error class in order to probe for
 
     /* Important Note:
      *  libvirt relies on the DeviceNotFound error class in order to probe for


@@ -2591,6 +2603,7 @@ void qmp_block_commit(const char *job_id, const char *device,
         }
         commit_start(job_id, bs, base_bs, top_bs, job_flags,
                      speed, on_error, backing_file,
         }
         commit_start(job_id, bs, base_bs, top_bs, job_flags,
                      speed, on_error, backing_file,

+                     backing_mask_protocol,

                      filter_node_name, &local_err);
     }
     if (local_err != NULL) {
                      filter_node_name, &local_err);
     }
     if (local_err != NULL) {