Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/x86/xen/hyperv.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ struct irq_domain *hyperv_xen_vpci_root_domain(void)
pr_err("Xen: can't bind the Hyper-V vPCI VIRQ: %d\n", ret);
irq_domain_remove(xen_hv_vpci_domain);
xen_hv_vpci_domain = NULL;
irq_domain_free_fwnode(fn);
return NULL;
}

Expand Down
16 changes: 16 additions & 0 deletions drivers/hv/hv_balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1932,6 +1932,22 @@ static int balloon_probe(struct hv_device *dev,
{
int ret;

/*
* A Xen PV dom0 nested under Hyper-V does not own the machine memory
* it runs on; Xen does. Every page range this driver would hand the
* L0 host (balloon, free-page report, hot-add) is a dom0
* pseudo-physical range, which L0 reads as a range of Xen machine
* frames: a balloon request would have the host reclaim Xen's own or
* another domain's memory, and a hot-add would add a range dom0's
* physmap does not back. Dynamic memory for the L1 VM is Xen's to
* manage, so leave the device unbound.
*/
if (hyperv_nested_on_xen) {
dev_info(&dev->device,
"dynamic memory is not supported on a Xen PV dom0 nested under Hyper-V\n");
return -ENODEV;
}

allow_hibernation = hv_is_hibernation_supported();
if (allow_hibernation)
hot_add = false;
Expand Down
Loading