Hello community,
here is the log from the commit of package xen for openSUSE:Factory checked in
at 2018-01-28 20:30:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xen (Old)
and /work/SRC/openSUSE:Factory/.xen.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xen"
Sun Jan 28 20:30:02 2018 rev:241 rq:570273 version:4.10.0_10
Changes:
--------
--- /work/SRC/openSUSE:Factory/xen/xen.changes 2018-01-16 09:26:32.530130432
+0100
+++ /work/SRC/openSUSE:Factory/.xen.new/xen.changes 2018-01-28
20:30:07.204147627 +0100
@@ -1,0 +2,7 @@
+Fri Jan 26 14:40:14 MST 2018 - carn...@suse.com
+
+- Fix python3 deprecated atoi call (bsc#1067224)
+ pygrub-python3-conversion.patch
+- Drop xenmon-python3-conversion.patch
+
+-------------------------------------------------------------------
Old:
----
xenmon-python3-conversion.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xen.spec ++++++
--- /var/tmp/diff_new_pack.ExAt3J/_old 2018-01-28 20:30:11.231959488 +0100
+++ /var/tmp/diff_new_pack.ExAt3J/_new 2018-01-28 20:30:11.235959301 +0100
@@ -207,9 +207,8 @@
# python3 conversion patches
Patch500: build-python3-conversion.patch
Patch501: pygrub-python3-conversion.patch
-Patch502: xenmon-python3-conversion.patch
-Patch503: migration-python3-conversion.patch
-Patch504: bin-python3-conversion.patch
+Patch502: migration-python3-conversion.patch
+Patch503: bin-python3-conversion.patch
# Hypervisor and PV driver Patches
Patch601: x86-ioapic-ack-default.patch
Patch602: x86-cpufreq-report.patch
@@ -405,7 +404,6 @@
%patch501 -p1
%patch502 -p1
%patch503 -p1
-%patch504 -p1
# Hypervisor and PV driver Patches
%patch601 -p1
%patch602 -p1
++++++ bin-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.ExAt3J/_old 2018-01-28 20:30:11.375952762 +0100
+++ /var/tmp/diff_new_pack.ExAt3J/_new 2018-01-28 20:30:11.375952762 +0100
@@ -526,6 +526,36 @@
sys.exit(e.code)
except KeyboardInterrupt:
sys.exit(2)
+Index: xen-4.10.0-testing/tools/xenmon/xenmon.py
+===================================================================
+--- xen-4.10.0-testing.orig/tools/xenmon/xenmon.py
++++ xen-4.10.0-testing/tools/xenmon/xenmon.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+
+ #####################################################################
+ # xenmon is a front-end for xenbaked.
+@@ -248,8 +248,8 @@ def display(scr, row, col, str, attr=0):
+ scr.keypad(0)
+ _c.echo()
+ _c.endwin()
+- print "Your terminal screen is not big enough; Please resize it."
+- print "row=%d, col=%d, str='%s'" % (row, col, str)
++ print("Your terminal screen is not big enough; Please resize it.")
++ print("row=%d, col=%d, str='%s'" % (row, col, str))
+ sys.exit(1)
+
+
+@@ -704,7 +704,7 @@ def main():
+ try:
+ writelog()
+ except:
+- print 'Quitting.'
++ print('Quitting.')
+ stop_xenbaked()
+
+ if __name__ == "__main__":
Index: xen-4.10.0-testing/tools/xentrace/xentrace_format
===================================================================
--- xen-4.10.0-testing.orig/tools/xentrace/xentrace_format
++++++ libxl.pvscsi.patch ++++++
--- /var/tmp/diff_new_pack.ExAt3J/_old 2018-01-28 20:30:11.543944915 +0100
+++ /var/tmp/diff_new_pack.ExAt3J/_new 2018-01-28 20:30:11.547944728 +0100
@@ -154,7 +154,7 @@
===================================================================
--- xen-4.10.0-testing.orig/tools/libxl/libxl.h
+++ xen-4.10.0-testing/tools/libxl/libxl.h
-@@ -1010,6 +1010,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
+@@ -1013,6 +1013,13 @@ void libxl_mac_copy(libxl_ctx *ctx, libx
#define LIBXL_HAVE_PCITOPOLOGY 1
/*
@@ -168,7 +168,7 @@
* LIBXL_HAVE_SOCKET_BITMAP
*
* If this is defined, then libxl_socket_bitmap_alloc and
-@@ -1917,6 +1924,41 @@ int libxl_device_channel_getinfo(libxl_c
+@@ -1920,6 +1927,41 @@ int libxl_device_channel_getinfo(libxl_c
libxl_device_channel *channel,
libxl_channelinfo *channelinfo);
++++++ libxl.set-migration-constraints-from-cmdline.patch ++++++
--- /var/tmp/diff_new_pack.ExAt3J/_old 2018-01-28 20:30:11.559944167 +0100
+++ /var/tmp/diff_new_pack.ExAt3J/_new 2018-01-28 20:30:11.559944167 +0100
@@ -300,7 +300,7 @@
===================================================================
--- xen-4.10.0-testing.orig/tools/libxl/libxl.h
+++ xen-4.10.0-testing/tools/libxl/libxl.h
-@@ -1467,8 +1467,23 @@ int libxl_domain_suspend(libxl_ctx *ctx,
+@@ -1470,8 +1470,23 @@ int libxl_domain_suspend(libxl_ctx *ctx,
int flags, /* LIBXL_SUSPEND_* */
const libxl_asyncop_how *ao_how)
LIBXL_EXTERNAL_CALLERS_ONLY;
++++++ pygrub-python3-conversion.patch ++++++
--- /var/tmp/diff_new_pack.ExAt3J/_old 2018-01-28 20:30:11.599942299 +0100
+++ /var/tmp/diff_new_pack.ExAt3J/_new 2018-01-28 20:30:11.599942299 +0100
@@ -91,6 +91,15 @@
def image_index(self):
if isinstance(self.cf.default, int):
+@@ -603,7 +601,7 @@ class Grub:
+ def get_entry_idx(cf, entry):
+ # first, see if the given entry is numeric
+ try:
+- idx = string.atoi(entry)
++ idx = int(entry)
+ return idx
+ except ValueError:
+ pass
@@ -636,21 +634,21 @@ def run_grub(file, entry, fs, cfg_args):
chosencfg["args"] = cfg_args
return chosencfg
++++++ xen.libxl.dmmd.patch ++++++
--- /var/tmp/diff_new_pack.ExAt3J/_old 2018-01-28 20:30:11.675938750 +0100
+++ /var/tmp/diff_new_pack.ExAt3J/_new 2018-01-28 20:30:11.675938750 +0100
@@ -49,7 +49,7 @@
===================================================================
--- xen-4.10.0-testing.orig/tools/libxl/libxl_dm.c
+++ xen-4.10.0-testing/tools/libxl/libxl_dm.c
-@@ -935,6 +935,30 @@ static char *qemu_disk_ide_drive_string(
+@@ -956,6 +956,30 @@ static char *qemu_disk_ide_drive_string(
return drive;
}
@@ -80,7 +80,7 @@
static int libxl__build_device_model_args_new(libxl__gc *gc,
const char *dm, int guest_domid,
const libxl_domain_config
*guest_config,
-@@ -1502,9 +1526,11 @@ static int libxl__build_device_model_arg
+@@ -1523,9 +1547,11 @@ static int libxl__build_device_model_arg
libxl__device_disk_dev_number(disks[i].vdev, &disk, &part);
const char *format;
char *drive;
@@ -93,7 +93,7 @@
if (dev_number == -1) {
LOGD(WARN, guest_domid, "unable to determine"" disk number
for %s",
disks[i].vdev);
-@@ -1545,7 +1571,7 @@ static int libxl__build_device_model_arg
+@@ -1566,7 +1592,7 @@ static int libxl__build_device_model_arg
* the bootloader path.
*/
if (disks[i].backend == LIBXL_DISK_BACKEND_TAP)
