X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Finterfaces%2Fvmm_packet.c;h=9356e22990973ed34d1d2479d05260c47c127e57;hb=0246f0904a4800dbe1e8e23332d49b468a58f751;hp=b46325ee518843adf3502c94cb172a711415cce2;hpb=9a32111c4074aafd55cd9590a24bd5c751a6fe61;p=palacios.git

diff --git a/palacios/src/interfaces/vmm_packet.c b/palacios/src/interfaces/vmm_packet.c
index b46325e..9356e22 100644
--- a/palacios/src/interfaces/vmm_packet.c
+++ b/palacios/src/interfaces/vmm_packet.c
@@ -26,7 +26,7 @@ static struct v3_packet_hooks * packet_hooks = 0;
 
 void V3_Init_Packet(struct v3_packet_hooks * hooks) {
     packet_hooks = hooks;
-    PrintDebug("V3 raw packet interface inited\n");
+    PrintDebug(VM_NONE, VCORE_NONE,"V3 raw packet interface inited\n");
 
     return;
 }
@@ -38,11 +38,16 @@ struct v3_packet * v3_packet_connect(struct v3_vm_info * vm,
 				     void * guest_packet_data) {
     struct v3_packet * packet = NULL;
 
-    V3_ASSERT(packet_hooks != NULL);
-    V3_ASSERT(packet_hooks->connect != NULL);
+    V3_ASSERT(vm, VCORE_NONE, packet_hooks != NULL);
+    V3_ASSERT(vm, VCORE_NONE, packet_hooks->connect != NULL);
 
     packet = V3_Malloc(sizeof(struct v3_packet));
 
+    if (!packet) {
+	PrintError(vm, VCORE_NONE, "Cannot allocate in connecting packet\n");
+	return NULL;
+    }
+
     memcpy(packet->dev_mac, vm_mac, ETH_ALEN);
     packet->input = input;
     packet->guest_packet_data = guest_packet_data;
@@ -55,15 +60,15 @@ struct v3_packet * v3_packet_connect(struct v3_vm_info * vm,
 }
 
 int v3_packet_send(struct v3_packet * packet, uint8_t * buf, uint32_t len) {
-    V3_ASSERT(packet_hooks != NULL);
-    V3_ASSERT(packet_hooks->send != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE,packet_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE,packet_hooks->send != NULL);
     
     return packet_hooks->send(packet, buf, len);
 }
 
 void v3_packet_close(struct v3_packet * packet) {
-    V3_ASSERT(packet_hooks != NULL);
-    V3_ASSERT(packet_hooks->close != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE,packet_hooks != NULL);
+    V3_ASSERT(VM_NONE, VCORE_NONE,packet_hooks->close != NULL);
     
     packet_hooks->close(packet);
     V3_Free(packet);