Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
9944d320
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,发现更多精彩内容 >>
提交
9944d320
编写于
2月 05, 2013
作者:
P
Paolo Bonzini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hw: move char devices to hw/char/, configure via default-configs/
Signed-off-by:
N
Paolo Bonzini
<
pbonzini@redhat.com
>
上级
80b4ecc8
变更
29
隐藏空白更改
内联
并排
Showing
29 changed file
with
29 addition
and
19 deletion
+29
-19
default-configs/arm-softmmu.mak
default-configs/arm-softmmu.mak
+1
-0
default-configs/i386-softmmu.mak
default-configs/i386-softmmu.mak
+1
-0
default-configs/lm32-softmmu.mak
default-configs/lm32-softmmu.mak
+1
-0
default-configs/s390x-softmmu.mak
default-configs/s390x-softmmu.mak
+1
-0
default-configs/sparc-softmmu.mak
default-configs/sparc-softmmu.mak
+1
-0
default-configs/x86_64-softmmu.mak
default-configs/x86_64-softmmu.mak
+1
-0
hw/arm/Makefile.objs
hw/arm/Makefile.objs
+3
-3
hw/char/Makefile.objs
hw/char/Makefile.objs
+15
-0
hw/char/debugcon.c
hw/char/debugcon.c
+0
-0
hw/char/etraxfs_ser.c
hw/char/etraxfs_ser.c
+0
-2
hw/char/exynos4210_uart.c
hw/char/exynos4210_uart.c
+0
-0
hw/char/grlib_apbuart.c
hw/char/grlib_apbuart.c
+0
-0
hw/char/imx_serial.c
hw/char/imx_serial.c
+0
-0
hw/char/lm32_juart.c
hw/char/lm32_juart.c
+0
-0
hw/char/lm32_uart.c
hw/char/lm32_uart.c
+0
-0
hw/char/mcf_uart.c
hw/char/mcf_uart.c
+0
-0
hw/char/milkymist-uart.c
hw/char/milkymist-uart.c
+0
-0
hw/char/omap_uart.c
hw/char/omap_uart.c
+0
-0
hw/char/sclpconsole.c
hw/char/sclpconsole.c
+1
-1
hw/char/sh_serial.c
hw/char/sh_serial.c
+0
-0
hw/char/spapr_vty.c
hw/char/spapr_vty.c
+0
-0
hw/cris/Makefile.objs
hw/cris/Makefile.objs
+0
-1
hw/i386/Makefile.objs
hw/i386/Makefile.objs
+1
-1
hw/lm32/Makefile.objs
hw/lm32/Makefile.objs
+0
-3
hw/m68k/Makefile.objs
hw/m68k/Makefile.objs
+0
-4
hw/ppc/Makefile.objs
hw/ppc/Makefile.objs
+0
-1
hw/s390x/Makefile.objs
hw/s390x/Makefile.objs
+1
-1
hw/sh4/Makefile.objs
hw/sh4/Makefile.objs
+1
-1
hw/sparc/Makefile.objs
hw/sparc/Makefile.objs
+1
-1
未找到文件。
default-configs/arm-softmmu.mak
浏览文件 @
9944d320
...
...
@@ -57,6 +57,7 @@ CONFIG_MARVELL_88W8618=y
CONFIG_OMAP
=
y
CONFIG_BLIZZARD
=
y
CONFIG_ONENAND
=
y
CONFIG_IMX
=
y
CONFIG_ZAURUS
=
y
CONFIG_VERSATILE_PCI
=
y
...
...
default-configs/i386-softmmu.mak
浏览文件 @
9944d320
...
...
@@ -34,3 +34,4 @@ CONFIG_MC146818RTC=y
CONFIG_WDT_IB700
=
y
CONFIG_PC_SYSFW
=
y
CONFIG_XEN_I386
=
$(CONFIG_XEN)
CONFIG_ISA_DEBUG
=
y
default-configs/lm32-softmmu.mak
浏览文件 @
9944d320
# Default configuration for lm32-softmmu
CONFIG_LM32
=
y
CONFIG_MILKYMIST
=
y
CONFIG_FRAMEBUFFER
=
y
CONFIG_PTIMER
=
y
...
...
default-configs/s390x-softmmu.mak
浏览文件 @
9944d320
CONFIG_VIRTIO
=
y
CONFIG_SCLPCONSOLE
=
y
default-configs/sparc-softmmu.mak
浏览文件 @
9944d320
...
...
@@ -11,3 +11,4 @@ CONFIG_PCNET_COMMON=y
CONFIG_LANCE
=
y
CONFIG_TCX
=
y
CONFIG_CS4231
=
y
CONFIG_GRLIB
=
y
default-configs/x86_64-softmmu.mak
浏览文件 @
9944d320
...
...
@@ -34,3 +34,4 @@ CONFIG_MC146818RTC=y
CONFIG_WDT_IB700
=
y
CONFIG_PC_SYSFW
=
y
CONFIG_XEN_I386
=
$(CONFIG_XEN)
CONFIG_ISA_DEBUG
=
y
hw/arm/Makefile.objs
浏览文件 @
9944d320
...
...
@@ -3,7 +3,7 @@ obj-y += arm_gic.o arm_gic_common.o
obj-y
+=
a9scu.o
obj-y
+=
realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o
obj-y
+=
exynos4210_gic.o exynos4210_combiner.o
obj-y
+=
exynos4210_
uart.o exynos4210_
pwm.o
obj-y
+=
exynos4210_pwm.o
obj-y
+=
exynos4210_pmu.o exynos4210_mct.o
obj-y
+=
exynos4210_rtc.o
obj-y
+=
arm_mptimer.o a15mpcore.o
...
...
@@ -12,14 +12,14 @@ obj-y += pxa2xx_timer.o pxa2xx_dma.o
obj-y
+=
pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
obj-y
+=
zaurus.o
obj-y
+=
omap_dma.o omap_clk.o omap_mmc.o
\
omap_gpio.o omap_intc.o
omap_uart.o
omap_gpio.o omap_intc.o
obj-y
+=
soc_dma.o omap_gptimer.o omap_synctimer.o
\
omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o
obj-y
+=
tsc210x.o
obj-y
+=
cbus.o tusb6010.o
obj-y
+=
mst_fpga.o
obj-y
+=
strongarm.o
obj-y
+=
imx_
serial.o imx_
ccm.o imx_timer.o imx_avic.o
obj-y
+=
imx_ccm.o imx_timer.o imx_avic.o
obj-$(CONFIG_KVM)
+=
kvm/arm_gic.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
...
...
hw/char/Makefile.objs
浏览文件 @
9944d320
...
...
@@ -9,4 +9,19 @@ common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
common-obj-$(CONFIG_XEN_BACKEND)
+=
xen_console.o
common-obj-$(CONFIG_CADENCE)
+=
cadence_uart.o
obj-$(CONFIG_EXYNOS4)
+=
exynos4210_uart.o
obj-$(CONFIG_COLDFIRE)
+=
mcf_uart.o
obj-$(CONFIG_OMAP)
+=
omap_uart.o
obj-$(CONFIG_SH4)
+=
sh_serial.o
obj-$(CONFIG_PSERIES)
+=
spapr_vty.o
common-obj-$(CONFIG_ETRAXFS)
+=
etraxfs_ser.o
common-obj-$(CONFIG_ISA_DEBUG)
+=
debugcon.o
common-obj-$(CONFIG_GRLIB)
+=
grlib_apbuart.o
common-obj-$(CONFIG_IMX)
+=
imx_serial.o
common-obj-$(CONFIG_LM32)
+=
lm32_juart.o
common-obj-$(CONFIG_LM32)
+=
lm32_uart.o
common-obj-$(CONFIG_MILKYMIST)
+=
milkymist-uart.o
common-obj-$(CONFIG_SCLPCONSOLE)
+=
sclpconsole.o
obj-$(CONFIG_VIRTIO)
+=
virtio-serial-bus.o
hw/debugcon.c
→
hw/
char/
debugcon.c
浏览文件 @
9944d320
文件已移动
hw/etraxfs_ser.c
→
hw/
char/
etraxfs_ser.c
浏览文件 @
9944d320
...
...
@@ -78,7 +78,6 @@ static uint64_t
ser_read
(
void
*
opaque
,
hwaddr
addr
,
unsigned
int
size
)
{
struct
etrax_serial
*
s
=
opaque
;
D
(
CPUCRISState
*
env
=
s
->
env
);
uint32_t
r
=
0
;
addr
>>=
2
;
...
...
@@ -116,7 +115,6 @@ ser_write(void *opaque, hwaddr addr,
struct
etrax_serial
*
s
=
opaque
;
uint32_t
value
=
val64
;
unsigned
char
ch
=
val64
;
D
(
CPUCRISState
*
env
=
s
->
env
);
D
(
qemu_log
(
"%s "
TARGET_FMT_plx
"=%x
\n
"
,
__func__
,
addr
,
value
));
addr
>>=
2
;
...
...
hw/exynos4210_uart.c
→
hw/
char/
exynos4210_uart.c
浏览文件 @
9944d320
文件已移动
hw/grlib_apbuart.c
→
hw/
char/
grlib_apbuart.c
浏览文件 @
9944d320
文件已移动
hw/imx_serial.c
→
hw/
char/
imx_serial.c
浏览文件 @
9944d320
文件已移动
hw/lm32_juart.c
→
hw/
char/
lm32_juart.c
浏览文件 @
9944d320
文件已移动
hw/lm32_uart.c
→
hw/
char/
lm32_uart.c
浏览文件 @
9944d320
文件已移动
hw/mcf_uart.c
→
hw/
char/
mcf_uart.c
浏览文件 @
9944d320
文件已移动
hw/milkymist-uart.c
→
hw/
char/
milkymist-uart.c
浏览文件 @
9944d320
文件已移动
hw/omap_uart.c
→
hw/
char/
omap_uart.c
浏览文件 @
9944d320
文件已移动
hw/
s390x
/sclpconsole.c
→
hw/
char
/sclpconsole.c
浏览文件 @
9944d320
...
...
@@ -234,7 +234,7 @@ static int write_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_hdr)
return
rc
;
}
static
void
trigger_ascii_console_data
(
void
*
env
,
int
n
,
int
level
)
static
void
trigger_ascii_console_data
(
void
*
opaque
,
int
n
,
int
level
)
{
sclp_service_interrupt
(
0
);
}
...
...
hw/sh_serial.c
→
hw/
char/
sh_serial.c
浏览文件 @
9944d320
文件已移动
hw/spapr_vty.c
→
hw/
char/
spapr_vty.c
浏览文件 @
9944d320
文件已移动
hw/cris/Makefile.objs
浏览文件 @
9944d320
...
...
@@ -2,7 +2,6 @@
obj-y
+=
etraxfs_dma.o
obj-y
+=
etraxfs_pic.o
obj-y
+=
etraxfs_timer.o
obj-y
+=
etraxfs_ser.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
...
...
hw/i386/Makefile.objs
浏览文件 @
9944d320
obj-y
+=
apic_common.o apic.o
obj-y
+=
sga.o ioapic_common.o ioapic.o piix_pci.o
obj-y
+=
vmport.o
obj-y
+=
debug
con.o debug
exit.o
obj-y
+=
debugexit.o
obj-y
+=
lpc_ich9.o q35.o
obj-y
+=
kvm/
obj-y
+=
pc-testdev.o
...
...
hw/lm32/Makefile.objs
浏览文件 @
9944d320
# LM32 peripherals
obj-y
+=
lm32_pic.o
obj-y
+=
lm32_juart.o
obj-y
+=
lm32_timer.o
obj-y
+=
lm32_uart.o
obj-y
+=
lm32_sys.o
obj-y
+=
milkymist-hpdmc.o
obj-y
+=
milkymist-memcard.o
obj-y
+=
milkymist-pfpu.o
obj-y
+=
milkymist-softusb.o
obj-y
+=
milkymist-sysctl.o
obj-y
+=
milkymist-uart.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
...
...
hw/m68k/Makefile.objs
浏览文件 @
9944d320
obj-y
=
mcf_uart.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
obj-y
+=
an5206.o mcf5208.o
obj-y
+=
dummy_m68k.o
...
...
hw/ppc/Makefile.objs
浏览文件 @
9944d320
# IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES)
+=
spapr_vty.o
obj-$(CONFIG_PSERIES)
+=
spapr_pci.o
obj-$(CONFIG_PSERIES)
+=
spapr_nvram.o
# PowerPC 4xx boards
...
...
hw/s390x/Makefile.objs
浏览文件 @
9944d320
...
...
@@ -2,7 +2,7 @@ obj-y = s390-virtio-bus.o s390-virtio.o
obj-y
+=
s390-virtio-hcall.o
obj-y
+=
sclp.o
obj-y
+=
event-facility.o
obj-y
+=
sclpquiesce.o
sclpconsole.o
obj-y
+=
sclpquiesce.o
obj-y
+=
ipl.o
obj-y
+=
css.o
obj-y
+=
s390-virtio-ccw.o
...
...
hw/sh4/Makefile.objs
浏览文件 @
9944d320
obj-y
+=
sh_timer.o sh_
serial.o sh_
intc.o sh_pci.o
obj-y
+=
sh_timer.o sh_intc.o sh_pci.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
...
...
hw/sparc/Makefile.objs
浏览文件 @
9944d320
...
...
@@ -3,7 +3,7 @@ obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o
obj-y
+=
eccmemctl.o sbi.o sun4c_intctl.o
# GRLIB
obj-y
+=
grlib_gptimer.o grlib_irqmp.o
grlib_apbuart.o
obj-y
+=
grlib_gptimer.o grlib_irqmp.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录