Suppressed prints for CPUID exit RIPS and removed timer thread
authorGanShun <ganshun@gmail.com>
Tue, 17 Nov 2015 22:12:00 +0000 (14:12 -0800)
committerBarret Rhoden <brho@cs.berkeley.edu>
Tue, 2 Feb 2016 22:43:52 +0000 (17:43 -0500)
Commented out timer pthread create in vmrunkernel.c and changed printk to
printd in vmx.c for CPUID exit prints.

Signed-off-by: GanShun <ganshun@gmail.com>
Signed-off-by: Barret Rhoden <brho@cs.berkeley.edu>
kern/arch/x86/vmm/intel/vmx.c
tests/vmm/vmrunkernel.c

index 3579b19..1ba3b65 100644 (file)
@@ -1950,7 +1950,7 @@ int vmx_launch(struct vmctl *v) {
                        vmx_dump_cpu(vcpu);
                        vcpu->shutdown = SHUTDOWN_UNHANDLED_EXIT_REASON;
                } else if (ret == EXIT_REASON_CPUID) {
-                       printk("CPUID EXIT RIP: %p\n", vcpu->regs.tf_rip);
+                       printd("CPUID EXIT RIP: %p\n", vcpu->regs.tf_rip);
                        vmx_handle_cpuid(vcpu);
                        vmx_get_cpu(vcpu);
                        vmcs_writel(GUEST_RIP, vcpu->regs.tf_rip + 2);
index c685a7d..90c9165 100644 (file)
@@ -299,15 +299,15 @@ void *consin(void *arg)
                virtio_mmio_set_vring_irq();
 
                pwrite(fd, &vmctl, sizeof(vmctl), 1<<12);
-               if (!timer_started && mcp) {
-                       /* Start up timer thread */
+               /*if (!timer_started && mcp) {
+                       // Start up timer thread
                        if (pthread_create(&timerthread_struct, NULL, timer_thread, NULL)) {
                                fprintf(stderr, "pth_create failed for timer thread.");
                                perror("pth_create");
                        } else {
                                timer_started = 1;
                        }
-               }
+               }*/
        }
        fprintf(stderr, "All done\n");
        return NULL;