X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=linux_module%2Fiface-console.c;h=e91b46e9d831b5c32d8868f3fad516fb8c71dfe9;hb=13230ccb05189ab1a615d28d78f1a8b19858e422;hp=067cefc6d276f72c9f12b8c64ae7b75ca0e60cfb;hpb=5ce19b21aac351221fe41e95e717127bfec0c467;p=palacios.releases.git

diff --git a/linux_module/iface-console.c b/linux_module/iface-console.c
index 067cefc..e91b46e 100644
--- a/linux_module/iface-console.c
+++ b/linux_module/iface-console.c
@@ -115,9 +115,9 @@ console_read(struct file * filp, char __user * buf, size_t size, loff_t * offset
 
     palacios_free(msg);
 
-    spin_lock_irqsave(&(cons->queue->lock), flags);
+    palacios_spinlock_lock_irqsave(&(cons->queue->lock), flags);
     entries =  cons->queue->num_entries;
-    spin_unlock_irqrestore(&(cons->queue->lock), flags);
+    palacios_spinlock_unlock_irqrestore(&(cons->queue->lock), flags);
     
     if (entries > 0) {
 	wake_up_interruptible(&(cons->intr_queue));
@@ -163,9 +163,9 @@ console_poll(struct file * filp, struct poll_table_struct * poll_tb) {
 
     poll_wait(filp, &(cons->intr_queue), poll_tb);
 
-    spin_lock_irqsave(&(cons->queue->lock), flags);
+    palacios_spinlock_lock_irqsave(&(cons->queue->lock), flags);
     entries = cons->queue->num_entries;
-    spin_unlock_irqrestore(&(cons->queue->lock), flags);
+    palacios_spinlock_unlock_irqrestore(&(cons->queue->lock), flags);
 
     if (entries > 0) {
 	//	DEBUG("Returning from POLL\n");
@@ -183,9 +183,9 @@ static int console_release(struct inode * i, struct file * filp) {
 
     DEBUG("Releasing the Console File desc\n");
     
-    spin_lock_irqsave(&(cons->queue->lock), flags);
+    palacios_spinlock_lock_irqsave(&(cons->queue->lock), flags);
     cons->connected = 0;
-    spin_unlock_irqrestore(&(cons->queue->lock), flags);
+    palacios_spinlock_unlock_irqrestore(&(cons->queue->lock), flags);
 
     while ((msg = dequeue(cons->queue))) {
 	palacios_free(msg);
@@ -216,12 +216,12 @@ static int console_connect(struct v3_guest * guest, unsigned int cmd,
 	return -1;
     }
 
-    spin_lock_irqsave(&(cons->lock), flags);
+    palacios_spinlock_lock_irqsave(&(cons->lock), flags);
     if (cons->connected == 0) {
 	cons->connected = 1;
 	acquired = 1;
     }
-    spin_unlock_irqrestore(&(cons->lock), flags);
+    palacios_spinlock_unlock_irqrestore(&(cons->lock), flags);
 
     if (acquired == 0) {
 	ERROR("Console already connected\n");
@@ -270,7 +270,7 @@ static void * palacios_tty_open(void * private_data, unsigned int width, unsigne
 
 
     cons->queue = create_queue(CONSOLE_QUEUE_LEN);
-    spin_lock_init(&(cons->lock));
+    palacios_spinlock_init(&(cons->lock));
     init_waitqueue_head(&(cons->intr_queue));
 
     cons->guest = guest;
@@ -418,7 +418,7 @@ static void palacios_tty_close(void * console) {
     remove_guest_ctrl(cons->guest, V3_VM_CONSOLE_CONNECT);
     deinit_queue(cons->queue);
        
-    kfree(cons);
+    palacios_free(cons);
 }