[xen staging] tools/xenstored: Remove stubdom special casing

[patchbot@xxxxxxx]

commit 671e80d9905339e329eada7549e1c2f7f804585e
Author:     Jason Andryuk <jason.andryuk@xxxxxxx>
AuthorDate: Fri Aug 15 17:35:55 2025 -0400
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Aug 19 11:04:08 2025 +0200

    tools/xenstored: Remove stubdom special casing
    
    posix.c and minios.c implement the same named functions serving slightly
    different purposes.
    
    For xenbus_map()
    posix.c maps the local /dev/xen/xsd_kva
    minios.c maps dom0 via grant and there is open coding for stub_domid in
    map_interface.
    
    Change xenbus_map() to map the local domain's interface.  The default
    grant table mapping is performed otherwise.
    
    Signed-off-by: Jason Andryuk <jason.andryuk@xxxxxxx>
    Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
---
 tools/xenstored/domain.c | 5 -----
 tools/xenstored/minios.c | 4 +---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/tools/xenstored/domain.c b/tools/xenstored/domain.c
index e282b5c5ed..cf5a54965a 100644
--- a/tools/xenstored/domain.c
+++ b/tools/xenstored/domain.c
@@ -512,11 +512,6 @@ static void *map_interface(domid_t domid)
        if (domid == store_domid)
                return xenbus_map();
 
-#ifdef __MINIOS__
-       if (domid == stub_domid)
-               return xenstore_buf;
-#endif
-
        return xengnttab_map_grant_ref(*xgt_handle, domid,
                                       GNTTAB_RESERVED_XENSTORE,
                                       PROT_READ|PROT_WRITE);
diff --git a/tools/xenstored/minios.c b/tools/xenstored/minios.c
index 60d921cf01..a214e23907 100644
--- a/tools/xenstored/minios.c
+++ b/tools/xenstored/minios.c
@@ -61,13 +61,11 @@ evtchn_port_t get_domain_evtchn(unsigned int domid)
 
 void *xenbus_map(void)
 {
-       return xengnttab_map_grant_ref(*xgt_handle, xenbus_master_domid(),
-                       GNTTAB_RESERVED_XENSTORE, PROT_READ|PROT_WRITE);
+       return xenstore_buf;
 }
 
 void unmap_xenbus(void *interface)
 {
-       xengnttab_unmap(*xgt_handle, interface, 1);
 }
 
 void early_init(bool live_update, bool dofork, const char *pidfile)
--
generated by git-patchbot for /home/xen/git/xen.git#staging