Hello community, here is the log from the commit of package kvm checked in at Mon Dec 1 17:55:25 CET 2008. -------- --- arch/i386/kvm/kvm.changes 2008-11-21 16:47:14.000000000 +0100 +++ /mounts/work_src_done/STABLE/kvm/kvm.changes 2008-12-01 17:09:41.328293000 +0100 @@ -1,0 +2,5 @@ +Mon Dec 1 17:09:24 CET 2008 - agraf@suse.de + +- update OSX patch to work for kvm-78 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kvm.spec ++++++ --- /var/tmp/diff_new_pack.nK5521/_old 2008-12-01 17:53:54.000000000 +0100 +++ /var/tmp/diff_new_pack.nK5521/_new 2008-12-01 17:53:54.000000000 +0100 @@ -39,7 +39,7 @@ Summary: Kernel-based Virtual Machine Url: http://kvm.qumranet.com/ Version: 78 -Release: 5 +Release: 6 Source0: %name-%version.tar.bz2 ### To update to new version, recompress the kvm-??.tar.gz using: # rpmbuild -bp kvm.spec --define="_sourcedir `pwd`" @@ -289,9 +289,11 @@ %_mandir/man1/qemu-kvm.1.gz %changelog +* Mon Dec 01 2008 agraf@suse.de +- update OSX patch to work for kvm-78 * Fri Nov 21 2008 brogers@novell.com - revert disk caching mode back to writeback for now. -* Fri Nov 07 2008 agraf@suse.de +* Sat Nov 08 2008 agraf@suse.de - fix external buildservice compilation * Fri Nov 07 2008 agraf@suse.de - fix compilation for < 11.1 @@ -317,7 +319,7 @@ - do not block other VMMs when KVM is loaded * Thu Oct 23 2008 brogers@novell.com - misc cleanup and again address s390 build -* Wed Oct 22 2008 brogers@novell.com +* Thu Oct 23 2008 brogers@novell.com - fix build failures in check-gcc-output * Fri Oct 17 2008 agraf@suse.de - update to KVM 77 @@ -404,7 +406,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 -* Mon Jul 21 2008 agraf@suse.de +* Tue Jul 22 2008 agraf@suse.de - disable PulseAudio for older distributions, so the package still builds on < 11.0 * Tue Jul 15 2008 agraf@suse.de @@ -448,7 +450,7 @@ - update to latest Mac patches * Mon May 26 2008 agraf@suse.de - enable ALSA -* Thu Mar 27 2008 coolo@suse.de +* Fri Mar 28 2008 coolo@suse.de - adding ncurses-devel to buildrequires * Fri Mar 07 2008 bk@suse.de - Update to kvm-63, adds curses interface. It still uses gcc for qemu's ++++++ kvm-qemu-macmodel.patch ++++++ --- /var/tmp/diff_new_pack.nK5521/_old 2008-12-01 17:53:54.000000000 +0100 +++ /var/tmp/diff_new_pack.nK5521/_new 2008-12-01 17:53:54.000000000 +0100 @@ -5,11 +5,11 @@ # like this: pc_init1(.... , ISA, ...) # pc_init1(.... , PCI | IOAPIC | PIIX, ..... # pc_init1(.... , PCI | ICH6, LPC, SMC , ...) -Index: kvm-75/qemu/hw/pc.c +Index: kvm-78/qemu/hw/pc.c =================================================================== ---- kvm-75.orig/qemu/hw/pc.c -+++ kvm-75/qemu/hw/pc.c -@@ -56,6 +56,12 @@ static PITState *pit; +--- kvm-78.orig/qemu/hw/pc.c ++++ kvm-78/qemu/hw/pc.c +@@ -58,6 +58,12 @@ static PITState *pit; static IOAPICState *ioapic; static PCIDevice *i440fx_state; @@ -22,7 +22,7 @@ static void ioport80_write(void *opaque, uint32_t addr, uint32_t data) { } -@@ -800,7 +806,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -805,7 +811,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, @@ -31,7 +31,7 @@ { char buf[1024]; int ret, linux_boot, i; -@@ -828,15 +834,19 @@ static void pc_init1(ram_addr_t ram_size +@@ -833,15 +839,19 @@ static void pc_init1(ram_addr_t ram_size /* init CPUs */ if (cpu_model == NULL) { @@ -54,7 +54,7 @@ } vmport_init(); -@@ -891,8 +901,16 @@ static void pc_init1(ram_addr_t ram_size +@@ -880,8 +890,16 @@ static void pc_init1(ram_addr_t ram_size vga_ram_addr = qemu_ram_alloc(vga_ram_size); /* BIOS load */ @@ -73,7 +73,7 @@ snprintf(buf, sizeof(buf), "%s/%s", bios_dir, bios_name); bios_size = get_image_size(buf); if (bios_size <= 0 || -@@ -991,7 +1009,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -956,7 +974,7 @@ static void pc_init1(ram_addr_t ram_size i8259 = i8259_init(cpu_irq[0]); ferr_irq = i8259[13]; @@ -82,7 +82,7 @@ pci_bus = i440fx_init(&i440fx_state, i8259); piix3_devfn = piix3_init(pci_bus, -1); } else { -@@ -1004,7 +1022,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -969,7 +987,7 @@ static void pc_init1(ram_addr_t ram_size register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL); if (cirrus_vga_enabled) { @@ -91,7 +91,7 @@ pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size); -@@ -1013,13 +1031,13 @@ static void pc_init1(ram_addr_t ram_size +@@ -978,13 +996,13 @@ static void pc_init1(ram_addr_t ram_size vga_ram_addr, vga_ram_size); } } else if (vmsvga_enabled) { @@ -107,7 +107,7 @@ pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr, vga_ram_addr, vga_ram_size, 0, 0); } else { -@@ -1035,8 +1053,13 @@ static void pc_init1(ram_addr_t ram_size +@@ -1000,8 +1018,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); @@ -123,7 +123,7 @@ } #ifdef USE_KVM_PIT if (kvm_enabled() && qemu_kvm_pit_in_kernel()) -@@ -1045,7 +1068,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -1010,7 +1033,7 @@ static void pc_init1(ram_addr_t ram_size #endif pit = pit_init(0x40, i8259[0]); pcspk_init(pit); @@ -132,7 +132,7 @@ pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic); } -@@ -1066,15 +1089,22 @@ static void pc_init1(ram_addr_t ram_size +@@ -1031,15 +1054,22 @@ static void pc_init1(ram_addr_t ram_size for(i = 0; i < nb_nics; i++) { nd = &nd_table[i]; if (!nd->model) { @@ -160,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)) -@@ -1103,19 +1133,25 @@ static void pc_init1(ram_addr_t ram_size +@@ -1068,19 +1098,25 @@ static void pc_init1(ram_addr_t ram_size hd[i] = NULL; } @@ -194,9 +194,9 @@ #endif for(i = 0; i < MAX_FD; i++) { -@@ -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); +@@ -1094,11 +1130,11 @@ static void pc_init1(ram_addr_t ram_size + + cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device, hd); - if (pci_enabled && usb_enabled) { + if ((model > MODEL_ISA) && usb_enabled) { @@ -208,7 +208,7 @@ uint8_t *eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */ i2c_bus *smbus; -@@ -1149,7 +1185,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -1113,7 +1149,7 @@ static void pc_init1(ram_addr_t ram_size i440fx_init_memory_mappings(i440fx_state); } @@ -217,7 +217,7 @@ int max_bus; int bus, unit; void *scsi; -@@ -1168,7 +1204,7 @@ static void pc_init1(ram_addr_t ram_size +@@ -1132,7 +1168,7 @@ static void pc_init1(ram_addr_t ram_size } /* Add virtio block devices */ @@ -226,7 +226,7 @@ int index; int unit_id = 0; -@@ -1191,10 +1227,22 @@ static void pc_init1(ram_addr_t ram_size +@@ -1155,10 +1191,22 @@ static void pc_init1(ram_addr_t ram_size extboot_init(info->bdrv, 1); } @@ -250,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, -@@ -1204,7 +1252,7 @@ static void pc_init_pci(ram_addr_t ram_s +@@ -1168,7 +1216,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, @@ -259,7 +259,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 +@@ -1180,7 +1228,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, @@ -268,25 +268,26 @@ } QEMUMachine pc_machine = { -@@ -1226,6 +1274,13 @@ QEMUMachine pc_machine = { +@@ -1190,6 +1238,14 @@ QEMUMachine pc_machine = { .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE, + .max_cpus = 255, }; - ++ +QEMUMachine mac_machine = { -+ "mac", -+ "Intel-Mac", -+ pc_init_mac, -+ VGA_RAM_SIZE + PC_MAX_BIOS_SIZE, ++ .name = "mac", ++ .desc = "Intel-Mac", ++ .init = pc_init_mac, ++ .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE, ++ .max_cpus = 255, +}; -+ + QEMUMachine isapc_machine = { .name = "isapc", - .desc = "ISA-only PC", -Index: kvm-75/qemu/hw/boards.h +Index: kvm-78/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; +--- kvm-78.orig/qemu/hw/boards.h ++++ kvm-78/qemu/hw/boards.h +@@ -33,6 +33,7 @@ extern QEMUMachine bareetraxfs_machine; /* pc.c */ extern QEMUMachine pc_machine; extern QEMUMachine isapc_machine; @@ -294,10 +295,10 @@ /* ppc.c */ extern QEMUMachine prep_machine; -Index: kvm-75/qemu/target-i386/machine.c +Index: kvm-78/qemu/target-i386/machine.c =================================================================== ---- kvm-75.orig/qemu/target-i386/machine.c -+++ kvm-75/qemu/target-i386/machine.c +--- kvm-78.orig/qemu/target-i386/machine.c ++++ kvm-78/qemu/target-i386/machine.c @@ -10,6 +10,7 @@ void register_machines(void) { qemu_register_machine(&pc_machine); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org