From 9a6396bca38f9113128fe57fbc30fe9244c101be Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Mon, 24 Sep 2018 10:23:20 -0400
Subject: [PATCH] deployment: libvirt: remove pci, bus, controllers

Refer also to commit 10daff0c, which applies the change to
controller.xml

Some of the entries are invalid when changing the machine type, which is
the next commit to follow this one.

Libvirt will fill these things in correctly for the specified hardware.

Related-Bug: #1793214

Change-Id: I43593a7014713ab6ea9bfe73346fc0c6d0c41300
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
 deployment/libvirt/controller_allinone.xml | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/deployment/libvirt/controller_allinone.xml b/deployment/libvirt/controller_allinone.xml
index 809a42e1..fd0ff0a3 100644
--- a/deployment/libvirt/controller_allinone.xml
+++ b/deployment/libvirt/controller_allinone.xml
@@ -32,24 +32,18 @@
       <backingStore/>
       <target dev='sda' bus='sata'/>
       <boot order='1'/>
-      <alias name='sata0-0-0'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='DISK1'/>
       <backingStore/>
       <target dev='sdb' bus='sata'/>
-      <alias name='sata0-0-1'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='1'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
       <source file='DISK2'/>
       <backingStore/>
       <target dev='sdc' bus='sata'/>
-      <alias name='sata0-0-2'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
@@ -58,27 +52,13 @@
       <target dev='sdd' bus='sata'/>
       <readonly/>
       <boot order='2'/>
-      <alias name='sata0-0-3'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='3'/>
     </disk>
-    <controller type='usb' index='0'>
-      <alias name='usb'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'>
-      <alias name='pci.0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <alias name='sata0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-    </controller>
     <interface type='bridge'>
       <mac address='52:54:00:da:8c:ad'/>
       <source bridge='%BR1%'/>
       <target dev='vnet0'/>
       <model type='e1000'/>
       <alias name='net0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <mac address='52:54:00:da:48:ff'/>
@@ -87,7 +67,6 @@
       <model type='e1000'/>
       <boot order='3'/>
       <alias name='net1'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <mac address='52:54:00:54:e6:c2'/>
@@ -95,7 +74,6 @@
       <target dev='vnet2'/>
       <model type='virtio'/>
       <alias name='net2'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <mac address='52:54:00:c5:62:6d'/>
@@ -103,7 +81,6 @@
       <target dev='vnet3'/>
       <model type='virtio'/>
       <alias name='net3'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </interface>
     <serial type='pty'>
       <source path='/dev/pts/8'/>
@@ -123,11 +100,9 @@
     <video>
       <model type='cirrus' vram='16384' heads='1'/>
       <alias name='video0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
   </devices>
   <seclabel type='dynamic' model='apparmor' relabel='yes'>