From: Jack Lange <jacklange@cs.pitt.edu>
Date: Fri, 16 Sep 2011 23:25:24 +0000 (-0400)
Subject: Merge branch 'devel' of newskysaw.cs.northwestern.edu:/home/palacios/palacios into... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=504a6fd3bf01d7299ec69f80d5117dea3014ea28;hp=-c

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

504a6fd3bf01d7299ec69f80d5117dea3014ea28
diff --combined palacios/src/devices/keyboard.c
index 6d39878,f8786e2..5943fd3
--- a/palacios/src/devices/keyboard.c
+++ b/palacios/src/devices/keyboard.c
@@@ -573,7 -573,7 +573,7 @@@ static int mouse_write_output(struct ke
  
  
  #if KEYBOARD_DEBUG_80H
- static int keyboard_write_delay(ushort_t port, void * src,  uint_t length, void * priv_data) {
+ static int keyboard_write_delay(struct guest_info *core, ushort_t port, void * src,  uint_t length, void * priv_data) {
  
      if (length == 1) { 
  	PrintDebug("keyboard: write of 0x%x to 80h\n", *((uint8_t*)src));
@@@ -1051,27 -1051,9 +1051,27 @@@ static int keyboard_reset_device(struc
  
  }
  
 +#ifdef V3_CONFIG_CHECKPOINT
 +static int keyboard_save(struct v3_chkpt_ctx * ctx, void * private_data) {
 +    return 0;
 +}
 +
 +
 +static int keyboard_load(struct v3_chkpt_ctx * ctx, void * private_data) {
 +    struct keyboard_internal * kbd = (struct keyboard_internal *)private_data;
 +    keyboard_reset_device(kbd);
 +    return 0;
 +}
 +
 +#endif
 +
 +
  static struct v3_device_ops dev_ops = { 
      .free = (int (*)(void *))keyboard_free,
 -
 +#ifdef V3_CONFIG_CHECKPOINT
 +    .save = keyboard_save,
 +    .load = keyboard_load
 +#endif
  };