From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Fri, 10 Oct 2008 19:55:11 +0000 (-0500)
Subject: Merging for release RC2
X-Git-Tag: 1.0~3
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=baf11c9608d0048e1282023ecd3158d701929f75;p=palacios.git

Merging for release RC2
Merge branch 'devel'

Conflicts:
	palacios/include/devices/generic.h
	palacios/include/devices/ide.h
	palacios/include/geekos/debug.h
	palacios/include/geekos/net.h
	palacios/include/geekos/pci.h
	palacios/include/geekos/queue.h
	palacios/include/geekos/reboot.h
	palacios/include/geekos/ring_buffer.h
	palacios/include/geekos/serial.h
	palacios/include/geekos/socket.h
	palacios/include/geekos/timer.h
	palacios/include/geekos/vm.h
	palacios/include/palacios/vmcs.h
	palacios/include/palacios/vmcs_gen.h
	palacios/src/devices/cdrom.c
	palacios/src/devices/generic.c
	palacios/src/devices/ramdisk.c
	palacios/src/geekos/debug.c
	palacios/src/geekos/net.c
	palacios/src/geekos/queue.c
	palacios/src/geekos/testvm.s
	palacios/src/palacios/vmm_config.c
---

baf11c9608d0048e1282023ecd3158d701929f75
diff --cc palacios/include/devices/generic.h
index b6461fc,591d86c..3dd33bc
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@@ -20,9 -19,10 +19,9 @@@
   * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
   */
  
 -
+ #ifndef __GENERIC_H__
+ #define __GENERIC_H__
  
- #ifndef __GENERIC_H
- #define __GENERIC_H
  
  #include <palacios/vm_dev.h>
  
diff --cc palacios/include/devices/ide.h
index dd1b4b2,c001550..66630fe
--- a/palacios/include/devices/ide.h
+++ b/palacios/include/devices/ide.h
@@@ -204,6 -204,9 +204,10 @@@ struct  drive_t 
    struct sense_info_t sense;
    struct atapi_t atapi;
    
++
+   /* JRL */
+   void * private_data;
+ 
    Bit8u model_no[41];
  };
  
@@@ -239,3 -242,29 +243,30 @@@ struct  ramdisk_t 
  
  #endif
  
++
+ #if 0
+ 
+ // FLAT MODE
+ // Open a image. Returns non-negative if successful.
+ //int open (const char* pathname);
+ 
+ // Open an image with specific flags. Returns non-negative if successful.
+ int rd_open (const char* pathname, int flags);
+ 
+ // Close the image.
+ void rd_close ();
+ 
+ // Position ourselves. Return the resulting offset from the
+ // beginning of the file.
+ off_t rd_lseek (off_t offset, int whence);
+ 
+ // Read count bytes to the buffer buf. Return the number of
+ // bytes read (count).
+ ssize_t rd_read (void* buf, size_t count);
+ 
+ // Write count bytes from buf. Return the number of bytes
+ // written (count).
+ ssize_t rd_write (const void* buf, size_t count);
+ 
+ 
+ #endif
diff --cc palacios/include/palacios/vmcs.h
index b82b179,5c78dd6..3ba5064
--- a/palacios/include/palacios/vmcs.h
+++ b/palacios/include/palacios/vmcs.h
@@@ -20,9 -20,13 +20,15 @@@
   * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
   */
  
- #ifndef __VMCS_H
- #define __VMCS_H
+ 
++
+ #ifndef __VMCS_H__
+ #define __VMCS_H__
+ 
+ #ifdef __V3VEE__
+ 
+ 
 +
  #include <palacios/vmm_types.h>
  
  
diff --cc palacios/include/palacios/vmcs_gen.h
index 6ac9108,a78990b..7c1a1c8
--- a/palacios/include/palacios/vmcs_gen.h
+++ b/palacios/include/palacios/vmcs_gen.h
@@@ -801,6 -799,11 +799,10 @@@ uint_t  Get_HOST_RIP()
  void    PrintTrace_HOST_RIP();
  
  void PrintTrace_VMCS_ALL();
- #endif
+ 
+ 
+ #endif // !__V3VEE
  
  #endif
+ 
+ 
 -
diff --cc palacios/src/devices/cdrom.c
index 102e86b,eaf073f..59a28fb
--- a/palacios/src/devices/cdrom.c
+++ b/palacios/src/devices/cdrom.c
@@@ -19,13 -18,13 +18,14 @@@
   * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
   */
  
++
  #include <devices/cdrom.h>
+ #include <devices/ide.h>
  #include <palacios/vmm.h>
  
- #ifdef DEBUG_RAMDISK
- #define Ramdisk_Print_CD(_f, _a...) PrintTrace("cdrom.c(%d) "_f, __LINE__, ## _a)
- #else
- #define Ramdisk_Print_CD(_f, _a...)
+ #ifndef DEBUG_RAMDISK
+ #undef PrintDebug
+ #define PrintDebug(fmt, args...)
  #endif