Introduce __FreePoolWithTag()

Being able to interpose on memory allocation can be useful during
debugging. We already have __AllocatePoolWithTag() so this patch matches
it with __FreePoolWithTag().

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/src/common/registry.c b/src/common/registry.c
index 9e9f79a81d338c580bcea3e4dfbaa5d8a05a2caf..d994e134694b3b6db5aeed8588c272634cf01ff8 100644 (file)
--- a/src/common/registry.c
+++ b/src/common/registry.c
@@ -52,7 +52,7 @@ __RegistryFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, REGISTRY_TAG);
+    __FreePoolWithTag(Buffer, REGISTRY_TAG);
 }
 
 NTSTATUS

diff --git a/src/common/util.h b/src/common/util.h
index c772b1e1b9ead55696179e0d09934ca8a8741ec9..7798ebd4483f8c0ffab0c2e67f3ef0dc58110219 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -158,6 +158,15 @@ __AllocatePoolWithTag(
     return Buffer;
 }
 
+static FORCEINLINE VOID
+__FreePoolWithTag(
+    IN  PVOID   Buffer,
+    IN  ULONG   Tag
+    )
+{
+    ExFreePoolWithTag(Buffer, Tag);
+}
+
 static FORCEINLINE PMDL
 __AllocatePage(
     VOID

diff --git a/src/xen/acpi.c b/src/xen/acpi.c
index ebf80244a31e5d0ba8526a158959102198070655..5defd7dd85cc1839b6a05a2f22b72aa0485e8f0c 100644 (file)
--- a/src/xen/acpi.c
+++ b/src/xen/acpi.c
@@ -56,7 +56,7 @@ __AcpiFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_ACPI_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_ACPI_TAG);
 }
 
 static BOOLEAN

diff --git a/src/xen/module.c b/src/xen/module.c
index a5bf3c707b11ff004a5c4b00b791000e54e063b4..584a63df1665df6afee0db4d2ef0232c9025ab46 100644 (file)
--- a/src/xen/module.c
+++ b/src/xen/module.c
@@ -72,7 +72,7 @@ __ModuleFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, MODULE_TAG);
+    __FreePoolWithTag(Buffer, MODULE_TAG);
 }
 
 static VOID

diff --git a/src/xen/system.c b/src/xen/system.c
index 65c9d0e08a0121131c55f4b5a9414d1dc0d204b6..0dc7e148d92ea26b86c7bb7e66fad66a4a1c202c 100644 (file)
--- a/src/xen/system.c
+++ b/src/xen/system.c
@@ -79,7 +79,7 @@ __SystemFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XEN_SYSTEM_TAG);
+    __FreePoolWithTag(Buffer, XEN_SYSTEM_TAG);
 }
 
 static FORCEINLINE const CHAR *

diff --git a/src/xen/unplug.c b/src/xen/unplug.c
index 77b6b8e38d71e468cc02c8fee71bea594020900a..20435911965190479a2238592426e040c619663e 100644 (file)
--- a/src/xen/unplug.c
+++ b/src/xen/unplug.c
@@ -71,7 +71,7 @@ __UnplugFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, UNPLUG_TAG);
+    __FreePoolWithTag(Buffer, UNPLUG_TAG);
 }
 
 static VOID

diff --git a/src/xenbus/balloon.c b/src/xenbus/balloon.c
index 1b3f5fa67325d93d234c71e8f99b6dc914dac913..e697722ef4493adb5b00ac2a9fd6da22b6dcac86 100644 (file)
--- a/src/xenbus/balloon.c
+++ b/src/xenbus/balloon.c
@@ -80,7 +80,7 @@ __BalloonFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_BALLOON_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_BALLOON_TAG);
 }
 
 #define SWAP_NODES(_PfnArray, _X, _Y)       \

diff --git a/src/xenbus/bus.c b/src/xenbus/bus.c
index d82fe0ac4b0b9034f5f04f3ba395b816ee3f8aef..6443281b035ade5d2e474e20855d2e2ef25a7c53 100644 (file)
--- a/src/xenbus/bus.c
+++ b/src/xenbus/bus.c
@@ -64,7 +64,7 @@ __BusFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, BUS_TAG);
+    __FreePoolWithTag(Buffer, BUS_TAG);
 }
 
 static VOID

diff --git a/src/xenbus/cache.c b/src/xenbus/cache.c
index 5a144114db8c39c82b771d8feac6bc71fb33778e..e3073f56260a16cd61bb69f2f34f67177e2b84bb 100644 (file)
--- a/src/xenbus/cache.c
+++ b/src/xenbus/cache.c
@@ -114,7 +114,7 @@ __CacheFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, CACHE_TAG);
+    __FreePoolWithTag(Buffer, CACHE_TAG);
 }
 
 static VOID

diff --git a/src/xenbus/debug.c b/src/xenbus/debug.c
index 7b2ec730e941b358d74fac4a9dba24bfc1855486..794a4325c6d7625a86a97a89c05edead0f24397f 100644 (file)
--- a/src/xenbus/debug.c
+++ b/src/xenbus/debug.c
@@ -77,7 +77,7 @@ __DebugFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_DEBUG_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_DEBUG_TAG);
 }
 
 extern USHORT

diff --git a/src/xenbus/dma.c b/src/xenbus/dma.c
index 3969778c04908b08f21af7d83c0f40bb10390d55..7531f8b09b5da804950c197415f52c0f532435a1 100644 (file)
--- a/src/xenbus/dma.c
+++ b/src/xenbus/dma.c
@@ -208,7 +208,7 @@ __DmaFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, DMA_TAG);
+    __FreePoolWithTag(Buffer, DMA_TAG);
 }
 
 static VOID

diff --git a/src/xenbus/driver.c b/src/xenbus/driver.c
index 73625efb98d00566fb870dafa8251b6fe60693a3..cd22a727e9fe756b8e39cfa4535713e43f8de0ad 100644 (file)
--- a/src/xenbus/driver.c
+++ b/src/xenbus/driver.c
@@ -74,7 +74,7 @@ __DriverFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_DRIVER_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_DRIVER_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenbus/evtchn.c b/src/xenbus/evtchn.c
index c5c97e421ab189d0538deafd75f46ada9040a656..afb52198e8e65ceac7d82e82a4e05de7074236b9 100644 (file)
--- a/src/xenbus/evtchn.c
+++ b/src/xenbus/evtchn.c
@@ -133,7 +133,7 @@ __EvtchnFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_EVTCHN_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_EVTCHN_TAG);
 }
 
 static NTSTATUS

diff --git a/src/xenbus/evtchn_2l.c b/src/xenbus/evtchn_2l.c
index 913160ff591564fdf53181c45661689f720aff7e..0982b00c97c6fea4c1b78a55fbde8cf7dc7b25f7 100644 (file)
--- a/src/xenbus/evtchn_2l.c
+++ b/src/xenbus/evtchn_2l.c
@@ -62,7 +62,7 @@ __EvtchnTwoLevelFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_EVTCHN_TWO_LEVEL_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_EVTCHN_TWO_LEVEL_TAG);
 }
 
 static BOOLEAN

diff --git a/src/xenbus/evtchn_fifo.c b/src/xenbus/evtchn_fifo.c
index 91cbd76a9ac73155c45bba5435fd5b73c74cc303..c0456e0572f3870bf772fb4c6010ea44fcc4c86f 100644 (file)
--- a/src/xenbus/evtchn_fifo.c
+++ b/src/xenbus/evtchn_fifo.c
@@ -68,7 +68,7 @@ __EvtchnFifoFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_EVTCHN_FIFO_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_EVTCHN_FIFO_TAG);
 }
 
 static event_word_t *

diff --git a/src/xenbus/fdo.c b/src/xenbus/fdo.c
index d079928a3af44a61fd2839c16fc310a505e139ea..9c9e38055fd3ea76492e386768d936e192514b52 100644 (file)
--- a/src/xenbus/fdo.c
+++ b/src/xenbus/fdo.c
@@ -155,7 +155,7 @@ __FdoFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_FDO_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_FDO_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenbus/filters.c b/src/xenbus/filters.c
index 8eb836befbcda3e0673774c7d2144489c383bb31..dfea119eb9f79a9c76dc0d1aa3fb160393c4aacd 100644 (file)
--- a/src/xenbus/filters.c
+++ b/src/xenbus/filters.c
@@ -57,7 +57,7 @@ __FiltersFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_FILTERS_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_FILTERS_TAG);
 }
 
 #define CLASS_PATH "\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Control\\Class"

diff --git a/src/xenbus/gnttab.c b/src/xenbus/gnttab.c
index 56158d832271f05db0be25c4e2d55a1e2c907dd3..f3fcc7c7089f08ec184eecf3dac6166be62f5571 100644 (file)
--- a/src/xenbus/gnttab.c
+++ b/src/xenbus/gnttab.c
@@ -107,7 +107,7 @@ __GnttabFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_GNTTAB_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_GNTTAB_TAG);
 }
 
 static NTSTATUS

diff --git a/src/xenbus/hash_table.c b/src/xenbus/hash_table.c
index b271abdfee2f44eb0c8ae58fbccc2b5892c321c7..75206e4d125298a813e511894f2458b4ce64c885 100644 (file)
--- a/src/xenbus/hash_table.c
+++ b/src/xenbus/hash_table.c
@@ -71,7 +71,7 @@ __HashTableFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_HASH_TABLE_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_HASH_TABLE_TAG);
 }
 
 static ULONG

diff --git a/src/xenbus/pdo.c b/src/xenbus/pdo.c
index 88c82a7387eaad7f242bd4ee6f9a2009eb33ed1f..3a8540e22bdd7e4ba6ed6b5b4c0db44e6ff7c84c 100644 (file)
--- a/src/xenbus/pdo.c
+++ b/src/xenbus/pdo.c
@@ -88,7 +88,7 @@ __PdoFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, PDO_TAG);
+    __FreePoolWithTag(Buffer, PDO_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenbus/range_set.c b/src/xenbus/range_set.c
index 1ce113f9c36713c1ec7175e9d24599e1dfbbcd22..eaf3f10e757a6d9b38e7786c62c804b827c7b569 100644 (file)
--- a/src/xenbus/range_set.c
+++ b/src/xenbus/range_set.c
@@ -81,7 +81,7 @@ __RangeSetFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, RANGE_SET_TAG);
+    __FreePoolWithTag(Buffer, RANGE_SET_TAG);
 }
 
 static FORCEINLINE BOOLEAN

diff --git a/src/xenbus/shared_info.c b/src/xenbus/shared_info.c
index 9d8bf1173732ae86528a5a4fabad1b1976cdfbe4..d6babcfcaa57ad424baf095ea7480eaace249872 100644 (file)
--- a/src/xenbus/shared_info.c
+++ b/src/xenbus/shared_info.c
@@ -70,7 +70,7 @@ __SharedInfoFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_SHARED_INFO_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_SHARED_INFO_TAG);
 }
 
 static BOOLEAN

diff --git a/src/xenbus/store.c b/src/xenbus/store.c
index dad0f393e9e208c0badba901e8ea617effcf31d5..6bca5e9d51c4e5e975cbbedaa22fe5880d8ebb15 100644 (file)
--- a/src/xenbus/store.c
+++ b/src/xenbus/store.c
@@ -165,7 +165,7 @@ __StoreFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_STORE_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_STORE_TAG);
 }
 
 static NTSTATUS

diff --git a/src/xenbus/suspend.c b/src/xenbus/suspend.c
index d272862c2a5f9c3ea50a0bd5bf1f23ec2bc1bce1..18cae1b5dcc6f0d7797fd65cb893417bb20dfb0b 100644 (file)
--- a/src/xenbus/suspend.c
+++ b/src/xenbus/suspend.c
@@ -73,7 +73,7 @@ __SuspendFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_SUSPEND_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_SUSPEND_TAG);
 }
 
 static NTSTATUS

diff --git a/src/xenbus/thread.c b/src/xenbus/thread.c
index 9048e4f2468ba06920e0361fedb3d824928f45bc..23b6e71355e9abf4eaf2ad527d640c9115e116a9 100644 (file)
--- a/src/xenbus/thread.c
+++ b/src/xenbus/thread.c
@@ -60,7 +60,7 @@ __ThreadFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, THREAD_TAG);
+    __FreePoolWithTag(Buffer, THREAD_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenbus/unplug.c b/src/xenbus/unplug.c
index 7414b0cdeda1ad49dc145644342213e8a44b4ed4..3c68c7f51f3a2fd73912edfafdfb2a6dfb7cc063 100644 (file)
--- a/src/xenbus/unplug.c
+++ b/src/xenbus/unplug.c
@@ -63,7 +63,7 @@ __UnplugFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENBUS_UNPLUG_TAG);
+    __FreePoolWithTag(Buffer, XENBUS_UNPLUG_TAG);
 }
 
 static VOID

diff --git a/src/xenfilt/driver.c b/src/xenfilt/driver.c
index bfc96eea109c55e7e55c5677091c4afe3a648c5d..d46630f38e4bceb018d481457eae0b582074eab2 100644 (file)
--- a/src/xenfilt/driver.c
+++ b/src/xenfilt/driver.c
@@ -78,7 +78,7 @@ __DriverFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENFILT_DRIVER_TAG);
+    __FreePoolWithTag(Buffer, XENFILT_DRIVER_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenfilt/emulated.c b/src/xenfilt/emulated.c
index 9cb656a9f9010747bb34165972e05ce347807fa5..7eb4054243f267ff9695ab6f827b62df180056a9 100644 (file)
--- a/src/xenfilt/emulated.c
+++ b/src/xenfilt/emulated.c
@@ -86,7 +86,7 @@ __EmulatedFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, XENFILT_EMULATED_TAG);
+    __FreePoolWithTag(Buffer, XENFILT_EMULATED_TAG);
 }
 
 static NTSTATUS

diff --git a/src/xenfilt/fdo.c b/src/xenfilt/fdo.c
index 037f892c7e8dab75849665502adc9268a9786651..f41288e4661645558113c6e5704b1a1731e5aacf 100644 (file)
--- a/src/xenfilt/fdo.c
+++ b/src/xenfilt/fdo.c
@@ -86,7 +86,7 @@ __FdoFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, FDO_TAG);
+    __FreePoolWithTag(Buffer, FDO_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenfilt/pdo.c b/src/xenfilt/pdo.c
index 6be7a76119a98a2131dbecef388be7520230cefe..6b09578b4e8ecaeb0d4495eb0550e2e3a88cd9ea 100644 (file)
--- a/src/xenfilt/pdo.c
+++ b/src/xenfilt/pdo.c
@@ -82,7 +82,7 @@ __PdoFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, PDO_TAG);
+    __FreePoolWithTag(Buffer, PDO_TAG);
 }
 
 static FORCEINLINE VOID

diff --git a/src/xenfilt/thread.c b/src/xenfilt/thread.c
index 7ec0ac8273a9bb5ff3d398c2dfdd4f282e785eb4..a834129d134d4c8ff50c580ecf326327514348fd 100644 (file)
--- a/src/xenfilt/thread.c
+++ b/src/xenfilt/thread.c
@@ -60,7 +60,7 @@ __ThreadFree(
     IN  PVOID   Buffer
     )
 {
-    ExFreePoolWithTag(Buffer, THREAD_TAG);
+    __FreePoolWithTag(Buffer, THREAD_TAG);
 }
 
 static FORCEINLINE VOID