From nobody Wed Oct 23 01:24:44 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=treblig.org ARC-Seal: i=1; a=rsa-sha256; t=1726753694; cv=none; d=zohomail.com; s=zohoarc; b=GspRBvx32CRggsWglBRZ4G0insTyN1WW2MMP6FjU9zYgdAkSE8URa9BcsZYFnIzkCUrFeA/kzCSORiB9Olm93dAdx0ldoUOtPoJgLkW3ILYAWguH7mDMspJVbTUpXCqCZhKkf1JR5bD7lZfCFmQqEhlg/CRsZiMwjeGMjBF744M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1726753694; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iIi4XYDAIN0x4iyYQPhfWqN51Z2+zfNdJj4hCZEgqfc=; b=cOTEMXk+6mdkvBkdLLUygoRgFUm5X6cZjDKdjN3GXZyy2nzoD6WUHZaaxtv5FgTqTtSHZfl3/sKfuDUdQUs4SjSharnT7oAeJGJC2iTtOUtIsVDuLVEgFbxXI+J6HKdfKDdr5D7exurzL7EQuGFbV/ScVQhxMQC4Wg6WckRW6EE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1726753694388454.8320431829459; Thu, 19 Sep 2024 06:48:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1srHUj-00081G-1f; Thu, 19 Sep 2024 09:46:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUW-0007CV-0H for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:45 -0400 Received: from mx.treblig.org ([2a00:1098:5b::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1srHUQ-0005zn-UP for qemu-devel@nongnu.org; Thu, 19 Sep 2024 09:46:39 -0400 Received: from localhost ([127.0.0.1] helo=dalek.home.treblig.org) by mx.treblig.org with esmtp (Exim 4.96) (envelope-from ) id 1srHUK-006QOJ-2B; Thu, 19 Sep 2024 13:46:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=treblig.org ; s=bytemarkmx; h=MIME-Version:Message-ID:Date:Subject:From:Content-Type:From :Subject; bh=iIi4XYDAIN0x4iyYQPhfWqN51Z2+zfNdJj4hCZEgqfc=; b=CHOnsEnZlnN+ASYZ l9UGUbxCQvTBQ9Isib7/6RxLwxpvQQWB+Y3kSZRZ5uaBfgLZ6e9r0wDzB8uq+hbyJTBZToexVvmIH ahqf3UcWVZ++l4neARVgfijLXErvtgB7+zEtbFrVUf6WZO+iHcbWZRjnWEKJsjvtXNmqZl5f7Q1wO g76x+DYKQKUR8VVSfK/CzWGEKJ5QDWac4fxsS4L0xNruUzKYaXsCbzyO+Zb2lfoCseEhheG6yhsMe b2CLom8BFSd0eIQH43pn3OSb7iAoDJY8hcrYVkFYrYM76QQMimUAGV7Rkfevx8gmW7c5VZUu9RAhC frWgqGobQk1Dzloy3Q==; From: dave@treblig.org To: peterx@redhat.com, farosas@suse.de, eblake@redhat.com, armbru@redhat.com Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Subject: [PATCH v2 1/7] migration: Remove migrate_cap_set Date: Thu, 19 Sep 2024 14:46:20 +0100 Message-ID: <20240919134626.166183-2-dave@treblig.org> X-Mailer: git-send-email 2.46.1 In-Reply-To: <20240919134626.166183-1-dave@treblig.org> References: <20240919134626.166183-1-dave@treblig.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1098:5b::1; envelope-from=dave@treblig.org; helo=mx.treblig.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @treblig.org) X-ZM-MESSAGEID: 1726753694869116600 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" migrate_cap_set has been unused since 18d154f575 ("migration: Remove 'blk/-b' option from migrate commands") Remove it. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Fabiano Rosas --- migration/options.c | 20 -------------------- migration/options.h | 1 - 2 files changed, 21 deletions(-) diff --git a/migration/options.c b/migration/options.c index 147cd2b8fd..9460c5dee9 100644 --- a/migration/options.c +++ b/migration/options.c @@ -605,26 +605,6 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps= , Error **errp) return true; } =20 -bool migrate_cap_set(int cap, bool value, Error **errp) -{ - MigrationState *s =3D migrate_get_current(); - bool new_caps[MIGRATION_CAPABILITY__MAX]; - - if (migration_is_running()) { - error_setg(errp, "There's a migration process in progress"); - return false; - } - - memcpy(new_caps, s->capabilities, sizeof(new_caps)); - new_caps[cap] =3D value; - - if (!migrate_caps_check(s->capabilities, new_caps, errp)) { - return false; - } - s->capabilities[cap] =3D value; - return true; -} - MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp) { MigrationCapabilityStatusList *head =3D NULL, **tail =3D &head; diff --git a/migration/options.h b/migration/options.h index a0bd6edc06..36e7b3723f 100644 --- a/migration/options.h +++ b/migration/options.h @@ -58,7 +58,6 @@ bool migrate_tls(void); /* capabilities helpers */ =20 bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp); -bool migrate_cap_set(int cap, bool value, Error **errp); =20 /* parameters */ =20 --=20 2.46.1