Move hostarch update code from build-vm-kvm to build-vm

The code is not kvm specific...

build-vm

@@ -594,6 +594,30 @@ vm_setup() {
     fi
 }
 
+vm_update_hostarch() {
+    local kernel="$vm_kernel"
+    local hostarchfile
+    local newhostarch
+    if test -z "$VM_KERNEL" -a -e "$BUILD_ROOT/.build.kernel.$VM_TYPE" ; then
+	kernel="$BUILD_ROOT/.build.kernel.$VM_TYPE"
+	hostarchfile="$BUILD_ROOT/.build.hostarch.$VM_TYPE"
+    fi
+    if test -n "$hostarchfile" -a -e "$hostarchfile"; then
+	newhostarch=`cat "$hostarchfile"`
+    elif test -n "$kernel" -a -e "$kernel" ; then
+	case `objdump -f "$kernel" | sed -ne 's/.*file format //p'` in
+	    elf64-powerpcle) newhostarch=ppc64le ;;
+	    elf64-powerpc) newhostarch=ppc64 ;;
+	esac
+    fi
+    if test -n "$newhostarch" -a "$newhostarch" != "$BUILD_HOST_ARCH" ; then
+	echo "setting hostarch to $newhostarch"
+	BUILD_HOST_ARCH="$newhostarch"
+	# update BUILD_INITVM_ARCH
+	build_host_arch
+    fi
+}
+
 #
 # prepare for vm startup
 #
@@ -639,6 +663,11 @@ vm_first_stage() {
     # do vm specific fixups
     vm_fixup
 
+    # update the hostarch
+    if test -n "$VM_IMAGE" ; then
+	vm_update_hostarch
+    fi
+
     # the watchdog needs a log file
     test -n "$LOGFILE" || VM_WATCHDOG=
     # put our config into .build/build.data

build-vm-kvm

@@ -203,17 +203,6 @@ vm_fixup_kvm() {
 	    qemu_rootdev=/dev/disk/by-id/virtio-0
 	    VM_SWAPDEV=/dev/disk/by-id/virtio-1
 	fi
-	if test -e "$BUILD_ROOT/.build.hostarch.$VM_TYPE" ; then
-	    BUILD_HOST_ARCH=`cat "$BUILD_ROOT/.build.hostarch.$VM_TYPE"`
-	else
-	    # do autodetection for ppc/ppc64le switching, legacy
-	    case `objdump -f "$BUILD_ROOT/.build.kernel.$VM_TYPE" | sed -ne 's/.*file format //p'` in
-		elf64-powerpcle) BUILD_HOST_ARCH=ppc64le ;;
-		elf64-powerpc)   BUILD_HOST_ARCH=ppc64 ;;
-	    esac
-	fi
-        # set BUILD_INITVM_ARCH
-        build_host_arch
     fi
 }