Move the QEMU driver & utility files from qemud/ to src/

ChangeLog

@@ -1,3 +1,16 @@
+Tue Jun 26 19:56:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+	* qemud/driver.c, qemud/driver.h, qemud/conf.c, qemud/conf.h,
+	qemud/bridge.c, qemud/bridge.h, qemud/uuid.c, qemud/uuid.h,
+	qemud/iptables.c, qemud/iptables.h: Removed files now in
+	the main library
+	* src/qemu_driver.c, src/qemu_driver.h, src/qemu_conf.c, src/qemu_conf.h,
+	src/bridge.c, src/bridge.h, src/uuid.c, src/uuid.h,
+	src/iptables.c, src/iptables.h: Add files previously in
+	the daemon
+	* src/qemu_internal.c, src/qemu_internal.h: Remove obsolete
+	QEMU driver code
+
 Tue Jun 26 19:35:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
 	* qemud/libvirtd.sysconf, qemud/libvirtd.init.in: Added config

qemud/Makefile.am

@@ -51,12 +51,7 @@ EXTRA_DIST = libvirtd.init.in libvirtd.sysconf default-network.xml \
 	remote_generate_stubs.pl rpcgen_fix.pl \
 	remote_dispatch_prototypes.h \
 	remote_dispatch_localvars.h \
-	remote_dispatch_proc_switch.h \
-        driver.c driver.h \
-        conf.c conf.h \
-        iptables.c iptables.h \
-        bridge.c bridge.h \
-        uuid.c uuid.h
+	remote_dispatch_proc_switch.h
 
 .x.c:
 	rm -f $@
@@ -96,9 +91,9 @@ uninstall-init:
 
 libvirtd.init: libvirtd.init.in
 	sed						\
-	    -e s!\@localstatedir\@!@localstatedir@!	\
-	    -e s!\@sbindir\@!@sbindir@!			\
-	    -e s!\@sysconfdir\@!@sysconfdir@!		\
+	    -e s!\@localstatedir\@!@localstatedir@!g	\
+	    -e s!\@sbindir\@!@sbindir@!g		\
+	    -e s!\@sysconfdir\@!@sysconfdir@!g		\
 	    < $< > $@
 	chmod a+x libvirtd.init
 

qemud/internal.h

@@ -30,8 +30,6 @@
 
 #include "protocol.h"
 #include "remote_protocol.h"
-#include "bridge.h"
-#include "iptables.h"
 #include "../config.h"
 
 #ifdef __GNUC__

src/Makefile.am

@@ -16,8 +16,7 @@ DEPS = libvirt.la
 LDADDS = @STATIC_BINARIES@ libvirt.la
 VIRSH_LIBS = @VIRSH_LIBS@
 
-EXTRA_DIST = libvirt_sym.version \
-		qemu_internal.c qemu_internal.h
+EXTRA_DIST = libvirt_sym.version
 
 lib_LTLIBRARIES = libvirt.la
 libvirt_la_LIBADD = @LIBXML_LIBS@
@@ -43,14 +42,14 @@ CLIENT_SOURCES =						\
 		proxy_internal.c proxy_internal.h		\
 		conf.c conf.h                                   \
 		xm_internal.c xm_internal.h                     \
-		remote_internal.c remote_internal.h
+		remote_internal.c remote_internal.h		\
+		bridge.c bridge.h 				\
+		iptables.c iptables.h 				\
+		uuid.c uuid.h 					\
+		qemu_driver.c qemu_driver.h 			\
+		qemu_conf.c qemu_conf.h
 
 SERVER_SOURCES = 						\
-		../qemud/bridge.c ../qemud/bridge.h 		\
-		../qemud/iptables.c ../qemud/iptables.h 	\
-		../qemud/uuid.c ../qemud/uuid.h 		\
-		../qemud/driver.c ../qemud/driver.h 		\
-		../qemud/qemu_conf.c ../qemud/conf.h		\
 		../qemud/protocol.h ../qemud/protocol.c		\
 		../qemud/remote_protocol.c ../qemud/remote_protocol.h
 
@@ -64,9 +63,6 @@ virsh_DEPENDENCIES = $(DEPS)
 virsh_LDADD = $(LDADDS) $(VIRSH_LIBS)
 virsh_CFLAGS = $(COVERAGE_CFLAGS)
 
-../qemud/qemu_conf.c:
-	ln -s conf.c $@
-
 #
 # target to ease building test programs
 #

src/libvirt.c

@@ -28,7 +28,7 @@
 #include "test.h"
 #include "xen_unified.h"
 #include "remote_internal.h"
-#include "../qemud/driver.h"
+#include "qemu_driver.h"
 
 /*
  * TODO:

src/qemu_conf.c

@@ -42,9 +42,9 @@
 
 #include <libvirt/virterror.h>
 
-#include "conf.h"
+#include "qemu_conf.h"
 #include "uuid.h"
-#include "../src/buf.h"
+#include "buf.h"
 
 #define qemudLog(level, msg...) fprintf(stderr, msg)
 

src/qemu_conf.h

@@ -24,7 +24,7 @@
 #ifndef __QEMUD_CONF_H
 #define __QEMUD_CONF_H
 
-#include "../src/internal.h"
+#include "internal.h"
 #include "bridge.h"
 #include "iptables.h"
 #include <netinet/in.h>

src/qemu_driver.c

@@ -49,9 +49,9 @@
 #include <libvirt/virterror.h>
 
 #include "event.h"
-#include "../src/buf.h"
-#include "driver.h"
-#include "conf.h"
+#include "buf.h"
+#include "qemu_driver.h"
+#include "qemu_conf.h"
 
 #define qemudLog(level, msg...) fprintf(stderr, msg)
 

src/qemu_driver.h

@@ -25,7 +25,7 @@
 #ifndef QEMUD_DRIVER_H
 #define QEMUD_DRIVER_H
 
-#include "../src/internal.h"
+#include "internal.h"
 
 int qemudStartup(void);
 int qemudReload(void);

src/qemu_internal.h

@@ -1,48 +0,0 @@
-/*
- * qemu_internal.h: A backend for managing QEMU machines
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- * Copyright (C) 2006 Daniel P. Berrange
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
- *
- * Author: Daniel P. Berrange <berrange@redhat.com>
- */
-
-#ifndef __VIR_QEMU_INTERNAL_H__
-#define __VIR_QEMU_INTERNAL_H__
-
-#include <libvirt/virterror.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int qemuRegister(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __VIR_QEMU_INTERNAL_H__ */
-
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */