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

esx: Add VMCI device for virtualHW >= 7

Browse Source 
This patch fixes an issue where vMotion fails when VMCI device is not
present in the vmx file.
This commit is contained in:
Dawid Zamirski 2016-05-23 17:22:54 -04:00 committed by Matthias Bolte
parent 2b89f1d8f5
commit 5b36410f37
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/vmx/vmx.c
View File

@ -3383,24 +3383,28 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
goto cleanup; goto cleanup;
} }
if (virtualHW_version >= 7 && hasSCSI) { if (virtualHW_version >= 7) {
virBufferAddLit(&buffer, "pciBridge0.present = \"true\"\n"); if (hasSCSI) {
virBufferAddLit(&buffer, "pciBridge0.present = \"true\"\n");
virBufferAddLit(&buffer, "pciBridge4.present = \"true\"\n"); virBufferAddLit(&buffer, "pciBridge4.present = \"true\"\n");
virBufferAddLit(&buffer, "pciBridge4.virtualDev = \"pcieRootPort\"\n"); virBufferAddLit(&buffer, "pciBridge4.virtualDev = \"pcieRootPort\"\n");
virBufferAddLit(&buffer, "pciBridge4.functions = \"8\"\n"); virBufferAddLit(&buffer, "pciBridge4.functions = \"8\"\n");
virBufferAddLit(&buffer, "pciBridge5.present = \"true\"\n"); virBufferAddLit(&buffer, "pciBridge5.present = \"true\"\n");
virBufferAddLit(&buffer, "pciBridge5.virtualDev = \"pcieRootPort\"\n"); virBufferAddLit(&buffer, "pciBridge5.virtualDev = \"pcieRootPort\"\n");
virBufferAddLit(&buffer, "pciBridge5.functions = \"8\"\n"); virBufferAddLit(&buffer, "pciBridge5.functions = \"8\"\n");
virBufferAddLit(&buffer, "pciBridge6.present = \"true\"\n"); virBufferAddLit(&buffer, "pciBridge6.present = \"true\"\n");
virBufferAddLit(&buffer, "pciBridge6.virtualDev = \"pcieRootPort\"\n"); virBufferAddLit(&buffer, "pciBridge6.virtualDev = \"pcieRootPort\"\n");
virBufferAddLit(&buffer, "pciBridge6.functions = \"8\"\n"); virBufferAddLit(&buffer, "pciBridge6.functions = \"8\"\n");
virBufferAddLit(&buffer, "pciBridge7.present = \"true\"\n"); virBufferAddLit(&buffer, "pciBridge7.present = \"true\"\n");
virBufferAddLit(&buffer, "pciBridge7.virtualDev = \"pcieRootPort\"\n"); virBufferAddLit(&buffer, "pciBridge7.virtualDev = \"pcieRootPort\"\n");
virBufferAddLit(&buffer, "pciBridge7.functions = \"8\"\n"); virBufferAddLit(&buffer, "pciBridge7.functions = \"8\"\n");
}
virBufferAddLit(&buffer, "vmci0.present = \"true\"\n");
} }
/* Get final VMX output */ /* Get final VMX output */

1
tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx
View File

@ -41,3 +41,4 @@ pciBridge6.functions = "8"
pciBridge7.present = "true" pciBridge7.present = "true"
pciBridge7.virtualDev = "pcieRootPort" pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8" pciBridge7.functions = "8"
vmci0.present = "true"

1
tests/xml2vmxdata/xml2vmx-serial-network-client.vmx
View File

@ -13,3 +13,4 @@ serial0.fileType = "network"
serial0.fileName = "tcp://192.168.0.17:42001" serial0.fileName = "tcp://192.168.0.17:42001"
serial0.network.endPoint = "client" serial0.network.endPoint = "client"
serial0.yieldOnMsrRead = "true" serial0.yieldOnMsrRead = "true"
vmci0.present = "true"

1
tests/xml2vmxdata/xml2vmx-serial-network-server.vmx
View File

@ -13,3 +13,4 @@ serial0.fileType = "network"
serial0.fileName = "ssl://0.0.0.0:42001" serial0.fileName = "ssl://0.0.0.0:42001"
serial0.network.endPoint = "server" serial0.network.endPoint = "server"
serial0.yieldOnMsrRead = "true" serial0.yieldOnMsrRead = "true"
vmci0.present = "true"

1
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
View File

@ -33,3 +33,4 @@ pciBridge6.functions = "8"
pciBridge7.present = "true" pciBridge7.present = "true"
pciBridge7.virtualDev = "pcieRootPort" pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8" pciBridge7.functions = "8"
vmci0.present = "true"

1
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
View File

@ -33,3 +33,4 @@ pciBridge6.functions = "8"
pciBridge7.present = "true" pciBridge7.present = "true"
pciBridge7.virtualDev = "pcieRootPort" pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8" pciBridge7.functions = "8"
vmci0.present = "true"