X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=4b2f4c079ba7a5a5c98f6c4675d285f539198d12;hp=7d1acfe1dcb5d49b76afffc15244001f3f548e2a;hb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;hpb=37c18b2c2335a41c68c2f0b779fd2b7d51ab216d

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 7d1acfe..4b2f4c0 100644
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -23,10 +23,10 @@
 #include <palacios/vmm_time.h>
 #include <palacios/vmm_util.h>
 #include <palacios/vmm_intr.h>
+#include <palacios/vmm_config.h>
 
 
-
-#ifndef DEBUG_PIT
+#ifndef CONFIG_DEBUG_PIT
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -631,9 +631,10 @@ static struct v3_device_ops dev_ops = {
 };
 
 
-static int pit_init(struct guest_info * info, void * cfg_data) {
+static int pit_init(struct guest_info * info, v3_cfg_tree_t * cfg) {
     struct pit * pit_state = NULL;
     struct vm_device * dev = NULL;
+    char * name = v3_cfg_val(cfg, "name");
 
     uint_t cpu_khz = V3_CPU_KHZ();
     ullong_t reload_val = (ullong_t)cpu_khz * 1000;
@@ -641,10 +642,10 @@ static int pit_init(struct guest_info * info, void * cfg_data) {
     pit_state = (struct pit *)V3_Malloc(sizeof(struct pit));
     V3_ASSERT(pit_state != NULL);
 
-    dev = v3_allocate_device("PIT", &dev_ops, pit_state);
+    dev = v3_allocate_device(name, &dev_ops, pit_state);
 
     if (v3_attach_device(info, dev) == -1) {
-	PrintError("Could not attach device %s\n", "PIT");
+	PrintError("Could not attach device %s\n", name);
 	return -1;
     }
 
@@ -653,7 +654,7 @@ static int pit_init(struct guest_info * info, void * cfg_data) {
     v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel);
     v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command);
 
-#ifdef DEBUG_PIT
+#ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ);
     PrintTraceLL(reload_val);
     PrintDebug("\n");
@@ -673,7 +674,7 @@ static int pit_init(struct guest_info * info, void * cfg_data) {
     init_channel(&(pit_state->ch_1));
     init_channel(&(pit_state->ch_2));
 
-#ifdef DEBUG_PIT
+#ifdef CONFIG_DEBUG_PIT
     PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000);
     PrintTraceLL(pit_state->pit_counter);
     PrintDebug("\n");