[libvirt] [PATCH] esx: Explictly declare VMX file content as UTF-8

--- src/esx/esx_vmx.c | 3 +++ tests/xml2vmxdata/xml2vmx-annotation.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-other.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-static.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx | 1 + tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx | 1 + tests/xml2vmxdata/xml2vmx-floppy-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-floppy-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx | 1 + tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx | 1 + tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx | 1 + tests/xml2vmxdata/xml2vmx-minimal.vmx | 1 + tests/xml2vmxdata/xml2vmx-parallel-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-parallel-file.vmx | 1 + tests/xml2vmxdata/xml2vmx-scsi-driver.vmx | 1 + tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx | 1 + tests/xml2vmxdata/xml2vmx-serial-device.vmx | 1 + tests/xml2vmxdata/xml2vmx-serial-file.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-client.vmx | 1 + .../xml2vmxdata/xml2vmx-serial-network-server.vmx | 1 + tests/xml2vmxdata/xml2vmx-serial-pipe.vmx | 1 + 38 files changed, 40 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c index e17e1e7..7dc8e60 100644 --- a/src/esx/esx_vmx.c +++ b/src/esx/esx_vmx.c @@ -2475,6 +2475,9 @@ esxVMX_FormatConfig(esxVMX_Context *ctx, virCapsPtr caps, virDomainDefPtr def, return NULL; } + /* vmx:.encoding */ + virBufferAddLit(&buffer, ".encoding = \"UTF-8\"\n"); + /* vmx:config.version */ virBufferAddLit(&buffer, "config.version = \"8\"\n"); diff --git a/tests/xml2vmxdata/xml2vmx-annotation.vmx b/tests/xml2vmxdata/xml2vmx-annotation.vmx index 5754c31..3a3e0c9 100644 --- a/tests/xml2vmxdata/xml2vmx-annotation.vmx +++ b/tests/xml2vmxdata/xml2vmx-annotation.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx index 2db1bcb..13b91b4 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx index 1adf995..d9b602d 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx index d7f1201..705b31b 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx index bc6d0f7..178f1e1 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx index 5e78a3b..e72ca80 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx index 44db410..68f069b 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other-64" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx index 5bdf40b..e09c694 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other-64" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx index 7decab6..627fcfb 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx index 7d8e59b..6effe4a 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx index 2b96c40..ad4f1d6 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-custom.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx index fb3c755..0c56810 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx index 3c0aa9e..4f5c47b 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx index 017cd0b..dd4caa4 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx index a8a2ffb..7d41239 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx index 27b302f..807040b 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx index f9a0112..dd9ae8d 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-floppy-device.vmx b/tests/xml2vmxdata/xml2vmx-floppy-device.vmx index b0bb348..add97cf 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-floppy-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx index 22a7e03..11ffb01 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx index f233e7b..caab06a 100644 --- a/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx +++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx index 3ad8a94..48476d6 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx index 88dac5d..757083a 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx index 06eac3a..74cd47d 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx index 718ac48..c9da229 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx index daff969..700b242 100644 --- a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx index 150aeaf..95b9cf3 100644 --- a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx b/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx index a1118de..b5eef75 100644 --- a/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx +++ b/tests/xml2vmxdata/xml2vmx-minimal-64bit.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other-64" diff --git a/tests/xml2vmxdata/xml2vmx-minimal.vmx b/tests/xml2vmxdata/xml2vmx-minimal.vmx index 38004f8..3aba6d6 100644 --- a/tests/xml2vmxdata/xml2vmx-minimal.vmx +++ b/tests/xml2vmxdata/xml2vmx-minimal.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-parallel-device.vmx b/tests/xml2vmxdata/xml2vmx-parallel-device.vmx index 065cf1d..4da65f6 100644 --- a/tests/xml2vmxdata/xml2vmx-parallel-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-parallel-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-parallel-file.vmx b/tests/xml2vmxdata/xml2vmx-parallel-file.vmx index d46de16..0618109 100644 --- a/tests/xml2vmxdata/xml2vmx-parallel-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-parallel-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx index b58dbe6..0b03634 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx index 9b08c57..ef6b07a 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx +++ b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-device.vmx b/tests/xml2vmxdata/xml2vmx-serial-device.vmx index 2f86e83..940e82c 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-device.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-device.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-file.vmx b/tests/xml2vmxdata/xml2vmx-serial-file.vmx index aae79f1..11c1194 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-file.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx b/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx index d10f403..00ed186 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-network-client.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "7" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx b/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx index b5d77f4..ff2384f 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-network-server.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "7" guestOS = "other" diff --git a/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx b/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx index 64462f6..ce6a356 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx +++ b/tests/xml2vmxdata/xml2vmx-serial-pipe.vmx @@ -1,3 +1,4 @@ +.encoding = "UTF-8" config.version = "8" virtualHW.version = "4" guestOS = "other" -- 1.7.0.4