mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-08 07:15:46 +00:00
vz: 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:
parent
b2060e2942
commit
adfa096bf2
@ -243,10 +243,10 @@ vzDomainDefAddDefaultInputDevices(virDomainDefPtr def)
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
vzDomainDefPostParse(virDomainDefPtr def,
|
vzDomainDefPostParse(virDomainDefPtr def,
|
||||||
virCapsPtr caps ATTRIBUTE_UNUSED,
|
virCapsPtr caps G_GNUC_UNUSED,
|
||||||
unsigned int parseFlags ATTRIBUTE_UNUSED,
|
unsigned int parseFlags G_GNUC_UNUSED,
|
||||||
void *opaque ATTRIBUTE_UNUSED,
|
void *opaque G_GNUC_UNUSED,
|
||||||
void *parseOpaque ATTRIBUTE_UNUSED)
|
void *parseOpaque G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
if (vzDomainDefAddDefaultInputDevices(def) < 0)
|
if (vzDomainDefAddDefaultInputDevices(def) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@ -256,7 +256,7 @@ vzDomainDefPostParse(virDomainDefPtr def,
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
vzDomainDefValidate(const virDomainDef *def,
|
vzDomainDefValidate(const virDomainDef *def,
|
||||||
virCapsPtr caps ATTRIBUTE_UNUSED,
|
virCapsPtr caps G_GNUC_UNUSED,
|
||||||
void *opaque)
|
void *opaque)
|
||||||
{
|
{
|
||||||
if (vzCheckUnsupportedControllers(def, opaque) < 0)
|
if (vzCheckUnsupportedControllers(def, opaque) < 0)
|
||||||
@ -268,10 +268,10 @@ vzDomainDefValidate(const virDomainDef *def,
|
|||||||
static int
|
static int
|
||||||
vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
|
vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
|
||||||
const virDomainDef *def,
|
const virDomainDef *def,
|
||||||
virCapsPtr caps ATTRIBUTE_UNUSED,
|
virCapsPtr caps G_GNUC_UNUSED,
|
||||||
unsigned int parseFlags ATTRIBUTE_UNUSED,
|
unsigned int parseFlags G_GNUC_UNUSED,
|
||||||
void *opaque ATTRIBUTE_UNUSED,
|
void *opaque G_GNUC_UNUSED,
|
||||||
void *parseOpaque ATTRIBUTE_UNUSED)
|
void *parseOpaque G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
if (dev->type == VIR_DOMAIN_DEVICE_NET &&
|
if (dev->type == VIR_DOMAIN_DEVICE_NET &&
|
||||||
(dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK ||
|
(dev->data.net->type == VIR_DOMAIN_NET_TYPE_NETWORK ||
|
||||||
@ -286,7 +286,7 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
|
|||||||
static int
|
static int
|
||||||
vzDomainDeviceDefValidate(const virDomainDeviceDef *dev,
|
vzDomainDeviceDefValidate(const virDomainDeviceDef *dev,
|
||||||
const virDomainDef *def,
|
const virDomainDef *def,
|
||||||
void *opaque ATTRIBUTE_UNUSED)
|
void *opaque G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
if (dev->type == VIR_DOMAIN_DEVICE_DISK)
|
if (dev->type == VIR_DOMAIN_DEVICE_DISK)
|
||||||
return vzCheckUnsupportedDisk(def, dev->data.disk, opaque);
|
return vzCheckUnsupportedDisk(def, dev->data.disk, opaque);
|
||||||
@ -346,8 +346,8 @@ vzDriverObjNew(void)
|
|||||||
|
|
||||||
static virDrvOpenStatus
|
static virDrvOpenStatus
|
||||||
vzConnectOpen(virConnectPtr conn,
|
vzConnectOpen(virConnectPtr conn,
|
||||||
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
|
virConnectAuthPtr auth G_GNUC_UNUSED,
|
||||||
virConfPtr conf ATTRIBUTE_UNUSED,
|
virConfPtr conf G_GNUC_UNUSED,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
vzDriverPtr driver = NULL;
|
vzDriverPtr driver = NULL;
|
||||||
@ -898,19 +898,19 @@ vzNodeGetInfo(virConnectPtr conn,
|
|||||||
return virCapabilitiesGetNodeInfo(nodeinfo);
|
return virCapabilitiesGetNodeInfo(nodeinfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED)
|
static int vzConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
/* Encryption is not relevant / applicable to way we talk to PCS */
|
/* Encryption is not relevant / applicable to way we talk to PCS */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
|
static int vzConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
/* We run CLI tools directly so this is secure */
|
/* We run CLI tools directly so this is secure */
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
|
static int vzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@ -2967,8 +2967,8 @@ static int
|
|||||||
vzDomainMigratePrepare3Params(virConnectPtr conn,
|
vzDomainMigratePrepare3Params(virConnectPtr conn,
|
||||||
virTypedParameterPtr params,
|
virTypedParameterPtr params,
|
||||||
int nparams,
|
int nparams,
|
||||||
const char *cookiein ATTRIBUTE_UNUSED,
|
const char *cookiein G_GNUC_UNUSED,
|
||||||
int cookieinlen ATTRIBUTE_UNUSED,
|
int cookieinlen G_GNUC_UNUSED,
|
||||||
char **cookieout,
|
char **cookieout,
|
||||||
int *cookieoutlen,
|
int *cookieoutlen,
|
||||||
char **uri_out,
|
char **uri_out,
|
||||||
@ -3030,7 +3030,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
vzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature)
|
vzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature)
|
||||||
{
|
{
|
||||||
if (virConnectSupportsFeatureEnsureACL(conn) < 0)
|
if (virConnectSupportsFeatureEnsureACL(conn) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
@ -3262,8 +3262,8 @@ vzDomainMigratePerform3Params(virDomainPtr domain,
|
|||||||
int nparams,
|
int nparams,
|
||||||
const char *cookiein,
|
const char *cookiein,
|
||||||
int cookieinlen,
|
int cookieinlen,
|
||||||
char **cookieout ATTRIBUTE_UNUSED,
|
char **cookieout G_GNUC_UNUSED,
|
||||||
int *cookieoutlen ATTRIBUTE_UNUSED,
|
int *cookieoutlen G_GNUC_UNUSED,
|
||||||
unsigned int flags)
|
unsigned int flags)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -3298,10 +3298,10 @@ static virDomainPtr
|
|||||||
vzDomainMigrateFinish3Params(virConnectPtr dconn,
|
vzDomainMigrateFinish3Params(virConnectPtr dconn,
|
||||||
virTypedParameterPtr params,
|
virTypedParameterPtr params,
|
||||||
int nparams,
|
int nparams,
|
||||||
const char *cookiein ATTRIBUTE_UNUSED,
|
const char *cookiein G_GNUC_UNUSED,
|
||||||
int cookieinlen ATTRIBUTE_UNUSED,
|
int cookieinlen G_GNUC_UNUSED,
|
||||||
char **cookieout ATTRIBUTE_UNUSED,
|
char **cookieout G_GNUC_UNUSED,
|
||||||
int *cookieoutlen ATTRIBUTE_UNUSED,
|
int *cookieoutlen G_GNUC_UNUSED,
|
||||||
unsigned int flags,
|
unsigned int flags,
|
||||||
int cancelled)
|
int cancelled)
|
||||||
{
|
{
|
||||||
@ -3344,13 +3344,13 @@ vzDomainMigrateFinish3Params(virConnectPtr dconn,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
vzDomainMigrateConfirm3Params(virDomainPtr domain ATTRIBUTE_UNUSED,
|
vzDomainMigrateConfirm3Params(virDomainPtr domain G_GNUC_UNUSED,
|
||||||
virTypedParameterPtr params,
|
virTypedParameterPtr params,
|
||||||
int nparams,
|
int nparams,
|
||||||
const char *cookiein ATTRIBUTE_UNUSED,
|
const char *cookiein G_GNUC_UNUSED,
|
||||||
int cookieinlen ATTRIBUTE_UNUSED,
|
int cookieinlen G_GNUC_UNUSED,
|
||||||
unsigned int flags,
|
unsigned int flags,
|
||||||
int cancelled ATTRIBUTE_UNUSED)
|
int cancelled G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
virCheckFlags(VZ_MIGRATION_FLAGS, -1);
|
virCheckFlags(VZ_MIGRATION_FLAGS, -1);
|
||||||
|
|
||||||
@ -4114,8 +4114,8 @@ vzStateCleanup(void)
|
|||||||
|
|
||||||
static int
|
static int
|
||||||
vzStateInitialize(bool privileged,
|
vzStateInitialize(bool privileged,
|
||||||
virStateInhibitCallback callback ATTRIBUTE_UNUSED,
|
virStateInhibitCallback callback G_GNUC_UNUSED,
|
||||||
void *opaque ATTRIBUTE_UNUSED)
|
void *opaque G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
if (!privileged)
|
if (!privileged)
|
||||||
return VIR_DRV_STATE_INIT_SKIPPED;
|
return VIR_DRV_STATE_INIT_SKIPPED;
|
||||||
|
@ -3083,7 +3083,7 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdom,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom ATTRIBUTE_UNUSED, virDomainDefPtr def)
|
static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom G_GNUC_UNUSED, virDomainDefPtr def)
|
||||||
{
|
{
|
||||||
PRL_RESULT pret;
|
PRL_RESULT pret;
|
||||||
|
|
||||||
@ -3283,8 +3283,8 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet, virDomainNetDefPtr net)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int prlsdkConfigureNet(vzDriverPtr driver ATTRIBUTE_UNUSED,
|
static int prlsdkConfigureNet(vzDriverPtr driver G_GNUC_UNUSED,
|
||||||
virDomainObjPtr dom ATTRIBUTE_UNUSED,
|
virDomainObjPtr dom G_GNUC_UNUSED,
|
||||||
PRL_HANDLE sdkdom,
|
PRL_HANDLE sdkdom,
|
||||||
virDomainNetDefPtr net,
|
virDomainNetDefPtr net,
|
||||||
bool isCt, bool create)
|
bool isCt, bool create)
|
||||||
@ -3665,7 +3665,7 @@ prlsdkAttachDevice(vzDriverPtr driver,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
prlsdkDetachDevice(vzDriverPtr driver ATTRIBUTE_UNUSED,
|
prlsdkDetachDevice(vzDriverPtr driver G_GNUC_UNUSED,
|
||||||
virDomainObjPtr dom,
|
virDomainObjPtr dom,
|
||||||
virDomainDeviceDefPtr dev)
|
virDomainDeviceDefPtr dev)
|
||||||
{
|
{
|
||||||
|
@ -551,7 +551,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void*
|
void*
|
||||||
vzDomObjAlloc(void *opaque ATTRIBUTE_UNUSED)
|
vzDomObjAlloc(void *opaque G_GNUC_UNUSED)
|
||||||
{
|
{
|
||||||
vzDomObjPtr pdom = NULL;
|
vzDomObjPtr pdom = NULL;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user