-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQIcBAABAgAGBQJWXxIgAAoJEL2+eyfA3jBXBhkP/06PCkWeIoDt+qTRyDpKuT1e e+enf3Dl998/nr57nAYx1V7/fmfSnvlY2XP/+3jTaPSj0D59teUfcbaZfZCKzsJq ikcQiRCfq5FwtNtf40Z+paA2hmJNcbz2PcldYNd+FpY+5QoMF3JMcBm9Ju6Q5O2m zUAmDMsz1S25RRtKWCadsQGQW8J7dnrD/pxeYj4JmH6xTIPvT0yRZV+gh14fh2GJ SN4oRICd9Ov3x/n5UDu64z/7Rvk4O0ykNivrc3EN8icPJfe/fJk3zyHbBTibGwDf N3JHyPRBexj/uIdbo3UTCAwMj9IVQewdQbx8RnfLDK4rHpZL621hhWbbr20dOD3E MQBdVISE+dWlXWClYhwcVrDPVVyMVNmOTkzPsKROwsoU48nDWNhmS4OtJrbJpx2Y 00/463/cozMMW/2Y/mD8hBJXspXOEkIXaCZeGIoo4JeOGU9CGkpvfhoj1g9AwIwM n8jpjurtS6qLbAuDJ19SqS7borHLaJmqdTp56qT/lkd/0WNTkCLAjhOxuuv6ysJg mmMfUKKww/s9YRX+nAN9nN72DEqCEEuM13nCrK8unEKdk8ltOe2cCHYxlSmEHSGR /QrWU9rB+V8k4GmC9sBVRTmMxadAiN0iLCRLmscGXjYswlmwOQA0KN+JqqzkUAZc clK1cBGgTspmvu6oZLkM =SdYa -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging # gpg: Signature made Wed 02 Dec 2015 15:45:36 GMT using RSA key ID C0DE3057 # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>" # gpg: aka "Jeffrey Cody <jeff@codyprime.org>" # gpg: aka "Jeffrey Cody <codyprime@gmail.com>" * remotes/cody/tags/block-pull-request: mirror: Quiesce source during "mirror_exit" Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
2196b6f5dd
|
@ -388,6 +388,7 @@ static void mirror_exit(BlockJob *job, void *opaque)
|
||||||
bdrv_unref(s->target);
|
bdrv_unref(s->target);
|
||||||
block_job_completed(&s->common, data->ret);
|
block_job_completed(&s->common, data->ret);
|
||||||
g_free(data);
|
g_free(data);
|
||||||
|
bdrv_drained_end(src);
|
||||||
bdrv_unref(src);
|
bdrv_unref(src);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -607,6 +608,9 @@ immediate_exit:
|
||||||
|
|
||||||
data = g_malloc(sizeof(*data));
|
data = g_malloc(sizeof(*data));
|
||||||
data->ret = ret;
|
data->ret = ret;
|
||||||
|
/* Before we switch to target in mirror_exit, make sure data doesn't
|
||||||
|
* change. */
|
||||||
|
bdrv_drained_begin(s->common.bs);
|
||||||
block_job_defer_to_main_loop(&s->common, mirror_exit, data);
|
block_job_defer_to_main_loop(&s->common, mirror_exit, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue