From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gleb Natapov <gleb@redhat.com>
Subject: [PATCH kvm-unit-test] get memory size from fwcfg
Date: Mon, 11 Feb 2013 15:10:32 +0200
Message-ID: <20130211131032.GA7837@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: mtosatti@redhat.com, lmr@redhat.com
To: kvm@vger.kernel.org
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:41823 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757146Ab3BKNKe (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 11 Feb 2013 08:10:34 -0500
Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25])
	by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1BDAX8L030557
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <kvm@vger.kernel.org>; Mon, 11 Feb 2013 08:10:34 -0500
Content-Disposition: inline
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Upstream test device does not implement port 0xd1.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/lib/x86/vm.c b/lib/x86/vm.c
index 71b70fd..2852c6c 100644
--- a/lib/x86/vm.c
+++ b/lib/x86/vm.c
@@ -1,3 +1,4 @@
+#include "fwcfg.h"
 #include "vm.h"
 #include "libcflat.h"
 
@@ -185,16 +186,9 @@ static void setup_mmu(unsigned long len)
     printf("cr4 = %x\n", read_cr4());
 }
 
-static unsigned int inl(unsigned short port)
-{
-    unsigned int val;
-    asm volatile("inl %w1, %0" : "=a"(val) : "Nd"(port));
-    return val;
-}
-
 void setup_vm()
 {
-    end_of_memory = inl(0xd1);
+    end_of_memory = fwcfg_get_u64(FW_CFG_RAM_SIZE);
     free_memory(&edata, end_of_memory - (unsigned long)&edata);
     setup_mmu(end_of_memory);
 }
diff --git a/x86/rmap_chain.c b/x86/rmap_chain.c
index 9add9b8..0df1bcb 100644
--- a/x86/rmap_chain.c
+++ b/x86/rmap_chain.c
@@ -1,6 +1,7 @@
 /* test long rmap chains */
 
 #include "libcflat.h"
+#include "fwcfg.h"
 #include "vm.h"
 #include "smp.h"
 
@@ -21,7 +22,7 @@ int main (void)
 
     setup_vm();
 
-    nr_pages = inl(0xd1) / PAGE_SIZE;
+    nr_pages = fwcfg_get_u64(FW_CFG_RAM_SIZE) / PAGE_SIZE;
     nr_pages -= 1000;
     target_page = alloc_page();
 
--
			Gleb.