From: Alexander Kudryavtsev <alexk@ispras.ru>
Date: Fri, 17 Feb 2012 20:29:24 +0000 (-0600)
Subject: Handle NMI-disabled write to NVRAM address register
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=74d89993a0fba5377a154615b853e44b24c3c945;p=palacios.releases.git

Handle NMI-disabled write to NVRAM address register
---

diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c
index cda167e..d1f27a2 100644
--- a/palacios/src/devices/nvram.c
+++ b/palacios/src/devices/nvram.c
@@ -713,11 +713,14 @@ static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvra
 
 static int nvram_write_reg_port(struct guest_info * core, uint16_t port,
 				void * src, uint_t length, void * priv_data) {
-
+    uint8_t reg;
     struct nvram_internal * data = priv_data;
+
+    memcpy(&reg,src,1);
+
+    data->thereg = reg & 0x7f;  //discard NMI bit if it's there
     
-    memcpy(&(data->thereg), src, 1);
-    PrintDebug("nvram: Writing To NVRAM reg: 0x%x\n", data->thereg);
+    PrintDebug("nvram: Writing To NVRAM reg: 0x%x (NMI_disable=%d)\n", data->thereg,reg>>7);
 
     return 1;
 }