From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yang, Sheng" Subject: [PATCH 2/6] kvm: libkvm: Add Supporting for in-kernel PIT model Date: Tue, 4 Mar 2008 18:22:48 +0800 Message-ID: <200803041822.48614.sheng.yang@intel.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_4LSzH/tvjvKe4VF" To: kvm-devel@lists.sourceforge.net Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces@lists.sourceforge.net Errors-To: kvm-devel-bounces@lists.sourceforge.net List-Id: kvm.vger.kernel.org --Boundary-00=_4LSzH/tvjvKe4VF Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline =46rom da231cf5bb50310b4b98cc4b58370723b8e3f65d Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Sun, 27 Jan 2008 11:25:29 +0800 Subject: [PATCH] kvm: libkvm: Add Supporting for in-kernel PIT model Signed-off-by: Sheng Yang =2D-- kernel/Kbuild | 2 +- libkvm/kvm-common.h | 4 ++++ libkvm/libkvm-x86.c | 25 +++++++++++++++++++++++++ libkvm/libkvm.c | 5 +++++ 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/kernel/Kbuild b/kernel/Kbuild index ed02f5a..014cc17 100644 =2D-- a/kernel/Kbuild +++ b/kernel/Kbuild @@ -1,7 +1,7 @@ EXTRA_CFLAGS :=3D -I$(src)/include -include $(src)/external-module-compat.h obj-m :=3D kvm.o kvm-intel.o kvm-amd.o kvm-objs :=3D kvm_main.o x86.o mmu.o x86_emulate.o anon_inodes.o irq.o i82= 59.o=20 \ =2D lapic.o ioapic.o preempt.o + lapic.o ioapic.o preempt.o i8254.o kvm-intel-objs :=3D vmx.o vmx-debug.o kvm-amd-objs :=3D svm.o diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h index d4df1a4..b8a88ee 100644 =2D-- a/libkvm/kvm-common.h +++ b/libkvm/kvm-common.h @@ -47,6 +47,10 @@ struct kvm_context { int no_irqchip_creation; /// in-kernel irqchip status int irqchip_in_kernel; + /// do not create in-kernel pit if set + int no_pit_creation; + /// in-kernel pit status + int pit_in_kernel; }; void init_slots(void); diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c index 4bd0e2f..b3a241e 100644 =2D-- a/libkvm/libkvm-x86.c +++ b/libkvm/libkvm-x86.c @@ -144,6 +144,27 @@ int kvm_arch_create_default_phys_mem(kvm_context_t kvm, return 0; } +int kvm_create_pit(kvm_context_t kvm) +{ +#ifdef KVM_CAP_PIT + int r; + + kvm->pit_in_kernel =3D 0; + if (!kvm->no_pit_creation) { + r =3D ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_PIT); + if (r > 0) { + r =3D ioctl(kvm->vm_fd, KVM_CREATE_PIT); + if (r >=3D 0) + kvm->pit_in_kernel =3D 1; + else { + printf("Create kernel PIC irqchip failed\n"); + return r; + } + } + } +#endif + return 0; +} int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes, void **vm_mem) @@ -154,6 +175,10 @@ int kvm_arch_create(kvm_context_t kvm, unsigned long=20 phys_mem_bytes, if (r < 0) return r; + r =3D kvm_create_pit(kvm); + if (r < 0) + return r; + return 0; } diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c index 966501c..a7cc0e6 100644 =2D-- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -271,6 +271,11 @@ void kvm_disable_irqchip_creation(kvm_context_t kvm) kvm->no_irqchip_creation =3D 1; } +void kvm_disable_pit_creation(kvm_context_t kvm) +{ + kvm->no_pit_creation =3D 1; +} + int kvm_create_vcpu(kvm_context_t kvm, int slot) { long mmap_size; =2D- debian.1.5.3.7.1-dirty --Boundary-00=_4LSzH/tvjvKe4VF Content-Type: text/x-diff; charset="utf-8"; name="0001-kvm-libkvm-Add-Supporting-for-in-kernel-PIT-model.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-kvm-libkvm-Add-Supporting-for-in-kernel-PIT-model.patch" =46rom da231cf5bb50310b4b98cc4b58370723b8e3f65d Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Sun, 27 Jan 2008 11:25:29 +0800 Subject: [PATCH] kvm: libkvm: Add Supporting for in-kernel PIT model Signed-off-by: Sheng Yang =2D-- kernel/Kbuild | 2 +- libkvm/kvm-common.h | 4 ++++ libkvm/libkvm-x86.c | 25 +++++++++++++++++++++++++ libkvm/libkvm.c | 5 +++++ 4 files changed, 35 insertions(+), 1 deletions(-) diff --git a/kernel/Kbuild b/kernel/Kbuild index ed02f5a..014cc17 100644 =2D-- a/kernel/Kbuild +++ b/kernel/Kbuild @@ -1,7 +1,7 @@ EXTRA_CFLAGS :=3D -I$(src)/include -include $(src)/external-module-compat.h obj-m :=3D kvm.o kvm-intel.o kvm-amd.o kvm-objs :=3D kvm_main.o x86.o mmu.o x86_emulate.o anon_inodes.o irq.o i82= 59.o \ =2D lapic.o ioapic.o preempt.o + lapic.o ioapic.o preempt.o i8254.o kvm-intel-objs :=3D vmx.o vmx-debug.o kvm-amd-objs :=3D svm.o =20 diff --git a/libkvm/kvm-common.h b/libkvm/kvm-common.h index d4df1a4..b8a88ee 100644 =2D-- a/libkvm/kvm-common.h +++ b/libkvm/kvm-common.h @@ -47,6 +47,10 @@ struct kvm_context { int no_irqchip_creation; /// in-kernel irqchip status int irqchip_in_kernel; + /// do not create in-kernel pit if set + int no_pit_creation; + /// in-kernel pit status + int pit_in_kernel; }; =20 void init_slots(void); diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c index 4bd0e2f..b3a241e 100644 =2D-- a/libkvm/libkvm-x86.c +++ b/libkvm/libkvm-x86.c @@ -144,6 +144,27 @@ int kvm_arch_create_default_phys_mem(kvm_context_t kvm, return 0; } =20 +int kvm_create_pit(kvm_context_t kvm) +{ +#ifdef KVM_CAP_PIT + int r; + + kvm->pit_in_kernel =3D 0; + if (!kvm->no_pit_creation) { + r =3D ioctl(kvm->fd, KVM_CHECK_EXTENSION, KVM_CAP_PIT); + if (r > 0) { + r =3D ioctl(kvm->vm_fd, KVM_CREATE_PIT); + if (r >=3D 0) + kvm->pit_in_kernel =3D 1; + else { + printf("Create kernel PIC irqchip failed\n"); + return r; + } + } + } +#endif + return 0; +} =20 int kvm_arch_create(kvm_context_t kvm, unsigned long phys_mem_bytes, void **vm_mem) @@ -154,6 +175,10 @@ int kvm_arch_create(kvm_context_t kvm, unsigned long p= hys_mem_bytes, if (r < 0) return r; =20 + r =3D kvm_create_pit(kvm); + if (r < 0) + return r; + return 0; } =20 diff --git a/libkvm/libkvm.c b/libkvm/libkvm.c index 966501c..a7cc0e6 100644 =2D-- a/libkvm/libkvm.c +++ b/libkvm/libkvm.c @@ -271,6 +271,11 @@ void kvm_disable_irqchip_creation(kvm_context_t kvm) kvm->no_irqchip_creation =3D 1; } =20 +void kvm_disable_pit_creation(kvm_context_t kvm) +{ + kvm->no_pit_creation =3D 1; +} + int kvm_create_vcpu(kvm_context_t kvm, int slot) { long mmap_size; =2D-=20 debian.1.5.3.7.1-dirty --Boundary-00=_4LSzH/tvjvKe4VF Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ --Boundary-00=_4LSzH/tvjvKe4VF Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kvm-devel mailing list kvm-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/kvm-devel --Boundary-00=_4LSzH/tvjvKe4VF--