projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d196e34
)
KVM: Limit vcpu mmap size to one page on non-x86
author
Avi Kivity
<avi@qumranet.com>
Thu, 24 Jan 2008 13:13:08 +0000
(15:13 +0200)
committer
Avi Kivity
<avi@qumranet.com>
Sun, 27 Apr 2008 08:53:17 +0000
(11:53 +0300)
The second page is only needed on archs that support pio.
Noted by Carsten Otte.
Signed-off-by: Avi Kivity <avi@qumranet.com>
virt/kvm/kvm_main.c
patch
|
blob
|
history
diff --git
a/virt/kvm/kvm_main.c
b/virt/kvm/kvm_main.c
index 121e65cccc58132f5aac387058305d4b599ce124..7972e3aa2caedd85f47ed7a8aef7e9ff1b455918 100644
(file)
--- a/
virt/kvm/kvm_main.c
+++ b/
virt/kvm/kvm_main.c
@@
-1061,7
+1061,10
@@
static long kvm_dev_ioctl(struct file *filp,
r = -EINVAL;
if (arg)
goto out;
- r = 2 * PAGE_SIZE;
+ r = PAGE_SIZE; /* struct kvm_run */
+#ifdef CONFIG_X86
+ r += PAGE_SIZE; /* pio data page */
+#endif
break;
default:
return kvm_arch_dev_ioctl(filp, ioctl, arg);