rpms/qemu/F-11 qemu-move-option-rom-reset-definition.patch, NONE, 1.1 qemu.spec, 1.88, 1.89

[Glauber Costa]

Author: glommer

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

Modified Files:
	qemu.spec 
Added Files:
	qemu-move-option-rom-reset-definition.patch 
Log Message:
move definition of option rom reset functions to beginning of file



qemu-move-option-rom-reset-definition.patch:

--- NEW FILE qemu-move-option-rom-reset-definition.patch ---
--- a/qemu/hw/pc.c	2009-05-12 10:53:18.000000000 -0300
+++ b/qemu/hw/pc.c	2009-05-12 10:53:48.000000000 -0300
@@ -58,6 +58,30 @@
 
 #define MAX_IDE_BUS 2
 
+typedef struct rom_reset_data {
+    uint8_t *data;
+    target_phys_addr_t addr;
+    unsigned size;
+} RomResetData;
+
+static void option_rom_reset(void *_rrd)
+{
+    RomResetData *rrd = _rrd;
+
+    cpu_physical_memory_write_rom(rrd->addr, rrd->data, rrd->size);
+}
+
+static void option_rom_setup_reset(target_phys_addr_t addr, unsigned size)
+{
+    RomResetData *rrd = qemu_malloc(sizeof *rrd);
+
+    rrd->data = qemu_malloc(size);
+    cpu_physical_memory_read(addr, rrd->data, size);
+    rrd->addr = addr;
+    rrd->size = size;
+    qemu_register_reset(option_rom_reset, rrd);
+}
+
 extern uint8_t *acpi_tables;
 extern size_t acpi_tables_len;
 
@@ -767,30 +791,6 @@ static void pc_init_ne2k_isa(NICInfo *nd
     nb_ne2k++;
 }
 
-typedef struct rom_reset_data {
-    uint8_t *data;
-    target_phys_addr_t addr;
-    unsigned size;
-} RomResetData;
-
-static void option_rom_reset(void *_rrd)
-{
-    RomResetData *rrd = _rrd;
-
-    cpu_physical_memory_write_rom(rrd->addr, rrd->data, rrd->size);
-}
-
-static void option_rom_setup_reset(target_phys_addr_t addr, unsigned size)
-{
-    RomResetData *rrd = qemu_malloc(sizeof *rrd);
-
-    rrd->data = qemu_malloc(size);
-    cpu_physical_memory_read(addr, rrd->data, size);
-    rrd->addr = addr;
-    rrd->size = size;
-    qemu_register_reset(option_rom_reset, rrd);
-}
-
 CPUState *pc_new_cpu(int cpu, const char *cpu_model, int pci_enabled)
 {
         CPUState *env = cpu_init(cpu_model);


Index: qemu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qemu/F-11/qemu.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- qemu.spec	12 May 2009 13:34:16 -0000	1.88
+++ qemu.spec	12 May 2009 14:15:52 -0000	1.89
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.10
-Release: 17%{?dist}
+Release: 18%{?dist}
 # I have mistakenly thought the revision name would be 1.0.
 # So 0.10 series get Epoch = 1
 Epoch: 2
@@ -37,7 +37,8 @@ Patch14: qemu-bios-bigger-roms.patch
 Patch15: qemu-fix-display-breakage.patch
 Patch16: qemu-fix-qcow2-2TB.patch
 Patch17: qemu-fix-qcow2-corruption.patch
-Patch18: qemu-fix-load-linux.patch
+Patch18: qemu-move-option-rom-reset-definition.patch
+Patch19: qemu-fix-load-linux.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -236,6 +237,7 @@ such as kvmtrace and kvm_stat.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 # systems like rhel build system does not have a recent enough linker so
@@ -480,6 +482,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Tue May 12 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-18
+- move option rom setup function to the beginning of the file. This
+  avoids static vs non-static issues, and is the way upstream does
+
 * Tue May 12 2009 Glauber Costa <glommer at redhat.com> - 2:0.10-17
 - fix reboot with -kernel parameter