Signed-off-by: Zhai Edwin <edwin.zhai@xxxxxxxxx>

diff -r 045b0034effd tools/python/xen/xend/XendCheckpoint.py
--- a/tools/python/xen/xend/XendCheckpoint.py	Fri Jul 20 10:58:04 2007 +0800
+++ b/tools/python/xen/xend/XendCheckpoint.py	Mon Aug 13 22:20:09 2007 +0800
@@ -98,6 +98,9 @@ def save(fd, dominfo, network, live, dst
                 log.info("Domain %d suspended.", dominfo.getDomid())
                 dominfo.migrateDevices(network, dst, DEV_MIGRATE_STEP3,
                                        domain_name)
+                if hvm:
+                    dominfo.image.saveDeviceModel()
+
                 tochild.write("done\n")
                 tochild.flush()
                 log.debug('Written done')
diff -r 045b0034effd tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py	Fri Jul 20 10:58:04 2007 +0800
+++ b/tools/python/xen/xend/XendDomainInfo.py	Mon Aug 13 22:20:09 2007 +0800
@@ -1184,8 +1184,6 @@ class XendDomainInfo:
                     self._clearRestart()
 
                     if reason == 'suspend':
-                        if self._stateGet() != DOM_STATE_SUSPENDED:
-                            self.image.saveDeviceModel()
                         self._stateSet(DOM_STATE_SUSPENDED)
                         # Don't destroy the domain.  XendCheckpoint will do
                         # this once it has finished.  However, stop watching