From: Janosch Frank <frankja@linux.ibm.com>
To: Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org
Cc: borntraeger@de.ibm.com, qemu-s390x@nongnu.org, cohuck@redhat.com,
david@redhat.com
Subject: Re: [PATCH v2 2/9] pc-bios: s390x: Consolidate timing functions into time.h
Date: Mon, 25 May 2020 14:20:22 +0200 [thread overview]
Message-ID: <16ca3fa3-0007-f61a-5e3f-17e1e4a4863d@linux.ibm.com> (raw)
In-Reply-To: <21da6890-0951-5488-feaa-74a9a2afe918@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 2004 bytes --]
On 5/20/20 9:53 PM, Thomas Huth wrote:
> On 14/05/2020 14.37, Janosch Frank wrote:
>> Let's consolidate timing related functions into one header.
>>
>> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
>> ---
>> pc-bios/s390-ccw/menu.c | 1 +
>> pc-bios/s390-ccw/netmain.c | 15 +++----------
>> pc-bios/s390-ccw/s390-ccw.h | 18 ----------------
>> pc-bios/s390-ccw/time.h | 39 ++++++++++++++++++++++++++++++++++
>> pc-bios/s390-ccw/virtio-net.c | 1 +
>> pc-bios/s390-ccw/virtio-scsi.c | 1 +
>> pc-bios/s390-ccw/virtio.c | 18 +++-------------
>> 7 files changed, 48 insertions(+), 45 deletions(-)
>> create mode 100644 pc-bios/s390-ccw/time.h
>>
>> diff --git a/pc-bios/s390-ccw/menu.c b/pc-bios/s390-ccw/menu.c
>> index ce3815b201..7925c33248 100644
>> --- a/pc-bios/s390-ccw/menu.c
>> +++ b/pc-bios/s390-ccw/menu.c
>> @@ -12,6 +12,7 @@
>> #include "libc.h"
>> #include "s390-ccw.h"
>> #include "sclp.h"
>> +#include "time.h"
>>
>> #define KEYCODE_NO_INP '\0'
>> #define KEYCODE_ESCAPE '\033'
>> diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
>> index 309ffa30d9..73def8de4f 100644
>> --- a/pc-bios/s390-ccw/netmain.c
>> +++ b/pc-bios/s390-ccw/netmain.c
>> @@ -35,6 +35,7 @@
>> #include "s390-ccw.h"
>> #include "cio.h"
>> #include "virtio.h"
>> +#include "time.h"
>
> netmain.c already contains a #include <time.h> which pulls in the header
> with the same name from libnet in SLOF ... so I wonder why you don't run
> into trouble here, I'd expect that your local time.h now rather gets
> included twice. Did you rebuild s390-netboot.img without problems?
> Anyway, time.h is maybe not the best name for a new header here...
>
> Thomas
>
That doesn't seem to be a problem when compiling.
However we could just move all of the function into helper.h as it's
really not a lot of code especially after splitting it up into helper.h
and time.h.
Or we could use s390-time.h
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-05-25 12:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-14 12:37 [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1 Janosch Frank
2020-05-14 12:37 ` [PATCH v2 1/9] pc-bios: s390x: cio.c cleanup and compile fix Janosch Frank
2020-05-18 11:52 ` David Hildenbrand
2020-05-18 12:02 ` Janosch Frank
2020-05-20 19:37 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 2/9] pc-bios: s390x: Consolidate timing functions into time.h Janosch Frank
2020-05-18 12:01 ` David Hildenbrand
2020-05-18 12:09 ` Janosch Frank
2020-05-18 12:45 ` David Hildenbrand
2020-05-20 19:53 ` Thomas Huth
2020-05-25 12:20 ` Janosch Frank [this message]
2020-05-14 12:37 ` [PATCH v2 3/9] pc-bios: s390x: Get rid of magic offsets into the lowcore Janosch Frank
2020-05-18 12:46 ` David Hildenbrand
2020-05-20 19:57 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 4/9] pc-bios: s390x: Rename and use PSW_MASK_ZMODE constant Janosch Frank
2020-05-21 5:44 ` Thomas Huth
2020-05-21 5:47 ` Thomas Huth
2020-05-25 12:03 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 5/9] pc-bios: s390x: Use PSW masks where possible Janosch Frank
2020-05-21 5:50 ` Thomas Huth
2020-05-25 12:08 ` Janosch Frank
2020-05-14 12:37 ` [PATCH v2 6/9] pc-bios: s390x: Move panic() into header and add infinite loop Janosch Frank
2020-05-21 5:53 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 7/9] pc-bios: s390x: Use ebcdic2ascii table Janosch Frank
2020-05-21 5:56 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 8/9] pc-bios: s390x: Replace 0x00 with 0x0 or 0 Janosch Frank
2020-05-18 12:47 ` David Hildenbrand
2020-05-21 6:01 ` Thomas Huth
2020-05-14 12:37 ` [PATCH v2 9/9] pc-bios: s390x: Make u32 ptr check explicit Janosch Frank
2020-05-21 6:03 ` Thomas Huth
2020-05-14 18:43 ` [PATCH v2 0/9] pc-bios: s390x: Cleanup part 1 no-reply
2020-05-20 11:52 ` Cornelia Huck
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=16ca3fa3-0007-f61a-5e3f-17e1e4a4863d@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/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).