From patchwork Thu Jun 13 12:59:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 251068 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0F8672C007A for ; Thu, 13 Jun 2013 22:58:51 +1000 (EST) Received: from localhost ([::1]:35706 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un772-00020t-Mm for incoming@patchwork.ozlabs.org; Thu, 13 Jun 2013 08:58:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un76j-00020k-9x for qemu-devel@nongnu.org; Thu, 13 Jun 2013 08:58:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Un76g-000887-T6 for qemu-devel@nongnu.org; Thu, 13 Jun 2013 08:58:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7414) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Un76g-00087v-LK for qemu-devel@nongnu.org; Thu, 13 Jun 2013 08:58:26 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5DCwPGb022707 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 13 Jun 2013 08:58:25 -0400 Received: from redhat.com (vpn-203-103.tlv.redhat.com [10.35.203.103]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id r5DCwMn9028808; Thu, 13 Jun 2013 08:58:23 -0400 Date: Thu, 13 Jun 2013 15:59:06 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20130613125906.GA32223@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Anthony Liguori Subject: [Qemu-devel] [PATCH] exec: move io_mem_read/write to memory.h 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 implementation is in memory.c, move function to match. This allows use from places that don't pull in exec-all.h Signed-off-by: Michael S. Tsirkin --- include/exec/exec-all.h | 5 ----- include/exec/memory.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 6362074..28cb37d 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -367,11 +367,6 @@ bool is_tcg_gen_code(uintptr_t pc_ptr); #if !defined(CONFIG_USER_ONLY) struct MemoryRegion *iotlb_to_region(hwaddr index); -uint64_t io_mem_read(struct MemoryRegion *mr, hwaddr addr, - unsigned size); -void io_mem_write(struct MemoryRegion *mr, hwaddr addr, - uint64_t value, unsigned size); - void tlb_fill(CPUArchState *env1, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr); diff --git a/include/exec/memory.h b/include/exec/memory.h index 9e88320..edeb1f2 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -888,6 +888,11 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, int is_write, hwaddr access_len); +uint64_t io_mem_read(struct MemoryRegion *mr, hwaddr addr, + unsigned size); +void io_mem_write(struct MemoryRegion *mr, hwaddr addr, + uint64_t value, unsigned size); + #endif #endif