Revision f8f5cfba

b/Makefile.objs
161 161 
hw-obj-y += vl.o loader.o
162 162 
hw-obj-y += virtio.o virtio-console.o
163 163 
hw-obj-y += fw_cfg.o
164 
hw-obj-$(CONFIG_PCI) += pci.o pci_host.o pcie_host.o pci_bridge.o
165 
hw-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
164 
# FIXME: Core PCI code and its direct dependencies are required by the
165 
# QMP query-pci command.
166 
hw-obj-y += pci.o pci_bridge.o msix.o msi.o
167 
hw-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
168 
hw-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
166 169 
hw-obj-y += watchdog.o
167 170 
hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
168 171 
hw-obj-$(CONFIG_ECC) += ecc.o
......
207 210 
hw-obj-$(CONFIG_PIIX4) += piix4.o
208 211 

  		





  209
  212
  
    
# PCI watchdog devices


  		





  210
  
  
    
hw-obj-y += wdt_i6300esb.o


  		





  
  213
  
    
hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o


  		





  211
  214
  
    

  		





  212
  
  
    
hw-obj-y += pcie.o pcie_port.o


  		





  213
  
  
    
hw-obj-y += msix.o msi.o


  		





  
  215
  
    
hw-obj-$(CONFIG_PCI) += pcie.o pcie_port.o


  		





  214
  216
  
    

  		





  215
  217
  
    
# PCI network cards


  		





  216
  
  
    
hw-obj-y += ne2000.o


  		





  217
  
  
    
hw-obj-y += eepro100.o


  		





  218
  
  
    
hw-obj-y += pcnet.o


  		





  
  218
  
    
hw-obj-$(CONFIG_NE2000_PCI) += ne2000.o


  		





  
  219
  
    
hw-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o


  		





  
  220
  
    
hw-obj-$(CONFIG_PCNET_PCI) += pcnet.o


  		





  219
  221
  
    

  		





  220
  222
  
    
hw-obj-$(CONFIG_SMC91C111) += smc91c111.o


  		





  221
  223
  
    
hw-obj-$(CONFIG_LAN9118) += lan9118.o


  		





  ......




  232
  234
  
    
hw-obj-$(CONFIG_IDE_VIA) += ide/via.o


  		





  233
  235
  
    

  		





  234
  236
  
    
# SCSI layer


  		





  235
  
  
    
hw-obj-y += lsi53c895a.o


  		





  
  237
  
    
hw-obj-$(CONFIG_LSI_SCSI_PCI) += lsi53c895a.o


  		





  236
  238
  
    
hw-obj-$(CONFIG_ESP) += esp.o


  		





  237
  239
  
    

  		





  238
  240
  
    
hw-obj-y += dma-helpers.o sysbus.o isa-bus.o


  		












  

    
      b/Makefile.target
    
  






  210
  210
  
    
obj-$(CONFIG_USB_OHCI) += usb-ohci.o


  		





  211
  211
  
    

  		





  212
  212
  
    
# PCI network cards


  		





  213
  
  
    
obj-y += rtl8139.o


  		





  214
  
  
    
obj-y += e1000.o


  		





  
  213
  
    
obj-$(CONFIG_RTL8139_PCI) += rtl8139.o


  		





  
  214
  
    
obj-$(CONFIG_E1000_PCI) += e1000.o


  		





  215
  215
  
    

  		





  216
  216
  
    
# Inter-VM PCI shared memory


  		





  217
  217
  
    
obj-$(CONFIG_KVM) += ivshmem.o


  		












  

    
      b/default-configs/arm-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for arm-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_GDBSTUB_XML=y


  		





  4
  
  
    
CONFIG_USB_OHCI=y


  		





  5
  5
  
    
CONFIG_ISA_MMIO=y


  		





  6
  6
  
    
CONFIG_NAND=y


  		





  7
  7
  
    
CONFIG_ECC=y


  		





  ......




  25
  25
  
    
CONFIG_LAN9118=y


  		





  26
  26
  
    
CONFIG_SMC91C111=y


  		





  27
  27
  
    
CONFIG_DS1338=y


  		





  28
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  29
  28
  
    
CONFIG_PFLASH_CFI01=y


  		





  30
  29
  
    
CONFIG_PFLASH_CFI02=y


  		












  

    
      b/default-configs/cris-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for cris-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
#include pci.mak


  		





  3
  4
  
    
CONFIG_NAND=y


  		





  4
  5
  
    
CONFIG_PTIMER=y


  		





  5
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  6
  6
  
    
CONFIG_PFLASH_CFI02=y


  		












  

    
      b/default-configs/i386-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for i386-softmmu


  		





  2
  2
  
    

  		





  3
  
  
    
CONFIG_USB_OHCI=y


  		





  
  3
  
    
include pci.mak


  		





  4
  4
  
    
CONFIG_VGA_PCI=y


  		





  5
  5
  
    
CONFIG_VGA_ISA=y


  		





  6
  6
  
    
CONFIG_VMWARE_VGA=y


  		





  ......




  9
  9
  
    
CONFIG_I8254=y


  		





  10
  10
  
    
CONFIG_PCSPK=y


  		





  11
  11
  
    
CONFIG_PCKBD=y


  		





  12
  
  
    
CONFIG_USB_UHCI=y


  		





  13
  12
  
    
CONFIG_FDC=y


  		





  14
  13
  
    
CONFIG_ACPI=y


  		





  15
  14
  
    
CONFIG_APM=y


  		





  ......




  22
  21
  
    
CONFIG_NE2000_ISA=y


  		





  23
  22
  
    
CONFIG_PIIX_PCI=y


  		





  24
  23
  
    
CONFIG_SOUND=y


  		





  25
  
  
    
CONFIG_VIRTIO_PCI=y


  		












  

    
      b/default-configs/m68k-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for m68k-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_GDBSTUB_XML=y


  		





  4
  5
  
    
CONFIG_PTIMER=y


  		





  5
  
  
    
CONFIG_VIRTIO_PCI=y


  		












  

    
      b/default-configs/microblaze-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for microblaze-softmmu


  		





  2
  2
  
    

  		





  3
  3
  
    
CONFIG_PTIMER=y


  		





  4
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  5
  4
  
    
CONFIG_PFLASH_CFI01=y


  		












  

    
      b/default-configs/mips-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for mips-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_ISA_MMIO=y


  		





  4
  5
  
    
CONFIG_ESP=y


  		





  5
  6
  
    
CONFIG_VGA_PCI=y


  		





  ......




  11
  12
  
    
CONFIG_I8254=y


  		





  12
  13
  
    
CONFIG_PCSPK=y


  		





  13
  14
  
    
CONFIG_PCKBD=y


  		





  14
  
  
    
CONFIG_USB_UHCI=y


  		





  15
  15
  
    
CONFIG_FDC=y


  		





  16
  16
  
    
CONFIG_ACPI=y


  		





  17
  17
  
    
CONFIG_APM=y


  		





  ......




  24
  24
  
    
CONFIG_IDE_PIIX=y


  		





  25
  25
  
    
CONFIG_NE2000_ISA=y


  		





  26
  26
  
    
CONFIG_SOUND=y


  		





  27
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  28
  27
  
    
CONFIG_RC4030=y


  		





  29
  28
  
    
CONFIG_DP8393X=y


  		





  30
  29
  
    
CONFIG_DS1225Y=y


  		












  

    
      b/default-configs/mips64-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for mips64-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_ISA_MMIO=y


  		





  4
  5
  
    
CONFIG_ESP=y


  		





  5
  6
  
    
CONFIG_VGA_PCI=y


  		





  ......




  11
  12
  
    
CONFIG_I8254=y


  		





  12
  13
  
    
CONFIG_PCSPK=y


  		





  13
  14
  
    
CONFIG_PCKBD=y


  		





  14
  
  
    
CONFIG_USB_UHCI=y


  		





  15
  15
  
    
CONFIG_FDC=y


  		





  16
  16
  
    
CONFIG_ACPI=y


  		





  17
  17
  
    
CONFIG_APM=y


  		





  ......




  24
  24
  
    
CONFIG_IDE_PIIX=y


  		





  25
  25
  
    
CONFIG_NE2000_ISA=y


  		





  26
  26
  
    
CONFIG_SOUND=y


  		





  27
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  28
  27
  
    
CONFIG_RC4030=y


  		





  29
  28
  
    
CONFIG_DP8393X=y


  		





  30
  29
  
    
CONFIG_DS1225Y=y


  		












  

    
      b/default-configs/mips64el-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for mips64el-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_ISA_MMIO=y


  		





  4
  5
  
    
CONFIG_ESP=y


  		





  5
  6
  
    
CONFIG_VGA_PCI=y


  		





  ......




  11
  12
  
    
CONFIG_I8254=y


  		





  12
  13
  
    
CONFIG_PCSPK=y


  		





  13
  14
  
    
CONFIG_PCKBD=y


  		





  14
  
  
    
CONFIG_USB_UHCI=y


  		





  15
  15
  
    
CONFIG_FDC=y


  		





  16
  16
  
    
CONFIG_ACPI=y


  		





  17
  17
  
    
CONFIG_APM=y


  		





  ......




  25
  25
  
    
CONFIG_IDE_VIA=y


  		





  26
  26
  
    
CONFIG_NE2000_ISA=y


  		





  27
  27
  
    
CONFIG_SOUND=y


  		





  28
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  29
  28
  
    
CONFIG_RC4030=y


  		





  30
  29
  
    
CONFIG_DP8393X=y


  		





  31
  30
  
    
CONFIG_DS1225Y=y


  		












  

    
      b/default-configs/mipsel-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for mipsel-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_ISA_MMIO=y


  		





  4
  5
  
    
CONFIG_ESP=y


  		





  5
  6
  
    
CONFIG_VGA_PCI=y


  		





  ......




  11
  12
  
    
CONFIG_I8254=y


  		





  12
  13
  
    
CONFIG_PCSPK=y


  		





  13
  14
  
    
CONFIG_PCKBD=y


  		





  14
  
  
    
CONFIG_USB_UHCI=y


  		





  15
  15
  
    
CONFIG_FDC=y


  		





  16
  16
  
    
CONFIG_ACPI=y


  		





  17
  17
  
    
CONFIG_APM=y


  		





  ......




  24
  24
  
    
CONFIG_IDE_PIIX=y


  		





  25
  25
  
    
CONFIG_NE2000_ISA=y


  		





  26
  26
  
    
CONFIG_SOUND=y


  		





  27
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  28
  27
  
    
CONFIG_RC4030=y


  		





  29
  28
  
    
CONFIG_DP8393X=y


  		





  30
  29
  
    
CONFIG_DS1225Y=y


  		












  

    
      b/default-configs/ppc-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for ppc-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_GDBSTUB_XML=y


  		





  4
  
  
    
CONFIG_USB_OHCI=y


  		





  5
  5
  
    
CONFIG_ISA_MMIO=y


  		





  6
  6
  
    
CONFIG_ESCC=y


  		





  7
  7
  
    
CONFIG_M48T59=y


  		





  ......




  31
  31
  
    
CONFIG_IDE_MACIO=y


  		





  32
  32
  
    
CONFIG_NE2000_ISA=y


  		





  33
  33
  
    
CONFIG_SOUND=y


  		





  34
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  35
  34
  
    
CONFIG_PFLASH_CFI01=y


  		





  36
  35
  
    
CONFIG_PFLASH_CFI02=y


  		





  37
  36
  
    
CONFIG_PTIMER=y


  		












  

    
      b/default-configs/ppc64-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for ppc64-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_GDBSTUB_XML=y


  		





  4
  
  
    
CONFIG_USB_OHCI=y


  		





  5
  5
  
    
CONFIG_ISA_MMIO=y


  		





  6
  6
  
    
CONFIG_ESCC=y


  		





  7
  7
  
    
CONFIG_M48T59=y


  		





  ......




  31
  31
  
    
CONFIG_IDE_MACIO=y


  		





  32
  32
  
    
CONFIG_NE2000_ISA=y


  		





  33
  33
  
    
CONFIG_SOUND=y


  		





  34
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  35
  34
  
    
CONFIG_PFLASH_CFI01=y


  		





  36
  35
  
    
CONFIG_PFLASH_CFI02=y


  		





  37
  36
  
    
CONFIG_PTIMER=y


  		












  

    
      b/default-configs/ppcemb-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for ppcemb-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_GDBSTUB_XML=y


  		





  4
  
  
    
CONFIG_USB_OHCI=y


  		





  5
  5
  
    
CONFIG_ISA_MMIO=y


  		





  6
  6
  
    
CONFIG_ESCC=y


  		





  7
  7
  
    
CONFIG_M48T59=y


  		





  ......




  31
  31
  
    
CONFIG_IDE_MACIO=y


  		





  32
  32
  
    
CONFIG_NE2000_ISA=y


  		





  33
  33
  
    
CONFIG_SOUND=y


  		





  34
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  35
  34
  
    
CONFIG_PFLASH_CFI01=y


  		





  36
  35
  
    
CONFIG_PFLASH_CFI02=y


  		





  37
  36
  
    
CONFIG_PTIMER=y


  		












  

    
      b/default-configs/sh4-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for sh4-softmmu


  		





  2
  2
  
    

  		





  3
  
  
    
CONFIG_USB_OHCI=y


  		





  
  3
  
    
include pci.mak


  		





  4
  4
  
    
CONFIG_SERIAL=y


  		





  5
  5
  
    
CONFIG_PTIMER=y


  		





  6
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  7
  6
  
    
CONFIG_IDE_CORE=y


  		





  8
  7
  
    
CONFIG_PFLASH_CFI02=y


  		





  9
  8
  
    
CONFIG_ISA_MMIO=y


  		












  

    
      b/default-configs/sh4eb-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for sh4eb-softmmu


  		





  2
  2
  
    

  		





  3
  
  
    
CONFIG_USB_OHCI=y


  		





  
  3
  
    
include pci.mak


  		





  4
  4
  
    
CONFIG_SERIAL=y


  		





  5
  5
  
    
CONFIG_PTIMER=y


  		





  6
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  7
  6
  
    
CONFIG_IDE_CORE=y


  		





  8
  7
  
    
CONFIG_PFLASH_CFI02=y


  		





  9
  8
  
    
CONFIG_ISA_MMIO=y


  		












  

    
      b/default-configs/sparc-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for sparc-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_ECC=y


  		





  4
  5
  
    
CONFIG_ESP=y


  		





  5
  6
  
    
CONFIG_ESCC=y


  		





  6
  7
  
    
CONFIG_M48T59=y


  		





  7
  8
  
    
CONFIG_PTIMER=y


  		





  8
  9
  
    
CONFIG_FDC=y


  		





  9
  
  
    
CONFIG_VIRTIO_PCI=y


  		





  10
  10
  
    
CONFIG_EMPTY_SLOT=y


  		












  

    
      b/default-configs/sparc64-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for sparc64-softmmu


  		





  2
  2
  
    

  		





  
  3
  
    
include pci.mak


  		





  3
  4
  
    
CONFIG_ISA_MMIO=y


  		





  4
  5
  
    
CONFIG_M48T59=y


  		





  5
  6
  
    
CONFIG_PTIMER=y


  		





  ......




  13
  14
  
    
CONFIG_IDE_PCI=y


  		





  14
  15
  
    
CONFIG_IDE_ISA=y


  		





  15
  16
  
    
CONFIG_IDE_CMD646=y


  		





  16
  
  
    
CONFIG_VIRTIO_PCI=y


  		












  

    
      b/default-configs/x86_64-softmmu.mak
    
  






  1
  1
  
    
# Default configuration for x86_64-softmmu


  		





  2
  2
  
    

  		





  3
  
  
    
CONFIG_USB_OHCI=y


  		





  
  3
  
    
include pci.mak


  		





  4
  4
  
    
CONFIG_VGA_PCI=y


  		





  5
  5
  
    
CONFIG_VGA_ISA=y


  		





  6
  6
  
    
CONFIG_VMWARE_VGA=y


  		





  ......




  9
  9
  
    
CONFIG_I8254=y


  		





  10
  10
  
    
CONFIG_PCSPK=y


  		





  11
  11
  
    
CONFIG_PCKBD=y


  		





  12
  
  
    
CONFIG_USB_UHCI=y


  		





  13
  12
  
    
CONFIG_FDC=y


  		





  14
  13
  
    
CONFIG_ACPI=y


  		





  15
  14
  
    
CONFIG_APM=y


  		





  ......




  22
  21
  
    
CONFIG_NE2000_ISA=y


  		





  23
  22
  
    
CONFIG_PIIX_PCI=y


  		





  24
  23
  
    
CONFIG_SOUND=y


  		





  25
  
  
    
CONFIG_VIRTIO_PCI=y


  		












Also available in:
  Unified diff