From nobody Mon Nov 25 09:44:07 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1716416510; cv=none; d=zohomail.com; s=zohoarc; b=X3Cer1wRHS2vCc3aokfHCHareCvJKQWoj2xDz2Dtew/WQYIoSW7CTbmrmeImF27BYuDKgUnY8m6XvpX3tio2KSyv+fwFmH5gr8v3+0zIiWorPrLg/Cm3X6VUEAsUniwTZOT31sxGcwJgwTZwAC1uGhRacR1m9uD8YzYGuTMn/hQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716416510; 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=CMJip9+5oFU8A4pQeC4tJVCv9RGJwgkxbx7N9o02fhA=; b=JNflHCjn7YPFF0q0Ui5+RZTuoXVRqK//vm5DTR3QDjG2d4wN2orZQS1+9NW/7Vp3bX4FAMYhbfcosxHc/trsuXcTWP5i7CSbMyvewZ/XyvltcVZM7bWuYG4+H1aTMkiklc4qKsChLrg/oxC0fWsX5MHm+QUVyXYZ7e9RcvJGoTw= 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 1716416510659180.0234894327424; Wed, 22 May 2024 15:21:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9uKG-0005RA-7E; Wed, 22 May 2024 18:20:48 -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 1s9uKC-0005Qd-AV for qemu-devel@nongnu.org; Wed, 22 May 2024 18:20:44 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s9uK9-0003gs-MY for qemu-devel@nongnu.org; Wed, 22 May 2024 18:20:44 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 46F4D21C24; Wed, 22 May 2024 22:20:40 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6F6D513A6B; Wed, 22 May 2024 22:20:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id gMy+DbZvTmaABAAAD6G6ig (envelope-from ); Wed, 22 May 2024 22:20:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716416440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CMJip9+5oFU8A4pQeC4tJVCv9RGJwgkxbx7N9o02fhA=; b=zlnFzhHdhfQpu8Mf3Nxihssf6Qm3CEn/xeRvfCA+nO2NZoZBPb1EuPEjYg2wusbWRFY/nN AW61Q42koLLpK+IqQvwlvjzMmy9gOSVfJ8E6/svCJscu5KVKTIqiE/msD49BZrtu6ATUjh VsIXuWmtxAsHjCxwO6XoYCr+QRlaIW8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716416440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CMJip9+5oFU8A4pQeC4tJVCv9RGJwgkxbx7N9o02fhA=; b=cJi89CHsD1b52JUq287Fe1a2CBVlIGdjNwsP9mYS07GjryQOs1InU/oyiasIGZE7kppLgU ADVGDoIH3YlX65Cw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716416440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CMJip9+5oFU8A4pQeC4tJVCv9RGJwgkxbx7N9o02fhA=; b=zlnFzhHdhfQpu8Mf3Nxihssf6Qm3CEn/xeRvfCA+nO2NZoZBPb1EuPEjYg2wusbWRFY/nN AW61Q42koLLpK+IqQvwlvjzMmy9gOSVfJ8E6/svCJscu5KVKTIqiE/msD49BZrtu6ATUjh VsIXuWmtxAsHjCxwO6XoYCr+QRlaIW8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716416440; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CMJip9+5oFU8A4pQeC4tJVCv9RGJwgkxbx7N9o02fhA=; b=cJi89CHsD1b52JUq287Fe1a2CBVlIGdjNwsP9mYS07GjryQOs1InU/oyiasIGZE7kppLgU ADVGDoIH3YlX65Cw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Richard Henderson , Li Zhijian , Zhang Chen , Michael Tokarev Subject: [PULL 1/9] migration/colo: Minor fix for colo error message Date: Wed, 22 May 2024 19:20:26 -0300 Message-Id: <20240522222034.4001-2-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240522222034.4001-1-farosas@suse.de> References: <20240522222034.4001-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.77 / 50.00]; BAYES_HAM(-2.97)[99.87%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.77 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=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, 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 @suse.de) X-ZM-MESSAGEID: 1716416512487100003 Content-Type: text/plain; charset="utf-8" From: Li Zhijian - Explicitly show the missing module name: replication - Fix capability name to x-colo Reviewed-by: Peter Xu Reviewed-by: Zhang Chen Signed-off-by: Li Zhijian Suggested-by: Michael Tokarev [fixed mangled author email address] Signed-off-by: Fabiano Rosas --- migration/migration.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index e88b24f1e6..995f0ca923 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -513,13 +513,13 @@ void migration_incoming_disable_colo(void) int migration_incoming_enable_colo(void) { #ifndef CONFIG_REPLICATION - error_report("ENABLE_COLO command come in migration stream, but COLO " - "module is not built in"); + error_report("ENABLE_COLO command come in migration stream, but the " + "replication module is not built in"); return -ENOTSUP; #endif =20 if (!migrate_colo()) { - error_report("ENABLE_COLO command come in migration stream, but c-= colo " + error_report("ENABLE_COLO command come in migration stream, but x-= colo " "capability is not set"); return -EINVAL; } --=20 2.35.3