diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /virt/kvm/kvm_main.c | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'virt/kvm/kvm_main.c')
| -rw-r--r-- | virt/kvm/kvm_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 904d7b7bd780..a845890b6800 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
| @@ -902,7 +902,7 @@ static const struct file_operations kvm_vcpu_fops = { | |||
| 902 | */ | 902 | */ |
| 903 | static int create_vcpu_fd(struct kvm_vcpu *vcpu) | 903 | static int create_vcpu_fd(struct kvm_vcpu *vcpu) |
| 904 | { | 904 | { |
| 905 | int fd = anon_inode_getfd("kvm-vcpu", &kvm_vcpu_fops, vcpu); | 905 | int fd = anon_inode_getfd("kvm-vcpu", &kvm_vcpu_fops, vcpu, 0); |
| 906 | if (fd < 0) | 906 | if (fd < 0) |
| 907 | kvm_put_kvm(vcpu->kvm); | 907 | kvm_put_kvm(vcpu->kvm); |
| 908 | return fd; | 908 | return fd; |
| @@ -1261,7 +1261,7 @@ static int kvm_dev_ioctl_create_vm(void) | |||
| 1261 | kvm = kvm_create_vm(); | 1261 | kvm = kvm_create_vm(); |
| 1262 | if (IS_ERR(kvm)) | 1262 | if (IS_ERR(kvm)) |
| 1263 | return PTR_ERR(kvm); | 1263 | return PTR_ERR(kvm); |
| 1264 | fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm); | 1264 | fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm, 0); |
| 1265 | if (fd < 0) | 1265 | if (fd < 0) |
| 1266 | kvm_put_kvm(kvm); | 1266 | kvm_put_kvm(kvm); |
| 1267 | 1267 | ||