Here's a draft GitLab MR if you'd prefer to review the changes there: https://gitlab.com/iammattcoleman/libvirt/-/merge_requests/3/diffs Matt Coleman (6): hyperv: reformat WQL query strings hyperv: remove duplicate function hypervGetVSSDFromUUID() hyperv: remove duplicate function hypervGetMemSDByVSSDInstanceId() hyperv: remove unneeded braces in hypervDomainGetInfo() and hypervDomainGetXMLDesc() hyperv: reduce duplicate code for Msvm_ComputerSystem lookups hyperv: do not overwrite errors from hypervInvokeMethod() src/hyperv/hyperv_driver.c | 169 +++++++++---------------------------- src/hyperv/hyperv_wmi.c | 57 +++++++------ src/hyperv/hyperv_wmi.h | 4 + 3 files changed, 75 insertions(+), 155 deletions(-) -- 2.27.0