[PATCH] xend: don't drop device config on domain start failure

[Jim Fehlig <jfehlig@novell.com>]

[-- Attachment #1: Type: text/plain, Size: 995 bytes --]

If domain creation in xend fails before devices are configured, e.g.
insufficient memory, device config is dropped from xend's managed domain
config.

# cat
/var/lib/xend/domains/70c7bace-af44-1343-1e8f-a6e149632f4a/config.sxp |
grep device
            (device_model /usr/lib/xen/bin/qemu-dm)
            (device_model /usr/lib/xen/bin/qemu-dm)
    (device
    (device (vkbd (backend 0)))
    (device
    (device
    (device
# xm start test1
Error: I need 4194816 KiB, but dom0_min_mem is 524288 and shrinking to
524288 KiB would leave only 3568556 KiB free.
# cat
/var/lib/xend/domains/70c7bace-af44-1343-1e8f-a6e149632f4a/config.sxp |
grep device
            (device_model /usr/lib/xen/bin/qemu-dm)
            (device_model /usr/lib/xen/bin/qemu-dm)

Once xend is restarted, the domain's devices are lost.

The attached patch fixes a bug in XendConfig where only the device
controller was consulted for device configuration.

Regards,
Jim

    Signed-off-by: Jim Fehlig <jfehlig@novell.com>


[-- Attachment #2: xend-preserve-devs.patch --]
[-- Type: text/x-patch, Size: 686 bytes --]

Index: xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py
===================================================================
--- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py
+++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py
@@ -1173,8 +1173,8 @@ class XendConfig(dict):
                                     config.append(['VDI', dev_cfg.get('VDI', '')])
 
                                 sxpr.append(['device', config])
+                                found = True
 
-                            found = True
                         except:
                             log.exception("dumping sxp from device controllers")
                             pass

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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