[libvirt] [PATCH 1/2] build: fix VPATH builds
The build currently fails when trying to create virnetprotocol.c into $(builddir)/rpc, which doesn't exist. But since the file is part of the tarball, it should be generated into $(srcdir). Caught by autobuild.sh. * src/Makefile.am (VIR_NET_RPC_GENERATED): Generate into srcdir. --- Pushing under the build-breaker rule. src/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 15a207e..1e7b905 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1201,7 +1201,9 @@ EXTRA_DIST += \ rpc/gendispatch.pl \ rpc/genprotocol.pl -VIR_NET_RPC_GENERATED = rpc/virnetprotocol.h rpc/virnetprotocol.c +VIR_NET_RPC_GENERATED = \ + $(srcdir)/rpc/virnetprotocol.h \ + $(srcdir)/rpc/virnetprotocol.c BUILT_SOURCES += $(VIR_NET_RPC_GENERATED) -- 1.7.4.4
Caught by gcc -O2, thanks to autobuild.sh. * src/qemu/qemu_driver.c (qemudDomainGetVcpupinInfo): Initialize vm. --- Pushing under the build-breaker rule. src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d9099d5..da612e7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3173,7 +3173,7 @@ qemudDomainGetVcpupinInfo(virDomainPtr dom, unsigned int flags) { struct qemud_driver *driver = dom->conn->privateData; - virDomainObjPtr vm; + virDomainObjPtr vm = NULL; virNodeInfo nodeinfo; virDomainDefPtr targetDef = NULL; int ret = -1; -- 1.7.4.4
participants (1)
-
Eric Blake