From nobody Mon Feb 9 03:48:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1601388960; cv=none; d=zohomail.com; s=zohoarc; b=hrzFjlZ+KqmJdocHbsUsbjFA49op4MjTzuoE5OgjyDOG2V+8j7KzxS0+tkX0sxjUAf4/nDhKsQ0J0QNYTtapKGkgDgeeVBi+YxQ9/9LZgGmGyg22Gb+dFSyO7un/4VPcHS2dEyxg6WdXuSbfIaLDbZyoEVt+d1laztWuSSk5940= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601388960; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MMW3RIcdncdFmJnsD+S8GJV52TuquA+Bz8QvxEwSQsU=; b=OR2K4J1C+NVKFcuOxUUYkIvfQKckgXAm9R/6unkpTXwEjpTj71RFNRK7BxT8E+9BN2kQxw+1sHGu5xpedFdoel+RXB3ZS8FXd7EwtThTjpL4i64PB7GZdV0A5Rai6KeZnygNUnoRu6mF3z8Gx84oOb4LPlKM/I+Lz6oTbTBPQHc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1601388960369683.5003055458964; Tue, 29 Sep 2020 07:16:00 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-141-mW2f2wqOMBiQMs_APfUY0w-1; Tue, 29 Sep 2020 10:15:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 509C8802B69; Tue, 29 Sep 2020 14:15:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C055F5579B; Tue, 29 Sep 2020 14:15:48 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 728311832FC1; Tue, 29 Sep 2020 14:15:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08TEFhkr015160 for ; Tue, 29 Sep 2020 10:15:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id B37611002C0E; Tue, 29 Sep 2020 14:15:43 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B0541002C0D for ; Tue, 29 Sep 2020 14:15:42 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601388959; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=MMW3RIcdncdFmJnsD+S8GJV52TuquA+Bz8QvxEwSQsU=; b=CQxdtADvlsrO97e927/9m5I6P4XpQU4GsvRU2suQXe4VgghnDloz+vDCJMxUK+HHAoNDKe HgAj0KPkmVxmOk19q8jI1UT5QchshUZKTjEblIDYEINP/ntTY6QJVQb9UhbNbLGJnxWMY9 v/Ay5hee85Z+yS2nRc7AF4xvRI8WUdU= X-MC-Unique: mW2f2wqOMBiQMs_APfUY0w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/6] qemu: migration: Rename qemuMigrationBakeCookie to qemuMigrationCookieFormat Date: Tue, 29 Sep 2020 16:15:31 +0200 Message-Id: <4c13316caea572d5df8face8cc0fb734b2984f9e.1601388825.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use a more descriptive name and move the verb to the end so that the functions conform with the naming policy. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_migration.c | 28 ++++++++++++++-------------- src/qemu/qemu_migration_cookie.c | 14 +++++++------- src/qemu/qemu_migration_cookie.h | 14 +++++++------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 5708334d2f..33591ba26b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2257,10 +2257,10 @@ qemuMigrationSrcBeginPhase(virQEMUDriverPtr driver, priv->origname, priv, NULL, 0, 0))) return NULL; - if (qemuMigrationBakeCookie(mig, driver, vm, - QEMU_MIGRATION_SOURCE, - cookieout, cookieoutlen, - cookieFlags) < 0) + if (qemuMigrationCookieFormat(mig, driver, vm, + QEMU_MIGRATION_SOURCE, + cookieout, cookieoutlen, + cookieFlags) < 0) return NULL; if (flags & VIR_MIGRATE_OFFLINE) { @@ -2758,9 +2758,9 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, goto stopjob; done: - if (qemuMigrationBakeCookie(mig, driver, vm, - QEMU_MIGRATION_DESTINATION, - cookieout, cookieoutlen, cookieFlags) < 0)= { + if (qemuMigrationCookieFormat(mig, driver, vm, + QEMU_MIGRATION_DESTINATION, + cookieout, cookieoutlen, cookieFlags) < = 0) { /* We could tear down the whole guest here, but * cookie data is (so far) non-critical, so that * seems a little harsh. We'll just warn for now. @@ -3917,9 +3917,9 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, QEMU_MIGRATION_COOKIE_STATS; if (qemuMigrationCookieAddPersistent(mig, &persistDef) < 0 || - qemuMigrationBakeCookie(mig, driver, vm, - QEMU_MIGRATION_SOURCE, - cookieout, cookieoutlen, cookieFlags) < 0)= { + qemuMigrationCookieFormat(mig, driver, vm, + QEMU_MIGRATION_SOURCE, + cookieout, cookieoutlen, cookieFlags) < = 0) { VIR_WARN("Unable to encode migration cookie"); } @@ -5401,10 +5401,10 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, priv->job.completed->statsType =3D QEMU_DOMAIN_JOB_STATS_TYPE_= MIGRATION; } - if (qemuMigrationBakeCookie(mig, driver, vm, - QEMU_MIGRATION_DESTINATION, - cookieout, cookieoutlen, - QEMU_MIGRATION_COOKIE_STATS) < 0) + if (qemuMigrationCookieFormat(mig, driver, vm, + QEMU_MIGRATION_DESTINATION, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_STATS) < 0) VIR_WARN("Unable to encode migration cookie"); /* Remove completed stats for post-copy, everything but timing fie= lds diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 3ea46e1527..124f61e3ea 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1389,13 +1389,13 @@ qemuMigrationCookieXMLParseStr(qemuMigrationCookieP= tr mig, int -qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, - virQEMUDriverPtr driver, - virDomainObjPtr dom, - qemuMigrationParty party, - char **cookieout, - int *cookieoutlen, - unsigned int flags) +qemuMigrationCookieFormat(qemuMigrationCookiePtr mig, + virQEMUDriverPtr driver, + virDomainObjPtr dom, + qemuMigrationParty party, + char **cookieout, + int *cookieoutlen, + unsigned int flags) { qemuDomainObjPrivatePtr priv =3D dom->privateData; diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index 95e7edb899..587f4206b7 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -152,13 +152,13 @@ struct _qemuMigrationCookie { int -qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, - virQEMUDriverPtr driver, - virDomainObjPtr dom, - qemuMigrationParty party, - char **cookieout, - int *cookieoutlen, - unsigned int flags); +qemuMigrationCookieFormat(qemuMigrationCookiePtr mig, + virQEMUDriverPtr driver, + virDomainObjPtr dom, + qemuMigrationParty party, + char **cookieout, + int *cookieoutlen, + unsigned int flags); qemuMigrationCookiePtr qemuMigrationEatCookie(virQEMUDriverPtr driver, --=20 2.26.2