Prefaced output from V3_Print on linux module

[palacios.git] / linux_module / iface-socket.c

diff --git a/linux_module/iface-socket.c b/linux_module/iface-socket.c
index 7407f5f..39d18f0 100644 (file)
--- a/linux_module/iface-socket.c
+++ b/linux_module/iface-socket.c
@@ -1,24 +1,8 @@
-/*
- * This file is part of the Palacios Virtual Machine Monitor developed
- * by the V3VEE Project with funding from the United States National
- * Science Foundation and the Department of Energy.
- *
- * The V3VEE Project is a joint project between Northwestern University
- * and the University of New Mexico.  You can find out more at
- * http://www.v3vee.org
- *
- * Copyright (c) 2010, Lei Xia <lxia@northwestern.edu>
- * Copyright (c) 2010, The V3VEE Project <http://www.v3vee.org>
- * All rights reserved.
- *
- * This is free software.  You are permitted to use, redistribute,
- * and modify it under the terms of the GNU General Public License
- * Version 2 (GPLv2).  The accompanying COPYING file contains the
- * full text of the license.
- */
- /* 
+/* 
  * Palacios Socket Interface Implementation
+ * (c) Lei Xia  2010
  */
+ 
 
 #include <interfaces/vmm_socket.h>
 
@@ -67,7 +51,7 @@ palacios_tcp_socket(const int bufsize, const int nodelay,
         vm_state = get_vm_ext_data(guest, "SOCKET_INTERFACE");
         
         if (vm_state == NULL) {
-            printk("ERROR: Could not locate vm socket state for extension SOCKET_INTERFACE\n");
+            ERROR("ERROR: Could not locate vm socket state for extension SOCKET_INTERFACE\n");
             return NULL;
         }
     }
@@ -111,7 +95,7 @@ palacios_udp_socket(
         vm_state = get_vm_ext_data(guest, "SOCKET_INTERFACE");
         
         if (vm_state == NULL) {
-            printk("ERROR: Could not locate vm socket state for extension SOCKET_INTERFACE\n");
+            ERROR("ERROR: Could not locate vm socket state for extension SOCKET_INTERFACE\n");
             return NULL;
         }
     }
@@ -203,7 +187,7 @@ static void * palacios_accept(const void * sock_ptr, unsigned int * remote_ip, u
         vm_state = get_vm_ext_data(sock->guest, "SOCKET_INTERFACE");
         
         if (vm_state == NULL) {
-            printk("ERROR: Could not locate vm socket state for extension SOCKET_INTERFACE\n");
+            ERROR("Could not locate vm socket state for extension SOCKET_INTERFACE\n");
             return NULL;
         }
     }
@@ -473,7 +457,7 @@ static int socket_init( void ) {
 
 static int socket_deinit( void ) {
     if (!list_empty(&(global_sockets))) {
-       printk("Error removing module with open sockets\n");
+       ERROR("Error removing module with open sockets\n");
     }
 
     return 0;