File migration-python3-conversion.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File migration-python3-conversion.patch of Package xen (Revision 098f355f50f7aa6cc81ac50cf5f6a453)

Currently displaying revision 098f355f50f7aa6cc81ac50cf5f6a453 , Show latest

Index: xen-4.10.0-testing/tools/python/xen/migration/legacy.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/legacy.py
+++ xen-4.10.0-testing/tools/python/xen/migration/legacy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """
Index: xen-4.10.0-testing/tools/python/xen/migration/libxc.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/libxc.py
+++ xen-4.10.0-testing/tools/python/xen/migration/libxc.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """
@@ -87,23 +87,23 @@ rec_type_to_str = {
 
 # page_data
 PAGE_DATA_FORMAT             = "II"
-PAGE_DATA_PFN_MASK           = (long(1) << 52) - 1
-PAGE_DATA_PFN_RESZ_MASK      = ((long(1) << 60) - 1) & ~((long(1) << 52) - 1)
+PAGE_DATA_PFN_MASK           = (int(1) << 52) - 1
+PAGE_DATA_PFN_RESZ_MASK      = ((int(1) << 60) - 1) & ~((int(1) << 52) - 1)
 
 # flags from xen/public/domctl.h: XEN_DOMCTL_PFINFO_* shifted by 32 bits
 PAGE_DATA_TYPE_SHIFT         = 60
-PAGE_DATA_TYPE_LTABTYPE_MASK = (long(0x7) << PAGE_DATA_TYPE_SHIFT)
-PAGE_DATA_TYPE_LTAB_MASK     = (long(0xf) << PAGE_DATA_TYPE_SHIFT)
-PAGE_DATA_TYPE_LPINTAB       = (long(0x8) << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable
-
-PAGE_DATA_TYPE_NOTAB         = (long(0x0) << PAGE_DATA_TYPE_SHIFT) # Regular page
-PAGE_DATA_TYPE_L1TAB         = (long(0x1) << PAGE_DATA_TYPE_SHIFT) # L1 pagetable
-PAGE_DATA_TYPE_L2TAB         = (long(0x2) << PAGE_DATA_TYPE_SHIFT) # L2 pagetable
-PAGE_DATA_TYPE_L3TAB         = (long(0x3) << PAGE_DATA_TYPE_SHIFT) # L3 pagetable
-PAGE_DATA_TYPE_L4TAB         = (long(0x4) << PAGE_DATA_TYPE_SHIFT) # L4 pagetable
-PAGE_DATA_TYPE_BROKEN        = (long(0xd) << PAGE_DATA_TYPE_SHIFT) # Broken
-PAGE_DATA_TYPE_XALLOC        = (long(0xe) << PAGE_DATA_TYPE_SHIFT) # Allocate-only
-PAGE_DATA_TYPE_XTAB          = (long(0xf) << PAGE_DATA_TYPE_SHIFT) # Invalid
+PAGE_DATA_TYPE_LTABTYPE_MASK = (int(0x7) << PAGE_DATA_TYPE_SHIFT)
+PAGE_DATA_TYPE_LTAB_MASK     = (int(0xf) << PAGE_DATA_TYPE_SHIFT)
+PAGE_DATA_TYPE_LPINTAB       = (int(0x8) << PAGE_DATA_TYPE_SHIFT) # Pinned pagetable
+
+PAGE_DATA_TYPE_NOTAB         = (int(0x0) << PAGE_DATA_TYPE_SHIFT) # Regular page
+PAGE_DATA_TYPE_L1TAB         = (int(0x1) << PAGE_DATA_TYPE_SHIFT) # L1 pagetable
+PAGE_DATA_TYPE_L2TAB         = (int(0x2) << PAGE_DATA_TYPE_SHIFT) # L2 pagetable
+PAGE_DATA_TYPE_L3TAB         = (int(0x3) << PAGE_DATA_TYPE_SHIFT) # L3 pagetable
+PAGE_DATA_TYPE_L4TAB         = (int(0x4) << PAGE_DATA_TYPE_SHIFT) # L4 pagetable
+PAGE_DATA_TYPE_BROKEN        = (int(0xd) << PAGE_DATA_TYPE_SHIFT) # Broken
+PAGE_DATA_TYPE_XALLOC        = (int(0xe) << PAGE_DATA_TYPE_SHIFT) # Allocate-only
+PAGE_DATA_TYPE_XTAB          = (int(0xf) << PAGE_DATA_TYPE_SHIFT) # Invalid
 
 # x86_pv_info
 X86_PV_INFO_FORMAT        = "BBHI"
Index: xen-4.10.0-testing/tools/python/xen/migration/libxl.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/libxl.py
+++ xen-4.10.0-testing/tools/python/xen/migration/libxl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """
Index: xen-4.10.0-testing/tools/python/xen/migration/public.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/public.py
+++ xen-4.10.0-testing/tools/python/xen/migration/public.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """
Index: xen-4.10.0-testing/tools/python/xen/migration/tests.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/tests.py
+++ xen-4.10.0-testing/tools/python/xen/migration/tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """
Index: xen-4.10.0-testing/tools/python/xen/migration/verify.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/verify.py
+++ xen-4.10.0-testing/tools/python/xen/migration/verify.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """
@@ -7,11 +7,11 @@ Common verification infrastructure for v
 
 from struct import calcsize, unpack
 
-class StreamError(StandardError):
+class StreamError(Exception):
     """Error with the stream"""
     pass
 
-class RecordError(StandardError):
+class RecordError(Exception):
     """Error with a record in the stream"""
     pass
 
Index: xen-4.10.0-testing/tools/python/xen/migration/xl.py
===================================================================
--- xen-4.10.0-testing.orig/tools/python/xen/migration/xl.py
+++ xen-4.10.0-testing/tools/python/xen/migration/xl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
 """

Places

File migration-python3-conversion.patch of Package xen (Revision 098f355f50f7aa6cc81ac50cf5f6a453)

Places