From patchwork Tue Mar 9 01:53:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 84205 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o291wPFC005064 for ; Tue, 9 Mar 2010 01:58:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756541Ab0CIB6X (ORCPT ); Mon, 8 Mar 2010 20:58:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34685 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756514Ab0CIB6U (ORCPT ); Mon, 8 Mar 2010 20:58:20 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o291wJVO010784 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 8 Mar 2010 20:58:19 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o291wJ6D016709; Mon, 8 Mar 2010 20:58:19 -0500 Received: from amt.cnet (vpn-10-246.rdu.redhat.com [10.11.10.246]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o291wHUR007791; Mon, 8 Mar 2010 20:58:18 -0500 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 2DD0D68A7D7; Mon, 8 Mar 2010 22:57:18 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o291vHKx025668; Mon, 8 Mar 2010 22:57:17 -0300 Message-Id: <20100309015644.272624611@redhat.com> User-Agent: quilt/0.47-1 Date: Mon, 08 Mar 2010 22:53:46 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: Marcelo Tosatti Subject: [patch 3/3] kvm: allow qemu to set EPT identity mapping address References: <20100309015343.901738854@redhat.com> Content-Disposition: inline; filename=identity-map X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 09 Mar 2010 01:58:25 +0000 (UTC) Index: qemu-kvm/target-i386/kvm.c =================================================================== --- qemu-kvm.orig/target-i386/kvm.c +++ qemu-kvm/target-i386/kvm.c @@ -341,6 +341,24 @@ static int kvm_has_msr_star(CPUState *en return 0; } +static int kvm_init_identity_map_page(KVMState *s) +{ +#ifdef KVM_CAP_SET_IDENTITY_MAP_ADDR + int ret; + uint64_t addr = 0xfffbc000; + + if (!kvm_check_extension(s, KVM_CAP_SET_IDENTITY_MAP_ADDR)) + return 0; + + ret = kvm_vm_ioctl(s, KVM_SET_IDENTITY_MAP_ADDR, &addr); + if (ret < 0) { + fprintf(stderr, "kvm_set_identity_map_addr: %s\n", strerror(ret)); + return ret; + } +#endif + return 0; +} + int kvm_arch_init(KVMState *s, int smp_cpus) { int ret; @@ -368,7 +386,11 @@ int kvm_arch_init(KVMState *s, int smp_c perror("e820_add_entry() table is full"); exit(1); } - return kvm_vm_ioctl(s, KVM_SET_TSS_ADDR, 0xfffbd000); + ret = kvm_vm_ioctl(s, KVM_SET_TSS_ADDR, 0xfffbd000); + if (ret < 0) + return ret; + + return kvm_init_identity_map_page(s); } static void set_v8086_seg(struct kvm_segment *lhs, const SegmentCache *rhs)