From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbjdl-0001cs-JK for qemu-devel@nongnu.org; Thu, 22 Nov 2012 22:09:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tbjdk-0001ai-GA for qemu-devel@nongnu.org; Thu, 22 Nov 2012 22:09:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tbjdk-0001ad-8D for qemu-devel@nongnu.org; Thu, 22 Nov 2012 22:09:16 -0500 Date: Thu, 22 Nov 2012 22:09:12 -0500 From: Jason Baron Message-ID: <20121123030912.GC2520@redhat.com> References: <50AE0B7B.80308@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <50AE0B7B.80308@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 00/14] Add Q35 base support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: juzhang@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, agraf@suse.de, blauwirbel@gmail.com, yamahata@valinux.co.jp, alex.williamson@redhat.com, kevin@koconnor.net, anthony@codemonkey.ws, gsomlo@gmail.com, mkletzan@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, afaerber@suse.de, armbru@redhat.com On Thu, Nov 22, 2012 at 12:24:43PM +0100, Gerd Hoffmann wrote: > > These patches are intened to give us a base set of patches for Q35 upon which > > to build. The major change in this series is to add the memory controller hub, > > or 'mch' as proper member of the q35 host structure. This change refactors the > > Fails to build with all targets enabled: > > [ ... ] > > LINK alpha-softmmu/qemu-system-alpha > ../hw/acpi_ich9.o: In function `ich9_pm_init': > acpi_ich9.c:(.text+0x5d): undefined reference to `acpi_pm_tmr_init' > acpi_ich9.c:(.text+0x65): undefined reference to `acpi_pm1_cnt_init' > acpi_ich9.c:(.text+0x72): undefined reference to `acpi_gpe_init' > > [ ... ] > > cheers, > Gerd > Adding the patch below fixes this: diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 0e17fbe..6c4cf09 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -28,7 +28,7 @@ common-obj-$(CONFIG_I8254) += i8254_common.o i8254.o common-obj-$(CONFIG_PCSPK) += pcspk.o common-obj-$(CONFIG_PCKBD) += pckbd.o common-obj-$(CONFIG_FDC) += fdc.o -common-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o +common-obj-$(CONFIG_ACPI) += acpi.o acpi_piix4.o acpi_ich9.o smbus_ich9.o common-obj-$(CONFIG_APM) += pm_smbus.o apm.o common-obj-$(CONFIG_DMA) += dma.o common-obj-$(CONFIG_I82374) += i82374.o @@ -39,7 +39,6 @@ common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o common-obj-y += fifo.o common-obj-y += pam.o -common-obj-y += acpi_ich9.o smbus_ich9.o # PPC devices common-obj-$(CONFIG_PREP_PCI) += prep_pci.o I've also re-posted patches 5 & 7, to reflect this update. Thanks for pointing this out. Thanks, -Jason