[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen staging-4.15] tools: use integer division in convert-legacy-stream
commit e9709a83490f5d6fa7247087ec1084c381cfe956 Author: Olaf Hering <olaf@xxxxxxxxx> AuthorDate: Thu Jul 1 11:55:59 2021 +0200 Commit: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> CommitDate: Thu Jul 15 11:55:50 2021 +0100 tools: use integer division in convert-legacy-stream A single slash gives a float, a double slash gives an int. bitmap = unpack_exact("Q" * ((max_id/64) + 1)) TypeError: can't multiply sequence by non-int of type 'float' Use future division to remain compatible with python 2. Signed-off-by: Olaf Hering <olaf@xxxxxxxxx> Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> (cherry picked from commit 74d044d51b19bb697eac5c3deafa140f6afafec8) --- tools/python/scripts/convert-legacy-stream | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index ca93a93848..66ee3d2f5d 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -6,6 +6,7 @@ Convert a legacy migration stream to a v2 stream. """ from __future__ import print_function +from __future__ import division import sys import os, os.path @@ -163,7 +164,7 @@ def write_libxc_hvm_params(params): raise RuntimeError("Expected even length list of hvm parameters") write_record(libxc.REC_TYPE_hvm_params, - pack(libxc.HVM_PARAMS_FORMAT, len(params) / 2, 0), + pack(libxc.HVM_PARAMS_FORMAT, len(params) // 2, 0), pack("Q" * len(params), *params)) def write_libxc_static_data_end(): @@ -264,8 +265,8 @@ def read_pv_extended_info(vm): (so_far - total_length, )) def read_pv_p2m_frames(vm): - fpp = 4096 / vm.width - p2m_frame_len = (vm.p2m_size - 1) / fpp + 1 + fpp = 4096 // vm.width + p2m_frame_len = (vm.p2m_size - 1) // fpp + 1 info("P2M frames: fpp %d, p2m_frame_len %d" % (fpp, p2m_frame_len)) write_libxc_pv_p2m_frames(vm, unpack_ulongs(p2m_frame_len)) @@ -405,7 +406,7 @@ def read_chunks(vm): (max_id, legacy.MAX_VCPU_ID)) vm.max_vcpu_id = max_id - bitmap = unpack_exact("Q" * ((max_id/64) + 1)) + bitmap = unpack_exact("Q" * ((max_id // 64) + 1)) for idx, word in enumerate(bitmap): bit_idx = 0 -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.15
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |