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, 39 insertions, 0 deletions

diff --git a/qemu/roms/SLOF/board-qemu/slof/archsupport.fs b/qemu/roms/SLOF/board-qemu/slof/archsupport.fs
new file mode 100644
index 000000000..a8ace3cc5
--- /dev/null
+++ b/qemu/roms/SLOF/board-qemu/slof/archsupport.fs
@@ -0,0 +1,39 @@
+\ *****************************************************************************
+\ * Copyright (c) 2011 IBM Corporation
+\ * All rights reserved.
+\ * This program and the accompanying materials
+\ * are made available under the terms of the BSD License
+\ * which accompanies this distribution, and is available at
+\ * http://www.opensource.org/licenses/bsd-license.php
+\ *
+\ * Contributors:
+\ *     IBM Corporation - initial implementation
+\ ****************************************************************************/
+
+\ 2 MiB FDT buffer size is enough to accommodate 255 CPU cores
+\ and 16 TiB of maxmem specification.
+200000 CONSTANT cas-buffer-size
+: ibm,client-architecture-support         ( vec -- err? )
+    \ Store require parameters in nvram
+    \ to come back to right boot device
+    \ Allocate memory for H_CALL
+    cas-buffer-size alloc-mem             ( vec memaddr )
+    dup 0= IF ." out of memory during ibm,client-architecture-support" cr THEN
+    swap over cas-buffer-size             ( memaddr vec memaddr size )
+    \ make h_call to hypervisor
+    hv-cas 0= IF                          ( memaddr )
+	dup l@ 1 >= IF                    \ Version number >= 1
+	    \ Make required changes
+	    " /" find-node set-node
+	    dup 4 + fdt-init
+	    fdt-check-header
+	    fdt-struct fdt-fix-cas-node
+	    fdt-fix-cas-success NOT
+	ELSE
+	    FALSE
+	THEN
+    ELSE
+	TRUE
+    THEN
+    >r cas-buffer-size free-mem r>
+;