![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package xen for openSUSE:Factory checked in at Sun Mar 21 11:57:45 CET 2010. -------- --- xen/xen.changes 2010-03-01 16:05:43.000000000 +0100 +++ /mounts/work_src_done/STABLE/xen/xen.changes 2010-03-19 18:16:52.000000000 +0100 @@ -1,0 +2,27 @@ +Wed Mar 17 16:42:20 CST 2010 - jsong@novell.com + +-Fix bnc#466899 - numa enabled xen fails to start/create vms + adjust_vcpuaffinity_more_cpu.patch +------------------------------------------------------------------- +Tue Mar 9 16:28:59 MST 2010 - carnold@novell.com + +- Update to changeset 21022 Xen 4.0.0 RC6. + +------------------------------------------------------------------- +Tue Mar 9 10:43:27 MST 2010 - carnold@novell.com + +- bnc#586510 - cpupool fixes + cpu-pools-update.patch + +------------------------------------------------------------------- +Fri Mar 5 09:04:18 MST 2010 - carnold@novell.com + +- bnc#582645 - Xen stuck, mptbase driver attempting to reset config + request + +------------------------------------------------------------------- +Mon Mar 1 10:05:07 MST 2010 - carnold@novell.com + +- Update to changeset 20990 Xen 4.0.0 RC5. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qemu-console-retry.patch shadow.patch xen-gcc45-fixes.patch xen_pvdrivers New: ---- cpu-pools-fixes.patch xen-extra-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xen (Version 4.0.0_20978_01) +# spec file for package xen (Version 4.0.0_21046_01) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,7 +22,7 @@ ExclusiveArch: %ix86 x86_64 %define xvers 4.0 %define xvermaj 4 -%define changeset 20978 +%define changeset 21046 %define xen_build_dir xen-4.0.0-testing %define with_kmp 0 BuildRequires: LibVNCServer-devel SDL-devel acpica automake bin86 curl-devel dev86 graphviz latex2html libjpeg-devel libxml2-devel ncurses-devel openssl openssl-devel pciutils-devel python-devel texinfo transfig @@ -37,7 +37,7 @@ %if %{?with_kmp}0 BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif -Version: 4.0.0_20978_01 +Version: 4.0.0_21046_01 Release: 1 License: GPLv2 Group: System/Kernel @@ -91,6 +91,7 @@ Patch314: xen-max-free-mem.diff Patch315: xen-disable-libxl.diff Patch316: xen-disable-xenpaging.diff +Patch317: xen-extra-fixes.patch Patch320: block-losetup-retry.diff Patch321: block-flags.diff Patch322: bridge-opensuse.patch @@ -120,20 +121,19 @@ Patch356: ioemu-vnc-resize.patch Patch357: ioemu-debuginfo.patch Patch358: vif-bridge-no-iptables.patch -Patch359: qemu-console-retry.patch # Needs to go upstream -Patch360: checkpoint-rename.patch -Patch361: xm-save-check-file.patch -Patch362: xm-create-xflag.patch -Patch363: cpupools-core.patch -Patch364: cpupools-core-fixup.patch -Patch365: keyhandler-alternative.patch -Patch366: cpu-pools-libxc.patch -Patch367: cpu-pools-python.patch -Patch368: cpu-pools-libxen.patch -Patch369: cpu-pools-xmtest.patch -Patch370: cpu-pools-docs.patch -Patch371: xen-gcc45-fixes.patch +Patch359: checkpoint-rename.patch +Patch360: xm-save-check-file.patch +Patch361: xm-create-xflag.patch +Patch362: cpupools-core.patch +Patch363: cpupools-core-fixup.patch +Patch364: keyhandler-alternative.patch +Patch365: cpu-pools-libxc.patch +Patch366: cpu-pools-python.patch +Patch367: cpu-pools-libxen.patch +Patch368: cpu-pools-xmtest.patch +Patch369: cpu-pools-docs.patch +Patch370: cpu-pools-fixes.patch # Patches for snapshot support Patch400: snapshot-ioemu-save.patch Patch401: snapshot-ioemu-restore.patch @@ -155,8 +155,7 @@ Patch425: ioemu-bdrv-open-CACHE_WB.patch Patch426: xen-ioemu-hvm-pv-support.diff Patch427: qemu-dm-segfault.patch -Patch428: shadow.patch -Patch429: hibernate.patch +Patch428: hibernate.patch # Jim's domain lock patch Patch450: xend-domain-lock.patch # Hypervisor and PV driver Patches @@ -532,6 +531,7 @@ %patch314 -p1 %patch315 -p1 %patch316 -p1 +%patch317 -p1 #%patch320 -p1 #%patch321 -p1 %patch322 -p1 @@ -573,7 +573,6 @@ %patch368 -p1 %patch369 -p1 %patch370 -p1 -%patch371 -p1 %patch400 -p1 %patch401 -p1 %patch402 -p1 @@ -593,7 +592,6 @@ %patch426 -p1 %patch427 -p1 %patch428 -p1 -%patch429 -p1 %patch450 -p1 %patch500 -p1 %patch501 -p1 ++++++ blktap-pv-cdrom.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -673,10 +673,10 @@ MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a endif --LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm +-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread -LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz +LDFLAGS_xen := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -+LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm ++LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm -lpthread +LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDFLAGS_xen) BLK-OBJS-y := block-aio.o ++++++ bridge-bonding.diff ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -2,9 +2,9 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge +++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge -@@ -241,6 +241,9 @@ op_start () { - return - fi +@@ -245,6 +245,9 @@ op_start () { + + claim_lock "network-bridge" + local bonded="" + [ -e /sys/class/net/${netdev}/bonding ] && bonded="yes" @@ -12,7 +12,7 @@ vlans=$(find_active_vlans "${netdev}") for vlan in $vlans ; do ifdown $vlan ; done -@@ -258,18 +261,32 @@ op_start () { +@@ -262,18 +265,32 @@ op_start () { ip link set ${netdev} down ip addr flush ${netdev} fi ++++++ bridge-opensuse.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge +++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge -@@ -262,18 +262,18 @@ op_stop () { +@@ -270,19 +270,19 @@ op_stop () { transfer_addrs ${bridge} ${pdev} if ! ifdown ${bridge}; then get_ip_info ${bridge} @@ -24,8 +24,9 @@ + ip link set ${pdev} down ip link set ${pdev} name ${netdev} do_ifup ${netdev} -- + - brctl delbr ${tdev} +- + release_lock "network-bridge" } - # adds $dev to $bridge but waits for $dev to be in running state first ++++++ bridge-record-creation.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -1,8 +1,8 @@ -Index: xen-3.5.0-testing/tools/hotplug/Linux/network-bridge +Index: xen-4.0.0-testing/tools/hotplug/Linux/network-bridge =================================================================== ---- xen-3.5.0-testing.orig/tools/hotplug/Linux/network-bridge -+++ xen-3.5.0-testing/tools/hotplug/Linux/network-bridge -@@ -249,6 +249,11 @@ op_start () { +--- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge ++++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge +@@ -253,6 +253,11 @@ op_start () { create_bridge ${tdev} @@ -14,7 +14,7 @@ preiftransfer ${netdev} transfer_addrs ${netdev} ${tdev} # Remember slaves for bonding interface. -@@ -322,6 +327,13 @@ op_stop () { +@@ -330,6 +335,13 @@ op_stop () { ip link set ${pdev} name ${netdev} do_ifup ${netdev} @@ -26,5 +26,5 @@ + fi + for vlan in $vlans ; do ifup $vlan ; done - } + release_lock "network-bridge" ++++++ bridge-vlan.diff ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/hotplug/Linux/network-bridge +++ xen-4.0.0-testing/tools/hotplug/Linux/network-bridge -@@ -191,6 +191,28 @@ antispoofing () { +@@ -193,6 +193,28 @@ antispoofing () { iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT } @@ -31,9 +31,9 @@ # Usage: show_status dev bridge # Print ifconfig and routes. show_status () { -@@ -219,6 +241,9 @@ op_start () { - return - fi +@@ -223,6 +245,9 @@ op_start () { + + claim_lock "network-bridge" + vlans=$(find_active_vlans "${netdev}") + for vlan in $vlans ; do ifdown $vlan ; done @@ -41,7 +41,7 @@ create_bridge ${tdev} preiftransfer ${netdev} -@@ -246,6 +271,8 @@ op_start () { +@@ -250,6 +275,8 @@ op_start () { add_to_bridge2 ${bridge} ${pdev} do_ifup ${bridge} @@ -50,9 +50,9 @@ if [ ${antispoof} = 'yes' ] ; then antispoofing fi -@@ -259,6 +286,9 @@ op_stop () { - return - fi +@@ -267,6 +294,9 @@ op_stop () { + + claim_lock "network-bridge" + vlans=$(find_active_vlans "${netdev}") + for vlan in $vlans ; do ifdown $vlan ; done @@ -60,12 +60,12 @@ transfer_addrs ${bridge} ${pdev} if ! ifdown ${bridge}; then get_ip_info ${bridge} -@@ -274,6 +304,8 @@ op_stop () { - ip link set ${pdev} down +@@ -283,6 +313,8 @@ op_stop () { ip link set ${pdev} name ${netdev} do_ifup ${netdev} -+ + + for vlan in $vlans ; do ifup $vlan ; done ++ + release_lock "network-bridge" } - # adds $dev to $bridge but waits for $dev to be in running state first ++++++ build-tapdisk-ioemu.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -60,7 +60,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/ioemu-remote/configure +++ xen-4.0.0-testing/tools/ioemu-remote/configure -@@ -1508,7 +1508,7 @@ bsd) +@@ -1511,7 +1511,7 @@ bsd) ;; esac @@ -121,7 +121,7 @@ typedef struct IOHandlerRecord { int fd; IOCanRWHandler *fd_read_poll; -@@ -103,7 +81,6 @@ int main(void) +@@ -103,7 +81,6 @@ int main(void) logfile = stderr; bdrv_init(); @@ -129,7 +129,7 @@ init_blktap(); /* Daemonize */ -@@ -115,8 +92,6 @@ int main(void) +@@ -115,8 +92,6 @@ int main(void) * completed aio operations. */ while (1) { ++++++ cpu-pools-fixes.patch ++++++ ++++ 773 lines (skipped) ++++++ cpu-pools-libxc.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -204,7 +204,7 @@ memcpy(domctl.u.createdomain.handle, handle, sizeof(xen_domain_handle_t)); if ( (err = do_domctl(xc_handle, &domctl)) != 0 ) return err; -@@ -206,6 +213,7 @@ int xc_domain_getinfo(int xc_handle, +@@ -220,6 +227,7 @@ int xc_domain_getinfo(int xc_handle, info->cpu_time = domctl.u.getdomaininfo.cpu_time; info->nr_online_vcpus = domctl.u.getdomaininfo.nr_online_vcpus; info->max_vcpu_id = domctl.u.getdomaininfo.max_vcpu_id; @@ -257,7 +257,7 @@ /* Functions to produce a dump of a given domain -@@ -500,6 +501,100 @@ int xc_domain_setdebugging(int xc_handle +@@ -502,6 +503,100 @@ int xc_domain_setdebugging(int xc_handle unsigned int enable); /* ++++++ cpu-pools-python.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -36,7 +36,7 @@ return pyxc_error_to_exception(); if ( target ) -@@ -316,7 +318,7 @@ static PyObject *pyxc_domain_getinfo(XcO +@@ -332,7 +334,7 @@ static PyObject *pyxc_domain_getinfo(XcO { info_dict = Py_BuildValue( "{s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i,s:i" @@ -45,7 +45,7 @@ "domid", (int)info[i].domid, "online_vcpus", info[i].nr_online_vcpus, "max_vcpu_id", info[i].max_vcpu_id, -@@ -331,7 +333,8 @@ static PyObject *pyxc_domain_getinfo(XcO +@@ -347,7 +349,8 @@ static PyObject *pyxc_domain_getinfo(XcO "cpu_time", (long long)info[i].cpu_time, "maxmem_kb", (long long)info[i].max_memkb, "ssidref", (int)info[i].ssidref, @@ -55,7 +55,7 @@ pyhandle = PyList_New(sizeof(xen_domain_handle_t)); if ( (pyhandle == NULL) || (info_dict == NULL) ) { -@@ -1697,6 +1700,179 @@ static PyObject *pyxc_dom_set_memshr(XcO +@@ -1755,6 +1758,179 @@ static PyObject *pyxc_dom_set_memshr(XcO return zero; } @@ -235,7 +235,7 @@ static PyMethodDef pyxc_methods[] = { { "handle", -@@ -1812,7 +1988,8 @@ static PyMethodDef pyxc_methods[] = { +@@ -1870,7 +2046,8 @@ static PyMethodDef pyxc_methods[] = { " maxmem_kb [int]: Maximum memory limit, in kilobytes\n" " cpu_time [long]: CPU time consumed, in nanoseconds\n" " shutdown_reason [int]: Numeric code from guest OS, explaining " @@ -245,7 +245,7 @@ { "vcpu_getinfo", (PyCFunction)pyxc_vcpu_getinfo, -@@ -2210,6 +2387,66 @@ static PyMethodDef pyxc_methods[] = { +@@ -2268,6 +2445,66 @@ static PyMethodDef pyxc_methods[] = { " enable [int,0|1]: Disable or enable?\n" "Returns: [int] 0 on success; -1 on error.\n" }, @@ -1489,15 +1489,15 @@ } LEGACY_CFG_TO_XENAPI_CFG = reverse_dict(XENAPI_CFG_TO_LEGACY_CFG) -@@ -233,6 +234,7 @@ XENAPI_CFG_TYPES = { - 's3_integrity' : int, +@@ -234,6 +235,7 @@ XENAPI_CFG_TYPES = { 'superpages' : int, 'memory_sharing': int, + 'Description': str, + 'pool_name' : str, } # List of legacy configuration keys that have no equivalent in the -@@ -278,6 +280,7 @@ LEGACY_CFG_TYPES = { +@@ -279,6 +281,7 @@ LEGACY_CFG_TYPES = { 'bootloader': str, 'bootloader_args': str, 'description': str, @@ -1505,7 +1505,7 @@ } # Values that should be stored in xenstore's /vm/<uuid> that is used -@@ -299,6 +302,7 @@ LEGACY_XENSTORE_VM_PARAMS = [ +@@ -300,6 +303,7 @@ LEGACY_XENSTORE_VM_PARAMS = [ 'on_xend_stop', 'bootloader', 'bootloader_args', @@ -1513,7 +1513,7 @@ ] ## -@@ -407,6 +411,7 @@ class XendConfig(dict): +@@ -408,6 +412,7 @@ class XendConfig(dict): 'other_config': {}, 'platform': {}, 'target': 0, @@ -1646,7 +1646,7 @@ def _init_networks(self): # Initialise networks -@@ -357,6 +360,18 @@ class XendNode: +@@ -361,6 +364,18 @@ class XendNode: for physical_host, pscsi_HBA_uuid in pscsi_HBA_table.items(): XendPSCSI_HBA(pscsi_HBA_uuid, {'physical_host': physical_host}) @@ -1665,7 +1665,7 @@ def add_network(self, interface): # TODO -@@ -577,6 +592,7 @@ class XendNode: +@@ -581,6 +596,7 @@ class XendNode: self.save_PPCIs() self.save_PSCSIs() self.save_PSCSI_HBAs() @@ -1673,7 +1673,7 @@ def save_PIFs(self): pif_records = dict([(pif_uuid, XendAPIStore.get( -@@ -619,6 +635,12 @@ class XendNode: +@@ -623,6 +639,12 @@ class XendNode: for pscsi_HBA_uuid in XendPSCSI_HBA.get_all()]) self.state_store.save_state('pscsi_HBA', pscsi_HBA_records) @@ -1686,7 +1686,7 @@ def shutdown(self): return 0 -@@ -930,6 +952,7 @@ class XendNode: +@@ -934,6 +956,7 @@ class XendNode: self.format_node_to_memory(info, 'node_to_memory') info['node_to_dma32_mem'] = \ self.format_node_to_memory(info, 'node_to_dma32_mem') @@ -1694,7 +1694,7 @@ # FIXME: These are hard-coded to be the inverse of the getXenMemory # functions in image.py. Find a cleaner way. -@@ -949,6 +972,7 @@ class XendNode: +@@ -953,6 +976,7 @@ class XendNode: 'virt_caps', 'total_memory', 'free_memory', ++++++ cpupools-core-fixup.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -6,12 +6,13 @@ - move and rename csched_priv to make sure eventual backported upstream patches using the variable get correctly adjusted (i.e. missing adjustments get detected at build time) +- remove boot time per-CPU pool assignment messages (bnc#572146) Index: xen-4.0.0-testing/xen/arch/x86/domain.c =================================================================== --- xen-4.0.0-testing.orig/xen/arch/x86/domain.c +++ xen-4.0.0-testing/xen/arch/x86/domain.c -@@ -1573,6 +1573,7 @@ int continue_hypercall_on_cpu(int cpu, v +@@ -1580,6 +1580,7 @@ int continue_hypercall_on_cpu(int cpu, v v->arch.schedule_tail = continue_hypercall_on_cpu_helper; v->arch.continue_info = info; @@ -19,7 +20,7 @@ } else { -@@ -1583,7 +1584,6 @@ int continue_hypercall_on_cpu(int cpu, v +@@ -1590,7 +1591,6 @@ int continue_hypercall_on_cpu(int cpu, v info->func = func; info->data = data; ++++++ cpupools-core.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -4,7 +4,7 @@ =================================================================== --- xen-4.0.0-testing.orig/xen/arch/x86/acpi/power.c +++ xen-4.0.0-testing/xen/arch/x86/acpi/power.c -@@ -229,7 +229,7 @@ static int enter_state(u32 state) +@@ -231,7 +231,7 @@ static int enter_state(u32 state) return error; } @@ -13,7 +13,7 @@ { struct acpi_sleep_info *sinfo = (struct acpi_sleep_info *)data; return enter_state(sinfo->sleep_state); -@@ -260,7 +260,7 @@ int acpi_enter_sleep(struct xenpf_enter_ +@@ -262,7 +262,7 @@ int acpi_enter_sleep(struct xenpf_enter_ acpi_sinfo.pm1b_cnt_val = sleep->pm1b_cnt_val; acpi_sinfo.sleep_state = sleep->sleep_state; @@ -26,7 +26,7 @@ =================================================================== --- xen-4.0.0-testing.orig/xen/arch/x86/domain.c +++ xen-4.0.0-testing/xen/arch/x86/domain.c -@@ -1510,42 +1510,52 @@ void sync_vcpu_execstate(struct vcpu *v) +@@ -1517,42 +1517,52 @@ void sync_vcpu_execstate(struct vcpu *v) } struct migrate_info { @@ -96,7 +96,7 @@ info = v->arch.continue_info; if ( info == NULL ) -@@ -1554,16 +1564,12 @@ int continue_hypercall_on_cpu(int cpu, l +@@ -1561,16 +1571,12 @@ int continue_hypercall_on_cpu(int cpu, l if ( info == NULL ) return -ENOMEM; @@ -117,7 +117,7 @@ v->arch.schedule_tail = continue_hypercall_on_cpu_helper; v->arch.continue_info = info; -@@ -1571,17 +1577,17 @@ int continue_hypercall_on_cpu(int cpu, l +@@ -1578,17 +1584,17 @@ int continue_hypercall_on_cpu(int cpu, l else { BUG_ON(info->nest != 0); @@ -160,7 +160,7 @@ if ( opt_dom0_max_vcpus > MAX_VIRT_CPUS ) opt_dom0_max_vcpus = MAX_VIRT_CPUS; -@@ -248,7 +249,7 @@ int __init construct_dom0( +@@ -277,7 +278,7 @@ int __init construct_dom0( unsigned long _initrd_start, unsigned long initrd_len, char *cmdline) { @@ -169,7 +169,7 @@ struct cpu_user_regs *regs; unsigned long pfn, mfn; unsigned long nr_pages; -@@ -757,8 +758,12 @@ int __init construct_dom0( +@@ -776,8 +777,12 @@ int __init construct_dom0( printk("Dom0 has maximum %u VCPUs\n", opt_dom0_max_vcpus); @@ -372,7 +372,7 @@ */ int alloc_cpu_id(void) { -@@ -984,10 +984,10 @@ static int __devinit do_boot_cpu(int api +@@ -985,10 +985,10 @@ static int __devinit do_boot_cpu(int api cpucount--; /* Mark the CPU as non-present */ @@ -430,7 +430,7 @@ if (cpu_online(cpu)) { printk("Bring up a online cpu. Bogus!\n"); err = -EBUSY; -@@ -1398,7 +1400,7 @@ int cpu_up(unsigned int cpu) +@@ -1400,7 +1402,7 @@ int cpu_up(unsigned int cpu) out: if (!err) send_guest_global_virq(dom0, VIRQ_PCPU_STATE); @@ -439,7 +439,7 @@ return err; } -@@ -1479,13 +1481,13 @@ int cpu_add(uint32_t apic_id, uint32_t a +@@ -1481,13 +1483,13 @@ int cpu_add(uint32_t apic_id, uint32_t a if ( physid_isset(apic_id, phys_cpu_present_map) ) return -EEXIST; @@ -455,7 +455,7 @@ return cpu; } -@@ -1502,7 +1504,7 @@ int cpu_add(uint32_t apic_id, uint32_t a +@@ -1504,7 +1506,7 @@ int cpu_add(uint32_t apic_id, uint32_t a "Setup node failed for pxm %x\n", pxm); x86_acpiid_to_apicid[acpi_id] = 0xff; mp_unregister_lapic(apic_id, cpu); @@ -464,7 +464,7 @@ return node; } apicid_to_node[apic_id] = node; -@@ -1510,7 +1512,7 @@ int cpu_add(uint32_t apic_id, uint32_t a +@@ -1512,7 +1514,7 @@ int cpu_add(uint32_t apic_id, uint32_t a srat_detect_node(cpu); numa_add_cpu(cpu); @@ -473,7 +473,7 @@ dprintk(XENLOG_INFO, "Add CPU %x with index %x\n", apic_id, cpu); return cpu; } -@@ -1554,6 +1556,7 @@ int __devinit __cpu_up(unsigned int cpu) +@@ -1556,6 +1558,7 @@ int __devinit __cpu_up(unsigned int cpu) process_pending_softirqs(); } ++++++ dom-print.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/xen/arch/x86/domain.c +++ xen-4.0.0-testing/xen/arch/x86/domain.c -@@ -143,7 +143,7 @@ void dump_pageframe_info(struct domain * +@@ -144,7 +144,7 @@ void dump_pageframe_info(struct domain * printk("Memory pages belonging to domain %u:\n", d->domain_id); @@ -11,7 +11,7 @@ { printk(" DomPage list too long to display\n"); } -@@ -151,6 +151,15 @@ void dump_pageframe_info(struct domain * +@@ -152,6 +152,15 @@ void dump_pageframe_info(struct domain * { page_list_for_each ( page, &d->page_list ) { ++++++ hv_tools.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:30.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:30.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/python/xen/lowlevel/xc/xc.c +++ xen-4.0.0-testing/tools/python/xen/lowlevel/xc/xc.c -@@ -917,16 +917,16 @@ static PyObject *pyxc_hvm_build(XcObject +@@ -950,16 +950,16 @@ static PyObject *pyxc_hvm_build(XcObject #endif int i; char *image; @@ -24,7 +24,7 @@ return NULL; memset(vcpu_avail, 0, sizeof(vcpu_avail)); -@@ -978,6 +978,7 @@ static PyObject *pyxc_hvm_build(XcObject +@@ -1011,6 +1011,7 @@ static PyObject *pyxc_hvm_build(XcObject va_hvm->checksum -= sum; munmap(va_map, XC_PAGE_SIZE); #endif ++++++ snapshot-ioemu-restore.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:31.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/blktap/drivers/blktapctrl.c +++ xen-4.0.0-testing/tools/blktap/drivers/blktapctrl.c -@@ -347,6 +347,7 @@ static int write_msg(int fd, int msgtype +@@ -348,6 +348,7 @@ static int write_msg(int fd, int msgtype msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t)); msg_dev->devnum = blkif->minor; msg_dev->domid = blkif->domid; ++++++ snapshot-xend.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:31.000000000 +0100 @@ -325,9 +325,9 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/python/xen/xend/XendConfig.py +++ xen-4.0.0-testing/tools/python/xen/xend/XendConfig.py -@@ -235,6 +235,7 @@ XENAPI_CFG_TYPES = { - 'superpages' : int, +@@ -236,6 +236,7 @@ XENAPI_CFG_TYPES = { 'memory_sharing': int, + 'Description': str, 'pool_name' : str, + 'snapshotname': str, } ++++++ x86-ioapic-ack-default.patch ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:31.000000000 +0100 @@ -1,7 +1,9 @@ Change default IO-APIC ack mode for single IO-APIC systems to old-style. ---- 2010-01-06.orig/xen/arch/x86/io_apic.c 2009-12-17 12:20:22.000000000 +0100 -+++ 2010-01-06/xen/arch/x86/io_apic.c 2010-01-06 11:17:14.000000000 +0100 +Index: xen-4.0.0-testing/xen/arch/x86/io_apic.c +=================================================================== +--- xen-4.0.0-testing.orig/xen/arch/x86/io_apic.c ++++ xen-4.0.0-testing/xen/arch/x86/io_apic.c @@ -1442,7 +1442,7 @@ static unsigned int startup_level_ioapic return 0; /* don't check for pending */ } @@ -11,7 +13,7 @@ static void setup_ioapic_ack(char *s) { if ( !strcmp(s, "old") ) -@@ -1954,6 +1954,8 @@ void __init setup_IO_APIC(void) +@@ -1946,6 +1946,8 @@ void __init setup_IO_APIC(void) else io_apic_irqs = ~PIC_IRQS; ++++++ xen-4.0.0-testing-src.tar.bz2 ++++++ xen/xen-4.0.0-testing-src.tar.bz2 /mounts/work_src_done/STABLE/xen/xen-4.0.0-testing-src.tar.bz2 differ: char 11, line 1 ++++++ xen-config.diff ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:31.000000000 +0100 @@ -2,16 +2,16 @@ =================================================================== --- xen-4.0.0-testing.orig/Config.mk +++ xen-4.0.0-testing/Config.mk -@@ -148,7 +148,7 @@ QEMU_REMOTE=http://xenbits.xensource.com +@@ -151,7 +151,7 @@ QEMU_REMOTE=http://xenbits.xensource.com # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. # CONFIG_QEMU ?= ../qemu-xen.git -CONFIG_QEMU ?= $(QEMU_REMOTE) +CONFIG_QEMU ?= ioemu-remote - QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78 - # Thu Feb 18 15:36:29 2010 +0000 -@@ -163,9 +163,9 @@ CONFIG_OCAML_XENSTORED ?= n + QEMU_TAG := xen-4.0.0-rc6 + #QEMU_TAG ?= e5d14857cd67490bf956d97c8888c0be95ed3f78 +@@ -167,9 +167,9 @@ CONFIG_OCAML_XENSTORED ?= n # Optional components XENSTAT_XENTOP ?= y VTPM_TOOLS ?= n ++++++ xen-extra-fixes.patch ++++++ Index: xen-4.0.0-testing/tools/ioemu-remote/block-vvfat.c =================================================================== --- xen-4.0.0-testing.orig/tools/ioemu-remote/block-vvfat.c +++ xen-4.0.0-testing/tools/ioemu-remote/block-vvfat.c @@ -865,7 +865,8 @@ static int init_directories(BDRVVVFATSta { direntry_t* entry=array_get_next(&(s->directory)); entry->attributes=0x28; /* archive | volume label */ - snprintf((char*)entry->name,11,"QEMU VVFAT"); + memcpy(entry->name,"QEMU VVF",8); + memcpy(entry->extension,"AT ",3); } /* Now build FAT, and write back information into directory */ Index: xen-4.0.0-testing/unmodified_drivers/linux-2.6/overrides.mk =================================================================== --- xen-4.0.0-testing.orig/unmodified_drivers/linux-2.6/overrides.mk +++ xen-4.0.0-testing/unmodified_drivers/linux-2.6/overrides.mk @@ -11,7 +11,7 @@ ifeq ($(ARCH),ia64) _XEN_CPPFLAGS += -DCONFIG_VMX_GUEST endif -_XEN_CPPFLAGS += -include $(objtree)/include/linux/autoconf.h +_XEN_CPPFLAGS += -include $(objtree)/include/generated/autoconf.h EXTRA_CFLAGS += $(_XEN_CPPFLAGS) EXTRA_AFLAGS += $(_XEN_CPPFLAGS) ++++++ xen-max-free-mem.diff ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:31.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/python/xen/xend/XendNode.py +++ xen-4.0.0-testing/tools/python/xen/xend/XendNode.py -@@ -907,15 +907,39 @@ class XendNode: +@@ -911,15 +911,39 @@ class XendNode: info['cpu_mhz'] = info['cpu_khz'] / 1000 @@ -47,7 +47,7 @@ ITEM_ORDER = ['nr_cpus', 'nr_nodes', 'cores_per_socket', -@@ -925,6 +949,9 @@ class XendNode: +@@ -929,6 +953,9 @@ class XendNode: 'virt_caps', 'total_memory', 'free_memory', ++++++ xen-warnings.diff ++++++ --- /var/tmp/diff_new_pack.LeQwEc/_old 2010-03-21 11:57:31.000000000 +0100 +++ /var/tmp/diff_new_pack.LeQwEc/_new 2010-03-21 11:57:31.000000000 +0100 @@ -165,7 +165,7 @@ =================================================================== --- xen-4.0.0-testing.orig/tools/blktap2/drivers/block-remus.c +++ xen-4.0.0-testing/tools/blktap2/drivers/block-remus.c -@@ -1578,7 +1578,7 @@ static int tdremus_open(td_driver_t *dri +@@ -1579,7 +1579,7 @@ static int tdremus_open(td_driver_t *dri td_flag_t flags) { struct tdremus_state *s = (struct tdremus_state *)driver->data; @@ -174,16 +174,3 @@ RPRINTF("opening %s\n", name); -Index: xen-4.0.0-testing/tools/libxl/Makefile -=================================================================== ---- xen-4.0.0-testing.orig/tools/libxl/Makefile -+++ xen-4.0.0-testing/tools/libxl/Makefile -@@ -50,7 +50,7 @@ xl.o: $(LIBCONFIG_OUTPUT)/libconfig.so x - $(CC) $(CFLAGS) -I$(LIBCONFIG_SOURCE) -c xl.c - - $(CLIENTS): xl.o libxenlight.so $(LIBCONFIG_OUTPUT)/libconfig.so -- $(CC) $(LDFLAGS) -o $@ $< $(LIBS) -L . -lxenlight -L$(LIBCONFIG_OUTPUT) -lconfig -+ $(CC) $(LDFLAGS) -o $@ $< -L . -lxenlight $(LIBS) -L$(LIBCONFIG_OUTPUT) -lconfig - - .PHONY: install - install: all ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org