Skip to content

Commit 93056ef

Browse files
dangdang
committed
Add current set of patches
1 parent fc069c2 commit 93056ef

11 files changed

+2288
-0
lines changed

‎kvm-45-qemu-configure.patch‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- kvm-45/qemu/configure.orig 2007-10-02 12:30:29.000000000 +0200
2+
+++ kvm-45/qemu/configure 2007-10-02 12:31:09.000000000 +0200
3+
@@ -666,8 +666,8 @@
4+
prefix="/usr/local"
5+
fi
6+
mansuffix="/share/man"
7+
- datasuffix="/share/qemu"
8+
- docsuffix="/share/doc/qemu"
9+
+ datasuffix="/share/kvm"
10+
+ docsuffix="/share/doc/kvm"
11+
binsuffix="/bin"
12+
fi
13+

‎kvm-57-kernel-longmode.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- kvm-57/kernel/mmu.h 2007-12-18 08:02:40.000000000 -0800
2+
+++ kvm-57/kernel/mmu.h 2007-12-20 08:19:31.000000000 -0800
3+
@@ -20,7 +20,7 @@ static inline int kvm_mmu_reload(struct
4+
static inline int is_long_mode(struct kvm_vcpu *vcpu)
5+
{
6+
#ifdef CONFIG_X86_64
7+
- return vcpu->arch.shadow_efer & EFER_LME;
8+
+ return vcpu->arch.shadow_efer & EFER_LMA;
9+
#else
10+
return 0;
11+
#endif

‎kvm-57-qemu-kvm-cmdline.patch‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- kvm-57/qemu/vl.c 2007-12-18 07:57:46.000000000 -0800
2+
+++ kvm-57/qemu/vl.c 2007-12-20 06:59:55.000000000 -0800
3+
@@ -136,8 +136,8 @@ int inet_aton(const char *cp, struct in_
4+
#include "qemu-kvm.h"
5+
#endif
6+
7+
-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
8+
-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
9+
+#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup"
10+
+#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/kvm/kvm-ifdown"
11+
#ifdef __sun__
12+
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
13+
#else
14+
@@ -7971,7 +7971,7 @@ static void help(int exitcode)
15+
"\n"
16+
"When using -nographic, press 'ctrl-a h' to get some help.\n"
17+
,
18+
- "qemu",
19+
+ "kvm",
20+
DEFAULT_RAM_SIZE,
21+
#ifndef _WIN32
22+
DEFAULT_NETWORK_SCRIPT,

‎kvm-61-qemu-kvm.patch‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- kvm-61/qemu/Makefile.target 2008-02-19 06:58:28.000000000 -0800
2+
+++ kvm-61/qemu/Makefile.target 2008-02-19 18:38:24.000000000 -0800
3+
@@ -70,11 +70,7 @@
4+
QEMU_PROG=qemu-$(TARGET_ARCH2)
5+
else
6+
# system emulator name
7+
-ifeq ($(TARGET_ARCH), i386)
8+
-QEMU_PROG=qemu$(EXESUF)
9+
-else
10+
-QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
11+
-endif
12+
+QEMU_PROG=kvm$(EXESUF)
13+
endif
14+
15+
PROGS=$(QEMU_PROG)

‎kvm-68-libkvm-no-kernel.patch‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN kvm-68.orig/libkvm/Makefile kvm-68/libkvm/Makefile
2+
--- kvm-68.orig/libkvm/Makefile 2008-05-02 07:20:13.000000000 -0400
3+
+++ kvm-68/libkvm/Makefile 2008-05-07 15:25:07.000000000 -0400
4+
@@ -25,10 +25,6 @@ libkvm.a: libkvm.o $(libkvm-$(ARCH)-objs
5+
6+
install:
7+
install -D libkvm.h $(DESTDIR)/$(PREFIX)/include/libkvm.h
8+
- install -D $(LIBKVM_KERNELDIR)/include/linux/kvm.h \
9+
- $(DESTDIR)/$(PREFIX)/include/linux/kvm.h
10+
- install -D $(LIBKVM_KERNELDIR)/include/linux/kvm_para.h \
11+
- $(DESTDIR)/$(PREFIX)/include/linux/kvm_para.h
12+
install -D libkvm.a $(DESTDIR)/$(PREFIX)/$(LIBDIR)/libkvm.a
13+
14+
-include .*.d

‎kvm-69-qemu-ifup_ifdown.patch‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
diff -Naur kvm-69.orig/scripts/qemu-ifdown kvm-69/scripts/qemu-ifdown
2+
--- kvm-69.orig/scripts/qemu-ifdown 1970-01-01 01:00:00.000000000 +0100
3+
+++ kvm-69/scripts/qemu-ifdown 2008-06-03 09:46:53.000000000 +0200
4+
@@ -0,0 +1,20 @@
5+
+#!/bin/sh
6+
+
7+
+if [ -x /sbin/brctl ]; then
8+
+ BRCTL="/sbin/brctl"
9+
+elif [ -x /usr/sbin/brctl ]; then
10+
+ BRCTL="/usr/sbin/brctl"
11+
+else
12+
+ echo "no bridge utils installed"
13+
+ exit 1
14+
+fi
15+
+
16+
+if [ -x /sbin/ip ]; then
17+
+ switch=$(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }')
18+
+ ${BRCTL} delif ${switch} $1
19+
+ /sbin/ip link set $1 down
20+
+else
21+
+ switch=$(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }')
22+
+ ${BRCTL} delif ${switch} $1
23+
+ /sbin/ifconfig $1 down
24+
+fi
25+
diff -Naur kvm-69.orig/scripts/qemu-ifup kvm-69/scripts/qemu-ifup
26+
--- kvm-69.orig/scripts/qemu-ifup 2008-06-03 09:42:05.000000000 +0200
27+
+++ kvm-69/scripts/qemu-ifup 2008-06-03 09:44:30.000000000 +0200
28+
@@ -1,5 +1,21 @@
29+
#!/bin/sh
30+
31+
-switch=$(/sbin/ip route list | awk '/^default / { print $NF }')
32+
-/sbin/ifconfig $1 0.0.0.0 up
33+
-/usr/sbin/brctl addif ${switch} $1
34+
+if [ -x /sbin/brctl ]; then
35+
+ BRCTL="/sbin/brctl"
36+
+elif [ -x /usr/sbin/brctl ]; then
37+
+ BRCTL="/usr/sbin/brctl"
38+
+else
39+
+ echo "no bridge utils installed"
40+
+ exit 1
41+
+fi
42+
+
43+
+if [ -x /sbin/ip ]; then
44+
+ switch=$(/sbin/ip route list | awk '/^default / { sub(/.* dev /, ""); print $1 }')
45+
+ /sbin/ip link set $1 up
46+
+else
47+
+ switch=$(/bin/netstat -rn | awk '/^0\.0\.0\.0/ { print $NF }')
48+
+ /sbin/ifconfig $1 0.0.0.0 up
49+
+fi
50+
+
51+
+${BRCTL} addif ${switch} $1
52+
+

‎kvm-69-qemu-no-blobs.patch‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN kvm-69.orig/qemu/Makefile kvm-69/qemu/Makefile
2+
--- kvm-69.orig/qemu/Makefile 2008-05-12 07:30:43.000000000 -0400
3+
+++ kvm-69/qemu/Makefile 2008-05-21 09:59:59.000000000 -0400
4+
@@ -199,8 +199,8 @@ ifneq ($(TOOLS),)
5+
$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
6+
endif
7+
mkdir -p "$(DESTDIR)$(datadir)"
8+
- set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
9+
- video.x openbios-sparc32 openbios-sparc64 pxe-ne2k_pci.bin \
10+
+ set -e; for x in bios.bin vgabios.bin vgabios-cirrus.bin \
11+
+ pxe-ne2k_pci.bin \
12+
pxe-rtl8139.bin pxe-pcnet.bin pxe-e1000.bin extboot.bin \
13+
bamboo.dtb; \
14+
do \
15+
@@ -301,10 +301,6 @@ tarbin:
16+
$(datadir)/bios.bin \
17+
$(datadir)/vgabios.bin \
18+
$(datadir)/vgabios-cirrus.bin \
19+
- $(datadir)/ppc_rom.bin \
20+
- $(datadir)/video.x \
21+
- $(datadir)/openbios-sparc32 \
22+
- $(datadir)/openbios-sparc64 \
23+
$(datadir)/pxe-ne2k_pci.bin \
24+
$(datadir)/pxe-rtl8139.bin \
25+
$(datadir)/pxe-pcnet.bin \
26+
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN kvm-69.orig/qemu/pc-bios/README kvm-69/qemu/pc-bios/README
27+
--- kvm-69.orig/qemu/pc-bios/README 2008-05-12 07:30:43.000000000 -0400
28+
+++ kvm-69/qemu/pc-bios/README 2008-05-21 09:59:34.000000000 -0400
29+
@@ -1,24 +1,19 @@
30+
-- The PC BIOS comes from the Bochs project
31+
- (http://bochs.sourceforge.net/). A patch from bios.diff was applied.
32+
+- The PC BIOS comes from the Bochs project (http://bochs.sourceforge.net/)
33+
+ The bios.bin binary is provided for convenience. If you want to rebuild
34+
+ it from source refer to the top level bios directory in the source package.
35+
36+
-- The VGA BIOS and the Cirrus VGA BIOS come from the LGPL VGA bios
37+
- project (http://www.nongnu.org/vgabios/).
38+
+- The VGA BIOS and the Cirrus VGA BIOS come from the LGPL VGA bios project
39+
+ (http://www.nongnu.org/vgabios/). The vgabios.bin and vgabios-cirrus.bin
40+
+ binaries are provided for convenience. If you want to rebuild them from
41+
+ source refer to the top level vgabios directory in the source package.
42+
43+
-- The PowerPC Open Hack'Ware Open Firmware Compatible BIOS is
44+
- available at http://perso.magic.fr/l_indien/OpenHackWare/index.htm.
45+
+- The PXE roms come from Rom-o-Matic etherboot 5.4.2 (http://rom-o-matic.net/)
46+
47+
-- video.x is a PowerMac NDRV compatible driver for a VGA frame
48+
- buffer. It comes from the Mac-on-Linux project
49+
- (http://www.maconlinux.org/).
50+
+ pcnet32:pcnet32 -- [0x1022,0x2000]
51+
+ ns8390:winbond940 -- [0x1050,0x0940]
52+
+ rtl8139:rtl8139 -- [0x10ec,0x8139]
53+
54+
-- OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable
55+
- firmware implementation. The goal is to implement a 100% IEEE
56+
- 1275-1994 (referred to as Open Firmware) compliant firmware.
57+
- The included Sparc32 image is built from SVN revision 185
58+
- and Sparc64 from SVN revision 181.
59+
+ For the source code go to the etherboot 5.4 git tree in :
60+
+
61+
+ http://git.etherboot.org/?p=etherboot.git
62+
63+
-- The PXE roms come from Rom-o-Matic etherboot 5.4.2.
64+
- pcnet32:pcnet32 -- [0x1022,0x2000]
65+
- ns8390:winbond940 -- [0x1050,0x0940]
66+
- rtl8139:rtl8139 -- [0x10ec,0x8139]
67+
- http://rom-o-matic.net/

0 commit comments

Comments
 (0)