Commit 6af978ae authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

pc-bios/s390-ccw: Move string arrays from bootmap header to .c file 



bootmap.h can currently only be included once - otherwise the linker
complains about multiple definitions of the "magic" strings. It's a
bad style to define string arrays in header files, so let's better
move these to the bootmap.c file instead where they are used.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1520317081-5341-1-git-send-email-thuth@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 1ffed98f

pc-bios/s390-ccw/bootmap.c

+20 −0
Original line number Diff line number Diff line
@@ -37,6 +37,26 @@ typedef struct ResetInfo { 


static ResetInfo save;



const uint8_t el_torito_magic[] = "EL TORITO SPECIFICATION"

                                  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";



/*

 * Match two CCWs located after PSW and eight filler bytes.

 * From libmagic and arch/s390/kernel/head.S.

 */

const uint8_t linux_s390_magic[] = "\x02\x00\x00\x18\x60\x00\x00\x50\x02\x00"

                                   "\x00\x68\x60\x00\x00\x50\x40\x40\x40\x40"

                                   "\x40\x40\x40\x40";



static inline bool is_iso_vd_valid(IsoVolDesc *vd)

{

    const uint8_t vol_desc_magic[] = "CD001";



    return !memcmp(&vd->ident[0], vol_desc_magic, 5) &&

           vd->version == 0x1 &&

           vd->type <= VOL_DESC_TYPE_PARTITION;

}



static void jump_to_IPL_2(void)

{

    ResetInfo *current = 0;

pc-bios/s390-ccw/bootmap.h

+0 −19
Original line number Diff line number Diff line
@@ -375,9 +375,6 @@ static inline void read_iso_boot_image(uint32_t block_offset, void *load_addr, 
               "Failed to read boot image!");

}



const uint8_t el_torito_magic[] = "EL TORITO SPECIFICATION"

                                  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";



#define ISO9660_MAX_DIR_DEPTH 8



typedef struct IsoDirHdr {
@@ -430,20 +427,12 @@ typedef struct IsoVolDesc { 
    } vd;

} __attribute__((packed)) IsoVolDesc;



const uint8_t vol_desc_magic[] = "CD001";

#define VOL_DESC_TYPE_BOOT 0

#define VOL_DESC_TYPE_PRIMARY 1

#define VOL_DESC_TYPE_SUPPLEMENT 2

#define VOL_DESC_TYPE_PARTITION 3

#define VOL_DESC_TERMINATOR 255



static inline bool is_iso_vd_valid(IsoVolDesc *vd)

{

    return !memcmp(&vd->ident[0], vol_desc_magic, 5) &&

           vd->version == 0x1 &&

           vd->type <= VOL_DESC_TYPE_PARTITION;

}



typedef struct IsoBcValid {

    uint8_t platform_id;

    uint16_t reserved;
@@ -468,14 +457,6 @@ typedef struct IsoBcHdr { 
    uint8_t id[28];

} __attribute__((packed)) IsoBcHdr;



/*

 * Match two CCWs located after PSW and eight filler bytes.

 * From libmagic and arch/s390/kernel/head.S.

 */

const uint8_t linux_s390_magic[] = "\x02\x00\x00\x18\x60\x00\x00\x50\x02\x00"

                                   "\x00\x68\x60\x00\x00\x50\x40\x40\x40\x40"

                                   "\x40\x40\x40\x40";



typedef struct IsoBcEntry {

    uint8_t id;

    union {