From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Thu, 2 Oct 2008 22:05:59 +0000 (-0500)
Subject: Merge branch 'ramdisk' into devel
X-Git-Tag: 1.0~3^2~17
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=7617d3cee4bd93b90558206b1bb1681c07f0396a

Merge branch 'ramdisk' into devel

Conflicts:
	palacios/include/devices/generic.h
	palacios/include/geekos/timer.h
	palacios/include/palacios/vmcs.h
	palacios/include/palacios/vmcs_gen.h
	palacios/src/devices/generic.c
	palacios/src/palacios/vmm_config.c
---

7617d3cee4bd93b90558206b1bb1681c07f0396a
diff --cc palacios/include/devices/generic.h
index c4a38b6,e2b4396..7a43e81
--- a/palacios/include/devices/generic.h
+++ b/palacios/include/devices/generic.h
@@@ -1,9 -1,10 +1,11 @@@
  /* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
+ /* (c) 2008, Jack Lange <jarusl@northwestern.edu> */
  /* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
  
- #ifndef __GENERIC_H
- #define __GENERIC_H
+ #ifndef __GENERIC_H__
+ #define __GENERIC_H__
+ 
 +
  #include <palacios/vm_dev.h>
  
  //
diff --cc palacios/include/geekos/timer.h
index 9b08713,b9f4eb4..f6add16
--- a/palacios/include/geekos/timer.h
+++ b/palacios/include/geekos/timer.h
@@@ -36,6 -36,6 +36,7 @@@ int Start_Timer_Secs(int seconds, timer
  int Start_Timer_MSecs(int msecs, timerCallback cb, void * arg);
  int Start_Timer(int ticks, timerCallback, void * arg);
  
++
  double Get_Remaining_Timer_Secs(int id);
  int Get_Remaining_Timer_MSecs(int id);
  int Get_Remaining_Timer_Ticks(int id);
diff --cc palacios/include/palacios/vmcs.h
index 337099c,01d6ba2..8851bae
--- a/palacios/include/palacios/vmcs.h
+++ b/palacios/include/palacios/vmcs.h
@@@ -2,11 -2,9 +2,13 @@@
  /* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
  /* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
  
 -#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 42af92e,467ae78..fa941b4
--- a/palacios/include/palacios/vmcs_gen.h
+++ b/palacios/include/palacios/vmcs_gen.h
@@@ -1,11 -1,8 +1,10 @@@
  /* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
- 
- 
 +#ifndef __VMCS_GEN__
 +#define __VMCS_GEN__
 +
 +#ifdef __V3VEE__
  
+ 
 -#ifndef vmcs_gen
 -#define vmcs_gen
  #include <palacios/vmcs.h>
  #include <palacios/vmm.h>
  
diff --cc palacios/include/palacios/vmm_types.h
index 4e073be,6f1aade..504b520
--- a/palacios/include/palacios/vmm_types.h
+++ b/palacios/include/palacios/vmm_types.h
@@@ -46,6 -46,6 +46,8 @@@ typedef char sint8_t
  
  typedef ulong_t addr_t;
  
 +#endif // ! __V3VEE__
 +
  #endif
+ 
+ #endif
diff --cc palacios/src/devices/generic.c
index 20ff37f,905a9a7..dc018ab
--- a/palacios/src/devices/generic.c
+++ b/palacios/src/devices/generic.c
@@@ -1,6 -1,7 +1,9 @@@
  /* (c) 2008, Peter Dinda <pdinda@northwestern.edu> */
  /* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
  
+ 
++
++
  #include <devices/generic.h>
  #include <palacios/vmm.h>
  #include <palacios/vmm_types.h>
@@@ -84,18 -99,7 +101,10 @@@ int generic_write_port_passthrough(usho
  
    switch (length) {
    case 1:
++<<<<<<< HEAD:palacios/src/devices/generic.c
++=======
+ 
++>>>>>>> ramdisk:palacios/src/devices/generic.c
      v3_outb(port,((uchar_t*)src)[0]);
      break;
    case 2:
@@@ -103,6 -107,7 +112,10 @@@
      break;
    case 4:
      v3_outdw(port,((uint_t*)src)[0]);
++<<<<<<< HEAD:palacios/src/devices/generic.c
++=======
+ 
++>>>>>>> ramdisk:palacios/src/devices/generic.c
      break;
    default:
      for (i = 0; i < length; i++) {