Rename memory.{c,h} to viralloc.{c,h}

diff --git a/cfg.mk b/cfg.mk
index f4431c05900e11e1b23b2991939f80ea8f7bbe1e..cdd02e4c78f1f8604be6f937cbd5224762c710c5 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -321,7 +321,7 @@ sc_prohibit_internal_functions:
 # Avoid raw malloc and free, except in documentation comments.
 sc_prohibit_raw_allocation:
        @prohibit='^.[^*].*\<((m|c|re)alloc|free) *\([^)]'              \
-       halt='use VIR_ macros from memory.h instead of malloc/free'     \
+       halt='use VIR_ macros from viralloc.h instead of malloc/free'   \
          $(_sc_search_regexp)
 
 # Avoid functions that can lead to double-close bugs.
@@ -785,7 +785,7 @@ exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
 exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$
 
 exclude_file_name_regexp--sc_prohibit_internal_functions = \
-  ^src/(util/(memory|util|virfile)\.[hc]|esx/esx_vi\.c)$$
+  ^src/(util/(viralloc|util|virfile)\.[hc]|esx/esx_vi\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \
   ^src/rpc/gendispatch\.pl$$
@@ -794,7 +794,7 @@ exclude_file_name_regexp--sc_prohibit_nonreentrant = \
   ^((po|tests)/|docs/.*py|run.in$$)
 
 exclude_file_name_regexp--sc_prohibit_raw_allocation = \
-  ^(src/util/memory\.[ch]|examples/.*)$$
+  ^(src/util/viralloc\.[ch]|examples/.*)$$
 
 exclude_file_name_regexp--sc_prohibit_readlink = \
   ^src/(util/util|lxc/lxc_container)\.c$$

diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index f61f08df3a9e3e6d27992cd9fca7ba21ff70ba46..b979a23240540ae6e65776468414927648cfea1a 100644 (file)
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -25,7 +25,7 @@
 
 #include "libvirtd-config.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "rpc/virnetserver.h"

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 2a2897a3c127a04679f8aac1f843e53e122a2520..9f82c993384931f1e90a4aeb1558215680181287 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -46,7 +46,7 @@
 #include "util.h"
 #include "uuid.h"
 #include "remote_driver.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virconf.h"
 #include "virnetlink.h"
 #include "virnetserver.h"

diff --git a/daemon/remote.c b/daemon/remote.c
index bb38689604fd0259c64f15bd9b1dbc91d05c8f95..7c7f80622b27c8fb8481db681e8c13bf7ebc08b0 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -33,7 +33,7 @@
 #include "libvirtd.h"
 #include "libvirt_internal.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "util.h"
 #include "stream.h"

diff --git a/daemon/stream.c b/daemon/stream.c
index d63e0092e19d474236a0efa4697f22f51e4ca53e..f208139ee4fcd4150305e47e4c60250abed4d556 100644 (file)
--- a/daemon/stream.c
+++ b/daemon/stream.c
@@ -25,7 +25,7 @@
 
 #include "stream.h"
 #include "remote.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virnetserverclient.h"
 #include "virterror_internal.h"

diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index eda8a1104eeb6e4e3563e6c2207afacc03ad041b..644f34ddfcbfb2a2065f576b8d1fb4462215b49a 100644 (file)
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -24,7 +24,7 @@
 #include "libvirt/virterror.h"
 #include "typewrappers.h"
 #include "libvirt.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virtypedparam.h"
 #include "ignore-value.h"
 #include "util.h"

diff --git a/python/typewrappers.c b/python/typewrappers.c
index d633603c8f4ca7789225162708826a3bc16269b9..9ba8790c42eca9202b9d709d73f3461d6ecc3d60 100644 (file)
--- a/python/typewrappers.c
+++ b/python/typewrappers.c
@@ -16,7 +16,7 @@
 
 #include "typewrappers.h"
 
-#include "memory.h"
+#include "viralloc.h"
 
 #ifndef Py_CAPSULE_H
 typedef void(*PyCapsule_Destructor)(void *, void *);

diff --git a/src/Makefile.am b/src/Makefile.am
index 59958c6679d8c7045936a5803cbc9def59e5824c..25c7cca96ca4147c120467f379d4c5c9e12d3622 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,7 +53,6 @@ augeastest_DATA =
 # These files are not related to driver APIs. Simply generic
 # helper APIs for various purposes
 UTIL_SOURCES =                                                 \
-               util/memory.c util/memory.h                     \
                util/pci.c util/pci.h                           \
                util/processinfo.c util/processinfo.h           \
                util/sexpr.c util/sexpr.h                       \
@@ -66,6 +65,7 @@ UTIL_SOURCES =                                                        \
                util/threadpool.c util/threadpool.h             \
                util/uuid.c util/uuid.h                         \
                util/util.c util/util.h                         \
+               util/viralloc.c util/viralloc.h                 \
                util/virarch.h util/virarch.c                   \
                util/viratomic.h util/viratomic.c               \
                util/viraudit.c util/viraudit.h                 \

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 76db89a65bac95d08b8378329b886bffc9288500..694e9b93dc5e9a21cf4f9999c8c116ef1c6c610d 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -27,7 +27,7 @@
 
 #include "capabilities.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "uuid.h"
 #include "cpu_conf.h"

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 9b865712643e9ff5bcc67603d87ad5a4c1126e2e..601136149669ff98dd9f3e68ba9029f1abd81d05 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virbuffer.h"
 #include "cpu_conf.h"

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index daf57bc380f8fd35d3f88f5c4c223be2a64be0ca..c3ca2d6d7b75e332099b41b5eb6c36302c8326f7 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -23,7 +23,7 @@
 #include <config.h>
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"

diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
index a73c7231c273ee68bedabc000dca2993cf8a6450..8919e620f95378e6ef3cbfd199451a3711721991 100644 (file)
--- a/src/conf/domain_audit.c
+++ b/src/conf/domain_audit.c
@@ -30,7 +30,7 @@
 #include "viraudit.h"
 #include "uuid.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 
 /* Return nn:mm in hex for block and character devices, and NULL
  * for other file types, stat failure, or allocation failure.  */

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 30b1a0fa4a9a079bafa4f00ed65130f7d27a7884..721a7f33054b16be201add9faeef648e85e82a90 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -34,7 +34,7 @@
 #include "datatypes.h"
 #include "domain_conf.h"
 #include "snapshot_conf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "verify.h"
 #include "xml.h"
 #include "uuid.h"

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index f1e247b7a78c4cd34a52e67d39d89078df15c89b..d5238088e14a339bab3acb4a33983aa409af58ee 100644 (file)
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -26,7 +26,7 @@
 #include "domain_event.h"
 #include "virlog.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 738ef336ae32b15fc8fca868187ec9a31994e135..046a8a1780c81d63af6934a692f13ff1c2ae98d0 100644 (file)
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -27,7 +27,7 @@
 
 #include "interface_conf.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 15840b92d163c48d65a9c51cd16e9f7579c91e23..35f067c81ed2158a3aa3e91d1e3e4f7cd8657f21 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -25,7 +25,7 @@
 #include "netdev_bandwidth_conf.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "domain_conf.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c
index 6a0511af9a8060bb41d46be14d7e30d9c0a75cb8..8cee025678d229926278550fcb323e169d042d37 100644 (file)
--- a/src/conf/netdev_vlan_conf.c
+++ b/src/conf/netdev_vlan_conf.c
@@ -23,7 +23,7 @@
 
 #include "netdev_vlan_conf.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index 94992e3087afe17b4a70be3a714935dfbb653889..a9a38d70230b3b6ffce7c2ead2c67d593edceddb 100644 (file)
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -24,7 +24,7 @@
 
 #include "netdev_vport_profile_conf.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 42cb87e4004060db56ade3f1d36d8815efe15c1a..1932851807c9b43bbec46579b7b07ef2b373c75a 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -37,7 +37,7 @@
 #include "netdev_vport_profile_conf.h"
 #include "netdev_bandwidth_conf.h"
 #include "netdev_vlan_conf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "uuid.h"
 #include "util.h"

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 50fcf0b59dadd6412671db9f7d5127ff44fb512e..85de50f3842d4479bce4a1a947354355f516ffdd 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -28,10 +28,10 @@
 
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #include "node_device_conf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "util.h"
 #include "virbuffer.h"

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 46580e9eb9083bb050f4ad93fafa25804a32dcd6..09a9d1cefa7f014c721d8943bd7552f18320cafa 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -39,7 +39,7 @@
 #include "internal.h"
 
 #include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "nwfilter_params.h"

diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c
index f8cf98025b203aa435ebe06b9878499b500dd165..142995297eae3c3bfb3396e5df19a9ed36b90bb0 100644 (file)
--- a/src/conf/nwfilter_params.c
+++ b/src/conf/nwfilter_params.c
@@ -25,7 +25,7 @@
 
 #include "internal.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "nwfilter_params.h"

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 24d7aa0df5a34f36a6c287c832b1534e171e1a36..5188c7a653f2a6f5300423bede8b5c2b75be87e3 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -26,7 +26,7 @@
 #include "virbuffer.h"
 #include "datatypes.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "secret_conf.h"
 #include "virterror_internal.h"
 #include "util.h"

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 63618102ea41c7b60aeabc74b39f84a46b3accb1..9c16a884d57f1b7c882cd9d16bb54cdae07b3c30 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -35,7 +35,7 @@
 #include "datatypes.h"
 #include "domain_conf.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "netdev_bandwidth_conf.h"
 #include "netdev_vport_profile_conf.h"
 #include "nwfilter_conf.h"

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index b81c08cf974a8bbf30f566a166983d72d8cda8f4..0e005888013d2252f3d6624d19d47dc64f828afa 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -42,7 +42,7 @@
 #include "uuid.h"
 #include "virbuffer.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 0c2bded1e5f5e4a79d736e25f0f6a625b75b8c7c..8d3ceac196918db86614d25832bff4dc16792c1e 100644 (file)
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -28,7 +28,7 @@
 #include "internal.h"
 
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "storage_conf.h"
 #include "storage_encryption_conf.h"
 #include "util.h"

diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c
index 92179ccc2d01933c3567400313edbeb3c0ffcb64..757573d7992e71647f3f5841d345835f7442227c 100644 (file)
--- a/src/conf/virconsole.c
+++ b/src/conf/virconsole.c
@@ -32,7 +32,7 @@
 #include "fdstream.h"
 #include "internal.h"
 #include "threads.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virpidfile.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index be1f4cecae1ee81f31d646df27060e5e9c5932f7..302629dd6a52daa823ae893251d78c985f83ac53 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "cpu.h"
 #include "cpu_x86.h"

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index 36c9db03078c2e4b4372d90c18cd840326aa3f63..cfe1a236cafdadcc9cc346ca46a8eb2d400892fb 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "cpu.h"
 
 #define VIR_FROM_THIS VIR_FROM_CPU

diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c
index b10ff47a2520baef32c8fb61bd17c1aec1760b65..5dfa6a21a4e9551c9f954ea54cd499ac990ca3fc 100644 (file)
--- a/src/cpu/cpu_generic.c
+++ b/src/cpu/cpu_generic.c
@@ -24,7 +24,7 @@
 
 #include <config.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virhash.h"
 #include "cpu.h"
 #include "cpu_generic.h"

diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c
index 8c4cfee5d3027b0e5fc7de5f1cf06a0f4db328e4..015be2e320a1042216a4edf7ec7d7bc417772a4c 100644 (file)
--- a/src/cpu/cpu_map.c
+++ b/src/cpu/cpu_map.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "cpu.h"
 #include "cpu_map.h"
 #include "configmake.h"

diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index 26991d80235e45bfcdee2d79b7419b99f6fe891c..cbc813b489b542734d0366f6a30c20083d0e89bc 100644 (file)
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "cpu.h"
 

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index ffbad036c5995c39e99ae5e7463e75be8847a8e8..998197c9049176d36cf44f5eddf8833201bcc9a4 100644 (file)
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -23,7 +23,7 @@
 
 #include <config.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "cpu.h"
 
 

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 2970573c774f8a3a180acb0a86fdcf7d975ab8cb..55e20c9a4624ffc7c3e508809e44be7ba1e19471 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "cpu.h"
 #include "cpu_map.h"

diff --git a/src/datatypes.c b/src/datatypes.c
index 73a2fd05f3aeaa8f11f08d3626bb55134907422e..0907c7daba5fd386fc12e636daddf4a7f54eadc6 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -25,7 +25,7 @@
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "util.h"
 

diff --git a/src/driver.c b/src/driver.c
index 4ef6fd2d5f9f87e4796364dd6bd2a9911f4a2dfd..23dc329cddc97efbe015b4c30607665353e665d9 100644 (file)
--- a/src/driver.c
+++ b/src/driver.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "driver.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "util.h"
 #include "configmake.h"

diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 0ad95f51067a03582d975356447e4d796801a78d..854fc385950ab7d6325911399f5014f229ad49f9 100644 (file)
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "esx_private.h"

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 488d18dd0ea86ba3faeac5482152deb92a0a85ba..346b9bc2210b2801a2ace6981dca75b387b0881a 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -29,7 +29,7 @@
 #include "snapshot_conf.h"
 #include "virauth.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "vmx.h"

diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index 4760264441942fabee5ad807393909dca32c313f..fea67ab3caeb3d97ba204b19a3b49d787214468d 100644 (file)
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "interface_conf.h"

diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index 3e25aa2df68abc2c0b57a7e738d545dee5bbbf4f..fec7e72af535c96f923b193b03cebd46d14646de 100644 (file)
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -27,7 +27,7 @@
 #include "md5.h"
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "network_conf.h"

diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index f5e710d5a20d8dd7ad898afdd0116deaabadbfb5..7a05a5a2542094da55d0af02dcf6e1d8a4c55004 100644 (file)
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "esx_private.h"

diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 2a98644d263677a2afa877f90dc63f03b729d0dd..2969b1967d9b4f69d44d7e6c75fa15422e940928 100644 (file)
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -25,7 +25,7 @@
 
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "esx_private.h"

diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 5d4eb3cb7d50be3a1352af6e9a25fb451091df8d..9d481d25b2e5678dc59f803d3bf4a737193cd959 100644 (file)
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -29,7 +29,7 @@
 #include "internal.h"
 #include "md5.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "storage_conf.h"

diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index c8bba9e7a93fab5d80e930f1733c1b9223120824..bca637b5b18e3f6d480f533954891a8b86859e7c 100644 (file)
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -32,7 +32,7 @@
 #include "internal.h"
 #include "md5.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "storage_conf.h"

diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index e6c09aae68850228ded1381d135fb5bf85ea0bbe..13244695850cab5090d9af215228d428701c53b1 100644 (file)
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -26,7 +26,7 @@
 #include <config.h>
 
 #include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "storage_conf.h"
 #include "esx_private.h"
 #include "esx_storage_driver.h"

diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 6e27fe468c0556cb14b0b7d5bc7ce07697d9d155..bcda9df66c760d9e8a4b45da8e6d4c09a61524c4 100644 (file)
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -29,7 +29,7 @@
 #include "internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "vmx.h"

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 76192dfd5998f5a62542588733b826a45da17bc4..37b6e0f627c5edb94f6d6bbbf612382a33fd1216 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -27,7 +27,7 @@
 #include <libxml/xpathInternals.h>
 
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "util.h"
 #include "uuid.h"

diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c
index a3870ee8da0b165e60650981d5b29d86f923319e..7ffca559d6df98b65079007c3a4a893a9a0f2bf8 100644 (file)
--- a/src/esx/esx_vi_methods.c
+++ b/src/esx/esx_vi_methods.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "esx_vi_methods.h"

diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index d0a2c6c427cc92a0adca73538765b3276622e249..b93223d634b2f2c21e912e460e8508191c1751a4 100644 (file)
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -29,7 +29,7 @@
 
 #include "virbuffer.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "util.h"
 #include "esx_vi.h"

diff --git a/src/fdstream.c b/src/fdstream.c
index fdbd7a20ee28491741df775d2ab6b20500385a17..39e92b829cfaf8f2faa4f55cbb8fc098635508d6 100644 (file)
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -36,7 +36,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "configmake.h"

diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index 1fa98b2fb399f820e7703fd1112aacf8d8f2bcd5..d6edb76c71c694ade62a205b30df6ba7ddfec72c 100644 (file)
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_device_monitor.h"

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 95b0cd96eda3fe87510a44ae1b2158eca5a4a989..749c7f01f48bbbc0b59edf4d55c7c3be76f55af4 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -28,7 +28,7 @@
 #include "domain_conf.h"
 #include "virauth.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_driver.h"

diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 6a3c2cbea35cb5234e2a70b94063e84dff9853d3..43c7dd7698224b223da4e2452680218829258b3d 100644 (file)
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_interface_driver.h"

diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 2f9fcab0e04d82be2e188da0e85d973dd7c39185..06b051bc336d04bbc19bee32bb3a8788c788117a 100644 (file)
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_network_driver.h"

diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index c490522405bca13b51fde3520fa03ade32f82d2a..7452b7abed08938bc73ef996e35b3a17ab6cc968 100644 (file)
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_nwfilter_driver.h"

diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 3d58b016d9df6b1d2df47495c8ae12e77b35bd8a..04a6adaf052f1352aa0d3a4d00af0a35f9901b0f 100644 (file)
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_secret_driver.h"

diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index 7fbc14ded02c433884c7bfca1be37c4cebf92365..b2817a2dd96efa39e04d67921f8df1ab1ce28260 100644 (file)
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_storage_driver.h"

diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 1ef6dae4524f044085c813028bf316f018918bda..016d415ae961518e5dd34a68019ab55f361f98cd 100644 (file)
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -25,7 +25,7 @@
 #include "internal.h"
 #include "datatypes.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "hyperv_private.h"

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 069ebe68693837b7cc1864176d2d8b43be50ac3d..69e7283e9cbac99bbad499abcf024ea3fbd08530 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -28,7 +28,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "uuid.h"
 #include "virbuffer.h"

diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c
index 1f42920f2c3cd5465d5230168bb438f6aa474028..74a749b357b55830636241f5bcd3c0205b1132a5 100644 (file)
--- a/src/interface/interface_backend_netcf.c
+++ b/src/interface/interface_backend_netcf.c
@@ -29,7 +29,7 @@
 #include "datatypes.h"
 #include "interface_driver.h"
 #include "interface_conf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE

diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
index 9233e87a7f0b9399cea710db95a41f28121172c7..248b02e393bd0289ba863e4ecb9fff9a3053cb41 100644 (file)
--- a/src/interface/interface_backend_udev.c
+++ b/src/interface/interface_backend_udev.c
@@ -27,7 +27,7 @@
 #include "datatypes.h"
 #include "interface_driver.h"
 #include "interface_conf.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE
 

diff --git a/src/libvirt.c b/src/libvirt.c
index d078304be84b719b709c0eeb949b5d15518b445d..ed7dcaef1faa46460fada477a11f1399f6b1853e 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -51,7 +51,7 @@
 #include "driver.h"
 
 #include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "configmake.h"
 #include "intprops.h"
 #include "virconf.h"

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 0ccab50a2aba6aea3c578bb6ecb4f60df452b7c4..5b20c395e91c8688b1e78aa74211faae8880d596 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -36,7 +36,7 @@
 #include "datatypes.h"
 #include "virfile.h"
 #include "virstring.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "capabilities.h"
 #include "libxl_driver.h"

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index b7e6630f3d704dad893b0e1dc9931d410f5f991e..4db2614004215039b367a3afbec5706d31dc7f2c 100644 (file)
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -36,7 +36,7 @@
 #include "virconf.h"
 #include "datatypes.h"
 #include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "vircommand.h"
 #include "libxl.h"

diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c
index 00861cfec067de30236cbf71c3749d3d7e42d089..0ae9750092dc66690e056d22dc4b30464612f6a0 100644 (file)
--- a/src/locking/domain_lock.c
+++ b/src/locking/domain_lock.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "domain_lock.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "virterror_internal.h"
 #include "virlog.h"

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 3c2a50c15a240b6d81fb16ad5c93bc8f2d7c92b8..3d90c57a3c887f8ec1423507e28581c599bd29a0 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -39,7 +39,7 @@
 #include "virprocess.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virconf.h"
 #include "rpc/virnetserver.h"
 #include "virrandom.h"

diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_config.c
index 9557b8c2bb4fd3c65c07e8159954f36db1c91739..e370dd465c0919b3b6b3fa25ca9e8bab707fd03e 100644 (file)
--- a/src/locking/lock_daemon_config.c
+++ b/src/locking/lock_daemon_config.c
@@ -25,7 +25,7 @@
 
 #include "lock_daemon_config.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "rpc/virnetserver.h"

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index d5d721d6d3ec787e79d0807fa7c706dee2a36ec4..cee530d80d8bd82ddbf8ccc1906e46ce292ede3a 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -23,7 +23,7 @@
 
 #include "lock_driver.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "util.h"

diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c
index 745a0bf41c63b66964905101d93cabaa71183392..cf0f49a3bc0007ea52692d30872f316d83c9ba93 100644 (file)
--- a/src/locking/lock_driver_nop.c
+++ b/src/locking/lock_driver_nop.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "lock_driver_nop.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index 1e8df2625d1d7a3d410433d5071927563e715771..e5204440d5aadf092800bb43e75977f05ec89c85 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -39,7 +39,7 @@
 #include "lock_driver.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "md5.h"

diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index f038d4e27f3f23d8deb6467adf35081dea14a4ae..f938b04a58dc8744bac883d97c27bb4aeb686ace 100644 (file)
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -26,7 +26,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 
 #if HAVE_DLFCN_H

diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c
index ad69312c2f2daa9947f48e4dd9d66f8d977113f0..3e400b7605a733b9d257b5525ad6318e37ad548d 100644 (file)
--- a/src/locking/sanlock_helper.c
+++ b/src/locking/sanlock_helper.c
@@ -6,7 +6,7 @@
 #include "configmake.h"
 #include "internal.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "domain_conf.h"
 
 

diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c
index d023b84b1b929cbaf6c208736bbce41fabe9783a..74f31566539f69ff6421521ef1beb07fa5822be8 100644 (file)
--- a/src/lxc/lxc_cgroup.c
+++ b/src/lxc/lxc_cgroup.c
@@ -26,7 +26,7 @@
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircgroup.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index a5ba2f75687409eac360bc59f50d23cc6302bf4f..ede79d154f45378f7a438444e9e60dd23fa5463d 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -30,7 +30,7 @@
 #include "nodeinfo.h"
 #include "virterror_internal.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "configmake.h"

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 760d3af631ca603d8263ff1ae585d479d9f9fb67..6b66fdebabdcd1436c9e98d5b300ec48a5ac2847 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -57,7 +57,7 @@
 #include "virlog.h"
 #include "lxc_container.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virnetdevveth.h"
 #include "uuid.h"
 #include "virfile.h"

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index f0e08e33919ff8a0ce31746d2a2e186a92445974..4520a5f0d9d26e70aea6d94bf6c0a5214d586fa8 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -62,7 +62,7 @@
 #include "lxc_fuse.h"
 #include "virnetdev.h"
 #include "virnetdevveth.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "virpidfile.h"

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 77a64dd134c08db3e038fabb647bccf61e0e80cf..fab150630d833d42aada1dc3147493ee824755ab 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -23,7 +23,7 @@
 
 #include "lxc_domain.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 826532838be3b29646272167138e69274103a09b..a595dd99f1c634e2816584402bb645996a320bee 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -45,7 +45,7 @@
 #include "lxc_domain.h"
 #include "lxc_driver.h"
 #include "lxc_process.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virnetdevbridge.h"
 #include "virnetdevveth.h"

diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index a888122069c0dd7ed28367886076efb7ee7128ba..987801710648ccae916936a0224d4c5213a068b2 100644 (file)
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -33,7 +33,7 @@
 
 # include "lxc_conf.h"
 # include "util.h"
-# include "memory.h"
+# include "viralloc.h"
 
 struct virLXCMeminfo {
     unsigned long long memtotal;

diff --git a/src/lxc/lxc_hostdev.c b/src/lxc/lxc_hostdev.c
index aa450ecfe8eb039b69313350cf5e4bb575e8229e..f01fc5630c242bce4eeb1e45fdf577af059d1861 100644 (file)
--- a/src/lxc/lxc_hostdev.c
+++ b/src/lxc/lxc_hostdev.c
@@ -24,9 +24,9 @@
 #include <config.h>
 
 #include "lxc_hostdev.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "memory.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c
index 9eb587d8af4b4d0e904663a0b7ffee4833cc4f63..90637ebd1ff2577dfe1cbad12a971f656e7ec31c 100644 (file)
--- a/src/lxc/lxc_monitor.c
+++ b/src/lxc/lxc_monitor.c
@@ -25,7 +25,7 @@
 #include "lxc_protocol.h"
 #include "lxc_monitor_dispatch.h"
 
-#include "memory.h"
+#include "viralloc.h"
 
 #include "virterror_internal.h"
 #include "virlog.h"

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 762a23de2f2a1d58d7819852062bc2341274b652..00bc1c62beea54ec132e77c91637eeed436846a2 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -38,7 +38,7 @@
 #include "virtime.h"
 #include "domain_nwfilter.h"
 #include "network/bridge_driver.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "domain_audit.h"
 #include "virterror_internal.h"
 #include "virlog.h"

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index e33650384fd9717b39dce77b5289769752d4d5a3..2265e5f3c6a19063831a2adfe378ec456202c0fb 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -54,7 +54,7 @@
 #include "virpidfile.h"
 #include "util.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "viriptables.h"
 #include "virlog.h"

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 48360e3b73afd044b1b596f8a82a9d3a1962faaf..d91481652213a3ea306584991be8e1cef2f501ae 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -32,7 +32,7 @@
 
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "node_device_conf.h"
 #include "node_device_hal.h"

diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c
index 59ba5c384c325768d2f57f6b62036dd07c0d0cd8..6f89f169d53dbee87ba0e531cc18069396bb6bd0 100644 (file)
--- a/src/node_device/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "driver.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "pci.h"
 #include "virlog.h"

diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c
index fbe0da517b431c94d3393569708c617c7082d04c..be5d3ed9f185870a327652a6c54dc56a706a2692 100644 (file)
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -29,7 +29,7 @@
 #include "node_device_driver.h"
 #include "node_device_hal.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index fef00ad131b7b7b968a5d7fa1029ae412e48a0f7..81a11d7120ec32a02f0c017b1224c2cab3f9cd4d 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -33,7 +33,7 @@
 #include "driver.h"
 #include "datatypes.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "util.h"
 #include "virbuffer.h"

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 0a456fa5dc67455925ea236ad993905f12889e74..71a52afcc6809ce7ec3dd7d4bbde2e62e2d69524 100644 (file)
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -44,7 +44,7 @@
 #endif
 
 #include "c-ctype.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "nodeinfo.h"
 #include "physmem.h"
 #include "util.h"

diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c
index 68aa233fbfc80e2216d2519eec22db5efd1f7fc0..a798e951d2f599a38e4b9ef65ff9d30dfd4989ec 100644 (file)
--- a/src/nwfilter/nwfilter_dhcpsnoop.c
+++ b/src/nwfilter/nwfilter_dhcpsnoop.c
@@ -54,7 +54,7 @@
 #include <netinet/udp.h>
 #include <net/if.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "virterror_internal.h"

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 7fde656bf7b24f2557ca3ac4748fff5672832810..4b1188db288bcfb029d98d22d3054a78e444bafb 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -34,7 +34,7 @@
 
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "domain_conf.h"
 #include "domain_nwfilter.h"
 #include "nwfilter_conf.h"

diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c
index 23a43d2da312ed98fb2dfb9d9e44e7e011fd360d..092ae5a15d20846e5caa6d8b9e71718c326bf6a3 100644 (file)
--- a/src/nwfilter/nwfilter_ebiptables_driver.c
+++ b/src/nwfilter/nwfilter_ebiptables_driver.c
@@ -31,7 +31,7 @@
 #include "internal.h"
 
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "domain_conf.h"

diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c
index 6be4a930f81c3b3cb865eebc2526a3e6401eb643..2b4cc8e3192230526003d5fbaaede93e2c7d9a2b 100644 (file)
--- a/src/nwfilter/nwfilter_gentech_driver.c
+++ b/src/nwfilter/nwfilter_gentech_driver.c
@@ -26,7 +26,7 @@
 
 #include "internal.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "domain_conf.h"
 #include "virterror_internal.h"

diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c
index 110eae845e32149b35e7e64355ccaf1e9f090b5f..8c4bbcfb79e67f06fb3407cec4aa1b76edd92df6 100644 (file)
--- a/src/nwfilter/nwfilter_learnipaddr.c
+++ b/src/nwfilter/nwfilter_learnipaddr.c
@@ -42,7 +42,7 @@
 
 #include "intprops.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "virnetdev.h"

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 5448a331efe254fda35133d597f3fc6b498cc6f0..7e42b51f5ea209a4323c234623edd6e22648b62b 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -47,7 +47,7 @@
 #include "openvz_util.h"
 #include "uuid.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "nodeinfo.h"
 #include "virfile.h"

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index e51bf296c13277fa5d938caa65c41e4881d572de..4c884998e248768576b1a3b6d2edea2c4db267ee 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -52,7 +52,7 @@
 #include "util.h"
 #include "openvz_conf.h"
 #include "nodeinfo.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 #include "virtypedparam.h"
 #include "virlog.h"

diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c
index 4163e196724ae01660aaf2b32d0594d8b1ec65b9..51b22c9492ad8c20db8249af76177cb3196ca0ff 100644 (file)
--- a/src/openvz/openvz_util.c
+++ b/src/openvz/openvz_util.c
@@ -28,7 +28,7 @@
 #include "virterror_internal.h"
 #include "vircommand.h"
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #include "openvz_conf.h"
 #include "openvz_util.h"

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index cc65117b0e98f2a90e418810beaa74ed06319389..e3d2711a7954d4febafd87e4927d9c9f8404a1d8 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -42,7 +42,7 @@
 
 #include "datatypes.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 #include "vircommand.h"

diff --git a/src/parallels/parallels_network.c b/src/parallels/parallels_network.c
index 40706aafa054714bcf9214bd709aeee936d3de04..4729f187dfa26433e7f51218466ac4bd9d5fdf48 100644 (file)
--- a/src/parallels/parallels_network.c
+++ b/src/parallels/parallels_network.c
@@ -23,7 +23,7 @@
 #include <config.h>
 
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "md5.h"
 

diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c
index 90fa10434872305daf112a1a683a60a5bd0de061..f546d28d6d36b90c0eebd440918016ec239f64a0 100644 (file)
--- a/src/parallels/parallels_storage.c
+++ b/src/parallels/parallels_storage.c
@@ -31,7 +31,7 @@
 #include <libgen.h>
 
 #include "datatypes.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "configmake.h"
 #include "storage_file.h"
 #include "virterror_internal.h"

diff --git a/src/parallels/parallels_utils.c b/src/parallels/parallels_utils.c
index b032882ea75e91dcdb8979397929b77710a0cfae..9e317b11920d61cb16d8a1a40e50a90c2019d958 100644 (file)
--- a/src/parallels/parallels_utils.c
+++ b/src/parallels/parallels_utils.c
@@ -26,7 +26,7 @@
 
 #include "vircommand.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virjson.h"
 
 #include "parallels_utils.h"

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index f1d994c02e42ee4f30d6b69c3690661c9e2a7b57..b09156ff3f6a55f4df0700c289b36e1f890d1123 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -47,7 +47,7 @@
 #include "util.h"
 #include "datatypes.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"
 #include "libvirt/libvirt.h"

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index 421e43f0945ef489d2e401b5b1ed288b77b5cf46..ec1e3002e06ac5dd4365f06b73f80be597eeba04 100644 (file)
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -34,7 +34,7 @@
 
 #include "qemu_agent.h"
 #include "qemu_command.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "virjson.h"

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 592ddd1e73aee2630773e6190a448ed374530328..ba2e30f0a0c8032f942cf9e30d3b5592e4408ca5 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "qemu_capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "util.h"

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 80ceee5459de10968356c10f72713d3d51b7f8c4..de4a5be9617c62ed6b417974c808c96783c42d6e 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -28,7 +28,7 @@
 #include "qemu_process.h"
 #include "vircgroup.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "util.h"
 #include "domain_audit.h"

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 52a96b941cfe75ce81eaf787c53c4f513eb9e451..2a5b08d3cba4f87cde0385fc80c538aef83f1bd7 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -28,7 +28,7 @@
 #include "qemu_capabilities.h"
 #include "qemu_bridge_filter.h"
 #include "cpu/cpu.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "util.h"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 2073fd5acb3d015b2e91c909e43f834d7498199a..9e0789f835b96c841443a757cbe00db27b75a45e 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -43,7 +43,7 @@
 #include "virbuffer.h"
 #include "virconf.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "datatypes.h"
 #include "xml.h"
 #include "nodeinfo.h"

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e6eaa58413df01ba189c1ca2026435562c88a5cf..8dcadbc57951a9be98f28be7bf635e1c3c3ff54f 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -27,7 +27,7 @@
 #include "qemu_command.h"
 #include "qemu_capabilities.h"
 #include "qemu_migration.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "c-ctype.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4d81a730ecb3eeeff22ff1611b64d239dfd4a9fa..d97fc165826e72e1af2864195c1c6b247df72e0b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -66,7 +66,7 @@
 #include "nodeinfo.h"
 #include "stats_linux.h"
 #include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"

diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c
index 94b5ae003acc9e83b9b206283d5b6870f52f39d2..051f0d914a81b8f40acc6c434edadf5e09b571a2 100644 (file)
--- a/src/qemu/qemu_hostdev.c
+++ b/src/qemu/qemu_hostdev.c
@@ -26,7 +26,7 @@
 #include "qemu_hostdev.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "pci.h"
 #include "virusb.h"
 #include "virnetdev.h"

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index f8420c4c3d325af5c980a74278366b6bb0ad715a..37e3ada129fe3a6fbe99c4b9e1290882f997373f 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -35,7 +35,7 @@
 #include "virlog.h"
 #include "datatypes.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "pci.h"
 #include "virfile.h"
 #include "qemu_cgroup.h"

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 4248298ee81e7ec46b7ddfa295d785f10a4af2b0..ff453beaef5cc7214f22a99fa70299d9cabea9a7 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -38,7 +38,7 @@
 #include "domain_audit.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "datatypes.h"

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 920453d27028722b39c682c72dcdb951e15e01f1..5ca1f899945f12e2fd99a2f069aeaa0d7cde9346 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -32,7 +32,7 @@
 #include "qemu_monitor_text.h"
 #include "qemu_monitor_json.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virprocess.h"

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index e14134b47a29cb57c749336b47a582dd3bac165f..0137291dddf0f1d176f72be80cbab4dcbc155c10 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -35,7 +35,7 @@
 #include "qemu_monitor_json.h"
 #include "qemu_command.h"
 #include "qemu_capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"
 #include "datatypes.h"

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 28690b16cbfc117851deccf33e43f28efd760413..82e9108d8aefa299919e29a39ee4f5e215255bc2 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -34,7 +34,7 @@
 #include "qemu_command.h"
 #include "c-ctype.h"
 #include "c-strcasestr.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"
 #include "datatypes.h"

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 00ff24302e8fbc156e48e8999ff55ccaa42dd83c..c43c968e7611d0f1cdc61366842b7f6fccd6044c 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -53,7 +53,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virhook.h"
 #include "virfile.h"
 #include "virpidfile.h"

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 1e9151ab6cfc6cd3aea7f4750a64f16a71dc28fb..2edf6e64633a2634c8f8e8c8c7e172c6736d0386 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -38,7 +38,7 @@
 #include "remote_driver.h"
 #include "remote_protocol.h"
 #include "qemu_protocol.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "vircommand.h"

diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 8fc1cba46b7bb193bdc9a6a588514b303340cedb..91af3157fdd08f5ec78b2b509f93b438dd22dbd5 100644 (file)
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virfile.h"
 #include "virlog.h"

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 7370ae06d73d07c7a490b2bd359c7b384427c20c..b4fe4d94e5067cd8a591fb06b502e66be34b5e99 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -30,7 +30,7 @@
 #include "virnetclient.h"
 #include "virnetsocket.h"
 #include "virkeepalive.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virfile.h"
 #include "virlog.h"

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index dec3943a892c73f64e6a5c2973cffcc6a050efb6..739697103b1d21c2ab632907ae7ac1d043a65d48 100644 (file)
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -28,7 +28,7 @@
 #include "virnetclient.h"
 #include "virnetprotocol.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "util.h"

diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index 26dc2924c703d5316a2c733399cdecb68fb1d3c8..4877b0caf6d41dd7853ab4e77340980b74777aa3 100644 (file)
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -24,7 +24,7 @@
 
 #include "virnetclientstream.h"
 #include "virnetclient.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "threads.h"

diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index 16d8e61ba6bf9419cac81ab151a635927e3101b6..f273811aba69e74c5464962b9bb3d0c07baba508 100644 (file)
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "virnetmessage.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c
index e880127fcc4e101513466458911943d35b5cfd9c..adc4f1e6082a722d3090d8a7e51b9cb6ba4a9895 100644 (file)
--- a/src/rpc/virnetsaslcontext.c
+++ b/src/rpc/virnetsaslcontext.c
@@ -26,7 +26,7 @@
 #include "virnetmessage.h"
 
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virlog.h"
 

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index 6d3532ad6e4a3ba3a27fe6ec418db857ca8fa18a..67cd4b5444ca08916f88a4da98c29885d66727df 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -29,7 +29,7 @@
 
 #include "virnetserver.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "threads.h"
 #include "threadpool.h"

diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index 9642ea5496551d2b163cec0f8277cf7180a4118a..7f028b87e7793d18b807c03af891a05fc523173d 100644 (file)
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -31,7 +31,7 @@
 
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virkeepalive.h"
 

diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index c17b65dd30501e8b426a4e08f594f052c70c27f3..daef2b4a2f42f939ac731a62078a3c53050e6f15 100644 (file)
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -42,7 +42,7 @@
 
 #include "virnetservermdns.h"
 #include "vireventpoll.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 

diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c
index 5b96c34039689137349730156f1b4067547ba134..287282e321659fca2936634fc4d5bfdd5af33852 100644 (file)
--- a/src/rpc/virnetserverprogram.c
+++ b/src/rpc/virnetserverprogram.c
@@ -26,7 +26,7 @@
 #include "virnetserverprogram.h"
 #include "virnetserverclient.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index a9362adaf5f87661ca4461866b9b92c6db8404fc..92b5cef9bb3cc1c1d7aae7cae7d5082e18f30c3c 100644 (file)
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -25,7 +25,7 @@
 
 #include "virnetserverservice.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "threads.h"
 

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index aa8f4b9c472a9b206c71f20b35c05627ab099e64..8c62a2a4adf55182c2286fe519ad7b3230018e05 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -42,7 +42,7 @@
 #include "c-ctype.h"
 #include "virnetsocket.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 734acaaba45a2c1360856c08b20993a4c69f673f..8a7d5f9a3d48f75bfcb7c04ee419b58107e5f28a 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "configmake.h"
 #include "threads.h"

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 29310030df58d8e4f7a4735cd9968d0fce53ba6a..d9354e0b762082e31653f1e27b247063a450cdc4 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -30,7 +30,7 @@
 
 #include "virnettlscontext.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "util.h"
 #include "virlog.h"

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 415935801fd8a77e19ffadbaa54c58e1151602ec..fb2024b1d2024363bcf2f77475c1b33805fbbc06 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -33,7 +33,7 @@
 #include "datatypes.h"
 #include "driver.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "secret_conf.h"
 #include "secret_driver.h"
 #include "threads.h"

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 92620919ea4b879c8e0e79cb484ac7896645874d..b2678ca47e8302b3710c1f0cc5ac9276856dcf17 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -39,7 +39,7 @@
 
 #include "security_apparmor.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "uuid.h"

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 931ae4ee56aabee13447aa33fdbc2ce48a50daed..7084e33b6183d98475ecc41745feb6ba5fc63cc8 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -26,7 +26,7 @@
 #include "security_dac.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "pci.h"
 #include "virusb.h"

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index c675715c6881d1f89dfbf0450ff7ff1dd696be3f..d6a3f644740350bff86505be1f66c91e9ae9b4b5 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -27,7 +27,7 @@
 #include "security_stack.h"
 #include "security_dac.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 11f839f3339df28796a6ca0b2c2c7b9f0d7b99ac..ad43bc8493ee26786e4a207da04faa0cbb53215b 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -35,7 +35,7 @@
 #include "security_selinux.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "pci.h"
 #include "virusb.h"

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 65d42406a60c4214f880812ceabf4beddeac81dd..341237204a28a38da7485ead44c020fe76cbf8f3 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -23,7 +23,7 @@
 #include "security_stack.h"
 
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY
 

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index cedffbd60c808830d5506d19f2ee239836b73ed5..32959173fddc3f1bc9169bb7e65efd5313107086 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -42,7 +42,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircommand.h"
 
 #include "security_driver.h"

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 899caeb5ed684328d6b4b94ab108df186d3b2612..cdc5bda77b15dd62a2132faec9f0e46880a64bef 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -48,7 +48,7 @@
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "internal.h"
 #include "secret_conf.h"
 #include "uuid.h"

diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 7e1d3ecbb628f3d4a452ff528c47648732c42bdd..8759b3a8cd68875d5f2efdd2afe1210b50b30cab 100644 (file)
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -30,7 +30,7 @@
 #include "virlog.h"
 #include "storage_backend_disk.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircommand.h"
 #include "configmake.h"
 

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 78b50f003c27def6b0e035aeb712532a8ea7b664..f7b46566ab17a06dfbfa1d03ae3dff17eb89e40a 100644 (file)
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -46,7 +46,7 @@
 #include "storage_conf.h"
 #include "storage_file.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "virfile.h"
 #include "virlog.h"

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index 46659af4030374186b100cda5f9614bc33f9981b..ecb8f8e42d95e5497c8b11e970c7162f276bf16e 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -38,7 +38,7 @@
 #include "storage_backend_scsi.h"
 #include "storage_backend_iscsi.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "vircommand.h"

diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index f28c663661ccc217b2c0737e932771ce6efa8fb7..83b517cde466af772e39037d07cfdc132bf202da 100644 (file)
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -35,7 +35,7 @@
 #include "storage_backend_logical.h"
 #include "storage_conf.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 

diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c
index 1ca120fb330cd6e7a2218d45bf62cbd0496ff21e..0e5d0329e5950568b208ea6cbb806eedc0fdd3a1 100644 (file)
--- a/src/storage/storage_backend_mpath.c
+++ b/src/storage/storage_backend_mpath.c
@@ -32,7 +32,7 @@
 #include "virterror_internal.h"
 #include "storage_conf.h"
 #include "storage_backend.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 4e58911f8f5ca9e71fc792eefd15bbec7c47d721..e1f07abb4bc0cac4496243c7944fdaef3c2d336d 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -26,7 +26,7 @@
 #include "storage_backend_rbd.h"
 #include "storage_conf.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "base64.h"
 #include "uuid.h"

diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c
index 32713be0c5557a98456e032602223852cd626813..1db8fdd6b35771b46277568d7f733637b2096b95 100644 (file)
--- a/src/storage/storage_backend_scsi.c
+++ b/src/storage/storage_backend_scsi.c
@@ -30,7 +30,7 @@
 
 #include "virterror_internal.h"
 #include "storage_backend_scsi.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "vircommand.h"

diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index 05deeeb161d8adb95daf7582e3779e4006cd55c8..d3b9d87afa56b9020df77c6460646771bfdbd1ad 100644 (file)
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -31,7 +31,7 @@
 #include "storage_conf.h"
 #include "vircommand.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 6076f6cbbb7b76dff303734410157c3bbd8be1d5..aebf8bb546a29c86d3b84354dbe15f947d4a77bd 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -42,7 +42,7 @@
 #include "util.h"
 #include "storage_driver.h"
 #include "storage_conf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "storage_backend.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 8dd56948077d45fa93313b4b2e46a760f413566d..0856cdbaa612801950faaccd552edbf637e58a45 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -39,7 +39,7 @@
 #include "util.h"
 #include "uuid.h"
 #include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "network_conf.h"
 #include "interface_conf.h"
 #include "domain_conf.h"

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 6b14f231e33a3d3110aeff083a2ae3cd15d002a8..496f2795368d5d84577646208ea7ed37b7a2a76e 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -39,7 +39,7 @@
 #include "virbuffer.h"
 #include "virconf.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "nodeinfo.h"
 #include "virlog.h"
 #include "domain_nwfilter.h"

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 90c9b662cae034e2ad34301ac46825c373ce855c..cece114b00e5619e4ab5fc380be6a5a374aea355 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -51,7 +51,7 @@
 #include "nodeinfo.h"
 #include "stats_linux.h"
 #include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "uuid.h"
 #include "domain_conf.h"
 #include "domain_audit.h"

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index a9c8b4cefa4c96c38f32c6c2f0980e6f0dc6eb78..1b16d5c960759fb1a4a7ff8e9d8ff117d771c138 100644 (file)
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -36,7 +36,7 @@
 #include "util.h"
 #include "threads.h"
 #include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "configmake.h"
 #include "virrandom.h"

diff --git a/src/util/pci.c b/src/util/pci.c
index 7adce758b7a8540a6c8b5496972708deed579769..e4009fa87e51a0de4e022a212e08b848d43ab935 100644 (file)
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircommand.h"
 #include "virterror_internal.h"
 #include "virfile.h"

diff --git a/src/util/sexpr.c b/src/util/sexpr.c
index f72b7d7a156a20ab4f0a6da0660be3072b0f082a..ae0cc186ee88e37e8600606a47dd33d278fae191 100644 (file)
--- a/src/util/sexpr.c
+++ b/src/util/sexpr.c
@@ -20,7 +20,7 @@
 #include "virterror_internal.h"
 #include "sexpr.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_SEXPR
 

diff --git a/src/util/stats_linux.c b/src/util/stats_linux.c
index 2dfc30d846e4242f734b26c386beb11f0e135af3..67ef82e589c6c5275114d921e7e47803b2afc920 100644 (file)
--- a/src/util/stats_linux.c
+++ b/src/util/stats_linux.c
@@ -36,7 +36,7 @@
 # include "datatypes.h"
 # include "util.h"
 # include "stats_linux.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "virfile.h"
 
 # define VIR_FROM_THIS VIR_FROM_STATS_LINUX

diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 6c3390b6c48c7c434ba3ad9f9a747d01825c8d31..a020bb257778baa603e36917eab09950cc05ec5e 100644 (file)
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -35,7 +35,7 @@
 # include <sys/statfs.h>
 #endif
 #include "dirname.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c
index f07c2d8344b365d0b970c00c768d5b9259910677..6da87ce7bb5b5f61b844e3c566498b68bc121d84 100644 (file)
--- a/src/util/sysinfo.c
+++ b/src/util/sysinfo.c
@@ -34,7 +34,7 @@
 #include "sysinfo.h"
 #include "util.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircommand.h"
 
 #define VIR_FROM_THIS VIR_FROM_SYSINFO

diff --git a/src/util/threadpool.c b/src/util/threadpool.c
index ffbbe7207b977844c583a9bf69ab8d8842a424e0..9d3d5d26cd999054396a2ef2a51658ee3e39e33a 100644 (file)
--- a/src/util/threadpool.c
+++ b/src/util/threadpool.c
@@ -26,7 +26,7 @@
 #include <config.h>
 
 #include "threadpool.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c
index 44e8bc050aac319a21b48af5bf5dd4ccb0e6e2bc..37d8902eaafae2e400fd6a8ad7003d449b5299c9 100644 (file)
--- a/src/util/threads-pthread.c
+++ b/src/util/threads-pthread.c
@@ -27,7 +27,7 @@
 # include <sys/syscall.h>
 #endif
 
-#include "memory.h"
+#include "viralloc.h"
 
 
 /* Nothing special required for pthreads */

diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c
index 142aa4f32bed4eb70fcd5f9b14173259f0c807fd..c9f16c1eb7c765ecd5920b9d6ad6f83ba9b9a93e 100644 (file)
--- a/src/util/threads-win32.c
+++ b/src/util/threads-win32.c
@@ -23,7 +23,7 @@
 
 #include <process.h>
 
-#include "memory.h"
+#include "viralloc.h"
 
 struct virThreadLocalData {
     DWORD key;

diff --git a/src/util/util.c b/src/util/util.c
index f941dfdb7949554e771fe5366e965121ec2960c8..c070d94a420e933637e47fd02f392d2fb9a4523f 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -80,7 +80,7 @@
 #include "virbuffer.h"
 #include "util.h"
 #include "storage_file.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "verify.h"
 #include "virfile.h"

diff --git a/src/util/uuid.c b/src/util/uuid.c
index 6efc7be91477dcbdb08e336e815c4de50191d17f..5232ba93ddb9898821a09cf15568dc4967ba32f8 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -38,7 +38,7 @@
 #include "util.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 #include "virrandom.h"
 

diff --git a/src/util/memory.c b/src/util/viralloc.c
similarity index 99%
rename from src/util/memory.c
rename to src/util/viralloc.c
index 186d3b61b4c1bb3689e68df6b3787042ed755d01..58d4bcdb0c57ca8da7b1e53d52a9a308d67528fd 100644 (file)
--- a/src/util/memory.c
+++ b/src/util/viralloc.c
@@ -1,5 +1,5 @@
 /*
- * memory.c: safer memory allocation
+ * viralloc.c: safer memory allocation
  *
  * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2008 Daniel P. Berrange
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <stdlib.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #if TEST_OOM

diff --git a/src/util/memory.h b/src/util/viralloc.h
similarity index 99%
rename from src/util/memory.h
rename to src/util/viralloc.h
index 839810568e937b068b2ee7c7d870c67a0e94424c..37ec5ee8943f9fc1b36a7b8398210b098cd83477 100644 (file)
--- a/src/util/memory.h
+++ b/src/util/viralloc.h
@@ -1,5 +1,5 @@
 /*
- * memory.c: safer memory allocation
+ * viralloc.h: safer memory allocation
  *
  * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2008 Daniel P. Berrange

diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index c4e0129716d2dc14a8a2affe0bf0a4bca5714986..a807b7604120f23922c03e0ededf71adfc37c8ab 100644 (file)
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -32,7 +32,7 @@
 #include "viraudit.h"
 #include "util.h"
 #include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
 
 /* Provide the macros in case the header file is old.
    FIXME: should be removed. */

diff --git a/src/util/virauth.c b/src/util/virauth.c
index a1bad6aa5f240af6e4d82b210386fd549a47ceac..c4c5676f43fb572e77b89bc1911df10c2319c4be 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -26,7 +26,7 @@
 
 #include "virauth.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"
 #include "virterror_internal.h"

diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index 46ba04051de971d312418ebbc72e25655330eb6e..a0f0be56d093c38962ff0e45350046236fe2c342 100644 (file)
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -25,7 +25,7 @@
 #include "virauthconfig.h"
 
 #include "virkeyfile.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index ec1483f104a3b1ef47c6274d57544ca4c8f54d13..a7ba60e1acc0b3f707b05eed64e31531845e8688 100644 (file)
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -31,7 +31,7 @@
 #include <sys/types.h>
 
 #include "virbitmap.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "util.h"
 #include "c-ctype.h"

diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
index c856c529a69a2e944931e3ddca93485681e4c707..969dcbf6b9408be31400b93396257084dfd8f6f1 100644 (file)
--- a/src/util/virbuffer.c
+++ b/src/util/virbuffer.c
@@ -31,7 +31,7 @@
 #define __VIR_BUFFER_C__
 
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 
 
 /* If adding more fields, ensure to edit buf.h to match

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 82e661346834a543adaaf5166fd6de50a2453180..5c628cc8907c6a712034d3e5d129f945ba2108cc 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -39,7 +39,7 @@
 
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircgroup.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 7bed04e2451e658de9b2c74ddfdfd762c93b09b7..6e17a8d9aa58ea411487273ef7d4b9fa44aba186 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -34,7 +34,7 @@
 #endif
 
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "util.h"
 #include "virlog.h"

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 84d3c698b8363f8ca9c782b3b3d781a8a9090f82..2cd92b5c855e56bacb11e873049eb9d17228896b 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -36,7 +36,7 @@
 #include "util.h"
 #include "c-ctype.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_CONF

diff --git a/src/util/virdbus.c b/src/util/virdbus.c
index b6c66422337d3620d1d9531265ba478dc32cdb1b..34c46b2c97c659d0026981237c5b11c8df368218 100644 (file)
--- a/src/util/virdbus.c
+++ b/src/util/virdbus.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "virdbus.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "threads.h"

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index e1c3133ea54b2dd172d01483440bce89ca0f385c..e71a0728068eb9417b0578a71a55c2625b58797c 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -45,7 +45,7 @@
 #include "virdnsmasq.h"
 #include "util.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/util/virebtables.c b/src/util/virebtables.c
index e8fdb8c584be354a1f80562f03298d7b111176ef..99afa50b58e78d2112bc221a514252a580d830ce 100644 (file)
--- a/src/util/virebtables.c
+++ b/src/util/virebtables.c
@@ -44,7 +44,7 @@
 #include "internal.h"
 #include "virebtables.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "threads.h"

diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index bdd405ff84500df6a9012a9a69cfb038ca2d88a6..535b2d44f6578dba3622c51084877f300be07ef8 100644 (file)
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -34,7 +34,7 @@
 #include "threads.h"
 #include "virlog.h"
 #include "vireventpoll.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "virterror_internal.h"

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 30294a2917c6e3c57082511e4d4cd9c7d073c754..f20ce64a517a70df2cdf2867d6c9b1892cede3fc 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -39,7 +39,7 @@
 
 #include "vircommand.h"
 #include "configmake.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 

diff --git a/src/util/virhash.c b/src/util/virhash.c
index 077abcac8a79813f66e6ec46a7cb756cd1864b10..a1234c4baea6bee0a26bc80e255c5b7cddd57a8f 100644 (file)
--- a/src/util/virhash.c
+++ b/src/util/virhash.c
@@ -26,7 +26,7 @@
 
 #include "virterror_internal.h"
 #include "virhash.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virhashcode.h"
 #include "virrandom.h"

diff --git a/src/util/virhook.c b/src/util/virhook.c
index b005f392fff741b504343d32c6661af3dc1e9d2e..140a78d19ef6aff699159c4a45aa8e62869ff47e 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -34,7 +34,7 @@
 #include "virhook.h"
 #include "util.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 #include "configmake.h"
 #include "vircommand.h"

diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index e8949af3da7704fbbe45ac292df1a1a62416bd7c..91a948f3f8ff1c92694447bf9595e36b2397a229 100644 (file)
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -30,7 +30,7 @@
 #include "virinitctl.h"
 #include "virterror_internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_INITCTL

diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 13dd31e24225f94027b9ab27c8a7804f252b1fdf..7929073d74d40240b05db861ab899eac0cf13477 100644 (file)
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -42,7 +42,7 @@
 #include "internal.h"
 #include "viriptables.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "threads.h"

diff --git a/src/util/virjson.c b/src/util/virjson.c
index b0d5a1523bd6b036f250622149b4731c85fbe43a..652e38dc60ce28c93c6d8c3f897b35880d5f7fe1 100644 (file)
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "virjson.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "util.h"

diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index b43b92de53bda0176bcf3b14a6045a14f9918c7e..fc61cf50e28d96435610dcd28cd919d7c9055dd5 100644 (file)
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -27,7 +27,7 @@
 
 #include "c-ctype.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virhash.h"
 #include "virkeyfile.h"

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index b6522946ae508d31bb02e9956e2d0065e3fb25c5..509b1624789e4957d182ebd5504bb2b4416f0dee 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -23,7 +23,7 @@
 
 #include "virlockspace.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "util.h"
 #include "virfile.h"

diff --git a/src/util/virlog.c b/src/util/virlog.c
index 3e0f7059ba9bcc3478b1aba63ebf931b5a95febf..73a3f55afb9e6015c26ed8539f36c8e9a0d022a0 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -42,7 +42,7 @@
 
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virbuffer.h"
 #include "threads.h"

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 5846aff5dba7d52307e3c1f883febb19696869d0..95a78977fbefa657f390a26f61884732307cef65 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -27,7 +27,7 @@
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "pci.h"
 #include "virlog.h"
 

diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index bd75a9d5b2d1ea16dccadb22bdb6620272aa168b..9cc885849cf65c93f08d84c5366468a4e1604319 100644 (file)
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -24,7 +24,7 @@
 
 #include "virnetdevbandwidth.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 2c4a9eb125532578154be7058fd5cb29097fe515..eb341a278c9b14456ab7bdd009307ba751d8b88b 100644 (file)
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -26,7 +26,7 @@
 #include "virterror_internal.h"
 #include "util.h"
 #include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "intprops.h"
 
 #include <sys/ioctl.h>

diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 8d2574c88a4375231c06965b6f1e75102bf6aa00..0f7107b5a152e53e86590fd9a9575739aed0acdf 100644 (file)
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -56,7 +56,7 @@ VIR_ENUM_IMPL(virNetDevMacVLanMode, VIR_NETDEV_MACVLAN_MODE_LAST,
 #  define MACVLAN_MODE_PASSTHRU 8
 # endif
 
-# include "memory.h"
+# include "viralloc.h"
 # include "virlog.h"
 # include "uuid.h"
 # include "virfile.h"

diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
index 983a240654dccad77bb83fcef5b0b7c8ff3bb302..b876a4e6152a7cd0fd39d4376313bac776bab466 100644 (file)
--- a/src/util/virnetdevopenvswitch.c
+++ b/src/util/virnetdevopenvswitch.c
@@ -25,7 +25,7 @@
 
 #include "virnetdevopenvswitch.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 #include "virmacaddr.h"
 

diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 644e9a4187a8a017880496a94bdd48b4331f5ad2..339d636e7085d77010f29fc6f18be7f2838425ec 100644 (file)
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "virfile.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "util.h"
 

diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 630b7c92a12fc358122583e47ca16e784f4fd3e6..c6568b73c27ee6d0036c0316f5a7eb1b9afbab63 100644 (file)
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -26,7 +26,7 @@
 #include <sys/wait.h>
 
 #include "virnetdevveth.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "vircommand.h"
 #include "virterror_internal.h"

diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c
index 7a6ff9b1ce16535b731811460a95e3ee71027012..53c6b6500933970d735d8c9f89deabfa9652167d 100644 (file)
--- a/src/util/virnetdevvlan.c
+++ b/src/util/virnetdevvlan.c
@@ -24,7 +24,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "virnetdevvlan.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 834b9b9f30d3beee2089115d26603cff211a703e..60acabd5584da66f07a5fceafab7c4382e5440c6 100644 (file)
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -24,7 +24,7 @@
 
 #include "virnetdevvportprofile.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET
 

diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
index 830e9b9084e4a8cdddfcca7dd8cd75321201a758..b132d9a59103728080c75e37d96a36eecd77ef16 100644 (file)
--- a/src/util/virnetlink.c
+++ b/src/util/virnetlink.c
@@ -37,7 +37,7 @@
 
 #include "virnetlink.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virmacaddr.h"
 #include "virterror_internal.h"

diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c
index e37a2d6f630a7fc220abf45296a5a45b57662b10..1528cf185f7bb2165c1578b275695c3458945834 100644 (file)
--- a/src/util/virnodesuspend.c
+++ b/src/util/virnodesuspend.c
@@ -26,7 +26,7 @@
 #include "threads.h"
 #include "datatypes.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/virobject.c b/src/util/virobject.c
index aa80cabb80deb7760540370e9fdadb09222c23af..5cdd2e87239d2d284dc03f5fcf85e06d09436899 100644 (file)
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -23,7 +23,7 @@
 
 #include "virobject.h"
 #include "threads.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "viratomic.h"
 #include "virterror_internal.h"
 #include "virlog.h"

diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 6ec97603bf2e51dadd2453befab697d08e980fa6..3b3322b3dcf4aba563b2866cc9a30ad2af26a46b 100644 (file)
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -29,7 +29,7 @@
 
 #include "virpidfile.h"
 #include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "intprops.h"
 #include "virlog.h"

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 3c0ed8a2eea9f39e46096fd17321472d524e191a..8070b8bff0b72467e1105fd14acc5e357c18dd85 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -28,7 +28,7 @@
 
 #include "virprocess.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "util.h"
 

diff --git a/src/util/virstring.c b/src/util/virstring.c
index 228c3fb418f6809506fc5408c041b076fe13661f..5607b3e217aa996cca2b331c82f45689ae56da7d 100644 (file)
--- a/src/util/virstring.c
+++ b/src/util/virstring.c
@@ -22,7 +22,7 @@
 #include <config.h>
 
 #include "virstring.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/virterror.c b/src/util/virterror.c
index 6e3301bef72f3d11ff8f893f981ec02ccee7ac3e..ce2d837acc8f7b1e0021c92fccfe4c8b9442bf15 100644 (file)
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "util.h"
 

diff --git a/src/util/virtime.c b/src/util/virtime.c
index a2610c444cc353ae57c580bf1938d4f29c44502c..f9fc2820cfeb32a3b75610acd61a47e00ed3a481 100644 (file)
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -38,7 +38,7 @@
 
 #include "virtime.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index 7f0a44be8366d568edd5957c8f8a2ed80b454375..e08530e17fab817f4d4cd0deabcfac68503b6cc8 100644 (file)
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -24,7 +24,7 @@
 
 #include <stdarg.h>
 
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/viruri.c b/src/util/viruri.c
index dd3b87819a89836cdc01b5bb5c6b4c6545c19e22..f48079d947f8a7af94fa16c7d0dc1944df9ec474 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -22,7 +22,7 @@
 
 #include "viruri.h"
 
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virterror_internal.h"
 #include "virbuffer.h"

diff --git a/src/util/virusb.c b/src/util/virusb.c
index d0e30246b931a7131eda01ac9c8e6c6f6c12ff41..c3dd50eaf09b203d72e6e1535c60203a2169e8ef 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -35,7 +35,7 @@
 
 #include "virusb.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/xml.c b/src/util/xml.c
index 5b08b1f0973b9b2f93c9c91419a36b7a5f3e0ea7..caf26a3d926552b30e857c824d5249c49b5f9772 100644 (file)
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -34,7 +34,7 @@
 #include "xml.h"
 #include "virbuffer.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 
 #define VIR_FROM_THIS VIR_FROM_XML

diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index 3194b7c7f6bfe9dbc22250727920b79b277707cb..cab4398bececf65975185c590af73ab82064d9e0 100644 (file)
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -30,7 +30,7 @@
 #define nsCID CLSID
 
 #include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 5f7028305b01437d0382b399465110800711a41b..5296127e4b1301b95b0f3fbcc042b1a673f7ce38 100644 (file)
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -37,7 +37,7 @@
 
 #include "vbox_XPCOMCGlue.h"
 #include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 3a456467efd6949e51a1cfaaf5480b6630329d3c..e39a9de69c555805ec430037d6e6705660c10490 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -49,7 +49,7 @@
 #include "storage_conf.h"
 #include "storage_file.h"
 #include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "nodeinfo.h"
 #include "virlog.h"
 #include "vbox_driver.h"

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index f82fcb3246e83ad42acc9e4aa5d5084e77d51230..6c8e9249ef2915cfa4145a5625ec86122b5100be 100644 (file)
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -26,7 +26,7 @@
 #include "vircommand.h"
 #include "cpu/cpu.h"
 #include "dirname.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "nodeinfo.h"
 #include "virfile.h"
 #include "uuid.h"

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index d9a1333faf5154c372dfc94bb1b1336c072b7a1f..233804ed511a7e45e29ceb8ac67bfc60f94b497e 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -27,7 +27,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virfile.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "uuid.h"
 #include "vircommand.h"

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index e34e15e4a43d906af27937fcc0393d091891d908..4d55f0b442b936f18f68693b958701b4eb4e6d19 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -28,7 +28,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "vmx.h"

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index e50b5ff3ede8bf22dca58768074eecfd8ca61780..126283b93def5b51785afa418e92718ede5b8029 100644 (file)
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -42,7 +42,7 @@
 # include "datatypes.h"
 # include "util.h"
 # include "block_stats.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "virfile.h"
 
 # define VIR_FROM_THIS VIR_FROM_STATS_LINUX

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index c281c009e5c64b7e54f8b99c4382dfdbcc585986..94df1169378b17f4ca84e720d1f5794b045ee252 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -55,7 +55,7 @@
 #endif
 #include "xml.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "node_device_conf.h"
 #include "pci.h"
 #include "uuid.h"

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index d6d387453cbd3343d2752beb2439ff4002730391..183788826a3367727518a1bdf0fc2d07d5bfb4ef 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -75,7 +75,7 @@
 #include "xend_internal.h"
 #include "virbuffer.h"
 #include "capabilities.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "threads.h"
 #include "virfile.h"
 #include "virnodesuspend.h"

diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c
index 073663f46accae19135c89ab2f5c783021bf7952..35a625ceae29757a79852943939a3eb7b633b4aa 100644 (file)
--- a/src/xen/xen_inotify.c
+++ b/src/xen/xen_inotify.c
@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "driver.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xen_driver.h"
 #include "virconf.h"
 #include "domain_conf.h"

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 0364f846ea448fde390578f3ebea2d42c35f22db..a4005f4e086f91a8a754e453e399d283228337cf 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -42,7 +42,7 @@
 #include "xen_driver.h"
 #include "xen_hypervisor.h"
 #include "xs_internal.h" /* To extract VNC port & Serial console TTY */
-#include "memory.h"
+#include "viralloc.h"
 #include "count-one-bits.h"
 #include "virfile.h"
 #include "viruri.h"

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index fc7b581304d747eb9b8beac0046af1fa476af1ed..2109972425bd53572f03497f818aefbd491ff8f9 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -46,7 +46,7 @@
 #include "virbuffer.h"
 #include "uuid.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "count-one-bits.h"
 

diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c
index 4cc82d8d49960e3355da1590df27ae57999c9222..e41496607572c9189eb1d9f62ee7e66df3a55ef9 100644 (file)
--- a/src/xen/xs_internal.c
+++ b/src/xen/xs_internal.c
@@ -44,7 +44,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "driver.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
 #include "xen_driver.h"

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 502c6534e615ae6638fec28e4453d9dea856c056..d49181c0af8a98231f7a7d368427a0f548d3c904 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -33,7 +33,7 @@
 #include "virauth.h"
 #include "util.h"
 #include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "viruri.h"
 #include "xenapi_driver.h"

diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 6f51100e44e99f448a7281da24cf1cc35e41ec15..33aa4d7559138708e4e4980ff1668689502c1f7e 100644 (file)
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -31,7 +31,7 @@
 #include "datatypes.h"
 #include "util.h"
 #include "uuid.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "virlog.h"
 #include "viruri.h"

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index 2aa384dc7291c4ea8b16595cc7dea5ed62dc9c96..0cbc248d50dda8e1cfd7ed054fd243dcc728d916 100644 (file)
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -29,7 +29,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "verify.h"
 #include "uuid.h"
 #include "virlog.h"

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index 5e284df7cf1920a61aca94c7059bad57fc92f409..8a64aad13d47dd9c7dbbe494d23ad2aa417588f4 100644 (file)
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -28,7 +28,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "verify.h"
 #include "uuid.h"
 #include "sexpr.h"

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 2100aa0e21386e502e34a2c9bc950069848c67a1..3c7fef550a6c436b1d5483e8abd218ab33099e55 100644 (file)
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -28,7 +28,7 @@
 
 #include "internal.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 #include "testutils.h"
 

diff --git a/tests/commandtest.c b/tests/commandtest.c
index f76bc54f2ae0f3b682a11a27708d7a8f3b33d740..b15c1688d4183dbe26c0428a6f50c12508e85a88 100644 (file)
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -32,7 +32,7 @@
 #include "internal.h"
 #include "nodeinfo.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "vircommand.h"
 #include "virfile.h"
 #include "virpidfile.h"

diff --git a/tests/conftest.c b/tests/conftest.c
index aacc5265dd9184aa047812bc974a1f0a9c835d37..d5467e800b0961f3521941d48eb82185776e0877 100644 (file)
--- a/tests/conftest.c
+++ b/tests/conftest.c
@@ -6,7 +6,7 @@
 #include <string.h>
 #include <errno.h>
 #include "virconf.h"
-#include "memory.h"
+#include "viralloc.h"
 
 int main(int argc, char **argv)
 {

diff --git a/tests/cputest.c b/tests/cputest.c
index 4a54c9fce7ccfbc35f1fa6c0238beea42eb2e863..62994094d1f75d75e9795ea900f6e8cf51791e58 100644 (file)
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -32,7 +32,7 @@
 
 #include "internal.h"
 #include "xml.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virbuffer.h"
 #include "testutils.h"
 #include "cpu_conf.h"

diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index 201b930edc01a96e65a09e961018c028aca03756..b65009b7880ed5a1a416de5152634e65f5f641f3 100644 (file)
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -7,7 +7,7 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "testutils.h"
 # include "util.h"
 # include "vmx/vmx.h"

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index dc0e06478fb9cac0f9f18a38c7147772a33b89ea..397954089ebdf5525ba6668c1d1254a585248f41 100644 (file)
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -12,7 +12,7 @@
 #include "testutils.h"
 #include "network_conf.h"
 #include "vircommand.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "network/bridge_driver.h"
 
 static int

diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 305c7b13a9b52449488973ea8f53e3d4f6c24de6..80701a23a6eb2a267cf2195ce71cdf7a2cde7bb2 100644 (file)
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -7,7 +7,7 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "testutils.h"
 # include "util.h"
 # include "openvz/openvz_conf.h"

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index caa7d645afd7e2bdae69db5eb5107bc976370822..252ad3a7f69e4267b96a000624ad2fdb4833b651 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -7,7 +7,7 @@
 
 # include "testutils.h"
 # include "qemu/qemu_capabilities.h"
-# include "memory.h"
+# include "viralloc.h"
 
 struct testInfo {
     const char *name;

diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c
index 82f861b36ba927892dade7d303f9c5d36151100a..21a6828c16c869713a10ff5ab6208ba6161c5ebb 100644 (file)
--- a/tests/qemumonitortest.c
+++ b/tests/qemumonitortest.c
@@ -8,7 +8,7 @@
 #ifdef WITH_QEMU
 
 # include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "testutils.h"
 # include "util.h"
 # include "qemu/qemu_monitor.h"

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index e4194ded3f7c73647f5f9b81a46eeca2f7da0532..1e3f0da5fcf80a3b4778f0aa4408fecda3ac343b 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -29,7 +29,7 @@
 #include "threads.h"
 #include "qemu/qemu_monitor.h"
 #include "rpc/virnetsocket.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 1555b6efc17ffc5ee5a56f88126c14bd7021906a..9e2c4e44d5d51554970624b99584117ad2f95a9f 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -12,7 +12,7 @@
 
 # include "internal.h"
 # include "testutils.h"
-# include "util/memory.h"
+# include "viralloc.h"
 # include "qemu/qemu_capabilities.h"
 # include "qemu/qemu_command.h"
 # include "qemu/qemu_domain.h"

diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index f8a248129b664ddc5fd01332b5f61a9a64975922..0e4959e6dc98500a8a8df39356bbf0c41a92fe65 100644 (file)
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -30,7 +30,7 @@
 
 #include "internal.h"
 #include "testutils.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/tests/sockettest.c b/tests/sockettest.c
index c6a175fa4e640b307038e5a4849408e523ad58ae..156ef454c6289261427b1dab746bda09a056ce51 100644 (file)
--- a/tests/sockettest.c
+++ b/tests/sockettest.c
@@ -28,7 +28,7 @@
 #include "virsocketaddr.h"
 #include "testutils.h"
 #include "virlog.h"
-#include "memory.h"
+#include "viralloc.h"
 
 static void testQuietError(void *userData ATTRIBUTE_UNUSED,
                            virErrorPtr error ATTRIBUTE_UNUSED)

diff --git a/tests/testutils.c b/tests/testutils.c
index 96e24d47435fef988397387cc245454274c307bc..7bb88f0debd94126a2295342d3cd15cfc012e309 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -39,7 +39,7 @@
 #include <limits.h>
 #include "testutils.h"
 #include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "threads.h"
 #include "virterror_internal.h"

diff --git a/tests/testutils.h b/tests/testutils.h
index 82837ab7778dba29445f5ac9f11829d8fa82e918..581bd3e3caedb7fb4e3e2c6323a74f775138086e 100644 (file)
--- a/tests/testutils.h
+++ b/tests/testutils.h
@@ -24,7 +24,7 @@
 # define __VIT_TEST_UTILS_H__
 
 # include <stdio.h>
-# include "memory.h"
+# include "viralloc.h"
 
 # define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */
 # define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken */

diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index ea2a558896e287ad64743158f456c67cabc5e0fe..b0a258053e4cdf0a265daa51a9207e397f647aa2 100644 (file)
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -4,7 +4,7 @@
 
 # include "testutilslxc.h"
 # include "testutils.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "domain_conf.h"
 
 

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 2ad9b2eee1ae2ec82b30c2a43a8d9009d3a2cadf..573927df572c3d940862a26e07f245a30eb423d0 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -4,7 +4,7 @@
 
 # include "testutilsqemu.h"
 # include "testutils.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "cpu_conf.h"
 # include "qemu/qemu_driver.h"
 # include "qemu/qemu_domain.h"

diff --git a/tests/utiltest.c b/tests/utiltest.c
index 774a2f7dd442dc8083cb7fd7b35230de5f8bdb93..4fbb25ca7025c7f58d380e937fba3a7d091c1b78 100644 (file)
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -6,7 +6,7 @@
 #include <unistd.h>
 
 #include "internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "testutils.h"
 #include "util.h"
 

diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 74cc18700eed5e8ed659bef092e8db8d7a724f57..9e7dac5859bb5d420ba50b5515fcc7aca08ce8e6 100644 (file)
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -26,7 +26,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "virauthconfig.h"

diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index 53b9bbe7493765ae9522e3d793a8225cdeb84c73..ec93939c4318d1424cb06dec5ba79c47c494da83 100644 (file)
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -8,7 +8,7 @@
 #include "util.h"
 #include "testutils.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 
 #define TEST_ERROR(...)                             \
     do {                                            \

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index 440ee8e1d811bb092f836bb3c1c6b4c343be04e0..e06179fbee5246dd0c99c954c6aa97893de65eaa 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -23,7 +23,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "driver.h"
 

diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index 7de16d0c029005a87bb315fb77ee1cc222ebaa2e..a2a40c6dfe95c7387d36b44483071593fa431ff3 100644 (file)
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -9,7 +9,7 @@
 #include "virhash.h"
 #include "virhashdata.h"
 #include "testutils.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virlog.h"
 

diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index c6aca862a9412a6103b771817d0aee1dcf58b445..ad5a516a6d4667333008d997c38372a8e3802a8e 100644 (file)
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -26,7 +26,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "virkeyfile.h"

diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index c95f5d84e5bea057c8637fd6842051819a0486bd..80478d94b97181f15d4a4ee89b6fd58e17660783 100644 (file)
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -27,7 +27,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "virlockspace.h"

diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index c20f5e6e588391208ddb0da27abab480a1c4d3f1..e3517e88c8efe01d994e99035ca67fd310ec1940 100644 (file)
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -26,7 +26,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "rpc/virnetmessage.h"

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index ba281e990fa4d603c0552c37dc2527d9435b9c9e..399c4fdc4cb68394a0e1d5a74a0a4c8ecac965df 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -30,7 +30,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 023665907b31e6d52a58a2c554d35be43a97fce9..27078ea6b4ad0a4e6698d6f75693d46814ddd6b9 100644 (file)
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -29,7 +29,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "vircommand.h"

diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 27e490ffe1032d33d9190f00b52c7051317e29d2..a8f4c793401bbdd86b4f17e6f20e0b01000e902c 100644 (file)
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -25,7 +25,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "virstring.h"

diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index c8e9a2e8c8f4ad50c273f51f77fdd61989090a21..7d7a2d6ffe839eaf51a3874175ec283727b47d24 100644 (file)
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -26,7 +26,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "virtime.h"

diff --git a/tests/viruritest.c b/tests/viruritest.c
index 46964b3a416bb692533693395ba862c4e2d39210..57d38955e2cb29c695f7471f5b0e6f6850160de2 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -26,7 +26,7 @@
 #include "testutils.h"
 #include "util.h"
 #include "virterror_internal.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virlog.h"
 
 #include "viruri.h"

diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index c44e61fc070205ecf013d8a49825364e539faaab..03a8989983299a95db857a6b60bfc3fbd9854f4c 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -7,7 +7,7 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "testutils.h"
 # include "vmx/vmx.h"
 

diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c
index 3de68fdb84cb5e477c0e3dca08d55a508595bb96..a3943e2d7b7aeda11e0d80d1af94f930cb9f2478 100644 (file)
--- a/tests/xmconfigtest.c
+++ b/tests/xmconfigtest.c
@@ -34,7 +34,7 @@
 #include "xenxs/xen_xm.h"
 #include "testutils.h"
 #include "testutilsxen.h"
-#include "memory.h"
+#include "viralloc.h"
 
 static virCapsPtr caps;
 

diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 334f321037c571c5350ae06a32346864def64558..653ab6cef3c21e82757e692cb2587af00c3164c8 100644 (file)
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -7,7 +7,7 @@
 # include <unistd.h>
 
 # include "internal.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "testutils.h"
 # include "vmx/vmx.h"
 

diff --git a/tools/console.c b/tools/console.c
index dbdaab747a5a33719c5e9b49af203ad16601f726..1d21189ad35f4f0cd20e8fd45c47184c3c24d7ad 100644 (file)
--- a/tools/console.c
+++ b/tools/console.c
@@ -41,7 +41,7 @@
 # include "virlog.h"
 # include "util.h"
 # include "virfile.h"
-# include "memory.h"
+# include "viralloc.h"
 # include "threads.h"
 # include "virterror_internal.h"
 

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 0006c11c8699c5c075de39f7da79289a9b66c88f..a44398849cd6b3632e2015516198a19cd099a3c2 100644 (file)
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "conf/domain_conf.h"
 #include "intprops.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virmacaddr.h"
 #include "virsh-domain.h"
 #include "xml.h"

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 76d9d51c283ae4fd7315e65226be5162b3fdd0ee..b0b0c9452770e7bed8dc1bccb3f33154ea12c019 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -42,7 +42,7 @@
 #include "c-ctype.h"
 #include "conf/domain_conf.h"
 #include "console.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "virkeycode.h"

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 6f129d1f11231f5e9b886581913240aaed8cea5e..2d59a75d065bf14106c593b6e79963cf31622212 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virsh-domain.h"
 #include "xml.h"

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 956fee8e244e39deee3ea797bdc563593d80918b..40216c6b418163db0e02f3b04ed5a70037b19760 100644 (file)
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "xml.h"
 

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index c5d494a37ed203af9fb7f12a275e4780d443cdc4..66ee7e357cc73332edb525c5715eee2e1af175f8 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "xml.h"
 #include "conf/network_conf.h"

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 52cd874cc1f2e6516c8d222357aa096b6ab02299..7e569b3fc3a603cf27f9675da049e9585cb3f3f2 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "xml.h"
 #include "conf/node_device_conf.h"

diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index 3108d1b082bbff50c44d46f6f542da6290ab6bc6..c3dba0c662cfbbd97725bdb2166bc87ef7dd442a 100644 (file)
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "xml.h"
 

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 4a78467f384f104a105d49e8c6244c2ae71fc780..6e296044cdbc120f417b878629b33ae2557d6952 100644 (file)
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -33,7 +33,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "xml.h"
 #include "conf/storage_conf.h"

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index ee79b972ea309d1a7fce2e838562d761e571ab13..d81e8cef8439da14c5e247905cf5adf118cf95fc 100644 (file)
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "base64.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "xml.h"
 

diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index d6a381de883f24cec08b8dca0b78c0df19c8e830..3fecde6bad53dca2a207c4deb6104c7a84d4c406 100644 (file)
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -35,7 +35,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virsh-domain.h"
 #include "xml.h"

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index 1bad6b1a3d232a4793f48ac8a6a5629e2d7439a6..ebfe52d8f55e34aefd7dc07a63167dd2a612bd01 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -35,7 +35,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "util.h"
 #include "virfile.h"
 #include "virsh-pool.h"

diff --git a/tools/virsh.c b/tools/virsh.c
index 5cb2e063a1c8c01b8f75aea95e29f239eb02a783..e894aff43974d76031d09eabd9b3a146524f94de 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -59,7 +59,7 @@
 #include "virbuffer.h"
 #include "console.h"
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "xml.h"
 #include "libvirt/libvirt-qemu.h"
 #include "virfile.h"

diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index 5bbb5e9fda623308d28dee2b38ac33673fac3dfe..cd75ebad96cd2b3664f3c17ee43885fdc02451b3 100644 (file)
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -28,7 +28,7 @@
 #include <sys/utsname.h>
 
 #include "util.h"
-#include "memory.h"
+#include "viralloc.h"
 #include "virfile.h"
 #include "virt-host-validate-common.h"