From patchwork Tue Nov 30 21:03:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cam Macdonell X-Patchwork-Id: 73762 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D6CCB70AA for ; Wed, 1 Dec 2010 19:43:53 +1100 (EST) Received: from localhost ([127.0.0.1]:47354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNiI2-0002Oc-Pc for incoming@patchwork.ozlabs.org; Wed, 01 Dec 2010 03:43:50 -0500 Received: from [140.186.70.92] (port=35913 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PNddF-0002LC-Vq for qemu-devel@nongnu.org; Tue, 30 Nov 2010 22:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PNXNE-00045F-Qc for qemu-devel@nongnu.org; Tue, 30 Nov 2010 16:04:30 -0500 Received: from smtp.srv.ualberta.ca ([129.128.5.19]:59003 helo=mail10.srv.ualberta.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PNXNE-0003DZ-Jw for qemu-devel@nongnu.org; Tue, 30 Nov 2010 16:04:28 -0500 Received: from localhost.localdomain (st-brides.cs.ualberta.ca [129.128.23.21]) (authenticated bits=0) by mail10.srv.ualberta.ca (8.14.3/8.13.8) with ESMTP id oAUL41tF025644 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 30 Nov 2010 14:04:14 -0700 (MST) From: Cam Macdonell To: qemu-devel@nongnu.org Date: Tue, 30 Nov 2010 14:03:58 -0700 Message-Id: <1291151039-10966-2-git-send-email-cam@cs.ualberta.ca> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1291151039-10966-1-git-send-email-cam@cs.ualberta.ca> References: <1291151039-10966-1-git-send-email-cam@cs.ualberta.ca> X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.0-3.9 Cc: Cam Macdonell , kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 1/2] add qemu_ram_free_from_ptr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org add function to free memory from Qemu that was added via qemu_ram_alloc_from_ptr. Name is a little weird. This is copied from qemu_ram_unmap from qemu-kvm. Signed-off-by: Cam Macdonell --- cpu-common.h | 1 + exec.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cpu-common.h b/cpu-common.h index a543b5d..3f802e1 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -44,6 +44,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, ram_addr_t size, void *host); ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size); void qemu_ram_free(ram_addr_t addr); +void qemu_ram_free_from_ptr(ram_addr_t addr); /* This should only be used for ram local to a device. */ void *qemu_get_ram_ptr(ram_addr_t addr); /* This should not be used by devices. */ diff --git a/exec.c b/exec.c index db9ff55..1f5c8f8 100644 --- a/exec.c +++ b/exec.c @@ -2875,6 +2875,19 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size) return qemu_ram_alloc_from_ptr(dev, name, size, NULL); } +void qemu_ram_free_from_ptr(ram_addr_t addr) +{ + RAMBlock *block; + + QLIST_FOREACH(block, &ram_list.blocks, next) { + if (addr == block->offset) { + QLIST_REMOVE(block, next); + qemu_free(block); + return; + } + } +} + void qemu_ram_free(ram_addr_t addr) { RAMBlock *block;