Rename the helper that access store_domid accordingly.

While doing this, rename the is_store_domain variable.

No functional change.

Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>
---
 tools/xenstored/core.h   | 2 +-
 tools/xenstored/domain.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/xenstored/core.h b/tools/xenstored/core.h
index d44cca8454..3e209893f3 100644
--- a/tools/xenstored/core.h
+++ b/tools/xenstored/core.h
@@ -381,7 +381,7 @@ uint64_t get_now_msec(void);
 void *xenbus_map(void);
 void unmap_xenbus(void *interface);
 
-static inline int xenbus_master_domid(void) { return store_domid; }
+static inline int xenbus_store_domid(void) { return store_domid; }
 
 static inline bool domid_is_unprivileged(unsigned int domid)
 {
diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c
index d9144e97a1..f1527a6db7 100644
--- a/tools/xenstored/domain.c
+++ b/tools/xenstored/domain.c
@@ -503,7 +503,7 @@ static const struct interface_funcs domain_funcs = {
 
 static void *map_interface(domid_t domid)
 {
-	if (domid == xenbus_master_domid())
+	if (domid == xenbus_store_domid())
 		return xenbus_map();
 
 	return xengnttab_map_grant_ref(*xgt_handle, domid,
@@ -513,7 +513,7 @@ static void *map_interface(domid_t domid)
 
 static void unmap_interface(domid_t domid, void *interface)
 {
-	if (domid == xenbus_master_domid())
+	if (domid == xenbus_store_domid())
 		unmap_xenbus(interface);
 	else if (domid != stub_domid)
 		xengnttab_unmap(*xgt_handle, interface, 1);
-- 
2.50.1

On 25.07.25 04:28, Jason Andryuk wrote:
> Rename the helper that access store_domid accordingly.
> 
> While doing this, rename the is_store_domain variable.
> 
> No functional change.
> 
> Signed-off-by: Jason Andryuk <jason.andryuk@amd.com>

With my remark on the previous patch this one can just be dropped.


Juergen