Commit 3907e631 authored by Justin Terry (VM)'s avatar Justin Terry (VM) Committed by Paolo Bonzini
Browse files

WHPX fix WHvGetCapability out WrittenSizeInBytes 



This fixes a breaking change to WHvGetCapability to include the 'out'
WrittenSizeInBytes introduced in Windows Insider SDK 17110.

This specifies on return the safe length to read into the WHV_CAPABILITY
structure passed to the call.

Signed-off-by: default avatarJustin Terry (VM) <juterry@microsoft.com>
Message-Id: <1521039163-138-2-git-send-email-juterry@microsoft.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 36b4cf19

configure

+3 −1
Original line number Diff line number Diff line
@@ -2496,7 +2496,9 @@ if test "$whpx" != "no" ; then 
#include <WinHvEmulation.h>

int main(void) {

    WHV_CAPABILITY whpx_cap;

    WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap));

    UINT32 writtenSize;

    WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap),

                     &writtenSize);

    return 0;

}

EOF

target/i386/whpx-all.c

+2 −1
Original line number Diff line number Diff line
@@ -1254,6 +1254,7 @@ static int whpx_accel_init(MachineState *ms) 
    int ret;

    HRESULT hr;

    WHV_CAPABILITY whpx_cap;

    UINT32 whpx_cap_size;

    WHV_PARTITION_PROPERTY prop;



    whpx = &whpx_global;
@@ -1262,7 +1263,7 @@ static int whpx_accel_init(MachineState *ms) 
    whpx->mem_quota = ms->ram_size;



    hr = WHvGetCapability(WHvCapabilityCodeHypervisorPresent, &whpx_cap,

                          sizeof(whpx_cap));

                          sizeof(whpx_cap), &whpx_cap_size);

    if (FAILED(hr) || !whpx_cap.HypervisorPresent) {

        error_report("WHPX: No accelerator found, hr=%08lx", hr);

        ret = -ENOSPC;