From nobody Tue Feb 10 21:59:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549394085218137.07909246548684; Tue, 5 Feb 2019 11:14:45 -0800 (PST) Received: from localhost ([127.0.0.1]:38301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6B7-0008Tr-PS for importer@patchew.org; Tue, 05 Feb 2019 14:14:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5Ge-0002di-RN for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5Gd-00049W-8N for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:20 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5Gc-0003z8-Te for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:19 -0500 Received: by mail-wm1-x342.google.com with SMTP id y8so4739335wmi.4 for ; Tue, 05 Feb 2019 10:16:07 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=i1n8jLvWrUzAyecYeF85aYrxW/dgM4MAF5HJIRp6TYU=; b=XjdrzJFLPK9isu8IbuC0OS5RpMASjdrauvUdghTzttAxA7iihzXkOW6DR3Wn1hhr0f e5YOKCXp/7XTJHv6ukg9N9ucyzS7wxOE45GalsYTtvQO1Sy+dWg9KeATLB0XisofOu/O 6AJApqvm/lFeCEs2Mr6+XiOOFP5pX1sUUnASnJUpetwFRJVgcBUzPKfjkGWKV946wSoP yjjPUwIL24PZSKmm1JaDKCTl0VQCZWUSyZ0ByakR8P9++9++zOAY45Mk5q6mWmPglBOn ojUs5bzoO788LiVyVv/f0OwaF6RrDLiXPbNBZ7DzyoNzH3+gK8iXDL18dQCVipPwSELF ttnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=i1n8jLvWrUzAyecYeF85aYrxW/dgM4MAF5HJIRp6TYU=; b=H5pdHNkpGuw/VR8hlGWHEU5OEHoT/6Burki3z4qAyP8PcND6pTKhxWRyleJDXM+rie asIXe+88woSIhThwJiq4hHxh02fZdwmpeTfu6rn38K5EVu4sLGM30mokOZ/zoy8bxuXN x2Bb8CxAiiz0xVh4w0994m5AiDJI51CXQEcVtSmu1Z+CClEdztDuWGzWqYsYRmZoESxr 4IDKIqXEuvaGcPN8FqqnjZBKpzHaVOdbeUMwGzQ2pQiRJ2h/RfxhfAkx8OFgYpnippuE r1CqmYYsTASLMehcMnUfwGzUI1TXrt5T+XOkj3lpE42NNEH5O5UHRgX29lVwRDg80WsZ 6vEg== X-Gm-Message-State: AHQUAuZBH8WjXFRSmrTVdz3eGIAzn1rtaaXsStExCcFcI5nx3820g5Zj WrFcy7ODQ0vpX6FbvjgA1zpKngLg X-Google-Smtp-Source: AHgI3IbwZT7c11Jnb2yOS7C9tdPasZ+0q5KaGaMd7N7TyUuUlP/cgT/naBj9ziQAc7SO9lNFHaQVMg== X-Received: by 2002:a1c:5dce:: with SMTP id r197mr8793wmb.130.1549390566327; Tue, 05 Feb 2019 10:16:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:14:47 +0100 Message-Id: <1549390526-24246-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PULL 37/76] i386: import & use bootparam.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Li Zhijian , Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Li Zhijian it's from v4.20-rc5. CC: Stefano Garzarella CC: Michael S. Tsirkin Signed-off-by: Li Zhijian Reviewed-by: Michael S. Tsirkin Reviewed-by: Stefano Garzarella Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 8 +------ include/standard-headers/asm-x86/bootparam.h | 34 ++++++++++++++++++++++++= ++++ scripts/update-linux-headers.sh | 6 +++++ 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 include/standard-headers/asm-x86/bootparam.h diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 00166d1..9664822 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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" =20 /* debug PC/ISA interrupts */ //#define DEBUG_IRQ @@ -1059,13 +1060,6 @@ static long get_file_size(FILE *f) return size; } =20 -/* 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; diff --git a/include/standard-headers/asm-x86/bootparam.h b/include/standar= d-headers/asm-x86/bootparam.h new file mode 100644 index 0000000..67d4f01 --- /dev/null +++ b/include/standard-headers/asm-x86/bootparam.h @@ -0,0 +1,34 @@ +/* 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 */ diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers= .sh index 0a964fe..3578cfe 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -120,6 +120,12 @@ for arch in $ARCHLIST; do cp "$tmpdir/include/asm/unistd_x32.h" "$output/linux-headers/asm-x= 86/" cp "$tmpdir/include/asm/unistd_64.h" "$output/linux-headers/asm-x8= 6/" cp_portable "$tmpdir/include/asm/kvm_para.h" "$output/include/stan= dard-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 =20 --=20 1.8.3.1