A fix for directories that contain both a manifest-based machine reference and Markdown-based machine definition (to avoid having redundant machines)

This commit is contained in:
Jeff Parsons 2016-04-16 15:16:31 -07:00
commit 82766dbfdf
11 changed files with 175 additions and 11 deletions

View file

@ -16,7 +16,7 @@
<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
<chipset id="chipset" model="5160" sw1="01001001"/>
<hdc ref="/disks/pc/fixed/10mb/pcdos200-win101-cga.xml"/>
<serial id="com1" adapter="1" binding="print"/>
<serial id="com1" adapter="1"/>
<serial id="com2" adapter="2"/>
<mouse serial="com2"/>
</machine>

View file

@ -18,4 +18,7 @@
<control type="description" binding="swdesc" left="0px"/>
</chipset>
<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
<serial id="com1" adapter="1" binding="print"/>
<serial id="com2" adapter="2"/>
<mouse serial="com2"/>
</machine>

View file

@ -16,4 +16,7 @@
<keyboard ref="/devices/pc/keyboard/us83-buttons-minimal.xml"/>
<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",type:3}]'/>
<chipset id="chipset" model="5160" sw1="01001001"/>
<serial id="com1" adapter="1"/>
<serial id="com2" adapter="2"/>
<mouse serial="com2"/>
</machine>