From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Yang, Sheng" Subject: Re: =?utf-8?q?=5BPATCH_3/6=5D_kvm=3A_qemu=3A_Add_option_f?= =?utf-8?q?or_enable/disable_in=09kernel_PIT?= Date: Thu, 6 Mar 2008 16:46:13 +0800 Message-ID: <200803061646.13237.sheng.yang@intel.com> References: <200803041822.52573.sheng.yang@intel.com> <47CD4D62.9050206@qumranet.com> <200803051020.46027.sheng.yang@intel.com> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_V96zHQkBnc7AIfU" To: kvm-devel@lists.sourceforge.net Return-path: In-Reply-To: <200803051020.46027.sheng.yang@intel.com> 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=_V96zHQkBnc7AIfU Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Fix a bug when using "--no-kvm-irqchip". --- libkvm/libkvm-x86.c | 9 +++++++++ qemu/hw/i8254.c | 12 ++++++++---- qemu/qemu-kvm.c | 4 ++++ qemu/qemu-kvm.h | 2 ++ qemu/vl.c | 11 ++++++++++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c index b3a241e..d19d17f 100644 --- a/libkvm/libkvm-x86.c +++ b/libkvm/libkvm-x86.c @@ -630,3 +630,12 @@ int kvm_disable_tpr_access_reporting(kvm_context_t kvm, int vcpu) } #endif + +int kvm_pit_in_kernel(kvm_context_t kvm) +{ +#ifdef KVM_CAP_PIT + return kvm->pit_in_kernel; +#else + return 0; +#endif +} diff --git a/qemu/hw/i8254.c b/qemu/hw/i8254.c index c281680..9e18ebc 100644 --- a/qemu/hw/i8254.c +++ b/qemu/hw/i8254.c @@ -26,6 +26,8 @@ #include "isa.h" #include "qemu-timer.h" +#include "qemu-kvm.h" + //#define DEBUG_PIT #define RW_STATE_LSB 1 @@ -491,10 +493,12 @@ PITState *pit_init(int base, qemu_irq irq) PITState *pit = &pit_state; PITChannelState *s; - s = &pit->channels[0]; - /* the timer 0 is connected to an IRQ */ - s->irq_timer = qemu_new_timer(vm_clock, pit_irq_timer, s); - s->irq = irq; + if (!kvm_enabled() || !qemu_kvm_pit_in_kernel()) { + s = &pit->channels[0]; + /* the timer 0 is connected to an IRQ */ + s->irq_timer = qemu_new_timer(vm_clock, pit_irq_timer, s); + s->irq = irq; + } register_savevm("i8254", base, 1, pit_save, pit_load, pit); diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c index 051946e..196e38e 100644 --- a/qemu/qemu-kvm.c +++ b/qemu/qemu-kvm.c @@ -10,6 +10,7 @@ int kvm_allowed = 1; int kvm_irqchip = 1; +int kvm_pit = 1; #include #include "hw/hw.h" @@ -536,6 +537,9 @@ int kvm_qemu_create_context(void) if (!kvm_irqchip) { kvm_disable_irqchip_creation(kvm_context); } + if (!kvm_pit) { + kvm_disable_pit_creation(kvm_context); + } if (kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base) < 0) { kvm_qemu_destroy(); return -1; diff --git a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h index 8e45f30..ff9c86e 100644 --- a/qemu/qemu-kvm.h +++ b/qemu/qemu-kvm.h @@ -84,9 +84,11 @@ extern kvm_context_t kvm_context; #define kvm_enabled() (kvm_allowed) #define qemu_kvm_irqchip_in_kernel() kvm_irqchip_in_kernel(kvm_context) +#define qemu_kvm_pit_in_kernel() kvm_pit_in_kernel(kvm_context) #else #define kvm_enabled() (0) #define qemu_kvm_irqchip_in_kernel() (0) +#define qemu_kvm_pit_in_kernel() (0) #endif #endif diff --git a/qemu/vl.c b/qemu/vl.c index 4762cb0..21c9b53 100644 --- a/qemu/vl.c +++ b/qemu/vl.c @@ -8097,6 +8097,7 @@ static void help(int exitcode) "-no-kvm disable KVM hardware virtualization\n" #endif "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n" + "-no-kvm-pit disable KVM kernel mode PIT\n" #endif #ifdef TARGET_I386 "-std-vga simulate a standard VGA card with VESA Bochs Extensions\n" @@ -8219,6 +8220,7 @@ enum { QEMU_OPTION_curses, QEMU_OPTION_no_kvm, QEMU_OPTION_no_kvm_irqchip, + QEMU_OPTION_no_kvm_pit, QEMU_OPTION_no_reboot, QEMU_OPTION_show_cursor, QEMU_OPTION_daemonize, @@ -8305,6 +8307,7 @@ const QEMUOption qemu_options[] = { { "no-kvm", 0, QEMU_OPTION_no_kvm }, #endif { "no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip }, + { "no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit }, #endif #if defined(TARGET_PPC) || defined(TARGET_SPARC) { "g", 1, QEMU_OPTION_g }, @@ -9238,8 +9241,14 @@ int main(int argc, char **argv) kvm_allowed = 0; break; case QEMU_OPTION_no_kvm_irqchip: { - extern int kvm_irqchip; + extern int kvm_irqchip, kvm_pit; kvm_irqchip = 0; + kvm_pit = 0; + break; + } + case QEMU_OPTION_no_kvm_pit: { + extern int kvm_pit; + kvm_pit = 0; break; } #endif -- debian.1.5.3.7.1-dirty --Boundary-00=_V96zHQkBnc7AIfU Content-Type: text/x-diff; charset="utf-8"; name="0002-kvm-qemu-Add-option-for-enable-disable-in-kernel-P.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-kvm-qemu-Add-option-for-enable-disable-in-kernel-P.patch" =46rom d8c50e41b2f04b49073f958c5697a4a450d3aba1 Mon Sep 17 00:00:00 2001 =46rom: Sheng Yang Date: Thu, 6 Mar 2008 16:43:18 +0800 Subject: [PATCH] kvm: qemu: Add option for enable/disable in kernel PIT Signed-off-by: Sheng Yang =2D-- libkvm/libkvm-x86.c | 9 +++++++++ qemu/hw/i8254.c | 12 ++++++++---- qemu/qemu-kvm.c | 4 ++++ qemu/qemu-kvm.h | 2 ++ qemu/vl.c | 11 ++++++++++- 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/libkvm/libkvm-x86.c b/libkvm/libkvm-x86.c index b3a241e..d19d17f 100644 =2D-- a/libkvm/libkvm-x86.c +++ b/libkvm/libkvm-x86.c @@ -630,3 +630,12 @@ int kvm_disable_tpr_access_reporting(kvm_context_t kvm= , int vcpu) } =20 #endif + +int kvm_pit_in_kernel(kvm_context_t kvm) +{ +#ifdef KVM_CAP_PIT + return kvm->pit_in_kernel; +#else + return 0; +#endif +} diff --git a/qemu/hw/i8254.c b/qemu/hw/i8254.c index c281680..9e18ebc 100644 =2D-- a/qemu/hw/i8254.c +++ b/qemu/hw/i8254.c @@ -26,6 +26,8 @@ #include "isa.h" #include "qemu-timer.h" =20 +#include "qemu-kvm.h" + //#define DEBUG_PIT =20 #define RW_STATE_LSB 1 @@ -491,10 +493,12 @@ PITState *pit_init(int base, qemu_irq irq) PITState *pit =3D &pit_state; PITChannelState *s; =20 =2D s =3D &pit->channels[0]; =2D /* the timer 0 is connected to an IRQ */ =2D s->irq_timer =3D qemu_new_timer(vm_clock, pit_irq_timer, s); =2D s->irq =3D irq; + if (!kvm_enabled() || !qemu_kvm_pit_in_kernel()) { + s =3D &pit->channels[0]; + /* the timer 0 is connected to an IRQ */ + s->irq_timer =3D qemu_new_timer(vm_clock, pit_irq_timer, s); + s->irq =3D irq; + } =20 register_savevm("i8254", base, 1, pit_save, pit_load, pit); =20 diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c index 051946e..196e38e 100644 =2D-- a/qemu/qemu-kvm.c +++ b/qemu/qemu-kvm.c @@ -10,6 +10,7 @@ =20 int kvm_allowed =3D 1; int kvm_irqchip =3D 1; +int kvm_pit =3D 1; =20 #include #include "hw/hw.h" @@ -536,6 +537,9 @@ int kvm_qemu_create_context(void) if (!kvm_irqchip) { kvm_disable_irqchip_creation(kvm_context); } + if (!kvm_pit) { + kvm_disable_pit_creation(kvm_context); + } if (kvm_create(kvm_context, phys_ram_size, (void**)&phys_ram_base) < 0= ) { kvm_qemu_destroy(); return -1; diff --git a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h index 8e45f30..ff9c86e 100644 =2D-- a/qemu/qemu-kvm.h +++ b/qemu/qemu-kvm.h @@ -84,9 +84,11 @@ extern kvm_context_t kvm_context; =20 #define kvm_enabled() (kvm_allowed) #define qemu_kvm_irqchip_in_kernel() kvm_irqchip_in_kernel(kvm_context) +#define qemu_kvm_pit_in_kernel() kvm_pit_in_kernel(kvm_context) #else #define kvm_enabled() (0) #define qemu_kvm_irqchip_in_kernel() (0) +#define qemu_kvm_pit_in_kernel() (0) #endif =20 #endif diff --git a/qemu/vl.c b/qemu/vl.c index 4762cb0..21c9b53 100644 =2D-- a/qemu/vl.c +++ b/qemu/vl.c @@ -8097,6 +8097,7 @@ static void help(int exitcode) "-no-kvm disable KVM hardware virtualization\n" #endif "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n" + "-no-kvm-pit disable KVM kernel mode PIT\n" #endif #ifdef TARGET_I386 "-std-vga simulate a standard VGA card with VESA Bochs E= xtensions\n" @@ -8219,6 +8220,7 @@ enum { QEMU_OPTION_curses, QEMU_OPTION_no_kvm, QEMU_OPTION_no_kvm_irqchip, + QEMU_OPTION_no_kvm_pit, QEMU_OPTION_no_reboot, QEMU_OPTION_show_cursor, QEMU_OPTION_daemonize, @@ -8305,6 +8307,7 @@ const QEMUOption qemu_options[] =3D { { "no-kvm", 0, QEMU_OPTION_no_kvm }, #endif { "no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip }, + { "no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit }, #endif #if defined(TARGET_PPC) || defined(TARGET_SPARC) { "g", 1, QEMU_OPTION_g }, @@ -9238,8 +9241,14 @@ int main(int argc, char **argv) kvm_allowed =3D 0; break; case QEMU_OPTION_no_kvm_irqchip: { =2D extern int kvm_irqchip; + extern int kvm_irqchip, kvm_pit; kvm_irqchip =3D 0; + kvm_pit =3D 0; + break; + } + case QEMU_OPTION_no_kvm_pit: { + extern int kvm_pit; + kvm_pit =3D 0; break; } #endif =2D-=20 debian.1.5.3.7.1-dirty --Boundary-00=_V96zHQkBnc7AIfU 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=_V96zHQkBnc7AIfU 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=_V96zHQkBnc7AIfU--