Re: [PATCH v3 1/7] s390-ccw: Getting rid of ulong
On 29/6/23 12:48, Thomas Huth wrote: From: Juan Quintela Any good reason why this still exist? I can understand u* and __u* to be linux kernel like, but ulong? Signed-off-by: Juan Quintela Message-Id: <20230510143925.4094-4-quint...@redhat.com> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/helper.h| 2 +- pc-bios/s390-ccw/s390-ccw.h | 7 +++ pc-bios/s390-ccw/virtio-scsi.h | 2 +- pc-bios/s390-ccw/virtio.h| 4 ++-- pc-bios/s390-ccw/virtio-blkdev.c | 12 ++-- pc-bios/s390-ccw/virtio-scsi.c | 4 ++-- pc-bios/s390-ccw/virtio.c| 12 ++-- 7 files changed, 21 insertions(+), 22 deletions(-) Reviewed-by: Philippe Mathieu-Daudé
Re: [PATCH v3 1/7] s390-ccw: Getting rid of ulong
On Thu, 29 Jun 2023 12:48:15 +0200
Thomas Huth wrote:
> From: Juan Quintela
>
> Any good reason why this still exist?
> I can understand u* and __u* to be linux kernel like, but ulong?
shorter code? ¯\_(ツ)_/¯
>
> Signed-off-by: Juan Quintela
> Message-Id: <20230510143925.4094-4-quint...@redhat.com>
> Reviewed-by: Thomas Huth
Reviewed-by: Claudio Imbrenda
> Signed-off-by: Thomas Huth
> ---
> pc-bios/s390-ccw/helper.h| 2 +-
> pc-bios/s390-ccw/s390-ccw.h | 7 +++
> pc-bios/s390-ccw/virtio-scsi.h | 2 +-
> pc-bios/s390-ccw/virtio.h| 4 ++--
> pc-bios/s390-ccw/virtio-blkdev.c | 12 ++--
> pc-bios/s390-ccw/virtio-scsi.c | 4 ++--
> pc-bios/s390-ccw/virtio.c| 12 ++--
> 7 files changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h
> index 3d0731c4c6..8e3dfcb6d6 100644
> --- a/pc-bios/s390-ccw/helper.h
> +++ b/pc-bios/s390-ccw/helper.h
> @@ -38,7 +38,7 @@ static inline void yield(void)
>
> static inline void sleep(unsigned int seconds)
> {
> -ulong target = get_time_seconds() + seconds;
> +unsigned long target = get_time_seconds() + seconds;
>
> while (get_time_seconds() < target) {
> yield();
> diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
> index b88e0550ab..f849fba74b 100644
> --- a/pc-bios/s390-ccw/s390-ccw.h
> +++ b/pc-bios/s390-ccw/s390-ccw.h
> @@ -17,7 +17,6 @@ typedef unsigned char u8;
> typedef unsigned short u16;
> typedef unsigned int u32;
> typedef unsigned long long u64;
> -typedef unsigned long ulong;
> typedef unsigned char __u8;
> typedef unsigned short __u16;
> typedef unsigned int __u32;
> @@ -67,11 +66,11 @@ void sclp_get_loadparm_ascii(char *loadparm);
> int sclp_read(char *str, size_t count);
>
> /* virtio.c */
> -unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
> - ulong subchan_id, void *load_addr);
> +unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long
> rec_list2,
> + unsigned long subchan_id, void *load_addr);
> bool virtio_is_supported(SubChannelId schid);
> int virtio_blk_setup_device(SubChannelId schid);
> -int virtio_read(ulong sector, void *load_addr);
> +int virtio_read(unsigned long sector, void *load_addr);
>
> /* bootmap.c */
> void zipl_load(void);
> diff --git a/pc-bios/s390-ccw/virtio-scsi.h b/pc-bios/s390-ccw/virtio-scsi.h
> index e6b6cd4815..c5612e16a2 100644
> --- a/pc-bios/s390-ccw/virtio-scsi.h
> +++ b/pc-bios/s390-ccw/virtio-scsi.h
> @@ -68,7 +68,7 @@ static inline bool virtio_scsi_response_ok(const
> VirtioScsiCmdResp *r)
> }
>
> int virtio_scsi_read_many(VDev *vdev,
> - ulong sector, void *load_addr, int sec_num);
> + unsigned long sector, void *load_addr, int
> sec_num);
> int virtio_scsi_setup_device(SubChannelId schid);
>
> #endif /* VIRTIO_SCSI_H */
> diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
> index e657d381ec..85bd9d1695 100644
> --- a/pc-bios/s390-ccw/virtio.h
> +++ b/pc-bios/s390-ccw/virtio.h
> @@ -190,14 +190,14 @@ int virtio_get_block_size(void);
> uint8_t virtio_get_heads(void);
> uint8_t virtio_get_sectors(void);
> uint64_t virtio_get_blocks(void);
> -int virtio_read_many(ulong sector, void *load_addr, int sec_num);
> +int virtio_read_many(unsigned long sector, void *load_addr, int sec_num);
>
> #define VIRTIO_SECTOR_SIZE 512
> #define VIRTIO_ISO_BLOCK_SIZE 2048
> #define VIRTIO_SCSI_BLOCK_SIZE 512
> #define VIRTIO_DASD_DEFAULT_BLOCK_SIZE 4096
>
> -static inline ulong virtio_sector_adjust(ulong sector)
> +static inline unsigned long virtio_sector_adjust(unsigned long sector)
> {
> return sector * (virtio_get_block_size() / VIRTIO_SECTOR_SIZE);
> }
> diff --git a/pc-bios/s390-ccw/virtio-blkdev.c
> b/pc-bios/s390-ccw/virtio-blkdev.c
> index 794f99b42c..a81207b52e 100644
> --- a/pc-bios/s390-ccw/virtio-blkdev.c
> +++ b/pc-bios/s390-ccw/virtio-blkdev.c
> @@ -16,7 +16,7 @@
> #define VIRTIO_BLK_F_GEOMETRY (1 << 4)
> #define VIRTIO_BLK_F_BLK_SIZE (1 << 6)
>
> -static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr,
> +static int virtio_blk_read_many(VDev *vdev, unsigned long sector, void
> *load_addr,
> int sec_num)
> {
> VirtioBlkOuthdr out_hdr;
> @@ -49,7 +49,7 @@ static int virtio_blk_read_many(VDev *vdev, ulong sector,
> void *load_addr,
> return status;
> }
>
> -int virtio_read_many(ulong sector, void *load_addr, int sec_num)
> +int virtio_read_many(unsigned long sector, void *load_addr, int sec_num)
> {
> VDev *vdev = virtio_get_device();
>
> @@ -63,14 +63,14 @@ int virtio_read_many(ulong sector, void *load_addr, int
> sec_num)
> return -1;
> }
>
> -unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
> -
[PATCH v3 1/7] s390-ccw: Getting rid of ulong
From: Juan Quintela
Any good reason why this still exist?
I can understand u* and __u* to be linux kernel like, but ulong?
Signed-off-by: Juan Quintela
Message-Id: <20230510143925.4094-4-quint...@redhat.com>
Reviewed-by: Thomas Huth
Signed-off-by: Thomas Huth
---
pc-bios/s390-ccw/helper.h| 2 +-
pc-bios/s390-ccw/s390-ccw.h | 7 +++
pc-bios/s390-ccw/virtio-scsi.h | 2 +-
pc-bios/s390-ccw/virtio.h| 4 ++--
pc-bios/s390-ccw/virtio-blkdev.c | 12 ++--
pc-bios/s390-ccw/virtio-scsi.c | 4 ++--
pc-bios/s390-ccw/virtio.c| 12 ++--
7 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/pc-bios/s390-ccw/helper.h b/pc-bios/s390-ccw/helper.h
index 3d0731c4c6..8e3dfcb6d6 100644
--- a/pc-bios/s390-ccw/helper.h
+++ b/pc-bios/s390-ccw/helper.h
@@ -38,7 +38,7 @@ static inline void yield(void)
static inline void sleep(unsigned int seconds)
{
-ulong target = get_time_seconds() + seconds;
+unsigned long target = get_time_seconds() + seconds;
while (get_time_seconds() < target) {
yield();
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index b88e0550ab..f849fba74b 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -17,7 +17,6 @@ typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned int u32;
typedef unsigned long long u64;
-typedef unsigned long ulong;
typedef unsigned char __u8;
typedef unsigned short __u16;
typedef unsigned int __u32;
@@ -67,11 +66,11 @@ void sclp_get_loadparm_ascii(char *loadparm);
int sclp_read(char *str, size_t count);
/* virtio.c */
-unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
- ulong subchan_id, void *load_addr);
+unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long
rec_list2,
+ unsigned long subchan_id, void *load_addr);
bool virtio_is_supported(SubChannelId schid);
int virtio_blk_setup_device(SubChannelId schid);
-int virtio_read(ulong sector, void *load_addr);
+int virtio_read(unsigned long sector, void *load_addr);
/* bootmap.c */
void zipl_load(void);
diff --git a/pc-bios/s390-ccw/virtio-scsi.h b/pc-bios/s390-ccw/virtio-scsi.h
index e6b6cd4815..c5612e16a2 100644
--- a/pc-bios/s390-ccw/virtio-scsi.h
+++ b/pc-bios/s390-ccw/virtio-scsi.h
@@ -68,7 +68,7 @@ static inline bool virtio_scsi_response_ok(const
VirtioScsiCmdResp *r)
}
int virtio_scsi_read_many(VDev *vdev,
- ulong sector, void *load_addr, int sec_num);
+ unsigned long sector, void *load_addr, int sec_num);
int virtio_scsi_setup_device(SubChannelId schid);
#endif /* VIRTIO_SCSI_H */
diff --git a/pc-bios/s390-ccw/virtio.h b/pc-bios/s390-ccw/virtio.h
index e657d381ec..85bd9d1695 100644
--- a/pc-bios/s390-ccw/virtio.h
+++ b/pc-bios/s390-ccw/virtio.h
@@ -190,14 +190,14 @@ int virtio_get_block_size(void);
uint8_t virtio_get_heads(void);
uint8_t virtio_get_sectors(void);
uint64_t virtio_get_blocks(void);
-int virtio_read_many(ulong sector, void *load_addr, int sec_num);
+int virtio_read_many(unsigned long sector, void *load_addr, int sec_num);
#define VIRTIO_SECTOR_SIZE 512
#define VIRTIO_ISO_BLOCK_SIZE 2048
#define VIRTIO_SCSI_BLOCK_SIZE 512
#define VIRTIO_DASD_DEFAULT_BLOCK_SIZE 4096
-static inline ulong virtio_sector_adjust(ulong sector)
+static inline unsigned long virtio_sector_adjust(unsigned long sector)
{
return sector * (virtio_get_block_size() / VIRTIO_SECTOR_SIZE);
}
diff --git a/pc-bios/s390-ccw/virtio-blkdev.c b/pc-bios/s390-ccw/virtio-blkdev.c
index 794f99b42c..a81207b52e 100644
--- a/pc-bios/s390-ccw/virtio-blkdev.c
+++ b/pc-bios/s390-ccw/virtio-blkdev.c
@@ -16,7 +16,7 @@
#define VIRTIO_BLK_F_GEOMETRY (1 << 4)
#define VIRTIO_BLK_F_BLK_SIZE (1 << 6)
-static int virtio_blk_read_many(VDev *vdev, ulong sector, void *load_addr,
+static int virtio_blk_read_many(VDev *vdev, unsigned long sector, void
*load_addr,
int sec_num)
{
VirtioBlkOuthdr out_hdr;
@@ -49,7 +49,7 @@ static int virtio_blk_read_many(VDev *vdev, ulong sector,
void *load_addr,
return status;
}
-int virtio_read_many(ulong sector, void *load_addr, int sec_num)
+int virtio_read_many(unsigned long sector, void *load_addr, int sec_num)
{
VDev *vdev = virtio_get_device();
@@ -63,14 +63,14 @@ int virtio_read_many(ulong sector, void *load_addr, int
sec_num)
return -1;
}
-unsigned long virtio_load_direct(ulong rec_list1, ulong rec_list2,
- ulong subchan_id, void *load_addr)
+unsigned long virtio_load_direct(unsigned long rec_list1, unsigned long
rec_list2,
+ unsigned long subchan_id, void *load_addr)
{
u8 status;
int sec = rec_list1;
int sec_num = ((rec_list2 >> 32) & 0x) + 1;
int sec_len = rec_list2 >> 48;
-ulong addr =
