Hello community,
here is the log from the commit of package kvm
checked in at Tue Sep 16 16:40:49 CEST 2008.
--------
--- arch/i386/kvm/kvm.changes 2008-09-04 13:14:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/kvm/kvm.changes 2008-09-16 15:23:36.365230000 +0200
@@ -1,0 +2,13 @@
+Tue Sep 16 15:35:54 CEST 2008 - agraf@suse.de
+
+- update to KVM 75
+ - ballooning (Anthony Liguori)
+ - requires 2.6.27+ host to work correctly
+ - fixes extboot failures after reset
+ - fixes rare reboot failures with Windows
+ - fixes ACPI error messages in Windows event log
+ - fixes hibernate/resume with guest smp
+ - fix random segfaults with npt (Joerg Roedel)
+- enable building on 10.3 again
+
+-------------------------------------------------------------------
Old:
----
IA64-kvm-Implement-kvm_arch_vcpu_ioctl_-set-get-_mp.patch
IA64-qemu-Add-get-set_mpstate-for-Ipf.patch
IA64-qemu-Fix-a-typo.patch
IA64-qemu-network.patch
IA64-qemu-Set-default-pm_io_base-to-0x1f40.patch
kvm-74.tar.bz2
New:
----
kvm-75.tar.bz2
kvm-compile-103.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kvm.spec ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:30.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kvm (Version 74)
+# spec file for package kvm (Version 75)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -31,7 +31,7 @@
Group: System/Kernel
Summary: Kernel-based Virtual Machine
Url: http://kvm.qumranet.com/
-Version: 74
+Version: 75
Release: 1
Source0: %name-%version.tar.bz2
### To update to new version, recompress the kvm-??.tar.gz using:
@@ -53,6 +53,7 @@
Patch01: qemu-datadir.diff
Patch02: kvm-susekernel.patch
Patch03: kvm-nested_paging.patch
+Patch04: kvm-compile-103.patch
# Sound
Patch07: kvm-audio.patch
Patch08: kvm-pulseaudio.patch
@@ -73,12 +74,7 @@
Patch86: kvm-ioapic.patch
Patch90: kvm-bios.patch
# IA 64 patches
-Patch500: IA64-qemu-Add-get-set_mpstate-for-Ipf.patch
-Patch501: IA64-qemu-Fix-a-typo.patch
-Patch502: IA64-kvm-suse.patch
-Patch503: IA64-kvm-Implement-kvm_arch_vcpu_ioctl_-set-get-_mp.patch
-Patch504: IA64-qemu-Set-default-pm_io_base-to-0x1f40.patch
-Patch505: IA64-qemu-network.patch
+Patch500: IA64-kvm-suse.patch
# For upstream patches:
Source100: convert-commits-to-patch.sh
#Patch100: kvm-commits.patch
@@ -174,6 +170,7 @@
%if %use_kmp
%patch02 -p0 -b .include-path-for-suse-kernel-rpms
%patch03 -p1
+%patch04 -p1
%endif
# Sound
%patch07 -p1
@@ -202,11 +199,6 @@
# IA64 support
%ifarch ia64
%patch500 -p1
-%patch501 -p1
-%patch502 -p1
-%patch503 -p1
-%patch504 -p1
-%patch505 -p1
%endif
# Currently not used, keep it for later use:
# Apply selected upstream patches from the kvm-commits list:
@@ -279,6 +271,16 @@
%_mandir/man1/qemu-kvm.1.gz
%changelog
+* Tue Sep 16 2008 agraf@suse.de
+- update to KVM 75
+ - ballooning (Anthony Liguori)
+ - requires 2.6.27+ host to work correctly
+ - fixes extboot failures after reset
+ - fixes rare reboot failures with Windows
+ - fixes ACPI error messages in Windows event log
+ - fixes hibernate/resume with guest smp
+ - fix random segfaults with npt (Joerg Roedel)
+- enable building on 10.3 again
* Thu Sep 04 2008 agraf@suse.de
- update to KVM 74
- fix shadow ptes corruption on i386 hosts running smp guests
++++++ kvm-74.tar.bz2 -> kvm-75.tar.bz2 ++++++
++++ 1616 lines of diff (skipped)
++++++ kvm-audio.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,8 +1,8 @@
-diff --git a/qemu/configure b/qemu/configure
-index 1449b13..2b4904a 100755
---- a/qemu/configure
-+++ b/qemu/configure
-@@ -201,7 +201,7 @@ SunOS)
+Index: kvm-75/qemu/configure
+===================================================================
+--- kvm-75.orig/qemu/configure
++++ kvm-75/qemu/configure
+@@ -206,7 +206,7 @@ SunOS)
audio_possible_drivers="oss sdl"
;;
*)
++++++ kvm-bios.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -4,11 +4,12 @@
- An PBLK which provides the size of the L2 and L3 caches
- If newer hardware like ICH6 IDE is found, init it
Signed-off-by: Alex Graf - http://alex.csgraf.de
-diff --git a/bios-mac/acpi-dsdt.dsl b/bios-mac/acpi-dsdt.dsl
-index 21fc76a..64eb92d 100755
---- a/bios-mac/acpi-dsdt.dsl
-+++ b/bios-mac/acpi-dsdt.dsl
-@@ -199,6 +292,47 @@ DefinitionBlock (
+Index: kvm-75/bios-mac/acpi-dsdt.dsl
+===================================================================
+--- kvm-75.orig/bios-mac/acpi-dsdt.dsl
++++ kvm-75/bios-mac/acpi-dsdt.dsl
+@@ -78,6 +78,47 @@ DefinitionBlock (
+
/* PCI Bus definition */
Scope(\_SB) {
+ Device (HPET)
@@ -55,15 +56,11 @@
Device(PCI0) {
Name (_HID, EisaId ("PNP0A03"))
Name (_ADR, 0x00)
- Name (_UID, 1)
-index 21fc76a..64eb92d 100755
---- a/bios/acpi-dsdt.dsl
-+++ b/bios/acpi-dsdt.dsl
-diff --git a/bios-mac/rombios32.c b/bios-mac/rombios32.c
-index d9498c2..14c8ca5 100755
---- a/bios-mac/rombios32.c
-+++ b/bios-mac/rombios32.c
-@@ -530,7 +530,9 @@ static uint32_t pci_bios_io_addr;
+Index: kvm-75/bios-mac/rombios32.c
+===================================================================
+--- kvm-75.orig/bios-mac/rombios32.c
++++ kvm-75/bios-mac/rombios32.c
+@@ -626,7 +626,9 @@ static uint32_t pci_bios_io_addr;
static uint32_t pci_bios_mem_addr;
static uint32_t pci_bios_bigmem_addr;
/* host irqs corresponding to PCI irqs A-D */
@@ -74,7 +71,7 @@
static PCIDevice i440_pcidev;
static void pci_config_writel(PCIDevice *d, uint32_t addr, uint32_t val)
-@@ -659,7 +661,9 @@ static void pci_bios_init_bridges(PCIDevice *d)
+@@ -755,7 +757,9 @@ static void pci_bios_init_bridges(PCIDev
vendor_id = pci_config_readw(d, PCI_VENDOR_ID);
device_id = pci_config_readw(d, PCI_DEVICE_ID);
@@ -85,7 +82,7 @@
int i, irq;
uint8_t elcr[2];
-@@ -739,7 +743,8 @@ static void pci_bios_init_device(PCIDevice *d)
+@@ -835,7 +839,8 @@ static void pci_bios_init_device(PCIDevi
d->bus, d->devfn, vendor_id, device_id);
switch(class) {
case 0x0101:
@@ -95,7 +92,7 @@
/* PIIX3 IDE */
pci_config_writew(d, 0x40, 0x8000); // enable IDE0
pci_config_writew(d, 0x42, 0x8000); // enable IDE1
-@@ -1444,6 +1449,13 @@ void acpi_bios_init(void)
+@@ -1540,6 +1545,13 @@ void acpi_bios_init(void)
acpi_build_table_header((struct acpi_table_header *)madt,
"APIC", madt_size, 1);
}
++++++ kvm-compile-103.patch ++++++
commit 5925d8e58d1fa4668351b157d9635be016794c79
Author: Jan Kiszka
Date: Thu Sep 11 17:28:52 2008 +0200
kvm: external module: fix cancel_work_sync() for 2.6.22
Signed-off-by: Jan Kiszka
Signed-off-by: Avi Kivity
Index: kvm-75/kernel/external-module-compat-comm.h
===================================================================
--- kvm-75.orig/kernel/external-module-compat-comm.h
+++ kvm-75/kernel/external-module-compat-comm.h
@@ -517,6 +517,11 @@ static inline int cancel_work_sync(struc
return 0;
}
+/* ... and it returned void before 2.6.23 */
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23)
+
+#define cancel_work_sync(work) ({ cancel_work_sync(work); 0; })
+
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
++++++ kvm-gfxboot.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -80,7 +80,7 @@
===================================================================
--- kernel/x86/x86.c.orig
+++ kernel/x86/x86.c
-@@ -2442,13 +2442,14 @@ int emulate_instruction(struct kvm_vcpu
+@@ -2444,13 +2444,14 @@ int emulate_instruction(struct kvm_vcpu
r = x86_decode_insn(&vcpu->arch.emulate_ctxt, &emulate_ops);
@@ -102,7 +102,7 @@
===================================================================
--- kernel/x86/x86_emulate.c.orig
+++ kernel/x86/x86_emulate.c
-@@ -186,7 +186,7 @@ static u16 opcode_table[256] = {
+@@ -196,7 +196,7 @@ static u16 opcode_table[256] = {
static u16 twobyte_table[256] = {
/* 0x00 - 0x0F */
0, Group | GroupDual | Group7, 0, 0, 0, 0, ImplicitOps, 0,
@@ -111,7 +111,7 @@
/* 0x10 - 0x1F */
0, 0, 0, 0, 0, 0, 0, 0, ImplicitOps | ModRM, 0, 0, 0, 0, 0, 0, 0,
/* 0x20 - 0x2F */
-@@ -1852,6 +1852,16 @@ twobyte_insn:
+@@ -1898,6 +1898,16 @@ twobyte_insn:
case 0x18: /* Grp16 (prefetch/nop) */
c->dst.type = OP_NONE;
break;
++++++ kvm-ioapic.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,8 +1,8 @@
-diff --git a/kernel/ioapic.c b/kernel/ioapic.c
-index 8afc074..b405945 100644
---- a/kernel/x86/ioapic.c
-+++ b/kernel/x86/ioapic.c
-@@ -273,7 +273,8 @@ void kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level)
+Index: kvm-75/kernel/x86/ioapic.c
+===================================================================
+--- kvm-75.orig/kernel/x86/ioapic.c
++++ kvm-75/kernel/x86/ioapic.c
+@@ -274,7 +274,8 @@ void kvm_ioapic_set_irq(struct kvm_ioapi
if (irq >= 0 && irq < IOAPIC_NUM_PINS) {
entry = ioapic->redirtbl[irq];
++++++ kvm-kernel-cpuid4.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,10 +1,10 @@
# Quick patch until proper version is upstream, but is safe.
# Signed-off-by: Alex Graf - agraf@suse
-diff --git a/kernel/x86/x86.c b/kernel/x86.c
-index 88ca017..cab96ab 100644
---- a/kernel/x86/x86.c
-+++ b/kernel/x86/x86.c
-@@ -915,7 +923,7 @@ static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
+Index: kvm-75/kernel/x86/x86.c
+===================================================================
+--- kvm-75.orig/kernel/x86/x86.c
++++ kvm-75/kernel/x86/x86.c
+@@ -1260,7 +1260,7 @@ static int kvm_vcpu_ioctl_set_cpuid(stru
struct kvm_cpuid *cpuid,
struct kvm_cpuid_entry *entries)
{
@@ -13,7 +13,7 @@
struct kvm_cpuid_entry *cpuid_entries;
r = -E2BIG;
-@@ -935,8 +943,17 @@ static int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
+@@ -1280,8 +1280,17 @@ static int kvm_vcpu_ioctl_set_cpuid(stru
vcpu->arch.cpuid_entries[i].ebx = cpuid_entries[i].ebx;
vcpu->arch.cpuid_entries[i].ecx = cpuid_entries[i].ecx;
vcpu->arch.cpuid_entries[i].edx = cpuid_entries[i].edx;
++++++ kvm-kernel-msr.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,8 +1,8 @@
-diff --git a/kernel/x86/x86.c b/kernel/x86.c
-index 88ca017..cab96ab 100644
---- a/kernel/x86/x86.c
-+++ b/kernel/x86/x86.c
-@@ -561,7 +561,11 @@ static void kvm_write_guest_time(struct kvm_vcpu *v)
+Index: kvm-75/kernel/x86/x86.c
+===================================================================
+--- kvm-75.orig/kernel/x86/x86.c
++++ kvm-75/kernel/x86/x86.c
+@@ -874,7 +874,11 @@ static int set_msr_mtrr(struct kvm_vcpu
int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data)
{
@@ -14,7 +14,7 @@
case MSR_EFER:
set_efer(vcpu, data);
break;
-@@ -686,6 +690,10 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
+@@ -1025,6 +1029,10 @@ int kvm_get_msr_common(struct kvm_vcpu *
case MSR_EFER:
data = vcpu->arch.shadow_efer;
break;
++++++ kvm-maccpuid.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,7 +1,7 @@
-diff --git a/qemu/qemu-kvm-x86.c b/qemu/qemu-kvm-x86.c
-index 5daedd1..97699d4 100644
---- a/qemu/qemu-kvm-x86.c
-+++ b/qemu/qemu-kvm-x86.c
+Index: kvm-75/qemu/qemu-kvm-x86.c
+===================================================================
+--- kvm-75.orig/qemu/qemu-kvm-x86.c
++++ kvm-75/qemu/qemu-kvm-x86.c
@@ -11,6 +11,7 @@
#include
@@ -10,7 +10,7 @@
#include "qemu-kvm.h"
#include
-@@ -497,7 +498,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry *e, uint32_t function,
+@@ -498,7 +499,7 @@ static void do_cpuid_ent(struct kvm_cpui
// isn't supported in compatibility mode on Intel. so advertise the
// actuall cpu, and say goodbye to migration between different vendors
// is you use compatibility mode.
++++++ kvm-nested_paging.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,7 +1,7 @@
-Index: kvm-72/kernel/x86/svm.c
+Index: kvm-75/kernel/x86/svm.c
===================================================================
---- kvm-72.orig/kernel/x86/svm.c
-+++ kvm-72/kernel/x86/svm.c
+--- kvm-75.orig/kernel/x86/svm.c
++++ kvm-75/kernel/x86/svm.c
@@ -50,12 +50,8 @@ MODULE_LICENSE("GPL");
#define DEBUGCTL_RESERVED_BITS (~(0x3fULL))
@@ -16,7 +16,7 @@
module_param(npt, int, S_IRUGO);
-@@ -438,19 +434,19 @@ static __init int svm_hardware_setup(voi
+@@ -439,19 +435,19 @@ static __init int svm_hardware_setup(voi
svm_features = cpuid_edx(SVM_CPUID_FUNC);
@@ -42,7 +42,7 @@
return 0;
-@@ -1495,7 +1491,10 @@ static void pre_svm_run(struct vcpu_svm
+@@ -1503,7 +1499,10 @@ static void pre_svm_run(struct vcpu_svm
struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu);
++++++ kvm-pulseaudio.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,8 +1,8 @@
-diff --git a/qemu/configure b/qemu/configure
-index 1449b13..2b4904a 100755
---- a/qemu/configure
-+++ b/qemu/configure
-@@ -201,7 +201,7 @@ SunOS)
+Index: kvm-75/qemu/configure
+===================================================================
+--- kvm-75.orig/qemu/configure
++++ kvm-75/qemu/configure
+@@ -206,7 +206,7 @@ SunOS)
audio_possible_drivers="oss sdl"
;;
*)
++++++ kvm-qemu-applesmc.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,9 +1,9 @@
#qemu-only -> submit upstream qemu
-diff --git a/qemu/Makefile.target b/qemu/Makefile.target
-index 66c1fb1..97a5f29 100644
---- a/qemu/Makefile.target
-+++ b/qemu/Makefile.target
-@@ -614,7 +614,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
+Index: kvm-75/qemu/Makefile.target
+===================================================================
+--- kvm-75.orig/qemu/Makefile.target
++++ kvm-75/qemu/Makefile.target
+@@ -610,7 +610,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
@@ -12,11 +12,10 @@
ifeq ($(USE_KVM_PIT), 1)
OBJS+= i8254-kvm.o
endif
-diff --git a/qemu/hw/applesmc.c b/qemu/hw/applesmc.c
-new file mode 100644
-index 0000000..6bd2b3f
+Index: kvm-75/qemu/hw/applesmc.c
+===================================================================
--- /dev/null
-+++ b/qemu/hw/applesmc.c
++++ kvm-75/qemu/hw/applesmc.c
@@ -0,0 +1,171 @@
+/*
+ * Apple SMC controller
@@ -189,11 +188,12 @@
+ register_ioport_write(APPLESMC_CMD_PORT, 4, 1, applesmc_io_cmd_writeb, s);
+}
+
-diff --git a/qemu/hw/pc.h b/qemu/hw/pc.h
-index c284bf1..e653549 100644
---- a/qemu/hw/pc.h
-+++ b/qemu/hw/pc.h
-@@ -147,3 +147,7 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
+Index: kvm-75/qemu/hw/pc.h
+===================================================================
+--- kvm-75.orig/qemu/hw/pc.h
++++ kvm-75/qemu/hw/pc.h
+@@ -150,6 +150,10 @@ void pci_piix4_ide_init(PCIBus *bus, Blo
+
void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd);
+/* applesmc.c */
@@ -201,11 +201,13 @@
+void applesmc_setkey(char *key);
+
/* lpc.c */
-diff --git a/qemu/vl.c b/qemu/vl.c
-index 7e4dce1..e4900d8 100644
---- a/qemu/vl.c
-+++ b/qemu/vl.c
-@@ -7698,6 +7699,7 @@ static void help(int exitcode)
+ void lpc_init(PCIBus *bus, int devfn, qemu_irq *pic);
+
+Index: kvm-75/qemu/vl.c
+===================================================================
+--- kvm-75.orig/qemu/vl.c
++++ kvm-75/qemu/vl.c
+@@ -8381,6 +8381,7 @@ static void help(int exitcode)
#endif
#ifdef TARGET_I386
"-no-fd-bootchk disable boot signature checking for floppy disks\n"
@@ -213,7 +215,7 @@
#endif
"-m megs set virtual RAM size to megs MB [default=%d]\n"
"-smp n set the number of CPUs to 'n' [default=1]\n"
-@@ -7857,6 +7859,7 @@ enum {
+@@ -8547,6 +8548,7 @@ enum {
QEMU_OPTION_snapshot,
#ifdef TARGET_I386
QEMU_OPTION_no_fd_bootchk,
@@ -221,7 +223,7 @@
#endif
QEMU_OPTION_m,
QEMU_OPTION_nographic,
-@@ -7960,6 +7963,7 @@ const QEMUOption qemu_options[] = {
+@@ -8648,6 +8650,7 @@ const QEMUOption qemu_options[] = {
{ "snapshot", 0, QEMU_OPTION_snapshot },
#ifdef TARGET_I386
{ "no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk },
@@ -229,7 +231,7 @@
#endif
{ "m", HAS_ARG, QEMU_OPTION_m },
{ "nographic", 0, QEMU_OPTION_nographic },
-@@ -8646,6 +8721,9 @@ int main(int argc, char **argv)
+@@ -9360,6 +9363,9 @@ int main(int argc, char **argv)
case QEMU_OPTION_no_fd_bootchk:
fd_bootchk = 0;
break;
@@ -237,5 +239,5 @@
+ applesmc_setkey(optarg);
+ break;
#endif
- case QEMU_OPTION_no_code_copy:
- code_copy_enabled = 0;
+ case QEMU_OPTION_net:
+ if (nb_net_clients >= MAX_NET_CLIENTS) {
++++++ kvm-qemu-cpu-coreduo.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,7 +1,7 @@
-diff --git a/qemu/target-i386/cpu.h b/qemu/target-i386/cpu.h
-index 8efc2f4..f87fc15 100644
---- a/qemu/target-i386/cpu.h
-+++ b/qemu/target-i386/cpu.h
+Index: kvm-75/qemu/target-i386/cpu.h
+===================================================================
+--- kvm-75.orig/qemu/target-i386/cpu.h
++++ kvm-75/qemu/target-i386/cpu.h
@@ -248,6 +248,8 @@
#define MSR_MCG_STATUS 0x17a
#define MSR_MCG_CTL 0x17b
@@ -11,11 +11,11 @@
#define MSR_PAT 0x277
#define MSR_EFER 0xc0000080
-diff --git a/qemu/target-i386/helper.c b/qemu/target-i386/helper.c
-index 9d88cea..f9703ce 100644
---- a/qemu/target-i386/helper.c
-+++ b/qemu/target-i386/helper.c
-@@ -173,6 +173,20 @@ static x86_def_t x86_defs[] = {
+Index: kvm-75/qemu/target-i386/helper.c
+===================================================================
+--- kvm-75.orig/qemu/target-i386/helper.c
++++ kvm-75/qemu/target-i386/helper.c
+@@ -175,6 +175,20 @@ static x86_def_t x86_defs[] = {
},
#endif
{
@@ -36,11 +36,11 @@
.name = "qemu32",
.level = 2,
.family = 6,
-diff --git a/qemu/target-i386/op_helper.c b/qemu/target-i386/op_helper.c
-index ebeeebd..d33d885 100644
---- a/qemu/target-i386/op_helper.c
-+++ b/qemu/target-i386/op_helper.c
-@@ -1908,6 +1908,69 @@ void helper_cpuid(void)
+Index: kvm-75/qemu/target-i386/op_helper.c
+===================================================================
+--- kvm-75.orig/qemu/target-i386/op_helper.c
++++ kvm-75/qemu/target-i386/op_helper.c
+@@ -1915,6 +1915,69 @@ void helper_cpuid(void)
ECX = 0;
EDX = 0x2c307d;
break;
@@ -110,7 +110,7 @@
case 0x80000000:
EAX = env->cpuid_xlevel;
EBX = env->cpuid_vendor1;
-@@ -3039,6 +3095,10 @@ void helper_wrmsr(void)
+@@ -3118,6 +3181,10 @@ void helper_rdmsr(void)
helper_svm_check_intercept_param(SVM_EXIT_MSR, 0);
switch((uint32_t)ECX) {
++++++ kvm-qemu-cpuid4.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,10 +1,10 @@
# Quick patch until proper version is upstream, but is safe.
# Signed-off-by: Alex Graf - agraf@suse
-diff --git a/qemu/qemu-kvm-x86.c b/qemu/qemu-kvm-x86.c
-index 197d761..743852f 100644
---- a/qemu/qemu-kvm-x86.c
-+++ b/qemu/qemu-kvm-x86.c
-@@ -465,10 +465,11 @@ static void host_cpuid(uint32_t function, uint32_t *eax, uint32_t *ebx,
+Index: kvm-75/qemu/qemu-kvm-x86.c
+===================================================================
+--- kvm-75.orig/qemu/qemu-kvm-x86.c
++++ kvm-75/qemu/qemu-kvm-x86.c
+@@ -465,10 +465,11 @@ static void host_cpuid(uint32_t function
}
@@ -17,7 +17,7 @@
qemu_kvm_cpuid_on_env(env);
e->function = function;
e->eax = env->regs[R_EAX];
-@@ -554,7 +555,7 @@ int kvm_arch_qemu_init_env(CPUState *cenv)
+@@ -554,7 +555,7 @@ int kvm_arch_qemu_init_env(CPUState *cen
#endif
int cpuid_nent = 0;
CPUState copy;
@@ -26,7 +26,7 @@
copy = *cenv;
-@@ -579,15 +580,26 @@ int kvm_arch_qemu_init_env(CPUState *cenv)
+@@ -579,15 +580,26 @@ int kvm_arch_qemu_init_env(CPUState *cen
qemu_kvm_cpuid_on_env(©);
limit = copy.regs[R_EAX];
++++++ kvm-qemu-hpet.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,7 +1,9 @@
#qemu-only -> submit upstream qemu
---- a/qemu/Makefile.target
-+++ b/qemu/Makefile.target
-@@ -614,7 +614,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
+Index: kvm-75/qemu/Makefile.target
+===================================================================
+--- kvm-75.orig/qemu/Makefile.target
++++ kvm-75/qemu/Makefile.target
+@@ -610,7 +610,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
@@ -10,11 +12,10 @@
ifeq ($(USE_KVM_PIT), 1)
OBJS+= i8254-kvm.o
endif
-diff --git a/qemu/hw/hpet.c b/qemu/hw/hpet.c
-new file mode 100644
-index 0000000..ce791c4
+Index: kvm-75/qemu/hw/hpet.c
+===================================================================
--- /dev/null
-+++ b/qemu/hw/hpet.c
++++ kvm-75/qemu/hw/hpet.c
@@ -0,0 +1,322 @@
+/*
+ * High Precisition Event Timer emulation
++++++ kvm-qemu-ide-ich6.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:35.000000000 +0200
@@ -1,8 +1,8 @@
#qemu-only -> submit upstream qemu
-Index: kvm-73/qemu/hw/ide.c
+Index: kvm-75/qemu/hw/ide.c
===================================================================
---- kvm-73.orig/qemu/hw/ide.c
-+++ kvm-73/qemu/hw/ide.c
+--- kvm-75.orig/qemu/hw/ide.c
++++ kvm-75/qemu/hw/ide.c
@@ -462,6 +462,7 @@ static inline int media_is_cd(IDEState *
#define IDE_TYPE_PIIX3 0
#define IDE_TYPE_CMD646 1
@@ -11,7 +11,7 @@
/* CMD646 specific */
#define MRDMODE 0x71
-@@ -3138,6 +3139,57 @@ void pci_piix3_ide_init(PCIBus *bus, Blo
+@@ -3164,6 +3165,57 @@ void pci_piix3_ide_init(PCIBus *bus, Blo
qemu_register_reset(piix3_reset, d);
piix3_reset(d);
@@ -69,10 +69,10 @@
pci_register_io_region((PCIDevice *)d, 4, 0x10,
PCI_ADDRESS_SPACE_IO, bmdma_map);
-Index: kvm-73/qemu/hw/irq.c
+Index: kvm-75/qemu/hw/irq.c
===================================================================
---- kvm-73.orig/qemu/hw/irq.c
-+++ kvm-73/qemu/hw/irq.c
+--- kvm-75.orig/qemu/hw/irq.c
++++ kvm-75/qemu/hw/irq.c
@@ -35,6 +35,7 @@ void qemu_set_irq(qemu_irq irq, int leve
if (!irq)
return;
@@ -81,11 +81,11 @@
irq->handler(irq->opaque, irq->n, level);
}
-Index: kvm-73/qemu/hw/pc.h
+Index: kvm-75/qemu/hw/pc.h
===================================================================
---- kvm-73.orig/qemu/hw/pc.h
-+++ kvm-73/qemu/hw/pc.h
-@@ -147,6 +147,8 @@ void pci_piix3_ide_init(PCIBus *bus, Blo
+--- kvm-75.orig/qemu/hw/pc.h
++++ kvm-75/qemu/hw/pc.h
+@@ -145,6 +145,8 @@ void pci_piix3_ide_init(PCIBus *bus, Blo
qemu_irq *pic);
void pci_piix4_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
qemu_irq *pic);
++++++ kvm-qemu-lpc.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:36.000000000 +0200
@@ -1,9 +1,9 @@
#qemu-only -> submit upstream qemu
-diff --git a/qemu/Makefile.target b/qemu/Makefile.target
-index 66c1fb1..97a5f29 100644
---- a/qemu/Makefile.target
-+++ b/qemu/Makefile.target
-@@ -614,7 +614,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
+Index: kvm-75/qemu/Makefile.target
+===================================================================
+--- kvm-75.orig/qemu/Makefile.target
++++ kvm-75/qemu/Makefile.target
+@@ -610,7 +610,7 @@ ifeq ($(TARGET_BASE_ARCH), i386)
OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
@@ -12,11 +12,10 @@
ifeq ($(USE_KVM_PIT), 1)
OBJS+= i8254-kvm.o
endif
-diff --git a/qemu/hw/lpc.c b/qemu/hw/lpc.c
-new file mode 100644
-index 0000000..4596623
+Index: kvm-75/qemu/hw/lpc.c
+===================================================================
--- /dev/null
-+++ b/qemu/hw/lpc.c
++++ kvm-75/qemu/hw/lpc.c
@@ -0,0 +1,163 @@
+/*
+ * Low Pin Count emulation
@@ -181,12 +180,11 @@
+#endif
+}
+
-diff --git a/qemu/hw/pc.h b/qemu/hw/pc.h
-index c284bf1..e653549 100644
---- a/qemu/hw/pc.h
-+++ b/qemu/hw/pc.h
-@@ -147,7 +147,10 @@ void pci_piix3_ide_init(PCIBus *bus, BlockDriverState **hd_table, int devfn,
- /* ne2000.c */
+Index: kvm-75/qemu/hw/pc.h
+===================================================================
+--- kvm-75.orig/qemu/hw/pc.h
++++ kvm-75/qemu/hw/pc.h
+@@ -150,6 +150,9 @@ void pci_piix4_ide_init(PCIBus *bus, Blo
void isa_ne2000_init(int base, qemu_irq irq, NICInfo *nd);
++++++ kvm-qemu-macmodel.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:36.000000000 +0200
@@ -5,10 +5,10 @@
# like this: pc_init1(.... , ISA, ...)
# pc_init1(.... , PCI | IOAPIC | PIIX, .....
# pc_init1(.... , PCI | ICH6, LPC, SMC , ...)
-diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
-index da4a608..563dc2e 100644
---- a/qemu/hw/pc.c
-+++ b/qemu/hw/pc.c
+Index: kvm-75/qemu/hw/pc.c
+===================================================================
+--- kvm-75.orig/qemu/hw/pc.c
++++ kvm-75/qemu/hw/pc.c
@@ -56,6 +56,12 @@ static PITState *pit;
static IOAPICState *ioapic;
static PCIDevice *i440fx_state;
@@ -22,7 +22,16 @@
static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
{
}
-@@ -803,15 +1224,19 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -800,7 +806,7 @@ static void pc_init1(ram_addr_t ram_size
+ const char *boot_device, DisplayState *ds,
+ const char *kernel_filename, const char *kernel_cmdline,
+ const char *initrd_filename,
+- int pci_enabled, const char *cpu_model)
++ int model, const char *cpu_model)
+ {
+ char buf[1024];
+ int ret, linux_boot, i;
+@@ -828,15 +834,19 @@ static void pc_init1(ram_addr_t ram_size
/* init CPUs */
if (cpu_model == NULL) {
@@ -45,7 +54,7 @@
}
vmport_init();
-@@ -865,8 +1290,16 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -891,8 +901,16 @@ static void pc_init1(ram_addr_t ram_size
vga_ram_addr = qemu_ram_alloc(vga_ram_size);
/* BIOS load */
@@ -64,7 +73,7 @@
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
bios_size = get_image_size(buf);
if (bios_size <= 0 ||
-@@ -960,7 +1393,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -991,7 +1009,7 @@ static void pc_init1(ram_addr_t ram_size
i8259 = i8259_init(cpu_irq[0]);
ferr_irq = i8259[13];
@@ -73,7 +82,7 @@
pci_bus = i440fx_init(&i440fx_state, i8259);
piix3_devfn = piix3_init(pci_bus, -1);
} else {
-@@ -973,7 +1406,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1004,7 +1022,7 @@ static void pc_init1(ram_addr_t ram_size
register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
if (cirrus_vga_enabled) {
@@ -82,7 +91,7 @@
pci_cirrus_vga_init(pci_bus,
ds, phys_ram_base + vga_ram_addr,
vga_ram_addr, vga_ram_size);
-@@ -982,13 +1415,13 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1013,13 +1031,13 @@ static void pc_init1(ram_addr_t ram_size
vga_ram_addr, vga_ram_size);
}
} else if (vmsvga_enabled) {
@@ -98,7 +107,7 @@
pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr,
vga_ram_addr, vga_ram_size, 0, 0);
} else {
-@@ -1002,8 +1435,13 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1035,8 +1053,13 @@ static void pc_init1(ram_addr_t ram_size
register_ioport_read(0x92, 1, 1, ioport92_read, NULL);
register_ioport_write(0x92, 1, 1, ioport92_write, NULL);
@@ -114,7 +123,7 @@
}
#ifdef USE_KVM_PIT
if (kvm_enabled() && qemu_kvm_pit_in_kernel())
-@@ -1012,7 +1450,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1045,7 +1068,7 @@ static void pc_init1(ram_addr_t ram_size
#endif
pit = pit_init(0x40, i8259[0]);
pcspk_init(pit);
@@ -123,7 +132,7 @@
pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
}
-@@ -1033,15 +1471,22 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1066,15 +1089,22 @@ static void pc_init1(ram_addr_t ram_size
for(i = 0; i < nb_nics; i++) {
nd = &nd_table[i];
if (!nd->model) {
@@ -151,7 +160,7 @@
if (strcmp(nd->model, "?") == 0)
fprintf(stderr, "qemu: Supported ISA NICs: ne2k_isa\n");
if (!pci_nic_init(pci_bus, nd, -1))
-@@ -1074,19 +1519,25 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1103,19 +1133,25 @@ static void pc_init1(ram_addr_t ram_size
hd[i] = NULL;
}
@@ -185,7 +194,7 @@
#endif
for(i = 0; i < MAX_FD; i++) {
-@@ -1101,11 +1552,11 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1130,11 +1166,11 @@ static void pc_init1(ram_addr_t ram_size
cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd,
smp_cpus);
@@ -199,7 +208,7 @@
uint8_t *eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
i2c_bus *smbus;
-@@ -1120,7 +1571,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1149,7 +1185,7 @@ static void pc_init1(ram_addr_t ram_size
i440fx_init_memory_mappings(i440fx_state);
}
@@ -208,7 +217,7 @@
int max_bus;
int bus, unit;
void *scsi;
-@@ -1139,7 +1590,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1168,7 +1204,7 @@ static void pc_init1(ram_addr_t ram_size
}
/* Add virtio block devices */
@@ -217,8 +226,13 @@
int index;
int unit_id = 0;
-@@ -1163,6 +1614,18 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
+@@ -1191,10 +1227,22 @@ static void pc_init1(ram_addr_t ram_size
+ extboot_init(info->bdrv, 1);
}
+
+- if (pci_enabled)
++ if (model > MODEL_ISA)
+ virtio_balloon_init(pci_bus);
}
+static void pc_init_mac(ram_addr_t ram_size, int vga_ram_size,
@@ -236,7 +250,7 @@
static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
const char *boot_device, DisplayState *ds,
const char *kernel_filename,
-@@ -1172,7 +1635,7 @@ static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
+@@ -1204,7 +1252,7 @@ static void pc_init_pci(ram_addr_t ram_s
{
pc_init1(ram_size, vga_ram_size, boot_device, ds,
kernel_filename, kernel_cmdline,
@@ -245,7 +259,7 @@
}
static void pc_init_isa(ram_addr_t ram_size, int vga_ram_size,
-@@ -1184,7 +1647,7 @@ static void pc_init_isa(ram_addr_t ram_size, int vga_ram_size,
+@@ -1216,7 +1264,7 @@ static void pc_init_isa(ram_addr_t ram_s
{
pc_init1(ram_size, vga_ram_size, boot_device, ds,
kernel_filename, kernel_cmdline,
@@ -254,8 +268,8 @@
}
QEMUMachine pc_machine = {
-@@ -1194,6 +1657,13 @@ QEMUMachine pc_machine = {
- VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
+@@ -1226,6 +1274,13 @@ QEMUMachine pc_machine = {
+ .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
};
+QEMUMachine mac_machine = {
@@ -266,13 +280,13 @@
+};
+
QEMUMachine isapc_machine = {
- "isapc",
- "ISA-only PC",
-diff --git a/qemu/hw/boards.h b/qemu/hw/boards.h
-index b833522..8a4e367 100644
---- a/qemu/hw/boards.h
-+++ b/qemu/hw/boards.h
-@@ -30,6 +30,7 @@ extern QEMUMachine bareetraxfs_machine;
+ .name = "isapc",
+ .desc = "ISA-only PC",
+Index: kvm-75/qemu/hw/boards.h
+===================================================================
+--- kvm-75.orig/qemu/hw/boards.h
++++ kvm-75/qemu/hw/boards.h
+@@ -31,6 +31,7 @@ extern QEMUMachine bareetraxfs_machine;
/* pc.c */
extern QEMUMachine pc_machine;
extern QEMUMachine isapc_machine;
@@ -280,10 +294,10 @@
/* ppc.c */
extern QEMUMachine prep_machine;
-diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
-index 8f38e57..7e8dd29 100644
---- a/qemu/target-i386/machine.c
-+++ b/qemu/target-i386/machine.c
+Index: kvm-75/qemu/target-i386/machine.c
+===================================================================
+--- kvm-75.orig/qemu/target-i386/machine.c
++++ kvm-75/qemu/target-i386/machine.c
@@ -10,6 +10,7 @@ void register_machines(void)
{
qemu_register_machine(&pc_machine);
++++++ kvm-qemu-multiboot.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:36.000000000 +0200
@@ -1,8 +1,8 @@
-diff --git a/qemu/elf_ops.h b/qemu/elf_ops.h
-index 6126565..ab5fd7b 100644
---- a/qemu/elf_ops.h
-+++ b/qemu/elf_ops.h
-@@ -156,6 +156,10 @@ static int glue(load_elf, SZ)(int fd, int64_t virt_to_phys_addend,
+Index: kvm-75/qemu/elf_ops.h
+===================================================================
+--- kvm-75.orig/qemu/elf_ops.h
++++ kvm-75/qemu/elf_ops.h
+@@ -156,6 +156,10 @@ static int glue(load_elf, SZ)(int fd, in
}
if (ELF_MACHINE != ehdr.e_machine)
@@ -13,11 +13,11 @@
goto fail;
if (pentry)
-diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
-index 42c2687..6b49987 100644
---- a/qemu/hw/pc.c
-+++ b/qemu/hw/pc.c
-@@ -502,6 +502,416 @@ static long get_file_size(FILE *f)
+Index: kvm-75/qemu/hw/pc.c
+===================================================================
+--- kvm-75.orig/qemu/hw/pc.c
++++ kvm-75/qemu/hw/pc.c
+@@ -512,6 +512,416 @@ static long get_file_size(FILE *f)
return size;
}
@@ -434,7 +434,7 @@
static void load_linux(const char *kernel_filename,
const char *initrd_filename,
const char *kernel_cmdline)
-@@ -512,7 +922,7 @@ static void load_linux(const char *kernel_filename,
+@@ -522,7 +932,7 @@ static void load_linux(const char *kerne
uint16_t real_seg;
int setup_size, kernel_size, initrd_size, cmdline_size;
uint32_t initrd_max;
@@ -443,7 +443,7 @@
target_phys_addr_t real_addr, prot_addr, cmdline_addr, initrd_addr;
FILE *f, *fi;
-@@ -522,7 +932,7 @@ static void load_linux(const char *kernel_filename,
+@@ -532,7 +942,7 @@ static void load_linux(const char *kerne
/* load the kernel header */
f = fopen(kernel_filename, "rb");
if (!f || !(kernel_size = get_file_size(f)) ||
@@ -452,7 +452,7 @@
fprintf(stderr, "qemu: could not load kernel '%s'\n",
kernel_filename);
exit(1);
-@@ -532,10 +942,15 @@ static void load_linux(const char *kernel_filename,
+@@ -542,10 +952,15 @@ static void load_linux(const char *kerne
#if 0
fprintf(stderr, "header magic: %#x\n", ldl_p(header+0x202));
#endif
@@ -472,7 +472,7 @@
if (protocol < 0x200 || !(header[0x211] & 0x01)) {
/* Low kernel */
-@@ -628,7 +1043,7 @@ static void load_linux(const char *kernel_filename,
+@@ -638,7 +1053,7 @@ static void load_linux(const char *kerne
}
/* store the finalized header and load the rest of the kernel */
@@ -481,7 +481,7 @@
setup_size = header[0x1f1];
if (setup_size == 0)
-@@ -637,7 +1052,7 @@ static void load_linux(const char *kernel_filename,
+@@ -647,7 +1062,7 @@ static void load_linux(const char *kerne
setup_size = (setup_size+1)*512;
kernel_size -= setup_size; /* Size of protected-mode code */
@@ -490,12 +490,3 @@
!fread_targphys_ok(prot_addr, kernel_size, f)) {
fprintf(stderr, "qemu: read error on kernel '%s'\n",
kernel_filename);
-@@ -773,7 +1188,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
- const char *boot_device, DisplayState *ds,
- const char *kernel_filename, const char *kernel_cmdline,
- const char *initrd_filename,
-- int pci_enabled, const char *cpu_model)
-+ int model, const char *cpu_model)
- {
- char buf[1024];
- int ret, linux_boot, i;
++++++ kvm-qemu-rtl8139-link.patch ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:36.000000000 +0200
@@ -1,10 +1,10 @@
# Fix the Link detection in MacOS
# Author Alex Graf - agraf@suse
-diff --git a/qemu/hw/rtl8139.c b/qemu/hw/rtl8139.c
-index e4df58f..4d4cee5 100644
---- a/qemu/hw/rtl8139.c
-+++ b/qemu/hw/rtl8139.c
-@@ -422,6 +422,9 @@ static void RTL8139TallyCounters_load(QEMUFile* f, RTL8139TallyCounters *tally_c
+Index: kvm-75/qemu/hw/rtl8139.c
+===================================================================
+--- kvm-75.orig/qemu/hw/rtl8139.c
++++ kvm-75/qemu/hw/rtl8139.c
+@@ -422,6 +422,9 @@ static void RTL8139TallyCounters_load(QE
/* Saves values of tally counters to VM state file */
static void RTL8139TallyCounters_save(QEMUFile* f, RTL8139TallyCounters *tally_counters);
@@ -22,7 +22,7 @@
PCIDevice *pci_dev;
VLANClientState *vc;
-@@ -1227,7 +1232,7 @@ static void rtl8139_reset(RTL8139State *s)
+@@ -1227,7 +1231,7 @@ static void rtl8139_reset(RTL8139State *
s->Config0 = 0x0; /* No boot ROM */
s->Config1 = 0xC; /* IO mapped and MEM mapped registers available */
s->Config3 = 0x1; /* fast back-to-back compatible */
@@ -31,7 +31,7 @@
s->CSCR = CSCR_F_LINK_100 | CSCR_HEART_BIT | CSCR_LD;
-@@ -1251,6 +1256,13 @@ static void rtl8139_reset(RTL8139State *s)
+@@ -1251,6 +1255,13 @@ static void rtl8139_reset(RTL8139State *
s->TimerInt = 0;
s->TCTR_base = 0;
@@ -45,7 +45,7 @@
/* reset tally counters */
RTL8139TallyCounters_clear(&s->tally_counters);
}
-@@ -2846,7 +2850,7 @@ static uint32_t rtl8139_io_readb(void *opaque, uint8_t addr)
+@@ -2846,7 +2857,7 @@ static uint32_t rtl8139_io_readb(void *o
break;
case MediaStatus:
@@ -54,7 +54,7 @@
DEBUG_PRINT(("RTL8139: MediaStatus read 0x%x\n", ret));
break;
-@@ -3441,6 +3445,15 @@ PCIDevice *pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn)
+@@ -3440,6 +3451,15 @@ PCIDevice *pci_rtl8139_init(PCIBus *bus,
s->pci_dev = (PCIDevice *)d;
memcpy(s->macaddr, nd->macaddr, 6);
@@ -70,11 +70,11 @@
rtl8139_reset(s);
s->vc = qemu_new_vlan_client(nd->vlan, rtl8139_receive,
rtl8139_can_receive, s);
-diff --git a/qemu/net.h b/qemu/net.h
-index 9dc8b7c..31fd50b 100644
---- a/qemu/net.h
-+++ b/qemu/net.h
-@@ -51,12 +51,20 @@ void net_client_uninit(NICInfo *nd);
+Index: kvm-75/qemu/net.h
+===================================================================
+--- kvm-75.orig/qemu/net.h
++++ kvm-75/qemu/net.h
+@@ -55,12 +55,20 @@ void net_client_uninit(NICInfo *nd);
#define MAX_NICS 8
@@ -95,11 +95,11 @@
};
extern int nb_nics;
-diff --git a/qemu/vl.c b/qemu/vl.c
-index 7e4dce1..e4900d8 100644
---- a/qemu/vl.c
-+++ b/qemu/vl.c
-@@ -5003,6 +5003,7 @@ int net_client_init(const char *str)
+Index: kvm-75/qemu/vl.c
+===================================================================
+--- kvm-75.orig/qemu/vl.c
++++ kvm-75/qemu/vl.c
+@@ -5555,6 +5555,7 @@ int net_client_init(const char *device,
}
nd->vlan = vlan;
nd->used = 1;
++++++ qemu-datadir.diff ++++++
--- /var/tmp/diff_new_pack.hc9075/_old 2008-09-16 16:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.hc9075/_new 2008-09-16 16:40:36.000000000 +0200
@@ -1,6 +1,8 @@
---- kvm-59/qemu/configure 2008/01/11 16:17:43 1.1
-+++ kvm-59/qemu/configure 2008/01/11 16:17:53
-@@ -696,7 +696,7 @@
+Index: kvm-75/qemu/configure
+===================================================================
+--- kvm-75.orig/qemu/configure
++++ kvm-75/qemu/configure
+@@ -952,7 +952,7 @@ else
prefix="/usr/local"
fi
mansuffix="/share/man"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org