[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Patch mismerge (was: [PATCH] multiboot: Use signed type for
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] Patch mismerge (was: [PATCH] multiboot: Use signed type for negative error numbers) |
Date: |
Fri, 04 Dec 2009 10:54:53 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.4pre) Gecko/20091014 Fedora/3.0-2.8.b4.fc11 Thunderbird/3.0b4 |
Hi Anthony,
the description of this patch made it into commit 5f370b1, but the
content of this commit is obviously nonsense (adds only an empty line).
It's still uint32_t in current master. Can you take the patch into your
queue once again? It should still apply cleanly.
Kevin
Am 18.11.2009 12:15, schrieb Kevin Wolf:
> In mb_mod_length a return value is stored that is negative in error case. With
> an unsigned type the check goes wrong.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> hw/pc.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/hw/pc.c b/hw/pc.c
> index 7c791c4..cb3b6c9 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -619,7 +619,7 @@ static int load_multiboot(void *fw_cfg,
> uint32_t mb_mod_info = 0x100;
> uint32_t mb_mod_cmdline = 0x300;
> uint32_t mb_mod_start = mh_load_addr;
> - uint32_t mb_mod_length = mb_kernel_size;
> + int mb_mod_length = mb_kernel_size;
> char *next_initrd;
> char *next_space;
> int mb_mod_count = 0;
- [Qemu-devel] Patch mismerge (was: [PATCH] multiboot: Use signed type for negative error numbers),
Kevin Wolf <=