On 04/07/19 20:03, Julio Montes wrote:
> How about a new header file with all devices? (see below patch)
Yes, looks good.
Paolo
> ---
> Makefile.target | 5 +++++
> hw/i386/pc_piix.c | 11 ++++++++---
> include/qemu/osdep.h | 1 +
> scripts/create_config | 2 ++
> 4 files changed, 16 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index a6919e0caf..65eda0994d 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -45,6 +45,9 @@ include $(SRC_PATH)/tests/tcg/Makefile.include
> config-target.h: config-target.h-timestamp
> config-target.h-timestamp: config-target.mak
>
> +config-devices.h: config-devices.h-timestamp
> +config-devices.h-timestamp: config-devices.mak
> +
> ifdef CONFIG_TRACE_SYSTEMTAP
> stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp
> $(QEMU_PROG)-simpletrace.stp $(QEMU_PROG)-log.stp
>
> @@ -170,6 +173,8 @@ generated-files-y += hmp-commands.h hmp-commands-info.h
>
> endif # CONFIG_SOFTMMU
>
> +generated-files-y += config-devices.h
> +
> dummy := $(call unnest-vars,,obj-y)
> all-obj-y := $(obj-y)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index c07c4a5b38..b93f9327be 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -61,9 +61,11 @@
>
> #define MAX_IDE_BUS 2
>
> +#ifdef CONFIG_IDE_ISA
> static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
> static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
> static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
> +#endif
>
> /* PC hardware initialisation */
> static void pc_init1(MachineState *machine,
> @@ -254,7 +256,10 @@ static void pc_init1(MachineState *machine,
> }
> idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
> idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
> - } else {
> + pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
> + }
> +#ifdef CONFIG_IDE_ISA
> +else {
> for(i = 0; i < MAX_IDE_BUS; i++) {
> ISADevice *dev;
> char busname[] = "ide.0";
> @@ -268,9 +273,9 @@ static void pc_init1(MachineState *machine,
> busname[4] = '0' + i;
> idebus[i] = qdev_get_child_bus(DEVICE(dev), busname);
> }
> + pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
> }
> -
> - pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
> +#endif
>
> if (pcmc->pci_enabled && machine_usb(machine)) {
> pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index af2b91f0b8..83b49a1e63 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -30,6 +30,7 @@
> #include "config-host.h"
> #ifdef NEED_CPU_H
> #include "config-target.h"
> +#include "config-devices.h"
> #else
> #include "exec/poison.h"
> #endif
> diff --git a/scripts/create_config b/scripts/create_config
> index d727e5e36e..00e86c82b0 100755
> --- a/scripts/create_config
> +++ b/scripts/create_config
> @@ -58,6 +58,8 @@ case $line in
> name=${line%=*}
> echo "#define $name 1"
> ;;
> + CONFIG_*=n) # configuration
> + ;;
> CONFIG_*=*) # configuration
> name=${line%=*}
> value=${line#*=}
> --
> 2.17.2
>
