From 10daff0c34546266dbb5b093a14d8932a576ffe9 Mon Sep 17 00:00:00 2001
From: Michel Thebeau <michel.thebeau@windriver.com>
Date: Thu, 6 Sep 2018 17:44:05 -0400
Subject: [PATCH] deployment: libvirt: remove pci, bus, controllers

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: #1790716

Change-Id: I674657cca117563de0c0ff04231224198623d3dd
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
---
 deployment/libvirt/compute.xml    | 21 ---------------------
 deployment/libvirt/controller.xml | 23 -----------------------
 2 files changed, 44 deletions(-)

diff --git a/deployment/libvirt/compute.xml b/deployment/libvirt/compute.xml
index 85474c03..19e052ad 100644
--- a/deployment/libvirt/compute.xml
+++ b/deployment/libvirt/compute.xml
@@ -32,34 +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>
-    <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'>
       <source bridge='%BR1%'/>
       <target dev='vnet8'/>
       <model type='e1000'/>
       <alias name='net0'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <source bridge='%BR2%'/>
@@ -67,21 +51,18 @@
       <model type='e1000'/>
       <boot order='2'/>
       <alias name='net1'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <source bridge='%BR3%'/>
       <target dev='vnet10'/>
       <model type='virtio'/>
       <alias name='net2'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <source bridge='%BR4%'/>
       <target dev='vnet11'/>
       <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/12'/>
@@ -101,11 +82,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'>
diff --git a/deployment/libvirt/controller.xml b/deployment/libvirt/controller.xml
index 1c786adc..ed54d36d 100644
--- a/deployment/libvirt/controller.xml
+++ b/deployment/libvirt/controller.xml
@@ -32,16 +32,12 @@
       <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='cdrom'>
       <driver name='qemu' type='raw'/>
@@ -50,26 +46,12 @@
       <target dev='sdc' bus='sata'/>
       <readonly/>
       <boot order='2'/>
-      <alias name='sata0-0-2'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='2'/>
     </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'>
       <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'>
       <source bridge='%BR2%'/>
@@ -77,21 +59,18 @@
       <model type='e1000'/>
       <boot order='3'/>
       <alias name='net1'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <source bridge='%BR3%'/>
       <target dev='vnet2'/>
       <model type='virtio'/>
       <alias name='net2'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
     <interface type='bridge'>
       <source bridge='%BR4%'/>
       <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'/>
@@ -111,11 +90,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'>