From: Lei Xia <lxia@northwestern.edu>
Date: Thu, 4 Nov 2010 14:15:13 +0000 (-0500)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=1877b10477f454ca5d271baa43da42b8e4167d9a;p=palacios.git

Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacios into devel

Conflicts:

	palacios/src/devices/serial.c
	palacios/src/devices/stream.c
---

1877b10477f454ca5d271baa43da42b8e4167d9a
diff --cc palacios/src/devices/stream.c
index bfcb855,e470cd9..0c6aed2
--- a/palacios/src/devices/stream.c
+++ b/palacios/src/devices/stream.c
@@@ -24,9 -24,8 +24,8 @@@
  #include <palacios/vmm_host_events.h>
  #include <palacios/vmm_lock.h>
  #include <palacios/vmm_string.h>
 -
 +#include <devices/serial.h>
  
- 
  struct stream_state {
      void *stream;
      struct vm_device *frontend_dev;
@@@ -103,10 -101,11 +102,10 @@@ static int stream_init(struct v3_vm_inf
  	return -1;
      }
  
 -    /* attach to front-end display adapter */
 -    v3_console_register_cga(frontend, &cons_ops, dev);
 -
 -	return 0;
 +    v3_stream_register_serial(frontend, &stream_ops, dev);
- 
- 	return 0;
++	
++    return 0;
  }
  
 -device_register("CURSES_CONSOLE", cons_init)
 +device_register("STREAM", stream_init)