rpms/kvm/devel kvm-62-e1000-default.patch, NONE, 1.1 kvm.spec, 1.45, 1.46

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/kvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26035

Modified Files:
	kvm.spec 
Added Files:
	kvm-62-e1000-default.patch 
Log Message:
Make e1000 the default network driver


kvm-62-e1000-default.patch:

--- NEW FILE kvm-62-e1000-default.patch ---
diff -Nur kvm-62.orig/kvm kvm-62/kvm
--- kvm-62.orig/kvm	2008-02-25 04:30:14.000000000 -0500
+++ kvm-62/kvm	2008-03-04 00:11:05.000000000 -0500
@@ -58,7 +58,7 @@
 optparser.add_option('--nictype',
                      help = 'use this specific nic type (vendor)',
                      dest = 'nictype',
-                     default = 'rtl8139',
+                     default = 'e1000',
                      )
 
 optparser.add_option('--mac',
diff -Nur kvm-62.orig/qemu/hw/pc.c kvm-62/qemu/hw/pc.c
--- kvm-62.orig/qemu/hw/pc.c	2008-02-25 04:30:14.000000000 -0500
+++ kvm-62/qemu/hw/pc.c	2008-03-04 12:56:50.000000000 -0500
@@ -1000,7 +1000,7 @@
         nd = &nd_table[i];
         if (!nd->model) {
             if (pci_enabled) {
-                nd->model = "rtl8139";
+                nd->model = "e1000";
             } else {
                 nd->model = "ne2k_isa";
             }
diff -Nur kvm-62.orig/qemu/vl.c kvm-62/qemu/vl.c
--- kvm-62.orig/qemu/vl.c	2008-03-04 00:08:22.000000000 -0500
+++ kvm-62/qemu/vl.c	2008-03-04 01:00:36.000000000 -0500
@@ -9450,7 +9450,7 @@
 	    char buf[1024];
             if (net_boot & (1 << i)) {
                 if (model == NULL)
-                    model = "rtl8139";
+                    model = "e1000";
                 snprintf(buf, sizeof(buf), "%s/pxe-%s.bin", bios_dir, model);
                 if (get_image_size(buf) > 0) {
                     if (nb_option_roms >= MAX_OPTION_ROMS) {


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- kvm.spec	4 Mar 2008 04:39:06 -0000	1.45
+++ kvm.spec	4 Mar 2008 22:39:18 -0000	1.46
@@ -1,7 +1,7 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
 Version: 62
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 URL: http://%{name}.sf.net
@@ -10,6 +10,7 @@
 Patch0: kvm-62-defaults.patch
 Patch1: %{name}-bootmenu.patch
 Patch2: %{name}-62-block-rw-range-check.patch
+Patch3: %{name}-62-e1000-default.patch
 # patches from upstream qemu
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel
@@ -41,6 +42,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 # we need to install the data bits in a different path
@@ -95,6 +97,9 @@
 %{_sysconfdir}/sysconfig/modules/%{name}.modules
 
 %changelog
+* Tue Mar  4 2008 Kevin Fenzi <kevin at tummy.com> - 62-4
+- Make e1000 the default network driver
+
 * Mon Mar  3 2008 Jeremy Katz <katzj at redhat.com> - 62-3
 - Default to vmwaresvga now that it's been fixed to work