From patchwork Mon May 3 22:48:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 96584 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 o43Mv4ls031859 for ; Mon, 3 May 2010 22:57:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759546Ab0ECW5A (ORCPT ); Mon, 3 May 2010 18:57:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51142 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759550Ab0ECW46 (ORCPT ); Mon, 3 May 2010 18:56:58 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o43Muw55015482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 3 May 2010 18:56:58 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o43MuvJC032128; Mon, 3 May 2010 18:56:58 -0400 Received: from amt.cnet (vpn-8-8.rdu.redhat.com [10.11.8.8]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o43MuuHY006975; Mon, 3 May 2010 18:56:57 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id DC87C65607B; Mon, 3 May 2010 19:56:22 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.3/8.14.3/Submit) id o43MuBL0026918; Mon, 3 May 2010 19:56:11 -0300 Message-Id: <20100503224905.894980453@amt.cnet> User-Agent: quilt/0.47-1 Date: Mon, 03 May 2010 19:48:24 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org Cc: avi@redhat.com, jan.kiszka@web.de, Marcelo Tosatti Subject: [patch 5/6] introduce qemu_ram_map References: <20100503224819.773169076@amt.cnet> Content-Disposition: inline; filename=qemu-ram-mmap X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 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]); Mon, 03 May 2010 22:57:04 +0000 (UTC) Index: qemu-kvm/cpu-common.h =================================================================== --- qemu-kvm.orig/cpu-common.h +++ qemu-kvm/cpu-common.h @@ -40,6 +40,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 @@ -2805,6 +2805,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;