Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 2f3989ed 编写于 作者: J Ján Tomko
浏览文件
操作

openvz: use G_GNUC_UNUSED 

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
上级 5693bc87
显示空白变更内容
内联 并排
Showing with 46 addition and 46 deletion
src/openvz/openvz_driver.c
浏览文件 @ 2f3989ed
...@@ -112,10 +112,10 @@ openvzDomObjFromDomain(struct openvz_driver *driver, ...@@ -112,10 +112,10 @@ openvzDomObjFromDomain(struct openvz_driver *driver,
static int static int
openvzDomainDefPostParse(virDomainDefPtr def, openvzDomainDefPostParse(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)
{ {
/* fill the init path */ /* fill the init path */
if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
...@@ -129,11 +129,11 @@ openvzDomainDefPostParse(virDomainDefPtr def, ...@@ -129,11 +129,11 @@ openvzDomainDefPostParse(virDomainDefPtr def,
static int static int
openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
const virDomainDef *def ATTRIBUTE_UNUSED, const virDomainDef *def G_GNUC_UNUSED,
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_CHR && if (dev->type == VIR_DOMAIN_DEVICE_CHR &&
dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE && dev->data.chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
...@@ -358,7 +358,7 @@ static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version) ...@@ -358,7 +358,7 @@ static int openvzConnectGetVersion(virConnectPtr conn, unsigned long *version)
} }
static char *openvzConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) static char *openvzConnectGetHostname(virConnectPtr conn G_GNUC_UNUSED)
{ {
return virGetHostname(); return virGetHostname();
} }
...@@ -509,7 +509,7 @@ static int openvzDomainIsPersistent(virDomainPtr dom) ...@@ -509,7 +509,7 @@ static int openvzDomainIsPersistent(virDomainPtr dom)
return ret; return ret;
} }
static int openvzDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) static int openvzDomainIsUpdated(virDomainPtr dom G_GNUC_UNUSED)
{ {
return 0; return 0;
} }
...@@ -1209,7 +1209,7 @@ openvzDomainGetAutostart(virDomainPtr dom, int *autostart) ...@@ -1209,7 +1209,7 @@ openvzDomainGetAutostart(virDomainPtr dom, int *autostart)
return ret; return ret;
} }
static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, static int openvzConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUSED,
const char *type) const char *type)
{ {
if (type == NULL || STRCASEEQ(type, "openvz")) if (type == NULL || STRCASEEQ(type, "openvz"))
...@@ -1221,7 +1221,7 @@ static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -1221,7 +1221,7 @@ static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED,
} }
static int static int
openvzDomainGetVcpusFlags(virDomainPtr dom ATTRIBUTE_UNUSED, openvzDomainGetVcpusFlags(virDomainPtr dom G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
if (flags != (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { if (flags != (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) {
...@@ -1322,8 +1322,8 @@ openvzConnectURIProbe(char **uri) ...@@ -1322,8 +1322,8 @@ openvzConnectURIProbe(char **uri)
static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn, static virDrvOpenStatus openvzConnectOpen(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)
{ {
struct openvz_driver *driver; struct openvz_driver *driver;
...@@ -1391,24 +1391,24 @@ static int openvzConnectClose(virConnectPtr conn) ...@@ -1391,24 +1391,24 @@ static int openvzConnectClose(virConnectPtr conn)
return 0; return 0;
} }
static const char *openvzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) { static const char *openvzConnectGetType(virConnectPtr conn G_GNUC_UNUSED) {
return "OpenVZ"; return "OpenVZ";
} }
static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) static int openvzConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* Encryption is not relevant / applicable to way we talk to openvz */ /* Encryption is not relevant / applicable to way we talk to openvz */
return 0; return 0;
} }
static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) static int openvzConnectIsSecure(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 static int
openvzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) openvzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
{ {
return 1; return 1;
} }
...@@ -1424,7 +1424,7 @@ static char *openvzConnectGetCapabilities(virConnectPtr conn) { ...@@ -1424,7 +1424,7 @@ static char *openvzConnectGetCapabilities(virConnectPtr conn) {
return ret; return ret;
} }
static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, static int openvzConnectListDomains(virConnectPtr conn G_GNUC_UNUSED,
int *ids, int nids) int *ids, int nids)
{ {
int got = 0; int got = 0;
...@@ -1480,7 +1480,7 @@ static int openvzConnectNumOfDomains(virConnectPtr conn) ...@@ -1480,7 +1480,7 @@ static int openvzConnectNumOfDomains(virConnectPtr conn)
return n; return n;
} }
static int openvzConnectListDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED, static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSED,
char **const names, int nnames) { char **const names, int nnames) {
int got = 0; int got = 0;
int veid, outfd = -1, ret; int veid, outfd = -1, ret;
...@@ -2003,7 +2003,7 @@ openvzConnectListAllDomains(virConnectPtr conn, ...@@ -2003,7 +2003,7 @@ openvzConnectListAllDomains(virConnectPtr conn,
static int static int
openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, openvzNodeGetInfo(virConnectPtr conn G_GNUC_UNUSED,
virNodeInfoPtr nodeinfo) virNodeInfoPtr nodeinfo)
{ {
return virCapabilitiesGetNodeInfo(nodeinfo); return virCapabilitiesGetNodeInfo(nodeinfo);
...@@ -2011,7 +2011,7 @@ openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2011,7 +2011,7 @@ openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED,
static int static int
openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, openvzNodeGetCPUStats(virConnectPtr conn G_GNUC_UNUSED,
int cpuNum, int cpuNum,
virNodeCPUStatsPtr params, virNodeCPUStatsPtr params,
int *nparams, int *nparams,
...@@ -2022,7 +2022,7 @@ openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2022,7 +2022,7 @@ openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED,
static int static int
openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, openvzNodeGetMemoryStats(virConnectPtr conn G_GNUC_UNUSED,
int cellNum, int cellNum,
virNodeMemoryStatsPtr params, virNodeMemoryStatsPtr params,
int *nparams, int *nparams,
...@@ -2033,7 +2033,7 @@ openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2033,7 +2033,7 @@ openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
static int static int
openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, openvzNodeGetCellsFreeMemory(virConnectPtr conn G_GNUC_UNUSED,
unsigned long long *freeMems, unsigned long long *freeMems,
int startCell, int startCell,
int maxCells) int maxCells)
...@@ -2043,7 +2043,7 @@ openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2043,7 +2043,7 @@ openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
static unsigned long long static unsigned long long
openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) openvzNodeGetFreeMemory(virConnectPtr conn G_GNUC_UNUSED)
{ {
unsigned long long freeMem; unsigned long long freeMem;
if (virHostMemGetInfo(NULL, &freeMem) < 0) if (virHostMemGetInfo(NULL, &freeMem) < 0)
...@@ -2053,7 +2053,7 @@ openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) ...@@ -2053,7 +2053,7 @@ openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
static int static int
openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, openvzNodeGetCPUMap(virConnectPtr conn G_GNUC_UNUSED,
unsigned char **cpumap, unsigned char **cpumap,
unsigned int *online, unsigned int *online,
unsigned int flags) unsigned int flags)
...@@ -2063,7 +2063,7 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, ...@@ -2063,7 +2063,7 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED,
static int static int
openvzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) openvzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature)
{ {
switch ((virDrvFeature) feature) { switch ((virDrvFeature) feature) {
case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_PARAMS:
...@@ -2092,8 +2092,8 @@ static char * ...@@ -2092,8 +2092,8 @@ static char *
openvzDomainMigrateBegin3Params(virDomainPtr domain, openvzDomainMigrateBegin3Params(virDomainPtr domain,
virTypedParameterPtr params, virTypedParameterPtr params,
int nparams, int nparams,
char **cookieout ATTRIBUTE_UNUSED, char **cookieout G_GNUC_UNUSED,
int *cookieoutlen ATTRIBUTE_UNUSED, int *cookieoutlen G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
...@@ -2132,12 +2132,12 @@ static int ...@@ -2132,12 +2132,12 @@ static int
openvzDomainMigratePrepare3Params(virConnectPtr dconn, openvzDomainMigratePrepare3Params(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,
char **uri_out, char **uri_out,
unsigned int fflags ATTRIBUTE_UNUSED) unsigned int fflags G_GNUC_UNUSED)
{ {
struct openvz_driver *driver = dconn->privateData; struct openvz_driver *driver = dconn->privateData;
const char *dom_xml = NULL; const char *dom_xml = NULL;
...@@ -2230,13 +2230,13 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn, ...@@ -2230,13 +2230,13 @@ openvzDomainMigratePrepare3Params(virConnectPtr dconn,
static int static int
openvzDomainMigratePerform3Params(virDomainPtr domain, openvzDomainMigratePerform3Params(virDomainPtr domain,
const char *dconnuri ATTRIBUTE_UNUSED, const char *dconnuri 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,
char **cookieout ATTRIBUTE_UNUSED, char **cookieout G_GNUC_UNUSED,
int *cookieoutlen ATTRIBUTE_UNUSED, int *cookieoutlen G_GNUC_UNUSED,
unsigned int flags) unsigned int flags)
{ {
struct openvz_driver *driver = domain->conn->privateData; struct openvz_driver *driver = domain->conn->privateData;
...@@ -2285,10 +2285,10 @@ static virDomainPtr ...@@ -2285,10 +2285,10 @@ static virDomainPtr
openvzDomainMigrateFinish3Params(virConnectPtr dconn, openvzDomainMigrateFinish3Params(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)
{ {
...@@ -2343,8 +2343,8 @@ static int ...@@ -2343,8 +2343,8 @@ static int
openvzDomainMigrateConfirm3Params(virDomainPtr domain, openvzDomainMigrateConfirm3Params(virDomainPtr domain,
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) int cancelled)
{ {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或