From patchwork Mon May 11 12:27:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 1287685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=web.de header.i=@web.de header.a=rsa-sha256 header.s=dbaedf251592 header.b=q3d/oDlE; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49LL5d1J6Fz9sSJ for ; Mon, 11 May 2020 22:36:20 +1000 (AEST) Received: from localhost ([::1]:50166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jY7fO-00034h-Hv for incoming@patchwork.ozlabs.org; Mon, 11 May 2020 08:36:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Ww-0006Gu-No for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:34 -0400 Received: from mout.web.de ([212.227.15.3]:60591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jY7Wv-00063k-SG for qemu-devel@nongnu.org; Mon, 11 May 2020 08:27:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1589200028; bh=Rdxixi7KV4eiUZcjalX0wrnXk1aVs2YQ0vK98vYI6WU=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=q3d/oDlEOOkPZymhC29pvlAMCIEWksXfdkjcn58o1Mlom7oNQXyB2XymNGCdk84cv 6rXInsKeWYYIad6RIDpuLmlaws7znUslqWP6rEhiPga5aLt3AZUNwg0eqxMekxB38z c2Mgjx+KToamCdHSzTL45Ph5ikIWkao6p5XRKDj4= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([89.247.255.192]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LhNmy-1ilubk3QxM-00mf4N; Mon, 11 May 2020 14:27:08 +0200 Date: Mon, 11 May 2020 14:27:07 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH 4/5] configure,Makefile: Install colo resource-agent Message-ID: <334d8321f91f23759ef82a7b904f977003164475.1589199922.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:kzRApTIPUtXSXuplx1eKea1e2uuM1fGZVxV6CUIhKCpSXo+GlmG ZwdaCoxJqxNfnJZB2C/fgG/xkJoDTwerSUv5RBo0dHqWbXPheMRHmmn8NI5auUyUCNZQim8 kSBvjDDTAyB5BFg3wIi2z8qu2Ps+OeXYGh0WbEMFcVNQJ3/fBGxLICtMREyP7i1AdBITAGQ D/RrsVGxey1F7H5v+5yug== X-UI-Out-Filterresults: notjunk:1;V03:K0:A88D/8D1VRs=:w2cXqlouHjy1Yz0HM9EBOV QOPXKFPmfH82uHLqR64F+5TrhGjXxDbv61nYNAqKzUaE9INnA1WN01iYmM2IWrTpyxEGnW67A lgWQNjc+Rlm/9fzU3Y4GE9zk59HpOu1y81ZoY4Pto2OhTYRksprb6IjIZC8o8Meefw5qx5gsx rEvNH4pngsFjEIZGOcLnFUV7jM7cM7JRrTlefbexy1c5S229JLBjzmptLpVJvYXEfbrTFSAlO In8hEqI1NV0G+GgItZROEDR8+xJTnItQ1/k1bn6VSaAX1ycai9rwEXcfvpiHRP8NWzCgL9Q2R BR0osjGLYVPkm/33cJ59u55xXrlBlgwUtZ2jsAd+YuncyejqOFVO2ryip1uqEhKL7GoOnCU5D QBFE/B8TZdx83SC5mRLXn9cUULckj+0z7TlRJvV7x2E7F8KBGeSDBIUNdoDaed/yqN/e40CwA fNWtwEpJ+c6wR/mkhpA9ULtl26wCOx5YnVkgOYI/PNw5p6+G2WPouqPlNfpJElTNid/FPLsF8 s5MCVHkh4EKgg/VC0ko6FxlJrLhePTRecEiHScSOxtEbfa96CI6KJsy+4j9em4Z+UVabyzWM+ xhXJ61zbKDEu3px/ONhvn9h0I/EzeG9ad6HjQ7s2xBaoLqZGOW3aZKV7/EO/+l8J5Kte4YT7g B6c+gvCTOr+ZPSQ8+h21Vs1dmwbxwPVlokOjbkkjMQcEM9g2itIhZcPm0RvAV5h1qoS8WKcus up2vlmpTDHpSR9ges2OuuxmNjXnxCy144o3dVxdNucUJ3OyEr+zyOa17DRocaunAtGYU2JV3T wwcHcO3FEHfm+dzmkyQqzre1DyEYu5LuucIRn0ZeYcvqltZHqEReZcKm4rsNTe9sPD5Qkxbp/ 2Wf/4rFduxtZnF4wOHbQQqxwtY+VCNFlGGiPLc9h0h0+a6F7kHmHhr98hnI1MdWsxXz+jnFDh Do12la1sB6DHoSmiMaHJggwDC4+PR6KtyqmMgDzvfJVM/gU2iMYZJ/xtlPKN+FVLCOBRvJvXF 4sbBkPhoGXpFGd5vqyifH3Pc5f0Xi3JUP4D1H3DyeF5LWb6XwAY6iwr8DA8KmrhQqxGZFp0TJ spliA9btU2+hki9CshlEZylATslbywwKF8067uyhBHEsEJ9rKW3OKs4Gvd7Zp0roGlJ2jawu3 gXSvrxTXE2WTG83UypElTJ0qkrN1ARPRSbeZGq3u+jP0XSXlWCrjbmOf8/p0+tDDTmQVgMTFN gRWLN85ldP6FbgLaC Received-SPF: pass client-ip=212.227.15.3; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/11 07:11:00 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Alberto Garcia , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Optionally install the resouce-agent so it gets picked up by pacemaker. Signed-off-by: Lukas Straub --- Makefile | 5 +++++ configure | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/Makefile b/Makefile index 8a9113e666..2ebffc4465 100644 --- a/Makefile +++ b/Makefile @@ -973,6 +973,11 @@ ifneq ($(DESCS),) $(INSTALL_DATA) "$$tmpf" \ "$(DESTDIR)$(qemu_datadir)/firmware/$$x"; \ done +endif +ifdef INSTALL_COLO_RA + mkdir -p "$(DESTDIR)$(libdir)/ocf/resource.d/qemu" + $(INSTALL_PROG) "scripts/colo-resource-agent/colo" \ + "$(DESTDIR)$(libdir)/ocf/resource.d/qemu/colo" endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ diff --git a/configure b/configure index 23b5e93752..c9252030cf 100755 --- a/configure +++ b/configure @@ -430,6 +430,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +colo_ra="no" edk2_blobs="no" pkgversion="" pie="" @@ -1309,6 +1310,10 @@ for opt do ;; --disable-blobs) blobs="no" ;; + --disable-colo-ra) colo_ra="no" + ;; + --enable-colo-ra) colo_ra="yes" + ;; --with-pkgversion=*) pkgversion="$optarg" ;; --with-coroutine=*) coroutine="$optarg" @@ -1776,6 +1781,7 @@ Advanced options (experts only): --enable-gcov enable test coverage analysis with gcov --gcov=GCOV use specified gcov [$gcov_tool] --disable-blobs disable installing provided firmware blobs + --enable-colo-ra enable installing the COLO resource agent for pacemaker --with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent --with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb) --tls-priority default TLS protocol/cipher priority string @@ -6647,6 +6653,7 @@ echo "Linux AIO support $linux_aio" echo "Linux io_uring support $linux_io_uring" echo "ATTR/XATTR support $attr" echo "Install blobs $blobs" +echo "Install COLO resource agent $colo_ra" echo "KVM support $kvm" echo "HAX support $hax" echo "HVF support $hvf" @@ -7188,6 +7195,9 @@ fi if test "$blobs" = "yes" ; then echo "INSTALL_BLOBS=yes" >> $config_host_mak fi +if test "$colo_ra" = "yes" ; then + echo "INSTALL_COLO_RA=yes" >> $config_host_mak +fi if test "$iovec" = "yes" ; then echo "CONFIG_IOVEC=y" >> $config_host_mak fi