* [Qemu-devel] [PATCH v1 01/27] arm: disable CONFIG_SERIAL_ISA
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 02/27] ide: split ioport registration to a separate file Yang Zhong
` (25 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
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.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 1 -
1 file changed, 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2420491aac..3c9351f029 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 02/27] ide: split ioport registration to a separate file
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 01/27] arm: disable CONFIG_SERIAL_ISA Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:50 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 03/27] vfio: move conditional up to hw/Makefile.objs Yang Zhong
` (24 subsequent siblings)
26 siblings, 1 reply; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
This is not needed on ARM, and brings in ISA bus code which is otherwise not
necessary.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
index fc328ffbe8..a142add90e 100644
--- a/hw/ide/Makefile.objs
+++ b/hw/ide/Makefile.objs
@@ -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
diff --git a/hw/ide/core.c b/hw/ide/core.c
index c3d779db6e..84832008b8 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -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;
diff --git a/hw/ide/ioport.c b/hw/ide/ioport.c
new file mode 100644
index 0000000000..a0b3c1f6a1
--- /dev/null
+++ b/hw/ide/ioport.c
@@ -0,0 +1,66 @@
+/*
+ * QEMU IDE disk and CD/DVD-ROM Emulator
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/hw.h"
+#include "hw/isa/isa.h"
+#include "qemu/error-report.h"
+#include "qemu/timer.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/dma.h"
+#include "hw/block/block.h"
+#include "sysemu/block-backend.h"
+#include "qapi/error.h"
+#include "qemu/cutils.h"
+#include "sysemu/replay.h"
+
+#include "hw/ide/internal.h"
+#include "trace.h"
+
+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");
+ }
+}
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 03/27] vfio: move conditional up to hw/Makefile.objs
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 01/27] arm: disable CONFIG_SERIAL_ISA Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 02/27] ide: split ioport registration to a separate file Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS Yang Zhong
` (23 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
Instead of wrapping the entire Makefile.objs with an ifeq/endif, just
include the directory only for Linux.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/Makefile.objs | 2 +-
hw/vfio/Makefile.objs | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 39d882af6f..22dd211363 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -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/
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index 8b3f664d85..91805893f7 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (2 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 03/27] vfio: move conditional up to hw/Makefile.objs Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 8:33 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 05/27] build: actually use CONFIG_PAM Yang Zhong
` (22 subsequent siblings)
26 siblings, 1 reply; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Michael S . Tsirkin
Change the CONFIGs for PCI EXPRESS and make module name more
clear for code files.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3c9351f029..107f801367 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -122,7 +122,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
@@ -153,7 +153,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
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 64c998c4c8..2f919df346 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -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
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index c2ae313f47..9eb1208b58 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -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
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 6c7be12779..83738cbb65 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -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
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
index c9c5971409..fbfd1d4e4b 100644
--- a/default-configs/riscv32-softmmu.mak
+++ b/default-configs/riscv32-softmmu.mak
@@ -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
diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
index c9c5971409..fbfd1d4e4b 100644
--- a/default-configs/riscv64-softmmu.mak
+++ b/default-configs/riscv64-softmmu.mak
@@ -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
diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs
index fa461d4463..a43351aa04 100644
--- a/hw/net/Makefile.objs
+++ b/hw/net/Makefile.objs
@@ -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
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
index 6d6597c065..073d5124d1 100644
--- a/hw/pci-host/Makefile.objs
+++ b/hw/pci-host/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS Yang Zhong
@ 2019-01-31 8:33 ` Thomas Huth
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Huth @ 2019-01-31 8:33 UTC (permalink / raw)
To: Yang Zhong, qemu-devel; +Cc: pbonzini, Michael S . Tsirkin
On 2019-01-31 08:32, Yang Zhong wrote:
> Change the CONFIGs for PCI EXPRESS and make module name more
> clear for code files.
>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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(-)
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Qemu-devel] [PATCH v1 05/27] build: actually use CONFIG_PAM
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (3 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 04/27] hw/pci-host/Makefile.objs: make CONFIGS clear for PCI EXPRESS Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 06/27] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards Yang Zhong
` (21 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
Do not link it unconditionally into all binaries.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/i386-softmmu.mak | 1 +
hw/pci-host/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 2f919df346..48da9968cc 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -67,3 +67,4 @@ CONFIG_I2C=y
CONFIG_SEV=$(CONFIG_KVM)
CONFIG_VTD=y
CONFIG_AMD_IOMMU=y
+CONFIG_PAM=y
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
index 073d5124d1..a9cd3e022d 100644
--- a/hw/pci-host/Makefile.objs
+++ b/hw/pci-host/Makefile.objs
@@ -1,4 +1,4 @@
-common-obj-y += pam.o
+common-obj-$(CONFIG_PAM) += pam.o
# PPC devices
common-obj-$(CONFIG_PREP_PCI) += prep.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 06/27] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (4 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 05/27] build: actually use CONFIG_PAM Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Yang Zhong
` (20 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Paolo Bonzini <pbonzini@redhat.com>
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
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/i386-softmmu.mak | 2 ++
hw/i386/Makefile.objs | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 48da9968cc..71c9f6fbcb 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -68,3 +68,5 @@ CONFIG_SEV=$(CONFIG_KVM)
CONFIG_VTD=y
CONFIG_AMD_IOMMU=y
CONFIG_PAM=y
+CONFIG_I440FX=y
+CONFIG_Q35=y
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index fa87a14152..3de7ca2bb9 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (5 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 06/27] hw/i386/Makefile.objs: Build pc_piix* and pc_q35 boards Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 8:36 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 08/27] hw/m68k/Makefile.objs: Conditionally build boards Yang Zhong
` (19 subsequent siblings)
26 siblings, 1 reply; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
make virt code configurable and the new CONFIG_VIRT definitions
added to the default-configs/arm-softmmu.mak to replace CONFIG_ACPI
in arm board.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 1 +
hw/arm/Makefile.objs | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 107f801367..d3fc82256f 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -147,6 +147,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
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 50c7b4a927..dab3f88a7c 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Yang Zhong
@ 2019-01-31 8:36 ` Thomas Huth
2019-01-31 8:40 ` Yang Zhong
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2019-01-31 8:36 UTC (permalink / raw)
To: Yang Zhong, qemu-devel; +Cc: pbonzini
On 2019-01-31 08:32, Yang Zhong wrote:
> make virt code configurable and the new CONFIG_VIRT definitions
> added to the default-configs/arm-softmmu.mak to replace CONFIG_ACPI
> in arm board.
I think the patch description needs a refresh. It's CONFIG_ARM_VIRT now,
and CONFIG_ACPI is not replaced anymore.
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 1 +
> hw/arm/Makefile.objs | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 107f801367..d3fc82256f 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -147,6 +147,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
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 50c7b4a927..dab3f88a7c 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -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
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board
2019-01-31 8:36 ` Thomas Huth
@ 2019-01-31 8:40 ` Yang Zhong
0 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 8:40 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, pbonzini, yang.zhong
On Thu, Jan 31, 2019 at 09:36:01AM +0100, Thomas Huth wrote:
> On 2019-01-31 08:32, Yang Zhong wrote:
> > make virt code configurable and the new CONFIG_VIRT definitions
> > added to the default-configs/arm-softmmu.mak to replace CONFIG_ACPI
> > in arm board.
>
> I think the patch description needs a refresh. It's CONFIG_ARM_VIRT now,
> and CONFIG_ACPI is not replaced anymore.
>
Yes, it's my mistake and i will change this in next version, thanks!
Yang
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Qemu-devel] [PATCH v1 08/27] hw/m68k/Makefile.objs: Conditionally build boards
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (6 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 07/27] hw/arm/Makefile.objs: CONFIG_VIRT created for virt board Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 09/27] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards Yang Zhong
` (18 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
CONFIG_AN5206, CONFIG_MCF5206 and CONFIG_MCF5208 make
variables created for m68k boards, and added to
default-configs/m86k-softmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/m68k-softmmu.mak | 2 ++
hw/m68k/Makefile.objs | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 60f7cdfbf2..27f5274244 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -2,3 +2,5 @@
CONFIG_COLDFIRE=y
CONFIG_PTIMER=y
+CONFIG_AN5206=y
+CONFIG_MCF5208=y
diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
index d1f089c08a..482f8477b4 100644
--- a/hw/m68k/Makefile.objs
+++ b/hw/m68k/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 09/27] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (7 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 08/27] hw/m68k/Makefile.objs: Conditionally build boards Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 10/27] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards Yang Zhong
` (17 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
CONFIG_PETALOGIX_* and CONFIG_XLNX_* configs added to
default-configs/microblaze-softmmu.mak and
default-configs/microblazeel-softmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/microblaze-softmmu.mak | 3 +++
hw/microblaze/Makefile.objs | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index 7fca8e4c99..14837cf74a 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -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
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
index ae9fd40de7..8595a62f6c 100644
--- a/hw/microblaze/Makefile.objs
+++ b/hw/microblaze/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 10/27] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (8 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 09/27] hw/microblaze/Makefile.objs: Create configs for petalogix and xilinx boards Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* Yang Zhong
` (16 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
Add the new configs to default-configs/mips*-sofmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/mips-softmmu-common.mak | 3 +++
hw/mips/Makefile.objs | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index fae2347ee7..479fb4d900 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -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
diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
index 17a311aaba..525809af07 100644
--- a/hw/mips/Makefile.objs
+++ b/hw/mips/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_*
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (9 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 10/27] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 12/27] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device Yang Zhong
` (15 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD
and CONFIG_VIRTEX configuration options created for
default-configs/ppc*-softmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/ppc-softmmu.mak | 7 ++++++-
hw/ppc/Makefile.objs | 11 ++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 23d871fb3e..7f80f0ccba 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -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
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 4e0c1c0941..7d815b7d57 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 12/27] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (10 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 11/27] hw/ppc/Makefile.objs: Build all boards conditinally with CONFIG_* Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices Yang Zhong
` (14 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
Make hw/sh4 configurable and add new CONFIG_* to the
default-configs/sh4*-softmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/sh4-softmmu.mak | 2 ++
default-configs/sh4eb-softmmu.mak | 2 ++
hw/sh4/Makefile.objs | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index caeccd55be..1fdb009151 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -19,3 +19,5 @@ CONFIG_PCSPK=y
CONFIG_I82374=y
CONFIG_I8257=y
CONFIG_MC146818RTC=y
+CONFIG_R2D=y
+CONFIG_SHIX=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 53b9cd7b5a..3b550a5fe8 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -19,3 +19,5 @@ CONFIG_PCSPK=y
CONFIG_I82374=y
CONFIG_I8257=y
CONFIG_MC146818RTC=y
+CONFIG_R2D=y
+CONFIG_SHIX=y
diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs
index 2393702c57..2a707f9473 100644
--- a/hw/sh4/Makefile.objs
+++ b/hw/sh4/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (11 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 12/27] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 8:39 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 14/27] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created Yang Zhong
` (13 subsequent siblings)
26 siblings, 1 reply; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
Make hw/s390x configurable and add new CONFIG_* to the
default-configs/s390x*-softmmu.mak. This will be used to
enable/disable vfio-ccw.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
default-configs/s390x-softmmu.mak | 1 +
hw/s390x/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 5eef375924..8bb7e438c8 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -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
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index ca68806e44..a18c471913 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices Yang Zhong
@ 2019-01-31 8:39 ` Thomas Huth
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Huth @ 2019-01-31 8:39 UTC (permalink / raw)
To: Yang Zhong, qemu-devel; +Cc: pbonzini, qemu-s390x
On 2019-01-31 08:32, Yang Zhong wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
>
> Make hw/s390x configurable and add new CONFIG_* to the
> default-configs/s390x*-softmmu.mak. This will be used to
> enable/disable vfio-ccw.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/s390x-softmmu.mak | 1 +
> hw/s390x/Makefile.objs | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
> index 5eef375924..8bb7e438c8 100644
> --- a/default-configs/s390x-softmmu.mak
> +++ b/default-configs/s390x-softmmu.mak
> @@ -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
> diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
> index ca68806e44..a18c471913 100644
> --- a/hw/s390x/Makefile.objs
> +++ b/hw/s390x/Makefile.objs
> @@ -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
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Qemu-devel] [PATCH v1 14/27] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (12 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 13/27] hw/s390/Makefile.objs: Create new CONFIG_* variables for s390x boards and devices Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 15/27] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst Yang Zhong
` (12 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
CONFIG_LEON3 added to default-configs/sparc-softmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/sparc-softmmu.mak | 2 ++
hw/sparc/Makefile.objs | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 12f97eeb20..59a4a3d693 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -18,4 +18,6 @@ CONFIG_CS4231=y
CONFIG_GRLIB=y
CONFIG_STP2000=y
CONFIG_ECCMEMCTL=y
+
CONFIG_SUN4M=y
+CONFIG_LEON3=y
diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
index e2d0828c39..d57e33f83e 100644
--- a/hw/sparc/Makefile.objs
+++ b/hw/sparc/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 15/27] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (13 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 14/27] hw/sparc/Makefile.objs: CONFIG_* for sun4m and leon3 created Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 16/27] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally Yang Zhong
` (11 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
CONFIG_LM32 and CONFIG_MILKYMIST added for lm32 and milkmyst build.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
hw/lm32/Makefile.objs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index ea6418ae59..c3941866c7 100644
--- a/hw/lm32/Makefile.objs
+++ b/hw/lm32/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 16/27] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (14 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 15/27] hw/lm32/Makefile.objs: Conditionally build lm32 and milkmyst Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 17/27] hw/nios2/Makefile.objs: Conditionally build nios2 Yang Zhong
` (10 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
---
default-configs/xtensa-softmmu.mak | 3 +++
default-configs/xtensaeb-softmmu.mak | 3 +++
hw/xtensa/Makefile.objs | 4 ++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
index 9d8899cde7..baf90ca162 100644
--- a/default-configs/xtensa-softmmu.mak
+++ b/default-configs/xtensa-softmmu.mak
@@ -3,3 +3,6 @@
CONFIG_SERIAL=y
CONFIG_OPENCORES_ETH=y
CONFIG_PFLASH_CFI01=y
+
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_FPGA=y
diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak
index 9d8899cde7..baf90ca162 100644
--- a/default-configs/xtensaeb-softmmu.mak
+++ b/default-configs/xtensaeb-softmmu.mak
@@ -3,3 +3,6 @@
CONFIG_SERIAL=y
CONFIG_OPENCORES_ETH=y
CONFIG_PFLASH_CFI01=y
+
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_FPGA=y
diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
index cb4998d2bf..62e244fa53 100644
--- a/hw/xtensa/Makefile.objs
+++ b/hw/xtensa/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 17/27] hw/nios2/Makefile.objs: Conditionally build nios2
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (15 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 16/27] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Yang Zhong
` (9 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
CONFIG_NIOS2_10M50 added for 10m50 dev board.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/nios2-softmmu.mak | 1 +
hw/nios2/Makefile.objs | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
index 74dc70caae..ab42d0fc28 100644
--- a/default-configs/nios2-softmmu.mak
+++ b/default-configs/nios2-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_NIOS2=y
CONFIG_SERIAL=y
CONFIG_PTIMER=y
CONFIG_ALTERA_TIMER=y
+CONFIG_NIOS2_10M50=y
diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs
index 6b5c421760..89a419a9f5 100644
--- a/hw/nios2/Makefile.objs
+++ b/hw/nios2/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (16 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 17/27] hw/nios2/Makefile.objs: Conditionally build nios2 Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 8:41 ` Thomas Huth
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 19/27] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 Yang Zhong
` (8 subsequent siblings)
26 siblings, 1 reply; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/riscv*-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
default-configs/riscv32-softmmu.mak | 7 +++++++
default-configs/riscv64-softmmu.mak | 7 +++++++
hw/riscv/Makefile.objs | 22 +++++++++++-----------
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
index fbfd1d4e4b..65337166e1 100644
--- a/default-configs/riscv32-softmmu.mak
+++ b/default-configs/riscv32-softmmu.mak
@@ -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
diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
index fbfd1d4e4b..65337166e1 100644
--- a/default-configs/riscv64-softmmu.mak
+++ b/default-configs/riscv64-softmmu.mak
@@ -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
diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs
index 1dde01d39d..79bfb3abf9 100644
--- a/hw/riscv/Makefile.objs
+++ b/hw/riscv/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Yang Zhong
@ 2019-01-31 8:41 ` Thomas Huth
0 siblings, 0 replies; 36+ messages in thread
From: Thomas Huth @ 2019-01-31 8:41 UTC (permalink / raw)
To: Yang Zhong, qemu-devel; +Cc: pbonzini
On 2019-01-31 08:32, Yang Zhong wrote:
> Add the new configs to default-configs/riscv*-sofmmu.mak.
>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> ---
> default-configs/riscv32-softmmu.mak | 7 +++++++
> default-configs/riscv64-softmmu.mak | 7 +++++++
> hw/riscv/Makefile.objs | 22 +++++++++++-----------
> 3 files changed, 25 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak
> index fbfd1d4e4b..65337166e1 100644
> --- a/default-configs/riscv32-softmmu.mak
> +++ b/default-configs/riscv32-softmmu.mak
> @@ -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
> diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak
> index fbfd1d4e4b..65337166e1 100644
> --- a/default-configs/riscv64-softmmu.mak
> +++ b/default-configs/riscv64-softmmu.mak
> @@ -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
> diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs
> index 1dde01d39d..79bfb3abf9 100644
> --- a/hw/riscv/Makefile.objs
> +++ b/hw/riscv/Makefile.objs
> @@ -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
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 36+ messages in thread
* [Qemu-devel] [PATCH v1 19/27] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (17 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 18/27] hw/riscv/Makefile.objs: Create CONFIG_* for riscv boards Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 20/27] hw/alpha/Makefile.objs: Create CONFIG_* for alpha Yang Zhong
` (7 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/sparc64-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/sparc64-softmmu.mak | 2 ++
hw/sparc64/Makefile.objs | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index ce63d47046..1fae4888db 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -17,3 +17,5 @@ CONFIG_SUNHME=y
CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_SUN4V_RTC=y
+CONFIG_SUN4U=y
+CONFIG_NIAGARA=y
diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs
index 117e0ff27d..af0525c1a2 100644
--- a/hw/sparc64/Makefile.objs
+++ b/hw/sparc64/Makefile.objs
@@ -1,4 +1,4 @@
obj-y += sparc64.o
-obj-y += sun4u_iommu.o
-obj-y += sun4u.o
-obj-y += niagara.o
\ No newline at end of file
+obj-$(CONFIG_SUN4U) += sun4u_iommu.o
+obj-$(CONFIG_SUN4U) += sun4u.o
+obj-$(CONFIG_NIAGARA) += niagara.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 20/27] hw/alpha/Makefile.objs: Create CONFIG_* for alpha
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (18 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 19/27] hw/sparc64/Makefile.objs: Create CONFIG_* for sparc64 Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 21/27] hw/cris/Makefile.objs: Create CONFIG_* for cris Yang Zhong
` (6 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/alpha-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
default-configs/alpha-softmmu.mak | 1 +
hw/alpha/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
index 4d654eaa0b..49cb7ce351 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -19,3 +19,4 @@ CONFIG_I8259=y
CONFIG_MC146818RTC=y
CONFIG_ISA_TESTDEV=y
CONFIG_SMC37C669=y
+CONFIG_DP264=y
diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs
index 5c742756f0..62fdf3edec 100644
--- a/hw/alpha/Makefile.objs
+++ b/hw/alpha/Makefile.objs
@@ -1 +1 @@
-obj-y += dp264.o pci.o typhoon.o
+obj-$(CONFIG_DP264) += dp264.o pci.o typhoon.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 21/27] hw/cris/Makefile.objs: Create CONFIG_* for cris
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (19 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 20/27] hw/alpha/Makefile.objs: Create CONFIG_* for alpha Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 22/27] hw/hppa/Makefile.objs: Create CONFIG_* for hppa Yang Zhong
` (5 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/cris-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/cris-softmmu.mak | 1 +
hw/cris/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index d970d50158..a637c4b4bf 100644
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -4,3 +4,4 @@ CONFIG_ETRAXFS=y
CONFIG_NAND=y
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI02=y
+CONFIG_AXIS=y
diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs
index 7624173f77..a4a27b3a13 100644
--- a/hw/cris/Makefile.objs
+++ b/hw/cris/Makefile.objs
@@ -1,2 +1,2 @@
obj-y += boot.o
-obj-y += axis_dev88.o
+obj-$(CONFIG_AXIS) += axis_dev88.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 22/27] hw/hppa/Makefile.objs: Create CONFIG_* for hppa
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (20 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 21/27] hw/cris/Makefile.objs: Create CONFIG_* for cris Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 23/27] hw/moxie/Makefile.objs: Conditionally build moxie Yang Zhong
` (4 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/hppa-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
default-configs/hppa-softmmu.mak | 1 +
hw/hppa/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
index 4badc0521e..b594a6ddd9 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/hppa-softmmu.mak
@@ -10,3 +10,4 @@ CONFIG_IDE_CMD646=y
# CONFIG_IDE_MMIO=y
CONFIG_VIRTIO_VGA=y
CONFIG_MC146818RTC=y
+CONFIG_DINO=y
diff --git a/hw/hppa/Makefile.objs b/hw/hppa/Makefile.objs
index bef241ed25..67838f50a3 100644
--- a/hw/hppa/Makefile.objs
+++ b/hw/hppa/Makefile.objs
@@ -1 +1 @@
-obj-y += machine.o pci.o dino.o
+obj-$(CONFIG_DINO) += pci.o machine.o dino.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 23/27] hw/moxie/Makefile.objs: Conditionally build moxie
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (21 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 22/27] hw/hppa/Makefile.objs: Create CONFIG_* for hppa Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 24/27] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc Yang Zhong
` (3 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
CONFIG_MOXIE added for moxiesim board.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/moxie-softmmu.mak | 1 +
hw/moxie/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/moxie-softmmu.mak b/default-configs/moxie-softmmu.mak
index e00d099994..17ba906dc2 100644
--- a/default-configs/moxie-softmmu.mak
+++ b/default-configs/moxie-softmmu.mak
@@ -5,3 +5,4 @@ CONFIG_MC146818RTC=y
CONFIG_SERIAL=y
CONFIG_SERIAL_ISA=y
CONFIG_VGA=y
+CONFIG_MOXIESIM=y
diff --git a/hw/moxie/Makefile.objs b/hw/moxie/Makefile.objs
index bfc90012fd..ddbf300f54 100644
--- a/hw/moxie/Makefile.objs
+++ b/hw/moxie/Makefile.objs
@@ -1,2 +1,2 @@
# moxie boards
-obj-y += moxiesim.o
+obj-$(CONFIG_MOXIESIM) += moxiesim.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 24/27] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (22 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 23/27] hw/moxie/Makefile.objs: Conditionally build moxie Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 25/27] hw/tricore/Makefile.objs: Create CONFIG_* for tricore Yang Zhong
` (2 subsequent siblings)
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/or1k-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/or1k-softmmu.mak | 1 +
hw/openrisc/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/or1k-softmmu.mak b/default-configs/or1k-softmmu.mak
index 6f5824fd48..6a0f2ef6cf 100644
--- a/default-configs/or1k-softmmu.mak
+++ b/default-configs/or1k-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_SERIAL=y
CONFIG_OPENCORES_ETH=y
CONFIG_OMPIC=y
+CONFIG_OR1K_SIM=y
diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs
index 61246b149b..aa04de7f5a 100644
--- a/hw/openrisc/Makefile.objs
+++ b/hw/openrisc/Makefile.objs
@@ -1,2 +1,2 @@
obj-y = pic_cpu.o cputimer.o
-obj-y += openrisc_sim.o
+obj-$(CONFIG_OR1K_SIM) += openrisc_sim.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 25/27] hw/tricore/Makefile.objs: Create CONFIG_* for tricore
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (23 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 24/27] hw/openrisc/Makefile.objs: Create CONFIG_* for openrisc Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 26/27] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI Yang Zhong
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
Add the new configs to default-configs/tricore-sofmmu.mak.
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
default-configs/tricore-softmmu.mak | 1 +
hw/tricore/Makefile.objs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/tricore-softmmu.mak b/default-configs/tricore-softmmu.mak
index e69de29bb2..c397cff38a 100644
--- a/default-configs/tricore-softmmu.mak
+++ b/default-configs/tricore-softmmu.mak
@@ -0,0 +1 @@
+CONFIG_TRICORE=y
diff --git a/hw/tricore/Makefile.objs b/hw/tricore/Makefile.objs
index 435e095cff..5501f6c1a8 100644
--- a/hw/tricore/Makefile.objs
+++ b/hw/tricore/Makefile.objs
@@ -1 +1 @@
-obj-y += tricore_testboard.o
+obj-$(CONFIG_TRICORE) += tricore_testboard.o
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 26/27] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (24 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 25/27] hw/tricore/Makefile.objs: Create CONFIG_* for tricore Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI Yang Zhong
26 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
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.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
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(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index d3fc82256f..d2c8b52f6d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -150,6 +150,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
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 71c9f6fbcb..15b628757b 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -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)
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 479fb4d900..ded74980e1 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -39,3 +39,5 @@ CONFIG_I2C=y
CONFIG_R4K=y
CONFIG_MALTA=y
CONFIG_MIPSSIM=y
+CONFIG_ACPI_SMBUS=y
+CONFIG_SMBUS_EEPROM=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 7f80f0ccba..52acb7cf39 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -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
diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs
index 82e747e1cd..cecee486f7 100644
--- a/hw/i2c/Makefile.objs
+++ b/hw/i2c/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI
2019-01-31 7:32 [Qemu-devel] [PATCH v1 00/27] make qemu configurable for Kconfig Yang Zhong
` (25 preceding siblings ...)
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 26/27] hw/i2c/Makefile.objs: Create new CONFIG_* variables for EEPROM and ACPI controller Yang Zhong
@ 2019-01-31 7:32 ` Yang Zhong
2019-01-31 8:48 ` Thomas Huth
26 siblings, 1 reply; 36+ messages in thread
From: Yang Zhong @ 2019-01-31 7:32 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, thuth, yang.zhong
From: Paolo Bonzini <pbonzini@redhat.com>
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.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index d2c8b52f6d..e74b994f2a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -123,6 +123,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
diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index 83738cbb65..037636fa33 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -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
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 7f34ad0528..ccd7b179df 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -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
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 8bb7e438c8..6f2c6cec18 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -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
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 22dd211363..e2fcd6aafc 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -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/
diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
index 91805893f7..abad8b818c 100644
--- a/hw/vfio/Makefile.objs
+++ b/hw/vfio/Makefile.objs
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 36+ messages in thread* Re: [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI
2019-01-31 7:32 ` [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI Yang Zhong
@ 2019-01-31 8:48 ` Thomas Huth
2019-02-02 6:59 ` Yang Zhong
0 siblings, 1 reply; 36+ messages in thread
From: Thomas Huth @ 2019-01-31 8:48 UTC (permalink / raw)
To: qemu-devel, pbonzini; +Cc: Yang Zhong
On 2019-01-31 08:32, Yang Zhong wrote:
> From: Paolo Bonzini <pbonzini@redhat.com>
>
> 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.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> 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(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index d2c8b52f6d..e74b994f2a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -123,6 +123,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
>
> diff --git a/default-configs/pci.mak b/default-configs/pci.mak
> index 83738cbb65..037636fa33 100644
> --- a/default-configs/pci.mak
> +++ b/default-configs/pci.mak
> @@ -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
> diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> index 7f34ad0528..ccd7b179df 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -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
> diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
> index 8bb7e438c8..6f2c6cec18 100644
> --- a/default-configs/s390x-softmmu.mak
> +++ b/default-configs/s390x-softmmu.mak
> @@ -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
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 22dd211363..e2fcd6aafc 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -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/
> diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
> index 91805893f7..abad8b818c 100644
> --- a/hw/vfio/Makefile.objs
> +++ b/hw/vfio/Makefile.objs
> @@ -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
I had rather expected a "obj-$(CONFIG_VFIO_SPAPR) += spapr.o" here...
but I guess it doesn't link without spapr.o? Maybe worth to mention that
in the patch description...
Anyway:
Reviewed-by: Thomas Huth <thuth@redhat.com>
> +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
>
^ permalink raw reply [flat|nested] 36+ messages in thread
* Re: [Qemu-devel] [PATCH v1 27/27] hw/vfio/Makefile.objs: Create new CONFIG_* variables for VFIO core and PCI
2019-01-31 8:48 ` Thomas Huth
@ 2019-02-02 6:59 ` Yang Zhong
0 siblings, 0 replies; 36+ messages in thread
From: Yang Zhong @ 2019-02-02 6:59 UTC (permalink / raw)
To: Thomas Huth; +Cc: qemu-devel, pbonzini, yang.zhong
On Thu, Jan 31, 2019 at 09:48:54AM +0100, Thomas Huth wrote:
> On 2019-01-31 08:32, Yang Zhong wrote:
> > From: Paolo Bonzini <pbonzini@redhat.com>
> >
> > 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.
> >
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> > 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(-)
> >
> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> > index d2c8b52f6d..e74b994f2a 100644
> > --- a/default-configs/arm-softmmu.mak
> > +++ b/default-configs/arm-softmmu.mak
> > @@ -123,6 +123,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
> >
> > diff --git a/default-configs/pci.mak b/default-configs/pci.mak
> > index 83738cbb65..037636fa33 100644
> > --- a/default-configs/pci.mak
> > +++ b/default-configs/pci.mak
> > @@ -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
> > diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> > index 7f34ad0528..ccd7b179df 100644
> > --- a/default-configs/ppc64-softmmu.mak
> > +++ b/default-configs/ppc64-softmmu.mak
> > @@ -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
> > diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
> > index 8bb7e438c8..6f2c6cec18 100644
> > --- a/default-configs/s390x-softmmu.mak
> > +++ b/default-configs/s390x-softmmu.mak
> > @@ -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
> > diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> > index 22dd211363..e2fcd6aafc 100644
> > --- a/hw/Makefile.objs
> > +++ b/hw/Makefile.objs
> > @@ -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/
> > diff --git a/hw/vfio/Makefile.objs b/hw/vfio/Makefile.objs
> > index 91805893f7..abad8b818c 100644
> > --- a/hw/vfio/Makefile.objs
> > +++ b/hw/vfio/Makefile.objs
> > @@ -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
>
> I had rather expected a "obj-$(CONFIG_VFIO_SPAPR) += spapr.o" here...
> but I guess it doesn't link without spapr.o? Maybe worth to mention that
> in the patch description...
>
Yes, The common.c call some functions in spapr.c here. Thanks Thomas.
Yang
> Anyway:
>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
>
> > +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
> >
^ permalink raw reply [flat|nested] 36+ messages in thread