On Mon, Mar 30, 2015 at 14:33:09 -0600, Eric Blake wrote:
On 03/30/2015 12:50 PM, Peter Krempa wrote:
> From: Shanzhi Yu <shyu(a)redhat.com>
>
> virDomainHasDiskMirror() currently detects only jobs that add the mirror
> elements. Since some operations like migration are interlocked by
> existing block jobs on the given domain the check needs to be
> instrumented to check regular jobs too.
>
> This patch renames virDomainHasDiskMirror to virDomainHasDiskBlockjob
> and adds an argument that allows to select that it returns true only for
> block copy jobs as those interlock making the domain persistent.
>
> Other two uses trigger on any block job type.
>
> Signed-off-by: Shanzhi Yu <shyu(a)redhat.com>
> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
> ---
> src/conf/domain_conf.c | 25 ++++++++++++++++++++-----
> src/conf/domain_conf.h | 3 ++-
> src/libvirt_private.syms | 2 +-
> src/qemu/qemu_driver.c | 6 +++---
> src/qemu/qemu_migration.c | 2 +-
> 5 files changed, 27 insertions(+), 11 deletions(-)
ACK; series should be safe for freeze as a bug fix.
I've missed the rc-2 deadline so I've pushed them now that the release
is out.
Peter