Tue Feb 14 14:39:18 EST 2007 Mark McLoughlin <markmc@redhat.com

        * conf.[ch]: rename from config.[ch] so we can use
        autoconf's config.h

        * Makefile.am: update

        * driver.c, qemud.c: upd.

ChangeLog

-Tue Feb 14 15:37:17 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	Note: potential ABI break here, but people should
-	only really be using virError structs returned from
-	libvirt itself.
-
-	* include/libvirt/virterror.h: add virNetwork
-	to virError
-	
-	* src/internal.h, src/virterror.c: add network param
-	to __virRaiseError()
-	
-	* src/conf.c, src/hash.c, src/libvirt.c, src/proxy_internal.c,
-	src/qemu_internal.c, src/sexpr.c, src/test.c, src/xen_internal.c,
-	src/xend_internal.c, src/xm_internal.c, src/xml.c, src/xmlrpc.c,
-	src/xs_internal.c: update.
-	
-Tue Feb 14 15:33:05 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* include/libvirt/libvirt.h.in: add the networks APIs
-	
-	* include/libvirt/virterror.h: add some error codes
-	
-	* src/driver.h: add network driver vtable
-	
-	* src/hash.c: add networks hash
-	
-	* src/internal.h: add virNetwork
-
-	* src/libvirt.c: hook up the APIs to the network
-	driver
-	
-	* src/libvirt_sym.version: add the new APIs
-	
-	* src/virterror.c: handle the new error codes
-	
-Tue Feb 14 15:07:26 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* src/conf.h: fix merge error - remove the argc argument
-	from qemudBuildCommandLine()
-	
-Tue Feb 14 15:03:22 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* src/virsh.c: Re-name some of the VSH_DOMBYFOO stuff
-	to VSH_BYFOO in order to re-use it for the network stuff.
-	
-Tue Feb 14 14:58:35 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* src/hash.c, src/internal.h: Re-name virConnect->domains_mux
-	to virConnect->hashes_mux since it will also be used to
-	protect the networks hash.
-	
-Tue Feb 14 14:57:52 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* qemud/conf.c: qemudSaveConfig() will always report a
-	more specific error, so	we should avoid overwriting
-	this error.
-	
-Tue Feb 14 14:54:25 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* qemud/qemud.c: Re-factor out qemudExec() so that it can
-	be used to launch dnsmasq.
-
-	* qemud/conf.c: don't return argc from qemudBuildCommandLine()
-	as exec() doesn't need it.
-	
-Tue Feb 14 14:52:12 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* qemud/conf.c: Re-factor bits of conf.c so that:
-
-	  - qemudMakeConfigPath() can be re-used given another configDir
-	  - split qemudEnsureConfigDir() out of qemudSaveConfig() so
-	    that it may be re-used to create another configDir
-	  - split qemudScanConfigDir() out so that qemudScanConfigs()
-	    can scan multiple configDirs
-	
-Tue Feb 14 14:50:22 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* qemud/conf.c: handle an unspecified MAC address, 
-	fix the argv freeing code in qemudBuildCommandLine()
-	and fix copy and paste error in qemudGenerateXML()
-	
-Tue Feb 14 14:42:38 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* src/internal.h: add virConnect->qemud_fd so that
-	xen and qemu don't share the handle member.
-
-	* src/hash.c, src/qemu_internal.c: update
-	
-Tue Feb 14 14:40:52 EST 2007 Mark McLoughlin <markmc@redhat.com>
-
-	* qemud/conf.c, qemud/dispatch.c, qemud/driver.c,
-	  qemud/qemud.c: include autoconf's config.h
-	
-Tue Feb 14 14:39:18 EST 2007 Mark McLoughlin <markmc@redhat.com>
+Tue Feb 14 14:39:18 EST 2007 Mark McLoughlin <markmc@redhat.com
 
 	* conf.[ch]: rename from config.[ch] so we can use
 	autoconf's config.h
@@ -101,7 +7,7 @@ Tue Feb 14 14:39:18 EST 2007 Mark McLoughlin <markmc@redhat.com>
 
 	* driver.c, qemud.c: upd.
 	
-Tue Feb 14 14:33:22 EST 2007 Mark McLoughlin <markmc@redhat.com>
+Tue Feb 14 14:33:22 EST 2007 Mark McLoughlin <markmc@redhat.com
 
 	* autogen.sh: run autoheader
 

qemud/Makefile.am

@@ -7,7 +7,7 @@ libexec_PROGRAMS = libvirt_qemud
 libvirt_qemud_SOURCES = qemud.c internal.h protocol.h \
                 driver.c driver.h \
                 dispatch.c dispatch.h \
-                config.c config.h
+                conf.c conf.h
 #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L
 libvirt_qemud_CFLAGS = \
         -I$(top_srcdir)/include -I$(top_builddir)/include $(LIBXML_CFLAGS) \

qemud/conf.c

@@ -39,7 +39,7 @@
 
 #include "protocol.h"
 #include "internal.h"
-#include "config.h"
+#include "conf.h"
 #include "driver.h"
 
 static int qemudParseUUID(const char *uuid,

qemud/conf.h

@@ -21,8 +21,8 @@
  * Author: Daniel P. Berrange <berrange@redhat.com>
  */
 
-#ifndef __QEMUD_CONFIG_H
-#define __QEMUD_CONFIG_H
+#ifndef __QEMUD_CONF_H
+#define __QEMUD_CONF_H
 
 #include "internal.h"
 

qemud/config.h

-/*
- * config.h: VM configuration management
- *
- * 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 __QEMUD_CONFIG_H
-#define __QEMUD_CONFIG_H
-
-#include "internal.h"
-
-int qemudBuildCommandLine(struct qemud_server *server,
-                          struct qemud_vm *vm,
-                          char ***argv,
-                          int *argc);
-
-void qemudFreeVM(struct qemud_vm *vm);
-struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server,
-                                    const char *file,
-                                    const char *doc,
-                                    int persist);
-int qemudScanConfigs(struct qemud_server *server);
-char *qemudGenerateXML(struct qemud_server *server,
-                       struct qemud_vm *vm);
-
-int qemudDeleteConfigXML(struct qemud_server *server,
-                         struct qemud_vm *vm);
-
-
-#endif
-
-/*
- * Local variables:
- *  indent-tabs-mode: nil
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */

qemud/driver.c

@@ -37,7 +37,7 @@
 
 #include "internal.h"
 #include "driver.h"
-#include "config.h"
+#include "conf.h"
 
 void qemudReportError(struct qemud_server *server,
                       int code, const char *fmt, ...) {

qemud/qemud.c

@@ -47,7 +47,7 @@
 #include "internal.h"
 #include "dispatch.h"
 #include "driver.h"
-#include "config.h"
+#include "conf.h"
 
 static void reapchild(int sig ATTRIBUTE_UNUSED) {
     /* We explicitly waitpid the child later */