Commit 08d19f51 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm 

* 'kvm-updates/2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (134 commits)
  KVM: ia64: Add intel iommu support for guests.
  KVM: ia64: add directed mmio range support for kvm guests
  KVM: ia64: Make pmt table be able to hold physical mmio entries.
  KVM: Move irqchip_in_kernel() from ioapic.h to irq.h
  KVM: Separate irq ack notification out of arch/x86/kvm/irq.c
  KVM: Change is_mmio_pfn to kvm_is_mmio_pfn, and make it common for all archs
  KVM: Move device assignment logic to common code
  KVM: Device Assignment: Move vtd.c from arch/x86/kvm/ to virt/kvm/
  KVM: VMX: enable invlpg exiting if EPT is disabled
  KVM: x86: Silence various LAPIC-related host kernel messages
  KVM: Device Assignment: Map mmio pages into VT-d page table
  KVM: PIC: enhance IPI avoidance
  KVM: MMU: add "oos_shadow" parameter to disable oos
  KVM: MMU: speed up mmu_unsync_walk
  KVM: MMU: out of sync shadow core
  KVM: MMU: mmu_convert_notrap helper
  KVM: MMU: awareness of new kvm_mmu_zap_page behaviour
  KVM: MMU: mmu_parent_walk
  KVM: x86: trap invlpg
  KVM: MMU: sync roots on mmu reload
  ...
parents 1c95e1b6 2381ad24

MAINTAINERS

+8 −1
Original line number Diff line number Diff line
@@ -2448,7 +2448,14 @@ S: Supported 


KERNEL VIRTUAL MACHINE (KVM)

P:	Avi Kivity

M:	avi@qumranet.com

M:	avi@redhat.com

L:	kvm@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported



KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V

P:	Joerg Roedel

M:	joerg.roedel@amd.com

L:	kvm@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported

arch/ia64/include/asm/kvm_host.h

+5 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ 
#define GPFN_IOSAPIC        (4UL << 60) /* IOSAPIC base */

#define GPFN_LEGACY_IO      (5UL << 60) /* Legacy I/O base */

#define GPFN_GFW        (6UL << 60) /* Guest Firmware */

#define GPFN_HIGH_MMIO      (7UL << 60) /* High MMIO range */

#define GPFN_PHYS_MMIO      (7UL << 60) /* Directed MMIO Range */



#define GPFN_IO_MASK        (7UL << 60) /* Guest pfn is I/O type */

#define GPFN_INV_MASK       (1UL << 63) /* Guest pfn is invalid */
@@ -413,6 +413,10 @@ struct kvm_arch { 
	struct kvm_ioapic *vioapic;

	struct kvm_vm_stat stat;

	struct kvm_sal_data rdv_sal_data;



	struct list_head assigned_dev_head;

	struct dmar_domain *intel_iommu_domain;

	struct hlist_head irq_ack_notifier_list;

};



union cpuid3_t {

arch/ia64/kvm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -46,4 +46,6 @@ config KVM_INTEL 
config KVM_TRACE

       bool



source drivers/virtio/Kconfig



endif # VIRTUALIZATION

arch/ia64/kvm/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -44,7 +44,11 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 
EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o)

		coalesced_mmio.o irq_comm.o)



ifeq ($(CONFIG_DMAR),y)

common-objs += $(addprefix ../../../virt/kvm/, vtd.o)

endif



kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o

obj-$(CONFIG_KVM) += kvm.o

arch/ia64/kvm/irq.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/*

 * irq.h: In-kernel interrupt controller related definitions

 * Copyright (c) 2008, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program; if not, write to the Free Software Foundation, Inc., 59 Temple

 * Place - Suite 330, Boston, MA 02111-1307 USA.

 *

 * Authors:

 *   Xiantao Zhang <xiantao.zhang@intel.com>

 *

 */



#ifndef __IRQ_H

#define __IRQ_H



static inline int irqchip_in_kernel(struct kvm *kvm)

{

	return 1;

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE