From patchwork Tue Aug 4 10:46:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 277144 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 58216C433DF for ; Tue, 4 Aug 2020 10:50:21 +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 2F22D2075D for ; Tue, 4 Aug 2020 10:50:21 +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="GsWGlf/U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F22D2075D 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2uWR-0002vE-Ng for qemu-devel@archiver.kernel.org; Tue, 04 Aug 2020 06:50:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2uTU-0000pu-PG for qemu-devel@nongnu.org; Tue, 04 Aug 2020 06:47:16 -0400 Received: from mout.web.de ([212.227.15.3]:52061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2uTS-0003Zi-PQ for qemu-devel@nongnu.org; Tue, 04 Aug 2020 06:47:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1596538005; bh=4+fu4YF7JnIr5t2XhnLwYWVOhDFdULGoP3KaQ0BaBYs=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=GsWGlf/UMH1GQyEzvOyZuH13zh3zyGIA9ZCzeTYka/g4xO7P3blCrr5bbyEofCjeP yk3GKk/2GNBqAepwbwhUXMlBKoV1WP7elKCZZEdn1qAW9M1PY7QE11Rbec+dFzOctx MNue1RwJABzuYZdde9HtsEX8tkAMgjubVrYr0+BU= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([89.247.255.220]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1N62yi-1knFjJ15j6-016NQ7; Tue, 04 Aug 2020 12:46:45 +0200 Date: Tue, 4 Aug 2020 12:46:42 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 1/7] block/quorum.c: stable children names Message-ID: <5d5f930424c1c770754041aa8ad6421dc4e2b58e.1596536719.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:ZUIWubNMRMn3fQD4t3xE6/tLITlKvRmaOvCQQXcjzL/dxBzdaO5 /EkrjbrX6o72wT0bChtH8UVyztSPyxwzI7PLpxqZ++o7Y7Q+fZq4IyATqjxNCZTUQrHDH6s NInDEEm9QY50PBRP7UAfCCpxyTAp/94i1+cQMdkQYq6uj4hqS+qkQ4FEBKMy3sz4l9H8a/T JspvVCppH2EDVxhNbnU1g== X-UI-Out-Filterresults: notjunk:1; V03:K0:dibcz/EU/NU=:MCNU3EN/nqqeHasMecoFFL uU0BJHXZ+rk+uoLfbqGRCkdri3r52S2x7ajupLWnSm3InsDGdFR+iGM9i32eeeaudBk9MEEDM EXkOeHoe4U5/IH6anLm5g4l/0NgxSEDIrXiULBBJHMT49ys1GL2OYSGX/zh9z9NYlVWc8VdbH tDnL9+t5zh1QpbDFOBgKVWzzzV22r6h9SQzOGbzrbTwjDNyksZ9MC54EptZ/GMA0VH02wxgLy /RrSHzLgqvM3+amD/du93qKBa7xNeOkVJG+8BljdlIw518RtD+jm7UMwrZREcXIHwNRieqoAi 8uQ+bK9V7HBxOnV+AwLdgVFlbc6odoY0iVcHx2J5o59NXEy6pbamfWI4Ty2fmq2uWp9bcAYdQ aEuRMVxzcC0Rc1IIAEiRZIsPtV8W+Jizzz7zxsh1u23is73AfjNU3QkiL9HBC9J8ZjgfWW088 0Wx5zLE2AnzQMAKvNCYdiWov04zmMHMLNsr7mrZjlpQWCRNJXrRnDVU3Bz0NxcC8K6htzdZqg +AHJ0fjW7tM425UqhCYXnuvY/JtNdS+mGmZ4ki3ieCYBzYXhb0c824mHS1MK7XDt6BO+93B0x Lx2bD8rBY2q15gYIomS9G6fPqrthg2DEhfMaJo1azi6XiTVoF9w46g1djcc7Pb6cqUSm/wTGC C8Fbhc9u0qajZhUZCLc1wbRLqNSsuo4NSaf8w4MO0pFubGDXS8csjOhd16xfv5Ca6M9s4yPCg 3gaFnfHNqPuMtxzFub4zVcTbahbTqv4QbJdkZ6tuYJUYzTbA9+7Re+8f+CRnjZSDT5EFgFaDo k38+ibFiZd/N7cRFsDHRbmm9FerOl1yEWQLg5+hzVlOWQiZ00Dn/wGOCTf7CMYo9mB1Cmd5qV RZt9JLHw9NkjLzF4mq7sUS1UI/tPWUjEMBZ+vUUZ+1WC8Sk7HvJIQcIiB5BTm+5GgC3b3h4u/ ai65BLY3CIKVnvoOK/yWXgSiUkBl4H4g3fW+hcbcO9DkE5pS3Xif5qZKzQM469G7t2gQ8aKSa Lr1QAQKMzU25+VlGE/ZhRmdojfhkGP9eJqYVRGa4sigCTSJsGVYMt7k+86b3EgCWoUbfwRS7z mkgDmF3HOMiLzvAnAlEYQpNhBKltztlBOM8hgY0myqjTdnqFzVBqfJR1mnL6uIelH38uY86UM 88xz9QrvZctdu5qZQnoyGpYcQMdHV0Eu4cZeO5Cic+3ydmc51ZDRjDCi1wRsEe1reWqhM1fCF 1VUjGNEYvMc2UMIkpF0U3wiNKdhEv5oHBLKwQ6A== 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/08/04 06:47:13 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If we remove the child with the highest index from the quorum, decrement s->next_child_index. This way we get stable children names as long as we only remove the last child. Signed-off-by: Lukas Straub Fixes: https://bugs.launchpad.net/bugs/1881231 Reviewed-by: Zhang Chen Reviewed-by: Alberto Garcia --- block/quorum.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/block/quorum.c b/block/quorum.c index 6df9449fc2..e846a7e892 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -29,6 +29,8 @@ #define HASH_LENGTH 32 +#define INDEXSTR_LEN 32 + #define QUORUM_OPT_VOTE_THRESHOLD "vote-threshold" #define QUORUM_OPT_BLKVERIFY "blkverify" #define QUORUM_OPT_REWRITE "rewrite-corrupted" @@ -970,9 +972,9 @@ static int quorum_open(BlockDriverState *bs, QDict *options, int flags, opened = g_new0(bool, s->num_children); for (i = 0; i < s->num_children; i++) { - char indexstr[32]; - ret = snprintf(indexstr, 32, "children.%d", i); - assert(ret < 32); + char indexstr[INDEXSTR_LEN]; + ret = snprintf(indexstr, INDEXSTR_LEN, "children.%d", i); + assert(ret < INDEXSTR_LEN); s->children[i] = bdrv_open_child(NULL, options, indexstr, bs, &child_of_bds, BDRV_CHILD_DATA, false, @@ -1024,7 +1026,7 @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs, { BDRVQuorumState *s = bs->opaque; BdrvChild *child; - char indexstr[32]; + char indexstr[INDEXSTR_LEN]; int ret; if (s->is_blkverify) { @@ -1039,8 +1041,8 @@ static void quorum_add_child(BlockDriverState *bs, BlockDriverState *child_bs, return; } - ret = snprintf(indexstr, 32, "children.%u", s->next_child_index); - if (ret < 0 || ret >= 32) { + ret = snprintf(indexstr, INDEXSTR_LEN, "children.%u", s->next_child_index); + if (ret < 0 || ret >= INDEXSTR_LEN) { error_setg(errp, "cannot generate child name"); return; } @@ -1068,6 +1070,7 @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child, Error **errp) { BDRVQuorumState *s = bs->opaque; + char indexstr[INDEXSTR_LEN]; int i; for (i = 0; i < s->num_children; i++) { @@ -1089,6 +1092,11 @@ static void quorum_del_child(BlockDriverState *bs, BdrvChild *child, /* We know now that num_children > threshold, so blkverify must be false */ assert(!s->is_blkverify); + snprintf(indexstr, INDEXSTR_LEN, "children.%u", s->next_child_index - 1); + if (!strncmp(child->name, indexstr, INDEXSTR_LEN)) { + s->next_child_index--; + } + bdrv_drained_begin(bs); /* We can safely remove this child now */ From patchwork Tue Aug 4 10:46:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 277143 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 0A298C433DF for ; Tue, 4 Aug 2020 10:55:49 +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 DB7022075D for ; Tue, 4 Aug 2020 10:55:48 +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="TFFe43em" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB7022075D 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36736 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2ubj-0006K6-VD for qemu-devel@archiver.kernel.org; Tue, 04 Aug 2020 06:55:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2uTX-0000r1-8z for qemu-devel@nongnu.org; Tue, 04 Aug 2020 06:47:19 -0400 Received: from mout.web.de ([212.227.15.3]:50295) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2uTV-0003a2-LQ for qemu-devel@nongnu.org; Tue, 04 Aug 2020 06:47:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1596538013; bh=e//HiURP75Et9ivYV9SJ55oWF+4mjUJe/Vs4sreEytA=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=TFFe43emDEPbZIIBpAs+0WIQkFDRrGoW0Xbc1xCZI5p18PsXGGcQGsN97AHRLwqOo RHIB0iOo5WyC6mFqhEhIpFx1TXpb5kHQb5v68BCsWJyPGFszqUJIXnSX6wmQ1DUqez 0niLXaCxi7cpPT2sj9LUjfKagIJ7x0qXChucx4yY= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([89.247.255.220]) by smtp.web.de (mrweb006 [213.165.67.108]) with ESMTPSA (Nemesis) id 1M604t-1k5MVK0XAh-007VNP; Tue, 04 Aug 2020 12:46:53 +0200 Date: Tue, 4 Aug 2020 12:46:52 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 3/7] boot_linux.py: Use pick_qemu_util Message-ID: <39a4ee6737c33d28d6b396d17b466ef56ba811fd.1596536719.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:rAU2kYwJua4PNEz4TOMABTGxOjbz/xS+d83nzgarfE2eEGDSyvB hnaSJdpj9VGhuR1PhlUhmXmcoGQqz9tZ5M7wGzZ9yWGO2CBet8gb24aKd/5A/RHn8WSsUae WyNUlM+W4pn/P+jgS9GLapTgQDpbJ4QR+r/wwCR4XGAv+WSQ7R6enlpdr5F71ERnaysUl6B 9+SFzBlZSGt0tIMhYXc0w== X-UI-Out-Filterresults: notjunk:1; V03:K0:QxDu5nbFX1k=:tmAkM+r1NXYq9YxF5YpO9r 953tinOezmkJoTPHxxGfvWCKT3JMC4ZlK+su4mhE+3odmwQ+kAS9IJvlo5lSaYPHZ7r3NlVvF RT1fnUFjg8O7eNOg1ml9rsKUwm7Lkf27JFbQYfdq11+GF7ULE3ZDx5/Xbn27HgNEi1eB5TiTh gVellXG5DSP0/6lOeqA/wGBada/apdF6AeqmJ8yV9PORUYXR46OlogMy2GTU88sGWBNcwNB8q /LupOkOLfJMA0NvV23msyG9x0UcTl+gZhEUneNzFKEsPxbIuUVGYc/POD8L9XTVylGxBSg1lU NXW0meiJon/nnBzOE0HJJWAwor4Csiu/V7nu59zZ/6x1UaP70GeiZ6Y349R419rF+Sr0N3Y+a m2TM9XDq9mZx8rVfFuyWjnaeknHgHX1g2mGM8MaxPFmmv+P4X7FOm0PibHQlfBKxxOuLFzXXd s6jreWt97MHR6mAe6QWEpj2NsqA9dSaHtctorIW1twZVsC+1QR6yIjqL15+sMnuV8vdCBwygP Y63uUpuPiFdFdpx6hxP6qGQoQ+vWYVFMA2nyCrfb8qlFIBtgkHofEZ6I+y1y7kL/tMS1hMuL8 9HMynF+66qU0HjzXiNs3AGc1uz4ImHl/bZ9i8PHWKhnitho6zTWyZaaDI0TiKxA0PiOl5bQ5H DBvkWp0S47/GGRjvi/xQlHE1I6eiNgKzABmGv+Mb8v1vJLA//exFSIbNkrmuHN8u/rkGKjZxD uY1wtv0uzWuDGadvYuVUprfPhcebpLs0kQEc+vHiX4CmhojkZvXw0GwS+KLAipLyGcv0Yi4ht 9cCDRhfZ/KZKSbbQp78wOvBY/mh3DKurMMAYYHtA+RJRTVlPVOTVpw7dFSmacB6r9EhGtFTkF SNy8TWvFzKhlLT3X6vsM1LEGJdvrDY1DpNYPvEv0U0menHsufHzD+sTfLpCgGlsxEV+/9I1vh xTzS1qHo2FlYKeKeAU2gySsxMXXP6klDhczfnLvB1rVwQoTXlhsDzA5gZTxwpXv9QMZ1/ZnJI a6R1FN9cv3ABbbiMbvElPOHLMMvpyD/ykypvIa+QKdKH+w3XbharIzNGbi6uQBucfGN9kv+LC C3sjP5P1YcmvHR6liJvwGi5L6A6k2hjgzC1jQrkbAznUPRygY244Zkpyeh46cxEKNhDeNPUi9 iNpmuQgJrNKdRExEdB5X9UkPZ0+AGlmBn373p62HPOT4s81kRncjbwhcihaAfXXO68hWGQU15 NtkRm1SotqUuKkXr/Cark0T55KwszNu5Dc5rBwg== 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/08/04 06:47:13 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Replace duplicate code with pick_qemu_util. Signed-off-by: Lukas Straub --- tests/acceptance/boot_linux.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 0055dc7cee..0d3629cabb 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -31,15 +31,8 @@ class BootLinuxBase(Test): def download_boot(self): self.log.debug('Looking for and selecting a qemu-img binary to be ' 'used to create the bootable snapshot image') - # If qemu-img has been built, use it, otherwise the system wide one - # will be used. If none is available, the test will cancel. - qemu_img = os.path.join(BUILD_DIR, 'qemu-img') - if not os.path.exists(qemu_img): - qemu_img = find_command('qemu-img', False) - if qemu_img is False: - self.cancel('Could not find "qemu-img", which is required to ' - 'create the bootable image') - vmimage.QEMU_IMG = qemu_img + + vmimage.QEMU_IMG = self.pick_qemu_util("qemu-img") self.log.info('Downloading/preparing boot image') # Fedora 31 only provides ppc64le images From patchwork Tue Aug 4 10:47:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Straub X-Patchwork-Id: 277142 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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS 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 CDB43C433E0 for ; Tue, 4 Aug 2020 11:06:22 +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 A3611206DA for ; Tue, 4 Aug 2020 11:06:22 +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="h9HAoLYf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A3611206DA 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k2ulx-0001PY-NT for qemu-devel@archiver.kernel.org; Tue, 04 Aug 2020 07:06:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2uTn-0000zi-Rv for qemu-devel@nongnu.org; Tue, 04 Aug 2020 06:47:35 -0400 Received: from mout.web.de ([212.227.17.12]:40481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k2uTl-0003cF-Qe for qemu-devel@nongnu.org; Tue, 04 Aug 2020 06:47:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=dbaedf251592; t=1596538029; bh=O/7XckwoOtMpoz1hmSWxudDgqLsR2nByhlKynLe0Tck=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References; b=h9HAoLYf48VPacbRoKDCuF1BdqNrd2TTKk+/YD3/FWJgYKn6Y/U9AO2MD6a5f/rfF xCbGR/41ruN7+BrTLqnZOwFKEHpUPaC9XlvtC8Jfzxcr9LJJjeBCXjfs5Eaqw0tsfn 4DmuYnafQC5hbzlzKxH04FRjMJHySLEmjNfCFEog= X-UI-Sender-Class: c548c8c5-30a9-4db5-a2e7-cb6cb037b8f9 Received: from luklap ([89.247.255.220]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MjBRn-1khRtI0o7R-00f8fd; Tue, 04 Aug 2020 12:47:09 +0200 Date: Tue, 4 Aug 2020 12:47:06 +0200 From: Lukas Straub To: qemu-devel Subject: [PATCH v3 6/7] configure,Makefile: Install colo resource-agent Message-ID: <108a9f4106fcc52f089c9bded571d46f79929235.1596536719.git.lukasstraub2@web.de> In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:724UH4ULdnYgsHHqfGjtg9VMHrOiuTi4sSyc4of7UxUnvwKXJ0x SVLhrcIuwm42CN3CIVf2EkGpIRyYzAJ2G5tsn1knnGa7b50IQtqejy8Le6FZEEoA0Y+PEFU Adm3g7CkGVK4ETLWMssoOqNFWJfPwgJJ9g8WG51nt5LXvdNivRdghguBBzzStmhmqAAwm5E 9b2GIpI+/+jGcBv2rOr9Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:i+iLXdHYT+Q=:2f9AM3uQh6Sh3vg30gbEP+ ZVI2YOxcHRpzxJvdw7t5K6V/ZBrKyPreuGyJfiWA5s8FqirMVpt9MagYPvydR3srkFtMmoy88 hfynTfmrpjRoT0kO6W43sE4b3w5EB7pED0as4YCrTAvmYHWPNm/QI2WUhV8Pighr0Gej/DHCD C/8RHoV9PkTjQPVaTBl2xOpmL1KPsITICtcGHJRvVwHDBn+vrVBBX/VpLaNad+yhTUyHGlOII fFU/Dbm3WNHPOab9AyucuHjhN8n4MdAupIiCR0DyauBs2ZrcM4Uh0tylqbTcPbVrX61GND7JK JclL9ghhK86BM28dnOcEB8S/1lheXD1rDXVNGuAy20mHGPbzxlPbtfCJzcaPl7CoToJ6mVWPI M73dgg4IOS877PQ68NewroI6hrKUSPsmkLyRuUJJStZSzlv9m7xBChfowzcL0RnEhQfIkN9OA ds39ncJ3EKG1f4gdY7VSozv4s4jGWFLnC9RG01h3UBiweSxNv/39kXClz/9ZAk2HTGaDP8wIy sHJyP6+qnYIs6VJrcz17YS5MvXDRaAm1t8ijXaZ4uS2EfLZ+K1opI3oF3YDCjJ58Yab1+jkEq Tu3msfUCIO1wuhDjZsUBbGxbapGU/TkBg58B0PzUhFymxiWsvmT14pV8P1a2wCnuW8gg4478m s/ZjNpJ1vcKCl0M4+BoV+m9AVqB5M24l5EmHn24VzZxJXS8GydsBWfuewqHdGyLtYWGdZimIc pqX+QT070LsqOruiyVbBkRHTnoBzTbMI+ZQDpEnJoFqVi/aBpHNfQXQWuHaXhxoNnDyCSA3oa Ptvg0oN/AIx6rKI3T/FlMyWwRzfDTuD8z5PkUVCBnkpZQhYzi8Mcm4uR0wjahq4n2mUt46WYb /KBIPcdci6biU8qAN6mJOk3k8BGIjPTSyyjCMcC0nh/zol1Y2lLkN9/qpqmzojhkRpnu/qDUV 2Qme/0MlLwQ43uifL9gD7F3tWYApVKEjtPAmGZG1M3saz1KNIWfm+HDLfgxSd8d/AOBQnNrP8 YJGp9bvGKKaw92hQkO7z/w3F/26yECpTQ1vX970yL+f5ZDTw2xEGgng3Vgl+MSYQj1XAgIU7y jICdP7IbIpet4GHJBlZWJHrxaNx11fGFjC3+2Iiz//6rAW6EF7FbN/eGhxf6Jf4NZGLnnmtIP oKuLGQzMkiMREkp30N5KFwvMMO+Ed/fwD32r1lPh+id13XhKd1wCuuDGys7s+lJ5Sl2ff/BPJ 3eLdp9+IyaZ9vHSQNBasUQj9vVCHZ5jcPpsG3aw== 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/08/04 06:47:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 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.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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+qemu-devel=archiver.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 c2120d8d48..dccc20b120 100644 --- a/Makefile +++ b/Makefile @@ -969,6 +969,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 2acc4d1465..39051d25f8 100755 --- a/configure +++ b/configure @@ -438,6 +438,7 @@ softmmu="yes" linux_user="no" bsd_user="no" blobs="yes" +colo_ra="no" edk2_blobs="no" pkgversion="" pie="" @@ -1336,6 +1337,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" @@ -1821,6 +1826,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 @@ -6930,6 +6936,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" @@ -7496,6 +7503,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