Mailinglist Archive: opensuse-commit (1116 mails)
| < Previous | Next > |
commit kvm for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 19 Feb 2009 23:11:33 +0100
- Message-id: <20090219221133.E7AED678171@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kvm for openSUSE:Factory
checked in at Thu Feb 19 23:11:33 CET 2009.
--------
--- kvm/kvm.changes 2009-02-13 00:46:14.000000000 +0100
+++ kvm/kvm.changes 2009-02-19 23:08:32.722656000 +0100
@@ -1,0 +2,64 @@
+Thu Feb 19 10:55:38 MST 2009 - brogers@xxxxxxxxxx
+
+- update to kvm-84
+ - merge qemu-svn
+ - redirect slirp traffic to qemu-char device
+ - slirp fixes
+ - qcow2 fixes
+ - nic link status control
+ - enable ac97 audio by default
+ - add virtio-console device
+ - fix rtc time drift on Windows (-rtc-td-hack option)
+ - add -vga none option for running headless guests
+ - better block device error propagation
+ - fix guests halting when switching desktop workspace
+ - improved display interfaces
+ - better logging support
+ - don't corrupt qcow2 images when out disk space on host
+ - dma api
+ - add pci device vendor ID
+ - vnc improvements
+ - improve Virtual PC disk format support
+ - scsi fixes
+ - multicast filtering for e1000 and virtio-net
+ - add libkvm wrapper for KVM_SET_CPUID2 interface (Amit Shah)
+ - fix cpuid for leaves 4, 11, 13 (Amit Shah)
+ - save ia64 nvam (Yang Zhang)
+ - compile fixes (Mark McLaughlin, Jan Kiszka)
+ - generic irq routing
+ - build fixes against RHEL 5 hosts (Andrea Arcangeli)
+ - fix build when pc-bios directory is empty (Eduardo Habkost)
+ - improve host version check (Mark McLaughlin)
+ - drop obsolete eflags conversion to/from qemu emulator (Jan Kiszka)
+ - preallocate memory with -mem-path (John Cooper)
+ - don't register unassigned PCI BARs (Gleb Natapov)
+ - more hrtimer API compatibility
+ - fix build on uniprocessor hosts (Jan Kiszka)
+ - fix build on pre-msi hosts (Jan Kiszka)
+ - allow stopping vm from vcpu thread (Gleb Natapov)
+ - fix cpu and pci hotplug (Gleb Natapov)
+ - ppc updates (Liu Yu)
+ - fix ia64 fp trap handler (Yang Zhang)
+ - fix ia64 vtlb handling (Xiantao Zhang)
+ - enables Windows 2008 on ia64
+ - support translating ia64 PAL arguments (Xiantao Zhang)
+ - implement ia64 PAL calls needed by Windows 2008 (Xiantao Zhang)
+ - map assigned device mmio as uncachable (Sheng Yang)
+ - fix lapic pending count calculation (Marcelo Tosatti)
+ - fix s390 printk (Christian Borntraeger)
+ - fix s390 problem state check (Christian Borntraeger)
+ - fix s390 SIGP set prefix ioctl (Christian Borntraeger)
+ - dynamic ia64 cpu count (Jes Sorensen)
+ - fix lapic build on i386 (Clemens Noss)
+ - make irq ack notifications use routing table (Marcelo Tosatti)
+ - FFXSR support (Alexander Graf)
+ - fix assigned device circular locking dependency (Mark McLaughlin)
+ - drop unused code from string pio handlers (Jan Kiszka)
+ - fix kvmclock on hosts with unstable tsc (Gerd Hoffman)
+ - reenables Fedora 10 guests on those hosts
+ - enable msi from userspace (Sheng Yang)
+ - remove duplicated code in EPT handler (Sheng Yang)
+ - flush volatile msrs on Intel before emulating rdmsr
+ - fixes cygwin on Windows x64
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kvm-83.tar.bz2
kvm-explicit-decl.patch
kvm-pre84-user-Use-broadcast-address-for-slirp-dhcp-replies.patch
kvm-preXX-hpet-disable.patch
kvm-qemu-cpuid4.patch
kvm-qemu-missing_include.patch
New:
----
kvm-84.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kvm.spec ++++++
--- /var/tmp/diff_new_pack.f15644/_old 2009-02-19 23:10:24.000000000 +0100
+++ /var/tmp/diff_new_pack.f15644/_new 2009-02-19 23:10:24.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kvm (Version 83)
+# spec file for package kvm (Version 84)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -45,8 +45,8 @@
Group: System/Kernel
Summary: Kernel-based Virtual Machine
Url: http://kvm.qumranet.com/
-Version: 83
-Release: 3
+Version: 84
+Release: 1
Source0: %name-%version.tar.bz2
### To update to new version, recompress the kvm-??.tar.gz using:
# rpmbuild -bp kvm.spec --define="_sourcedir `pwd`"
@@ -65,9 +65,8 @@
Source3: qemu-ifup
# common and X86 patches
Patch01: qemu-datadir.diff
-Patch04: kvm-qemu-default-memsize.patch
-Patch05: kvm-explicit-decl.patch
-Patch07: kvm-qemu-no-fallback-if-open-kvm-fails.patch
+Patch02: kvm-qemu-default-memsize.patch
+Patch03: kvm-qemu-no-fallback-if-open-kvm-fails.patch
# Mac OS X patches
Patch10: kvm-qemu-lpc.patch
Patch11: kvm-qemu-applesmc.patch
@@ -75,18 +74,14 @@
Patch13: kvm-qemu-macmodel.patch
Patch14: kvm-qemu-rtl8139-link.patch
Patch15: kvm-qemu-multiboot.patch
-Patch16: kvm-qemu-cpuid4.patch
-Patch17: kvm-kernel-cpuid4.patch
-Patch18: kvm-kernel-msr.patch
-Patch19: kvm-maccpuid.patch
-Patch20: kvm-ioapic.patch
-Patch21: kvm-bios.patch
-Patch22: kvm-qemu-missing_include.patch
+Patch16: kvm-kernel-cpuid4.patch
+Patch17: kvm-kernel-msr.patch
+Patch18: kvm-maccpuid.patch
+Patch19: kvm-ioapic.patch
+Patch20: kvm-bios.patch
# Post-release upstream patches
Patch100: kvm-preXX-init-on-demand.patch
Patch101: kvm-preXX-altgr-and-dead-keys-with-VNC.patch
-Patch102:
kvm-pre84-user-Use-broadcast-address-for-slirp-dhcp-replies.patch
-Patch103: kvm-preXX-hpet-disable.patch
# for IA64
Source500: ia64-fix-pagesize.pl
Patch500: IA64-kvm-suse.patch
@@ -181,11 +176,8 @@
%endif
%setup -q
%patch01 -p1 -b .use-qemu-kvm-as-datadir
-%if %use_kmp
-%endif
-%patch04 -p1
-%patch05 -p1
-%patch07 -p1
+%patch02 -p1
+%patch03 -p1
# Mac OS X guest
%if !%{vanilla}
%patch10 -p1
@@ -198,16 +190,12 @@
%patch17 -p1
%patch18 -p1
%patch19 -p1
-%patch20 -p1
cp -a bios bios-mac
-%patch21 -p1 -b .bios-mac
-%patch22
+%patch20 -p1 -b .bios-mac
%endif
# Post-release patches
%patch100 -p1
%patch101 -p1
-%patch102 -p1
-%patch103 -p1
# IA64 support
%ifarch ia64
%patch500 -p1
@@ -325,7 +313,68 @@
%_mandir/man1/qemu-kvm.1.gz
%changelog
-* Fri Feb 13 2009 ro@xxxxxxx
+* Thu Feb 19 2009 brogers@xxxxxxxxxx
+- update to kvm-84
+ - merge qemu-svn
+ - redirect slirp traffic to qemu-char device
+ - slirp fixes
+ - qcow2 fixes
+ - nic link status control
+ - enable ac97 audio by default
+ - add virtio-console device
+ - fix rtc time drift on Windows (-rtc-td-hack option)
+ - add -vga none option for running headless guests
+ - better block device error propagation
+ - fix guests halting when switching desktop workspace
+ - improved display interfaces
+ - better logging support
+ - don't corrupt qcow2 images when out disk space on host
+ - dma api
+ - add pci device vendor ID
+ - vnc improvements
+ - improve Virtual PC disk format support
+ - scsi fixes
+ - multicast filtering for e1000 and virtio-net
+ - add libkvm wrapper for KVM_SET_CPUID2 interface (Amit Shah)
+ - fix cpuid for leaves 4, 11, 13 (Amit Shah)
+ - save ia64 nvam (Yang Zhang)
+ - compile fixes (Mark McLaughlin, Jan Kiszka)
+ - generic irq routing
+ - build fixes against RHEL 5 hosts (Andrea Arcangeli)
+ - fix build when pc-bios directory is empty (Eduardo Habkost)
+ - improve host version check (Mark McLaughlin)
+ - drop obsolete eflags conversion to/from qemu emulator (Jan Kiszka)
+ - preallocate memory with -mem-path (John Cooper)
+ - don't register unassigned PCI BARs (Gleb Natapov)
+ - more hrtimer API compatibility
+ - fix build on uniprocessor hosts (Jan Kiszka)
+ - fix build on pre-msi hosts (Jan Kiszka)
+ - allow stopping vm from vcpu thread (Gleb Natapov)
+ - fix cpu and pci hotplug (Gleb Natapov)
+ - ppc updates (Liu Yu)
+ - fix ia64 fp trap handler (Yang Zhang)
+ - fix ia64 vtlb handling (Xiantao Zhang)
+ - enables Windows 2008 on ia64
+ - support translating ia64 PAL arguments (Xiantao Zhang)
+ - implement ia64 PAL calls needed by Windows 2008 (Xiantao Zhang)
+ - map assigned device mmio as uncachable (Sheng Yang)
+ - fix lapic pending count calculation (Marcelo Tosatti)
+ - fix s390 printk (Christian Borntraeger)
+ - fix s390 problem state check (Christian Borntraeger)
+ - fix s390 SIGP set prefix ioctl (Christian Borntraeger)
+ - dynamic ia64 cpu count (Jes Sorensen)
+ - fix lapic build on i386 (Clemens Noss)
+ - make irq ack notifications use routing table (Marcelo Tosatti)
+ - FFXSR support (Alexander Graf)
+ - fix assigned device circular locking dependency (Mark McLaughlin)
+ - drop unused code from string pio handlers (Jan Kiszka)
+ - fix kvmclock on hosts with unstable tsc (Gerd Hoffman)
+ - reenables Fedora 10 guests on those hosts
+ - enable msi from userspace (Sheng Yang)
+ - remove duplicated code in EPT handler (Sheng Yang)
+ - flush volatile msrs on Intel before emulating rdmsr
+ - fixes cygwin on Windows x64
+* Thu Feb 12 2009 ro@xxxxxxx
- fix build: add missing include statement to
qemu/hw/device-hotplug.c
* Tue Jan 27 2009 agraf@xxxxxxx
@@ -382,7 +431,7 @@
- update OSX patch to work for kvm-78
* Fri Nov 21 2008 brogers@xxxxxxxxxx
- revert disk caching mode back to writeback for now.
-* Sat Nov 08 2008 agraf@xxxxxxx
+* Fri Nov 07 2008 agraf@xxxxxxx
- fix external buildservice compilation
* Fri Nov 07 2008 agraf@xxxxxxx
- fix compilation for < 11.1
@@ -408,7 +457,7 @@
- do not block other VMMs when KVM is loaded
* Thu Oct 23 2008 brogers@xxxxxxxxxx
- misc cleanup and again address s390 build
-* Thu Oct 23 2008 brogers@xxxxxxxxxx
+* Wed Oct 22 2008 brogers@xxxxxxxxxx
- fix build failures in check-gcc-output
* Fri Oct 17 2008 agraf@xxxxxxx
- update to KVM 77
@@ -495,7 +544,7 @@
- fix running of 32-bit code in x86_64 SLES10SP2 (bnc#403189)
- make /usr/bin/qemu-kvm runnable as non kvm group member
- take out the vmi fix again, as that's fixed upstream
-* Tue Jul 22 2008 agraf@xxxxxxx
+* Mon Jul 21 2008 agraf@xxxxxxx
- disable PulseAudio for older distributions, so the
package still builds on < 11.0
* Tue Jul 15 2008 agraf@xxxxxxx
@@ -539,7 +588,7 @@
- update to latest Mac patches
* Mon May 26 2008 agraf@xxxxxxx
- enable ALSA
-* Fri Mar 28 2008 coolo@xxxxxxx
+* Thu Mar 27 2008 coolo@xxxxxxx
- adding ncurses-devel to buildrequires
* Fri Mar 07 2008 bk@xxxxxxx
- Update to kvm-63, adds curses interface. It still uses gcc for qemu's
++++++ kvm-83.tar.bz2 -> kvm-84.tar.bz2 ++++++
++++ 41176 lines of diff (skipped)
++++++ kvm-qemu-applesmc.patch ++++++
--- /var/tmp/diff_new_pack.f15644/_old 2009-02-19 23:10:30.000000000 +0100
+++ /var/tmp/diff_new_pack.f15644/_new 2009-02-19 23:10:30.000000000 +0100
@@ -207,31 +207,31 @@
===================================================================
--- kvm-83.orig/qemu/vl.c
+++ kvm-83/qemu/vl.c
-@@ -3978,6 +3978,7 @@ static void help(int exitcode)
- #endif
- #ifdef TARGET_I386
+@@ -4087,6 +4087,7 @@ static void help(int exitcode)
"-no-fd-bootchk disable boot signature checking for floppy
disks\n"
+ "-no-acpi disable ACPI\n"
+ "-no-hpet disable HPET\n"
+ "-osk key set AppleSMC key\n"
#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"
-@@ -4167,6 +4168,7 @@ enum {
- QEMU_OPTION_snapshot,
- #ifdef TARGET_I386
+ "Linux boot specific:\n"
+ "-kernel bzImage use 'bzImage' as kernel image\n"
+@@ -4245,6 +4246,7 @@ enum {
QEMU_OPTION_no_fd_bootchk,
+ QEMU_OPTION_no_acpi,
+ QEMU_OPTION_no_hpet,
+ QEMU_OPTION_osk,
- #endif
- QEMU_OPTION_m,
- QEMU_OPTION_nographic,
-@@ -4275,6 +4277,7 @@ static const QEMUOption qemu_options[] =
- { "snapshot", 0, QEMU_OPTION_snapshot },
- #ifdef TARGET_I386
+
+ /* Linux boot specific: */
+ QEMU_OPTION_kernel,
+@@ -4379,6 +4381,7 @@ static const QEMUOption qemu_options[] =
{ "no-fd-bootchk", 0, QEMU_OPTION_no_fd_bootchk },
+ { "no-acpi", 0, QEMU_OPTION_no_acpi },
+ { "no-hpet", 0, QEMU_OPTION_no_hpet },
+ { "osk", HAS_ARG, QEMU_OPTION_osk },
#endif
- { "m", HAS_ARG, QEMU_OPTION_m },
- { "nographic", 0, QEMU_OPTION_nographic },
-@@ -5054,6 +5057,9 @@ int main(int argc, char **argv, char **e
+
+ /* Linux boot specific: */
+@@ -5159,6 +5162,9 @@ int main(int argc, char **argv, char **e
case QEMU_OPTION_no_fd_bootchk:
fd_bootchk = 0;
break;
++++++ kvm-qemu-default-memsize.patch ++++++
--- /var/tmp/diff_new_pack.f15644/_old 2009-02-19 23:10:30.000000000 +0100
+++ /var/tmp/diff_new_pack.f15644/_new 2009-02-19 23:10:30.000000000 +0100
@@ -1,13 +1,13 @@
-Index: kvm-77/qemu/vl.c
+Index: a/qemu/vl.c
===================================================================
---- kvm-77.orig/qemu/vl.c
-+++ kvm-77/qemu/vl.c
-@@ -162,7 +162,7 @@
- #ifdef TARGET_PPC
- #define DEFAULT_RAM_SIZE 144
- #else
+--- a/qemu/vl.c
++++ b/qemu/vl.c
+@@ -165,7 +165,7 @@
+ # define LOG_IOPORT(...) do { } while (0)
+ #endif
+
-#define DEFAULT_RAM_SIZE 128
+#define DEFAULT_RAM_SIZE 384
- #endif
/* Max number of USB devices that can be specified on the commandline. */
+ #define MAX_USB_CMDLINE 8
++++++ kvm-qemu-macmodel.patch ++++++
--- /var/tmp/diff_new_pack.f15644/_old 2009-02-19 23:10:30.000000000 +0100
+++ /var/tmp/diff_new_pack.f15644/_new 2009-02-19 23:10:30.000000000 +0100
@@ -8,8 +8,8 @@
Index: kvm-83/qemu/hw/pc.c
===================================================================
--- kvm-83.orig/qemu/hw/pc.c
-+++ kvm-83/qemu/hw/pc.c
-@@ -62,6 +62,12 @@ static PITState *pit;
++++ kvm-83.orig/qemu/hw/pc.c
+@@ -63,6 +63,12 @@ static PITState *pit;
static IOAPICState *ioapic;
static PCIDevice *i440fx_state;
@@ -22,8 +22,8 @@
static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
{
}
-@@ -803,7 +809,7 @@ static void pc_init1(ram_addr_t ram_size
- const char *boot_device, DisplayState *ds,
+@@ -804,7 +810,7 @@ static void pc_init1(ram_addr_t ram_size
+ const char *boot_device,
const char *kernel_filename, const char *kernel_cmdline,
const char *initrd_filename,
- int pci_enabled, const char *cpu_model)
@@ -73,7 +73,7 @@
snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name);
bios_size = get_image_size(buf);
if (bios_size <= 0 ||
-@@ -986,7 +1004,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -988,7 +1006,7 @@ vga_bios_error:
i8259 = i8259_init(cpu_irq[0]);
ferr_irq = i8259[13];
@@ -82,32 +82,32 @@
pci_bus = i440fx_init(&i440fx_state, i8259);
piix3_devfn = piix3_init(pci_bus, -1);
} else {
-@@ -999,7 +1017,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1001,7 +1019,7 @@ vga_bios_error:
register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
if (cirrus_vga_enabled) {
- if (pci_enabled) {
+ if (model > MODEL_ISA) {
pci_cirrus_vga_init(pci_bus,
- ds, phys_ram_base + vga_ram_addr,
+ phys_ram_base + vga_ram_addr,
vga_ram_addr, vga_ram_size);
-@@ -1008,13 +1026,13 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1010,13 +1028,13 @@ vga_bios_error:
vga_ram_addr, vga_ram_size);
}
} else if (vmsvga_enabled) {
- if (pci_enabled)
+ if (model > MODEL_ISA)
- pci_vmsvga_init(pci_bus, ds, phys_ram_base + vga_ram_addr,
+ pci_vmsvga_init(pci_bus, phys_ram_base + vga_ram_addr,
vga_ram_addr, vga_ram_size);
else
fprintf(stderr, "%s: vmware_vga: no PCI bus\n", __FUNCTION__);
- } else {
+ } else if (std_vga_enabled) {
- if (pci_enabled) {
+ if (model > MODEL_ISA) {
- pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr,
+ pci_vga_init(pci_bus, phys_ram_base + vga_ram_addr,
vga_ram_addr, vga_ram_size, 0, 0);
} else {
-@@ -1030,8 +1048,13 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1032,8 +1050,13 @@ vga_bios_error:
register_ioport_read(0x92, 1, 1, ioport92_read, NULL);
register_ioport_write(0x92, 1, 1, ioport92_write, NULL);
@@ -123,7 +123,7 @@
}
#ifdef USE_KVM_PIT
if (kvm_enabled() && qemu_kvm_pit_in_kernel())
-@@ -1043,7 +1066,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1045,7 +1068,7 @@ vga_bios_error:
if (!no_hpet) {
hpet_init(i8259);
}
@@ -132,35 +132,16 @@
pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
}
-@@ -1064,15 +1087,22 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1066,7 +1089,7 @@ vga_bios_error:
for(i = 0; i < nb_nics; i++) {
- nd = &nd_table[i];
- if (!nd->model) {
-- if (pci_enabled) {
-- nd->model = "rtl8139";
-- } else {
-- nd->model = "ne2k_isa";
-+ switch(model) {
-+ case MODEL_ISA:
-+ nd->model = "ne2k_isa";
-+ break;
-+ case MODEL_MAC:
-+ nd->model = "rtl8139";
-+ nd->link = Link_10mbps;
-+ break;
-+ default:
-+ nd->model = "ne2k_pci";
-+ break;
- }
- }
- if (strcmp(nd->model, "ne2k_isa") == 0) {
+ NICInfo *nd = &nd_table[i];
+
+- if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
++ if (model == MODEL_ISA || (nd->model && strcmp(nd->model, "ne2k_isa")
== 0))
pc_init_ne2k_isa(nd, i8259);
-- } else if (pci_enabled) {
-+ } else if (model > MODEL_ISA) {
- if (strcmp(nd->model, "?") == 0)
- fprintf(stderr, "qemu: Supported ISA NICs: ne2k_isa\n");
- if (!pci_nic_init(pci_bus, nd, -1))
-@@ -1101,19 +1131,25 @@ static void pc_init1(ram_addr_t ram_size
+ else
+ pci_nic_init(pci_bus, nd, -1, "rtl8139");
+@@ -1087,19 +1110,25 @@ vga_bios_error:
hd[i] = NULL;
}
@@ -194,7 +175,7 @@
#endif
for(i = 0; i < MAX_FD; i++) {
-@@ -1127,11 +1163,11 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1113,11 +1142,11 @@ vga_bios_error:
cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd);
@@ -208,7 +189,7 @@
uint8_t *eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this
persistent */
i2c_bus *smbus;
-@@ -1146,7 +1182,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1132,7 +1161,7 @@ vga_bios_error:
i440fx_init_memory_mappings(i440fx_state);
}
@@ -217,7 +198,7 @@
int max_bus;
int bus, unit;
void *scsi;
-@@ -1165,7 +1201,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1151,7 +1180,7 @@ vga_bios_error:
}
/* Add virtio block devices */
@@ -226,7 +207,7 @@
int index;
int unit_id = 0;
-@@ -1188,7 +1224,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -1174,11 +1203,11 @@ vga_bios_error:
}
/* Add virtio balloon device */
@@ -234,49 +215,53 @@
+ if (model > MODEL_ISA)
virtio_balloon_init(pci_bus);
- #ifdef USE_KVM_DEVICE_ASSIGNMENT
-@@ -1199,6 +1235,18 @@ static void pc_init1(ram_addr_t ram_size
+ /* Add virtio console devices */
+- if (pci_enabled) {
++ if (model > MODEL_ISA) {
+ for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {
+ if (virtcon_hds[i])
+ virtio_console_init(pci_bus, virtcon_hds[i]);
+@@ -1193,6 +1222,18 @@ vga_bios_error:
#endif /* USE_KVM_DEVICE_ASSIGNMENT */
}
+static void pc_init_mac(ram_addr_t ram_size, int vga_ram_size,
-+ const char *boot_device, DisplayState *ds,
++ const char *boot_device,
+ const char *kernel_filename,
+ const char *kernel_cmdline,
+ const char *initrd_filename,
+ const char *cpu_model)
+{
-+ pc_init1(ram_size, vga_ram_size, boot_device, ds,
++ pc_init1(ram_size, vga_ram_size, boot_device,
+ kernel_filename, kernel_cmdline,
+ initrd_filename, MODEL_MAC, cpu_model);
+}
+
static void pc_init_pci(ram_addr_t ram_size, int vga_ram_size,
- const char *boot_device, DisplayState *ds,
+ const char *boot_device,
const char *kernel_filename,
-@@ -1208,7 +1256,7 @@ static void pc_init_pci(ram_addr_t ram_s
+@@ -1202,7 +1243,7 @@ static void pc_init_pci(ram_addr_t ram_s
{
- pc_init1(ram_size, vga_ram_size, boot_device, ds,
+ pc_init1(ram_size, vga_ram_size, boot_device,
kernel_filename, kernel_cmdline,
- initrd_filename, 1, cpu_model);
+ initrd_filename, MODEL_PCI, cpu_model);
}
static void pc_init_isa(ram_addr_t ram_size, int vga_ram_size,
-@@ -1220,7 +1268,7 @@ static void pc_init_isa(ram_addr_t ram_s
+@@ -1214,7 +1255,7 @@ static void pc_init_isa(ram_addr_t ram_s
{
- pc_init1(ram_size, vga_ram_size, boot_device, ds,
+ pc_init1(ram_size, vga_ram_size, boot_device,
kernel_filename, kernel_cmdline,
- initrd_filename, 0, cpu_model);
+ initrd_filename, MODEL_ISA, cpu_model);
}
/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE)
-@@ -1238,6 +1286,14 @@ QEMUMachine pc_machine = {
- .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
+@@ -1233,6 +1274,14 @@ QEMUMachine pc_machine = {
.max_cpus = 255,
};
-+
+
+QEMUMachine mac_machine = {
+ .name = "mac",
+ .desc = "Intel-Mac",
@@ -284,9 +269,10 @@
+ .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
+ .max_cpus = 255,
+};
-
++
QEMUMachine isapc_machine = {
.name = "isapc",
+ .desc = "ISA-only PC",
Index: kvm-83/qemu/hw/boards.h
===================================================================
--- kvm-83.orig/qemu/hw/boards.h
++++++ kvm-qemu-no-fallback-if-open-kvm-fails.patch ++++++
--- /var/tmp/diff_new_pack.f15644/_old 2009-02-19 23:10:30.000000000 +0100
+++ /var/tmp/diff_new_pack.f15644/_new 2009-02-19 23:10:30.000000000 +0100
@@ -1,11 +1,11 @@
-Index: kvm-78/qemu/vl.c
+Index: a/qemu/vl.c
===================================================================
---- kvm-78.orig/qemu/vl.c
-+++ kvm-78/qemu/vl.c
-@@ -10057,7 +10057,8 @@ int main(int argc, char **argv)
+--- a/qemu/vl.c
++++ b/qemu/vl.c
+@@ -5658,7 +5658,8 @@ int main(int argc, char **argv, char **e
+ #ifdef USE_KVM
if (kvm_enabled()) {
if (kvm_qemu_init() < 0) {
- extern int kvm_allowed;
- fprintf(stderr, "Could not initialize KVM, will disable KVM
support\n");
+ fprintf(stderr, "Could not initialize KVM. Do you have kvm-amd or
kvm-intel modprobe'd?\nIf you want to use CPU emulation, start with
-no-kvm.\n");
+ exit(1);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |