Re: [Qemu-devel] [PATCH v3 01/10] pc-bios/s390-ccw: Move libc functions to separate header

[Cornelia Huck]

On Mon, 10 Jul 2017 17:32:31 +0200
Thomas Huth <address@hidden> wrote:

> The upcoming netboot code will use the libc from SLOF. To be able
> to still use s390-ccw.h there, the libc related functions in this
> header have to be moved to a different location.
> And while we're at it, remove the duplicate memcpy() function from
> sclp.c.
> 
> Reviewed-by: Christian Borntraeger <address@hidden>
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>  pc-bios/s390-ccw/bootmap.c     |  1 +
>  pc-bios/s390-ccw/libc.h        | 45 
> ++++++++++++++++++++++++++++++++++++++++++
>  pc-bios/s390-ccw/main.c        |  1 +
>  pc-bios/s390-ccw/s390-ccw.h    | 29 ---------------------------
>  pc-bios/s390-ccw/sclp.c        | 10 ++--------
>  pc-bios/s390-ccw/virtio-scsi.c |  1 +
>  pc-bios/s390-ccw/virtio.c      |  1 +
>  7 files changed, 51 insertions(+), 37 deletions(-)
>  create mode 100644 pc-bios/s390-ccw/libc.h
> 

> diff --git a/pc-bios/s390-ccw/libc.h b/pc-bios/s390-ccw/libc.h
> new file mode 100644
> index 0000000..6397d67
> --- /dev/null
> +++ b/pc-bios/s390-ccw/libc.h
> @@ -0,0 +1,45 @@
> +/*
> + * libc-style definitions and functions
> + *
> + * This code is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + */
> +
> +#ifndef S390_CCW_LIBC_H
> +#define S390_CCW_LIBC_H
> +
> +typedef long               size_t;
> +typedef int                bool;
> +typedef unsigned char      uint8_t;
> +typedef unsigned short     uint16_t;
> +typedef unsigned int       uint32_t;
> +typedef unsigned long long uint64_t;
> +
> +static inline void *memset(void *s, int c, size_t n)

This one uses n...

> +{
> +    int i;
> +    unsigned char *p = s;
> +
> +    for (i = 0; i < n; i++) {
> +        p[i] = c;
> +    }
> +
> +    return s;
> +}
> +
> +static inline void *memcpy(void *s1, const void *s2, size_t len)

...and this one len. (The duplicate memcpy function used n.)

No real need to change, just to show I actually read this ;)

> +{
> +    uint8_t *dest = s1;
> +    const uint8_t *src = s2;
> +    int i;
> +
> +    for (i = 0; i < len; i++) {
> +        dest[i] = src[i];
> +    }
> +
> +    return s1;
> +}
> +
> +#endif

Reviewed-by: Cornelia Huck <address@hidden>