[libvirt] [PATCH 2/3] esx: Add VMCI device for virtualHW >= 7
This patch fixes an issue where vMotion fails when VMCI device is not
present in the vmx file.
---
src/vmx/vmx.c | 2 ++
tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 1 +
tests/xml2vmxdata/xml2vmx-serial-network-client.vmx | 1 +
tests/xml2vmxdata/xml2vmx-serial-network-server.vmx | 1 +
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx | 1 +
tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx | 1 +
6 files changed, 7 insertions(+)
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 5b98dac..c8acc9f 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -3403,6 +3403,8 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt,
virDomainDe
virBufferAddLit(&buffer, "pciBridge7.virtualDev =
\"pcieRootPort\"\n");
virBufferAddLit(&buffer, "pciBridge7.functions =
\"8\"\n");
}
+
+ virBufferAddLit(&buffer, "vmci0.present = \"true\"\n");
}
/* Get final VMX output */
diff --git a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx
b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx
index ab09bc9..9605e2d 100644
--- a/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx
+++ b/tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx
@@ -41,3 +41,4 @@ pciBridge6.functions = "8"
pciBridge7.present = "true"
pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8"
+vmci0.present = "true"
diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx
b/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx
index 00ed186..5e21903 100644
--- a/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx
+++ b/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx
@@ -13,3 +13,4 @@ serial0.fileType = "network"
serial0.fileName = "tcp://192.168.0.17:42001"
serial0.network.endPoint = "client"
serial0.yieldOnMsrRead = "true"
+vmci0.present = "true"
diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx
b/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx
index ff2384f..e65f175 100644
--- a/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx
+++ b/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx
@@ -13,3 +13,4 @@ serial0.fileType = "network"
serial0.fileName = "ssl://0.0.0.0:42001"
serial0.network.endPoint = "server"
serial0.yieldOnMsrRead = "true"
+vmci0.present = "true"
diff --git a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
index acdf772..b43c933 100644
--- a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.vmx
@@ -33,3 +33,4 @@ pciBridge6.functions = "8"
pciBridge7.present = "true"
pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8"
+vmci0.present = "true"
diff --git a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
index 5086605..f7f40ec 100644
--- a/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
+++ b/tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.vmx
@@ -33,3 +33,4 @@ pciBridge6.functions = "8"
pciBridge7.present = "true"
pciBridge7.virtualDev = "pcieRootPort"
pciBridge7.functions = "8"
+vmci0.present = "true"
--
2.7.4