From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NGUtT-0005zB-7v
	for qemu-devel@nongnu.org; Fri, 04 Dec 2009 04:56:07 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NGUtO-0005su-8u
	for qemu-devel@nongnu.org; Fri, 04 Dec 2009 04:56:06 -0500
Received: from [199.232.76.173] (port=60236 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NGUtO-0005sg-45
	for qemu-devel@nongnu.org; Fri, 04 Dec 2009 04:56:02 -0500
Received: from mx1.redhat.com ([209.132.183.28]:8426)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <kwolf@redhat.com>) id 1NGUtN-0004jL-KQ
	for qemu-devel@nongnu.org; Fri, 04 Dec 2009 04:56:01 -0500
Message-ID: <4B18DC6D.1050100@redhat.com>
Date: Fri, 04 Dec 2009 10:54:53 +0100
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
References: <1258542921-776-1-git-send-email-kwolf@redhat.com>
In-Reply-To: <1258542921-776-1-git-send-email-kwolf@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Patch mismerge (was: [PATCH] multiboot: Use signed
 type for negative error	numbers)
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org

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 <kwolf@redhat.com>
> ---
>  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;