kvm: qemu: Add option for enable/disable in kernel PIT
PATCH 3/6 kvm: qemu: Add option for enable/disable in kernel PIT
From 98543bb3c3821e5bc9003bb91d7d0c755394ffac Mon Sep 17 00:00:00 2001
From: Sheng Yang <[email protected]>
Date: Fri, 7 Mar 2008 14:24:32 +0800
Subject: [PATCH] kvm: qemu: Add option for enable/disable in kernel PIT
--- 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(-)
libkvm/libkvm-x86.c +0 -0
@@ -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
+}
qemu/hw/i8254.c +8 -4
@@ -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);
qemu/qemu-kvm.c +4 -0
@@ -10,6 +10,7 @@int kvm_allowed =1 ;int kvm_irqchip =1 ; +int kvm_pit =1 ;#include <string.h> #include "hw/hw.h"
@@ -544,6 +545,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 ;
qemu/qemu-kvm.h +2 -0
@@ -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
qemu/vl.c +1 -0
@@ -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
From 98543bb3c3821e5bc9003bb91d7d0c755394ffac Mon Sep 17 00:00:00 2001
From: Sheng Yang <[email protected]>
Date: Fri, 7 Mar 2008 14:24:32 +0800
Subject: [PATCH] kvm: qemu: Add option for enable/disable in kernel PIT
--- 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(-)
libkvm/libkvm-x86.c +9 -0
@@ -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 +}
qemu/hw/i8254.c +8 -4
@@ -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);
qemu/qemu-kvm.c +4 -0
@@ -10,6 +10,7 @@int kvm_allowed =1 ;int kvm_irqchip =1 ; +int kvm_pit =1 ;#include <string.h> #include "hw/hw.h"
@@ -544,6 +545,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 ;
qemu/qemu-kvm.h +2 -0
@@ -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
qemu/vl.c +10 -1
@@ -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
Signature · 1 line
debian.1.5.3.7.1-dirty
-------------------------------------------------------------------------
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/
_______________________________________________
kvm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel
Quoted 4 lines · Sheng
From
98543bb3c3821e5bc9003bb91d7d0c755394ffacMon Sep 17 00:00:00 2001
From: Sheng Yang <[email protected]>
Date: Fri, 7 Mar 2008 14:24:32 +0800
Subject: [PATCH] kvm: qemu: Add option for enable/disable in kernel PIT
This patch breaks all non-x86 architectures, since common code now calls functions defined only in libkvm-x86.c .
Signature · 9 lines
Hollis Blanchard IBM Linux Technology Center ------------------------------------------------------------------------- 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/