From patchwork Mon Apr 15 13:19:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 236615 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 AD3FA2C00DC for ; Tue, 16 Apr 2013 00:05:18 +1000 (EST) Received: from localhost ([::1]:36936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjVz-0006GS-CN for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 09:32:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjU1-00040w-Td for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:30:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URjTv-0006Dc-A1 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:30:09 -0400 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]:40528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URjKE-0001lb-Ia for qemu-devel@nongnu.org; Mon, 15 Apr 2013 09:20:02 -0400 Received: by mail-bk0-f46.google.com with SMTP id je9so2390069bkc.19 for ; Mon, 15 Apr 2013 06:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=Bcg7HAZrgO5i/jewJ1QLDK3uz3A+srwA7GMM6HofmzI=; b=QpJOTPWsFKvZCBY8Yql0L+NyfyRYD7OvVt9US/ts3O+4PSiq3Rmfy3C5k/jfi+32kn e9UmNh3W5QXeyJV0ZSO8dkefLXIV3VaN7zjzlnZkvhOlWuno0kzQR7Y3YWFJ6lOcOnqt XGAcrWKLfVPUASw48b8Iv8v9B4wku7O3KI7pgAacjTuP8/h2TBsywPmiojC07tFOafK2 /cjvelw4gockYXUF2Wdgt2uo9S50qcWCM/I1AqP9n+q5ei6QfMImjowihBG5Xuzoh3UI 3D8K4EEVEa8aZ0dM505xywo45fHdBSC/H6mcr/BGXCnXXYcW9JLNYi+5PCy/FF8XBOwR Ojzw== X-Received: by 10.204.163.135 with SMTP id a7mr5102413bky.62.1366032001738; Mon, 15 Apr 2013 06:20:01 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id js7sm8527139bkb.9.2013.04.15.06.20.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 06:20:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 15 Apr 2013 15:19:32 +0200 Message-Id: <1366031973-7718-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1366031973-7718-1-git-send-email-pbonzini@redhat.com> References: <1366031973-7718-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:4008:c01::22e Subject: [Qemu-devel] [PATCH 11/12] memory: move core typedefs to qemu/typedefs.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 Signed-off-by: Paolo Bonzini --- include/exec/memory.h | 5 ----- include/qemu/typedefs.h | 4 ++++ target-ppc/kvm_ppc.h | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 2322732..9e88320 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -27,7 +27,6 @@ #include "qemu/int128.h" typedef struct MemoryRegionOps MemoryRegionOps; -typedef struct MemoryRegion MemoryRegion; typedef struct MemoryRegionPortio MemoryRegionPortio; typedef struct MemoryRegionMmio MemoryRegionMmio; @@ -157,8 +156,6 @@ struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } -typedef struct AddressSpace AddressSpace; - /** * AddressSpace: describes a mapping of addresses to #MemoryRegion objects */ @@ -173,8 +170,6 @@ struct AddressSpace { QTAILQ_ENTRY(AddressSpace) address_spaces_link; }; -typedef struct MemoryRegionSection MemoryRegionSection; - /** * MemoryRegionSection: describes a fragment of a #MemoryRegion * diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index fd532a2..93aae81 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -18,6 +18,10 @@ typedef struct DeviceState DeviceState; typedef struct BusState BusState; typedef struct BusClass BusClass; +typedef struct AddressSpace AddressSpace; +typedef struct MemoryRegion MemoryRegion; +typedef struct MemoryRegionSection MemoryRegionSection; + typedef struct NICInfo NICInfo; typedef struct HCIInfo HCIInfo; typedef struct AudioState AudioState; diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h index c30b006..6bcc5cc 100644 --- a/target-ppc/kvm_ppc.h +++ b/target-ppc/kvm_ppc.h @@ -9,8 +9,6 @@ #ifndef __KVM_PPC_H__ #define __KVM_PPC_H__ -#include "exec/memory.h" - #define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU void kvmppc_init(void);