From nobody Thu Nov 21 12:19:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1731588634; cv=none; d=zohomail.com; s=zohoarc; b=MdlEmsxTukooGvei39ANM04Xd18mrjpbVOcY+U1NbAnG3v3Mxaapjwmr52va0gMgTew2v7mWcUuuAp/4dOzMPHfnfnUxWljs9MXtsLZRCdHM0aBz+uVK8tCRG/q/bzrUmcsTEcLE1H+++xT/VdIYvcTu5TwmBcyNz9fQkEwYuak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731588634; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=y0Aj5W+j63+NuGcn0ZB3t9CEq3oH9AJf5/KiiQiC1a0=; b=eJw7Rb/oiHjZbUz2c/IuZaMVs2LjzZgV8S2eDgUfOBK/lRwgSXLNGqbBlUgWTltb+9P8IhXnFY1hMklBI6fkT5at0WQoVPj01ffmw0ACoRP+Ye5xvcMIhbAKK4jYMyYBxNC1V+PiIhKJyR+tn0a4swRgcrtyUj90kbFwwmbI3iI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1731588634741679.7269686335517; Thu, 14 Nov 2024 04:50:34 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.836418.1252313 (Exim 4.92) (envelope-from ) id 1tBZIV-0002UD-PW; Thu, 14 Nov 2024 12:50:07 +0000 Received: by outflank-mailman (output) from mailman id 836418.1252313; Thu, 14 Nov 2024 12:50:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIV-0002U6-MY; Thu, 14 Nov 2024 12:50:07 +0000 Received: by outflank-mailman (input) for mailman id 836418; Thu, 14 Nov 2024 12:50:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIU-0002Aa-RZ for xen-devel@lists.xenproject.org; Thu, 14 Nov 2024 12:50:06 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f7e7212d-a286-11ef-a0c7-8be0dac302b0; Thu, 14 Nov 2024 13:50:04 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4316a44d1bbso5307855e9.3 for ; Thu, 14 Nov 2024 04:50:04 -0800 (PST) Received: from localhost.localdomain (99.149.115.87.dyn.plus.net. [87.115.149.99]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821ae1685csm1416809f8f.83.2024.11.14.04.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 04:50:00 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f7e7212d-a286-11ef-a0c7-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjozMmMiLCJoZWxvIjoibWFpbC13bTEteDMyYy5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImY3ZTcyMTJkLWEyODYtMTFlZi1hMGM3LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxNTg4NjA0LjIyNDQxNywic2VuZGVyIjoiZnJlZGlhbm8uemlnbGlvQGNsb3VkLmNvbSIsInJlY2lwaWVudCI6Inhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZyJ9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1731588601; x=1732193401; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y0Aj5W+j63+NuGcn0ZB3t9CEq3oH9AJf5/KiiQiC1a0=; b=RrB1vT7fbhH01hlcJ3A4CN5AfsCC6B8Nv+lxQ1Y5EC9OSL2jB5BemV+iEw95iVQ2WD s1XrGPhYUyZPyqoRlLXC7nMZZ65UxEy4E0J6Ux9/Po7o4xYUPgfbgbjna4xefggzxtu8 XaV0DkFb5Uu4lkZH61zNpZ6b2DOSsL17LulpQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731588601; x=1732193401; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y0Aj5W+j63+NuGcn0ZB3t9CEq3oH9AJf5/KiiQiC1a0=; b=vh6fFgWEQMUqAFUfJ8RS3hyEblpjfe3zYszuMctCnC24imXNJ3cBFomdCjOlgdDWid gs2uzvYItAngBZIgYNcBnoOFeCyzWAkxNwwo1/+EMPuxERzRe4KFyKcO20+ONyAvV2U8 mGaFhH5L3JAWga+FfKOL26x7h72U9KEYQtIDjv6Muc1M6LjwUhoZQoqVSLIoRfR9QI1J FX5FwHUxkMG0fdgE4udVR4Z/aF8tk1xl2MUb9guy6UrEVVWpb4Ah/MOknsL68rSh9PqR wf/44R+d8au4eTcHJNMcNlWkzyxCQJwjztmSbXyJDmPRjg86Rme8k+iknNHh+vGQdWr7 7mrQ== X-Gm-Message-State: AOJu0Yy9pCOX8WGZDKZow2HtrNRmB2nklho7jgHzDuQw9YMkaXr8kfTJ 32hB3SOXKCwB1xXKRiGTz3wNR99K12oxCN4ADVEX1s8L39CVj9hledauMli5sW7+m3dxQB+qRqr X9/I= X-Google-Smtp-Source: AGHT+IFZBqsZYRBCdwtL6NGshW6oAswZeo2hdZ9/qUiRqDf0+E43eek1nE9y+vm8SVGhne25OJnxhQ== X-Received: by 2002:a05:600c:4f8a:b0:431:5863:4240 with SMTP id 5b1f17b1804b1-432d4ad340bmr57400045e9.24.1731588601023; Thu, 14 Nov 2024 04:50:01 -0800 (PST) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 1/4] Use an include/boot directory to override headers for boot code Date: Thu, 14 Nov 2024 12:49:47 +0000 Message-Id: <20241114124950.24808-2-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114124950.24808-1-frediano.ziglio@cloud.com> References: <20241114124950.24808-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1731588636380116600 Content-Type: text/plain; charset="utf-8" Not all headers can be used by 32 bit boot code. Allows to override some headers, we don't want to mess up with main headers as most of the code is only 64 bit so the easy stuff should be done for 64 bit declarations. Boot headers should be 64 bit compatibles to avoid having multiple declarations. Signed-off-by: Frediano Ziglio --- xen/arch/x86/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index d457876659..13d4583173 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -18,7 +18,7 @@ CFLAGS_x86_32 :=3D $(subst -m64,-m32 -march=3Di686,$(XEN_= TREEWIDE_CFLAGS)) $(call cc-options-add,CFLAGS_x86_32,CC,$(EMBEDDED_EXTRA_CFLAGS)) CFLAGS_x86_32 +=3D -Werror -fno-builtin -g0 -msoft-float -mregparm=3D3 CFLAGS_x86_32 +=3D -nostdinc -include $(filter %/include/xen/config.h,$(XE= N_CFLAGS)) -CFLAGS_x86_32 +=3D $(filter -I% -O%,$(XEN_CFLAGS)) -D__XEN__ +CFLAGS_x86_32 +=3D -I$(srctree)/arch/x86/include/boot $(filter -I% -O%,$(X= EN_CFLAGS)) -D__XEN__ =20 # override for 32bit binaries $(obj32): CFLAGS_stack_boundary :=3D --=20 2.34.1 From nobody Thu Nov 21 12:19:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1731588636; cv=none; d=zohomail.com; s=zohoarc; b=XnqwRrvT7DaOYN64c0/Y8d8SA/glja2lxpbj3FBtyRP/ucwLsm2GKuhlTg2aFzerUR3zCAlASg5ioi6mDMRVSf2QKGho3WbdDdAlxNoBHgJWbfSSBjKq67FlnsUAkbT6jxWMYCJ8cwbnU373591O5GpUeWr4Q7TLL66NUfIujQM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731588636; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2manZp1AIdPBh7iI0RBUSq4id6SrxSe85LAkzhSm0W8=; b=NhZ91yIWudbXjtAU39rsMHtcr/7xg4QrrvJQrRlouskFOO2qjcrrl29ygvRIw+KEW1TqwxeS8oTwjiRbIijxYaSYkwBWjygRFp7GtVXIo7OGeDRWA7SykyqsQ+cIA2U6xhCKH9+V/Hl1rxsdCaDjsWW2sRomnoC9LlCMYRIkiAU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17315886361961005.7931600731742; Thu, 14 Nov 2024 04:50:36 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.836419.1252323 (Exim 4.92) (envelope-from ) id 1tBZIW-0002jP-WB; Thu, 14 Nov 2024 12:50:08 +0000 Received: by outflank-mailman (output) from mailman id 836419.1252323; Thu, 14 Nov 2024 12:50:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIW-0002jI-Td; Thu, 14 Nov 2024 12:50:08 +0000 Received: by outflank-mailman (input) for mailman id 836419; Thu, 14 Nov 2024 12:50:07 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIV-0002Aa-Gz for xen-devel@lists.xenproject.org; Thu, 14 Nov 2024 12:50:07 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f857c341-a286-11ef-a0c7-8be0dac302b0; Thu, 14 Nov 2024 13:50:04 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-432d9b8558aso4427795e9.0 for ; Thu, 14 Nov 2024 04:50:04 -0800 (PST) Received: from localhost.localdomain (99.149.115.87.dyn.plus.net. [87.115.149.99]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821ae1685csm1416809f8f.83.2024.11.14.04.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 04:50:01 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f857c341-a286-11ef-a0c7-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjozMmMiLCJoZWxvIjoibWFpbC13bTEteDMyYy5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImY4NTdjMzQxLWEyODYtMTFlZi1hMGM3LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxNTg4NjA0Ljk0MDM0OSwic2VuZGVyIjoiZnJlZGlhbm8uemlnbGlvQGNsb3VkLmNvbSIsInJlY2lwaWVudCI6Inhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZyJ9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1731588604; x=1732193404; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2manZp1AIdPBh7iI0RBUSq4id6SrxSe85LAkzhSm0W8=; b=PAY+pbIwGDlp9zrIjhP7DMuLmHLsbMb7wRmxUV96GugReJo79/r2AIJwPb06+6X5/Q aZlkxmFYWxUL3BxvCQX/LSStoeRhBOe2p1rdVJHzCPyxASlNvEn8Vh0PxtlVFG8fH3wy TcWYcPKm7rFmO5I9zwsxSDn9ZiSH9PoDPKafI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731588604; x=1732193404; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2manZp1AIdPBh7iI0RBUSq4id6SrxSe85LAkzhSm0W8=; b=ZlGqTIz4iH6XApw5/9bb0i5CmMtcdtWKOfL68icp/ryMc7kxkrZMRDmB7xSnfKJt3r 025RpYFfq5vyCESGKkH/XLqQapRnrqAZeHeiNyr/75l2K9sZaeIKndZ7S0D7ZUTP0ICU b2IQMNaZEMuvA+rxX3zegw4Ti+c6l37Arix7owfmDcVWqiYLtcUPsxka2PqUOrX0vZ+e QUla5HrUAKTLZQ+Z5a0VqVW4yKId2zOTiUDB63Hvej9OS3yItKa7fsP8C2kM/8MP3+V9 d/ynbmg88Z7Aew7JbUGGJrons5LgNf6zi+a6hGJx/NJ1K/Ke50l3p7jyXyjyfJftf8Lf rsbg== X-Gm-Message-State: AOJu0YzfvHkOh2bdEs8EzWFSAGli6r/9UVVjQg+E/ZW8u9YL8yl/dW/c 3i8Ck0zkyZWBO/WkAx/hR/HTxhtt9j87p5R4hkF69ads7dEiyM+rZIy7UG3PTEtwSII91DcT5yu NAPY= X-Google-Smtp-Source: AGHT+IHLGbOvOAaIXdjY4KfHj/39O0tKCjcFUmS9HRx7rBg1TvHHiskK2fLnljDucY2pR3fwLCE3Fw== X-Received: by 2002:a05:600c:4e47:b0:431:57cf:f13d with SMTP id 5b1f17b1804b1-432d973e2e1mr31221715e9.3.1731588604127; Thu, 14 Nov 2024 04:50:04 -0800 (PST) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 2/4] x86/boot: Use header to allows inclusion of public xen.h header Date: Thu, 14 Nov 2024 12:49:48 +0000 Message-Id: <20241114124950.24808-3-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114124950.24808-1-frediano.ziglio@cloud.com> References: <20241114124950.24808-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1731588636383116600 Content-Type: text/plain; charset="utf-8" This allows to include other headers and avoid duplicated declarations. Signed-off-by: Frediano Ziglio --- xen/arch/x86/include/boot/public/xen.h | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 xen/arch/x86/include/boot/public/xen.h diff --git a/xen/arch/x86/include/boot/public/xen.h b/xen/arch/x86/include/= boot/public/xen.h new file mode 100644 index 0000000000..399b86b5e5 --- /dev/null +++ b/xen/arch/x86/include/boot/public/xen.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* This header allows the inclusion of public xen.h */ + +#ifndef BOOT__PUBLIC__XEN_H +#define BOOT__PUBLIC__XEN_H + +#if !defined(__XEN__) || defined(__XEN_TOOLS__) || __XEN__ !=3D 1 +#error Unexpected defines +#endif + +#include + +#ifdef __i386__ + +# define __XEN_TOOLS__ 1 +# undef __XEN__ +# include +# define __XEN__ 1 +# undef __XEN_TOOLS__ + +#else + +# include + +#endif + +#endif /* BOOT__PUBLIC__XEN_H */ --=20 2.34.1 From nobody Thu Nov 21 12:19:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1731588637; cv=none; d=zohomail.com; s=zohoarc; b=Ash5nge1AY167l7j87OyUIsUuwazP+c6yTmbJF0HG586W1L1E/7uD20Y2gM6rAETNRkdPAhmSt5CGSqpUUo0L9J1nfzYYR4p1UZEiIMM0MKmEane5PREIrabuTVUb2aNLc4zGoVTrnIe8s0Gh5xl7/g/g47Ts8jr/7iV/gkW+Xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731588637; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rLYetKdXRISWvqivl/6DtEP61NuYrlAS1Q0ZpWaKKIQ=; b=Jke/TF5xbhpfGr8M5J2JzUk/Z2E7BBAVnH8/5KfpBiI5JUYgcYtDZKa2ACK3LYS/L6jHGwIgaU4Na/6frksGQYdygfYYGwYtYjncw/wFQ2WHf7uNH/E8imycJ3HYq7RS+ae0/IMNSJaXa0q+PVGH1L7/iTUXjxLKppJVj8PMyas= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1731588637061306.9860131069265; Thu, 14 Nov 2024 04:50:37 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.836420.1252333 (Exim 4.92) (envelope-from ) id 1tBZIZ-00030w-8E; Thu, 14 Nov 2024 12:50:11 +0000 Received: by outflank-mailman (output) from mailman id 836420.1252333; Thu, 14 Nov 2024 12:50:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIZ-00030n-4b; Thu, 14 Nov 2024 12:50:11 +0000 Received: by outflank-mailman (input) for mailman id 836420; Thu, 14 Nov 2024 12:50:09 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIX-0001tD-01 for xen-devel@lists.xenproject.org; Thu, 14 Nov 2024 12:50:09 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id f8ec2a90-a286-11ef-99a3-01e77a169b0f; Thu, 14 Nov 2024 13:50:05 +0100 (CET) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43193678216so5727155e9.0 for ; Thu, 14 Nov 2024 04:50:05 -0800 (PST) Received: from localhost.localdomain (99.149.115.87.dyn.plus.net. [87.115.149.99]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821ae1685csm1416809f8f.83.2024.11.14.04.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 04:50:04 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f8ec2a90-a286-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjozMmMiLCJoZWxvIjoibWFpbC13bTEteDMyYy5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImY4ZWMyYTkwLWEyODYtMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMxNTg4NjA1Ljk0NjE1OSwic2VuZGVyIjoiZnJlZGlhbm8uemlnbGlvQGNsb3VkLmNvbSIsInJlY2lwaWVudCI6Inhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZyJ9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1731588605; x=1732193405; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rLYetKdXRISWvqivl/6DtEP61NuYrlAS1Q0ZpWaKKIQ=; b=Ssgn7d9UqR1xEJJh/b3ncDlU3qIim6TdFrvCWC6UuZALmLub3YINTh7zpTJBYyMFlw tzdy4828xzikW2bkJLPu3VauvyhVP59eS3AX7dkmBWNYfItzKKAjFFYEFMvuLESUMHtc TwkraGvQpUBKAIPq5d0nq8PTLFWU9JIGYLE44= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731588605; x=1732193405; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rLYetKdXRISWvqivl/6DtEP61NuYrlAS1Q0ZpWaKKIQ=; b=Hsx5pWuPZuHJ8ySOIXmXxCYEE/3BQ9e7xW1JEfoqhLKD5LCibgJNqOhCGiNitdjfhi aRkWPJiSq85mq1LN8u5dD6kAfd6oYgrE0hsJMFR8ufE87X5PAbMST1xaOzwswS5hO55J Tmh0MFHLoGxwMZv2s6nGYtnN30f0UOoNiAu3rgM38NFuq30JC4zFpHW24u8sCzWVZCbq LBs2Sq0vZ42WnOqAsbz9vDOxy9RXOgcdLL8riFRhi5XF1B2HjUv0OOIvpwa7Uc69eKzO kJnGYrpb8ItusPlUgzci5CXq1G03AovWLHPIEJC3Fe19UpCQki2RMbmQa3VXoOqwILCL EtcQ== X-Gm-Message-State: AOJu0Yx2sH7hF/iESqORPakNp43N0+48xwlvtol524zgB6hVr4/tQ8hL YRE0pOmbHohD2JeRx4Ngbv/pU++R6NDo1efDJ4Ui3geaBP3h42aq8bi0Sd0YNCf6xBbTPoY8Q0U HVwU= X-Google-Smtp-Source: AGHT+IEE2eQuQ0ylILh+xi7FBs+sI5MZ06cbiMMpngQuOUiHGfLx6c4+jyT/W6NLqTTOGlE7g9i65w== X-Received: by 2002:a05:600c:35d3:b0:42c:b1ee:4b04 with SMTP id 5b1f17b1804b1-432b751c264mr188593465e9.28.1731588604848; Thu, 14 Nov 2024 04:50:04 -0800 (PST) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 3/4] x86/boot: Move some settings to C Date: Thu, 14 Nov 2024 12:49:49 +0000 Message-Id: <20241114124950.24808-4-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114124950.24808-1-frediano.ziglio@cloud.com> References: <20241114124950.24808-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1731588638438116600 Content-Type: text/plain; charset="utf-8" Initialise multiboot_ptr and pvh_start_info_pa from C code. Signed-off-by: Frediano Ziglio --- xen/arch/x86/boot/build32.lds.S | 3 +++ xen/arch/x86/boot/head.S | 10 -------- xen/arch/x86/boot/reloc.c | 28 ++++++++++++++++++----- xen/arch/x86/include/asm/guest/pvh-boot.h | 1 + 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/boot/build32.lds.S b/xen/arch/x86/boot/build32.ld= s.S index 1e59732edd..1726c17c88 100644 --- a/xen/arch/x86/boot/build32.lds.S +++ b/xen/arch/x86/boot/build32.lds.S @@ -51,6 +51,9 @@ SECTIONS DECLARE_IMPORT(__trampoline_seg_stop); DECLARE_IMPORT(trampoline_phys); DECLARE_IMPORT(boot_vid_info); + DECLARE_IMPORT(multiboot_ptr); + DECLARE_IMPORT(pvh_boot); + DECLARE_IMPORT(pvh_start_info_pa); . =3D . + GAP; *(.text) *(.text.*) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index dcda91cfda..f86910294f 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -515,16 +515,6 @@ trampoline_setup: /* reloc(magic/eax, info/edx) using fastcall. */ call reloc =20 -#ifdef CONFIG_PVH_GUEST - cmpb $0, sym_esi(pvh_boot) - je 1f - mov %eax, sym_esi(pvh_start_info_pa) - jmp 2f -#endif -1: - mov %eax, sym_esi(multiboot_ptr) -2: - /* * Now trampoline_phys points to the following structure (lowest a= ddress * is at the bottom): diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index e50e161b27..a03ef71a4c 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -17,13 +17,15 @@ #include =20 #include -#include #include #include +#include =20 #include +#include =20 #include +#include =20 #ifdef CONFIG_VIDEO # include "video.h" @@ -347,28 +349,42 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, = memctx *ctx) } =20 /* SAF-1-safe */ -void *reloc(uint32_t magic, uint32_t in) +void reloc(uint32_t magic, uint32_t in) { /* Get bottom-most low-memory stack address. */ memctx ctx =3D { trampoline_phys + TRAMPOLINE_SPACE }; =20 + void *res; + switch ( magic ) { case MULTIBOOT_BOOTLOADER_MAGIC: - return mbi_reloc(in, &ctx); + res =3D mbi_reloc(in, &ctx); + break; =20 case MULTIBOOT2_BOOTLOADER_MAGIC: - return mbi2_reloc(in, &ctx); + res =3D mbi2_reloc(in, &ctx); + break; =20 case XEN_HVM_START_MAGIC_VALUE: if ( IS_ENABLED(CONFIG_PVH_GUEST) ) - return pvh_info_reloc(in, &ctx); + { + res =3D pvh_info_reloc(in, &ctx); + break; + } /* Fallthrough */ =20 default: /* Nothing we can do */ - return NULL; + res =3D NULL; } + +#ifdef CONFIG_PVH_GUEST + if ( pvh_boot ) + pvh_start_info_pa =3D (unsigned long)res; +#endif + + multiboot_ptr =3D (unsigned long)res; } =20 /* diff --git a/xen/arch/x86/include/asm/guest/pvh-boot.h b/xen/arch/x86/inclu= de/asm/guest/pvh-boot.h index 247ba6899e..b5ad2b11a4 100644 --- a/xen/arch/x86/include/asm/guest/pvh-boot.h +++ b/xen/arch/x86/include/asm/guest/pvh-boot.h @@ -13,6 +13,7 @@ #ifdef CONFIG_PVH_GUEST =20 extern bool pvh_boot; +extern uint32_t pvh_start_info_pa; =20 void pvh_init(multiboot_info_t **mbi, module_t **mod); void pvh_print_info(void); --=20 2.34.1 From nobody Thu Nov 21 12:19:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1731588638; cv=none; d=zohomail.com; s=zohoarc; b=YGx40oHDAUOGFGRJDadBc7VLgnHDDLlmNfC/6Jg4mjyJCTHvrh2MEBHXVH8f6q6xVUZei9WJHvrWg0RS3CSurLDLoZYRO0aVJeTQZ1todzYBiz3L/QoiOk+Ggkb/KhC+zqJ5bGIJB+BSeYldiAKZ2kn4iLJxovLia2WWh2XYnUU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731588638; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HpeDYZanm22C28MNfmY1IgLVgt+E9w0szXnSSi/YSPs=; b=XDyn7zaBppgDPwMgLlmnTYFcICcSWeiAYklZhMFQY7oSEcz+KorFOq9zaUSxGetdFtUsy9dmM/ygIAcccSigX/7WHFyXKX9vutYvw3YXRzw32t/JLzz8NxyD6lrQK0lKtoa0CGgIM+tlwfnvKdagYeZ6I4DzBoLKyhFtfhcHC5E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1731588638185364.4074178291993; Thu, 14 Nov 2024 04:50:38 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.836421.1252339 (Exim 4.92) (envelope-from ) id 1tBZIZ-00039b-P9; Thu, 14 Nov 2024 12:50:11 +0000 Received: by outflank-mailman (output) from mailman id 836421.1252339; Thu, 14 Nov 2024 12:50:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIZ-00036y-KY; Thu, 14 Nov 2024 12:50:11 +0000 Received: by outflank-mailman (input) for mailman id 836421; Thu, 14 Nov 2024 12:50:10 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBZIY-0002Aa-RW for xen-devel@lists.xenproject.org; Thu, 14 Nov 2024 12:50:10 +0000 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [2a00:1450:4864:20::42a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id f96736f3-a286-11ef-a0c7-8be0dac302b0; Thu, 14 Nov 2024 13:50:06 +0100 (CET) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3821c81f165so390514f8f.3 for ; Thu, 14 Nov 2024 04:50:06 -0800 (PST) Received: from localhost.localdomain (99.149.115.87.dyn.plus.net. [87.115.149.99]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3821ae1685csm1416809f8f.83.2024.11.14.04.50.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Nov 2024 04:50:05 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f96736f3-a286-11ef-a0c7-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo0MmEiLCJoZWxvIjoibWFpbC13cjEteDQyYS5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImY5NjczNmYzLWEyODYtMTFlZi1hMGM3LThiZTBkYWMzMDJiMCIsInRzIjoxNzMxNTg4NjA2LjgzNjIyNSwic2VuZGVyIjoiZnJlZGlhbm8uemlnbGlvQGNsb3VkLmNvbSIsInJlY2lwaWVudCI6Inhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZyJ9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1731588606; x=1732193406; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HpeDYZanm22C28MNfmY1IgLVgt+E9w0szXnSSi/YSPs=; b=IjVGysZ03izP5QUc7ibPZ1xDttsFXGbL4+qWrnLJv6FOUi89nYSPBc/V0oxsYU7epn ZBrPdYsmt8yGR4DSsUJeXJcqOIBNH5Qe5HpvA/WPJgiYmDkbz++bINCe6zS06oPOASk+ BcbywZU6gWAASevuBDLyrYs5+O9Hfoy6GTTiU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731588606; x=1732193406; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HpeDYZanm22C28MNfmY1IgLVgt+E9w0szXnSSi/YSPs=; b=MGmDqpJXRpSdoB5MBdY/wDvez51qvdC5/OPOYh2MuseA39tcISoB0ybHIwH/KiEA6f QY4i5IPzrjDrR4bYit955XoZP1JSN47cpORk9PWWiturZXAh6AakTnjWDsqFgV3W+Fey 4jlAxciHsFfO+NYvTc3B/Ou4TIqW+i3RWnVWHZuEj6cgunt1Y+LNc0hwSqWBTv04/EP1 cmZKbD63cpNHbhYXkFZkojPpbKYxrf+Fw0ZAb1p6kLborBp0+ELPOp0wW2brQwtkP2zs leNuRKHcK2Ibr4kfrS1l2tl93IjxvS/BTGFEhCV5FB4nJDks9OnWRvie8hNlWtkP0MUH HbHQ== X-Gm-Message-State: AOJu0YxjAmubRPwHZBKHUoHxud5c1PSXoto/7TDe8ctrU52wT9JLujTp IXE9wNRHomHUoxJ5rNjGKjtyY309UPToRg9ZWltHMp1ntwFx8JCx+62cbfPFotLjdBZ2zXsF4FD l6nc= X-Google-Smtp-Source: AGHT+IEO6TDY+IHrzXffukz7o50BXQ7iLKQ4LBnhl/8VwjJ3U/BMEfKgmOERURTyEowf+asOk80+FA== X-Received: by 2002:a05:6000:1ac5:b0:37c:cfdc:19ba with SMTP id ffacd0b85a97d-3821851d1femr1885630f8f.28.1731588605856; Thu, 14 Nov 2024 04:50:05 -0800 (PST) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 4/4] x86/boot: Use external symbols from cmdline_parse_early Date: Thu, 14 Nov 2024 12:49:50 +0000 Message-Id: <20241114124950.24808-5-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241114124950.24808-1-frediano.ziglio@cloud.com> References: <20241114124950.24808-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1731588638420116600 Content-Type: text/plain; charset="utf-8" Move some assembly code to C. Signed-off-by: Frediano Ziglio --- xen/arch/x86/boot/build32.lds.S | 1 + xen/arch/x86/boot/cmdline.c | 14 ++++++++++++-- xen/arch/x86/boot/head.S | 9 +-------- xen/arch/x86/boot/trampoline.S | 2 +- xen/arch/x86/include/asm/setup.h | 2 ++ xen/arch/x86/include/boot/xen/cpumask.h | 1 + xen/arch/x86/include/boot/xen/string.h | 10 ++++++++++ 7 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 xen/arch/x86/include/boot/xen/cpumask.h create mode 100644 xen/arch/x86/include/boot/xen/string.h diff --git a/xen/arch/x86/boot/build32.lds.S b/xen/arch/x86/boot/build32.ld= s.S index 1726c17c88..652f951e52 100644 --- a/xen/arch/x86/boot/build32.lds.S +++ b/xen/arch/x86/boot/build32.lds.S @@ -54,6 +54,7 @@ SECTIONS DECLARE_IMPORT(multiboot_ptr); DECLARE_IMPORT(pvh_boot); DECLARE_IMPORT(pvh_start_info_pa); + DECLARE_IMPORT(early_boot_opts); . =3D . + GAP; *(.text) *(.text.*) diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index 196c580e91..7a8a3ed97f 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -22,6 +22,9 @@ #include #include #include +#include + +#include =20 #include "video.h" =20 @@ -39,6 +42,8 @@ typedef struct __packed { #endif } early_boot_opts_t; =20 +extern early_boot_opts_t early_boot_opts; + /* Avoid pulling in all of ctypes.h for this. */ #define tolower(c) ((c) | 0x20) =20 @@ -335,10 +340,15 @@ static void vga_parse(const char *cmdline, early_boot= _opts_t *ebo) #endif =20 /* SAF-1-safe */ -void cmdline_parse_early(const char *cmdline, early_boot_opts_t *ebo) +void cmdline_parse_early(void) { - if ( !cmdline ) + early_boot_opts_t *ebo =3D &early_boot_opts; + struct multiboot_info *mbi =3D (void *)multiboot_ptr; + const char *cmdline; + + if ( !(mbi->flags & MBI_CMDLINE) || !mbi->cmdline ) return; + cmdline =3D (void *)mbi->cmdline; =20 ebo->skip_realmode =3D skip_realmode(cmdline); ebo->opt_edd =3D edd_parse(cmdline); diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index f86910294f..b79d4884df 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -690,14 +690,7 @@ trampoline_setup: cmpb $0, sym_esi(efi_platform) jnz 1f =20 - /* Bail if there is no command line to parse. */ - mov sym_esi(multiboot_ptr), %ebx - testl $MBI_CMDLINE,MB_flags(%ebx) - jz 1f - - lea sym_esi(early_boot_opts), %edx - mov MB_cmdline(%ebx), %eax - /* cmdline_parse_early(cmdline/eax, opts/edx) using fastcall.= */ + /* cmdline_parse_early using fastcall. */ call cmdline_parse_early =20 1: diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index b8ab0ffdcb..f2fa7ca07d 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -258,7 +258,7 @@ trampoline_boot_cpu_entry: =20 .align 2 /* Keep in sync with cmdline.c:early_boot_opts_t type! */ -early_boot_opts: +GLOBAL(early_boot_opts) skip_realmode: .byte 0 opt_edd: diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/se= tup.h index 25c15ef914..a5ca007722 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -16,6 +16,8 @@ extern uint64_t boot_tsc_stamp; extern void *stack_start; extern unsigned int multiboot_ptr; =20 +struct domain; + void early_cpu_init(bool verbose); void early_time_init(void); =20 diff --git a/xen/arch/x86/include/boot/xen/cpumask.h b/xen/arch/x86/include= /boot/xen/cpumask.h new file mode 100644 index 0000000000..046b862b78 --- /dev/null +++ b/xen/arch/x86/include/boot/xen/cpumask.h @@ -0,0 +1 @@ +/* Empty. */ diff --git a/xen/arch/x86/include/boot/xen/string.h b/xen/arch/x86/include/= boot/xen/string.h new file mode 100644 index 0000000000..6556d3b4af --- /dev/null +++ b/xen/arch/x86/include/boot/xen/string.h @@ -0,0 +1,10 @@ +#ifndef BOOT__XEN__STRING_H +#define BOOT__XEN__STRING_H + +#include /* for size_t */ + +void *memset(void *s, int c, size_t n); +void *memcpy(void *dest, const void *src, size_t n); +void *memmove(void *dest, const void *src, size_t n); + +#endif /* BOOT__XEN__STRING_H */ --=20 2.34.1