From: Claire Murphy <claire.k.murphy@intel.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 1/2] Patch for Qemu wrapper for US-VHost to ensure Qemu process ends when VM is shutdown.
Date: Wed, 18 Jun 2014 16:34:53 +0100 [thread overview]
Message-ID: <1403105694-23736-2-git-send-email-claire.k.murphy@intel.com> (raw)
In-Reply-To: <1403105694-23736-1-git-send-email-claire.k.murphy@intel.com>
Signed-off-by: Claire Murphy <claire.k.murphy@intel.com>
---
examples/vhost/libvirt/qemu-wrap.py | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/examples/vhost/libvirt/qemu-wrap.py b/examples/vhost/libvirt/qemu-wrap.py
index e2d68a0..bfe668a 100755
--- a/examples/vhost/libvirt/qemu-wrap.py
+++ b/examples/vhost/libvirt/qemu-wrap.py
@@ -76,6 +76,7 @@
# "/dev/ptmx", "/dev/kvm", "/dev/kqemu",
# "/dev/rtc", "/dev/hpet", "/dev/net/tun",
# "/dev/<devbase-name>-<index>",
+# "/dev/hugepages"
# ]
#
# 4.b) Disable SELinux or set to permissive mode
@@ -161,6 +162,8 @@ hugetlbfs_dir = ""
#############################################
import sys, os, subprocess
+import time
+import signal
#List of open userspace vhost file descriptors
@@ -174,6 +177,18 @@ vhost_flags = [ "csum=off",
"guest_ecn=off"
]
+#String of the path to the Qemu process pid
+qemu_pid = "/tmp/%d-qemu.pid" % os.getpid()
+
+#############################################
+# Signal haldler to kill Qemu subprocess
+#############################################
+def kill_qemu_process(signum, stack):
+ pidfile = open(qemu_pid, 'r')
+ pid = int(pidfile.read())
+ os.killpg(pid, signal.SIGTERM)
+ pidfile.close()
+
#############################################
# Find the system hugefile mount point.
@@ -274,13 +289,13 @@ def main():
emul_call = ''
mem_prealloc_set = 0
mem_path_set = 0
- num = 0;
+ num = 0
#parse the parameters
while (num < num_cmd_args):
arg = sys.argv[num]
- #Check netdev +1 parameter for vhostfd
+ #Check netdev +1 parameter for vhostfd
if arg == '-netdev':
num_vhost_devs = len(fd_list)
new_args.append(arg)
@@ -333,7 +348,6 @@ def main():
emul_call += mp
emul_call += " "
-
#add user options
for opt in emul_opts_user:
emul_call += opt
@@ -353,13 +367,22 @@ def main():
emul_call+=str(arg)
emul_call+= " "
+ emul_call += "-pidfile %s " % qemu_pid
#Call QEMU
- subprocess.call(emul_call, shell=True)
+ process = subprocess.Popen(emul_call, shell=True, preexec_fn=os.setsid)
+
+ for sig in [signal.SIGTERM, signal.SIGINT, signal.SIGHUP, signal.SIGQUIT]:
+ signal.signal(sig, kill_qemu_process)
+ process.wait()
#Close usvhost files
for fd in fd_list:
os.close(fd)
+ #Cleanup temporary files
+ if os.access(qemu_pid, os.F_OK):
+ os.remove(qemu_pid)
+
if __name__ == "__main__":
--
1.7.0.7
next prev parent reply other threads:[~2014-06-18 15:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-18 15:34 [dpdk-dev] [PATCH 0/2] *** SUBJECT HERE *** Claire Murphy
2014-06-18 15:34 ` Claire Murphy [this message]
2014-06-18 15:34 ` [dpdk-dev] [PATCH 2/2] Patch to allow live migration of a VM with US-VHost Claire Murphy
2014-08-06 9:44 ` Gray, Mark D
2014-08-06 10:01 ` Gray, Mark D
2014-08-29 15:08 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403105694-23736-2-git-send-email-claire.k.murphy@intel.com \
--to=claire.k.murphy@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).