From patchwork Fri Oct 14 12:40:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 9376673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9628860779 for ; Fri, 14 Oct 2016 12:41:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88A5028423 for ; Fri, 14 Oct 2016 12:41:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CBAC2A603; Fri, 14 Oct 2016 12:41:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3707128423 for ; Fri, 14 Oct 2016 12:41:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753123AbcJNMlE (ORCPT ); Fri, 14 Oct 2016 08:41:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60146 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752013AbcJNMlD (ORCPT ); Fri, 14 Oct 2016 08:41:03 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC0D815567; Fri, 14 Oct 2016 12:41:02 +0000 (UTC) Received: from pxdev.xzpeter.org.com (dhcp-15-192.nay.redhat.com [10.66.15.192]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9ECevGo012346; Fri, 14 Oct 2016 08:41:00 -0400 From: Peter Xu To: kvm@vger.kernel.org Cc: jan.kiszka@web.de, agordeev@redhat.com, drjones@redhat.com, rkrcmar@redhat.com, pbonzini@redhat.com, peterx@redhat.com Subject: [kvm-unit-tests PATCH 01/14] x86: vm: allow multiple init for vm setup Date: Fri, 14 Oct 2016 20:40:39 +0800 Message-Id: <1476448852-30062-2-git-send-email-peterx@redhat.com> In-Reply-To: <1476448852-30062-1-git-send-email-peterx@redhat.com> References: <1476448852-30062-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 14 Oct 2016 12:41:02 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Xu --- lib/x86/vm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/x86/vm.c b/lib/x86/vm.c index 906fbf2..9771bd7 100644 --- a/lib/x86/vm.c +++ b/lib/x86/vm.c @@ -151,9 +151,16 @@ static void setup_mmu(unsigned long len) void setup_vm() { + static bool vm_inited = false; + + if (vm_inited) { + return; + } + end_of_memory = fwcfg_get_u64(FW_CFG_RAM_SIZE); free_memory(&edata, end_of_memory - (unsigned long)&edata); setup_mmu(end_of_memory); + vm_inited = true; } void *vmalloc(unsigned long size)