785e8553df
We need to make sure that the patch output was clean. As test_*.py are not needed and xenhost will be patched through xs suppack, those content can be removed from patch files. Change-Id: Ie78b4fd31b73fa6fff6064f855b31a1c7c0fddad
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
|
|
index f88cb3a..982ad37 100644
|
|
--- a/nova/virt/xenapi/vm_utils.py
|
|
+++ b/nova/virt/xenapi/vm_utils.py
|
|
@@ -137,6 +137,7 @@ MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE
|
|
KERNEL_DIR = '/boot/guest'
|
|
MAX_VDI_CHAIN_SIZE = 16
|
|
PROGRESS_INTERVAL_SECONDS = 300
|
|
+DD_BLOCKSIZE = 65536
|
|
|
|
# Fudge factor to allow for the VHD chain to be slightly larger than
|
|
# the partitioned space. Otherwise, legitimate images near their
|
|
@@ -1159,6 +1160,7 @@ def generate_configdrive(session, instance, vm_ref, userdevice,
|
|
utils.execute('dd',
|
|
'if=%s' % tmp_file,
|
|
'of=%s' % dev_path,
|
|
+ 'bs=%d' % DD_BLOCKSIZE,
|
|
'oflag=direct,sync',
|
|
run_as_root=True)
|
|
|
|
@@ -2426,6 +2428,7 @@ def _copy_partition(session, src_ref, dst_ref, partition, virtual_size):
|
|
utils.execute('dd',
|
|
'if=%s' % src_path,
|
|
'of=%s' % dst_path,
|
|
+ 'bs=%d' % DD_BLOCKSIZE,
|
|
'count=%d' % num_blocks,
|
|
'iflag=direct,sync',
|
|
'oflag=direct,sync',
|