conf: alter disk mirror xml output
Now that we track a disk mirror as a virStorageSource, we might
as well update the XML to theoretically allow any type of
mirroring destination (not just a local file). A later patch
will also be reusing <mirror> to track the block commit of the
top layer of a chain, which is another case where libvirt needs
to update the backing chain after the job is finally pivoted,
and since backing chains can have network backing files as the
destination to commit into, it makes more sense to display that
in the XML.
This patch changes output-only XML; it was already documented
that <mirror> does not affect a domain definition at this point
(because qemu doesn't provide persistent bitmaps yet). Any
application that was starting a block copy job with older libvirt
and then relying on the domain XML to determine if it was
complete will no longer be able to access the file= and format=
attributes of mirror that were previously used. However, this is
not going to be a problem in practice: the only time a block copy
job works is on a transient domain, and any app that is managing
a transient domain probably already does enough of its own
bookkeeping to know which file it is mirroring into without
having to re-read it from the libvirt XML. The one thing that
was likely to be used in a mirroring job was the ready=
attribute, which is unchanged. Meanwhile, I made sure the schema
and parser still accept the old format, even if we no longer
output it, so that upgrading from an older version of libvirt is
seamless.
* docs/schemas/domaincommon.rng (diskMirror): Alter definition.
* src/conf/domain_conf.c (virDomainDiskDefParseXML): Parse two
styles of mirror elements.
(virDomainDiskDefFormat): Output new style.
* tests/qemuxml2argvdata/qemuxml2argv-disk-mirror-old.xml: New
file, copied from...
* tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml: ...here
before modernizing.
* tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old*: New
files.
* tests/qemuxml2xmltest.c (mymain): Test both styles.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-05-22 08:39:57 +04:00
<domain type= 'qemu' id= '1' >
<name > QEMUGuest1</name>
<uuid > c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit= 'KiB' > 219136</memory>
<currentMemory unit= 'KiB' > 219136</currentMemory>
<vcpu placement= 'static' > 1</vcpu>
<os >
<type arch= 'i686' machine= 'pc' > hvm</type>
<boot dev= 'hd' />
</os>
<clock offset= 'utc' />
<on_poweroff > destroy</on_poweroff>
<on_reboot > restart</on_reboot>
<on_crash > destroy</on_crash>
<devices >
2017-04-06 19:19:48 +03:00
<emulator > /usr/bin/qemu-system-i686</emulator>
conf: alter disk mirror xml output
Now that we track a disk mirror as a virStorageSource, we might
as well update the XML to theoretically allow any type of
mirroring destination (not just a local file). A later patch
will also be reusing <mirror> to track the block commit of the
top layer of a chain, which is another case where libvirt needs
to update the backing chain after the job is finally pivoted,
and since backing chains can have network backing files as the
destination to commit into, it makes more sense to display that
in the XML.
This patch changes output-only XML; it was already documented
that <mirror> does not affect a domain definition at this point
(because qemu doesn't provide persistent bitmaps yet). Any
application that was starting a block copy job with older libvirt
and then relying on the domain XML to determine if it was
complete will no longer be able to access the file= and format=
attributes of mirror that were previously used. However, this is
not going to be a problem in practice: the only time a block copy
job works is on a transient domain, and any app that is managing
a transient domain probably already does enough of its own
bookkeeping to know which file it is mirroring into without
having to re-read it from the libvirt XML. The one thing that
was likely to be used in a mirroring job was the ready=
attribute, which is unchanged. Meanwhile, I made sure the schema
and parser still accept the old format, even if we no longer
output it, so that upgrading from an older version of libvirt is
seamless.
* docs/schemas/domaincommon.rng (diskMirror): Alter definition.
* src/conf/domain_conf.c (virDomainDiskDefParseXML): Parse two
styles of mirror elements.
(virDomainDiskDefFormat): Output new style.
* tests/qemuxml2argvdata/qemuxml2argv-disk-mirror-old.xml: New
file, copied from...
* tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml: ...here
before modernizing.
* tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old*: New
files.
* tests/qemuxml2xmltest.c (mymain): Test both styles.
Signed-off-by: Eric Blake <eblake@redhat.com>
2014-05-22 08:39:57 +04:00
<disk type= 'block' device= 'disk' >
<source dev= '/dev/HostVG/QEMUGuest1' />
<backingStore />
<mirror file= '/dev/HostVG/QEMUGuest1Copy' ready= 'yes' />
<target dev= 'hda' bus= 'ide' />
<address type= 'drive' controller= '0' bus= '0' target= '0' unit= '0' />
</disk>
<disk type= 'block' device= 'cdrom' >
<source dev= '/dev/HostVG/QEMUGuest2' />
<backingStore />
<target dev= 'hdc' bus= 'ide' />
<readonly />
<address type= 'drive' controller= '0' bus= '1' target= '0' unit= '0' />
</disk>
<disk type= 'file' device= 'disk' >
<source file= '/tmp/data.img' />
<backingStore />
<mirror file= '/tmp/copy.img' format= 'qcow2' />
<target dev= 'vda' bus= 'virtio' />
</disk>
<disk type= 'file' device= 'disk' >
<source file= '/tmp/logs.img' />
<backingStore />
<target dev= 'vdb' bus= 'virtio' />
</disk>
<controller type= 'usb' index= '0' />
<controller type= 'ide' index= '0' />
<controller type= 'pci' index= '0' model= 'pci-root' />
<memballoon model= 'virtio' />
</devices>
</domain>
