make qemu configurable for Kconfig
v2 cover make qemu configurable for Kconfig
This patch set is part of Kconfig task, and our target is to make all platform's code file configurable for Kconfig, which is suitable for add "config XXX" for all platforms.
As for Kconfig patch set(RFC v5), please ref below thread:
http://lists.nongnu.org/archive/html/qemu-devel/2019-01/msg06466.html
Paolo and Thomas, i will have 9 days leave for Chinese new year from next Monday, please help me take care this patch set and Kconfig patch set. Many thanks!
The change list:
v1 --->v2
patch 7 : change the commit message for CONFIG_ARM_VIRT.(Thomas Huth)
non-rfc v5 --> v1:
patch 1 : update the commit message(Thomas Huth)
patch 2 : add ioport.o to ide isa and ide piix(Thomas Huth) patch 7 : CONFIG_ARM_VIRT to replace CONFIG_VIRT(Thomas Huth) patch 13: CONFIG_S390_CCW_VIRTIO is only for s390-virtio-ccw.o(Thomas Huth) patch 23: CONFIG_MOXIESIM to replace CONFIG_MOXIE(Thomas Huth) patch 24: CONFIG_OR1K_SIM to replace CONFIG_OPENRISC(Thomas Huth)
Paolo Bonzini (8):
arm: disable CONFIG_SERIAL_ISA
ide: split ioport registration to a separate file
vfio: move conditional up to hw/Makefile.objs
build: actually use CONFIG_PAM
hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards
and devices
hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and
ACPI controller
hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and
PCI
Yang Zhong (11):
hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS hw/arm/Makefile.objs: CONFIG_ARM_VIRT created for virt board hw/nios2/Makefile.objs: Conditionally build nios2 hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 hw/alpha/Makefile.objs: Create CONFIG_* for alpha hw/cris/Makefile.objs: Create CONFIG_* for cris hw/hppa/Makefile.objs: Create CONFIG_* for hppa hw/moxie/Makefile.objs: Conditionally build moxie hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc hw/tricore/Makefile.objs: Create CONFIG_* for tricore
Ákos Kovács (8):
hw/m68k/Makefile.objs: Conditionally build boards hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx
boards
hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards
and device
hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga
conditionally
default-configs/alpha-softmmu.mak | 1 + default-configs/arm-softmmu.mak | 9 ++-- default-configs/cris-softmmu.mak | 1 + default-configs/hppa-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 7 ++- default-configs/m68k-softmmu.mak | 2 + default-configs/microblaze-softmmu.mak | 3 ++ default-configs/mips-softmmu-common.mak | 5 ++ default-configs/mips64el-softmmu.mak | 2 +- default-configs/moxie-softmmu.mak | 1 + default-configs/nios2-softmmu.mak | 1 + default-configs/or1k-softmmu.mak | 1 + default-configs/pci.mak | 4 +- default-configs/ppc-softmmu.mak | 8 ++- default-configs/ppc64-softmmu.mak | 1 + default-configs/riscv32-softmmu.mak | 9 +++- default-configs/riscv64-softmmu.mak | 9 +++- default-configs/s390x-softmmu.mak | 6 ++- default-configs/sh4-softmmu.mak | 2 + default-configs/sh4eb-softmmu.mak | 2 + default-configs/sparc-softmmu.mak | 2 + default-configs/sparc64-softmmu.mak | 2 + default-configs/tricore-softmmu.mak | 1 + default-configs/xtensa-softmmu.mak | 3 ++ default-configs/xtensaeb-softmmu.mak | 3 ++ hw/Makefile.objs | 2 +- hw/alpha/Makefile.objs | 2 +- hw/arm/Makefile.objs | 3 +- hw/cris/Makefile.objs | 2 +- hw/hppa/Makefile.objs | 2 +- hw/i2c/Makefile.objs | 5 +- hw/i386/Makefile.objs | 4 +- hw/ide/Makefile.objs | 4 +- hw/ide/core.c | 25 ---------- hw/ide/ioport.c | 66 +++++++++++++++++++++++++ hw/lm32/Makefile.objs | 4 +- hw/m68k/Makefile.objs | 4 +- hw/microblaze/Makefile.objs | 6 +-- hw/mips/Makefile.objs | 5 +- hw/moxie/Makefile.objs | 2 +- hw/net/Makefile.objs | 4 +- hw/nios2/Makefile.objs | 3 +- hw/openrisc/Makefile.objs | 2 +- hw/pci-host/Makefile.objs | 10 ++-- hw/ppc/Makefile.objs | 11 +++-- hw/riscv/Makefile.objs | 22 ++++----- hw/s390x/Makefile.objs | 2 +- hw/sh4/Makefile.objs | 4 +- hw/sparc/Makefile.objs | 4 +- hw/sparc64/Makefile.objs | 6 +-- hw/tricore/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 9 ++-- hw/xtensa/Makefile.objs | 4 +- 53 files changed, 208 insertions(+), 97 deletions(-) create mode 100644 hw/ide/ioport.c
Signature · 1 line
2.17.1
PATCH v2 1/27 arm: disable CONFIG_SERIAL_ISA
From: Paolo Bonzini <[email protected]>
ARM should not have an ISA bus, this device should not be enabled. Kconfig allows to clean up the dependencies and remove CONFIG_ISA_BUS=y from ARM, and then catches a contradiction between the hardcoded CONFIG_SERIAL_ISA=y and CONFIG_ISA_BUS=n.
--- default-configs/arm-softmmu.mak | 1 - 1 file changed, 1 deletion(-)
default-configs/arm-softmmu.mak +0 -1
@@ -6,7 +6,6 @@ CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y -CONFIG_SERIAL_ISA=y CONFIG_PTIMER=y CONFIG_SD=y CONFIG_MAX7310=y
Signature · 1 line
2.17.1
PATCH v2 2/27 ide: split ioport registration to a separate file
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
This is not needed on ARM, and brings in ISA bus code which is otherwise not necessary.
--- hw/ide/Makefile.objs | 4 +-- hw/ide/core.c | 25 ----------------- hw/ide/ioport.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 27 deletions(-) create mode 100644 hw/ide/ioport.c
hw/ide/Makefile.objs +2 -2
@@ -1,8 +1,8 @@ common-obj-$(CONFIG_IDE_CORE) += core.o atapi.o common-obj-$(CONFIG_IDE_QDEV) += qdev.o common-obj-$(CONFIG_IDE_PCI) += pci.o -common-obj-$(CONFIG_IDE_ISA) += isa.o -common-obj-$(CONFIG_IDE_PIIX) += piix.o +common-obj-$(CONFIG_IDE_ISA) += isa.o ioport.o +common-obj-$(CONFIG_IDE_PIIX) += piix.o ioport.o common-obj-$(CONFIG_IDE_CMD646) += cmd646.o common-obj-$(CONFIG_IDE_MACIO) += macio.o common-obj-$(CONFIG_IDE_MMIO) += mmio.o
hw/ide/core.c +0 -25
@@ -2686,31 +2686,6 @@ void ide_exit(IDEState *s)qemu_vfree (s->io_buffer); } -static const MemoryRegionPortio ide_portio_list[] = { - {0 ,8 ,1 , .read = ide_ioport_read, .write = ide_ioport_write }, - {0 ,1 ,2 , .read = ide_data_readw, .write = ide_data_writew }, - {0 ,1 ,4 , .read = ide_data_readl, .write = ide_data_writel }, -PORTIO_END_OF_LIST (), -}; - -static const MemoryRegionPortio ide_portio2_list[] = { - {0 ,1 ,1 , .read = ide_status_read, .write = ide_cmd_write }, -PORTIO_END_OF_LIST (), -}; - -void ide_init_ioport (IDEBus *bus,ISADevice *dev,int iobase,int iobase2) -{ -/* ??? Assume only ISA and PCI configurations, and that the PCI-ISA -bridge has been setup properly to always register with ISA. */ -isa_register_portio_list (dev, &bus->portio_list, - iobase, ide_portio_list, bus,"ide" ); - -if (iobase2) { -isa_register_portio_list (dev, &bus->portio2_list, - iobase2, ide_portio2_list, bus,"ide" ); - } -} -static bool is_identify_set (void *opaque,int version_id) {IDEState *s = opaque;
hw/ide/ioport.c new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 3/27 vfio: move conditional up to hw/Makefile.objs
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
Instead of wrapping the entire Makefile.objs with an ifeq/endif, just include the directory only for Linux.
--- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
hw/Makefile.objs +1 -1
@@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ devices-dirs-$(CONFIG_SOFTMMU) += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-$(CONFIG_SOFTMMU) += usb/ -devices-dirs-$(CONFIG_SOFTMMU) += vfio/ +devices-dirs-$(CONFIG_LINUX) += vfio/ devices-dirs-$(CONFIG_SOFTMMU) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/
hw/vfio/Makefile.objs +0 -2
@@ -1,4 +1,3 @@ -ifeq ($(CONFIG_LINUX), y) obj-$(CONFIG_SOFTMMU) += common.o obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) += ccw.o
@@ -7,4 +6,3 @@ obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o obj-$(CONFIG_SOFTMMU) += spapr.o obj-$(CONFIG_VFIO_AP) += ap.o -endif
Signature · 1 line
2.17.1
PATCH v2 4/27 hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS
In reply to Yang ZhongChange the CONFIGs for PCI EXPRESS and make module name more clear for code files.
--- default-configs/arm-softmmu.mak | 4 ++-- default-configs/i386-softmmu.mak | 2 +- default-configs/mips64el-softmmu.mak | 2 +- default-configs/pci.mak | 2 +- default-configs/riscv32-softmmu.mak | 2 +- default-configs/riscv64-softmmu.mak | 2 +- hw/net/Makefile.objs | 4 ++-- hw/pci-host/Makefile.objs | 8 ++++---- 8 files changed, 13 insertions(+), 13 deletions(-)
default-configs/arm-softmmu.mak +2 -2
@@ -123,7 +123,7 @@ CONFIG_VERSATILE=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y -CONFIG_PCI_GENERIC=y +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VFIO_XGMAC=y CONFIG_VFIO_AMD_XGBE=y
@@ -154,7 +154,7 @@ CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y CONFIG_XILINX_AXI=y -CONFIG_PCI_DESIGNWARE=y +CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y CONFIG_HIGHBANK=y
default-configs/i386-softmmu.mak +1 -1
@@ -47,7 +47,7 @@ CONFIG_ISA_TESTDEV=y CONFIG_VMPORT=y CONFIG_SGA=y CONFIG_LPC_ICH9=y -CONFIG_PCI_Q35=y +CONFIG_PCI_EXPRESS_Q35=y CONFIG_APIC=y CONFIG_IOAPIC=y CONFIG_PVPANIC=y
default-configs/mips64el-softmmu.mak +1 -1
@@ -12,4 +12,4 @@ CONFIG_JAZZ_LED=y CONFIG_VT82C686=y CONFIG_MIPS_BOSTON=y CONFIG_FITLOADER=y -CONFIG_PCI_XILINX=y +CONFIG_PCI_EXPRESS_XILINX=y
default-configs/pci.mak +1 -1
@@ -22,7 +22,7 @@ CONFIG_MEGASAS_SCSI_PCI=y CONFIG_MPTSAS_SCSI_PCI=y CONFIG_RTL8139_PCI=y CONFIG_E1000_PCI=y -CONFIG_E1000E_PCI=y +CONFIG_E1000E_PCI_EXPRESS=y CONFIG_IDE_CORE=y CONFIG_IDE_QDEV=y CONFIG_IDE_PCI=y
default-configs/riscv32-softmmu.mak +1 -1
@@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_CADENCE=y -CONFIG_PCI_GENERIC=y +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y
default-configs/riscv64-softmmu.mak +1 -1
@@ -8,7 +8,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_CADENCE=y -CONFIG_PCI_GENERIC=y +CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y
hw/net/Makefile.objs +2 -2
@@ -7,8 +7,8 @@ common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o common-obj-$(CONFIG_PCNET_PCI) += pcnet-pci.o common-obj-$(CONFIG_PCNET_COMMON) += pcnet.o common-obj-$(CONFIG_E1000_PCI) += e1000.o e1000x_common.o -common-obj-$(CONFIG_E1000E_PCI) += net_tx_pkt.o net_rx_pkt.o -common-obj-$(CONFIG_E1000E_PCI) += e1000e.o e1000e_core.o e1000x_common.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += net_tx_pkt.o net_rx_pkt.o +common-obj-$(CONFIG_E1000E_PCI_EXPRESS) += e1000e.o e1000e_core.o e1000x_common.o common-obj-$(CONFIG_RTL8139_PCI) += rtl8139.o common-obj-$(CONFIG_VMXNET3_PCI) += net_tx_pkt.o net_rx_pkt.o common-obj-$(CONFIG_VMXNET3_PCI) += vmxnet3.o
hw/pci-host/Makefile.objs +4 -4
@@ -14,8 +14,8 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o common-obj-$(CONFIG_FULONG) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o -common-obj-$(CONFIG_PCI_Q35) += q35.o -common-obj-$(CONFIG_PCI_GENERIC) += gpex.o -common-obj-$(CONFIG_PCI_XILINX) += xilinx-pcie.o +common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o +common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o +common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o -common-obj-$(CONFIG_PCI_DESIGNWARE) += designware.o +common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) += designware.o
Signature · 1 line
2.17.1
PATCH v2 5/27 build: actually use CONFIG_PAM
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
Do not link it unconditionally into all binaries.
--- default-configs/i386-softmmu.mak | 1 + hw/pci-host/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/i386-softmmu.mak +1 -0
@@ -67,3 +67,4 @@ CONFIG_I2C=y CONFIG_SEV=$(CONFIG_KVM) CONFIG_VTD=y CONFIG_AMD_IOMMU=y +CONFIG_PAM=y
hw/pci-host/Makefile.objs +1 -1
@@ -1,4 +1,4 @@ -common-obj-y += pam.o +common-obj-$(CONFIG_PAM) += pam.o # PPC devices common-obj-$(CONFIG_PREP_PCI) += prep.o
Signature · 1 line
2.17.1
PATCH v2 6/27 hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
CONFIG_PIIX and CONFIG_Q35 created for the pc board object files. These are enabled automatically at default-configs/i386-softmmu.mak and default-configs/x86_64-softmmu.mak
--- default-configs/i386-softmmu.mak | 2 ++ hw/i386/Makefile.objs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
default-configs/i386-softmmu.mak +2 -0
@@ -68,3 +68,5 @@ CONFIG_SEV=$(CONFIG_KVM) CONFIG_VTD=y CONFIG_AMD_IOMMU=y CONFIG_PAM=y +CONFIG_I440FX=y +CONFIG_Q35=y
hw/i386/Makefile.objs +3 -1
@@ -1,6 +1,8 @@ obj-$(CONFIG_KVM) += kvm/ obj-y += multiboot.o -obj-y += pc.o pc_piix.o pc_q35.o +obj-y += pc.o +obj-$(CONFIG_I440FX) += pc_piix.o +obj-$(CONFIG_Q35) += pc_q35.o obj-y += pc_sysfw.o obj-$(CONFIG_VTD) += x86-iommu.o intel_iommu.o obj-$(CONFIG_AMD_IOMMU) += x86-iommu.o amd_iommu.o
Signature · 1 line
2.17.1
PATCH v2 7/27 hw/arm/Makefile.objs: CONFIG_ARM_VIRT created for virt board
In reply to Yang ZhongMake ARM virt code configurable and the new CONFIG_ARM_VIRT definitions added to the default-configs/arm-softmmu.mak.
--- default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
default-configs/arm-softmmu.mak +1 -0
@@ -148,6 +148,7 @@ CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y CONFIG_ACPI=y +CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=y CONFIG_GPIO_KEY=y
hw/arm/Makefile.objs +2 -1
@@ -1,4 +1,5 @@ -obj-y += boot.o virt.o sysbus-fdt.o +obj-y += boot.o sysbus-fdt.o +obj-$(CONFIG_ARM_VIRT) += virt.o obj-$(CONFIG_ACPI) += virt-acpi-build.o obj-$(CONFIG_DIGIC) += digic_boards.o obj-$(CONFIG_EXYNOS4) += exynos4_boards.o
Signature · 1 line
2.17.1
PATCH v2 8/27 hw/m68k/Makefile.objs: Conditionally build boards
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
CONFIG_AN5206, CONFIG_MCF5206 and CONFIG_MCF5208 make variables created for m68k boards, and added to default-configs/m86k-softmmu.mak.
--- default-configs/m68k-softmmu.mak | 2 ++ hw/m68k/Makefile.objs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
default-configs/m68k-softmmu.mak +2 -0
@@ -2,3 +2,5 @@ CONFIG_COLDFIRE=y CONFIG_PTIMER=y +CONFIG_AN5206=y +CONFIG_MCF5208=y
hw/m68k/Makefile.objs +2 -2
@@ -1,2 +1,2 @@ -obj-y += an5206.o mcf5208.o -obj-y += mcf5206.o mcf_intc.o +obj-$(CONFIG_AN5206) += an5206.o mcf5206.o +obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o
Signature · 1 line
2.17.1
PATCH v2 9/27 hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
CONFIG_PETALOGIX_* and CONFIG_XLNX_* configs added to default-configs/microblaze-softmmu.mak and default-configs/microblazeel-softmmu.mak.
--- default-configs/microblaze-softmmu.mak | 3 +++ hw/microblaze/Makefile.objs | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
default-configs/microblaze-softmmu.mak +3 -0
@@ -10,3 +10,6 @@ CONFIG_XILINX_ETHLITE=y CONFIG_SSI=y CONFIG_SSI_M25P80=y CONFIG_XLNX_ZYNQMP=y +CONFIG_PETALOGIX_S3ADSP1800=y +CONFIG_PETALOGIX_ML605=y +CONFIG_XLNX_ZYNQMP_PMU=y
hw/microblaze/Makefile.objs +3 -3
@@ -1,4 +1,4 @@ -obj-y += petalogix_s3adsp1800_mmu.o -obj-y += petalogix_ml605_mmu.o -obj-y += xlnx-zynqmp-pmu.o +obj-$(CONFIG_PETALOGIX_S3ADSP1800) += petalogix_s3adsp1800_mmu.o +obj-$(CONFIG_PETALOGIX_ML605) += petalogix_ml605_mmu.o +obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-zynqmp-pmu.o obj-y += boot.o
Signature · 1 line
2.17.1
PATCH v2 10/27 hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
Add the new configs to default-configs/mips*-sofmmu.mak.
--- default-configs/mips-softmmu-common.mak | 3 +++ hw/mips/Makefile.objs | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)
default-configs/mips-softmmu-common.mak +3 -0
@@ -36,3 +36,6 @@ CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_I2C=y +CONFIG_R4K=y +CONFIG_MALTA=y +CONFIG_MIPSSIM=y
hw/mips/Makefile.objs +3 -2
@@ -1,7 +1,8 @@ -obj-y += mips_r4k.o mips_malta.o mips_mipssim.o obj-y += addr.o mips_int.o +obj-$(CONFIG_R4K) += mips_r4k.o +obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o +obj-$(CONFIG_MIPSSIM) += mips_mipssim.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o -obj-y += gt64xxx_pci.o obj-$(CONFIG_MIPS_CPS) += cps.o obj-$(CONFIG_MIPS_BOSTON) += boston.o
Signature · 1 line
2.17.1
PATCH v2 11/27 hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_*
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD and CONFIG_VIRTEX configuration options created for default-configs/ppc*-softmmu.mak.
--- default-configs/ppc-softmmu.mak | 7 ++++++- hw/ppc/Makefile.objs | 11 ++++++----- 2 files changed, 12 insertions(+), 6 deletions(-)
default-configs/ppc-softmmu.mak +6 -1
@@ -21,6 +21,10 @@ CONFIG_E500=y CONFIG_OPENPIC_KVM=$(call land,$(CONFIG_E500),$(CONFIG_KVM)) CONFIG_PLATFORM_BUS=y CONFIG_ETSEC=y +CONFIG_PPC405=y +CONFIG_PPC440=y +CONFIG_VIRTEX=y + # For Sam460ex CONFIG_SAM460EX=y CONFIG_USB_EHCI_SYSBUS=y
@@ -34,7 +38,6 @@ CONFIG_M41T80=y CONFIG_VGA_CIRRUS=y # For Macs -CONFIG_MAC=y CONFIG_ESCC=y CONFIG_MACIO=y CONFIG_MACIO_GPIO=y
@@ -50,6 +53,8 @@ CONFIG_GRACKLE_PCI=y CONFIG_UNIN_PCI=y CONFIG_DEC_PCI=y CONFIG_IDE_MACIO=y +CONFIG_MAC_OLDWORLD=y +CONFIG_MAC_NEWWORLD=y # For PReP CONFIG_PREP=y
hw/ppc/Makefile.objs +6 -5
@@ -14,19 +14,20 @@ endif obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o # PowerPC 4xx boards obj-y += ppc4xx_devs.o ppc405_uc.o -obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc405_boards.o -obj-$(CONFIG_PPC4XX) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o +obj-$(CONFIG_PPC405) += ppc405_boards.o +obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o +obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o obj-$(CONFIG_SAM460EX) += sam460ex.o # PReP obj-$(CONFIG_PREP) += prep.o obj-$(CONFIG_PREP) += prep_systemio.o obj-${CONFIG_RS6000_MC} += rs6000_mc.o # OldWorld PowerMac -obj-$(CONFIG_MAC) += mac_oldworld.o +obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o # NewWorld PowerMac -obj-$(CONFIG_MAC) += mac_newworld.o +obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o # e500 obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. -obj-$(CONFIG_XILINX) += virtex_ml507.o +obj-$(CONFIG_VIRTEX) += virtex_ml507.o
Signature · 1 line
2.17.1
PATCH v2 12/27 hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
Make hw/sh4 configurable and add new CONFIG_* to the default-configs/sh4*-softmmu.mak.
--- default-configs/sh4-softmmu.mak | 2 ++ default-configs/sh4eb-softmmu.mak | 2 ++ hw/sh4/Makefile.objs | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-)
default-configs/sh4-softmmu.mak +2 -0
@@ -19,3 +19,5 @@ CONFIG_PCSPK=y CONFIG_I82374=y CONFIG_I8257=y CONFIG_MC146818RTC=y +CONFIG_R2D=y +CONFIG_SHIX=y
default-configs/sh4eb-softmmu.mak +2 -0
@@ -19,3 +19,5 @@ CONFIG_PCSPK=y CONFIG_I82374=y CONFIG_I8257=y CONFIG_MC146818RTC=y +CONFIG_R2D=y +CONFIG_SHIX=y
hw/sh4/Makefile.objs +2 -2
@@ -1,4 +1,4 @@ -obj-y += shix.o r2d.o - obj-y += sh7750.o sh7750_regnames.o obj-y += sh_pci.o +obj-$(CONFIG_R2D) += r2d.o +obj-$(CONFIG_SHIX) += shix.o
Signature · 1 line
2.17.1
PATCH v2 13/27 hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
Make hw/s390x configurable and add new CONFIG_* to the default-configs/s390x*-softmmu.mak. This will be used to enable/disable vfio-ccw.
--- default-configs/s390x-softmmu.mak | 1 + hw/s390x/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/s390x-softmmu.mak +1 -0
@@ -8,3 +8,4 @@ CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y CONFIG_VFIO_AP=$(CONFIG_LINUX) +CONFIG_S390_CCW_VIRTIO=y
hw/s390x/Makefile.objs +1 -1
@@ -5,7 +5,7 @@ obj-y += sclpquiesce.o obj-y += sclpcpu.o obj-y += ipl.o obj-y += css.o -obj-y += s390-virtio-ccw.o +obj-$(CONFIG_S390_CCW_VIRTIO) += s390-virtio-ccw.o obj-y += 3270-ccw.o obj-y += virtio-ccw.o obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o
Signature · 1 line
2.17.1
PATCH v2 14/27 hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
CONFIG_LEON3 added to default-configs/sparc-softmmu.mak.
--- default-configs/sparc-softmmu.mak | 2 ++ hw/sparc/Makefile.objs | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-)
default-configs/sparc-softmmu.mak +2 -0
@@ -18,4 +18,6 @@ CONFIG_CS4231=y CONFIG_GRLIB=y CONFIG_STP2000=y CONFIG_ECCMEMCTL=y + CONFIG_SUN4M=y +CONFIG_LEON3=y
hw/sparc/Makefile.objs +3 -1
@@ -1 +1,3 @@ -obj-y += sun4m_iommu.o sun4m.o leon3.o +obj-$(CONFIG_SUN4M) += sun4m_iommu.o +obj-$(CONFIG_SUN4M) += sun4m.o +obj-$(CONFIG_LEON3) += leon3.o
Signature · 1 line
2.17.1
PATCH v2 15/27 hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
CONFIG_LM32 and CONFIG_MILKYMIST added for lm32 and milkmyst build.
--- hw/lm32/Makefile.objs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/lm32/Makefile.objs +2 -2
@@ -1,3 +1,3 @@ # LM32 boards -obj-y += lm32_boards.o -obj-y += milkymist.o +obj-$(CONFIG_LM32) += lm32_boards.o +obj-$(CONFIG_MILKYMIST) += milkymist.o
Signature · 1 line
2.17.1
PATCH v2 16/27 hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally
In reply to Yang ZhongFrom: Ákos Kovács <[email protected]>
Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak.
--- default-configs/xtensa-softmmu.mak | 3 +++ default-configs/xtensaeb-softmmu.mak | 3 +++ hw/xtensa/Makefile.objs | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-)
default-configs/xtensa-softmmu.mak +3 -0
@@ -3,3 +3,6 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_PFLASH_CFI01=y + +CONFIG_XTENSA_SIM=y +CONFIG_XTENSA_FPGA=y
default-configs/xtensaeb-softmmu.mak +3 -0
@@ -3,3 +3,6 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_PFLASH_CFI01=y + +CONFIG_XTENSA_SIM=y +CONFIG_XTENSA_FPGA=y
hw/xtensa/Makefile.objs +2 -2
@@ -1,4 +1,4 @@ obj-y += pic_cpu.o -obj-y += sim.o obj-y += xtensa_memory.o -obj-y += xtfpga.o +obj-$(CONFIG_XTENSA_SIM) += sim.o +obj-$(CONFIG_XTENSA_FPGA) += xtfpga.o
Signature · 1 line
2.17.1
PATCH v2 17/27 hw/nios2/Makefile.objs: Conditionally build nios2
In reply to Yang ZhongCONFIG_NIOS2_10M50 added for 10m50 dev board.
--- default-configs/nios2-softmmu.mak | 1 + hw/nios2/Makefile.objs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
default-configs/nios2-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_NIOS2=y CONFIG_SERIAL=y CONFIG_PTIMER=y CONFIG_ALTERA_TIMER=y +CONFIG_NIOS2_10M50=y
hw/nios2/Makefile.objs +2 -1
@@ -1 +1,2 @@ -obj-y = boot.o cpu_pic.o 10m50_devboard.o +obj-y = boot.o cpu_pic.o +obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o
Signature · 1 line
2.17.1
PATCH v2 18/27 hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards
In reply to Yang ZhongAdd the new configs to default-configs/riscv*-sofmmu.mak.
--- default-configs/riscv32-softmmu.mak | 7 +++++++ default-configs/riscv64-softmmu.mak | 7 +++++++ hw/riscv/Makefile.objs | 22 +++++++++++----------- 3 files changed, 25 insertions(+), 11 deletions(-)
default-configs/riscv32-softmmu.mak +7 -0
@@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y + +CONFIG_SPIKE=y +CONFIG_HART=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y
default-configs/riscv64-softmmu.mak +7 -0
@@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y + +CONFIG_SPIKE=y +CONFIG_HART=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y
hw/riscv/Makefile.objs +11 -11
@@ -1,11 +1,11 @@ -obj-y += riscv_htif.o -obj-y += riscv_hart.o -obj-y += sifive_e.o -obj-y += sifive_clint.o -obj-y += sifive_prci.o -obj-y += sifive_plic.o -obj-y += sifive_test.o -obj-y += sifive_u.o -obj-y += sifive_uart.o -obj-y += spike.o -obj-y += virt.o +obj-$(CONFIG_SPIKE) += riscv_htif.o +obj-$(CONFIG_HART) += riscv_hart.o +obj-$(CONFIG_SIFIVE_E) += sifive_e.o +obj-$(CONFIG_SIFIVE) += sifive_clint.o +obj-$(CONFIG_SIFIVE) += sifive_prci.o +obj-$(CONFIG_SIFIVE) += sifive_plic.o +obj-$(CONFIG_SIFIVE) += sifive_test.o +obj-$(CONFIG_SIFIVE_U) += sifive_u.o +obj-$(CONFIG_SIFIVE) += sifive_uart.o +obj-$(CONFIG_SPIKE) += spike.o +obj-$(CONFIG_RISCV_VIRT) += virt.o
Signature · 1 line
2.17.1
PATCH v2 19/27 hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64
In reply to Yang ZhongAdd the new configs to default-configs/sparc64-sofmmu.mak.
--- default-configs/sparc64-softmmu.mak | 2 ++ hw/sparc64/Makefile.objs | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-)
default-configs/sparc64-softmmu.mak +2 -0
@@ -17,3 +17,5 @@ CONFIG_SUNHME=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_SUN4V_RTC=y +CONFIG_SUN4U=y +CONFIG_NIAGARA=y
hw/sparc64/Makefile.objs +3 -3
@@ -1,4 +1,4 @@ obj-y += sparc64.o -obj-y += sun4u_iommu.o -obj-y += sun4u.o -obj-y += niagara.o +obj-$(CONFIG_SUN4U) += sun4u_iommu.o +obj-$(CONFIG_SUN4U) += sun4u.o +obj-$(CONFIG_NIAGARA) += niagara.o
Signature · 1 line
2.17.1
PATCH v2 20/27 hw/alpha/Makefile.objs: Create CONFIG_* for alpha
In reply to Yang ZhongAdd the new configs to default-configs/alpha-sofmmu.mak.
--- default-configs/alpha-softmmu.mak | 1 + hw/alpha/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/alpha-softmmu.mak +1 -0
@@ -19,3 +19,4 @@ CONFIG_I8259=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y CONFIG_SMC37C669=y +CONFIG_DP264=y
hw/alpha/Makefile.objs +1 -1
@@ -1 +1 @@ -obj-y += dp264.o pci.o typhoon.o +obj-$(CONFIG_DP264) += dp264.o pci.o typhoon.o
Signature · 1 line
2.17.1
PATCH v2 21/27 hw/cris/Makefile.objs: Create CONFIG_* for cris
In reply to Yang ZhongAdd the new configs to default-configs/cris-sofmmu.mak.
--- default-configs/cris-softmmu.mak | 1 + hw/cris/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/cris-softmmu.mak +1 -0
@@ -4,3 +4,4 @@ CONFIG_ETRAXFS=y CONFIG_NAND=y CONFIG_PTIMER=y CONFIG_PFLASH_CFI02=y +CONFIG_AXIS=y
hw/cris/Makefile.objs +1 -1
@@ -1,2 +1,2 @@ obj-y += boot.o -obj-y += axis_dev88.o +obj-$(CONFIG_AXIS) += axis_dev88.o
Signature · 1 line
2.17.1
PATCH v2 22/27 hw/hppa/Makefile.objs: Create CONFIG_* for hppa
In reply to Yang ZhongAdd the new configs to default-configs/hppa-sofmmu.mak.
--- default-configs/hppa-softmmu.mak | 1 + hw/hppa/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/hppa-softmmu.mak +1 -0
@@ -10,3 +10,4 @@ CONFIG_IDE_CMD646=y # CONFIG_IDE_MMIO=y CONFIG_VIRTIO_VGA=y CONFIG_MC146818RTC=y +CONFIG_DINO=y
hw/hppa/Makefile.objs +1 -1
@@ -1 +1 @@ -obj-y += machine.o pci.o dino.o +obj-$(CONFIG_DINO) += pci.o machine.o dino.o
Signature · 1 line
2.17.1
PATCH v2 23/27 hw/moxie/Makefile.objs: Conditionally build moxie
In reply to Yang ZhongCONFIG_MOXIE added for moxiesim board.
--- default-configs/moxie-softmmu.mak | 1 + hw/moxie/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/moxie-softmmu.mak +1 -0
@@ -5,3 +5,4 @@ CONFIG_MC146818RTC=y CONFIG_SERIAL=y CONFIG_SERIAL_ISA=y CONFIG_VGA=y +CONFIG_MOXIESIM=y
hw/moxie/Makefile.objs +1 -1
@@ -1,2 +1,2 @@ # moxie boards -obj-y += moxiesim.o +obj-$(CONFIG_MOXIESIM) += moxiesim.o
Signature · 1 line
2.17.1
PATCH v2 24/27 hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc
In reply to Yang ZhongAdd the new configs to default-configs/or1k-sofmmu.mak.
--- default-configs/or1k-softmmu.mak | 1 + hw/openrisc/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/or1k-softmmu.mak +1 -0
@@ -3,3 +3,4 @@ CONFIG_SERIAL=y CONFIG_OPENCORES_ETH=y CONFIG_OMPIC=y +CONFIG_OR1K_SIM=y
hw/openrisc/Makefile.objs +1 -1
@@ -1,2 +1,2 @@ obj-y = pic_cpu.o cputimer.o -obj-y += openrisc_sim.o +obj-$(CONFIG_OR1K_SIM) += openrisc_sim.o
Signature · 1 line
2.17.1
PATCH v2 25/27 hw/tricore/Makefile.objs: Create CONFIG_* for tricore
In reply to Yang ZhongAdd the new configs to default-configs/tricore-sofmmu.mak.
--- default-configs/tricore-softmmu.mak | 1 + hw/tricore/Makefile.objs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/tricore-softmmu.mak +1 -0
@@ -0,0 +1 @@ +CONFIG_TRICORE=y
hw/tricore/Makefile.objs +1 -1
@@ -1 +1 @@ -obj-y += tricore_testboard.o +obj-$(CONFIG_TRICORE) += tricore_testboard.o
Signature · 1 line
2.17.1
PATCH v2 26/27 hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
Create separate variables for these components, they are used in many boards but not all. This allows finer-grain selection of the included code with default-configs/*.mak.
--- default-configs/arm-softmmu.mak | 1 + default-configs/i386-softmmu.mak | 2 ++ default-configs/mips-softmmu-common.mak | 2 ++ default-configs/ppc-softmmu.mak | 1 + hw/i2c/Makefile.objs | 5 +++-- 5 files changed, 9 insertions(+), 2 deletions(-)
default-configs/arm-softmmu.mak +1 -0
@@ -151,6 +151,7 @@ CONFIG_ACPI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y CONFIG_ASPEED_SOC=y +CONFIG_SMBUS_EEPROM=y CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y
default-configs/i386-softmmu.mak +2 -0
@@ -62,6 +62,8 @@ CONFIG_I82801B11=y CONFIG_SMBIOS=y CONFIG_PXB=y CONFIG_ACPI_VMGENID=y +CONFIG_ACPI_SMBUS=y +CONFIG_SMBUS_EEPROM=y CONFIG_FW_CFG_DMA=y CONFIG_I2C=y CONFIG_SEV=$(CONFIG_KVM)
default-configs/mips-softmmu-common.mak +2 -0
@@ -39,3 +39,5 @@ CONFIG_I2C=y CONFIG_R4K=y CONFIG_MALTA=y CONFIG_MIPSSIM=y +CONFIG_ACPI_SMBUS=y +CONFIG_SMBUS_EEPROM=y
default-configs/ppc-softmmu.mak +1 -0
@@ -36,6 +36,7 @@ CONFIG_AT24C=y CONFIG_BITBANG_I2C=y CONFIG_M41T80=y CONFIG_VGA_CIRRUS=y +CONFIG_SMBUS_EEPROM=y # For Macs CONFIG_ESCC=y
hw/i2c/Makefile.objs +3 -2
@@ -1,8 +1,9 @@ -common-obj-$(CONFIG_I2C) += core.o smbus.o smbus_eeprom.o +common-obj-$(CONFIG_I2C) += core.o smbus.o +common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o common-obj-$(CONFIG_DDC) += i2c-ddc.o common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o common-obj-$(CONFIG_ACPI_X86) += smbus_ich9.o -common-obj-$(CONFIG_APM) += pm_smbus.o +common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
Signature · 1 line
2.17.1
PATCH v2 27/27 hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI
In reply to Yang ZhongFrom: Paolo Bonzini <[email protected]>
Make hw/vfio configurable and add new CONFIG_VFIO_* to the default-configs/s390x*-softmmu.mak. This allow a finer-grain selection of the various VFIO backends.
--- default-configs/arm-softmmu.mak | 2 ++ default-configs/pci.mak | 2 ++ default-configs/ppc64-softmmu.mak | 1 + default-configs/s390x-softmmu.mak | 5 +++-- hw/Makefile.objs | 2 +- hw/vfio/Makefile.objs | 7 +++---- 6 files changed, 12 insertions(+), 7 deletions(-)
default-configs/arm-softmmu.mak +2 -0
@@ -124,6 +124,8 @@ CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y +CONFIG_VFIO=$(CONFIG_LINUX) +CONFIG_VFIO_PLATFORM=y CONFIG_VFIO_XGMAC=y CONFIG_VFIO_AMD_XGBE=y
default-configs/pci.mak +2 -0
@@ -47,3 +47,5 @@ CONFIG_VGA_PCI=y CONFIG_BOCHS_DISPLAY=y CONFIG_IVSHMEM_DEVICE=$(CONFIG_IVSHMEM) CONFIG_ROCKER=y +CONFIG_VFIO=$(CONFIG_LINUX) +CONFIG_VFIO_PCI=y
default-configs/ppc64-softmmu.mak +1 -0
@@ -18,6 +18,7 @@ CONFIG_XICS_SPAPR=$(CONFIG_PSERIES) CONFIG_XICS_KVM=$(call land,$(CONFIG_PSERIES),$(CONFIG_KVM)) CONFIG_XIVE=$(CONFIG_PSERIES) CONFIG_XIVE_SPAPR=$(CONFIG_PSERIES) +CONFIG_VFIO_SPAPR=$(CONFIG_PSERIES) CONFIG_MEM_DEVICE=y CONFIG_DIMM=y CONFIG_SPAPR_RNG=y
default-configs/s390x-softmmu.mak +3 -2
@@ -5,7 +5,8 @@ CONFIG_SCLPCONSOLE=y CONFIG_TERMINAL3270=y CONFIG_S390_FLIC=y CONFIG_S390_FLIC_KVM=$(CONFIG_KVM) -CONFIG_VFIO_CCW=$(CONFIG_LINUX) CONFIG_WDT_DIAG288=y -CONFIG_VFIO_AP=$(CONFIG_LINUX) CONFIG_S390_CCW_VIRTIO=y +CONFIG_VFIO=$(CONFIG_LINUX) +CONFIG_VFIO_CCW=y +CONFIG_VFIO_AP=y
hw/Makefile.objs +1 -1
@@ -30,7 +30,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/ devices-dirs-$(CONFIG_SOFTMMU) += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-$(CONFIG_SOFTMMU) += usb/ -devices-dirs-$(CONFIG_LINUX) += vfio/ +devices-dirs-$(CONFIG_VFIO) += vfio/ devices-dirs-$(CONFIG_SOFTMMU) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += xen/
hw/vfio/Makefile.objs +3 -4
@@ -1,8 +1,7 @@ -obj-$(CONFIG_SOFTMMU) += common.o -obj-$(CONFIG_PCI) += pci.o pci-quirks.o display.o +obj-y += common.o spapr.o +obj-$(CONFIG_VFIO_PCI) += pci.o pci-quirks.o display.o obj-$(CONFIG_VFIO_CCW) += ccw.o -obj-$(CONFIG_SOFTMMU) += platform.o +obj-$(CONFIG_VFIO_PLATFORM) += platform.o obj-$(CONFIG_VFIO_XGMAC) += calxeda-xgmac.o obj-$(CONFIG_VFIO_AMD_XGBE) += amd-xgbe.o -obj-$(CONFIG_SOFTMMU) += spapr.o obj-$(CONFIG_VFIO_AP) += ap.o
Signature · 1 line
2.17.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --python=/usr/bin/python3 --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=2.0
ERROR: unknown option --with-sdlabi=2.0
Try '/tmp/qemu-test/src/configure --help' for more information
# QEMU configure log Sun Feb 3 17:24:49 UTC 2019
# Configured with: '/tmp/qemu-test/src/configure' '--enable-werror' '--target-list=x86_64-softmmu,aarch64-softmmu' '--prefix=/tmp/qemu-test/install' '--python=/usr/bin/python3' '--cross-prefix=x86_64-w64-mingw32-' '--enable-trace-backends=simple' '--enable-gnutls' '--enable-nettle' '--enable-curl' '--enable-vnc' '--enable-bzip2' '--enable-guest-agent' '--with-sdlabi=2.0'
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 634 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.cconfig-temp/qemu-conf.c:2:2: error: #error __linux__ not defined
#error __linux__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 686 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c config-temp/qemu-conf.c:2:2: error: #error __i386__ not defined
#error __i386__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 689 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c config-temp/qemu-conf.c:2:2: error: #error __ILP32__ not defined
#error __ILP32__ not defined
^~~~~
---
lines: 92 128 920 0
x86_64-w64-mingw32-gcc -mthreads -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -o config-temp/qemu-conf.exe config-temp/qemu-conf.c -g -liberty /usr/lib/gcc/x86_64-w64-mingw32/8.2.0/../../../../x86_64-w64-mingw32/bin/ld: cannot find -liberty
collect2: error: ld returned 1 exit status
Failed to run 'configure'
Traceback (most recent call last):
File "./tests/docker/docker.py", line 563, in <module>
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --python=/usr/bin/python3 --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=2.0
ERROR: unknown option --with-sdlabi=2.0
Try '/tmp/qemu-test/src/configure --help' for more information
# QEMU configure log Sun Feb 3 17:52:17 UTC 2019
# Configured with: '/tmp/qemu-test/src/configure' '--enable-werror' '--target-list=x86_64-softmmu,aarch64-softmmu' '--prefix=/tmp/qemu-test/install' '--python=/usr/bin/python3' '--cross-prefix=x86_64-w64-mingw32-' '--enable-trace-backends=simple' '--enable-gnutls' '--enable-nettle' '--enable-curl' '--enable-vnc' '--enable-bzip2' '--enable-guest-agent' '--with-sdlabi=2.0'
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 634 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.cconfig-temp/qemu-conf.c:2:2: error: #error __linux__ not defined
#error __linux__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 686 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c config-temp/qemu-conf.c:2:2: error: #error __i386__ not defined
#error __i386__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 689 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c config-temp/qemu-conf.c:2:2: error: #error __ILP32__ not defined
#error __ILP32__ not defined
^~~~~
---
lines: 92 128 920 0
x86_64-w64-mingw32-gcc -mthreads -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -o config-temp/qemu-conf.exe config-temp/qemu-conf.c -g -liberty /usr/lib/gcc/x86_64-w64-mingw32/8.2.0/../../../../x86_64-w64-mingw32/bin/ld: cannot find -liberty
collect2: error: ld returned 1 exit status
Failed to run 'configure'
Traceback (most recent call last):
File "./tests/docker/docker.py", line 563, in <module>
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]