v3: - Remove leftover comment - Parse both UUIDs and leave the legacy one in <hwuuid> - Fix the callback for VMX parsing v2: - https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/ODGBR... - ESX driver has an opt-in for the legacy behaviour just in case anynone needs that, although hopefully that should not be the case. The opt-in does not exist in the vmware driver or the vmx tests, there the v1 behaviour is kept in which vc.uuid is preferred, but uuid.bios is a fallback. v1: - https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/thread/WEKRA... Martin Kletzander (2): esx: Track VMs by instanceUuid instead of UUID NEWS: Add information about VMWare domains having different UUIDs NEWS.rst | 9 +++++ docs/drvesx.rst | 9 +++++ src/esx/esx_driver.c | 43 ++++++++++++++++-------- src/esx/esx_util.c | 11 ++++++ src/esx/esx_util.h | 1 + src/esx/esx_vi.c | 32 +++++++++++++++--- src/esx/esx_vi.h | 3 ++ src/vmx/vmx.c | 12 +++++-- tests/vmx2xmldata/esx-in-the-wild-10.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-11.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-12.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-13.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-14.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-15.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-16.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-17.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-5.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-6.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-7.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-8.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-9.xml | 2 +- 21 files changed, 113 insertions(+), 33 deletions(-) -- 2.54.0