qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Cc: "Aurelien Jarno" <aurelien@aurel32.net>,
	"Aleksandar Markovic" <amarkovic@wavecomp.com>,
	"Aleksandar Rikalo" <arikalo@wavecomp.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [Qemu-devel] [PATCH 2/5] hw/mips/malta: Remove fl_sectors variable (used one single time)
Date: Tue,  5 Mar 2019 17:28:26 +0100	[thread overview]
Message-ID: <20190305162829.20079-3-philmd@redhat.com> (raw)
In-Reply-To: <20190305162829.20079-1-philmd@redhat.com>

fl_sectors is only used in one place, with bios_size = FLASH_SIZE.
Use it directly and remove the variable.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/mips/mips_malta.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index b4cd8f02ad..00e5aac98b 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -1210,7 +1210,6 @@ void mips_malta_init(MachineState *machine)
     DriveInfo *dinfo;
     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
     int fl_idx = 0;
-    int fl_sectors = bios_size >> 16;
     int be;
 
     DeviceState *dev = qdev_create(NULL, TYPE_MIPS_MALTA);
@@ -1279,7 +1278,7 @@ void mips_malta_init(MachineState *machine)
     fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
                                BIOS_SIZE,
                                pflash_blk,
-                               65536, fl_sectors,
+                               65536, FLASH_SIZE >> 16,
                                4, 0x0000, 0x0000, 0x0000, 0x0000, be);
     bios = pflash_cfi01_get_memory(fl);
     fl_idx++;
-- 
2.20.1

  parent reply	other threads:[~2019-03-05 16:28 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-05 16:28 [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size Philippe Mathieu-Daudé
2019-03-05 16:28 ` [Qemu-devel] [PATCH 1/5] hw/mips/malta: Fix the DEBUG_BOARD_INIT code Philippe Mathieu-Daudé
2019-03-06 13:20   ` Markus Armbruster
2019-03-07  7:06   ` Markus Armbruster
2019-03-07 13:48     ` Aleksandar Markovic
2019-03-07 13:53       ` Aleksandar Markovic
2019-03-05 16:28 ` Philippe Mathieu-Daudé [this message]
2019-03-05 16:28 ` [Qemu-devel] [PATCH 3/5] hw/mips/malta: Restrict 'bios_size' variable scope Philippe Mathieu-Daudé
2019-03-05 16:28 ` [Qemu-devel] [PATCH 4/5] hw/mips/malta: Only accept 'monitor' pflash of 4MiB Philippe Mathieu-Daudé
2019-03-05 23:53   ` Richard Henderson
2019-03-06  8:01     ` Philippe Mathieu-Daudé
2019-03-06 13:31   ` Markus Armbruster
2019-03-05 16:28 ` [Qemu-devel] [PATCH 5/5] mips_malta: Clean up definition of flash memory size somewhat Philippe Mathieu-Daudé
2019-03-05 16:34   ` Philippe Mathieu-Daudé
2019-03-05 23:54 ` [Qemu-devel] [PATCH 0/5] mips_malta: Clean up definition of flash memory size Richard Henderson
2019-03-06  6:38 ` Aleksandar Markovic
2019-03-06  9:21   ` Philippe Mathieu-Daudé
2019-03-06 13:33     ` Markus Armbruster
2019-03-06 13:07 ` Markus Armbruster
2019-03-06 13:18   ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190305162829.20079-3-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=amarkovic@wavecomp.com \
    --cc=arikalo@wavecomp.com \
    --cc=armbru@redhat.com \
    --cc=aurelien@aurel32.net \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).