On Wed, Feb 04, 2015 at 10:54:17PM -0800, sfel...@gmail.com wrote: > diff --git a/default-configs/pci.mak b/default-configs/pci.mak > index a186c39..a7f3278 100644 > --- a/default-configs/pci.mak > +++ b/default-configs/pci.mak > @@ -32,3 +32,4 @@ CONFIG_PCI_TESTDEV=y > CONFIG_NVME_PCI=y > CONFIG_SD=y > CONFIG_SDHCI=y > +CONFIG_ROCKER=y > diff --git a/hw/net/Makefile.objs b/hw/net/Makefile.objs > index ea93293..4f8e826 100644 > --- a/hw/net/Makefile.objs > +++ b/hw/net/Makefile.objs > @@ -35,3 +35,6 @@ obj-y += vhost_net.o > > obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \ > fsl_etsec/rings.o fsl_etsec/miim.o > + > +common-obj-y += rocker/rocker.o rocker/rocker_fp.o rocker/rocker_desc.o \ > + rocker/rocker_world.o rocker/rocker_of_dpa.o
common-obj-y breaks builds for targets that do not support PCI. This should be common-obj-$(CONFIG_ROCKER) instead. This poses a new problem: when QEMU is built without rocker the QMP/HMP commands fail to link because rocker_find() and friends are missing (they live in rocker.c). There are two options compile out the HMP/QMP commands (see how SPICE does this, e.g. query-spice) or provide stub functions that return an error to the HMP/QMP client when rocker is unavailable.
pgpnhurYauPud.pgp
Description: PGP signature
