clean up

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 470d878..b636ddc 100644 (file)
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -6,12 +6,7 @@
 #ifndef DEBUG_PIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
-#endif
-
-#ifdef DEBUG_RAMDISK
-#define Ramdisk_Print_Pic(_f, _a...) PrintTrace("\n8259a.c(%d) "_f, __LINE__, ## _a)
-#else
-#define Ramdisk_Print_Pic(_f, _a...)
+#define PrintPicTrace(_f, _a...) PrintTrace("\n8259a.c(%d) "_f, __LINE__, ## _a)
 #endif
 
 
@@ -195,18 +190,18 @@ static int pic_lower_intr(void *private_data, int irq_no) {
 
   struct pic_internal *state = (struct pic_internal*)private_data;
 
-  Ramdisk_Print_Pic("[pic_lower_intr] IRQ line %d now low\n", (unsigned) irq_no);
+  PrintPicTrace("[pic_lower_intr] IRQ line %d now low\n", (unsigned) irq_no);
   if (irq_no <= 7) {
 
     state->master_irr &= ~(1 << irq_no);
     if ((state->master_irr & ~(state->master_imr)) == 0) {
-      Ramdisk_Print_Pic("\t\tFIXME: Master maybe should do sth\n");
+      PrintPicTrace("\t\tFIXME: Master maybe should do sth\n");
     }
   } else if ((irq_no > 7) && (irq_no <= 15)) {
 
     state->slave_irr &= ~(1 << (irq_no - 8));
     if ((state->slave_irr & (~(state->slave_imr))) == 0) {
-      Ramdisk_Print_Pic("\t\tFIXME: Slave maybe should do sth\n");
+      PrintPicTrace("\t\tFIXME: Slave maybe should do sth\n");
     }
   }
   return 0;
@@ -226,9 +221,9 @@ static int pic_intr_pending(void * private_data) {
 }
 
 static int pic_get_intr_number(void * private_data) {
-  struct pic_internal * state = (struct pic_internal*)private_data;
-  int i=0;
-  int irq=-1;
+  struct pic_internal * state = (struct pic_internal *)private_data;
+  int i = 0;
+  int irq = -1;
 
   PrintDebug("8259 PIC: getnum: master_irr: 0x%x master_imr: 0x%x\n", i, state->master_irr, state->master_imr);
   PrintDebug("8259 PIC: getnum: slave_irr: 0x%x slave_imr: 0x%x\n", i, state->slave_irr, state->slave_imr);
@@ -254,11 +249,11 @@ static int pic_get_intr_number(void * private_data) {
     }
   }
 
-  if (i==15 || i==6) { 
+  if ((i == 15) || (i == 6)) { 
     DumpPICState(state);
   }
   
-  if (i==16) { 
+  if (i == 16) { 
     return -1;
   } else {
     return irq;

diff --git a/palacios/src/devices/cdrom.c b/palacios/src/devices/cdrom.c
index 75b7e33..cfcd7bb 100644 (file)
--- a/palacios/src/devices/cdrom.c
+++ b/palacios/src/devices/cdrom.c
@@ -19,7 +19,7 @@ extern ulong_t g_ramdiskImage;
 extern ulong_t s_ramdiskSize;
 
 static
-void cdrom_init(struct cdrom_interface *cdrom)
+void cdrom_init(struct cdrom_interface * cdrom)
 {
 
   Ramdisk_Print_CD("[cdrom_init]\n");
@@ -36,7 +36,7 @@ void cdrom_init(struct cdrom_interface *cdrom)
  */
  
 static
-rd_bool cdrom_insert(struct cdrom_interface *cdrom, char *dev /*= NULL*/)
+rd_bool cdrom_insert(struct cdrom_interface * cdrom, char *dev /*= NULL*/)
 {
   Ramdisk_Print_CD("[cdrom_insert]\n");
   return 1;

diff --git a/palacios/src/palacios/vmm_intr.c b/palacios/src/palacios/vmm_intr.c
index 823652a..ebe9d12 100644 (file)
--- a/palacios/src/palacios/vmm_intr.c
+++ b/palacios/src/palacios/vmm_intr.c
@@ -6,13 +6,12 @@
 #ifndef DEBUG_INTERRUPTS
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
+#else 
+#undef PrintDebug
+#define PrintDebug(fmt, args...) PrintTrace("\nvmm_intr.c(%d) "_f, __LINE__, ## _a)
 #endif
 
-#ifdef DEBUG_RAMDISK
-#define Ramdisk_Print_Intr(_f, _a...) PrintTrace("\nvmm_intr.c(%d) "_f, __LINE__, ## _a)
-#else
-#define Ramdisk_Print_Intr(_f, _a...)
-#endif
+
 
 /*Zheng 07/30/2008*/
 void init_interrupt_state(struct guest_info * info) {
@@ -81,12 +80,9 @@ void deliver_interrupt_to_vmm(struct vmm_intr_state *state)
 
 static void guest_injection_irq_handler(struct vmm_intr_state *state)
 {
-  PrintDebug("guest_irq_injection: state=0x%x\n",state);
-
   struct guest_info *guest = (struct guest_info *)(state->opaque);
-
-  PrintDebug("guest_irq_injection: injecting irq 0x%x into guest 0x%x\n",state->irq,guest);
-  Ramdisk_Print_Intr("[guest_injection_irq_handler] raise_irq = %x\n", state->irq);
+  PrintDebug("[guest_injection_irq_handler] raise_irq=0x%x (guest=0x%x)\n", state->irq, guest);
+  PrintDebug("guest_irq_injection: state=0x%x\n", state);
   guest->vm_ops.raise_irq(guest,state->irq);
 }
 
@@ -99,10 +95,10 @@ int v3_hook_irq_for_guest_injection(struct guest_info *info, int irq)
                       info);
 
   if (rc) { 
-    PrintError("guest_irq_injection: failed to hook irq 0x%x for guest 0x%x\n", irq,info);
+    PrintError("guest_irq_injection: failed to hook irq 0x%x (guest=0x%x)\n", irq, info);
     return -1;
   } else {
-    PrintDebug("guest_irq_injection: hooked irq 0x%x for guest 0x%x\n", irq,info);
+    PrintDebug("guest_irq_injection: hooked irq 0x%x (guest=0x%x)\n", irq, info);
     return 0;
   }
 }
@@ -118,11 +114,9 @@ int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t
     intr_state->excp_num = excp;
     intr_state->excp_error_code = error_code;
     intr_state->excp_error_code_valid = 1;
-    PrintDebug("Raising exception with error code: %x\n", error_code);
-    Ramdisk_Print_Intr("[v3_raise_exception_with_error] error code: %x\n", error_code);
+    PrintDebug("[v3_raise_exception_with_error] error code: %x\n", error_code);
   } else {
     PrintError("exception already pending, currently not implemented\n");
-    Ramdisk_Print_Intr("[v3_raise_exception_with_error] not implemented\n");
     return -1;
   }
 
@@ -131,7 +125,7 @@ int v3_raise_exception_with_error(struct guest_info * info, uint_t excp, uint_t
 
 int v3_raise_exception(struct guest_info * info, uint_t excp) {
   struct vm_intr * intr_state = &(info->intr_state);
-  Ramdisk_Print_Intr("[v3_raise_exception]\n");
+  PrintDebug("[v3_raise_exception]\n");
   if (intr_state->excp_pending == 0) {
     intr_state->excp_pending = 1;
     intr_state->excp_num = excp;
@@ -153,7 +147,7 @@ int v3_lower_irq(struct guest_info * info, int irq) {
   V3_ASSERT(info->intr_state.controller);
   V3_ASSERT(info->intr_state.controller->raise_intr);
 
-  Ramdisk_Print_Intr("[v3_lower_irq]\n");
+  PrintDebug("[v3_lower_irq]\n");
 
   //  if ((info->intr_state.controller) && 
   //  (info->intr_state.controller->raise_intr)) {
@@ -171,7 +165,7 @@ int v3_raise_irq(struct guest_info * info, int irq) {
   V3_ASSERT(info->intr_state.controller);
   V3_ASSERT(info->intr_state.controller->raise_intr);
 
-  Ramdisk_Print_Intr("[v3_raise_irq]\n");
+  PrintDebug("[v3_raise_irq]\n");
 
   //  if ((info->intr_state.controller) && 
   //  (info->intr_state.controller->raise_intr)) {
@@ -188,7 +182,7 @@ int v3_raise_irq(struct guest_info * info, int irq) {
 int intr_pending(struct guest_info * info) {
   struct vm_intr * intr_state = &(info->intr_state);
 
-  //  Ramdisk_Print_Intr("[intr_pending]\n");
+  //  PrintDebug("[intr_pending]\n");
   if (intr_state->excp_pending == 1) {
     return 1;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state) == 1) {
@@ -207,7 +201,7 @@ uint_t get_intr_number(struct guest_info * info) {
   if (intr_state->excp_pending == 1) {
     return intr_state->excp_num;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
-    Ramdisk_Print_Intr("[get_intr_number] intr_number = %d\n", intr_state->controller->get_intr_number(intr_state->controller_state));
+    PrintDebug("[get_intr_number] intr_number = %d\n", intr_state->controller->get_intr_number(intr_state->controller_state));
     return intr_state->controller->get_intr_number(intr_state->controller_state);
   }
 
@@ -221,13 +215,13 @@ intr_type_t get_intr_type(struct guest_info * info) {
  struct vm_intr * intr_state = &(info->intr_state);
 
   if (intr_state->excp_pending) {
-    Ramdisk_Print_Intr("[get_intr_type] Exception\n");
+    PrintDebug("[get_intr_type] Exception\n");
     return EXCEPTION;
   } else if (intr_state->controller->intr_pending(intr_state->controller_state)) {
-    Ramdisk_Print_Intr("[get_intr_type] External_irq\n");
+    PrintDebug("[get_intr_type] External_irq\n");
     return EXTERNAL_IRQ;
   }
-    Ramdisk_Print_Intr("[get_intr_type] Invalid_Intr\n");
+    PrintDebug("[get_intr_type] Invalid_Intr\n");
   return INVALID_INTR;
 }
 
@@ -240,14 +234,14 @@ int injecting_intr(struct guest_info * info, uint_t intr_num, intr_type_t type)
   struct vm_intr * intr_state = &(info->intr_state);
 
   if (type == EXCEPTION) {
-    Ramdisk_Print_Intr("[injecting_intr] Exception\n");
+    PrintDebug("[injecting_intr] Exception\n");
     intr_state->excp_pending = 0;
     intr_state->excp_num = 0;
     intr_state->excp_error_code = 0;
     intr_state->excp_error_code_valid = 0;
     
   } else if (type == EXTERNAL_IRQ) {
-    Ramdisk_Print_Intr("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
+    PrintDebug("[injecting_intr] External_Irq with intr_num = %x\n", intr_num);
     return intr_state->controller->begin_irq(intr_state->controller_state, intr_num);
   }
 

diff --git a/palacios/src/palacios/vmm_queue.c b/palacios/src/palacios/vmm_queue.c
index da5176a..66ae17e 100644 (file)
--- a/palacios/src/palacios/vmm_queue.c
+++ b/palacios/src/palacios/vmm_queue.c
@@ -2,19 +2,19 @@
 
 
 
-void init_queue(struct gen_queue * queue) {
+void v3_init_queue(struct gen_queue * queue) {
   queue->num_entries = 0;
   INIT_LIST_HEAD(&(queue->entries));
 }
 
 
-struct gen_queue * create_queue() {
+struct gen_queue * v3_create_queue() {
   struct gen_queue * tmp_queue = V3_Malloc(sizeof(struct gen_queue));
-  init_queue(tmp_queue);
+  v3_init_queue(tmp_queue);
   return tmp_queue;
 }
 
-void enqueue(struct gen_queue * queue, addr_t entry) {
+void v3_enqueue(struct gen_queue * queue, addr_t entry) {
   struct queue_entry * q_entry = V3_Malloc(sizeof(struct queue_entry));
 
   q_entry->entry = entry;
@@ -23,7 +23,7 @@ void enqueue(struct gen_queue * queue, addr_t entry) {
 }
 
 
-addr_t dequeue(struct gen_queue * queue) {
+addr_t v3_dequeue(struct gen_queue * queue) {
   addr_t entry_val = 0;
 
   if (!list_empty(&(queue->entries))) {