From: Julio Faracco <jcfaracco@gmail.com>
Date: Fri, 9 Mar 2018 03:24:15 +0000 (-0300)
Subject: qemu: different declarations for the same method
X-Git-Tag: v4.2.0-rc1~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dff3fab47faaa638f6b78277548e75ba06079474;p=thirdparty%2Flibvirt.git

qemu: different declarations for the same method

Recently, this warning is appearing while libvirt is being compiled:
Function 'qemuAssignDeviceDiskAlias' argument order different:
declaration 'vmdef, def' definition 'def, disk'

This commit change the default declaration for qemuAssignDeviceDiskAlias
specified at src/qemu/qemu_alias.c.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 2246e712f9..8c744138ce 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -38,8 +38,8 @@ int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef,
                                     virQEMUCapsPtr qemuCaps,
                                     virDomainControllerDefPtr controller);
 
-int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef,
-                              virDomainDiskDefPtr def);
+int qemuAssignDeviceDiskAlias(virDomainDefPtr def,
+                              virDomainDiskDefPtr disk);
 
 int qemuAssignDeviceHostdevAlias(virDomainDefPtr def,
                                  char **alias,