External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

domain: add implicit controllers from post parse

Browse Source 
Seems like the natural fit, since we are already adding other XML bits
in the PostParse routine.

Previously AddImplicitControllers was only called at the end of XML
parsing, meaning code that builds a DomainDef by hand had to manually
call it. Now those PostParse callers get it for free.

There's some test churn here; xen xm and sexpr test suite bits weren't
calling this before, but now they are, so you'll see new IDE controllers.
I don't think this will cause problems in practice, since the code already
needs to handle these implicit controllers like in the case when a user
defines their own XML.
This commit is contained in:
Cole Robinson 2016-01-07 22:49:57 -05:00
parent 5591ca502d
commit 4066c73428
61 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/domain_conf.c
View File

@ -3856,6 +3856,9 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
if (virDomainDefPostParseTimer(def) < 0)
return -1;
if (virDomainDefAddImplicitControllers(def) < 0)
return -1;
/* clean up possibly duplicated metadata entries */
virDomainDefMetadataSanitize(def);
@ -16392,10 +16395,6 @@ virDomainDefParseXML(xmlDocPtr xml,
if (virDomainDefPostParse(def, caps, flags, xmlopt) < 0)
goto error;
/* Auto-add any implied controllers which aren't present */
if (virDomainDefAddImplicitControllers(def) < 0)
goto error;
virHashFree(bootHash);
return def;

1
tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:e8:18'/>
<source bridge='e1000g0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml
View File

@ -35,6 +35,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml
View File

@ -35,6 +35,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-sound.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-utc.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv-v2.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-fv.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:0a:7b:39'/>
<source bridge='xenbr0'/>

1
tests/sexpr2xmldata/sexpr2xml-vif-rate.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:1b:b1:47'/>
<source bridge='xenbr0'/>

1
tests/xlconfigdata/test-fullvirt-direct-kernel-boot-bogus-extra.xml
View File

@ -36,6 +36,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-fullvirt-direct-kernel-boot-extra.xml
View File

@ -36,6 +36,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-fullvirt-direct-kernel-boot.xml
View File

@ -36,6 +36,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-fullvirt-multiusb.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-new-disk.xml
View File

@ -39,6 +39,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-spice-features.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-spice.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xlconfigdata/test-vif-rate.xml
View File

@ -39,6 +39,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-escape-paths.xml
View File

@ -39,6 +39,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-default-feature.xml
View File

@ -35,6 +35,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-force-hpet.xml
View File

@ -35,6 +35,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-force-nohpet.xml
View File

@ -35,6 +35,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-localtime.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-net-netfront.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-new-cdrom.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-parallel-tcp.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-file.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-null.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-pipe.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-pty.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-stdio.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-tcp.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-udp.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-serial-unix.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-sound.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-usbmouse.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-usbtablet.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-fullvirt-utc.xml
View File

@ -33,6 +33,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:66:92:9c'/>
<source bridge='xenbr1'/>

1
tests/xmconfigdata/test-no-source-cdrom.xml
View File

@ -32,6 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:0a:7b:39'/>
<source bridge='xenbr0'/>

1
tests/xmconfigdata/test-pci-devs.xml
View File

@ -32,6 +32,7 @@
<readonly/>
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
</disk>
<controller type='ide' index='0'/>
<interface type='bridge'>
<mac address='00:16:3e:0a:7b:39'/>
<source bridge='xenbr0'/>