diff options
| author | Josh Kearney <josh@jk0.org> | 2011-06-13 15:20:43 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-06-13 15:20:43 -0500 |
| commit | bebeaa6b0bf69c0a4017d429e79174401df28550 (patch) | |
| tree | 0739d0c62c831285029181909926da60f134d714 | |
| parent | 06591f13dcf130d8fb035466bfbe5650acfddb28 (diff) | |
| download | nova-bebeaa6b0bf69c0a4017d429e79174401df28550.tar.gz nova-bebeaa6b0bf69c0a4017d429e79174401df28550.tar.xz nova-bebeaa6b0bf69c0a4017d429e79174401df28550.zip | |
Removed clocksource=jiffies from PV_args.
| -rw-r--r-- | nova/tests/test_xenapi.py | 2 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py index 3a175b106..d1c88287a 100644 --- a/nova/tests/test_xenapi.py +++ b/nova/tests/test_xenapi.py @@ -331,7 +331,7 @@ class XenAPIVMTestCase(test.TestCase): def check_vm_params_for_linux(self): self.assertEquals(self.vm['platform']['nx'], 'false') - self.assertEquals(self.vm['PV_args'], 'clocksource=jiffies') + self.assertEquals(self.vm['PV_args'], '') self.assertEquals(self.vm['PV_bootloader'], 'pygrub') # check that these are not set diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index b9d4346e4..11da221f2 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -157,7 +157,6 @@ class VMHelper(HelperBase): rec['PV_ramdisk'] = ramdisk else: # 2. Use kernel within the image - rec['PV_args'] = 'clocksource=jiffies' rec['PV_bootloader'] = 'pygrub' else: # 3. Using hardware virtualization |