Skip to content

Commit

Permalink
[S390] kvm_s390: Fix oops in virtio device detection with "mem="
Browse files Browse the repository at this point in the history
The current virtio model on s390 has the descriptor page above the main
memory. The guest virtio detection will oops if the mem= parameter is
used to reduce/change the memory size.
We have to use real_memory_size instead of max_pfn to detect the virtio
descriptor pages.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
  • Loading branch information
borntraeger authored and Martin Schwidefsky committed Nov 14, 2008
1 parent 675be97 commit cc835f7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/s390/kvm/kvm_virtio.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,13 +322,13 @@ static int __init kvm_devices_init(void)
return rc;
}

rc = vmem_add_mapping(PFN_PHYS(max_pfn), PAGE_SIZE);
rc = vmem_add_mapping(real_memory_size, PAGE_SIZE);
if (rc) {
s390_root_dev_unregister(kvm_root);
return rc;
}

kvm_devices = (void *) PFN_PHYS(max_pfn);
kvm_devices = (void *) real_memory_size;

ctl_set_bit(0, 9);
register_external_interrupt(0x2603, kvm_extint_handler);
Expand Down

0 comments on commit cc835f7

Please sign in to comment.