Re: [libvirt] [PATCH v2 01/15] vbox: Update ATTRIBUTE_UNUSED usage

[John Ferlan]

On 10/24/2017 03:35 PM, Dawid Zamirski wrote:
> Since the removal of VBOX <= 3x, the function arguments are actually
> used so they should not be marked with ATTRIBUTE_UNUSED anymore.
> ---
>  src/vbox/vbox_tmpl.c | 49 +++--
>  1 file changed, 23 insertions(+), 26 deletions(-)
> 

Reviewed-by: John Ferlan 

John

[I can push this before a v3 would be necessary - more later]

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH v2 01/15] vbox: Update ATTRIBUTE_UNUSED usage

[Dawid Zamirski]

Since the removal of VBOX <= 3x, the function arguments are actually
used so they should not be marked with ATTRIBUTE_UNUSED anymore.
---
 src/vbox/vbox_tmpl.c | 49 +++--
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index dffeabde0..4aa5e9a63 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -665,7 +665,9 @@ _virtualboxCreateHardDisk(IVirtualBox *vboxObj, PRUnichar 
*format,
 #if VBOX_API_VERSION < 500
 return vboxObj->vtbl->CreateHardDisk(vboxObj, format, location, medium);
 #elif VBOX_API_VERSION >= 500 /*VBOX_API_VERSION >= 500*/
-return vboxObj->vtbl->CreateMedium(vboxObj, format, location, 
AccessMode_ReadWrite, DeviceType_HardDisk, medium);
+return vboxObj->vtbl->CreateMedium(vboxObj, format, location,
+   AccessMode_ReadWrite,
+   DeviceType_HardDisk, medium);
 #endif /*VBOX_API_VERSION >= 500*/
 }
 
@@ -676,38 +678,33 @@ _virtualboxRegisterMachine(IVirtualBox *vboxObj, IMachine 
*machine)
 }
 
 static nsresult
-_virtualboxFindHardDisk(IVirtualBox *vboxObj, PRUnichar *location,
-PRUint32 deviceType ATTRIBUTE_UNUSED,
+_virtualboxFindHardDisk(IVirtualBox *vboxObj,
+PRUnichar *location,
+PRUint32 deviceType,
 PRUint32 accessMode ATTRIBUTE_UNUSED,
 IMedium **medium)
 {
 #if VBOX_API_VERSION < 4002000
-return vboxObj->vtbl->FindMedium(vboxObj, location,
- deviceType, medium);
+return vboxObj->vtbl->FindMedium(vboxObj, location, deviceType, medium);
 #else /* VBOX_API_VERSION >= 4002000 */
-return vboxObj->vtbl->OpenMedium(vboxObj, location,
- deviceType, accessMode, PR_FALSE, medium);
+return vboxObj->vtbl->OpenMedium(vboxObj, location, deviceType, accessMode,
+ PR_FALSE, medium);
 #endif /* VBOX_API_VERSION >= 4002000 */
 }
 
 static nsresult
-_virtualboxOpenMedium(IVirtualBox *vboxObj ATTRIBUTE_UNUSED,
-  PRUnichar *location ATTRIBUTE_UNUSED,
-  PRUint32 deviceType ATTRIBUTE_UNUSED,
-  PRUint32 accessMode ATTRIBUTE_UNUSED,
-  IMedium **medium ATTRIBUTE_UNUSED)
+_virtualboxOpenMedium(IVirtualBox *vboxObj,
+  PRUnichar *location,
+  PRUint32 deviceType,
+  PRUint32 accessMode,
+  IMedium **medium)
 {
 #if VBOX_API_VERSION == 400
-return vboxObj->vtbl->OpenMedium(vboxObj,
- location,
- deviceType, accessMode,
+return vboxObj->vtbl->OpenMedium(vboxObj, location, deviceType, accessMode,
  medium);
 #elif VBOX_API_VERSION >= 4001000
-return vboxObj->vtbl->OpenMedium(vboxObj,
- location,
- deviceType, accessMode,
- false,
- medium);
+return vboxObj->vtbl->OpenMedium(vboxObj, location, deviceType, accessMode,
+ false, medium);
 #endif
 }
 
@@ -759,12 +756,12 @@ _machineGetStorageControllerByName(IMachine *machine, 
PRUnichar *name,
 }
 
 static nsresult
-_machineAttachDevice(IMachine *machine ATTRIBUTE_UNUSED,
- PRUnichar *name ATTRIBUTE_UNUSED,
- PRInt32 controllerPort ATTRIBUTE_UNUSED,
- PRInt32 device ATTRIBUTE_UNUSED,
- PRUint32 type ATTRIBUTE_UNUSED,
- IMedium * medium ATTRIBUTE_UNUSED)
+_machineAttachDevice(IMachine *machine,
+ PRUnichar *name,
+ PRInt32 controllerPort,
+ PRInt32 device,
+ PRUint32 type,
+ IMedium * medium)
 {
 return machine->vtbl->AttachDevice(machine, name, controllerPort,
device, type, medium);
-- 
2.14.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list