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: Justin Terry (VM) <juterry@microsoft.com> Message-Id: <1521039163-138-2-git-send-email-juterry@microsoft.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
36b4cf1934
commit
3907e6318e
4
configure
vendored
4
configure
vendored
|
@ -2496,7 +2496,9 @@ if test "$whpx" != "no" ; then
|
||||||
#include <WinHvEmulation.h>
|
#include <WinHvEmulation.h>
|
||||||
int main(void) {
|
int main(void) {
|
||||||
WHV_CAPABILITY whpx_cap;
|
WHV_CAPABILITY whpx_cap;
|
||||||
WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap));
|
UINT32 writtenSize;
|
||||||
|
WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap),
|
||||||
|
&writtenSize);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -1254,6 +1254,7 @@ static int whpx_accel_init(MachineState *ms)
|
||||||
int ret;
|
int ret;
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
WHV_CAPABILITY whpx_cap;
|
WHV_CAPABILITY whpx_cap;
|
||||||
|
UINT32 whpx_cap_size;
|
||||||
WHV_PARTITION_PROPERTY prop;
|
WHV_PARTITION_PROPERTY prop;
|
||||||
|
|
||||||
whpx = &whpx_global;
|
whpx = &whpx_global;
|
||||||
|
@ -1262,7 +1263,7 @@ static int whpx_accel_init(MachineState *ms)
|
||||||
whpx->mem_quota = ms->ram_size;
|
whpx->mem_quota = ms->ram_size;
|
||||||
|
|
||||||
hr = WHvGetCapability(WHvCapabilityCodeHypervisorPresent, &whpx_cap,
|
hr = WHvGetCapability(WHvCapabilityCodeHypervisorPresent, &whpx_cap,
|
||||||
sizeof(whpx_cap));
|
sizeof(whpx_cap), &whpx_cap_size);
|
||||||
if (FAILED(hr) || !whpx_cap.HypervisorPresent) {
|
if (FAILED(hr) || !whpx_cap.HypervisorPresent) {
|
||||||
error_report("WHPX: No accelerator found, hr=%08lx", hr);
|
error_report("WHPX: No accelerator found, hr=%08lx", hr);
|
||||||
ret = -ENOSPC;
|
ret = -ENOSPC;
|
||||||
|
|
Loading…
Reference in a new issue