From patchwork Fri Jan 29 08:09:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12055427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5FD9C433DB for ; Fri, 29 Jan 2021 08:09:36 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 520F064E07 for ; Fri, 29 Jan 2021 08:09:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 520F064E07 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.77753.141019 (Exim 4.92) (envelope-from ) id 1l5OqN-00053L-62; Fri, 29 Jan 2021 08:09:27 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 77753.141019; Fri, 29 Jan 2021 08:09:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5OqN-00053E-0I; Fri, 29 Jan 2021 08:09:27 +0000 Received: by outflank-mailman (input) for mailman id 77753; Fri, 29 Jan 2021 08:09:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l5OqL-00052y-5A for xen-devel@lists.xenproject.org; Fri, 29 Jan 2021 08:09:25 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d589fe18-b640-4174-8af8-d29cf7458891; Fri, 29 Jan 2021 08:09:23 +0000 (UTC) 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: d589fe18-b640-4174-8af8-d29cf7458891 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1611907763; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=VLk1ilLS/5EiUIcofUgMC8ww4YHHzs1Hhh3RL8LxF7c=; b=ZhkZkM2ivJ3lPD5KjJXfz9VwJZ0hrcb68t+3mWYLbBfiayYLs7HKSydD iYO+SEzxCwrIw2hGUiQSWfrwJLTonGq8p6ip43ePZ9yNOE1NqJzYA5YRR xztTCyNOxfS6oBq15UflCewTZo39du0b/4kFgekdzQMG/EGDJ5LurjPyv k=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com IronPort-SDR: K2vthq0ZaUF4BxnPkCkhxY3Li867X2qzmnNnM68up5XF8J5B58gpFNusNNc20X6sl+RmgmFqam 4hG8972He1QbyQDY2xUQeekZPg84We4281Fmz4e/KFNCXSAm04e41iPRf6eaZtRJsqgeGursCh 3zoB3PNc1e8LteAC7O5SsN4gDR9wRJAueJl1AoTkm1n9Gvo21bjM5kPpA/qH3XSWtrHyuv7RuN UQkdiGc+QaJgq5Ea6McHYEY9QhHj2LlM7O5dyc7mdR4DIByX1wdB0NM+2yIZCMI0GNquRDZ/y0 4Jo= X-SBRS: 5.2 X-MesageID: 36094392 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.156.83 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,384,1602561600"; d="scan'208";a="36094392" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FDqbO8Hl3Gf3HOIigYPbBM3LcLu/U0UnjZMyc6bbwtQMaoa+6Y2+WiDAXqk7/fQcQU3nwFIVreHSpj5S8PoYdR6yW3CmCV+Ms47gB178g/ihR7yOjWNxOyxaSmIBpHQnqXY13cfXd0PyjIM0dOJFrKjtG3Zj9vQ5i2/rCcxXcdGrQlQv7srBs5IRRl9yh4LDpeGmFW4qHJG9FLmsaeii7HC80CBfYzKrVyKlnGLhXgMB6F/Nqe33PhLmijQXtiVSz9jGZVUg7GeYk85bSYaQHoyIWTRrit55rwZLvhhOeh55PE5SclKfcSLZ2gncsUXjzciYCI42fmZsZ+oXXNTGpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=59IBSPxFJSLPUesTixSDC35C2l3xZdXrRoLPqiJoM6U=; b=jjzRY/uDK7aAlF8piL8Lgz4LswTPK+49gDuv3HwM/tlWsyaRlIGymJjKdZeeOhO6cCOb+4CN8ZAgi2EhwvWwbDf55Hl2wa9Q84iLPZytVip2sHqzpLvBFSs7MLHL02eN7bsm/Js8d99lPrzBwyu0tvQMuY5/J+TALDmy+uz5rHappEytHe/fkGEHtq6ga7QhNWTvAEKue4sMzhnLJva089d8UXF61pSYukkXnXW4J8ahNGw87+vlPuYvnlkSYEqSEU0wVh9CyFQAQYjxGHswk6LweVBLBd6GwGCAxS4++3/cqQE+5HeOlpnufeBaXbBNGs6ct4w2nz98RcrqwyjDXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=59IBSPxFJSLPUesTixSDC35C2l3xZdXrRoLPqiJoM6U=; b=jxBlHZi0HcfCxZs/zXLiYv9X7pElHLkPPchvrwuZZmulIWqZrSOd5mQs3w7C+XgOgXnCGg1+LYLGjUv2/jhRoH1WcN/4IlC5uzeW5eT6P7WoHjmFm2vmcxOb0+WmGwaNZyXewVCJXvRHNz7DGzqqElBN0aDavDxIjYJRYYnpcX0= From: Roger Pau Monne To: CC: Roger Pau Monne , Ian Jackson , Wei Liu Subject: [PATCH] libs/foreignmemory: fix MiniOS build Date: Fri, 29 Jan 2021 09:09:05 +0100 Message-ID: <20210129080905.14517-1-roger.pau@citrix.com> X-Mailer: git-send-email 2.29.2 X-ClientProxiedBy: MRXP264CA0040.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:14::28) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 955b3ac5-94e3-4131-9ba7-08d8c42d2c76 X-MS-TrafficTypeDiagnostic: DM6PR03MB4476: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6MJUmOvdyg+V40945+ncTmF+mQqaOBnlPRaxaulq/NXvOL+OY4kFbWBDg1eTHWUuemrYZXKkvGuown9YL+e1xgO2AOyhRn58aIrtUWTgKR4cwrq9WKm4A1a92G3UEc3bkfJKjVmPY2dIt1i3hiKMhv0FoARc8oeZFWltkEcD1QlIp7tn90rg9Q04Pw99jfy93JsWVjcrkNnQrOgsgPt8mpMe6Arma7/USm7bxbOrHk0Ishw4VG/OAB0KyUon/6ZI398y19oRJPifF3U9PeseXbrbFOa00lZmM0XIg0ukULtPhx+LWKPRZ7o3yqr6rOD9IfYbSGz0O8NlEQqSqxUUWeV5WSQQ4WaN+f9d3REa/GlBF27943vfGxqRx7/wowdZHX7MuuJBip1xjYO5+AxB9XYZpz3pmUQPbd6cYm5eA2T4AMSGGQix+hUdD3BPGldGrmErrPUYpOiU60G2KatOx8yIkOV2C2p5RTyFnKfYbrVUT6Hz9uxEJxs0QoVluN7kv2IITFSFXYPkw4/f4DDevQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(366004)(39860400002)(396003)(136003)(376002)(6916009)(86362001)(4326008)(8676002)(6496006)(6666004)(8936002)(316002)(5660300002)(26005)(83380400001)(16526019)(66946007)(2906002)(2616005)(478600001)(956004)(36756003)(1076003)(66476007)(66556008)(54906003)(186003)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?PxNPQNSbgOZUWj2A+9+eeZP21MlUc4?= =?utf-8?q?R4cWcKXS2zUnpg7W+VCMd1iM9MIqxVhObiVSe5o4vWUYAzBCyO9WFf7Y2tdOWj74G?= =?utf-8?q?z3eUplbIzlI1ZSvZNqDIJLktT68tcmYfUMlipyPH36iiIj6mtjpotDD/BFtkqkgOm?= =?utf-8?q?K15kzeLB6zpLcf2Sn+j5TRKcd+k91M8+XCGo2kr3GdHoIHGYaUmHiq298K8Sy6y2H?= =?utf-8?q?FSZUktzFX8cy5uYy4VqIdjlNM6kmE8Usf9KlJEa1+IM9tuCqfNyB6GTWU9f1u1N1I?= =?utf-8?q?RA8Dqnvn75c7JaomZyU215aZXkKHggFulsjtTKOEwHxAJISFvFTWNci2pncdjOzM8?= =?utf-8?q?KCxKnpJ5T/HjliJgvrSeIYIyf8svUN7sEAQEHwvy7HUS4YnGNefZog0DebIzzMTG6?= =?utf-8?q?XQxiZ8DHHP4r642lM9wQxZOMg6fxfh67/1WoTchlRPBCoCJi4jLUSic2h90oMgjkg?= =?utf-8?q?75opDfBMRjCT7NztC7sCNm4BYIeBySQF+YOVWB6P6bN02EUlXdKuFdDDJLsWqxSgn?= =?utf-8?q?8Yqixe6qFstGXSzrdOj/T2Q99w0Xv+hPbljykl6Z4Ct2htPkK6Sq4pi1AwaF2dwV5?= =?utf-8?q?Fc/Pt0Vb300C7291/uT3L4TcQy5/KpGy5uM51hFB2KK1luG2/V05IIitQAfgeTRKn?= =?utf-8?q?c0hOHJy4gcR/LP+g+P/vrpl96Hg/wVDfi5EaE++Iym0QjtX4IGV3cmxQ7rxTF3pDW?= =?utf-8?q?7l+jA2NYI70pZl1PXyHcWJJk20NYa2Mqq4kBfAAcTKJtYb+S8vpb1PDm8UkKMVU1s?= =?utf-8?q?sVfaBfBV/uuefbFcZ5nfjQyzAkkhnZUSRMdGmH1CEHSAVL9qTNvTV479aLh9MmFLJ?= =?utf-8?q?Ont1081fewBLW6LdfQpQWqHr61lDfl0dQeffahyjrEDuhTl870vYo7LNy4G8a4yfk?= =?utf-8?q?evEFARzWUQzKGT+paVE5qM4bkxioCH9i5u2cWuhWNzuRgxi9c+RoolF/RlR5qB5N4?= =?utf-8?q?xgVggyXX8rHfo6595FWYSWPeD/SS3IpyF1dQiP7PUUUe3R8lHPlznAZy7cY53PfAE?= =?utf-8?q?8sZtUbf3KzlTu29pj5?= X-MS-Exchange-CrossTenant-Network-Message-Id: 955b3ac5-94e3-4131-9ba7-08d8c42d2c76 X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2021 08:09:17.3658 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VGC1YGb1hcdQR4UZLehtg73jAUXFmeUcjyPZKdSxpJQUePbNXl6EhwgKGDFHLXXEOhHByTSyLfIejhZJ6P2dbQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR03MB4476 X-OriginatorOrg: citrix.com Keep the dummy handlers for restrict, map_resource and unmap_resource for MiniOS, or else the build breaks with: ld: /home/osstest/build.158759.build-amd64/xen/stubdom/mini-os-x86_64-xenstore/mini-os.o: in function `xenforeignmemory_restrict': /home/osstest/build.158759.build-amd64/xen/stubdom/libs-x86_64/foreignmemory/core.c:137: undefined reference to `osdep_xenforeignmemory_restrict' ld: /home/osstest/build.158759.build-amd64/xen/stubdom/mini-os-x86_64-xenstore/mini-os.o: in function `xenforeignmemory_map_resource': /home/osstest/build.158759.build-amd64/xen/stubdom/libs-x86_64/foreignmemory/core.c:171: undefined reference to `osdep_xenforeignmemory_map_resource' ld: /home/osstest/build.158759.build-amd64/xen/stubdom/mini-os-x86_64-xenstore/mini-os.o: in function `xenforeignmemory_unmap_resource': /home/osstest/build.158759.build-amd64/xen/stubdom/libs-x86_64/foreignmemory/core.c:185: undefined reference to `osdep_xenforeignmemory_unmap_resource' ld: /home/osstest/build.158759.build-amd64/xen/stubdom/mini-os-x86_64-xenstore/mini-os.o: in function `xenforeignmemory_resource_size': /home/osstest/build.158759.build-amd64/xen/stubdom/libs-x86_64/foreignmemory/core.c:200: undefined reference to `osdep_xenforeignmemory_map_resource' Fixes: 2b4b33ffe7d67 ('libs/foreignmemory: Implement on NetBSD') Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper and I'll put it in --- tools/libs/foreignmemory/private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libs/foreignmemory/private.h b/tools/libs/foreignmemory/private.h index 7e734ac61e..1ee3626dd2 100644 --- a/tools/libs/foreignmemory/private.h +++ b/tools/libs/foreignmemory/private.h @@ -54,7 +54,7 @@ struct xenforeignmemory_resource_handle { int flags; }; -#ifdef __sun__ +#if defined(__sun__) || defined(__MINIOS__) static inline int osdep_xenforeignmemory_restrict(xenforeignmemory_handle *fmem, domid_t domid) {