From nobody Thu Sep 19 01:46:07 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=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1715885928; cv=none; d=zohomail.com; s=zohoarc; b=hAvMqTrhA11blYaanrDWDgvFzCciu8DlFfAjOlE5vzMzxk5GgWxGTfhRgeZZ03owaIpOCaZo3FjD3K/csTL2yIpPGggTYIzFlrCAxftc09RJeb96m56WLdo5WhVT+95HMFOM5p1atHq8BiZgd1cABr71aWe0ApvuIU6LGQLZTvA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715885928; h=Content-Type: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=BcRpXVcdvZAYil4Irc1oaRVZc77Zx6hRkAA/T1NmAPk=; b=hJyIBqasPVHSHDOs6s4Mot3NdDgy9WFvYWbYgNwqII0+o+l/o4ZZNLTFMEkEQK+Q9Nmkztl27Wq1UU25oNYcWAeN15tZMFkYsjgcsB0urAvBjMAQWHtsywtnLtjkZyLUlFGd34HERtB0hREhue00AkdN0G1BUtifDw1T7qxvZz4= 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 1715885928196341.67008260648765; Thu, 16 May 2024 11:58:48 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.723572.1128540 (Exim 4.92) (envelope-from ) id 1s7gIv-0005Wd-WC; Thu, 16 May 2024 18:58:13 +0000 Received: by outflank-mailman (output) from mailman id 723572.1128540; Thu, 16 May 2024 18:58:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s7gIv-0005V3-Oz; Thu, 16 May 2024 18:58:13 +0000 Received: by outflank-mailman (input) for mailman id 723572; Thu, 16 May 2024 18:58:11 +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 1s7gIt-00057x-QT for xen-devel@lists.xenproject.org; Thu, 16 May 2024 18:58:11 +0000 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [2a00:1450:4864:20::633]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3d75aad3-13b6-11ef-909d-e314d9c70b13; Thu, 16 May 2024 20:58:10 +0200 (CEST) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-a59c0a6415fso373774066b.1 for ; Thu, 16 May 2024 11:58:10 -0700 (PDT) Received: from andrewcoop.citrite.net (default-46-102-197-194.interdsl.co.uk. [46.102.197.194]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a179c7d9dsm1003072566b.132.2024.05.16.11.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 May 2024 11:58:09 -0700 (PDT) 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: 3d75aad3-13b6-11ef-909d-e314d9c70b13 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1715885890; x=1716490690; 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=BcRpXVcdvZAYil4Irc1oaRVZc77Zx6hRkAA/T1NmAPk=; b=OqR99uHbYpRJqUdjk4Rv0b9dYEz4uiLCSlVq4J+V6HqrdtvZqz2vDTl2tXRj/n5ahi LRpLIVj9gTQowy/ubjFNov2eITWWCL+Aw2JyRslY+ibSLQRWAPK5G4jWzzP5Yg9P9ND4 xcl8XC83tBdoPcwEgzRj+vG1PMH4J5DZvPkg4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715885890; x=1716490690; 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=BcRpXVcdvZAYil4Irc1oaRVZc77Zx6hRkAA/T1NmAPk=; b=PyE6MGkAQeBV0inKbQ/1qli6ZAhlCjZjNMdNElsius0a5dcQClD6APsZeGdC06ClEd J8I/T0Wm97dRWh4wIKAbkVWp41e64dvkX+CdrmjNX6Nr9BxMTTPOiu32Oj9dEOHpJeY1 uMfwJ7c3Aq0GuFTOma7BwfVQnieL3v5CMbLLvsFUmLcgGHj8H0LX8Q10OgeKKfKTbFxZ nvv1XpCJZ5eXmq0yewtJ6tJPlL5kbQXo2/M2rvC42CwYLyyZpR6/Ykq/nj6liygpKilk CyFvcFhfV63fV2AZUJ1XcWRgYErcKdgdwsWBagDHEDIhkX4WlzaUqXYxrDqi9SN2hFLz vaIA== X-Gm-Message-State: AOJu0YyY3notNXiM2y4ZVkj6h/ntWY3geq1MICF3ptQXv5IlxXn8JlG4 U4totogfFUrnm+pxrR/WCYtRiedc+pGPdAuIcc7d3R7ZcTKAR8b2bpdG8voUScYJE3DQXoKecFB b X-Google-Smtp-Source: AGHT+IHHDTG9ObchtcVV/jVsqnfEynMKD2ibsufesvRXQQvkctYIHq8TbMcia1ICMivvqlAwStUKYQ== X-Received: by 2002:a17:906:ecb4:b0:a5a:2d30:b8c5 with SMTP id a640c23a62f3a-a5a2d5356f5mr1471090766b.16.1715885890249; Thu, 16 May 2024 11:58:10 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , George Dunlap , Jan Beulich , Stefano Stabellini , Julien Grall , Christian Lindig , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Subject: [PATCH v2 3/4] tools/{c,o}xenstored: Don't link against libsystemd Date: Thu, 16 May 2024 19:58:03 +0100 Message-Id: <20240516185804.3309725-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240516185804.3309725-1-andrew.cooper3@citrix.com> References: <20240516185804.3309725-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1715885930130100001 Use the local freestanding wrapper instead. Signed-off-by: Andrew Cooper Reviewed-by: Juergen Gross # tools/xenstored --- CC: Anthony PERARD CC: Juergen Gross CC: George Dunlap CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Christian Lindig CC: Edwin T=C3=B6r=C3=B6k v2: * Redo almost from scratch, using the freestanding wrapper instead. --- tools/ocaml/xenstored/Makefile | 2 -- tools/ocaml/xenstored/systemd_stubs.c | 2 +- tools/xenstored/Makefile | 5 ----- tools/xenstored/posix.c | 4 ++-- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/tools/ocaml/xenstored/Makefile b/tools/ocaml/xenstored/Makefile index e8aaecf2e630..a8b8bb64698e 100644 --- a/tools/ocaml/xenstored/Makefile +++ b/tools/ocaml/xenstored/Makefile @@ -4,8 +4,6 @@ include $(OCAML_TOPLEVEL)/common.make =20 # Include configure output (config.h) CFLAGS +=3D -include $(XEN_ROOT)/tools/config.h -CFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_CFLAGS) -LDFLAGS-$(CONFIG_SYSTEMD) +=3D $(SYSTEMD_LIBS) =20 CFLAGS +=3D $(CFLAGS-y) CFLAGS +=3D $(APPEND_CFLAGS) diff --git a/tools/ocaml/xenstored/systemd_stubs.c b/tools/ocaml/xenstored/= systemd_stubs.c index f4c875075abe..7dbbdd35bf30 100644 --- a/tools/ocaml/xenstored/systemd_stubs.c +++ b/tools/ocaml/xenstored/systemd_stubs.c @@ -25,7 +25,7 @@ =20 #if defined(HAVE_SYSTEMD) =20 -#include +#include =20 CAMLprim value ocaml_sd_notify_ready(value ignore) { diff --git a/tools/xenstored/Makefile b/tools/xenstored/Makefile index e0897ed1ba30..09adfe1d5064 100644 --- a/tools/xenstored/Makefile +++ b/tools/xenstored/Makefile @@ -9,11 +9,6 @@ xenstored: LDLIBS +=3D $(LDLIBS_libxenctrl) xenstored: LDLIBS +=3D -lrt xenstored: LDLIBS +=3D $(SOCKET_LIBS) =20 -ifeq ($(CONFIG_SYSTEMD),y) -$(XENSTORED_OBJS-y): CFLAGS +=3D $(SYSTEMD_CFLAGS) -xenstored: LDLIBS +=3D $(SYSTEMD_LIBS) -endif - TARGETS :=3D xenstored =20 .PHONY: all diff --git a/tools/xenstored/posix.c b/tools/xenstored/posix.c index d88c82d972d7..6037d739d013 100644 --- a/tools/xenstored/posix.c +++ b/tools/xenstored/posix.c @@ -27,7 +27,7 @@ #include #include #if defined(HAVE_SYSTEMD) -#include +#include #endif #include =20 @@ -393,7 +393,7 @@ void late_init(bool live_update) #if defined(HAVE_SYSTEMD) if (!live_update) { sd_notify(1, "READY=3D1"); - fprintf(stderr, SD_NOTICE "xenstored is ready\n"); + fprintf(stderr, "xenstored is ready\n"); } #endif } --=20 2.30.2