From: Aleksandar Markovic <aleksandar.markovic@rt-rk.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, amarkovic@wavecomp.com
Subject: [Qemu-devel] [PULL 09/11] target/mips: Style improvements in mips_mipssim.c
Date: Tue, 20 Aug 2019 08:38:01 +0200 [thread overview]
Message-ID: <1566283083-21838-10-git-send-email-aleksandar.markovic@rt-rk.com> (raw)
In-Reply-To: <1566283083-21838-1-git-send-email-aleksandar.markovic@rt-rk.com>
From: Aleksandar Markovic <amarkovic@wavecomp.com>
Fixes mostly errors and warnings reported by 'checkpatch.pl -f'.
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>
Message-Id: <1566216496-17375-17-git-send-email-aleksandar.markovic@rt-rk.com>
---
hw/mips/mips_mipssim.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 1ca7e90..282bbec 100644
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -3,7 +3,7 @@
*
* Emulates a very simple machine model similar to the one used by the
* proprietary MIPS emulator.
- *
+ *
* Copyright (c) 2007 Thiemo Seufer
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -76,8 +76,9 @@ static int64_t load_kernel(void)
(uint64_t *)&kernel_high, big_endian,
EM_MIPS, 1, 0);
if (kernel_size >= 0) {
- if ((entry & ~0x7fffffffULL) == 0x80000000)
+ if ((entry & ~0x7fffffffULL) == 0x80000000) {
entry = (int32_t)entry;
+ }
} else {
error_report("could not load kernel '%s': %s",
loaderparams.kernel_filename,
@@ -89,9 +90,10 @@ static int64_t load_kernel(void)
initrd_size = 0;
initrd_offset = 0;
if (loaderparams.initrd_filename) {
- initrd_size = get_image_size (loaderparams.initrd_filename);
+ initrd_size = get_image_size(loaderparams.initrd_filename);
if (initrd_size > 0) {
- initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) & INITRD_PAGE_MASK;
+ initrd_offset = (kernel_high + ~INITRD_PAGE_MASK) &
+ INITRD_PAGE_MASK;
if (initrd_offset + initrd_size > loaderparams.ram_size) {
error_report("memory too small for initial ram disk '%s'",
loaderparams.initrd_filename);
@@ -175,8 +177,9 @@ mips_mipssim_init(MachineState *machine)
/* Map the BIOS / boot exception handler. */
memory_region_add_subregion(address_space_mem, 0x1fc00000LL, bios);
/* Load a BIOS / boot exception handler image. */
- if (bios_name == NULL)
+ if (bios_name == NULL) {
bios_name = BIOS_FILENAME;
+ }
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) {
bios_size = load_image_targphys(filename, 0x1fc00000LL, BIOS_SIZE);
@@ -212,8 +215,10 @@ mips_mipssim_init(MachineState *machine)
get_system_io(), 0, 0x00010000);
memory_region_add_subregion(get_system_memory(), 0x1fd00000, isa);
- /* A single 16450 sits at offset 0x3f8. It is attached to
- MIPS CPU INT2, which is interrupt 4. */
+ /*
+ * A single 16450 sits at offset 0x3f8. It is attached to
+ * MIPS CPU INT2, which is interrupt 4.
+ */
if (serial_hd(0))
serial_init(0x3f8, env->irq[4], 115200, serial_hd(0),
get_system_io());
--
2.7.4
next prev parent reply other threads:[~2019-08-20 6:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-20 6:37 [Qemu-devel] [PULL 00/11] MIPS queue for August 20th, 2019 Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 01/11] target/mips: Style improvements in cp0_timer.c Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 02/11] target/mips: Style improvements in cpu.c Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 03/11] target/mips: Style improvements in machine.c Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 04/11] target/mips: Style improvements in translate.c Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 05/11] target/mips: Style improvements in cps.c Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 06/11] target/mips: Style improvements in mips_fulong2e.c Aleksandar Markovic
2019-08-20 6:37 ` [Qemu-devel] [PULL 07/11] target/mips: Style improvements in mips_int.c Aleksandar Markovic
2019-08-20 6:38 ` [Qemu-devel] [PULL 08/11] target/mips: Style improvements in mips_malta.c Aleksandar Markovic
2019-08-20 6:38 ` Aleksandar Markovic [this message]
2019-08-20 6:38 ` [Qemu-devel] [PULL 10/11] target/mips: tests/tcg: Add optional printing of more detailed failure info Aleksandar Markovic
2019-08-20 6:38 ` [Qemu-devel] [PULL 11/11] target/mips: tests/tcg: Fix target configurations for MSA tests Aleksandar Markovic
2019-08-20 13:14 ` [Qemu-devel] [PULL 00/11] MIPS queue for August 20th, 2019 Peter Maydell
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=1566283083-21838-10-git-send-email-aleksandar.markovic@rt-rk.com \
--to=aleksandar.markovic@rt-rk.com \
--cc=amarkovic@wavecomp.com \
--cc=peter.maydell@linaro.org \
--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).