From 731ed05ce9c63e80ec041f3f41b84a9ff950e88d Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Tue, 16 Feb 2016 10:11:34 -0500
Subject: [PATCH] qemu: Move qemuDomainNetVLAN

Move function into qemu_domain.c.
---
 src/qemu/qemu_command.c | 6 ------
 src/qemu/qemu_command.h | 2 --
 src/qemu/qemu_domain.c  | 8 ++++++++
 src/qemu/qemu_domain.h  | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 706414b38e..679f558508 100644
--- 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 8d5d88d090..776954e5f5 100644
--- 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 4e9a737ac8..7223b9e296 100644
--- 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 59875c1334..f0b47e78a6 100644
--- 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__ */
-- 
GitLab