rpms/kvm/devel kvm-19-defaults.patch,NONE,1.1 kvm.spec,1.10,1.11

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Tue Apr 17 22:36:14 UTC 2007


Author: katzj

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

Modified Files:
	kvm.spec 
Added Files:
	kvm-19-defaults.patch 
Log Message:
* Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 19-1
- update to kvm-19
- use rtl8139 as the default nic emulation instead of ne2k_pci (#236790)


kvm-19-defaults.patch:

--- NEW FILE kvm-19-defaults.patch ---
--- kvm-19/qemu/hw/pc.c.defaults	2007-04-17 15:37:51.000000000 -0400
+++ kvm-19/qemu/hw/pc.c	2007-04-17 15:38:24.000000000 -0400
@@ -694,7 +694,7 @@
         nd = &nd_table[i];
         if (!nd->model) {
             if (pci_enabled) {
-                nd->model = "ne2k_pci";
+                nd->model = "rtl8139";
             } else {
                 nd->model = "ne2k_isa";
             }
--- kvm-19/qemu/vl.c.defaults	2007-04-17 15:36:17.000000000 -0400
+++ kvm-19/qemu/vl.c	2007-04-17 15:38:43.000000000 -0400
@@ -7470,7 +7470,7 @@
 	    const char *model = nd_table[i].model;
 	    char buf[1024];
 	    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) {
 		option_rom[nb_option_roms] = strdup(buf);


Index: kvm.spec
===================================================================
RCS file: /cvs/extras/rpms/kvm/devel/kvm.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kvm.spec	26 Mar 2007 21:16:26 -0000	1.10
+++ kvm.spec	17 Apr 2007 22:35:40 -0000	1.11
@@ -1,12 +1,13 @@
 Summary: Kernel-based Virtual Machine
 Name: kvm
-Version: 15
-Release: 2
+Version: 19
+Release: 1
 License: GPL
 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
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel 
 # qemu doesn't build with gcc 4.x
@@ -29,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .defaults
 
 %build
 ./configure --with-patched-kernel --qemu-cc=gcc34 --kerneldir=$(pwd)/kernel --prefix=%{_prefix}
@@ -73,6 +75,10 @@
 %{_sysconfdir}/sysconfig/modules/kvm.modules
 
 %changelog
+* Tue Apr 17 2007 Jeremy Katz <katzj at redhat.com> - 19-1
+- update to kvm-19
+- use rtl8139 as the default nic emulation instead of ne2k_pci (#236790)
+
 * Mon Mar 26 2007 Jeremy Katz <katzj at redhat.com> - 15-2
 - add file so that kvm modules get loaded on boot
 




More information about the scm-commits mailing list