hw/ide/ich: Compile ich.c only if CONFIG_PCI is also set
PATCH 1/1 hw/ide/ich: Compile ich.c only if CONFIG_PCI is also set
With the upcoming Kconfig-like build system, it will be easy to build also version of QEMU that only contain a single machine. Some of these machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI sysbus device, but do not use CONFIG_PCI since they do not feature a PCI bus. In this case linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':hw/ide/ich.c:124: undefined reference to pci_allocate_irq' hw/ide/ich.c:126: undefined reference to pci_register_bar' hw/ide/ich.c:128: undefined reference to pci_register_bar' hw/ide/ich.c:131: undefined reference to pci_add_capability' hw/ide/ich.c:147: undefined reference to msi_init' ../hw/ide/ich.o: In function pci_ich9_uninit':hw/ide/ich.c:158: undefined reference to msi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to vmstate_pci_device'
Thus we must only compile ich.c if CONFIG_PCI is also set.
--- hw/ide/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/ide/Makefile.objs +1 -1
@@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o common-obj-$(CONFIG_IDE_VIA) += via.o common-obj-$(CONFIG_MICRODRIVE) += microdrive.o common-obj-$(CONFIG_AHCI) += ahci.o -common-obj-$(CONFIG_AHCI) += ich.o +common-obj-$(call land,$(CONFIG_AHCI),$(CONFIG_PCI)) += ich.o common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
Signature · 1 line
1.8.3.1
Quoted 28 lines · Thomas Huth
With the upcoming Kconfig-like build system, it will be easy to build also version of QEMU that only contain a single machine. Some of these machines (like the ARM cubieboard) use
CONFIG_AHCIfor an AHCI sysbus device, but do not useCONFIG_PCIsince they do not feature a PCI bus. In this case linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':hw/ide/ich.c:124: undefined reference topci_allocate_irq' hw/ide/ich.c:126: undefined reference topci_register_bar'hw/ide/ich.c:128: undefined reference topci_register_bar' hw/ide/ich.c:131: undefined reference topci_add_capability'hw/ide/ich.c:147: undefined reference tomsi_init' ../hw/ide/ich.o: In functionpci_ich9_uninit':hw/ide/ich.c:158: undefined reference tomsi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference tovmstate_pci_device'Thus we must only compile
ich.cifCONFIG_PCIis also set.Signed-off-by Thomas Huth <[email protected]>--- hw/ide/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)hw/ide/Makefile.objs +0
-0
hw/ide/Makefile.objs common-obj-$(CONFIG_IDE_MMIO) += mmio.o · line 14
Quoted 7 lines
hw/ide/Makefile.objs +1
-1@@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o common-obj-$(CONFIG_IDE_VIA) += via.o common-obj-$(CONFIG_MICRODRIVE) += microdrive.o common-obj-$(CONFIG_AHCI) += ahci.o -common-obj-$(CONFIG_AHCI) += ich.o +common-obj-$(call land,$(CONFIG_AHCI),$(CONFIG_PCI)) += ich.o common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
What about defining CONFIG_AHCI_ICH instead? It can wait until after Kconfig is merged.
Paolo
Quoted 24 lines · Paolo Bonzini
Quoted 23 lines · Thomas Huth
With the upcoming Kconfig-like build system, it will be easy to build also version of QEMU that only contain a single machine. Some of these machines (like the ARM cubieboard) use
CONFIG_AHCIfor an AHCI sysbus device, but do not useCONFIG_PCIsince they do not feature a PCI bus. In this case linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':hw/ide/ich.c:124: undefined reference topci_allocate_irq' hw/ide/ich.c:126: undefined reference topci_register_bar'hw/ide/ich.c:128: undefined reference topci_register_bar' hw/ide/ich.c:131: undefined reference topci_add_capability'hw/ide/ich.c:147: undefined reference tomsi_init' ../hw/ide/ich.o: In functionpci_ich9_uninit':hw/ide/ich.c:158: undefined reference tomsi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference tovmstate_pci_device'Thus we must only compile
ich.cifCONFIG_PCIis also set.Signed-off-by Thomas Huth <[email protected]>--- hw/ide/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines
hw/ide/Makefile.objs common-obj-$(CONFIG_IDE_MMIO) += mmio.o · line 14
Quoted 12 lines
hw/ide/Makefile.objs +1
-1@@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o common-obj-$(CONFIG_IDE_VIA) += via.o common-obj-$(CONFIG_MICRODRIVE) += microdrive.o common-obj-$(CONFIG_AHCI) += ahci.o -common-obj-$(CONFIG_AHCI) += ich.o +common-obj-$(call land,$(CONFIG_AHCI),$(CONFIG_PCI)) += ich.o common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) += sii3112.oWhat about defining
CONFIG_AHCI_ICHinstead? It can wait until afterKconfigis merged.
Yeah, that's the ultimate solution once we've got Kconfig merged. I thought this might be a nice intermediate step, but if we want to avoid code churn, this can indeed wait.
By the way, what's the current status of the Kconfig series? Will there be another respin soon? ... the next softfreeze is not that far away ...
Thomas
Quoted 2 lines · Thomas Huth
By the way, what's the current status of the
Kconfigseries? Will there be another respin soon? ... the next softfreeze is not that far away ...
Waiting on the vhost series; I'll talk to Peter about merging it without ARM and handling ARM later.
Paolo
Quoted 2 lines · Thomas Huth
With the upcoming Kconfig-like build system, it will be easy to build also version of QEMU that only contain a single machine. Some
Sorry for my poor English.
What is also version?
Quoted 36 lines
of these machines (like the ARM cubieboard) use
CONFIG_AHCIfor an AHCI sysbus device, but do not useCONFIG_PCIsince they do not feature a PCI bus. In this case linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':hw/ide/ich.c:124: undefined reference topci_allocate_irq' hw/ide/ich.c:126: undefined reference topci_register_bar'hw/ide/ich.c:128: undefined reference topci_register_bar' hw/ide/ich.c:131: undefined reference topci_add_capability'hw/ide/ich.c:147: undefined reference tomsi_init' ../hw/ide/ich.o: In functionpci_ich9_uninit':hw/ide/ich.c:158: undefined reference tomsi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference tovmstate_pci_device'Thus we must only compile
ich.cifCONFIG_PCIis also set.Signed-off-by Thomas Huth <[email protected]>---
hw/ide/Makefile.objs | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)hw/ide/Makefile.objs +0
-0@@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.ocommon-obj-$(CONFIG_IDE_VIA) += via.o
common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
common-obj-$(CONFIG_AHCI) += ahci.ohw/ide/Makefile.objs +1
-1-common-obj-$(CONFIG_AHCI) += ich.o +common-obj-$(call land,$(CONFIG_AHCI),$(CONFIG_PCI)) += ich.ocommon-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
Signature · 1 line
1.8.3.1
Signature · 2 lines
Wei Yang Help you, Help me
Quoted 7 lines · Wei Yang
Quoted 2 lines · Thomas Huth
With the upcoming Kconfig-like build system, it will be easy to build also version of QEMU that only contain a single machine. Some
Sorry for my poor English.
What is also version?
I mean "it will be easy to build a version of QEMU, too, that ...". Maybe I should have rather written "it will be easy to build a binary of QEMU, too, that ...".
Thomas