From: Michael Brown <mcb30@ipxe.org>
Date: Tue, 25 Apr 2017 12:33:52 +0000 (+0100)
Subject: [hyperv] Do not fail if guest OS ID MSR is already set
X-Git-Tag: v1.20.1~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0f6e75532c68f49b3e1c73ca88151d9663f5269;p=thirdparty%2Fipxe.git

[hyperv] Do not fail if guest OS ID MSR is already set

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/arch/x86/drivers/hyperv/hyperv.c b/src/arch/x86/drivers/hyperv/hyperv.c
index cc6e38688..8298f2097 100644
--- a/src/arch/x86/drivers/hyperv/hyperv.c
+++ b/src/arch/x86/drivers/hyperv/hyperv.c
@@ -245,9 +245,8 @@ static int hv_map_hypercall ( struct hv_hypervisor *hv ) {
 	/* Report guest OS identity */
 	guest_os_id = rdmsr ( HV_X64_MSR_GUEST_OS_ID );
 	if ( guest_os_id != 0 ) {
-		DBGC ( hv, "HV %p guest OS ID MSR already set to %#08llx\n",
+		DBGC ( hv, "HV %p guest OS ID MSR was %#08llx\n",
 		       hv, guest_os_id );
-		return -EBUSY;
 	}
 	guest_os_id = HV_GUEST_OS_ID_IPXE;
 	DBGC2 ( hv, "HV %p guest OS ID MSR is %#08llx\n", hv, guest_os_id );