rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=29

Browse Source
This commit is contained in:
OBS User unknown 2007-08-18 10:16:49 +00:00 committed by Git OBS Bridge
parent d392f1f54e
commit 49bc396272
6 changed files with 101 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
15381-log-svm-npt.patch Normal file
View File

@ -0,0 +1,31 @@
# HG changeset patch
# User kfraser@localhost.localdomain
# Date 1182263948 -3600
# Node ID f1ca92bf7e0f0fc8441f9681395a09afe4617af9
# Parent 07688f8f53943cb51c965fa91923b1c4a3e87d0f
hvm svm: Log into 'xm dmesg' that SVM NPT is enabled.
Signed-off-by: Keir Fraser <keir@xensource.com>
Index: xen-3.1-testing/xen/arch/x86/hvm/svm/svm.c
===================================================================
--- xen-3.1-testing.orig/xen/arch/x86/hvm/svm/svm.c
+++ xen-3.1-testing/xen/arch/x86/hvm/svm/svm.c
@@ -895,7 +895,7 @@ static struct hvm_function_table svm_fun
.event_injection_faulted = svm_event_injection_faulted
};
-void svm_npt_detect(void)
+static void svm_npt_detect(void)
{
u32 eax, ebx, ecx, edx;
@@ -956,6 +956,9 @@ int start_svm(void)
hvm_enable(&svm_function_table);
+ if ( opt_hap_enabled )
+ printk("SVM: Nested paging enabled.\n");
+
return 1;
}

10
15433-pae-ptwr-check.patch
View File

@ -10,11 +10,11 @@ aligned to the 8 byte pte size.
Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
Index: 2007-05-14/xen/arch/x86/mm.c
Index: xen-3.1-testing/xen/arch/x86/mm.c
===================================================================
--- 2007-05-14.orig/xen/arch/x86/mm.c 2007-07-02 10:39:23.000000000 +0200
+++ 2007-05-14/xen/arch/x86/mm.c 2007-07-02 10:51:13.000000000 +0200
@@ -3196,6 +3196,7 @@ static int ptwr_emulated_update(
--- xen-3.1-testing.orig/xen/arch/x86/mm.c
+++ xen-3.1-testing/xen/arch/x86/mm.c
@@ -3194,6 +3194,7 @@ static int ptwr_emulated_update(
struct ptwr_emulate_ctxt *ptwr_ctxt)
{
unsigned long mfn;
@ -22,7 +22,7 @@ Index: 2007-05-14/xen/arch/x86/mm.c
struct page_info *page;
l1_pgentry_t pte, ol1e, nl1e, *pl1e;
struct vcpu *v = current;
@@ -3249,7 +3250,7 @@ static int ptwr_emulated_update(
@@ -3247,7 +3248,7 @@ static int ptwr_emulated_update(
if ( unlikely(!get_page_from_l1e(gl1e_to_ml1e(d, nl1e), d)) )
{
if ( (CONFIG_PAGING_LEVELS >= 3) && is_pv_32bit_domain(d) &&

20
cdrom-removable.patch
View File

@ -1,7 +1,7 @@
Index: xen-3.1-testing/tools/ioemu/block.c
===================================================================
--- xen-3.1-testing.orig/tools/ioemu/block.c 2007-07-17 08:02:01.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/block.c 2007-07-17 08:05:58.000000000 -0600
--- xen-3.1-testing.orig/tools/ioemu/block.c 2007-08-13 12:47:26.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/block.c 2007-08-13 12:48:46.000000000 -0600
@@ -185,6 +185,13 @@
uint8_t *buf;
size_t bufsize = 1024;
@ -105,7 +105,7 @@ Index: xen-3.1-testing/tools/ioemu/block.c
+
+static int raw_eject(BlockDriverState *bs, int eject_flag)
+{
+ char cmd[sizeof(bs->device_name) + 32];
+ char cmd[sizeof(bs->filename) + 32];
+
+ switch(bs->removable) {
+ case BDRV_TYPE_CDROM:
@ -212,7 +212,7 @@ Index: xen-3.1-testing/tools/ioemu/block.c
+{
+
+ int ret = 0;
+ char cmd[sizeof(bs->device_name) + 32];
+ char cmd[sizeof(bs->filename) + 32];
+ BlockDriver *drv = bs->drv;
+
+ switch(bs->removable) {
@ -262,7 +262,7 @@ Index: xen-3.1-testing/tools/ioemu/block.c
Index: xen-3.1-testing/tools/ioemu/block_int.h
===================================================================
--- xen-3.1-testing.orig/tools/ioemu/block_int.h 2007-05-17 09:51:09.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/block_int.h 2007-07-17 08:05:58.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/block_int.h 2007-08-13 12:47:26.000000000 -0600
@@ -41,6 +41,13 @@
int nb_sectors, int *pnum);
int (*bdrv_set_key)(BlockDriverState *bs, const char *key);
@ -288,7 +288,7 @@ Index: xen-3.1-testing/tools/ioemu/block_int.h
Index: xen-3.1-testing/tools/ioemu/hw/ide.c
===================================================================
--- xen-3.1-testing.orig/tools/ioemu/hw/ide.c 2007-05-17 09:51:09.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/hw/ide.c 2007-07-17 08:05:58.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/hw/ide.c 2007-08-13 12:47:26.000000000 -0600
@@ -278,6 +278,7 @@
#define ASC_ILLEGAL_OPCODE 0x20
#define ASC_LOGICAL_BLOCK_OOR 0x21
@ -328,7 +328,7 @@ Index: xen-3.1-testing/tools/ioemu/hw/ide.c
Index: xen-3.1-testing/tools/ioemu/xenstore.c
===================================================================
--- xen-3.1-testing.orig/tools/ioemu/xenstore.c 2007-05-17 09:51:09.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/xenstore.c 2007-07-17 08:05:58.000000000 -0600
+++ xen-3.1-testing/tools/ioemu/xenstore.c 2007-08-13 12:47:37.000000000 -0600
@@ -82,7 +82,7 @@
char **e = NULL;
char *buf = NULL, *path;
@ -403,7 +403,7 @@ Index: xen-3.1-testing/tools/ioemu/xenstore.c
Index: xen-3.1-testing/tools/python/xen/xend/server/HalDaemon.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xen-3.1-testing/tools/python/xen/xend/server/HalDaemon.py 2007-07-17 08:05:58.000000000 -0600
+++ xen-3.1-testing/tools/python/xen/xend/server/HalDaemon.py 2007-08-13 12:47:26.000000000 -0600
@@ -0,0 +1,228 @@
+#!/usr/bin/env python
+# -*- mode: python; -*-
@ -636,7 +636,7 @@ Index: xen-3.1-testing/tools/python/xen/xend/server/HalDaemon.py
Index: xen-3.1-testing/tools/python/xen/xend/server/Hald.py
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ xen-3.1-testing/tools/python/xen/xend/server/Hald.py 2007-07-17 08:05:58.000000000 -0600
+++ xen-3.1-testing/tools/python/xen/xend/server/Hald.py 2007-08-13 12:47:26.000000000 -0600
@@ -0,0 +1,113 @@
+#============================================================================
+# This library is free software; you can redistribute it and/or
@ -754,7 +754,7 @@ Index: xen-3.1-testing/tools/python/xen/xend/server/Hald.py
Index: xen-3.1-testing/tools/python/xen/xend/server/SrvServer.py
===================================================================
--- xen-3.1-testing.orig/tools/python/xen/xend/server/SrvServer.py 2007-05-17 09:51:10.000000000 -0600
+++ xen-3.1-testing/tools/python/xen/xend/server/SrvServer.py 2007-07-17 08:05:58.000000000 -0600
+++ xen-3.1-testing/tools/python/xen/xend/server/SrvServer.py 2007-08-13 12:47:26.000000000 -0600
@@ -57,6 +57,7 @@
from SrvRoot import SrvRoot

23
xen-rpmoptflags.diff
View File

@ -1,7 +1,7 @@
Index: xen-unstable/Config.mk
Index: xen-3.1-testing/Config.mk
===================================================================
--- xen-unstable.orig/Config.mk
+++ xen-unstable/Config.mk
--- xen-3.1-testing.orig/Config.mk
+++ xen-3.1-testing/Config.mk
@@ -18,7 +18,7 @@ SHELL ?= /bin/sh
# Tools to run on system hosting the build
@ -11,3 +11,20 @@ Index: xen-unstable/Config.mk
DISTDIR ?= $(XEN_ROOT)/dist
DESTDIR ?= /
Index: xen-3.1-testing/tools/libxen/Makefile
===================================================================
--- xen-3.1-testing.orig/tools/libxen/Makefile
+++ xen-3.1-testing/tools/libxen/Makefile
@@ -21,10 +21,10 @@ include $(XEN_ROOT)/tools/Rules.mk
MAJOR = 1.0
MINOR = 0
-CFLAGS = -Iinclude \
+CFLAGS += -Iinclude \
$(shell xml2-config --cflags) \
$(shell curl-config --cflags) \
- -W -Wall -Wmissing-prototypes -Werror -std=c99 -O2 -fPIC
+ -std=c99 -fPIC
LDFLAGS = $(shell xml2-config --libs) \
$(shell curl-config --libs)

10
xen.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Aug 13 10:25:32 MDT 2007 - carnold@novell.com
- hvm svm: Log into 'xm dmesg' that SVM NPT is enabled.
-------------------------------------------------------------------
Fri Aug 10 16:43:31 MDT 2007 - ccoffing@novell.com
- Honor RPM_OPT_FLAGS better
-------------------------------------------------------------------
Thu Aug 9 10:29:08 MDT 2007 - ccoffing@novell.com

44
xen.spec
View File

@ -34,8 +34,8 @@ BuildRequires: glibc-32bit glibc-devel-32bit
BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11
%endif
Version: 3.1.0_15042
Release: 28
License: GPL v2 or later
Release: 32
License: GPL v2 only
Group: System/Kernel
Autoreqprov: on
PreReq: %insserv_prereq %fillup_prereq
@ -70,23 +70,24 @@ Patch9: 15250_xend_device_destroy.patch
Patch10: 15273_libxenapi.patch
Patch11: 15274_xenapi.patch
Patch12: 15275_xenapi.patch
Patch13: 15389-32on64-memop-error-path.patch
Patch14: 15390-32on64-setup-error-path.patch
Patch15: 15391-32on64-setup-pgtable.patch
Patch16: 15410-domain-restore.patch
Patch17: 15416-x86_64-failsafe.patch
Patch18: 15433-pae-ptwr-check.patch
Patch19: 15444-vmxassist-p2r.patch
Patch20: 15480-man-xm.patch
Patch21: rtl8139-data-corruption.patch
Patch22: 15168-check-dup-domians.patch
Patch23: 15587-domid-reset.patch
Patch24: 15609-save-mem-values.patch
Patch25: 15642_uuid_unique.patch
Patch26: 15649_xenapi.patch
Patch27: 15650_xenapi.patch
Patch28: 15651_xenapi.patch
Patch29: 15693-32on64-gnttab-err.patch
Patch13: 15381-log-svm-npt.patch
Patch14: 15389-32on64-memop-error-path.patch
Patch15: 15390-32on64-setup-error-path.patch
Patch16: 15391-32on64-setup-pgtable.patch
Patch17: 15410-domain-restore.patch
Patch18: 15416-x86_64-failsafe.patch
Patch19: 15433-pae-ptwr-check.patch
Patch20: 15444-vmxassist-p2r.patch
Patch21: 15480-man-xm.patch
Patch22: rtl8139-data-corruption.patch
Patch23: 15168-check-dup-domians.patch
Patch24: 15587-domid-reset.patch
Patch25: 15609-save-mem-values.patch
Patch26: 15642_uuid_unique.patch
Patch27: 15649_xenapi.patch
Patch28: 15650_xenapi.patch
Patch29: 15651_xenapi.patch
Patch30: 15693-32on64-gnttab-err.patch
# Our patches
Patch100: xen-config.diff
Patch101: xend-config.diff
@ -564,6 +565,7 @@ Authors:
%patch27 -p1
%patch28 -p1
%patch29 -p1
%patch30 -p1
%patch100 -p1
%patch101 -p1
%patch102 -p1
@ -949,6 +951,10 @@ rm -f $RPM_BUILD_ROOT/%pysite/*.egg-info
/sbin/ldconfig
%changelog
* Mon Aug 13 2007 - carnold@novell.com
- hvm svm: Log into 'xm dmesg' that SVM NPT is enabled.
* Fri Aug 10 2007 - ccoffing@novell.com
- Honor RPM_OPT_FLAGS better
* Thu Aug 09 2007 - ccoffing@novell.com
- #298176: Do not enable NX if CPU/BIOS does not support it
- #289569: Modify network-bridge to handle vlan