From 8c69a838818b4131fce47e82900397e9fb7ff5dd Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 15 Sep 2009 18:47:05 +0100
Subject: [PATCH] Move remote driver to src/remote/

* daemon/mdns.c: Remove bogus include
* daemon/qemud.c, src/Makefile.am, src/libvirt.c: Adapt for
  changed paths
* src/remote_internal.c: Rename to src/remote/remote_driver.c
* src/remote_internal.h: Rename to src/remote/remote_driver.h
---
 daemon/mdns.c                                     | 1 -
 daemon/qemud.c                                    | 2 +-
 src/Makefile.am                                   | 4 ++--
 src/libvirt.c                                     | 2 +-
 src/{remote_internal.c => remote/remote_driver.c} | 2 +-
 src/{remote_internal.h => remote/remote_driver.h} | 0
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename src/{remote_internal.c => remote/remote_driver.c} (99%)
 rename src/{remote_internal.h => remote/remote_driver.h} (100%)

diff --git a/daemon/mdns.c b/daemon/mdns.c
index 73b7d11fc1..e1471af59c 100644
--- a/daemon/mdns.c
+++ b/daemon/mdns.c
@@ -41,7 +41,6 @@
 #include "qemud.h"
 #include "mdns.h"
 #include "event.h"
-#include "remote_internal.h"
 #include "memory.h"
 
 #define AVAHI_DEBUG(fmt, ...) DEBUG(fmt, __VA_ARGS__)
diff --git a/daemon/qemud.c b/daemon/qemud.c
index 7972efe2ca..67c49b389d 100644
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -57,7 +57,7 @@
 #include "dispatch.h"
 
 #include "util.h"
-#include "remote_internal.h"
+#include "remote/remote_driver.h"
 #include "conf.h"
 #include "event.h"
 #include "memory.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index b2c2ca6187..0586338cba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -97,8 +97,8 @@ SECRET_CONF_SOURCES =						\
 
 # The remote RPC driver, covering domains, storage, networks, etc
 REMOTE_DRIVER_SOURCES =						\
-		gnutls_1_0_compat.h				\
-		remote_internal.c remote_internal.h		\
+		gnutls_1_0_compat.h			\
+		remote/remote_driver.c remote/remote_driver.h	\
 		../daemon/remote_protocol.c			\
 		../daemon/remote_protocol.h
 
diff --git a/src/libvirt.c b/src/libvirt.c
index 98f17ffc98..6dcf5451f8 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -50,7 +50,7 @@
 #include "xen/xen_driver.h"
 #endif
 #ifdef WITH_REMOTE
-#include "remote_internal.h"
+#include "remote/remote_driver.h"
 #endif
 #ifdef WITH_OPENVZ
 #include "openvz/openvz_driver.h"
diff --git a/src/remote_internal.c b/src/remote/remote_driver.c
similarity index 99%
rename from src/remote_internal.c
rename to src/remote/remote_driver.c
index 3ffda35c94..543e186aa6 100644
--- a/src/remote_internal.c
+++ b/src/remote/remote_driver.c
@@ -83,7 +83,7 @@
 #include "driver.h"
 #include "buf.h"
 #include "qparams.h"
-#include "remote_internal.h"
+#include "remote_driver.h"
 #include "remote_protocol.h"
 #include "memory.h"
 #include "util.h"
diff --git a/src/remote_internal.h b/src/remote/remote_driver.h
similarity index 100%
rename from src/remote_internal.h
rename to src/remote/remote_driver.h