Attachment 193041 Details for Bug 249564 – Keep track of QEMU pids

[patch] Keep track of QEMU pids

xen-3.1.0-device-model-recreate.patch (text/plain), 2.52 KB, created by Daniel Berrangé on 2007-09-11 21:34:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-09-11 21:34:53 UTC

Size: 2.52 KB

patch

obsolete

>diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/image.py xen-3.1.0-src.new/tools/python/xen/xend/image.py
>--- xen-3.1.0-src.orig/tools/python/xen/xend/image.py	2007-09-11 12:27:37.000000000 -0400
>+++ xen-3.1.0-src.new/tools/python/xen/xend/image.py	2007-09-11 17:20:15.000000000 -0400
>@@ -182,7 +182,10 @@ class ImageHandler:
>     def createDeviceModel(self):
>         """Create device model for the domain (define in subclass if needed)."""
>         pass
>-    
>+
>+    def recreate(self):
>+        pass
>+
>     def destroy(self):
>         """Extra cleanup on domain destroy (define in subclass if needed)."""
>         pass
>@@ -251,7 +254,7 @@ class HVMImageHandler(ImageHandler):
>                         ("image/device-model", self.device_model),
>                         ("image/display", self.display))
> 
>-        self.pid = 0
>+        self.pid = None
> 
>         self.dmargs += self.configVNC(imageConfig)
> 
>@@ -406,8 +409,12 @@ class HVMImageHandler(ImageHandler):
>             args = args + ([ "-vncviewer" ])
>         log.info("spawning device models: %s %s", self.device_model, args)
>         self.pid = os.spawnve(os.P_NOWAIT, self.device_model, args, env)
>+        self.vm.storeDom("image/device-model-pid", self.pid)
>         log.info("device model pid: %d", self.pid)
> 
>+    def recreate(self):
>+        self.pid = self.vm.gatherDom(('image/device-model-pid', int))
>+
>     def destroy(self, suspend=False):
>         if self.pid:
>             try:
>diff -rup xen-3.1.0-src.orig/tools/python/xen/xend/XendDomainInfo.py xen-3.1.0-src.new/tools/python/xen/xend/XendDomainInfo.py
>--- xen-3.1.0-src.orig/tools/python/xen/xend/XendDomainInfo.py	2007-09-11 12:27:37.000000000 -0400
>+++ xen-3.1.0-src.new/tools/python/xen/xend/XendDomainInfo.py	2007-09-11 15:55:37.000000000 -0400
>@@ -261,6 +261,14 @@ def recreate(xeninfo, priv):
>         vm.storeVmDetails()
>         vm.storeDomDetails()
> 
>+    if vm.info['image']: # Only dom0 should be without an image entry when
>+                         # recreating, but we cope with missing ones
>+                         # elsewhere just in case.
>+        vm.image = image.create(vm,
>+                                vm.info['image'],
>+                                vm.info['device'])
>+        vm.image.recreate()
>+
>     vm.registerWatches()
>     vm.refreshShutdown(xeninfo)
>     return vm
>@@ -662,6 +670,8 @@ class XendDomainInfo:
>     def writeDom(self, *args):
>         return xstransact.Write(self.dompath, *args)
> 
>+    def gatherDom(self, *args):
>+        return xstransact.Gather(self.dompath, *args)
> 
>     ## public:
>

Actions: View | Diff

Attachments on bug 249564: 159946 | 159977 | 193041