[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] libs/foreignmemory: fix MiniOS build


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Date: Fri, 29 Jan 2021 09:09:05 +0100
  • 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
  • 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-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FDqbO8Hl3Gf3HOIigYPbBM3LcLu/U0UnjZMyc6bbwtQMaoa+6Y2+WiDAXqk7/fQcQU3nwFIVreHSpj5S8PoYdR6yW3CmCV+Ms47gB178g/ihR7yOjWNxOyxaSmIBpHQnqXY13cfXd0PyjIM0dOJFrKjtG3Zj9vQ5i2/rCcxXcdGrQlQv7srBs5IRRl9yh4LDpeGmFW4qHJG9FLmsaeii7HC80CBfYzKrVyKlnGLhXgMB6F/Nqe33PhLmijQXtiVSz9jGZVUg7GeYk85bSYaQHoyIWTRrit55rwZLvhhOeh55PE5SclKfcSLZ2gncsUXjzciYCI42fmZsZ+oXXNTGpw==
  • Authentication-results: esa5.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
  • Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Ian Jackson <iwj@xxxxxxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
  • Delivery-date: Fri, 29 Jan 2021 08:09:27 +0000
  • Ironport-sdr: K2vthq0ZaUF4BxnPkCkhxY3Li867X2qzmnNnM68up5XF8J5B58gpFNusNNc20X6sl+RmgmFqam 4hG8972He1QbyQDY2xUQeekZPg84We4281Fmz4e/KFNCXSAm04e41iPRf6eaZtRJsqgeGursCh 3zoB3PNc1e8LteAC7O5SsN4gDR9wRJAueJl1AoTkm1n9Gvo21bjM5kPpA/qH3XSWtrHyuv7RuN UQkdiGc+QaJgq5Ea6McHYEY9QhHj2LlM7O5dyc7mdR4DIByX1wdB0NM+2yIZCMI0GNquRDZ/y0 4Jo=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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é <roger.pau@xxxxxxxxxx>
---
 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)
 {
-- 
2.29.2




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.