From patchwork Sat Jun 6 19:18:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 11591347 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B7161667 for ; Sat, 6 Jun 2020 19:32:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 21B702067B for ; Sat, 6 Jun 2020 19:32:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=web.de header.i=@web.de header.b="F1VWM23H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21B702067B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=web.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jheXz-0006pa-UO for patchwork-qemu-devel@patchwork.kernel.org; Sat, 06 Jun 2020 15:32:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40834) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL8-0004hq-V8 for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:46 -0400 Received: from mout.web.de ([212.227.17.12]:57427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jheL7-0005do-No for qemu-devel@nongnu.org; Sat, 06 Jun 2020 15:18:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1591471097; bh=M2wUbERBYXkG9+JKl52v0XU9Jkn+Ar+DrSWBvHw2TRs=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=F1VWM23HU3KMePOYdou/mvm4D44+ZR1wLRyk9F1jz5gxR5yBmieMsAyrSrQBvtTSp LDlBY6KsArpAbUvEDyyQfneGdYnxZx5SRS0IAu0YWcrVq/dHk8RMG4C+c7ZUf6tBmA +w4SWlPXA0HCdXhRwQgBohsC/iG667zagQO1lTIc= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([87.123.206.73]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0M57Vi-1ikbgt1x42-00zFj1; Sat, 06 Jun 2020 21:18:17 +0200 Date: Sat, 6 Jun 2020 21:18:16 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v2 6/7] configure,Makefile: Install colo resource-agent Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:O1sxOPo1cfXbWRMsgDzY+tHhX+15cbpW1Gp4bUWbhdG3VuFw6RC JFQpLwydxvmbHUi5NWaa/nt9f/wV3CmjBhGSo4ASUSz3Q+IMfkSDxvDS4rEBnReb/YHalLy vFanEkyb2CHwqxaJH6/T6aVM9KJuZ8TpPZbwXKoqVVu3Add9BTzOraPV53CO7U7uvOJE9Xt VhlKuCJBq3wIiVmcuvhqw== X-UI-Out-Filterresults: notjunk:1;V03:K0:7FYAYU9faS0=:pV857PrqQavR9e5dxCZhcT NFREqDqqK7ZB7zvZdjwbYSl+Ib8iwqofSGyF9Vt+tAjByV5tkRfwhXdSoALIYS5n826rjT4Jt aqxOtOgEILlRvgyKxQVvWAfnE9pNyvFl4KwANzhPhpWj+s7xRWCUCDSsxA4xiWQJuKNBj9aA0 6sAsmORWsITO/wB7hq1V6mbI6IY1eFCKCvnuk7+aDe8dXjKFeeWmwbat/BkSWN8OyWGoqoHVE H/5jEzsm+EHs6+BSERohAIJgWvg+F6bHXrL1BjOpb5cf38f7sQ0yewhZvSqSn43nnAfrFf7o/ wzdIrh/F4OnLK29faLx1fV9kmkSexzOlRnhrOq5zb3Qm1Ursq9/iN9CeKms8nbb36Pytx8le3 miKdk5IUNxG78NhUTOKadYl9dw1Juu2mLMezZyBq+pRRdIJKMg1Z6Ign6/Ub2JcSZeAlkebGb zPZYptJ9WXMC0t153fh7+OHH6ZScxdVXXiI0seuxcQzupNcPiFT2gHsGnjWhrKaxyR2nbhlvw Vgzomqjpgd4pcSr/GFs0I4fVrmOSHOQy7szcGroETU+VwW2ScEI62jjEiQ9rKyGOwY3awEffn 4yvW2LdgvUMFIy1eSKLPoGx6L1XWPoknsK1p0G83pgyPqLSEUZGLyPQ9GRHy5Oe8iAOYW+Lwo CBt7JyL/vif/OwKkZVaz9SHnFUpFpGgRONN7Ac06vW8B/77MgzD4WXtMqi+8salzrydIwe3gj 8Zu0DlH8MWzbagEC4qeBFjV3+ke7ayL7/b5HIBg4KITdZtpccUbIHT7ISm+0GBM8j3pVetj6A PbRj5cxhR6SVHkb41pXui28BTDXbUZ37wr1Sp9wYE0G59KjVLTVIsZevMNrbkK/LbYmDXxIXM Usl2lN1K1jhcrvgdrAwVhtyrEtTD6WuXRRnnf+YaE+NqnOdkMOL87HR/whggglf4lRPXNr4JF VHOID+tm/vsvEZbhv6mrHoU6FZw5scgfmrFaaul3T/5cYNqenQ2A916wdlnm6iZpyrWBpzzEh J+UEktjzV6sAExsV1aCKh+rLtONEA8XWlMFgTPrfOTLFCs4dKuCFBYY2e4TmlpP7S/wleTSu3 d2zJFul3SjS+tJu406rKRZpY52VwPkaGCsB/MPzT3WkI0WQT6wFtg67Raq/QNvoB+/R5ImRu+ hxrhvCtnoALdgM15b+SopjdEojKzy0IWXgAXJ/nnv0QSDlvsegh14IcTlbxDz31D25NBFXpoz qP854NvmJ61/d/FIc Received-SPF: pass client-ip=212.227.17.12; envelope-from=lukasstraub2@web.de; helo=mout.web.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/06 15:18:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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: Kevin Wolf , Alberto Garcia , "Dr. David Alan Gilbert" , Wainer dos Santos Moschetta , Max Reitz , Zhang Chen , Cleber Rosa , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.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(+) -- 2.20.1 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