Commit 06e0259a authored by Li Zhijian's avatar Li Zhijian Committed by Paolo Bonzini
Browse files

i386: import & use bootparam.h 



it's from v4.20-rc5.

CC: Stefano Garzarella <sgarzare@redhat.com>
CC: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarLi Zhijian <lizhijian@cn.fujitsu.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1f40547f

hw/i386/pc.c

+1 −7
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
#include "hw/usb.h"

#include "hw/i386/intel_iommu.h"

#include "hw/net/ne2000-isa.h"

#include "standard-headers/asm-x86/bootparam.h"



/* debug PC/ISA interrupts */

//#define DEBUG_IRQ
@@ -1059,13 +1060,6 @@ static long get_file_size(FILE *f) 
    return size;

}



/* setup_data types */

#define SETUP_NONE     0

#define SETUP_E820_EXT 1

#define SETUP_DTB      2

#define SETUP_PCI      3

#define SETUP_EFI      4



struct setup_data {

    uint64_t next;

    uint32_t type;

include/standard-headers/asm-x86/bootparam.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_X86_BOOTPARAM_H

#define _ASM_X86_BOOTPARAM_H



/* setup_data types */

#define SETUP_NONE			0

#define SETUP_E820_EXT			1

#define SETUP_DTB			2

#define SETUP_PCI			3

#define SETUP_EFI			4

#define SETUP_APPLE_PROPERTIES		5

#define SETUP_JAILHOUSE			6



/* ram_size flags */

#define RAMDISK_IMAGE_START_MASK	0x07FF

#define RAMDISK_PROMPT_FLAG		0x8000

#define RAMDISK_LOAD_FLAG		0x4000



/* loadflags */

#define LOADED_HIGH	(1<<0)

#define KASLR_FLAG	(1<<1)

#define QUIET_FLAG	(1<<5)

#define KEEP_SEGMENTS	(1<<6)

#define CAN_USE_HEAP	(1<<7)



/* xloadflags */

#define XLF_KERNEL_64			(1<<0)

#define XLF_CAN_BE_LOADED_ABOVE_4G	(1<<1)

#define XLF_EFI_HANDOVER_32		(1<<2)

#define XLF_EFI_HANDOVER_64		(1<<3)

#define XLF_EFI_KEXEC			(1<<4)





#endif /* _ASM_X86_BOOTPARAM_H */

scripts/update-linux-headers.sh

+6 −0
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ for arch in $ARCHLIST; do 
        cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x86/"

        cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x86/"

        cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/standard-headers/asm-$arch"

        # Remove everything except the macros from bootparam.h avoiding the

        # unnecessary import of several video/ist/etc headers

        sed -e '/__ASSEMBLY__/,/__ASSEMBLY__/d' \

               "$tmpdir/include/asm/bootparam.h" > "$tmpdir/bootparam.h"

        cp_portable "$tmpdir/bootparam.h" \

                    "$output/include/standard-headers/asm-$arch"

    fi

done