Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
qemu
提交
c0907c9e
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,发现更多精彩内容 >>
提交
c0907c9e
编写于
2月 05, 2013
作者:
P
Paolo Bonzini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hw: move PCI bridges to hw/pci-* or hw/ARCH
Signed-off-by:
N
Paolo Bonzini
<
pbonzini@redhat.com
>
上级
8ac5c651
变更
35
隐藏空白更改
内联
并排
Showing
35 changed file
with
26 addition
and
27 deletion
+26
-27
default-configs/i386-softmmu.mak
default-configs/i386-softmmu.mak
+4
-0
default-configs/sparc64-softmmu.mak
default-configs/sparc64-softmmu.mak
+1
-0
default-configs/x86_64-softmmu.mak
default-configs/x86_64-softmmu.mak
+4
-0
hw/Makefile.objs
hw/Makefile.objs
+1
-0
hw/alpha/Makefile.objs
hw/alpha/Makefile.objs
+1
-5
hw/alpha/typhoon.c
hw/alpha/typhoon.c
+0
-0
hw/i386/Makefile.objs
hw/i386/Makefile.objs
+1
-2
hw/mips/Makefile.objs
hw/mips/Makefile.objs
+1
-5
hw/mips/gt64xxx_pci.c
hw/mips/gt64xxx_pci.c
+0
-0
hw/pci-bridge/Makefile.objs
hw/pci-bridge/Makefile.objs
+0
-0
hw/pci-bridge/i82801b11.c
hw/pci-bridge/i82801b11.c
+0
-0
hw/pci-bridge/ioh3420.c
hw/pci-bridge/ioh3420.c
+0
-0
hw/pci-bridge/pci_bridge_dev.c
hw/pci-bridge/pci_bridge_dev.c
+0
-0
hw/pci-bridge/xio3130_downstream.c
hw/pci-bridge/xio3130_downstream.c
+0
-0
hw/pci-bridge/xio3130_upstream.c
hw/pci-bridge/xio3130_upstream.c
+0
-0
hw/pci-host/Makefile.objs
hw/pci-host/Makefile.objs
+5
-0
hw/pci-host/apb.c
hw/pci-host/apb.c
+4
-4
hw/pci-host/bonito.c
hw/pci-host/bonito.c
+0
-0
hw/pci-host/dec.c
hw/pci-host/dec.c
+0
-0
hw/pci-host/grackle.c
hw/pci-host/grackle.c
+0
-0
hw/pci-host/pam.c
hw/pci-host/pam.c
+0
-0
hw/pci-host/piix.c
hw/pci-host/piix.c
+0
-0
hw/pci-host/ppce500.c
hw/pci-host/ppce500.c
+0
-0
hw/pci-host/prep.c
hw/pci-host/prep.c
+0
-0
hw/pci-host/q35.c
hw/pci-host/q35.c
+0
-0
hw/pci-host/uninorth.c
hw/pci-host/uninorth.c
+0
-0
hw/pci-host/versatile.c
hw/pci-host/versatile.c
+0
-0
hw/pci/Makefile.objs
hw/pci/Makefile.objs
+0
-2
hw/ppc/Makefile.objs
hw/ppc/Makefile.objs
+2
-3
hw/ppc/ppc4xx_pci.c
hw/ppc/ppc4xx_pci.c
+0
-0
hw/ppc/spapr_pci.c
hw/ppc/spapr_pci.c
+0
-0
hw/sh4/Makefile.objs
hw/sh4/Makefile.objs
+2
-1
hw/sh4/sh_pci.c
hw/sh4/sh_pci.c
+0
-0
hw/sparc64/Makefile.objs
hw/sparc64/Makefile.objs
+0
-4
include/hw/pci-host/q35.h
include/hw/pci-host/q35.h
+0
-1
未找到文件。
default-configs/i386-softmmu.mak
浏览文件 @
c0907c9e
...
...
@@ -31,8 +31,12 @@ CONFIG_TPM_TIS=y
CONFIG_TPM_PASSTHROUGH
=
y
CONFIG_PCI_HOTPLUG
=
y
CONFIG_MC146818RTC
=
y
CONFIG_PAM
=
y
CONFIG_PCI_PIIX
=
y
CONFIG_PCI_HOTPLUG
=
y
CONFIG_WDT_IB700
=
y
CONFIG_PC_SYSFW
=
y
CONFIG_XEN_I386
=
$(CONFIG_XEN)
CONFIG_ISA_DEBUG
=
y
CONFIG_LPC_ICH9
=
y
CONFIG_Q35
=
y
default-configs/sparc64-softmmu.mak
浏览文件 @
c0907c9e
...
...
@@ -13,4 +13,5 @@ CONFIG_PCKBD=y
CONFIG_FDC
=
y
CONFIG_IDE_ISA
=
y
CONFIG_IDE_CMD646
=
y
CONFIG_PCI_APB
=
y
CONFIG_MC146818RTC
=
y
default-configs/x86_64-softmmu.mak
浏览文件 @
c0907c9e
...
...
@@ -31,8 +31,12 @@ CONFIG_TPM_TIS=y
CONFIG_TPM_PASSTHROUGH
=
y
CONFIG_PCI_HOTPLUG
=
y
CONFIG_MC146818RTC
=
y
CONFIG_PAM
=
y
CONFIG_PCI_PIIX
=
y
CONFIG_PCI_HOTPLUG
=
y
CONFIG_WDT_IB700
=
y
CONFIG_PC_SYSFW
=
y
CONFIG_XEN_I386
=
$(CONFIG_XEN)
CONFIG_ISA_DEBUG
=
y
CONFIG_LPC_ICH9
=
y
CONFIG_Q35
=
y
hw/Makefile.objs
浏览文件 @
c0907c9e
...
...
@@ -17,6 +17,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += misc/
devices-dirs-$(CONFIG_SOFTMMU)
+=
net/
devices-dirs-$(CONFIG_SOFTMMU)
+=
nvram/
devices-dirs-$(CONFIG_SOFTMMU)
+=
pci/
devices-dirs-$(CONFIG_PCI)
+=
pci-bridge/ pci-host/
devices-dirs-$(CONFIG_SOFTMMU)
+=
scsi/
devices-dirs-$(CONFIG_SOFTMMU)
+=
sd/
devices-dirs-$(CONFIG_SOFTMMU)
+=
ssi/
...
...
hw/alpha/Makefile.objs
浏览文件 @
c0907c9e
obj-y
+=
alpha_typhoon.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
obj-y
+=
dp264.o pci.o
obj-y
+=
dp264.o pci.o typhoon.o
hw/alpha
_
typhoon.c
→
hw/alpha
/
typhoon.c
浏览文件 @
c0907c9e
文件已移动
hw/i386/Makefile.objs
浏览文件 @
c0907c9e
obj-y
+=
apic_common.o apic.o
obj-y
+=
sga.o ioapic_common.o ioapic.o
piix_pci.o
obj-y
+=
sga.o ioapic_common.o ioapic.o
obj-y
+=
vmport.o
obj-y
+=
debugexit.o
obj-y
+=
q35.o
obj-y
+=
kvm/
obj-y
+=
pc-testdev.o
...
...
hw/mips/Makefile.objs
浏览文件 @
c0907c9e
obj-y
+=
gt64xxx.o
obj-$(CONFIG_FULONG)
+=
bonito.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
obj-y
+=
mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
obj-y
+=
addr.o cputimer.o mips_int.o
obj-$(CONFIG_FULONG)
+=
mips_fulong2e.o
obj-y
+=
gt64xxx_pci.o
hw/
gt64xxx
.c
→
hw/
mips/gt64xxx_pci
.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
bridge/Makefile.objs
→
hw/pci
-
bridge/Makefile.objs
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
bridge/i82801b11.c
→
hw/pci
-
bridge/i82801b11.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
bridge/ioh3420.c
→
hw/pci
-
bridge/ioh3420.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
bridge/pci_bridge_dev.c
→
hw/pci
-
bridge/pci_bridge_dev.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
bridge/xio3130_downstream.c
→
hw/pci
-
bridge/xio3130_downstream.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
bridge/xio3130_upstream.c
→
hw/pci
-
bridge/xio3130_upstream.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/Makefile.objs
→
hw/pci
-
host/Makefile.objs
浏览文件 @
c0907c9e
...
...
@@ -11,3 +11,8 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o
# ARM devices
common-obj-$(CONFIG_VERSATILE_PCI)
+=
versatile.o
common-obj-$(CONFIG_PCI_APB)
+=
apb.o
common-obj-$(CONFIG_FULONG)
+=
bonito.o
common-obj-$(CONFIG_PCI_PIIX)
+=
piix.o
common-obj-$(CONFIG_PCI_Q35)
+=
q35.o
hw/
apb_pci
.c
→
hw/
pci-host/apb
.c
浏览文件 @
c0907c9e
...
...
@@ -92,7 +92,7 @@ static void apb_config_writel (void *opaque, hwaddr addr,
{
APBState
*
s
=
opaque
;
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_lx
" val %"
PRIx64
"
\n
"
,
__func__
,
addr
,
val
);
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_
p
lx
" val %"
PRIx64
"
\n
"
,
__func__
,
addr
,
val
);
switch
(
addr
&
0xffff
)
{
case
0x30
...
0x4f
:
/* DMA error registers */
...
...
@@ -201,7 +201,7 @@ static uint64_t apb_config_readl (void *opaque,
val
=
0
;
break
;
}
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_lx
" -> %x
\n
"
,
__func__
,
addr
,
val
);
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_
p
lx
" -> %x
\n
"
,
__func__
,
addr
,
val
);
return
val
;
}
...
...
@@ -218,7 +218,7 @@ static void apb_pci_config_write(void *opaque, hwaddr addr,
APBState
*
s
=
opaque
;
val
=
qemu_bswap_len
(
val
,
size
);
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_lx
" val %"
PRIx64
"
\n
"
,
__func__
,
addr
,
val
);
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_
p
lx
" val %"
PRIx64
"
\n
"
,
__func__
,
addr
,
val
);
pci_data_write
(
s
->
bus
,
addr
,
val
,
size
);
}
...
...
@@ -230,7 +230,7 @@ static uint64_t apb_pci_config_read(void *opaque, hwaddr addr,
ret
=
pci_data_read
(
s
->
bus
,
addr
,
size
);
ret
=
qemu_bswap_len
(
ret
,
size
);
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_lx
" -> %x
\n
"
,
__func__
,
addr
,
ret
);
APB_DPRINTF
(
"%s: addr "
TARGET_FMT_
p
lx
" -> %x
\n
"
,
__func__
,
addr
,
ret
);
return
ret
;
}
...
...
hw/bonito.c
→
hw/
pci-host/
bonito.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/dec.c
→
hw/pci
-
host/dec.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/grackle.c
→
hw/pci
-
host/grackle.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/pam.c
→
hw/pci
-
host/pam.c
浏览文件 @
c0907c9e
文件已移动
hw/p
iix_pci
.c
→
hw/p
ci-host/piix
.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/ppce500.c
→
hw/pci
-
host/ppce500.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/prep.c
→
hw/pci
-
host/prep.c
浏览文件 @
c0907c9e
文件已移动
hw/q35.c
→
hw/
pci-host/
q35.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/uninorth.c
→
hw/pci
-
host/uninorth.c
浏览文件 @
c0907c9e
文件已移动
hw/pci
/
host/versatile.c
→
hw/pci
-
host/versatile.c
浏览文件 @
c0907c9e
文件已移动
hw/pci/Makefile.objs
浏览文件 @
c0907c9e
...
...
@@ -8,6 +8,4 @@ common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
common-obj-$(CONFIG_NO_PCI)
+=
pci-stub.o
common-obj-$(CONFIG_ALL)
+=
pci-stub.o
common-obj-$(CONFIG_PCI)
+=
bridge/ host/
obj-$(CONFIG_PCI_HOTPLUG)
+=
pci-hotplug.o
hw/ppc/Makefile.objs
浏览文件 @
c0907c9e
# IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES)
+=
spapr_pci.o
obj-$(CONFIG_PSERIES)
+=
spapr_nvram.o
# PowerPC 4xx boards
obj-y
+=
ppc4xx_pci.o
# PowerPC OpenPIC
obj-y
+=
openpic.o
...
...
@@ -13,8 +10,10 @@ obj-y += ppc.o ppc_booke.o
# IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES)
+=
spapr.o xics.o spapr_vio.o spapr_events.o
obj-$(CONFIG_PSERIES)
+=
spapr_hcall.o spapr_iommu.o spapr_rtas.o
obj-$(CONFIG_PSERIES)
+=
spapr_pci.o
# PowerPC 4xx boards
obj-y
+=
ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o
obj-y
+=
ppc4xx_pci.o
# PReP
obj-y
+=
prep.o
# OldWorld PowerMac
...
...
hw/ppc4xx_pci.c
→
hw/ppc
/ppc
4xx_pci.c
浏览文件 @
c0907c9e
文件已移动
hw/spapr_pci.c
→
hw/
ppc/
spapr_pci.c
浏览文件 @
c0907c9e
文件已移动
hw/sh4/Makefile.objs
浏览文件 @
c0907c9e
obj-y
+=
sh_intc.o
sh_pci.o
obj-y
+=
sh_intc.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
obj-y
+=
shix.o r2d.o
obj-y
+=
sh7750.o sh7750_regnames.o
obj-y
+=
sh_pci.o
hw/sh_pci.c
→
hw/sh
4/sh
_pci.c
浏览文件 @
c0907c9e
文件已移动
hw/sparc64/Makefile.objs
浏览文件 @
c0907c9e
obj-y
=
apb_pci.o
obj-y
:=
$(
addprefix
../,
$
(
obj-y
))
obj-y
+=
sun4u.o
include/hw/pci-host/q35.h
浏览文件 @
c0907c9e
...
...
@@ -28,7 +28,6 @@
#include "hw/sysbus.h"
#include "hw/i386/pc.h"
#include "hw/isa/apm.h"
#include "hw/i386/apic.h"
#include "hw/pci/pci.h"
#include "hw/pci/pcie_host.h"
#include "hw/acpi/acpi.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录