From 58355a5bfbc3ff76eeab3fdfc4d60b70439ef286 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 15 Sep 2009 17:14:43 +0100
Subject: [PATCH] Move QEMU driver to src/qemu/

* src/qemu_conf.c, src/qemu_conf.h, src/qemu_driver.c,
  src/qemu_driver.h: Move to src/qemu/
* daemon/qemud.c, src/Makefile.am, tests/qemuargv2xmltest.c,
  tests/qemuhelptest.c, tests/qemuxml2argvtest.c,
  tests/qemuxml2xmltest.c: Adapt for changed paths
---
 daemon/qemud.c               | 2 +-
 src/Makefile.am              | 4 ++--
 src/{ => qemu}/qemu_conf.c   | 0
 src/{ => qemu}/qemu_conf.h   | 0
 src/{ => qemu}/qemu_driver.c | 0
 src/{ => qemu}/qemu_driver.h | 0
 tests/qemuargv2xmltest.c     | 2 +-
 tests/qemuhelptest.c         | 2 +-
 tests/qemuxml2argvtest.c     | 2 +-
 tests/qemuxml2xmltest.c      | 2 +-
 10 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{ => qemu}/qemu_conf.c (100%)
 rename src/{ => qemu}/qemu_conf.h (100%)
 rename src/{ => qemu}/qemu_driver.c (100%)
 rename src/{ => qemu}/qemu_driver.h (100%)

diff --git a/daemon/qemud.c b/daemon/qemud.c
index cc8c0139d3..f54c971af2 100644
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -69,7 +69,7 @@
 #include "driver.h"
 #else
 #ifdef WITH_QEMU
-#include "qemu_driver.h"
+#include "qemu/qemu_driver.h"
 #endif
 #ifdef WITH_LXC
 #include "lxc/lxc_driver.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index bff7c2dea3..643a2ff46f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -152,8 +152,8 @@ VBOX_DRIVER_SOURCES =						\
 VBOX_DRIVER_EXTRA_DIST = vbox/vbox_tmpl.c vbox/README
 
 QEMU_DRIVER_SOURCES =						\
-		qemu_conf.c qemu_conf.h				\
-		qemu_driver.c qemu_driver.h			\
+		qemu/qemu_conf.c qemu/qemu_conf.h				\
+		qemu/qemu_driver.c qemu/qemu_driver.h			\
 		cgroup.c cgroup.h
 
 UML_DRIVER_SOURCES =						\
diff --git a/src/qemu_conf.c b/src/qemu/qemu_conf.c
similarity index 100%
rename from src/qemu_conf.c
rename to src/qemu/qemu_conf.c
diff --git a/src/qemu_conf.h b/src/qemu/qemu_conf.h
similarity index 100%
rename from src/qemu_conf.h
rename to src/qemu/qemu_conf.h
diff --git a/src/qemu_driver.c b/src/qemu/qemu_driver.c
similarity index 100%
rename from src/qemu_driver.c
rename to src/qemu/qemu_driver.c
diff --git a/src/qemu_driver.h b/src/qemu/qemu_driver.h
similarity index 100%
rename from src/qemu_driver.h
rename to src/qemu/qemu_driver.h
diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 4a9228032f..65d4d147c5 100644
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 
 #include "testutilsqemu.h"
 
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 20677e0742..428d9a38d4 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 
 #define MAX_HELP_OUTPUT_SIZE 1024*64
 
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index cf0327606d..8318a2c998 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 
 #include "testutilsqemu.h"
 
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 7f19f78af9..2cba47b96e 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -12,7 +12,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "qemu_conf.h"
+#include "qemu/qemu_conf.h"
 #include "testutilsqemu.h"
 
 static char *progname;