mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-24 00:20:53 +00:00
232a31bea3
A future patch is going to wire up qemu active block commit jobs; but as they have similar events and are canceled/pivoted in the same way as block copy jobs, it is easiest to track all bookkeeping for the commit job by reusing the <mirror> element. This patch adds domain XML to track which job was responsible for creating a mirroring situation, and adds a job='copy' attribute to all existing uses of <mirror>. Along the way, it also massages the qemu monitor backend to read the new field in order to generate the correct type of libvirt job (even though it requires a future patch to actually cause a qemu event that can be reported as an active commit). It also prepares to update persistent XML to match changes made to live XML when a copy completes. * docs/schemas/domaincommon.rng: Enhance schema. * docs/formatdomain.html.in: Document it. * src/conf/domain_conf.h (_virDomainDiskDef): Add a field. * src/conf/domain_conf.c (virDomainBlockJobType): String conversion. (virDomainDiskDefParseXML): Parse job type. (virDomainDiskDefFormat): Output job type. * src/qemu/qemu_process.c (qemuProcessHandleBlockJob): Distinguish active from regular commit. * src/qemu/qemu_driver.c (qemuDomainBlockCopy): Set job type. (qemuDomainBlockPivot, qemuDomainBlockJobImpl): Clean up job type on completion. * tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml: Update tests. * tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml: Likewise. * tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml: New file. * tests/qemuxml2xmltest.c (mymain): Drive new test. Signed-off-by: Eric Blake <eblake@redhat.com> |
||
|---|---|---|
| .. | ||
| libvirtd_qemu.aug | ||
| MIGRATION.txt | ||
| qemu_agent.c | ||
| qemu_agent.h | ||
| qemu_capabilities.c | ||
| qemu_capabilities.h | ||
| qemu_cgroup.c | ||
| qemu_cgroup.h | ||
| qemu_command.c | ||
| qemu_command.h | ||
| qemu_conf.c | ||
| qemu_conf.h | ||
| qemu_domain.c | ||
| qemu_domain.h | ||
| qemu_driver.c | ||
| qemu_driver.h | ||
| qemu_hostdev.c | ||
| qemu_hostdev.h | ||
| qemu_hotplug.c | ||
| qemu_hotplug.h | ||
| qemu_hotplugpriv.h | ||
| qemu_migration.c | ||
| qemu_migration.h | ||
| qemu_monitor_json.c | ||
| qemu_monitor_json.h | ||
| qemu_monitor_text.c | ||
| qemu_monitor_text.h | ||
| qemu_monitor.c | ||
| qemu_monitor.h | ||
| qemu_process.c | ||
| qemu_process.h | ||
| qemu_processpriv.h | ||
| qemu.conf | ||
| test_libvirtd_qemu.aug.in | ||
| THREADS.txt | ||