* [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6
@ 2010-05-20 6:14 Eduard - Gabriel Munteanu
2010-05-20 8:08 ` Isaku Yamahata
2010-05-20 20:38 ` [Qemu-devel] " Blue Swirl
0 siblings, 2 replies; 3+ messages in thread
From: Eduard - Gabriel Munteanu @ 2010-05-20 6:14 UTC (permalink / raw)
To: blauwirbel
Cc: kvm, joro, qemu-devel, yamahata, kraxel,
Eduard - Gabriel Munteanu
Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a
'void **' and passing it around in different ways.
Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
---
hw/pc.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/pc.c b/hw/pc.c
index fee08c9..4a4a706 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
ram_addr_t ram_addr, bios_offset, option_rom_offset;
ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
int bios_size, isa_bios_size;
- void **fw_cfg;
+ void *fw_cfg;
if (ram_size >= 0xe0000000 ) {
above_4g_mem_size = ram_size - 0xe0000000;
@@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
rom_set_fw(fw_cfg);
if (linux_boot) {
- load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
+ load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
}
for (i = 0; i < nb_option_roms; i++) {
--
1.6.4.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6
2010-05-20 6:14 [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 Eduard - Gabriel Munteanu
@ 2010-05-20 8:08 ` Isaku Yamahata
2010-05-20 20:38 ` [Qemu-devel] " Blue Swirl
1 sibling, 0 replies; 3+ messages in thread
From: Isaku Yamahata @ 2010-05-20 8:08 UTC (permalink / raw)
To: Eduard - Gabriel Munteanu; +Cc: blauwirbel, joro, qemu-devel, kvm, kraxel
Thank you for fixing it. Probably I was too in hurry when rebasing the patches.
Acked-by: Isaku Yamahata <yamahata@valinux.co.jp>
On Thu, May 20, 2010 at 09:14:04AM +0300, Eduard - Gabriel Munteanu wrote:
> Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a
> 'void **' and passing it around in different ways.
>
> Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
> ---
> hw/pc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index fee08c9..4a4a706 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
> ram_addr_t ram_addr, bios_offset, option_rom_offset;
> ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
> int bios_size, isa_bios_size;
> - void **fw_cfg;
> + void *fw_cfg;
>
> if (ram_size >= 0xe0000000 ) {
> above_4g_mem_size = ram_size - 0xe0000000;
> @@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
> rom_set_fw(fw_cfg);
>
> if (linux_boot) {
> - load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
> + load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
> }
>
> for (i = 0; i < nb_option_roms; i++) {
> --
> 1.6.4.4
>
>
--
yamahata
^ permalink raw reply [flat|nested] 3+ messages in thread* [Qemu-devel] Re: [PATCH] pc: fix segfault introduced by 3d53f5c36ff6
2010-05-20 6:14 [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 Eduard - Gabriel Munteanu
2010-05-20 8:08 ` Isaku Yamahata
@ 2010-05-20 20:38 ` Blue Swirl
1 sibling, 0 replies; 3+ messages in thread
From: Blue Swirl @ 2010-05-20 20:38 UTC (permalink / raw)
To: Eduard - Gabriel Munteanu; +Cc: yamahata, joro, kraxel, kvm, qemu-devel
Good catch. Thanks, applied.
On Thu, May 20, 2010 at 6:14 AM, Eduard - Gabriel Munteanu
<eduard.munteanu@linux360.ro> wrote:
> Commit 3d53f5c36ff6 introduced a segfault by erroneously making fw_cfg a
> 'void **' and passing it around in different ways.
>
> Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
> ---
> hw/pc.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index fee08c9..4a4a706 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -822,7 +822,7 @@ void pc_memory_init(ram_addr_t ram_size,
> ram_addr_t ram_addr, bios_offset, option_rom_offset;
> ram_addr_t below_4g_mem_size, above_4g_mem_size = 0;
> int bios_size, isa_bios_size;
> - void **fw_cfg;
> + void *fw_cfg;
>
> if (ram_size >= 0xe0000000 ) {
> above_4g_mem_size = ram_size - 0xe0000000;
> @@ -905,7 +905,7 @@ void pc_memory_init(ram_addr_t ram_size,
> rom_set_fw(fw_cfg);
>
> if (linux_boot) {
> - load_linux(*fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
> + load_linux(fw_cfg, kernel_filename, initrd_filename, kernel_cmdline, below_4g_mem_size);
> }
>
> for (i = 0; i < nb_option_roms; i++) {
> --
> 1.6.4.4
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-20 20:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-20 6:14 [Qemu-devel] [PATCH] pc: fix segfault introduced by 3d53f5c36ff6 Eduard - Gabriel Munteanu
2010-05-20 8:08 ` Isaku Yamahata
2010-05-20 20:38 ` [Qemu-devel] " Blue Swirl
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).