WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] [xen-unstable] xenstored: allow guests to reintroduce th

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] xenstored: allow guests to reintroduce themselves
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Tue, 09 Aug 2011 22:22:08 +0100
Delivery-date: Tue, 09 Aug 2011 14:22:43 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1312876420 -3600
# Node ID f5176c177b9940b7be756ddc61563bc5878e696d
# Parent  0f36c2eec2e1576b4db6538b5f22d625587c1a15
xenstored: allow guests to reintroduce themselves

During kexec all old watches have to be removed, otherwise the new
kernel will receive unexpected events. Allow a guest to introduce
itself
and cleanup all of its watches.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
---


diff -r 0f36c2eec2e1 -r f5176c177b99 tools/xenstore/xenstored_domain.c
--- a/tools/xenstore/xenstored_domain.c Thu Jul 28 15:40:54 2011 +0100
+++ b/tools/xenstore/xenstored_domain.c Tue Aug 09 08:53:40 2011 +0100
@@ -315,7 +315,7 @@
 {
        struct domain *domain;
        char *vec[3];
-       unsigned int domid;
+       unsigned int domid, target;
        unsigned long mfn;
        evtchn_port_t port;
        int rc;
@@ -326,7 +326,7 @@
                return;
        }
 
-       if (conn->id != 0 || !conn->can_write) {
+       if (!conn->can_write) {
                send_error(conn, EACCES);
                return;
        }
@@ -340,19 +340,26 @@
                send_error(conn, EINVAL);
                return;
        }
+       /* Allow guest to reset all watches */
+       if (domid != DOMID_SELF && conn->id != 0) {
+               send_error(conn, EACCES);
+               return;
+       }
 
-       domain = find_domain_by_domid(domid);
+       target = domid == DOMID_SELF ? conn->id : domid;
+
+       domain = find_domain_by_domid(target);
 
        if (domain == NULL) {
                interface = xc_map_foreign_range(
-                       *xc_handle, domid,
+                       *xc_handle, target,
                        getpagesize(), PROT_READ|PROT_WRITE, mfn);
                if (!interface) {
                        send_error(conn, errno);
                        return;
                }
                /* Hang domain off "in" until we're finished. */
-               domain = new_domain(in, domid, port);
+               domain = new_domain(in, target, port);
                if (!domain) {
                        munmap(interface, getpagesize());
                        send_error(conn, errno);
@@ -365,11 +372,11 @@
                talloc_steal(domain->conn, domain);
 
                fire_watches(NULL, "@introduceDomain", false);
-       } else if ((domain->mfn == mfn) && (domain->conn != conn)) {
+       } else if ((domain->mfn == mfn) && ((domain->conn != conn) || domid == 
DOMID_SELF)) {
                /* Use XS_INTRODUCE for recreating the xenbus event-channel. */
                if (domain->port)
                        xc_evtchn_unbind(xce_handle, domain->port);
-               rc = xc_evtchn_bind_interdomain(xce_handle, domid, port);
+               rc = xc_evtchn_bind_interdomain(xce_handle, target, port);
                domain->port = (rc == -1) ? 0 : rc;
                domain->remote_port = port;
        } else {

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] xenstored: allow guests to reintroduce themselves, Xen patchbot-unstable <=