conf: Move numatune_conf to numa_conf

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.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3064037fcc88fbb2188fafb26bb8bb7ca451d3b9..c25bfce5bc11886999ca3239353358af82ae3a89 100644 (file)
--- 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 a938d7ea7fb3039f932a717e93ab79bbd8231d4f..d38432ec2ad0c0e4df4931bc92f124f3080fb881 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -275,7 +275,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 325afa82c98a4c73fcf65328f40726314f7243ac..c45e303455b00192383370c9ca3e1b17d6b2c3ad 100644 (file)
--- 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 d6cedaa5a8bd81262ad9279ec97dba59952db1e6..0bbc136e59a31e5319cb1bfe09adf39d82f4a186 100644 (file)
--- 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 c4b3f6e698ced139366269027a963f8e64f43f13..4891f15694616d3c6eec7a45d3458724ba1b9d73 100644 (file)
--- 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@redhat.com>
  */
 
-#ifndef __NUMATUNE_CONF_H__
-# define __NUMATUNE_CONF_H__
+#ifndef __NUMA_CONF_H__
+# define __NUMA_CONF_H__
 
 # include <libxml/xpath.h>
 
@@ -114,4 +114,4 @@ bool virDomainNumatuneNodesetIsAvailable(virDomainNumatunePtr numatune,
 
 bool virDomainNumatuneNodeSpecified(virDomainNumatunePtr numatune,
                                     int cellid);
-#endif /* __NUMATUNE_CONF_H__ */
+#endif /* __NUMA_CONF_H__ */

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 46a16136ca6b9bfd2ca598378a48b2e44901de94..96291953b184d4d370785edb92a350b738647aa3 100644 (file)
--- 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;