summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk2015-06-29 18:51:05 +0200
committerStefano Stabellini2015-09-10 14:04:30 +0200
commit20a544c7dc2428e8816ed4a87af732884e885f2d (patch)
tree97119891ec77045b67630537a566e089c141291d /configure
parentxen/pt: xen_host_pci_config_read returns -errno, not -1 on failure (diff)
downloadqemu-20a544c7dc2428e8816ed4a87af732884e885f2d.tar.gz
qemu-20a544c7dc2428e8816ed4a87af732884e885f2d.tar.xz
qemu-20a544c7dc2428e8816ed4a87af732884e885f2d.zip
xen: use errno instead of rc for xc_domain_add_to_physmap
In Xen 4.6 commit cd2f100f0f61b3f333d52d1737dd73f02daee592 "libxc: Fix do_memory_op to return negative value on errors" made the libxc API less odd-ball: On errors, return value is -1 and error code is in errno. On success the return value is either 0 or an positive value. Since we could be running with an old toolstack in which the Exx value is in rc or the newer, we add an wrapper around the xc_domain_add_to_physmap (called xen_xc_domain_add_to_physmap) which will always return the EXX. Xen 4.6 did not change the libxc functions mentioned (same parameters) so we piggyback on the fact that Xen 4.6 has a new function: commit 504ed2053362381ac01b98db9313454488b7db40 "tools/libxc: Expose new hypercall xc_reserved_device_memory_map" and check for that. Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Suggested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 5618bf1bc0..5c06663f3c 100755
--- a/configure
+++ b/configure
@@ -1890,6 +1890,7 @@ int main(void) {
xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL);
+ xc_reserved_device_memory_map(xc, 0, 0, 0, 0, NULL, 0);
return 0;
}
EOF