[libvirt] [PATCH] bridge_driver.h: Fix build --without-network

The networkNotifyActualDevice function is accepting two arguments, not one: qemu/qemu_process.c: In function 'qemuProcessNotifyNets': qemu/qemu_process.c:2776:47: error: macro "networkNotifyActualDevice" passed 2 arguments, but takes just 1 if (networkNotifyActualDevice(def, net) < 0) ^ Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/network/bridge_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 0f80556..1c2a4a7 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -55,7 +55,7 @@ int networkDnsmasqConfContents(virNetworkObjPtr network, # else /* Define no-op replacements that don't drag in any link dependencies. */ # define networkAllocateActualDevice(dom, iface) 0 -# define networkNotifyActualDevice(iface) (iface=iface, 0) +# define networkNotifyActualDevice(dom, iface) (dom=dom, iface=iface, 0) # define networkReleaseActualDevice(dom, iface) (dom=dom, iface=iface, 0) # define networkGetNetworkAddress(netname, netaddr) (-2) # define networkDnsmasqConfContents(network, pidfile, configstr, \ -- 1.9.0

On 02/18/2014 07:43 PM, Michal Privoznik wrote:
The networkNotifyActualDevice function is accepting two arguments, not one:
qemu/qemu_process.c: In function 'qemuProcessNotifyNets': qemu/qemu_process.c:2776:47: error: macro "networkNotifyActualDevice" passed 2 arguments, but takes just 1 if (networkNotifyActualDevice(def, net) < 0) ^
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/network/bridge_driver.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 0f80556..1c2a4a7 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -55,7 +55,7 @@ int networkDnsmasqConfContents(virNetworkObjPtr network, # else /* Define no-op replacements that don't drag in any link dependencies. */ # define networkAllocateActualDevice(dom, iface) 0 -# define networkNotifyActualDevice(iface) (iface=iface, 0) +# define networkNotifyActualDevice(dom, iface) (dom=dom, iface=iface, 0) # define networkReleaseActualDevice(dom, iface) (dom=dom, iface=iface, 0) # define networkGetNetworkAddress(netname, netaddr) (-2) # define networkDnsmasqConfContents(network, pidfile, configstr, \
In case you're not pushing as a build breaker, ACK.
participants (2)
-
Laine Stump
-
Michal Privoznik