rpms/qemu/F-11 .cvsignore, 1.15, 1.16 qemu-roms-more-room-fix-vga-align.patch, 1.2, 1.3 qemu-roms-more-room.patch, 1.3, 1.4 qemu.spec, 1.95, 1.96 sources, 1.15, 1.16 qemu-dma-aio-cancellation1.patch, 1.1, NONE qemu-dma-aio-cancellation2.patch, 1.1, NONE qemu-dma-aio-cancellation3.patch, 1.1, NONE qemu-dma-aio-cancellation4.patch, 1.1, NONE qemu-fix-gcc.patch, 1.2, NONE qemu-fix-load-linux.patch, 1.3, NONE qemu-trim-cpu-features-not-supported-by-kvm.patch, 1.1, NONE

Glauber Costa glommer at fedoraproject.org
Sun May 31 14:43:04 UTC 2009 

Author: glommer

Update of /cvs/pkgs/rpms/qemu/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13362

Modified Files:
	.cvsignore qemu-roms-more-room-fix-vga-align.patch 
	qemu-roms-more-room.patch qemu.spec sources 
Removed Files:
	qemu-dma-aio-cancellation1.patch 
	qemu-dma-aio-cancellation2.patch 
	qemu-dma-aio-cancellation3.patch 
	qemu-dma-aio-cancellation4.patch qemu-fix-gcc.patch 
	qemu-fix-load-linux.patch 
	qemu-trim-cpu-features-not-supported-by-kvm.patch 
Log Message:
stable 0.10.5




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	13 May 2009 08:35:55 -0000	1.15
+++ .cvsignore	31 May 2009 14:42:32 -0000	1.16
@@ -1 +1 @@
-qemu-kvm-*.tar.gz
+qemu-kvm-0.10.5.tar.gz

qemu-roms-more-room-fix-vga-align.patch:

Index: qemu-roms-more-room-fix-vga-align.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-roms-more-room-fix-vga-align.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- qemu-roms-more-room-fix-vga-align.patch	13 May 2009 08:35:55 -0000	1.2
+++ qemu-roms-more-room-fix-vga-align.patch	31 May 2009 14:42:34 -0000	1.3
@@ -18,10 +18,11 @@ Signed-off-by: Glauber Costa <glommer at re
  qemu/hw/pc.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff -urp qemu-kvm-0.10.4.orig/hw/pc.c qemu-kvm-0.10.4/hw/pc.c
---- qemu-kvm-0.10.4.orig/hw/pc.c	2009-05-12 22:48:08.000000000 +0100
-+++ qemu-kvm-0.10.4/hw/pc.c	2009-05-12 22:48:46.000000000 +0100
-@@ -927,7 +927,7 @@ vga_bios_error:
+Index: qemu-kvm-0.10.5/hw/pc.c
+===================================================================
+--- qemu-kvm-0.10.5.orig/hw/pc.c
++++ qemu-kvm-0.10.5/hw/pc.c
+@@ -925,7 +925,7 @@ vga_bios_error:
              exit(1);
          }
  	/* Round up vga bios size to the next 2k boundary */
@@ -30,4 +31,3 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
  	option_rom_start = 0xc0000 + vga_bios_size;
  
          /* setup basic memory access */
-Only in qemu-kvm-0.10.4/hw: pc.c.orig

qemu-roms-more-room.patch:

Index: qemu-roms-more-room.patch
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu-roms-more-room.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qemu-roms-more-room.patch	13 May 2009 11:21:59 -0000	1.3
+++ qemu-roms-more-room.patch	31 May 2009 14:42:34 -0000	1.4
@@ -31,10 +31,11 @@ git-svn-id: svn://svn.savannah.nongnu.or
  hw/pc.c |   29 +++++++++++++++++++----------
  1 files changed, 19 insertions(+), 10 deletions(-)
 
-diff -urp qemu-kvm-0.10.4.orig/hw/pc.c qemu-kvm-0.10.4/hw/pc.c
---- qemu-kvm-0.10.4.orig/hw/pc.c	2009-05-12 17:16:34.000000000 +0100
-+++ qemu-kvm-0.10.4/hw/pc.c	2009-05-12 22:46:38.000000000 +0100
-@@ -820,7 +820,7 @@ static void pc_init1(ram_addr_t ram_size
+Index: qemu-kvm-0.10.5/hw/pc.c
+===================================================================
+--- qemu-kvm-0.10.5.orig/hw/pc.c
++++ qemu-kvm-0.10.5/hw/pc.c
+@@ -818,7 +818,7 @@ static void pc_init1(ram_addr_t ram_size
  {
      char buf[1024];
      int ret, linux_boot, i;
@@ -43,7 +44,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
      ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
      int bios_size, isa_bios_size, vga_bios_size;
      int pci_option_rom_offset;
-@@ -832,6 +832,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -830,6 +830,7 @@ static void pc_init1(ram_addr_t ram_size
      int index;
      BlockDriverState *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
      BlockDriverState *fd[MAX_FD];
@@ -51,7 +52,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
  
      if (ram_size >= 0xe0000000 ) {
          above_4g_mem_size = ram_size - 0xe0000000;
-@@ -907,7 +908,7 @@ static void pc_init1(ram_addr_t ram_size
+@@ -905,7 +906,7 @@ static void pc_init1(ram_addr_t ram_size
          exit(1);
      }
  
@@ -60,7 +61,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
          /* VGA BIOS load */
          if (cirrus_vga_enabled) {
              snprintf(buf, sizeof(buf), "%s/%s", bios_dir, VGABIOS_CIRRUS_FILENAME);
-@@ -925,12 +926,21 @@ vga_bios_error:
+@@ -923,12 +924,21 @@ vga_bios_error:
              fprintf(stderr, "qemu: could not load VGA BIOS '%s'\n", buf);
              exit(1);
          }
@@ -83,7 +84,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
      /* map the last 128KB of the BIOS in ISA space */
      isa_bios_size = bios_size;
      if (isa_bios_size > (128 * 1024))
-@@ -951,14 +961,14 @@ vga_bios_error:
+@@ -949,14 +959,14 @@ vga_bios_error:
          ram_addr_t option_rom_offset;
          int size, offset;
  
@@ -91,17 +92,17 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
 +        offset = option_rom_start;
          if (linux_boot) {
              option_rom_offset = qemu_ram_alloc(TARGET_PAGE_SIZE);
-             load_linux(option_rom_offset,
-                        kernel_filename, initrd_filename, kernel_cmdline);
 -            cpu_register_physical_memory(0xd0000, TARGET_PAGE_SIZE,
 +            cpu_register_physical_memory(option_rom_start, TARGET_PAGE_SIZE,
                                           option_rom_offset);
+             load_linux(0xd0000,
+                        kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
 -            offset = TARGET_PAGE_SIZE;
 +            offset += TARGET_PAGE_SIZE;
          }
  
          for (i = 0; i < nb_option_roms; i++) {
-@@ -968,13 +978,13 @@ vga_bios_error:
+@@ -966,13 +976,13 @@ vga_bios_error:
                          option_rom[i]);
                  exit(1);
              }
@@ -117,7 +118,7 @@ diff -urp qemu-kvm-0.10.4.orig/hw/pc.c q
                  exit(1);
              }
              size = (size + 4095) & ~4095;
-@@ -982,9 +992,8 @@ vga_bios_error:
+@@ -980,9 +990,8 @@ vga_bios_error:
         initialization, and (optionally) marked readonly by the BIOS
         before INT 19h.  See the PNPBIOS specification, appendix B.
         DDIM support is mandatory for proper PCI expansion ROM support. */


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- qemu.spec	19 May 2009 03:00:56 -0000	1.95
+++ qemu.spec	31 May 2009 14:42:34 -0000	1.96
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
-Version: 0.10.4
-Release: 5%{?dist}
+Version: 0.10.5
+Release: 1%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -23,19 +23,10 @@ Patch8: 08-vnc-acl-mgmt.patch
 
 Patch9: kvm-upstream-ppc.patch
 Patch10: qemu-fix-debuginfo.patch
-Patch11: qemu-fix-gcc.patch
-Patch12: qemu-roms-more-room.patch
-Patch13: qemu-roms-more-room-fix-vga-align.patch
-Patch14: qemu-bios-bigger-roms.patch
-Patch15: qemu-kvm-fix-kerneldir-includes.patch
-Patch16: qemu-fix-load-linux.patch
-Patch17: qemu-dma-aio-cancellation1.patch
-Patch18: qemu-dma-aio-cancellation2.patch
-Patch19: qemu-dma-aio-cancellation3.patch
-Patch20: qemu-dma-aio-cancellation4.patch
-Patch21: qemu-make-x86-cpuid-feature-names-available-in-file-scope.patch
-Patch22: qemu-fix-x86-feature-modifications-for-features-that-set.patch
-Patch23: qemu-trim-cpu-features-not-supported-by-kvm.patch
+Patch11: qemu-roms-more-room.patch
+Patch12: qemu-roms-more-room-fix-vga-align.patch
+Patch13: qemu-bios-bigger-roms.patch
+Patch14: qemu-kvm-fix-kerneldir-includes.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -231,15 +222,6 @@ such as kvmtrace and kvm_stat.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-#%patch22 -p1
-#%patch23 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -482,6 +464,19 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun May 31 2009 Glauber Costa <glommer at redhat.com> - 2:0.10.5-1
+- Update to 0.10.5, and remove already upstream patches
+    qemu-fix-gcc.patch
+    qemu-fix-load-linux.patch
+    qemu-dma-aio-cancellation1.patch
+    qemu-dma-aio-cancellation2.patch
+    qemu-dma-aio-cancellation3.patch
+    qemu-dma-aio-cancellation4.patch
+    + all cpuid trimming
+
+  Conflicts:
+    qemu-roms-more-room.patch
+
 * Mon May 18 2009 Glauber Costa <glommer at redhat.com> - 2:0.10.4-5
 - Backport cpuid trimming from upstream (#499596)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	13 May 2009 08:35:55 -0000	1.15
+++ sources	31 May 2009 14:42:34 -0000	1.16
@@ -1 +1 @@
-7b876a4899ed82517ca47898e59f215c  qemu-kvm-0.10.4.tar.gz
+e59ca20604ca8892d8f99b9fc5a159c1  qemu-kvm-0.10.5.tar.gz


--- qemu-dma-aio-cancellation1.patch DELETED ---


--- qemu-dma-aio-cancellation2.patch DELETED ---


--- qemu-dma-aio-cancellation3.patch DELETED ---


--- qemu-dma-aio-cancellation4.patch DELETED ---


--- qemu-fix-gcc.patch DELETED ---


--- qemu-fix-load-linux.patch DELETED ---


--- qemu-trim-cpu-features-not-supported-by-kvm.patch DELETED ---

More information about the scm-commits mailing list