Patchwork [v4,00/14] Add Q35 base support

login
register
mail settings
Submitter Jason Baron
Date Nov. 23, 2012, 3:09 a.m.
Message ID <20121123030912.GC2520@redhat.com>
Download mbox | patch
Permalink /patch/201239/
State New
Headers show

Comments

Jason Baron - Nov. 23, 2012, 3:09 a.m.
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:





I've also re-posted patches 5 & 7, to reflect this update. Thanks for
pointing this out.

Thanks,

-Jason

Patch

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