diff options
| author | Ian Campbell | 2016-01-15 14:23:43 +0100 |
|---|---|---|
| committer | Stefano Stabellini | 2016-01-26 18:19:41 +0100 |
| commit | 228df5c91c87d98383f02ee07bbfdc001ba0ab0f (patch) | |
| tree | 008680cc7feac87ab68746c8c7f8366ca9cc3b59 /hw/xenpv/xen_domainbuild.c | |
| parent | xen: Use stable library interfaces when they are available. (diff) | |
| download | qemu-228df5c91c87d98383f02ee07bbfdc001ba0ab0f.tar.gz qemu-228df5c91c87d98383f02ee07bbfdc001ba0ab0f.tar.xz qemu-228df5c91c87d98383f02ee07bbfdc001ba0ab0f.zip | |
xen: domainbuild: reopen libxenctrl interface after forking for domain watcher.
Using an existing libxenctrl handle after a fork was never
particularly safe (especially if foreign mappings existed at the time
of the fork) and the xc fd has been unavailable for many releases.
Reopen the handle after fork and therefore do away with xc_fd().
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'hw/xenpv/xen_domainbuild.c')
| -rw-r--r-- | hw/xenpv/xen_domainbuild.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index ac0e5ac9f0..f9be029b0e 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -174,12 +174,15 @@ static int xen_domain_watcher(void) for (i = 3; i < n; i++) { if (i == fd[0]) continue; - if (i == xc_fd(xen_xc)) { - continue; - } close(i); } + /* + * Reopen xc interface, since the original is unsafe after fork + * and was closed above. + */ + xen_xc = xc_interface_open(0, 0, 0); + /* ignore term signals */ signal(SIGINT, SIG_IGN); signal(SIGTERM, SIG_IGN); |