pool/xen
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to c/s 23010 Xen 4.1 rc8

Browse Source 
- use _smp_mflags instead of jobs, jobs is not expanded everywhere

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=104
This commit is contained in:
Charles Arnold 2011-03-22 21:15:11 +00:00 committed by Git OBS Bridge
parent f9ad98ceba
commit 6aae1b5cd9
11 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disable_emulated_device.diff
View File

@ -2,7 +2,7 @@ Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.
===================================================================
--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -396,6 +396,11 @@ static int __devinit platform_pci_init(s
@@ -398,6 +398,11 @@ static int __devinit platform_pci_init(s
platform_mmio = mmio_addr;
platform_mmiolen = mmio_len;

2
dom-print.patch
View File

@ -2,7 +2,7 @@ Index: xen-4.1.0-testing/xen/arch/x86/domain.c
===================================================================
--- xen-4.1.0-testing.orig/xen/arch/x86/domain.c
+++ xen-4.1.0-testing/xen/arch/x86/domain.c
@@ -145,15 +145,30 @@ void dump_pageframe_info(struct domain *
@@ -150,15 +150,30 @@ void dump_pageframe_info(struct domain *
printk("Memory pages belonging to domain %u:\n", d->domain_id);

2
magic_ioport_compat.patch
View File

@ -6,7 +6,7 @@ Index: xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.
===================================================================
--- xen-4.1.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ xen-4.1.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -320,7 +320,10 @@ static int check_platform_magic(struct d
@@ -322,7 +322,10 @@ static int check_platform_magic(struct d
if (magic != XEN_IOPORT_MAGIC_VAL) {
err = "unrecognised magic value";

2
snapshot-xend.patch
View File

@ -675,7 +675,7 @@ Index: xen-4.1.0-testing/tools/python/xen/xm/main.py
def xm_save(args):
arg_check(args, "save", 2, 4)
@@ -3829,6 +3904,10 @@ commands = {
@@ -3827,6 +3902,10 @@ commands = {
"restore": xm_restore,
"resume": xm_resume,
"save": xm_save,

2
usb-list.patch
View File

@ -19,7 +19,7 @@ Index: xen-4.1.0-testing/tools/python/xen/xm/main.py
===================================================================
--- xen-4.1.0-testing.orig/tools/python/xen/xm/main.py
+++ xen-4.1.0-testing/tools/python/xen/xm/main.py
@@ -2631,10 +2631,22 @@ def xm_usb_list(args):
@@ -2629,10 +2629,22 @@ def xm_usb_list(args):
ni = parse_dev_info(x[1])
ni['idx'] = int(x[0])
usbver = sxp.child_value(x[1], 'usb-ver')

6
x86-show-page-walk-early.patch
View File

@ -27,7 +27,7 @@ Index: xen-4.1.0-testing/xen/arch/x86/x86_32/mm.c
===================================================================
--- xen-4.1.0-testing.orig/xen/arch/x86/x86_32/mm.c
+++ xen-4.1.0-testing/xen/arch/x86/x86_32/mm.c
@@ -122,6 +122,8 @@ void __init paging_init(void)
@@ -123,6 +123,8 @@ void __init paging_init(void)
#undef CNT
#undef MFN
@ -74,7 +74,7 @@ Index: xen-4.1.0-testing/xen/arch/x86/x86_64/mm.c
===================================================================
--- xen-4.1.0-testing.orig/xen/arch/x86/x86_64/mm.c
+++ xen-4.1.0-testing/xen/arch/x86/x86_64/mm.c
@@ -735,6 +735,8 @@ void __init paging_init(void)
@@ -749,6 +749,8 @@ void __init paging_init(void)
#undef CNT
#undef MFN
@ -131,7 +131,7 @@ Index: xen-4.1.0-testing/xen/include/asm-x86/mm.h
===================================================================
--- xen-4.1.0-testing.orig/xen/include/asm-x86/mm.h
+++ xen-4.1.0-testing/xen/include/asm-x86/mm.h
@@ -469,6 +469,8 @@ TYPE_SAFE(unsigned long,mfn);
@@ -467,6 +467,8 @@ TYPE_SAFE(unsigned long,mfn);
#define SHARED_M2P_ENTRY (~0UL - 1UL)
#define SHARED_M2P(_e) ((_e) == SHARED_M2P_ENTRY)

4
xen-4.1.0-testing-src.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bcc8046d5760c203a44f0358eb063c5cf35c5f5b68fc477268a646e529a2d57
size 10781365
oid sha256:1d28ba8e9a3621a7d8537eb1741e756b4996dbfcd068c5eabcd05907d68f46e0
size 10778639

4
xen-config.diff
View File

@ -9,9 +9,9 @@ Index: xen-4.1.0-testing/Config.mk
-CONFIG_QEMU ?= $(QEMU_REMOTE)
+CONFIG_QEMU ?= ioemu-qemu-xen
QEMU_TAG := xen-4.1.0-rc6
QEMU_TAG := xen-4.1.0-rc8
#QEMU_TAG ?= e073e69457b4d99b6da0b6536296e3498f7f6599
@@ -193,7 +193,7 @@ QEMU_TAG := xen-4.1.0-rc6
@@ -193,7 +193,7 @@ QEMU_TAG := xen-4.1.0-rc8
# Optional components
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n

11
xen-max-free-mem.diff
View File

@ -2,14 +2,13 @@ Index: xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
===================================================================
--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendNode.py
+++ xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
@@ -949,10 +949,33 @@ class XendNode:
@@ -949,11 +949,35 @@ class XendNode:
info['cpu_mhz'] = info['cpu_khz'] / 1000
- # physinfo is in KiB, need it in MiB
- info['total_memory'] = info['total_memory'] / 1024
- info['free_memory'] = info['free_memory'] / 1024
- info['free_cpus'] = len(XendCPUPool.unbound_cpus())
+ configured_floor = xendoptions().get_dom0_min_mem() * 1024
+ from xen.xend import balloon
+ try:
@ -23,7 +22,8 @@ Index: xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
+ extra_mem = dom0_mem - dom0_min_mem
+ info['free_memory'] = info['free_memory'] + info['scrub_memory']
+ info['max_free_memory'] = info['free_memory'] + extra_mem
+
info['free_cpus'] = len(XendCPUPool.unbound_cpus())
+ # Convert KiB to MiB, rounding down to be conservative
+ info['total_memory'] = info['total_memory'] / 1024
+ info['free_memory'] = info['free_memory'] / 1024
@ -37,10 +37,11 @@ Index: xen-4.1.0-testing/tools/python/xen/xend/XendNode.py
+ info['max_hvm_memory'] = int((info['max_free_memory']-12) * (1-2.4/1024))
+ if info['max_hvm_memory'] < 0:
+ info['max_hvm_memory'] = 0
+
ITEM_ORDER = ['nr_cpus',
'nr_nodes',
@@ -964,6 +987,9 @@ class XendNode:
'cores_per_socket',
@@ -964,6 +988,9 @@ class XendNode:
'total_memory',
'free_memory',
'free_cpus',

10
xen.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Mar 22 15:13:08 MDT 2011 - carnold@novell.com
- Update to c/s 23010 Xen 4.1 rc8
-------------------------------------------------------------------
Tue Mar 22 10:53:00 CET 2011 - ohering@suse.de
- use _smp_mflags instead of jobs, jobs is not expanded everywhere
-------------------------------------------------------------------
Mon Mar 21 10:09:50 MDT 2011 - carnold@novell.com

24
xen.spec
View File

@ -22,7 +22,7 @@ Name: xen
ExclusiveArch: %ix86 x86_64
%define xvers 4.1
%define xvermaj 4
%define changeset 22983
%define changeset 23010
%define xen_build_dir xen-4.1.0-testing
%define with_kmp 1
%define with_stubdom 0
@ -723,12 +723,12 @@ sed -i "s/XEN_CHANGESET[\t ]*=.*\$/XEN_CHANGESET = %{changeset}/" xen/Makefi
RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/}
export CFLAGS="${RPM_OPT_FLAGS}"
export RPM_OPT_FLAGS
make -C xenalyze.hg CC="gcc -I../xen/include" %{?jobs:-j%{jobs}}
make -C tools/include/xen-foreign %{?jobs:-j%{jobs}}
make tools docs %{?jobs:-j%{jobs}}
make -C xenalyze.hg CC="gcc -I../xen/include" %{?_smp_mflags}
make -C tools/include/xen-foreign %{?_smp_mflags}
make tools docs %{?_smp_mflags}
make -C tools/debugger/gdbsx
#### there are code problems that don't pass the 02-check-gcc-output, hence bitbucket
###env MAKE="make %{?jobs:-j%{jobs}}" ./gdbbuild 1>/dev/null 2>/dev/null
###env MAKE="make %{?_smp_mflags}" ./gdbbuild 1>/dev/null 2>/dev/null
###cd ../../..
%if %{?with_kmp}0
# pv driver modules
@ -741,7 +741,7 @@ for flavor in %flavors_to_build; do
cd obj/$flavor
./mkbuildtree
make -C /usr/src/linux-obj/%_target_cpu/$flavor modules \
%{?jobs:-j%{jobs}} \
%{?_smp_mflags} \
M=$PWD
cd ../..
done
@ -771,23 +771,23 @@ install_xen()
ln -s xen${ext}-%{version}-%{release}.gz $RPM_BUILD_ROOT/boot/xen${ext}.gz
ln -sf xen-syms${ext}-%{version}-%{release} $RPM_BUILD_ROOT/boot/xen-syms${ext}
}
make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT %{?jobs:-j%{jobs}}
make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=y crash_debug=y DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
install_xen dbg
make -C xen clean
make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?jobs:-j%{jobs}}
make -C xen install max_phys_cpus=%{max_cpus} pae=%{pae_enabled} debug=n crash_debug=n DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags}
install_xen
make -C xen clean
export CFLAGS="$RPM_OPT_FLAGS"
export RPM_OPT_FLAGS
make -C tools/include/xen-foreign %{?jobs:-j%{jobs}}
make -C tools/include/xen-foreign %{?_smp_mflags}
# tools
export XEN_PYTHON_NATIVE_INSTALL=1
make -C tools install \
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?jobs:-j%{jobs}}
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags}
###cp tools/debugger/gdb/gdb-6.2.1-linux-i386-xen/gdb/gdbserver/gdbserver-xen $RPM_BUILD_ROOT/usr/bin/gdbserver-xen
rm -f $RPM_BUILD_ROOT/usr/sbin/{qcow-create,img2qcow,qcow2raw}
make -C tools/misc/serial-split install \
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?jobs:-j%{jobs}}
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} %{?_smp_mflags}
%ifarch x86_64
mkdir -p $RPM_BUILD_ROOT/${_libdir}/xen/bin/
ln -s /usr/lib/xen/bin/qemu-dm $RPM_BUILD_ROOT/%{_libdir}/xen/bin/qemu-dm
@ -807,7 +807,7 @@ install -m644 %SOURCE20 $RPM_BUILD_ROOT/etc/modprobe.d/xen_pvdrivers.conf
%endif
%if %{?with_stubdom}0
# stubdom
make stubdom %{?jobs:-j%{jobs}}
make stubdom %{?_smp_mflags}
make -C stubdom install \
DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
DOCDIR=%{_defaultdocdir}/xen INCDIR=%{_includedir}