Message ID | 20180415234307.28132-6-f4bug@amsat.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YXxTTGn4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40PSmT3skFz9s0b for <incoming@patchwork.ozlabs.org>; Mon, 16 Apr 2018 09:44:57 +1000 (AEST) Received: from localhost ([::1]:52663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1f7rKJ-0004tK-Iz for incoming@patchwork.ozlabs.org; Sun, 15 Apr 2018 19:44:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1f7rJ2-0004Mw-5T for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1f7rJ1-0000Bi-7I for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:36 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:38590) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <philippe.mathieu.daude@gmail.com>) id 1f7rIz-00008a-5I; Sun, 15 Apr 2018 19:43:33 -0400 Received: by mail-qt0-x241.google.com with SMTP id z23so13561766qti.5; Sun, 15 Apr 2018 16:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QhY06qKl3znwZvKZLIq0uZmF4mSh89y+JxRVcxXXcaE=; b=YXxTTGn4oT+46bXPEUs3q5N50FR3rfrwXAYetRWagYJxB+nctE194tcyRwOEcZ8OnQ 8HlD7wOCY+iKLKhGZJhsthRMENBCFm9gMsSAYEhWKwlDT1bu0xzWhzQkwq5uzkBbEXdF 0hxp3Y1RqjRaZe1r04EJnGsZNO/ITAyb/NUj0BFHX/TGnLCHETBLIYvvZStRdrCOJ+sv o1c0GBT94nSVghtW6a+oJq0oSFI6tjF52RqPy6nhgHj4XjDvXJSjKBhMpSq8xbxOL3CY F/t84BfA4S6TSAJr7+W/iME91/OS/d3D8Uhr9UIzDlwTFpoJ++AIIHpaMUz/LPxzZvKr K+WQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QhY06qKl3znwZvKZLIq0uZmF4mSh89y+JxRVcxXXcaE=; b=MQxW1PWs6f7u+S/aXPin5fHLWc/jAvEl+wvCR1Nl9qOj1SwqjCJEOja1u2oVu7JLoS rkzp5Ev2le7ozBM/+bMWqSLcm7cpiAygkowoLAkJFN2Y0LANfIZi+wgkEpMpwhc9GjxS fZXNNdbzG+3EsINjlzqnh0RHFwRXIK0Usv7xQs+WzMxSOng3i/t+ZZc1vZUjmUt9oIK7 4T4TNz73Z3Qr5/VzswDxSf+sQsJe28E8eWqKYYzVsCN0kpdtHxkUuCeq12Sws0KTUV0z UumvBgZjLH5PwQvLhjUVRzmZI2jMyde+gN9Gj2wS1kQt3xmBvrjtCVPhOE75A310hg+v TL9A== X-Gm-Message-State: ALQs6tBRsKn437kGI0zJ+FhxqJFfxKAfI4en3e/j+NyZNY4LS1VuAglf LCHn9X1VtjGwrdttVbLDwHunGBk1 X-Google-Smtp-Source: AIpwx49nXR+d6X8ksrs8nXY9GdjxtDeofEyJvJ4+Xju0V591gyDsXqOWYGmtOGotb9cf3doN6CDCAQ== X-Received: by 10.200.47.180 with SMTP id l49mr465993qta.195.1523835812542; Sun, 15 Apr 2018 16:43:32 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d1sm1081394qtk.57.2018.04.15.16.43.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:43:32 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org> To: qemu-trivial@nongnu.org, Thomas Huth <thuth@redhat.com> Date: Sun, 15 Apr 2018 20:42:31 -0300 Message-Id: <20180415234307.28132-6-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415234307.28132-1-f4bug@amsat.org> References: <20180415234307.28132-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v3 05/41] hw/mips/r4k: Constify params_size X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Yongbok Kim <yongbok.kim@mips.com>, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= <f4bug@amsat.org>, Aurelien Jarno <aurelien@aurel32.net>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
hw: Use the BYTE-based definitions when useful
|
expand
|
diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index aeadc4a340..c26a44da06 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -80,8 +80,9 @@ typedef struct ResetData { static int64_t load_kernel(void) { + const size_t params_size = 264; int64_t entry, kernel_high; - long kernel_size, initrd_size, params_size; + long kernel_size, initrd_size; ram_addr_t initrd_offset; uint32_t *params_buf; int big_endian; @@ -129,7 +130,6 @@ static int64_t load_kernel(void) } /* Store command line. */ - params_size = 264; params_buf = g_malloc(params_size); params_buf[0] = tswap32(ram_size); @@ -144,7 +144,7 @@ static int64_t load_kernel(void) } rom_add_blob_fixed("params", params_buf, params_size, - (16 << 20) - 264); + (16 << 20) - params_size); g_free(params_buf); return entry;
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/mips/mips_r4k.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)