From patchwork Fri Apr 23 17:04:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 94719 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 o3NH8okI014082 for ; Fri, 23 Apr 2010 17:09:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758402Ab0DWRIx (ORCPT ); Fri, 23 Apr 2010 13:08:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19132 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758355Ab0DWRIq (ORCPT ); Fri, 23 Apr 2010 13:08:46 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3NH8i9J003768 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 23 Apr 2010 13:08:44 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3NH8h8n009505; Fri, 23 Apr 2010 13:08:44 -0400 Received: from amt.cnet (vpn-11-16.rdu.redhat.com [10.11.11.16]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o3NH8gLj010351; Fri, 23 Apr 2010 13:08:43 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 6513268A9C5; Fri, 23 Apr 2010 14:07:56 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o3NH7tTw000872; Fri, 23 Apr 2010 14:07:55 -0300 Message-Id: <20100423170646.344848232@amt.cnet> User-Agent: quilt/0.47-1 Date: Fri, 23 Apr 2010 14:04:15 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org Cc: qemu-devel@nongnu.org, Cam Macdonell , Marcelo Tosatti Subject: [uq/master patch 5/5] introduce qemu_ram_map References: <20100423170410.914857113@amt.cnet> Content-Disposition: inline; filename=qemu-ram-mmap X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 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]); Fri, 23 Apr 2010 17:09:17 +0000 (UTC) Index: qemu-kvm/cpu-common.h =================================================================== --- qemu-kvm.orig/cpu-common.h +++ qemu-kvm/cpu-common.h @@ -32,6 +32,7 @@ static inline void cpu_register_physical } ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr); +ram_addr_t qemu_ram_map(ram_addr_t size, void *host); ram_addr_t qemu_ram_alloc(ram_addr_t); void qemu_ram_free(ram_addr_t addr); /* This should only be used for ram local to a device. */ Index: qemu-kvm/exec.c =================================================================== --- qemu-kvm.orig/exec.c +++ qemu-kvm/exec.c @@ -2710,6 +2710,34 @@ static void *file_ram_alloc(ram_addr_t m } #endif +ram_addr_t qemu_ram_map(ram_addr_t size, void *host) +{ + RAMBlock *new_block; + + size = TARGET_PAGE_ALIGN(size); + new_block = qemu_malloc(sizeof(*new_block)); + + new_block->host = host; + + new_block->offset = last_ram_offset; + new_block->length = size; + + new_block->next = ram_blocks; + ram_blocks = new_block; + + phys_ram_dirty = qemu_realloc(phys_ram_dirty, + (last_ram_offset + size) >> TARGET_PAGE_BITS); + memset(phys_ram_dirty + (last_ram_offset >> TARGET_PAGE_BITS), + 0xff, size >> TARGET_PAGE_BITS); + + last_ram_offset += size; + + if (kvm_enabled()) + kvm_setup_guest_memory(new_block->host, size); + + return new_block->offset; +} + ram_addr_t qemu_ram_alloc(ram_addr_t size) { RAMBlock *new_block;