aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/kvm.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-10 03:16:27 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-10 03:16:27 -0500
commit4ecd33d930591d41fe356160593a9076467b961c (patch)
treeb9051a334540bbce38db1b2b03cebb4cf1d51f73 /include/linux/kvm.h
parent7d5a78cd98c3a5eb83bd6a061c5ea6ef1e9b8fcb (diff)
parentf7160c7573615ec82c691e294cf80d920b5d588d (diff)
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'include/linux/kvm.h')
-rw-r--r--include/linux/kvm.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/kvm.h b/include/linux/kvm.h
index 797fcd781242..f18b86fa8655 100644
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@ -489,6 +489,9 @@ struct kvm_assigned_pci_dev {
489 __u32 busnr; 489 __u32 busnr;
490 __u32 devfn; 490 __u32 devfn;
491 __u32 flags; 491 __u32 flags;
492 union {
493 __u32 reserved[12];
494 };
492}; 495};
493 496
494struct kvm_assigned_irq { 497struct kvm_assigned_irq {
@@ -496,6 +499,9 @@ struct kvm_assigned_irq {
496 __u32 host_irq; 499 __u32 host_irq;
497 __u32 guest_irq; 500 __u32 guest_irq;
498 __u32 flags; 501 __u32 flags;
502 union {
503 __u32 reserved[12];
504 };
499}; 505};
500 506
501#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) 507#define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0)