From patchwork Tue May 21 10:57:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 245264 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0DDBC2C00BE for ; Tue, 21 May 2013 20:58:18 +1000 (EST) Received: from localhost ([::1]:34901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekGl-0003Yi-Ps for incoming@patchwork.ozlabs.org; Tue, 21 May 2013 06:58:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44702) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekGG-0003TV-Mv for qemu-devel@nongnu.org; Tue, 21 May 2013 06:57:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UekGE-0004xQ-AV for qemu-devel@nongnu.org; Tue, 21 May 2013 06:57:44 -0400 Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]:45723) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UekGE-0004x8-4V for qemu-devel@nongnu.org; Tue, 21 May 2013 06:57:42 -0400 Received: by mail-ea0-f170.google.com with SMTP id f15so295392eak.15 for ; Tue, 21 May 2013 03:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=6uPQOn3qvpA8jOEefqpKIVmaDm8I2zzmGdNsw0r6UaQ=; b=i4/4L0JtBBRWRDJXlIrCnCqQzHeSeaMPYdSGilEl1ahGbNKLaBfRfcLyAsy1MwjEu9 AevzcbhLQDNmWNryZv0tYnNHQsd6K3GPEy18hwiTu9bzwGvmWkWunBTLAHm7s7oxaVDO VINWCQHnwHzQzYqJpv2K6a1/B15NGn0WqX/n4gpRIJ7DA+7rXIV/gnaMCn1FimRc0UwR lGUXDnh5Q/XQ30VHwvLQ5BpiacTQSD+TKNMzXHB83fV74IUZqDwjmI35GCC6d1e5niZS JG0dbeUlKdi3zPX5AlBOPywNSYdgpJ2ddpj3aOtiNJuywwjeHNA80yMAsojjxl45myqT RkTQ== X-Received: by 10.14.1.7 with SMTP id 7mr5150019eec.41.1369133861205; Tue, 21 May 2013 03:57:41 -0700 (PDT) Received: from playground.lan (net-37-116-223-193.cust.dsl.vodafone.it. [37.116.223.193]) by mx.google.com with ESMTPSA id a5sm2754398ees.6.2013.05.21.03.57.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 21 May 2013 03:57:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 May 2013 12:57:03 +0200 Message-Id: <1369133851-1894-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1369133851-1894-1-git-send-email-pbonzini@redhat.com> References: <1369133851-1894-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22a Cc: peter.maydell@linaro.org, jan.kiszka@gmail.com, David Gibson Subject: [Qemu-devel] [PATCH 02/30] exec: eliminate qemu_put_ram_ptr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell --- exec.c | 8 -------- hw/pci/pci.c | 2 -- hw/scsi/megasas.c | 1 - include/exec/cpu-common.h | 1 - trace-events | 3 --- 5 files changed, 15 deletions(-) diff --git a/exec.c b/exec.c index 197625c..fa5f9c3 100644 --- a/exec.c +++ b/exec.c @@ -1334,11 +1334,6 @@ static void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size) } } -void qemu_put_ram_ptr(void *addr) -{ - trace_qemu_put_ram_ptr(addr); -} - int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr) { RAMBlock *block; @@ -1928,7 +1923,6 @@ void address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf, ptr = qemu_get_ram_ptr(addr1); memcpy(ptr, buf, l); invalidate_and_set_dirty(addr1, l); - qemu_put_ram_ptr(ptr); } } else { if (!(memory_region_is_ram(section->mr) || @@ -1958,7 +1952,6 @@ void address_space_rw(AddressSpace *as, hwaddr addr, uint8_t *buf, + memory_region_section_addr(section, addr)); memcpy(buf, ptr, l); - qemu_put_ram_ptr(ptr); } } len -= l; @@ -2020,7 +2013,6 @@ void cpu_physical_memory_write_rom(hwaddr addr, ptr = qemu_get_ram_ptr(addr1); memcpy(ptr, buf, l); invalidate_and_set_dirty(addr1, l); - qemu_put_ram_ptr(ptr); } len -= l; buf += l; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index d5257ed..bb3879b 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1959,8 +1959,6 @@ static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) pci_patch_ids(pdev, ptr, size); } - qemu_put_ram_ptr(ptr); - pci_register_bar(pdev, PCI_ROM_SLOT, 0, &pdev->rom); return 0; diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 4934a81..fe6550c 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -711,7 +711,6 @@ static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd) ptr = memory_region_get_ram_ptr(&s->dev.rom); memcpy(biosver, ptr + 0x41, 31); - qemu_put_ram_ptr(ptr); memcpy(info.image_component[1].name, "BIOS", 4); memcpy(info.image_component[1].version, biosver, strlen((const char *)biosver)); diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h index 2e5f11f..cafc3c2 100644 --- a/include/exec/cpu-common.h +++ b/include/exec/cpu-common.h @@ -51,7 +51,6 @@ typedef uint32_t CPUReadMemoryFunc(void *opaque, hwaddr addr); void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); /* This should only be used for ram local to a device. */ void *qemu_get_ram_ptr(ram_addr_t addr); -void qemu_put_ram_ptr(void *addr); /* This should not be used by devices. */ int qemu_ram_addr_from_host(void *ptr, ram_addr_t *ram_addr); ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr); diff --git a/trace-events b/trace-events index 9c73931..b123b0f 100644 --- a/trace-events +++ b/trace-events @@ -813,9 +813,6 @@ xen_map_cache_return(void* ptr) "%p" xen_map_block(uint64_t phys_addr, uint64_t size) "%#"PRIx64", size %#"PRIx64 xen_unmap_block(void* addr, unsigned long size) "%p, size %#lx" -# exec.c -qemu_put_ram_ptr(void* addr) "%p" - # hw/xen_platform.c xen_platform_log(char *s) "xen platform: %s"