External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

bhyve: use G_GNUC_UNUSED

Browse Source 
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 cf4befa1c3
commit db7b6172a4
7 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bhyve/bhyve_command.c
View File

@ -286,7 +286,7 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def,
} }
static int static int
bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
virCommandPtr cmd) virCommandPtr cmd)
{ {
@ -319,7 +319,7 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED,
} }
static int static int
bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, bhyveBuildLPCArgStr(const virDomainDef *def G_GNUC_UNUSED,
virCommandPtr cmd) virCommandPtr cmd)
{ {
virCommandAddArgList(cmd, "-s", "1,lpc", NULL); virCommandAddArgList(cmd, "-s", "1,lpc", NULL);
@ -643,7 +643,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn,
} }
virCommandPtr virCommandPtr
virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver G_GNUC_UNUSED,
virDomainDefPtr def) virDomainDefPtr def)
{ {
virCommandPtr cmd = virCommandNew(BHYVECTL); virCommandPtr cmd = virCommandNew(BHYVECTL);

4
src/bhyve/bhyve_device.c
View File

@ -31,8 +31,8 @@
VIR_LOG_INIT("bhyve.bhyve_device"); VIR_LOG_INIT("bhyve.bhyve_device");
static int static int
bhyveCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED,
virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, virDomainDeviceDefPtr device G_GNUC_UNUSED,
virDomainDeviceInfoPtr info, virDomainDeviceInfoPtr info,
void *opaque) void *opaque)
{ {

26
src/bhyve/bhyve_domain.c
View File

@ -32,7 +32,7 @@
VIR_LOG_INIT("bhyve.bhyve_domain"); VIR_LOG_INIT("bhyve.bhyve_domain");
static void * static void *
bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) bhyveDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
{ {
bhyveDomainObjPrivatePtr priv; bhyveDomainObjPrivatePtr priv;
@ -74,10 +74,10 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def)
static int static int
bhyveDomainDefPostParse(virDomainDefPtr def, bhyveDomainDefPostParse(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)
{ {
/* Add an implicit PCI root controller */ /* Add an implicit PCI root controller */
if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0, if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI, 0,
@ -90,7 +90,7 @@ bhyveDomainDefPostParse(virDomainDefPtr def,
static int static int
bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver, bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver,
virDomainDiskDefPtr def, virDomainDiskDefPtr def,
const virDomainDef *vmdef ATTRIBUTE_UNUSED) const virDomainDef *vmdef G_GNUC_UNUSED)
{ {
int idx = virDiskNameToIndex(def->dst); int idx = virDiskNameToIndex(def->dst);
@ -122,10 +122,10 @@ bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver,
static int static int
bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, bhyveDomainDeviceDefPostParse(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, void *opaque,
void *parseOpaque ATTRIBUTE_UNUSED) void *parseOpaque G_GNUC_UNUSED)
{ {
bhyveConnPtr driver = opaque; bhyveConnPtr driver = opaque;
@ -156,10 +156,10 @@ bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
static int static int
bhyveDomainDefAssignAddresses(virDomainDef *def, bhyveDomainDefAssignAddresses(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 (bhyveDomainAssignAddresses(def, NULL) < 0) if (bhyveDomainAssignAddresses(def, NULL) < 0)
return -1; return -1;

16
src/bhyve/bhyve_driver.c
View File

@ -191,8 +191,8 @@ bhyveConnectURIProbe(char **uri)
static virDrvOpenStatus static virDrvOpenStatus
bhyveConnectOpen(virConnectPtr conn, bhyveConnectOpen(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)
{ {
virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
@ -1049,7 +1049,7 @@ bhyveDomainShutdown(virDomainPtr dom)
static int static int
bhyveDomainOpenConsole(virDomainPtr dom, bhyveDomainOpenConsole(virDomainPtr dom,
const char *dev_name ATTRIBUTE_UNUSED, const char *dev_name G_GNUC_UNUSED,
virStreamPtr st, virStreamPtr st,
unsigned int flags) unsigned int flags)
{ {
@ -1215,8 +1215,8 @@ bhyveStateCleanup(void)
static int static int
bhyveStateInitialize(bool privileged, bhyveStateInitialize(bool privileged,
virStateInhibitCallback callback ATTRIBUTE_UNUSED, virStateInhibitCallback callback G_GNUC_UNUSED,
void *opaque ATTRIBUTE_UNUSED) void *opaque G_GNUC_UNUSED)
{ {
bool autostart = true; bool autostart = true;
@ -1550,20 +1550,20 @@ bhyveConnectGetType(virConnectPtr conn)
return "BHYVE"; return "BHYVE";
} }
static int bhyveConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) static int bhyveConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
{ {
return 1; return 1;
} }
static int static int
bhyveConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) bhyveConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* Trivially secure, since always inside the daemon */ /* Trivially secure, since always inside the daemon */
return 1; return 1;
} }
static int static int
bhyveConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) bhyveConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED)
{ {
/* Not encrypted, but remote driver takes care of that */ /* Not encrypted, but remote driver takes care of that */
return 0; return 0;

2
src/bhyve/bhyve_monitor.c
View File

@ -44,7 +44,7 @@ struct _bhyveMonitor {
}; };
static void static void
bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque) bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque)
{ {
const struct timespec zerowait = { 0, 0 }; const struct timespec zerowait = { 0, 0 };
virDomainObjPtr vm = opaque; virDomainObjPtr vm = opaque;

8
src/bhyve/bhyve_parse_command.c
View File

@ -263,7 +263,7 @@ bhyveCommandLineToArgv(const char *nativeConfig,
static int static int
bhyveParseBhyveLPCArg(virDomainDefPtr def, bhyveParseBhyveLPCArg(virDomainDefPtr def,
unsigned caps ATTRIBUTE_UNUSED, unsigned caps G_GNUC_UNUSED,
const char *arg) const char *arg)
{ {
/* -l emulation[,config] */ /* -l emulation[,config] */
@ -414,7 +414,7 @@ bhyveParsePCISlot(const char *slotdef,
static int static int
bhyveParsePCIDisk(virDomainDefPtr def, bhyveParsePCIDisk(virDomainDefPtr def,
unsigned caps ATTRIBUTE_UNUSED, unsigned caps G_GNUC_UNUSED,
unsigned pcislot, unsigned pcislot,
unsigned pcibus, unsigned pcibus,
unsigned function, unsigned function,
@ -487,7 +487,7 @@ bhyveParsePCIDisk(virDomainDefPtr def,
static int static int
bhyveParsePCINet(virDomainDefPtr def, bhyveParsePCINet(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned caps ATTRIBUTE_UNUSED, unsigned caps G_GNUC_UNUSED,
unsigned pcislot, unsigned pcislot,
unsigned pcibus, unsigned pcibus,
unsigned function, unsigned function,
@ -843,7 +843,7 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def,
static int static int
bhyveParseCustomLoaderCommandLine(virDomainDefPtr def, bhyveParseCustomLoaderCommandLine(virDomainDefPtr def,
int argc ATTRIBUTE_UNUSED, int argc G_GNUC_UNUSED,
char **argv) char **argv)
{ {
if (!argv) if (!argv)

2
src/bhyve/bhyve_process.c
View File

@ -55,7 +55,7 @@ VIR_LOG_INIT("bhyve.bhyve_process");
static void static void
bhyveProcessAutoDestroy(virDomainObjPtr vm, bhyveProcessAutoDestroy(virDomainObjPtr vm,
virConnectPtr conn ATTRIBUTE_UNUSED, virConnectPtr conn G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
bhyveConnPtr driver = opaque; bhyveConnPtr driver = opaque;