Received: from eggs.gnu.org ([209.51.188.92]:54848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLMya-0005eF-F0 for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:14:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLMyZ-0004EB-Gl for qemu-devel@nongnu.org; Tue, 30 Apr 2019 03:14:52 -0400 From: Thomas Huth Date: Tue, 30 Apr 2019 09:13:37 +0200 Message-Id: <20190430071405.16714-3-thuth@redhat.com> In-Reply-To: <20190430071405.16714-1-thuth@redhat.com> References: <20190430071405.16714-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v6 02/30] hw/ide/ahci: Add a Kconfig switch for the AHCI-ICH9 device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: yang.zhong@intel.com, Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com Cc: Beniamino Galvani , Rob Herring , Aurelien Jarno , Cedric Le Goater , Jan Kiszka , qemu-arm@nongnu.org, Andrzej Zaborowski , John Snow , Igor Mitsyanko , Joel Stanley , Peter Chubb , "Edgar E . Iglesias" , Antony Pavlov , qemu-block@nongnu.org, Jean-Christophe Dubois , Marcel Apfelbaum , Philippe Mathieu-Daude , Alistair Francis , "Michael S. Tsirkin" , Subbaraya Sundeep , Andrew Jeffery , Andrey Smirnov , Gerd Hoffmann Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHC= I sysbus device, but do not use CONFIG_PCI since they do not feature a PCI bus. With CONFIG_AHCI but without CONFIG_PCI, currently 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' We must only compile ich.c if CONFIG_PCI is available, too, so introduce = a new config switch for this device. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/ide/Kconfig | 6 +++++- hw/ide/Makefile.objs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig index ab47b6a7a3..5d9106b1ac 100644 --- a/hw/ide/Kconfig +++ b/hw/ide/Kconfig @@ -43,10 +43,14 @@ config MICRODRIVE select IDE_QDEV =20 config AHCI + bool + select IDE_QDEV + +config AHCI_ICH9 bool default y if PCI_DEVICES depends on PCI - select IDE_QDEV + select AHCI =20 config IDE_SII3112 bool diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs index a142add90e..faf04e0209 100644 --- a/hw/ide/Makefile.objs +++ b/hw/ide/Makefile.objs @@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) +=3D mmio.o common-obj-$(CONFIG_IDE_VIA) +=3D via.o common-obj-$(CONFIG_MICRODRIVE) +=3D microdrive.o common-obj-$(CONFIG_AHCI) +=3D ahci.o -common-obj-$(CONFIG_AHCI) +=3D ich.o +common-obj-$(CONFIG_AHCI_ICH9) +=3D ich.o common-obj-$(CONFIG_ALLWINNER_A10) +=3D ahci-allwinner.o common-obj-$(CONFIG_IDE_SII3112) +=3D sii3112.o --=20 2.21.0