Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
xen
23595-xenpaging_add_watch_thread_to_catch_guest...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 23595-xenpaging_add_watch_thread_to_catch_guest_shutdown.patch of Package xen
changeset: 23595:389c8bf31688 user: Olaf Hering <olaf@aepfle.de> date: Fri Jun 10 10:47:27 2011 +0200 files: tools/xenpaging/xenpaging.c description: xenpaging: add watch thread to catch guest shutdown If xenpaging is started manually then no event is sent to xenpaging when the guest is shutdown or rebooted. Add a watch on the @releaseDomain node to leave the loop and gracefully shutdown the pager. Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Ian Jackson <ian.jackson.citrix.com> --- tools/xenpaging/xenpaging.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c =================================================================== --- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c +++ xen-4.1.2-testing/tools/xenpaging/xenpaging.c @@ -39,6 +39,7 @@ #include "policy.h" #include "xenpaging.h" +static char watch_token[16]; static char filename[80]; static int interrupted; @@ -75,13 +76,19 @@ static int xenpaging_wait_for_event_or_t { xc_interface *xch = paging->xc_handle; xc_evtchn *xce = paging->mem_event.xce_handle; - struct pollfd fd[1]; + char **vec; + unsigned int num; + struct pollfd fd[2]; int port; int rc; + /* Wait for event channel and xenstore */ fd[0].fd = xc_evtchn_fd(xce); fd[0].events = POLLIN | POLLERR; - rc = poll(fd, 1, 100); + fd[1].fd = xs_fileno(paging->xs_handle); + fd[1].events = POLLIN | POLLERR; + + rc = poll(fd, 2, 100); if ( rc < 0 ) { if (errno == EINTR) @@ -91,6 +98,27 @@ static int xenpaging_wait_for_event_or_t return -errno; } + /* First check for guest shutdown */ + if ( rc && fd[1].revents & POLLIN ) + { + DPRINTF("Got event from xenstore\n"); + vec = xs_read_watch(paging->xs_handle, &num); + if ( vec ) + { + if ( strcmp(vec[XS_WATCH_TOKEN], watch_token) == 0 ) + { + /* If our guest disappeared, set interrupt flag and fall through */ + if ( xs_is_domain_introduced(paging->xs_handle, paging->mem_event.domain_id) == false ) + { + xs_unwatch(paging->xs_handle, "@releaseDomain", watch_token); + interrupted = SIGQUIT; + rc = 0; + } + } + free(vec); + } + } + if ( rc && fd[0].revents & POLLIN ) { DPRINTF("Got event from evtchn\n"); @@ -165,6 +193,14 @@ static xenpaging_t *xenpaging_init(domid goto err; } + /* write domain ID to watch so we can ignore other domain shutdowns */ + snprintf(watch_token, sizeof(watch_token), "%u", domain_id); + if ( xs_watch(paging->xs_handle, "@releaseDomain", watch_token) == false ) + { + ERROR("Could not bind to shutdown watch\n"); + goto err; + } + p = getenv("XENPAGING_POLICY_MRU_SIZE"); if ( p && *p ) {
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor