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

diff --git a/qemu/roms/SLOF/slof/fs/archsupport.fs b/qemu/roms/SLOF/slof/fs/archsupport.fs
deleted file mode 100644
index cc4668769..000000000
--- a/qemu/roms/SLOF/slof/fs/archsupport.fs
+++ /dev/null
@@ -1,38 +0,0 @@
-\ *****************************************************************************
-\ * 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
-\ ****************************************************************************/
-
-\ Qemu supports max 256cpus, 32K will be able to accomodate the fdt changes if
-\ needed.
-8000 VALUE size
-: ibm,client-architecture-support         ( vec -- err? )
-    \ Store require parameters in nvram
-    \ to come back to right boot device
-    \ Allocate memory for H_CALL
-    size alloc-mem                        ( vec memaddr )
-    swap over 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 size free-mem r>
-;