[libvirt] [PATCH 01/24] conf: Move numatune_conf to numa_conf

[Peter Krempa]

For a while now there are two places that gather information about NUMA
related guest configuration. While the XML can't be changed we can at
least store the data in one place in the definition.

Rename the numatune_conf.[ch] files to numa_conf as later patches will
move the rest of the definitions from the cpu definition to this one.
---
 po/POTFILES.in                            |  2 +-
 src/Makefile.am                           |  2 +-
 src/conf/domain_conf.h                    |  2 +-
 src/conf/{numatune_conf.c => numa_conf.c} |  6 +++---
 src/conf/{numatune_conf.h => numa_conf.h} | 10 +++++-----
 src/libvirt_private.syms                  |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename src/conf/{numatune_conf.c => numa_conf.c} (99%)
 rename src/conf/{numatune_conf.h => numa_conf.h} (96%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3064037..c25bfce 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -27,7 +27,7 @@ src/conf/netdev_vport_profile_conf.c
 src/conf/network_conf.c
 src/conf/networkcommon_conf.c
 src/conf/node_device_conf.c
-src/conf/numatune_conf.c
+src/conf/numa_conf.c
 src/conf/nwfilter_conf.c
 src/conf/nwfilter_params.c
 src/conf/object_event.c
diff --git a/src/Makefile.am b/src/Makefile.am
index b41c6d4..85624be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -273,7 +273,7 @@ DOMAIN_CONF_SOURCES =						\
 		conf/domain_audit.c conf/domain_audit.h		\
 		conf/domain_nwfilter.c conf/domain_nwfilter.h	\
 		conf/snapshot_conf.c conf/snapshot_conf.h	\
-		conf/numatune_conf.c conf/numatune_conf.h
+		conf/numa_conf.c conf/numa_conf.h

 OBJECT_EVENT_SOURCES =						\
 		conf/object_event.c conf/object_event.h \
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 325afa8..c45e303 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -38,7 +38,7 @@
 # include "virsocketaddr.h"
 # include "networkcommon_conf.h"
 # include "nwfilter_params.h"
-# include "numatune_conf.h"
+# include "numa_conf.h"
 # include "virnetdevmacvlan.h"
 # include "virsysinfo.h"
 # include "virnetdevvportprofile.h"
diff --git a/src/conf/numatune_conf.c b/src/conf/numa_conf.c
similarity index 99%
rename from src/conf/numatune_conf.c
rename to src/conf/numa_conf.c
index 7f322ea..f6a8248 100644
--- a/src/conf/numatune_conf.c
+++ b/src/conf/numa_conf.c
@@ -1,7 +1,7 @@
 /*
- * numatune_conf.c
+ * numa_conf.c
  *
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@

 #include <config.h>

-#include "numatune_conf.h"
+#include "numa_conf.h"

 #include "domain_conf.h"
 #include "viralloc.h"
diff --git a/src/conf/numatune_conf.h b/src/conf/numa_conf.h
similarity index 96%
rename from src/conf/numatune_conf.h
rename to src/conf/numa_conf.h
index 28c4ce2..bcc8c8a 100644
--- a/src/conf/numatune_conf.h
+++ b/src/conf/numa_conf.h
@@ -1,7 +1,7 @@
 /*
- * numatune_conf.h
+ * numa_conf.h
  *
- * Copyright (C) 2014 Red Hat, Inc.
+ * Copyright (C) 2014-2015 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,8 @@
  * Author: Martin Kletzander <mkletzan at redhat.com>
  */

-#ifndef __NUMATUNE_CONF_H__
-# define __NUMATUNE_CONF_H__
+#ifndef __NUMA_CONF_H__
+# define __NUMA_CONF_H__

 # include <libxml/xpath.h>

@@ -111,4 +111,4 @@ int virDomainNumatuneSpecifiedMaxNode(virDomainNumatunePtr numatune);

 bool virDomainNumatuneNodesetIsAvailable(virDomainNumatunePtr numatune,
                                          virBitmapPtr auto_nodeset);
-#endif /* __NUMATUNE_CONF_H__ */
+#endif /* __NUMA_CONF_H__ */
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c07a561..edd54b8 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -625,7 +625,7 @@ virNodeDeviceObjRemove;
 virNodeDeviceObjUnlock;


-# conf/numatune_conf.h
+# conf/numa_conf.h
 virDomainNumatuneEquals;
 virDomainNumatuneFormatNodeset;
 virDomainNumatuneFormatXML;
-- 
2.2.2