From: Michal Privoznik <[email protected]> Similarly to SCSI controllers (see one previous commits), parse and report PCI address for SATA controllers.
Signed-off-by: Michal Privoznik <[email protected]> --- src/vmx/vmx.c | 11 +++++++++-- tests/vmx2xmldata/esx-in-the-wild-10.xml | 4 +++- tests/vmx2xmldata/esx-in-the-wild-12.xml | 4 +++- tests/vmx2xmldata/esx-in-the-wild-16.xml | 4 +++- tests/vmx2xmldata/esx-in-the-wild-17.xml | 4 +++- tests/vmx2xmldata/esx-in-the-wild-8.xml | 4 +++- tests/vmx2xmldata/esx-in-the-wild-9.xml | 4 +++- 7 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index bc4c69ad6a..25bfddbf68 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2236,6 +2236,8 @@ virVMXParseSATAController(virDomainDef *def, int controllerIdx, bool *present) { + virDomainControllerDef *controllerDef = NULL; + g_autofree char *pciSlotNumberName = NULL; char present_name[32]; if (controllerIdx < 0 || controllerIdx > 3) { @@ -2253,8 +2255,13 @@ virVMXParseSATAController(virDomainDef *def, if (!*present) return 0; - virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, - controllerIdx, -1); + controllerDef = virDomainDefAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_SATA, + controllerIdx, -1); + + pciSlotNumberName = g_strdup_printf("sata%d.pciSlotNumber", controllerIdx); + + if (virVMXPCISlotNumber(conf, pciSlotNumberName, &controllerDef->info) < 0) + return -1; return 0; } diff --git a/tests/vmx2xmldata/esx-in-the-wild-10.xml b/tests/vmx2xmldata/esx-in-the-wild-10.xml index 166240f96b..2ba801169e 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-10.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-10.xml @@ -26,7 +26,9 @@ <target dev='sda' bus='sata'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> - <controller type='sata' index='0'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> <interface type='bridge'> <mac address='00:50:56:9a:9c:7a' type='generated'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/esx-in-the-wild-12.xml b/tests/vmx2xmldata/esx-in-the-wild-12.xml index 08a4b5fada..907a000391 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-12.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-12.xml @@ -34,7 +34,9 @@ <controller type='scsi' index='0' model='vmpvscsi'> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> - <controller type='sata' index='0'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/> + </controller> <interface type='bridge'> <mac address='00:50:56:a0:cf:2f' type='generated'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/esx-in-the-wild-16.xml b/tests/vmx2xmldata/esx-in-the-wild-16.xml index c0f430e617..5d3b2163ed 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-16.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-16.xml @@ -29,7 +29,9 @@ <controller type='scsi' index='0' model='vmpvscsi'> <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> </controller> - <controller type='sata' index='0'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x02' function='0x0'/> + </controller> <controller type='nvme' index='0'/> <interface type='bridge'> <mac address='00:50:56:a0:a6:7e' type='generated'/> diff --git a/tests/vmx2xmldata/esx-in-the-wild-17.xml b/tests/vmx2xmldata/esx-in-the-wild-17.xml index 04776efcea..fe15990118 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-17.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-17.xml @@ -37,7 +37,9 @@ <controller type='scsi' index='0' model='lsisas1068'> <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> </controller> - <controller type='sata' index='0'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </controller> <interface type='bridge'> <mac address='00:50:56:a5:b8:68' type='generated'/> <source bridge='Mgmt Network'/> diff --git a/tests/vmx2xmldata/esx-in-the-wild-8.xml b/tests/vmx2xmldata/esx-in-the-wild-8.xml index 5e92157c9d..63bdd82c6b 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-8.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-8.xml @@ -45,7 +45,9 @@ <controller type='scsi' index='0' model='vmpvscsi'> <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> </controller> - <controller type='sata' index='0'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> <interface type='bridge'> <mac address='00:1a:4a:16:01:55' type='static'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/esx-in-the-wild-9.xml b/tests/vmx2xmldata/esx-in-the-wild-9.xml index a1a66bef5f..8b7f442921 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-9.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-9.xml @@ -29,7 +29,9 @@ <controller type='scsi' index='0' model='lsisas1068'> <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> </controller> - <controller type='sata' index='0'/> + <controller type='sata' index='0'> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </controller> <interface type='bridge'> <mac address='00:50:56:80:b3:81' type='generated'/> <source bridge='VM Network'/> -- 2.54.0
