From nobody Fri Nov 7 14:33:35 2025 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 1548096110366643.5725689824982; Mon, 21 Jan 2019 10:41:50 -0800 (PST) Received: from localhost ([127.0.0.1]:57884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gleW1-0000d8-5i for importer@patchew.org; Mon, 21 Jan 2019 13:41:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldz2-0005D8-Pg for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldz1-00050b-MS for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:40 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldz0-0004g8-3B for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:07:38 -0500 Received: by mail-wr1-x442.google.com with SMTP id u4so24489828wrp.3 for ; Mon, 21 Jan 2019 10:07:10 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.07.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:07:09 -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=HPfhHFQMJ/irfXHQltbUorB5lN0DChhsBtHPbH/qLj0=; b=eE2NhsUCMmKWIFClJoyeXGdI9pHosIYBpRz7WCF58yO9VzLLxlcTI3Kn6tlun2N8wI EFkYIaMK/atbPKZGn9XKtwGWh/x8Xi+hRtmIb2g1QkxyOX66BiRqPOmml61EFwIJHKrU ziWg97tahnZFbmFfbnNR1HIzuwKyZfCyvErL1sPGL/YI4p+4318w5uSrXSwpgIJCu2zM ukUU3CIVAFXH6OT2nk2l5pk1jWfNGhPcnsvlghNxcJwk+ZgWxn6daPiNTmZ86J41NLmb sf+MG64kyHj0PR08ME8vDvbMGkXakNA+qrFplLVPf/ZRmv4Q+ECchz2RfVs9jhzrH+uh v/Xg== 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=HPfhHFQMJ/irfXHQltbUorB5lN0DChhsBtHPbH/qLj0=; b=KxXnDhl0DPRKDVKcukMO+yaTuyjOr5cnYqEjzQYIyd+YJ7RNqlg24RPq68Xe4HXCcA MEjmeYb5eWWsIhff0ZWHL3F5r10p6G0bB7UpKH8UPTep4A1GlVmxACxt+YP6DEyRUEwe b9xFrNb7jCET4NPoFdovOj81C8Qrfp7QB8WKy9Q4F0PRevStclvl15XBd2SzKm4YTxsP G/37sS4Xpq9ajbTYfDqhJ8usdfoYocdCjPGG3sd+mqQAvPgblm3McZ0K6yXMrymXjaHq ABNlt5H0hTRU06IfJD1Yxrl4d+Z6dlvj/vZG0TKxfxoahsZc3Oxc+XHsQdoExqRF9x8B MFFg== X-Gm-Message-State: AJcUukdADVfDfzY4/bzcjedoqdIxwmwyrRJ7UwZ4vMlfIkvByEDHDHzZ /1OmbXrlqaIdqskrZsLFDm48oZ5p X-Google-Smtp-Source: ALg8bN5IR/LoNBrVVIn3WpTKRglZ6H41ZvkYmOwnmSynyGKAH42l/Rfc6LVtkAdotH2M1AJqaw+39w== X-Received: by 2002:a5d:628a:: with SMTP id k10mr28498186wru.254.1548094029556; Mon, 21 Jan 2019 10:07:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:06:18 +0100 Message-Id: <1548093980-43088-48-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-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::442 Subject: [Qemu-devel] [PULL 47/49] 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 2833b13..90e684d 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 @@ -1050,13 +1051,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 c933489..a310a90 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -127,6 +127,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