[libvirt] [PATCH for 1.2.13] schema: Add virtio-mmio address type into RNG
The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation. Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define> -- 2.3.0
On Wed, Feb 25, 2015 at 11:30:51AM +0100, Martin Kletzander wrote:
The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define>
ACK, but this suggests our qemuxml2argdata/ directory doesn't have any coverage of the mmio addressing scheme, as we would have got RNG failures if it did. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Wed, Feb 25, 2015 at 10:34:52AM +0000, Daniel P. Berrange wrote:
On Wed, Feb 25, 2015 at 11:30:51AM +0100, Martin Kletzander wrote:
The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define>
ACK, but this suggests our qemuxml2argdata/ directory doesn't have any coverage of the mmio addressing scheme, as we would have got RNG failures if it did.
Yes, I'll send a follow-up where I'll lift the requirement of getting in for 1.2.13, thanks for the (non-null) pointer.
Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
On 25.02.2015 11:30, Martin Kletzander wrote:
The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define>
This should be backported all the way down till 1.1.3 maint branches. Michal
On Wed, Feb 25, 2015 at 11:50:37AM +0100, Michal Privoznik wrote:
On 25.02.2015 11:30, Martin Kletzander wrote:
The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define>
This should be backported all the way down till 1.1.3 maint branches.
As with other schema changes, I think this makes sense for 1.2.12-maint *at most*. Feel free to back-port it though, if you have a reason.
On Wed, Feb 25, 2015 at 11:30:51AM +0100, Martin Kletzander wrote:
The "virtio-mmio" is perfectly valid address type which we parse and format correctly, but it's missing in our RNG schemas, hence editing a domain with device having such address fails the validation.
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> --- docs/schemas/domaincommon.rng | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index f41ca43..6e73e7c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4415,6 +4415,11 @@ </attribute> <ref name="isaaddress"/> </group> + <group> + <attribute name="type"> + <value>virtio-mmio</value> + </attribute> + </group> </choice> </element> </define> -- 2.3.0
ACK. Just tested with the below XML. -------------------------------------------------------------------------- <domain type='kvm' id='3'> <name>devstack</name> <uuid>d02624c5-460e-436b-baaa-973cfee554c8</uuid> <memory unit='KiB'>8388608</memory> <currentMemory unit='KiB'>8388608</currentMemory> <vcpu placement='static'>1</vcpu> <resource> <partition>/machine</partition> </resource> <os> <type arch='aarch64' machine='virt'>hvm</type> <loader readonly='yes' type='pflash'>/usr/share/AAVMF/AAVMF_CODE.fd</loader> <nvram>/var/lib/libvirt/nvram/fedora-21-aarch64-nvram</nvram> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <cpu mode='custom' match='exact'> <model fallback='allow'>host</model> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='writeback'/> <source file='/home/kashyapc/devstack'/> <backingStore/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='virtio-mmio'/> </disk> <interface type='network'> <mac address='52:54:00:f5:6f:23'/> <source network='default' bridge='virbr0'/> <target dev='vnet0'/> <model type='virtio'/> <alias name='net0'/> <address type='virtio-mmio'/> </interface> <serial type='pty'> <source path='/dev/pts/3'/> <target port='0'/> <alias name='serial0'/> </serial> <console type='pty' tty='/dev/pts/3'> <source path='/dev/pts/3'/> <target type='serial' port='0'/> <alias name='serial0'/> </console> </devices> <seclabel type='dynamic' model='selinux' relabel='yes'> <label>system_u:system_r:svirt_t:s0:c545,c776</label> <imagelabel>system_u:object_r:svirt_image_t:s0:c545,c776</imagelabel> </seclabel> </domain> -------------------------------------------------------------------------- -- /kashyap
participants (4)
-
Daniel P. Berrange -
Kashyap Chamarthy -
Martin Kletzander -
Michal Privoznik