Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
f76d27b6
Q
qemu
项目概览
openeuler
/
qemu
通知
10
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f76d27b6
编写于
12月 19, 2011
作者:
A
Anthony Liguori
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'qemu-kvm/memory/exec-obsolete' into staging
上级
4a1cc680
67d95c15
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
74 addition
and
42 deletion
+74
-42
cpu-common.h
cpu-common.h
+0
-39
exec-obsolete.h
exec-obsolete.h
+68
-0
exec.c
exec.c
+3
-0
hw/etraxfs_eth.c
hw/etraxfs_eth.c
+0
-3
memory.c
memory.c
+3
-0
未找到文件。
cpu-common.h
浏览文件 @
f76d27b6
...
...
@@ -38,37 +38,7 @@ typedef unsigned long ram_addr_t;
typedef
void
CPUWriteMemoryFunc
(
void
*
opaque
,
target_phys_addr_t
addr
,
uint32_t
value
);
typedef
uint32_t
CPUReadMemoryFunc
(
void
*
opaque
,
target_phys_addr_t
addr
);
void
cpu_register_physical_memory_log
(
target_phys_addr_t
start_addr
,
ram_addr_t
size
,
ram_addr_t
phys_offset
,
ram_addr_t
region_offset
,
bool
log_dirty
);
static
inline
void
cpu_register_physical_memory_offset
(
target_phys_addr_t
start_addr
,
ram_addr_t
size
,
ram_addr_t
phys_offset
,
ram_addr_t
region_offset
)
{
cpu_register_physical_memory_log
(
start_addr
,
size
,
phys_offset
,
region_offset
,
false
);
}
static
inline
void
cpu_register_physical_memory
(
target_phys_addr_t
start_addr
,
ram_addr_t
size
,
ram_addr_t
phys_offset
)
{
cpu_register_physical_memory_offset
(
start_addr
,
size
,
phys_offset
,
0
);
}
ram_addr_t
cpu_get_physical_page_desc
(
target_phys_addr_t
addr
);
struct
MemoryRegion
;
ram_addr_t
qemu_ram_alloc_from_ptr
(
DeviceState
*
dev
,
const
char
*
name
,
ram_addr_t
size
,
void
*
host
,
struct
MemoryRegion
*
mr
);
ram_addr_t
qemu_ram_alloc
(
DeviceState
*
dev
,
const
char
*
name
,
ram_addr_t
size
,
struct
MemoryRegion
*
mr
);
void
qemu_ram_free
(
ram_addr_t
addr
);
void
qemu_ram_free_from_ptr
(
ram_addr_t
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
);
...
...
@@ -81,11 +51,6 @@ void qemu_put_ram_ptr(void *addr);
int
qemu_ram_addr_from_host
(
void
*
ptr
,
ram_addr_t
*
ram_addr
);
ram_addr_t
qemu_ram_addr_from_host_nofail
(
void
*
ptr
);
int
cpu_register_io_memory
(
CPUReadMemoryFunc
*
const
*
mem_read
,
CPUWriteMemoryFunc
*
const
*
mem_write
,
void
*
opaque
,
enum
device_endian
endian
);
void
cpu_unregister_io_memory
(
int
table_address
);
void
cpu_physical_memory_rw
(
target_phys_addr_t
addr
,
uint8_t
*
buf
,
int
len
,
int
is_write
);
static
inline
void
cpu_physical_memory_read
(
target_phys_addr_t
addr
,
...
...
@@ -134,10 +99,6 @@ void cpu_unregister_phys_memory_client(CPUPhysMemoryClient *);
* batching which can make a major impact on performance when using
* virtualization.
*/
void
qemu_register_coalesced_mmio
(
target_phys_addr_t
addr
,
ram_addr_t
size
);
void
qemu_unregister_coalesced_mmio
(
target_phys_addr_t
addr
,
ram_addr_t
size
);
void
qemu_flush_coalesced_mmio_buffer
(
void
);
uint32_t
ldub_phys
(
target_phys_addr_t
addr
);
...
...
exec-obsolete.h
0 → 100644
浏览文件 @
f76d27b6
/*
* Declarations for obsolete exec.c functions
*
* Copyright 2011 Red Hat, Inc. and/or its affiliates
*
* Authors:
* Avi Kivity <avi@redhat.com>
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*
*/
/*
* This header is for use by exec.c and memory.c ONLY. Do not include it.
* The functions declared here will be removed soon.
*/
#ifndef EXEC_OBSOLETE_H
#define EXEC_OBSOLETE_H
#ifndef WANT_EXEC_OBSOLETE
#error Do not include exec-obsolete.h
#endif
#ifndef CONFIG_USER_ONLY
ram_addr_t
qemu_ram_alloc_from_ptr
(
DeviceState
*
dev
,
const
char
*
name
,
ram_addr_t
size
,
void
*
host
,
MemoryRegion
*
mr
);
ram_addr_t
qemu_ram_alloc
(
DeviceState
*
dev
,
const
char
*
name
,
ram_addr_t
size
,
MemoryRegion
*
mr
);
void
qemu_ram_free
(
ram_addr_t
addr
);
void
qemu_ram_free_from_ptr
(
ram_addr_t
addr
);
int
cpu_register_io_memory
(
CPUReadMemoryFunc
*
const
*
mem_read
,
CPUWriteMemoryFunc
*
const
*
mem_write
,
void
*
opaque
,
enum
device_endian
endian
);
void
cpu_unregister_io_memory
(
int
table_address
);
void
cpu_register_physical_memory_log
(
target_phys_addr_t
start_addr
,
ram_addr_t
size
,
ram_addr_t
phys_offset
,
ram_addr_t
region_offset
,
bool
log_dirty
);
static
inline
void
cpu_register_physical_memory_offset
(
target_phys_addr_t
start_addr
,
ram_addr_t
size
,
ram_addr_t
phys_offset
,
ram_addr_t
region_offset
)
{
cpu_register_physical_memory_log
(
start_addr
,
size
,
phys_offset
,
region_offset
,
false
);
}
static
inline
void
cpu_register_physical_memory
(
target_phys_addr_t
start_addr
,
ram_addr_t
size
,
ram_addr_t
phys_offset
)
{
cpu_register_physical_memory_offset
(
start_addr
,
size
,
phys_offset
,
0
);
}
void
qemu_register_coalesced_mmio
(
target_phys_addr_t
addr
,
ram_addr_t
size
);
void
qemu_unregister_coalesced_mmio
(
target_phys_addr_t
addr
,
ram_addr_t
size
);
#endif
#endif
exec.c
浏览文件 @
f76d27b6
...
...
@@ -57,6 +57,9 @@
#include "trace.h"
#endif
#define WANT_EXEC_OBSOLETE
#include "exec-obsolete.h"
//#define DEBUG_TB_INVALIDATE
//#define DEBUG_FLUSH
//#define DEBUG_TLB
...
...
hw/etraxfs_eth.c
浏览文件 @
f76d27b6
...
...
@@ -323,7 +323,6 @@ struct fs_eth
MemoryRegion
mmio
;
NICState
*
nic
;
NICConf
conf
;
int
ethregs
;
/* Two addrs in the filter. */
uint8_t
macaddr
[
2
][
6
];
...
...
@@ -571,8 +570,6 @@ static void eth_cleanup(VLANClientState *nc)
{
struct
fs_eth
*
eth
=
DO_UPCAST
(
NICState
,
nc
,
nc
)
->
opaque
;
cpu_unregister_io_memory
(
eth
->
ethregs
);
/* Disconnect the client. */
eth
->
dma_out
->
client
.
push
=
NULL
;
eth
->
dma_out
->
client
.
opaque
=
NULL
;
...
...
memory.c
浏览文件 @
f76d27b6
...
...
@@ -18,6 +18,9 @@
#include "kvm.h"
#include <assert.h>
#define WANT_EXEC_OBSOLETE
#include "exec-obsolete.h"
unsigned
memory_region_transaction_depth
=
0
;
static
bool
memory_region_update_pending
=
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录