aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kvm/kvm-ia64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 40505200249..f5104b7c52c 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -809,10 +809,13 @@ static void kvm_build_io_pmt(struct kvm *kvm)
809#define GUEST_PHYSICAL_RR4 0x2739 809#define GUEST_PHYSICAL_RR4 0x2739
810#define VMM_INIT_RR 0x1660 810#define VMM_INIT_RR 0x1660
811 811
812int kvm_arch_init_vm(struct kvm *kvm) 812int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
813{ 813{
814 BUG_ON(!kvm); 814 BUG_ON(!kvm);
815 815
816 if (type)
817 return -EINVAL;
818
816 kvm->arch.is_sn2 = ia64_platform_is("sn2"); 819 kvm->arch.is_sn2 = ia64_platform_is("sn2");
817 820
818 kvm->arch.metaphysical_rr0 = GUEST_PHYSICAL_RR0; 821 kvm->arch.metaphysical_rr0 = GUEST_PHYSICAL_RR0;
@@ -1169,6 +1172,11 @@ out:
1169 1172
1170#define PALE_RESET_ENTRY 0x80000000ffffffb0UL 1173#define PALE_RESET_ENTRY 0x80000000ffffffb0UL
1171 1174
1175bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu)
1176{
1177 return irqchip_in_kernel(vcpu->kcm) == (vcpu->arch.apic != NULL);
1178}
1179
1172int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 1180int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
1173{ 1181{
1174 struct kvm_vcpu *v; 1182 struct kvm_vcpu *v;
@@ -1563,6 +1571,21 @@ out:
1563 return r; 1571 return r;
1564} 1572}
1565 1573
1574int kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf)
1575{
1576 return VM_FAULT_SIGBUS;
1577}
1578
1579void kvm_arch_free_memslot(struct kvm_memory_slot *free,
1580 struct kvm_memory_slot *dont)
1581{
1582}
1583
1584int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
1585{
1586 return 0;
1587}
1588
1566int kvm_arch_prepare_memory_region(struct kvm *kvm, 1589int kvm_arch_prepare_memory_region(struct kvm *kvm,
1567 struct kvm_memory_slot *memslot, 1590 struct kvm_memory_slot *memslot,
1568 struct kvm_memory_slot old, 1591 struct kvm_memory_slot old,