summaryrefslogtreecommitdiffstats
path: root/src/arch
diff options
context:
space:
mode:
authorMichael Brown2017-04-25 14:33:52 +0200
committerMichael Brown2017-04-26 21:15:39 +0200
commita0f6e75532c68f49b3e1c73ca88151d9663f5269 (patch)
treed076b97bb3950b5499ffdd9c0e3242e7409f4b4c /src/arch
parent[block] Provide abstraction to allow system to be quiesced (diff)
downloadipxe-a0f6e75532c68f49b3e1c73ca88151d9663f5269.tar.gz
ipxe-a0f6e75532c68f49b3e1c73ca88151d9663f5269.tar.xz
ipxe-a0f6e75532c68f49b3e1c73ca88151d9663f5269.zip
[hyperv] Do not fail if guest OS ID MSR is already set
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/drivers/hyperv/hyperv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/arch/x86/drivers/hyperv/hyperv.c b/src/arch/x86/drivers/hyperv/hyperv.c
index cc6e3868..8298f209 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 );