|
 |
218e99 |
From 7c11083dcfe6e621276d306d18ef09b789ecb119 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Date: Mon, 12 Aug 2013 15:59:33 +0200
|
|
|
218e99 |
Subject: memory_mapping: Move MemoryMappingList typedef to qemu/typedefs.h
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
Message-id: <1376323180-12863-4-git-send-email-lersek@redhat.com>
|
|
|
218e99 |
Patchwork-id: 53162
|
|
|
218e99 |
O-Subject: [RHEL-7 qemu-kvm PATCH 03/10] memory_mapping: Move MemoryMappingList typedef to qemu/typedefs.h
|
|
|
218e99 |
Bugzilla: 981582
|
|
|
218e99 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Radim Krcmar <rkrcmar@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Andreas Färber <afaerber@suse.de>
|
|
|
218e99 |
|
|
|
218e99 |
This will avoid issues with hwaddr and ram_addr_t when including
|
|
|
218e99 |
sysemu/memory_mapping.h for CONFIG_USER_ONLY, e.g., from qom/cpu.h.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
218e99 |
(cherry picked from commit 6d4d3ae77dbb756d454c2deb2ef844b0cc7bde7b)
|
|
|
218e99 |
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
|
|
|
218e99 |
index 93aae81..1218a61 100644
|
|
|
218e99 |
--- a/include/qemu/typedefs.h
|
|
|
218e99 |
+++ b/include/qemu/typedefs.h
|
|
|
218e99 |
@@ -22,6 +22,8 @@ typedef struct AddressSpace AddressSpace;
|
|
|
218e99 |
typedef struct MemoryRegion MemoryRegion;
|
|
|
218e99 |
typedef struct MemoryRegionSection MemoryRegionSection;
|
|
|
218e99 |
|
|
|
218e99 |
+typedef struct MemoryMappingList MemoryMappingList;
|
|
|
218e99 |
+
|
|
|
218e99 |
typedef struct NICInfo NICInfo;
|
|
|
218e99 |
typedef struct HCIInfo HCIInfo;
|
|
|
218e99 |
typedef struct AudioState AudioState;
|
|
|
218e99 |
diff --git a/include/sysemu/memory_mapping.h b/include/sysemu/memory_mapping.h
|
|
|
218e99 |
index 6f01524..1f71c32 100644
|
|
|
218e99 |
--- a/include/sysemu/memory_mapping.h
|
|
|
218e99 |
+++ b/include/sysemu/memory_mapping.h
|
|
|
218e99 |
@@ -15,6 +15,7 @@
|
|
|
218e99 |
#define MEMORY_MAPPING_H
|
|
|
218e99 |
|
|
|
218e99 |
#include "qemu/queue.h"
|
|
|
218e99 |
+#include "qemu/typedefs.h"
|
|
|
218e99 |
|
|
|
218e99 |
/* The physical and virtual address in the memory mapping are contiguous. */
|
|
|
218e99 |
typedef struct MemoryMapping {
|
|
|
218e99 |
@@ -24,11 +25,11 @@ typedef struct MemoryMapping {
|
|
|
218e99 |
QTAILQ_ENTRY(MemoryMapping) next;
|
|
|
218e99 |
} MemoryMapping;
|
|
|
218e99 |
|
|
|
218e99 |
-typedef struct MemoryMappingList {
|
|
|
218e99 |
+struct MemoryMappingList {
|
|
|
218e99 |
unsigned int num;
|
|
|
218e99 |
MemoryMapping *last_mapping;
|
|
|
218e99 |
QTAILQ_HEAD(, MemoryMapping) head;
|
|
|
218e99 |
-} MemoryMappingList;
|
|
|
218e99 |
+};
|
|
|
218e99 |
|
|
|
218e99 |
int cpu_get_memory_mapping(MemoryMappingList *list, CPUArchState *env);
|
|
|
218e99 |
|