On Thu, May 14, 2015 at 17:55:22 +0200, Michal Privoznik wrote:
On 13.05.2015 14:28, Jiri Denemark wrote:
> Version 2:
> - move QEMU-only data from virDomainDiskDef to a private data object
>
> Jiri Denemark (5):
> Add privateData to virDomainDiskDef
> Rename virDomainHasBlockjob as qemuDomainHasBlockjob
> Move QEMU-only fields from virDomainDiskDef into privateData
> qemu: Keep track of what disks are being migrated
> qemu: Don't give up on first error in qemuMigrationCancelDriverMirror
>
> src/conf/domain_conf.c | 43 ++++-------------------
> src/conf/domain_conf.h | 19 +++-------
> src/libvirt_private.syms | 1 -
> src/parallels/parallels_sdk.c | 4 +--
> src/qemu/qemu_blockjob.c | 48 ++++++++++++++-----------
> src/qemu/qemu_command.c | 4 +--
> src/qemu/qemu_domain.c | 81 ++++++++++++++++++++++++++++++++++++++++++-
> src/qemu/qemu_domain.h | 25 +++++++++++++
> src/qemu/qemu_driver.c | 15 ++++----
> src/qemu/qemu_migration.c | 42 +++++++++++-----------
> src/qemu/qemu_process.c | 17 +++++----
> src/vbox/vbox_common.c | 4 +--
> src/vbox/vbox_tmpl.c | 6 ++--
> src/vmx/vmx.c | 2 +-
> src/xenconfig/xen_sxpr.c | 6 ++--
> src/xenconfig/xen_xl.c | 2 +-
> src/xenconfig/xen_xm.c | 4 +--
> 17 files changed, 201 insertions(+), 122 deletions(-)
>
ACK series
I moved the hunk from 3/5 to 2/5, and pushed this series. Thanks.
Jirka