diff options
| author | Michael Brown | 2017-04-28 17:18:58 +0200 |
|---|---|---|
| committer | Michael Brown | 2017-04-28 17:20:35 +0200 |
| commit | 276d618ca9588198acde376e28e49bd5a93b20d6 (patch) | |
| tree | 1ad3127ce848d6a85468118c4be7fb7d7f7ad61f /src/arch | |
| parent | [hyperv] Do not fail if guest OS ID MSR is already set (diff) | |
| download | ipxe-276d618ca9588198acde376e28e49bd5a93b20d6.tar.gz ipxe-276d618ca9588198acde376e28e49bd5a93b20d6.tar.xz ipxe-276d618ca9588198acde376e28e49bd5a93b20d6.zip | |
[hyperv] Remove redundant return status code from mapping functions
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/x86/drivers/hyperv/hyperv.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/arch/x86/drivers/hyperv/hyperv.c b/src/arch/x86/drivers/hyperv/hyperv.c index 8298f209..b90937df 100644 --- a/src/arch/x86/drivers/hyperv/hyperv.c +++ b/src/arch/x86/drivers/hyperv/hyperv.c @@ -223,9 +223,8 @@ static int hv_check_features ( struct hv_hypervisor *hv ) { * Map hypercall page * * @v hv Hyper-V hypervisor - * @ret rc Return status code */ -static int hv_map_hypercall ( struct hv_hypervisor *hv ) { +static void hv_map_hypercall ( struct hv_hypervisor *hv ) { union { struct { uint32_t ebx; @@ -267,8 +266,6 @@ static int hv_map_hypercall ( struct hv_hypervisor *hv ) { hypercall |= ( virt_to_phys ( hv->hypercall ) | HV_HYPERCALL_ENABLE ); DBGC2 ( hv, "HV %p hypercall MSR is %#08llx\n", hv, hypercall ); wrmsr ( HV_X64_MSR_HYPERCALL, hypercall ); - - return 0; } /** @@ -296,9 +293,8 @@ static void hv_unmap_hypercall ( struct hv_hypervisor *hv ) { * Map synthetic interrupt controller * * @v hv Hyper-V hypervisor - * @ret rc Return status code */ -static int hv_map_synic ( struct hv_hypervisor *hv ) { +static void hv_map_synic ( struct hv_hypervisor *hv ) { uint64_t simp; uint64_t siefp; uint64_t scontrol; @@ -322,8 +318,6 @@ static int hv_map_synic ( struct hv_hypervisor *hv ) { scontrol |= HV_SCONTROL_ENABLE; DBGC2 ( hv, "HV %p SCONTROL MSR is %#08llx\n", hv, scontrol ); wrmsr ( HV_X64_MSR_SCONTROL, scontrol ); - - return 0; } /** @@ -552,12 +546,10 @@ static int hv_probe ( struct root_device *rootdev ) { goto err_alloc_message; /* Map hypercall page */ - if ( ( rc = hv_map_hypercall ( hv ) ) != 0 ) - goto err_map_hypercall; + hv_map_hypercall ( hv ); /* Map synthetic interrupt controller */ - if ( ( rc = hv_map_synic ( hv ) ) != 0 ) - goto err_map_synic; + hv_map_synic ( hv ); /* Probe Hyper-V devices */ if ( ( rc = vmbus_probe ( hv, &rootdev->dev ) ) != 0 ) @@ -569,9 +561,7 @@ static int hv_probe ( struct root_device *rootdev ) { vmbus_remove ( hv, &rootdev->dev ); err_vmbus_probe: hv_unmap_synic ( hv ); - err_map_synic: hv_unmap_hypercall ( hv ); - err_map_hypercall: hv_free_message ( hv ); err_alloc_message: hv_free_pages ( hv, hv->hypercall, hv->synic.message, hv->synic.event, |