sync pit dm with latest qemu and move it to hypervisor
PATCH 1/1 sync pit dm with latest qemu and move it to hypervisor
sync pit dm with latest qemu and move it to hypervisor
Signed-off-by Edwin Zhai <[email protected]>
Signature · 2 lines
thanks, edwin
tools/ioemu/hw/pc.c +3 -9
@@ -40,7 +40,6 @@ int dummy_refresh_clock;int dummy_refresh_clock;static fdctrl_t *floppy_controller;static RTCState *rtc_state; -static PITState *pit;static void ioport80_write (void *opaque,uint32_t addr,uint32_t data) {
@@ -243,17 +242,13 @@ static void cmos_init(uint64_t ram_size,static void speaker_ioport_write (void *opaque,uint32_t addr,uint32_t val) { - speaker_data_on = (val >>1 ) &1 ; -pit_set_gate (pit,2 , val &1 ); +fprintf (stderr,"speaker port should not be handled in DM!\n" ); }static uint32_t speaker_ioport_read (void *opaque,uint32_t addr) { -int out; - out =pit_get_out (pit,2 ,qemu_get_clock (vm_clock)); - dummy_refresh_clock ^=1 ; -return (speaker_data_on <<1 ) |pit_get_gate (pit,2 ) | (out <<5 ) | - (dummy_refresh_clock <<4 ); +fprintf (stderr,"speaker port should not be handled in DM!\n" ); +return 0 ; }static void ioport92_write (void *opaque,uint32_t addr,uint32_t val)
@@ -529,7 +524,6 @@ void pc_init(uint64_t ram_size, int vga_register_ioport_write (0x92 ,1 ,1 , ioport92_write,NULL );pic_init (); - pit =pit_init (0x40 ,0 );for (i =0 ; i <MAX_SERIAL_PORTS ; i++) {if (serial_hds[i]) {
tools/ioemu/target-i386-dm/Makefile +1 -1
@@ -277,7 +277,7 @@ endif # Hardware support VL_OBJS+= ide.o ne2000.o pckbd.o vga.o dma.o -VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259_stub.o i8254.o pc.o port-e9.o +VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259_stub.o pc.o port-e9.o VL_OBJS+= cirrus_vga.o pcnet.o VL_OBJS+= $(SOUND_HW) $(AUDIODRV) mixeng.o
xen/arch/x86/hvm/Makefile +1 -0
@@ -2,6 +2,7 @@ subdir-y += vmx subdir-y += vmx obj-y += hvm.o +obj-y += i8254.o obj-y += i8259.o obj-y += intercept.o obj-y += io.o
xen/arch/x86/hvm/hvm.c +2 -0
@@ -203,6 +203,8 @@ void hvm_setup_platform(struct domain* dspin_lock_init (&d->arch.hvm_domain.round_robin_lock);hvm_vioapic_init (d); } + +pit_init (&platform->vpit, current); }void pic_irq_request (void *data,int level)
xen/arch/x86/hvm/intercept.c +0 -236
248 lines not on this page · raw message
xen/arch/x86/hvm/io.c +0 -2
@@ -674,8 +674,6 @@ void hvm_io_assist(struct vcpu *v) } p = &vio->vp_ioreq; -if (p->state ==STATE_IORESP_HOOK ) -hvm_hooks_assist (v);/* clear IO wait HVM flag */ if (test_bit (ARCH_HVM_IO_WAIT , &v->arch.hvm_vcpu.ioflags)) {
xen/arch/x86/hvm/svm/intr.c +19 -19
@@ -46,44 +46,43 @@u64 svm_get_guest_time (struct vcpu *v) { -struct hvm_virpit *vpit = &(v->domain->arch.hvm_domain.vpit); +struct hvm_time_info *time_info = &(v->domain->arch.hvm_domain.vpit.time_info);u64 host_tsc;rdtscll (host_tsc); -return host_tsc + vpit->cache_tsc_offset; +return host_tsc + time_info->cache_tsc_offset; }void svm_set_guest_time (struct vcpu *v,u64 gtime) { -struct hvm_virpit *vpit = &(v->domain->arch.hvm_domain.vpit); +struct hvm_time_info *time_info = &(v->domain->arch.hvm_domain.vpit.time_info);u64 host_tsc;rdtscll (host_tsc); - vpit->cache_tsc_offset = gtime - host_tsc; - v->arch.hvm_svm.vmcb->tsc_offset = vpit->cache_tsc_offset; + time_info->cache_tsc_offset = gtime - host_tsc; + v->arch.hvm_svm.vmcb->tsc_offset = time_info->cache_tsc_offset; }static inline void interrupt_post_injection (struct vcpu * v,int vector,int type) {struct hvm_virpit *vpit = &(v->domain->arch.hvm_domain.vpit); +struct hvm_time_info *time_info = &vpit->time_info;if (is_pit_irq (v, vector, type) ) { -if ( !vpit->first_injected ) { - vpit->pending_intr_nr =0 ; - vpit->last_pit_gtime =svm_get_guest_time (v); - vpit->scheduled =NOW () + vpit->period; -set_timer (&vpit->pit_timer, vpit->scheduled); - vpit->first_injected =1 ; +if ( !time_info->first_injected ) { + time_info->pending_intr_nr =0 ; + time_info->last_pit_gtime =svm_get_guest_time (v); + time_info->first_injected =1 ; }else { - vpit->pending_intr_nr--; + time_info->pending_intr_nr--; } - vpit->count_advance =0 ; - vpit->count_point =NOW (); - - vpit->last_pit_gtime += vpit->period_cycles; -svm_set_guest_time (v, vpit->last_pit_gtime); + time_info->count_advance =0 ; + time_info->count_point =NOW (); + + time_info->last_pit_gtime += time_info->period_cycles; +svm_set_guest_time (v, time_info->last_pit_gtime); } switch(type)
@@ -123,6 +122,7 @@ asmlinkage void svm_intr_assist(void)struct vmcb_struct *vmcb = v->arch.hvm_svm.vmcb;struct hvm_domain *plat=&v->domain->arch.hvm_domain;struct hvm_virpit *vpit = &plat->vpit; +struct hvm_time_info *time_info = &vpit->time_info;struct hvm_virpic *pic= &plat->vpic;int intr_type =VLAPIC_DELIV_MODE_EXT ;int intr_vector =-1 ;
@@ -185,7 +185,7 @@ asmlinkage void svm_intr_assist(void)if (cpu_has_pending_irq (v) ) { intr_vector =cpu_get_interrupt (v, &intr_type); } -else if ( (v->vcpu_id ==0 ) && vpit->pending_intr_nr ) { +else if ( (v->vcpu_id ==0 ) && time_info->pending_intr_nr ) {pic_set_irq (pic,0 ,0 );pic_set_irq (pic,0 ,1 ); intr_vector =cpu_get_interrupt (v, &intr_type);
@@ -201,7 +201,7 @@ asmlinkage void svm_intr_assist(void)/* Re-injecting a PIT interruptt? */ if (re_injecting &&is_pit_irq (v, intr_vector, intr_type)) { - ++vpit->pending_intr_nr; + ++time_info->pending_intr_nr; }/* let's inject this interrupt */ TRACE_3D (TRC_VMX_INT , v->domain->domain_id, intr_vector,0 );
xen/arch/x86/hvm/svm/svm.c +12 -12
@@ -675,12 +675,12 @@ static void arch_svm_do_launch(struct vcstatic void svm_freeze_time (struct vcpu *v) { -struct hvm_virpit *vpit = &v->domain->arch.hvm_domain.vpit; +struct hvm_time_info *time_info = &v->domain->arch.hvm_domain.vpit.time_info; -if ( vpit->first_injected && !v->domain->arch.hvm_domain.guest_time ) { +if ( time_info->first_injected && !v->domain->arch.hvm_domain.guest_time ) { v->domain->arch.hvm_domain.guest_time =svm_get_guest_time (v); - vpit->count_advance += (NOW () - vpit->count_point); -stop_timer (&(vpit->pit_timer)); + time_info->count_advance += (NOW () - time_info->count_point); +stop_timer (&(time_info->pit_timer)); } }
@@ -750,7 +750,7 @@ static void svm_relinquish_guest_resourc } } -kill_timer (&d->arch.hvm_domain.vpit.pit_timer); +kill_timer (&d->arch.hvm_domain.vpit.time_info.pit_timer);if ( d->arch.hvm_domain.shared_page_va ) unmap_domain_page_global(
@@ -780,10 +780,10 @@ void arch_svm_do_resume(struct vcpu *v)void svm_migrate_timers (struct vcpu *v) { -struct hvm_virpit *vpit = &(v->domain->arch.hvm_domain.vpit); - -migrate_timer ( &vpit->pit_timer, v->processor ); -migrate_timer ( &v->arch.hvm_svm.hlt_timer, v->processor ); +struct hvm_time_info *time_info = &v->domain->arch.hvm_domain.vpit.time_info; + +migrate_timer (&time_info->pit_timer, v->processor); +migrate_timer (&v->arch.hvm_svm.hlt_timer, v->processor);if (hvm_apic_support (v->domain) &&VLAPIC ( v ))migrate_timer ( &(VLAPIC (v)->vlapic_timer ), v->processor ); }
@@ -1843,11 +1843,11 @@ static inline void svm_do_msr_access(strswitch (regs->ecx) {case MSR_IA32_TIME_STAMP_COUNTER : { -struct hvm_virpit *vpit; +struct hvm_time_info *time_info;rdtscll (msr_content); - vpit = &(v->domain->arch.hvm_domain.vpit); - msr_content += vpit->cache_tsc_offset; + time_info = &v->domain->arch.hvm_domain.vpit.time_info; + msr_content += time_info->cache_tsc_offset;break ; }case MSR_IA32_SYSENTER_CS :
xen/arch/x86/hvm/svm/vmcb.c +3 -2
@@ -478,14 +478,15 @@ void svm_do_resume(struct vcpu *v) {struct domain *d = v->domain;struct hvm_virpit *vpit = &d->arch.hvm_domain.vpit; +struct hvm_time_info *time_info = &vpit->time_info;svm_stts (v);/* pick up the elapsed PIT ticks and re-enable pit_timer */ -if ( vpit->first_injected ) { +if ( time_info->first_injected ) {if ( v->domain->arch.hvm_domain.guest_time ) {svm_set_guest_time (v, v->domain->arch.hvm_domain.guest_time); - vpit->count_point =NOW (); + time_info->count_point =NOW (); v->domain->arch.hvm_domain.guest_time =0 ; }pickup_deactive_ticks (vpit);
xen/arch/x86/hvm/vmx/io.c +21 -21
91 lines not on this page · raw message
xen/arch/x86/hvm/vmx/vmx.c +11 -11
@@ -102,7 +102,7 @@ static void vmx_relinquish_guest_resourc } } -kill_timer (&d->arch.hvm_domain.vpit.pit_timer); +kill_timer (&d->arch.hvm_domain.vpit.time_info.pit_timer);if ( d->arch.hvm_domain.shared_page_va ) unmap_domain_page_global(
@@ -358,12 +358,12 @@ static inline int long_mode_do_msr_writestatic void vmx_freeze_time (struct vcpu *v) { -struct hvm_virpit *vpit = &v->domain->arch.hvm_domain.vpit; +struct hvm_time_info *time_info = &(v->domain->arch.hvm_domain.vpit.time_info); -if ( vpit->first_injected && !v->domain->arch.hvm_domain.guest_time ) { +if ( time_info->first_injected && !v->domain->arch.hvm_domain.guest_time ) { v->domain->arch.hvm_domain.guest_time =get_guest_time (v); - vpit->count_advance += (NOW () - vpit->count_point); -stop_timer (&(vpit->pit_timer)); + time_info->count_advance += (NOW () - time_info->count_point); +stop_timer (&(time_info->pit_timer)); } }
@@ -393,9 +393,9 @@ int vmx_initialize_guest_resources(strucvoid vmx_migrate_timers (struct vcpu *v) { -struct hvm_virpit *vpit = &(v->domain->arch.hvm_domain.vpit); - -migrate_timer (&vpit->pit_timer, v->processor); +struct hvm_time_info *time_info = &v->domain->arch.hvm_domain.vpit.time_info; + +migrate_timer (&time_info->pit_timer, v->processor);migrate_timer (&v->arch.hvm_vmx.hlt_timer, v->processor);if (hvm_apic_support (v->domain) &&VLAPIC (v))migrate_timer (&(VLAPIC (v)->vlapic_timer), v->processor);
@@ -1836,11 +1836,11 @@ static inline void vmx_do_msr_read(strucswitch (regs->ecx) {case MSR_IA32_TIME_STAMP_COUNTER : { -struct hvm_virpit *vpit; +struct hvm_time_info *time_info;rdtscll (msr_content); - vpit = &(v->domain->arch.hvm_domain.vpit); - msr_content += vpit->cache_tsc_offset; + time_info = &(v->domain->arch.hvm_domain.vpit.time_info); + msr_content += time_info->cache_tsc_offset;break ; }case MSR_IA32_SYSENTER_CS :
xen/include/asm-x86/hvm/vpit.h +38 -20
85 lines not on this page · raw message
xen/arch/x86/hvm/i8254.c new file +594 -0
594 lines not on this page · raw message
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel