X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fvmm_ringbuffer.c;h=fc33a60a1d42b6fffc741e233df96e51bf1d5ba8;hb=3586c3bd6260bf79c57baebf66a26d7e8158d411;hp=af2428015ac5fe78d4a21f2275976d25da495e12;hpb=266af4b5b19da7bee8e7445288c7c1cb3ee194c7;p=palacios.git

diff --git a/palacios/src/palacios/vmm_ringbuffer.c b/palacios/src/palacios/vmm_ringbuffer.c
index af24280..fc33a60 100644
--- a/palacios/src/palacios/vmm_ringbuffer.c
+++ b/palacios/src/palacios/vmm_ringbuffer.c
@@ -25,6 +25,12 @@
 
 void NO_INST v3_init_ringbuf(struct v3_ringbuf * ring, uint_t size) {
     ring->buf = V3_Malloc(size);
+
+    if (!(ring->buf)) {
+        PrintError(VM_NONE, VCORE_NONE, "Cannot init a ring buffer\n");
+	return;
+    }
+
     ring->size = size;
   
     ring->start = 0;
@@ -36,6 +42,11 @@ NO_INST
 struct v3_ringbuf * v3_create_ringbuf(uint_t size) {
     struct v3_ringbuf * ring = (struct v3_ringbuf *)V3_Malloc(sizeof(struct v3_ringbuf));
 
+    if (!ring) {
+	PrintError(VM_NONE, VCORE_NONE, "Cannot allocate a ring buffer\n");
+	return NULL;
+    }
+
     v3_init_ringbuf(ring, size);
 
     return ring;
@@ -181,7 +192,7 @@ int v3_ringbuf_write(struct v3_ringbuf * ring, uchar_t * src, uint_t len) {
     if (is_write_loop(ring, write_len)) {
 	int section_len = get_write_section_size(ring);
 
-	//  PrintDebug("Write loop: write_ptr=%p, src=%p, sec_len=%d\n", 
+	//  PrintDebug(info->vm_info, info, "Write loop: write_ptr=%p, src=%p, sec_len=%d\n", 
 	//	       (void *)get_write_ptr(ring),(void*)src, section_len);
     
 	memcpy(get_write_ptr(ring), src, section_len);
@@ -191,7 +202,7 @@ int v3_ringbuf_write(struct v3_ringbuf * ring, uchar_t * src, uint_t len) {
 
 	ring->end += write_len - section_len;
     } else {
-	//    PrintDebug("Writing: write_ptr=%p, src=%p, write_len=%d\n", 
+	//    PrintDebug(info->vm_info, info, "Writing: write_ptr=%p, src=%p, write_len=%d\n", 
 	//	       (void *)get_write_ptr(ring),(void*)src, write_len);
 
 	memcpy(get_write_ptr(ring), src, write_len);
@@ -212,6 +223,6 @@ void v3_print_ringbuf(struct v3_ringbuf * ring) {
     for (ctr = 0; ctr < ring->current_len; ctr++) {
 	int index = (ctr + ring->start) % ring->size;
 
-	PrintDebug("Entry %d (index=%d): %c\n", ctr, index, ring->buf[index]);
+	PrintDebug(VM_NONE, VCORE_NONE, "Entry %d (index=%d): %c\n", ctr, index, ring->buf[index]);
     }
 }