Merging trunk

2 files changed, 4 insertions, 2 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 3f5957190..3e290567c 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -77,12 +77,14 @@ from nova import crypto
 from nova import db
 from nova import exception
 from nova import flags
+from nova import log as logging
 from nova import quota
 from nova import utils
 from nova.auth import manager
 from nova.cloudpipe import pipelib
 
 
+logging.basicConfig()
 FLAGS = flags.FLAGS
 flags.DECLARE('fixed_range', 'nova.network.manager')
 flags.DECLARE('num_networks', 'nova.network.manager')
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index a623d10c7..6d2db7201 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -252,7 +252,7 @@ class VMOps(object):
             raise Exception(_("suspend: instance not present %s") %
                                                      instance_name)
         task = self._session.call_xenapi('Async.VM.suspend', vm)
-        self._wait_with_callback(task, callback)
+        self._wait_with_callback(instance.id, task, callback)
 
     def resume(self, instance, callback):
         """resume the specified instance"""
@@ -262,7 +262,7 @@ class VMOps(object):
             raise Exception(_("resume: instance not present %s") %
                                                     instance_name)
         task = self._session.call_xenapi('Async.VM.resume', vm, False, True)
-        self._wait_with_callback(task, callback)
+        self._wait_with_callback(instance.id, task, callback)
 
     def get_info(self, instance_id):
         """Return data about VM instance"""