diff --git a/xen.spec b/xen.spec index 35128a2..d9353d7 100644 --- a/xen.spec +++ b/xen.spec @@ -32,7 +32,7 @@ ExclusiveArch: x86_64 %arm aarch64 %define with_debug 1 %define with_stubdom 1 %define with_qemu_traditional 1 -%define with_xend 0 +%define with_xend 1 %endif # EFI requires gcc46 or newer # its available in 12.1 or >= sles11sp2 @@ -231,35 +231,37 @@ Patch400: xen.migrate.tools_set_migration_constraints_from_cmdline.patch Patch401: xen.migrate.tools_add_xm_migrate_--log_progress_option.patch Patch402: xen.migrate.tools-xend_move_assert_to_exception_block.patch Patch403: xen.migrate.tools_set_number_of_dirty_pages_during_migration.patch -Patch404: xend-max-free-mem.patch -Patch405: xend-hvm-default-pae.patch -Patch406: xend-xenapi-console-protocol.patch -Patch407: xend-xen-api-auth.patch -Patch408: xend-checkpoint-rename.patch -Patch409: xend-xm-save-check-file.patch -Patch410: xend-xm-create-xflag.patch -Patch411: xend-domu-usb-controller.patch -Patch412: xend-devid-or-name.patch -Patch413: xend-migration-domname-fix.patch -Patch414: xend-del_usb_xend_entry.patch -Patch415: xend-xen-domUloader.patch -Patch416: xend-multi-xvdp.patch -Patch417: xend-check_device_status.patch -Patch418: xend-change_home_server.patch -Patch419: xend-minimum-restart-time.patch -Patch420: xend-disable-internal-logrotate.patch -Patch421: xend-console-port-restore.patch -Patch422: xend-vcpu-affinity-fix.patch -Patch423: xend-migration-bridge-check.patch -Patch424: xend-managed-pci-device.patch -Patch425: xend-hvm-firmware-passthrough.patch -Patch426: xend-cpuinfo-model-name.patch -Patch427: xend-xm-reboot-fix.patch -Patch428: xend-domain-lock.patch -Patch429: xend-domain-lock-sfex.patch -Patch430: xend-32on64-extra-mem.patch -Patch431: xend-hv_extid_compatibility.patch -Patch432: xend-xenpaging.autostart.patch +Patch404: xend-config.patch +Patch405: xend-max-free-mem.patch +Patch406: xend-hvm-default-pae.patch +Patch407: xend-xenapi-console-protocol.patch +Patch408: xend-core-dump-loc.patch +Patch409: xend-xen-api-auth.patch +Patch410: xend-checkpoint-rename.patch +Patch411: xend-xm-save-check-file.patch +Patch412: xend-xm-create-xflag.patch +Patch413: xend-domu-usb-controller.patch +Patch414: xend-devid-or-name.patch +Patch415: xend-migration-domname-fix.patch +Patch416: xend-del_usb_xend_entry.patch +Patch417: xend-xen-domUloader.patch +Patch418: xend-multi-xvdp.patch +Patch419: xend-check_device_status.patch +Patch420: xend-change_home_server.patch +Patch421: xend-minimum-restart-time.patch +Patch422: xend-disable-internal-logrotate.patch +Patch423: xend-console-port-restore.patch +Patch424: xend-vcpu-affinity-fix.patch +Patch425: xend-migration-bridge-check.patch +Patch426: xend-managed-pci-device.patch +Patch427: xend-hvm-firmware-passthrough.patch +Patch428: xend-cpuinfo-model-name.patch +Patch429: xend-xm-reboot-fix.patch +Patch430: xend-domain-lock.patch +Patch431: xend-domain-lock-sfex.patch +Patch432: xend-32on64-extra-mem.patch +Patch433: xend-hv_extid_compatibility.patch +Patch434: xend-xenpaging.autostart.patch # Other bug fixes or features Patch450: libxen_permissive.patch Patch451: xenconsole-no-multiple-connections.patch @@ -594,6 +596,8 @@ Authors: %patch430 -p1 %patch431 -p1 %patch432 -p1 +%patch433 -p1 +%patch434 -p1 %endif # Other bug fixes or features %patch450 -p1 diff --git a/xend-core-dump-loc.patch b/xend-core-dump-loc.patch index 48a8372..d4fe205 100644 --- a/xend-core-dump-loc.patch +++ b/xend-core-dump-loc.patch @@ -1,8 +1,8 @@ -Index: xen-4.2.1-testing/tools/python/xen/xend/XendDomainInfo.py +Index: xen-4.4.0-testing/tools/python/xen/xend/XendDomainInfo.py =================================================================== ---- xen-4.2.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py -+++ xen-4.2.1-testing/tools/python/xen/xend/XendDomainInfo.py -@@ -2320,7 +2320,7 @@ class XendDomainInfo: +--- xen-4.4.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py ++++ xen-4.4.0-testing/tools/python/xen/xend/XendDomainInfo.py +@@ -2339,7 +2339,7 @@ class XendDomainInfo: # To prohibit directory traversal based_name = os.path.basename(self.info['name_label']) diff --git a/xend-domain-lock-sfex.patch b/xend-domain-lock-sfex.patch index 5f6873b..9ae376c 100644 --- a/xend-domain-lock-sfex.patch +++ b/xend-domain-lock-sfex.patch @@ -2,7 +2,7 @@ Index: xen-4.4.0-testing/tools/examples/xend-config.sxp =================================================================== --- xen-4.4.0-testing.orig/tools/examples/xend-config.sxp +++ xen-4.4.0-testing/tools/examples/xend-config.sxp -@@ -328,7 +328,7 @@ +@@ -334,7 +334,7 @@ # path // # Return 0 on success, non-zero on error. # @@ -11,7 +11,7 @@ Index: xen-4.4.0-testing/tools/examples/xend-config.sxp # -s Lock status. If lock is acquired, print any contents # on stdout and return 0. Return non-zero if lock is # available. -@@ -354,6 +354,11 @@ +@@ -360,6 +360,11 @@ # #(xend-domain-lock-utility domain-lock) diff --git a/xend-domain-lock.patch b/xend-domain-lock.patch index ad3bdb9..dff7c5e 100644 --- a/xend-domain-lock.patch +++ b/xend-domain-lock.patch @@ -12,7 +12,7 @@ Index: xen-4.4.0-testing/tools/examples/xend-config.sxp =================================================================== --- xen-4.4.0-testing.orig/tools/examples/xend-config.sxp +++ xen-4.4.0-testing/tools/examples/xend-config.sxp -@@ -295,6 +295,65 @@ +@@ -301,6 +301,65 @@ # device assignment could really work properly even after we do this. #(pci-passthrough-strict-check yes)