devel/kvm kvm-58-defaults.patch, NONE, 1.1 kvm.spec, 1.35, 1.36 kvm-19-defaults.patch, 1.1, NONE

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/kvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12702

Modified Files:
	kvm.spec 
Added Files:
	kvm-58-defaults.patch 
Removed Files:
	kvm-19-defaults.patch 
Log Message:
* Thu Dec 27 2007 Jeremy Katz <katzj at redhat.com> - 58-2
- Fix up defaults patch to apply


kvm-58-defaults.patch:

--- NEW FILE kvm-58-defaults.patch ---
diff -up kvm-58/qemu/vl.c.defaults kvm-58/qemu/vl.c
--- kvm-58/qemu/vl.c.defaults	2007-12-26 05:48:22.000000000 -0500
+++ kvm-58/qemu/vl.c	2007-12-27 13:54:45.000000000 -0500
@@ -9217,7 +9217,7 @@ int main(int argc, char **argv)
 	    char buf[1024];
             if (net_boot & (1 << i)) {
                 if (model == NULL)
-                    model = "ne2k_pci";
+                    model = "rtl8139";
                 snprintf(buf, sizeof(buf), "%s/pxe-%s.bin", bios_dir, model);
                 if (get_image_size(buf) > 0) {
                     if (nb_option_roms >= MAX_OPTION_ROMS) {
diff -up kvm-58/qemu/hw/pc.c.defaults kvm-58/qemu/hw/pc.c
--- kvm-58/qemu/hw/pc.c.defaults	2007-12-26 05:48:22.000000000 -0500
+++ kvm-58/qemu/hw/pc.c	2007-12-27 13:53:59.000000000 -0500
@@ -1005,7 +1005,7 @@ static void pc_init1(ram_addr_t ram_size
         nd = &nd_table[i];
         if (!nd->model) {
             if (pci_enabled) {
-                nd->model = "ne2k_pci";
+                nd->model = "rtl8139";
             } else {
                 nd->model = "ne2k_isa";
             }


Index: kvm.spec
===================================================================
RCS file: /cvs/pkgs/devel/kvm/kvm.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- kvm.spec	27 Dec 2007 18:24:36 -0000	1.35
+++ kvm.spec	27 Dec 2007 18:56:19 -0000	1.36
@@ -1,13 +1,13 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 58
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+, LGPLv2+
 Group: Development/Tools
 URL: http://kvm.sf.net
 Source0: http://download.sourceforge.net/sourceforge/kvm/kvm-%{version}.tar.gz
 Source1: kvm.modules
-Patch0: kvm-19-defaults.patch
+Patch0: kvm-58-defaults.patch
 Patch1: kvm-bootmenu.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -86,6 +86,9 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Thu Dec 27 2007 Jeremy Katz <katzj at redhat.com> - 58-2
+- Fix up defaults patch to apply
+
 * Thu Dec 27 2007 Jeremy Katz <katzj at redhat.com> - 58-1
 - Update to kvm-58
 


--- kvm-19-defaults.patch DELETED ---