At the expense of adding 113 lines of code, kill the ugly qemuBlockJobImpl method and spread it's guts into separate functions. This series additionally fixes a issue with failed drive pivot and the abort function now returns errors if the returned event contained failure. Peter Krempa (11): qemu: monitor: Extract handling of JSON block job error codes qemu: domain: Introduce helper to retrieve domain monitor object qemu: domain: Add helper to check block job support qemu: blockjob: Use the new helpers in qemuDomainGetBlockJobInfo qemu: blockjob: Split qemuDomainBlockJobSetSpeed from qemuDomainBlockJobImpl qemu: Clean up old leftovers in qemuMonitorDrivePivot qemu: blockPivot: Don't pause the VM any more since we don't use drive-reopen qemu: blockjob: Separate qemuDomainBlockJobAbort from qemuDomainBlockJobImpl qemu: blockPull: Refactor the rest of qemuDomainBlockJobImpl qemu: drivePivot: Fix assumption when 'block-job-complete' fails qemu: Refactor qemuDomainBlockJobAbort() src/qemu/qemu_domain.c | 43 +++++ src/qemu/qemu_domain.h | 4 + src/qemu/qemu_driver.c | 437 +++++++++++++++++++++---------------------- src/qemu/qemu_migration.c | 8 +- src/qemu/qemu_monitor.c | 88 ++++++--- src/qemu/qemu_monitor.h | 35 ++-- src/qemu/qemu_monitor_json.c | 188 +++++++++++-------- src/qemu/qemu_monitor_json.h | 28 ++- tests/qemumonitorjsontest.c | 2 +- 9 files changed, 473 insertions(+), 360 deletions(-) -- 2.2.2 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list