qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: qemu-s390x@nongnu.org, Cornelia Huck <cohuck@redhat.com>,
	Eric Farman <farman@linux.ibm.com>
Subject: [PULL 02/18] pc-bios/s390-ccw: Add a proper prototype for main()
Date: Thu,  7 Jul 2022 09:54:10 +0200	[thread overview]
Message-ID: <20220707075426.1163210-3-thuth@redhat.com> (raw)
In-Reply-To: <20220707075426.1163210-1-thuth@redhat.com>

Older versions of Clang complain if there is no prototype for main().
Add one, and while we're at it, make sure that we use the same type
for main.c and netmain.c - since the return value does not matter,
declare the return type of main() as "void".

Message-Id: <20220704111903.62400-2-thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 pc-bios/s390-ccw/s390-ccw.h | 1 +
 pc-bios/s390-ccw/main.c     | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index 79db69ff54..b88e0550ab 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -57,6 +57,7 @@ void write_subsystem_identification(void);
 void write_iplb_location(void);
 extern char stack[PAGE_SIZE * 8] __attribute__((__aligned__(PAGE_SIZE)));
 unsigned int get_loadparm_index(void);
+void main(void);
 
 /* sclp.c */
 void sclp_print(const char *string);
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 5d2b7ba94d..835341457d 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -281,7 +281,7 @@ static void probe_boot_device(void)
     sclp_print("Could not find a suitable boot device (none specified)\n");
 }
 
-int main(void)
+void main(void)
 {
     sclp_setup();
     css_setup();
@@ -294,5 +294,4 @@ int main(void)
     }
 
     panic("Failed to load OS from hard disk\n");
-    return 0; /* make compiler happy */
 }
-- 
2.31.1



  parent reply	other threads:[~2022-07-07  7:57 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-07  7:54 [PULL 00/18] s390x updates Thomas Huth
2022-07-07  7:54 ` [PULL 01/18] target/s390x/tcg: SPX: check validity of new prefix Thomas Huth
2022-07-07  7:54 ` Thomas Huth [this message]
2022-07-07  7:54 ` [PULL 03/18] pc-bios/s390-ccw/virtio: Introduce a macro for the DASD block size Thomas Huth
2022-07-07  7:54 ` [PULL 04/18] pc-bios/s390-ccw/bootmap: Improve the guessing logic in zipl_load_vblk() Thomas Huth
2022-07-07  7:54 ` [PULL 05/18] pc-bios/s390-ccw/virtio-blkdev: Simplify/fix virtio_ipl_disk_is_valid() Thomas Huth
2022-07-07  7:54 ` [PULL 06/18] pc-bios/s390-ccw/virtio-blkdev: Remove virtio_assume_scsi() Thomas Huth
2022-07-07  7:54 ` [PULL 07/18] pc-bios/s390-ccw/virtio: Set missing status bits while initializing Thomas Huth
2022-07-07  7:54 ` [PULL 08/18] pc-bios/s390-ccw/virtio: Read device config after feature negotiation Thomas Huth
2022-07-07  7:54 ` [PULL 09/18] pc-bios/s390-ccw/virtio: Beautify the code for reading virtqueue configuration Thomas Huth
2022-07-07  7:54 ` [PULL 10/18] pc-bios/s390-ccw: Split virtio-scsi code from virtio_blk_setup_device() Thomas Huth
2022-07-07  7:54 ` [PULL 11/18] pc-bios/s390-ccw/virtio-blkdev: Request the right feature bits Thomas Huth
2022-07-07  7:54 ` [PULL 12/18] pc-bios/s390-ccw/virtio: Remove "extern" keyword from prototypes Thomas Huth
2022-07-07  7:54 ` [PULL 13/18] pc-bios/s390-ccw/netboot.mak: Ignore Clang's warnings about GNU extensions Thomas Huth
2022-07-07  7:54 ` [PULL 14/18] pc-bios/s390-ccw: Update the s390-ccw bios binaries with the virtio-blk fixes Thomas Huth
2022-07-07  7:54 ` [PULL 15/18] target/s390x: Remove DISAS_GOTO_TB Thomas Huth
2022-07-07  7:54 ` [PULL 16/18] target/s390x: Remove DISAS_PC_STALE Thomas Huth
2022-07-07  7:54 ` [PULL 17/18] target/s390x: Remove DISAS_PC_STALE_NOCHAIN Thomas Huth
2022-07-07  7:54 ` [PULL 18/18] target/s390x: Exit tb after executing ex_value Thomas Huth
2022-07-08  0:46 ` [PULL 00/18] s390x updates Richard Henderson

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=20220707075426.1163210-3-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=cohuck@redhat.com \
    --cc=farman@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.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).