These changes are the raw update to qemu-2.6.

Collission happened in the following patches:

migration: do cleanup operation after completion(738df5b9)
Bug fix.(1750c932f86)
kvmclock: add a new function to update env->tsc.(b52baab2)

The code provided by the patches was already in the upstreamed
version.

Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>

1 files changed, 14 insertions, 0 deletions

diff --git a/qemu/roms/SLOF/slof/helpers.c b/qemu/roms/SLOF/slof/helpers.c
index d7c1888b4..48c34a65c 100644
--- a/qemu/roms/SLOF/slof/helpers.c
+++ b/qemu/roms/SLOF/slof/helpers.c
@@ -114,6 +114,13 @@ long SLOF_pci_config_read16(long offset)
 	return forth_pop();
 }
 
+long SLOF_pci_config_read8(long offset)
+{
+	forth_push(offset);
+	forth_eval("config-b@");
+	return forth_pop();
+}
+
 void SLOF_pci_config_write32(long offset, long value)
 {
 	forth_push(value);
@@ -128,6 +135,13 @@ void SLOF_pci_config_write16(long offset, long value)
 	forth_eval("config-w!");
 }
 
+void SLOF_pci_config_write8(long offset, long value)
+{
+	forth_push(value);
+	forth_push(offset);
+	forth_eval("config-b!");
+}
+
 void *SLOF_translate_my_address(void *addr)
 {
 	forth_push((long)addr);