qemu: Move qemuDomainNetVLAN

Move function into qemu_domain.c.

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 706414b38e6a8abde8dabed78a2f7b560b772aa1..679f5585081049b95b7b484da852780dcfcce0a5 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -259,12 +259,6 @@ qemuBuildObjectCommandlineFromJSON(const char *type,
 }
 
 
-int qemuDomainNetVLAN(virDomainNetDefPtr def)
-{
-    return qemuDomainDeviceAliasIndex(&def->info, "net");
-}
-
-
 char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
                                virQEMUCapsPtr qemuCaps)
 {

diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 8d5d88d090a249a2ea65b34c1703fef91589837b..776954e5f521211920d9bb6df6de31fb1104044b 100644 (file)
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -227,8 +227,6 @@ char *qemuBuildRedirdevDevStr(virDomainDefPtr def,
 
 int qemuNetworkPrepareDevices(virDomainDefPtr def);
 
-int qemuDomainNetVLAN(virDomainNetDefPtr def);
-
 int qemuGetDriveSourceString(virStorageSourcePtr src,
                              virConnectPtr conn,
                              char **source);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4e9a737ac82e0018bef7ea937e3add5b1d540789..7223b9e296c92686fc568e7e05d0d3471b774714 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include "qemu_domain.h"
+#include "qemu_alias.h"
 #include "qemu_command.h"
 #include "qemu_parse_command.h"
 #include "qemu_capabilities.h"
@@ -4428,3 +4429,10 @@ qemuDomainSupportsNetdev(virDomainDefPtr def,
         return false;
     return virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV);
 }
+
+
+int
+qemuDomainNetVLAN(virDomainNetDefPtr def)
+{
+    return qemuDomainDeviceAliasIndex(&def->info, "net");
+}

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 59875c1334901d3ba1d0ecd99ea9dd385e9e5d57..f0b47e78a685289e61cef95ee5394fa7e54e5c56 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -521,5 +521,6 @@ bool qemuDomainSupportsNetdev(virDomainDefPtr def,
                               virQEMUCapsPtr qemuCaps,
                               virDomainNetDefPtr net);
 
+int qemuDomainNetVLAN(virDomainNetDefPtr def);
 
 #endif /* __QEMU_DOMAIN_H__ */