openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

network: use G_GNUC_UNUSED 

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2019-10-14 14:45:33 +02:00
parent aa9a313a72
commit adf76a7f11
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/network/bridge_driver.c
View File

@ -662,7 +662,7 @@ networkAutostartConfig(virNetworkObjPtr obj,
#ifdef WITH_FIREWALLD
static DBusHandlerResult
firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED,
firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED,
DBusMessage *message,
void *user_data)
{
@ -709,8 +709,8 @@ firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED,
*/
static int
networkStateInitialize(bool privileged,
virStateInhibitCallback callback ATTRIBUTE_UNUSED,
void *opaque ATTRIBUTE_UNUSED)
virStateInhibitCallback callback G_GNUC_UNUSED,
void *opaque G_GNUC_UNUSED)
{
int ret = VIR_DRV_STATE_INIT_ERROR;
char *configdir = NULL;
@ -932,8 +932,8 @@ networkStateCleanup(void)
static virDrvOpenStatus
networkConnectOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
virConfPtr conf ATTRIBUTE_UNUSED,
virConnectAuthPtr auth G_GNUC_UNUSED,
virConfPtr conf G_GNUC_UNUSED,
unsigned int flags)
{
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
@ -955,27 +955,27 @@ networkConnectOpen(virConnectPtr conn,
return VIR_DRV_OPEN_SUCCESS;
}
static int networkConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED)
static int networkConnectClose(virConnectPtr conn G_GNUC_UNUSED)
{
return 0;
}
static int networkConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
static int networkConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
{
/* Trivially secure, since always inside the daemon */
return 1;
}
static int networkConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED)
static int networkConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
{
/* Not encrypted, but remote driver takes care of that */
return 0;
}
static int networkConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
static int networkConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
{
return 1;
}
@ -1131,7 +1131,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj,
const char *pidfile,
char **configstr,
dnsmasqContext *dctx,
dnsmasqCapsPtr caps ATTRIBUTE_UNUSED)
dnsmasqCapsPtr caps G_GNUC_UNUSED)
{
virNetworkDefPtr def = virNetworkObjGetDef(obj);
virBuffer configbuf = VIR_BUFFER_INITIALIZER;
@ -2213,7 +2213,7 @@ networkRefreshDaemons(virNetworkDriverStatePtr driver)
static int
networkReloadFirewallRulesHelper(virNetworkObjPtr obj,
void *opaque ATTRIBUTE_UNUSED)
void *opaque G_GNUC_UNUSED)
{
virNetworkDefPtr def;
@ -2760,7 +2760,7 @@ networkStartNetworkBridge(virNetworkObjPtr obj)
static int
networkShutdownNetworkBridge(virNetworkObjPtr obj ATTRIBUTE_UNUSED)
networkShutdownNetworkBridge(virNetworkObjPtr obj G_GNUC_UNUSED)
{
virNetworkDefPtr def = virNetworkObjGetDef(obj);
@ -2900,7 +2900,7 @@ networkStartNetworkExternal(virNetworkObjPtr obj)
static int
networkShutdownNetworkExternal(virNetworkObjPtr obj ATTRIBUTE_UNUSED)
networkShutdownNetworkExternal(virNetworkObjPtr obj G_GNUC_UNUSED)
{
/* put anything here that needs to be done each time a network of
* type BRIDGE, PRIVATE, VEPA, HOSTDEV or PASSTHROUGH is shutdown. On

2
src/network/bridge_driver_linux.c
View File

@ -157,7 +157,7 @@ void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup
}
void networkPostReloadFirewallRules(bool startup ATTRIBUTE_UNUSED)
void networkPostReloadFirewallRules(bool startup G_GNUC_UNUSED)
{
iptablesSetDeletePrivate(true);
}

12
src/network/bridge_driver_nop.c
View File

@ -19,27 +19,27 @@
#include <config.h>
void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver ATTRIBUTE_UNUSED,
bool startup ATTRIBUTE_UNUSED)
void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver G_GNUC_UNUSED,
bool startup G_GNUC_UNUSED)
{
}
void networkPostReloadFirewallRules(bool startup ATTRIBUTE_UNUSED)
void networkPostReloadFirewallRules(bool startup G_GNUC_UNUSED)
{
}
int networkCheckRouteCollision(virNetworkDefPtr def ATTRIBUTE_UNUSED)
int networkCheckRouteCollision(virNetworkDefPtr def G_GNUC_UNUSED)
{
return 0;
}
int networkAddFirewallRules(virNetworkDefPtr def ATTRIBUTE_UNUSED)
int networkAddFirewallRules(virNetworkDefPtr def G_GNUC_UNUSED)
{
return 0;
}
void networkRemoveFirewallRules(virNetworkDefPtr def ATTRIBUTE_UNUSED)
void networkRemoveFirewallRules(virNetworkDefPtr def G_GNUC_UNUSED)
{
}