include: Move RAMList to ramlist.h

Moves the struct back into qemu's headers
This commit is contained in:
Lioncash 2018-02-20 08:41:52 -05:00
parent cdd4003ce9
commit c658126845
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
5 changed files with 21 additions and 12 deletions

View file

@ -17,7 +17,7 @@ struct uc_struct;
#include "vl.h"
// These two structs are originally from qemu/include/exec/cpu-all.h
// This struct was originally from qemu/include/exec/cpu-all.h
// Temporarily moved here since there is circular inclusion.
typedef struct {
@ -28,12 +28,4 @@ typedef struct {
bool in_use;
} BounceBuffer;
typedef struct RAMList {
/* Protected by the iothread lock. */
unsigned long *dirty_memory[DIRTY_MEMORY_NUM];
RAMBlock *mru_block;
QLIST_HEAD(, RAMBlock) blocks;
uint32_t version;
} RAMList;
#endif

View file

@ -8,6 +8,7 @@
#include <stdio.h>
#include "qemu.h"
#include "exec/ramlist.h"
#include "unicorn/unicorn.h"
#include "list.h"

View file

@ -16,9 +16,6 @@
#ifndef CONFIG_USER_ONLY
#define DIRTY_MEMORY_CODE 0
#define DIRTY_MEMORY_NUM 1 /* num of dirty bits */
#include "unicorn/platform.h"
#include "exec/cpu-common.h"
#include "exec/hwaddr.h"

View file

@ -23,6 +23,7 @@
#ifndef CONFIG_USER_ONLY
#include "hw/xen/xen.h"
#include "exec/ramlist.h"
struct RAMBlock {
struct MemoryRegion *mr;

View file

@ -0,0 +1,18 @@
#ifndef RAMLIST_H
#define RAMLIST_H
#include "qemu/queue.h"
#include "qemu/thread.h"
#define DIRTY_MEMORY_CODE 0
#define DIRTY_MEMORY_NUM 1 /* num of dirty bits */
typedef struct RAMList {
/* Protected by the iothread lock. */
unsigned long *dirty_memory[DIRTY_MEMORY_NUM];
RAMBlock *mru_block;
QLIST_HEAD(, RAMBlock) blocks;
uint32_t version;
} RAMList;
#endif