From nobody Sun Feb 8 19:56:49 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=1601388994; cv=none; d=zohomail.com; s=zohoarc; b=PIb/cWTiTFgxHA//Hg4zkUcDiXKPd6LpJrXEt3Wpeju/sLoa5z8rEZiDAnz/aL4HroDm8qSvipySVflapC9SxgZQrAGo/8GexisrWdsofdUwfgW5h9aqgKK8AIkUMxA6cCqb93+YNhFc0YyGyuSqyecI+TIDEDVQ6m8YAPBQaOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601388994; 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=qPXtc/VCwJZH232+XIlhLcLPiRgSuF5xtkNw+BSUg2Q=; b=AuY4pjzAizV59TGKEBDXzxc19M1vakbX/Vs2Aez2zJGoy5CqqQucAib3LIUWIQ77wA882TUqlghQ0VRFpxgyLoPHiUtFbnuCuqIq59bDqbBTOHA7T5shUNzHcOkE99Tp9UGNTDu5uEvShhI5dGwV23POEx1o4o5Zv60WBO/g7Y8= 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 1601388994293602.8023179384769; Tue, 29 Sep 2020 07:16:34 -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-173-Nkq4Fw5CO7-MiPqGOhCwyw-1; Tue, 29 Sep 2020 10:16:25 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9931110BBEDD; Tue, 29 Sep 2020 14:16:10 +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 2697E277D0; Tue, 29 Sep 2020 14:16:10 +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 D5F2F1832FC4; Tue, 29 Sep 2020 14:16:09 +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 08TEFog8015210 for ; Tue, 29 Sep 2020 10:15:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 365E31001281; Tue, 29 Sep 2020 14:15:50 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 549851002C13 for ; Tue, 29 Sep 2020 14:15:49 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601388993; 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=qPXtc/VCwJZH232+XIlhLcLPiRgSuF5xtkNw+BSUg2Q=; b=bMrHN9Cu2vt2p8qw6UzEoEoZvlxdBoaGNDcl9mDSCa8spIY1Ha9PSM3qoZvxf+iESji6GH 9patu5BbFEFcoHG3X64CbGKIFXQJdpczPvl7kCm9mt765gMPkOw5iirnZ3tfb7/Wq4BDff p+RDfHeck/3Akby690impEIG30XGlqY= X-MC-Unique: Nkq4Fw5CO7-MiPqGOhCwyw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 6/6] qemu: migration: Rename qemuMigrationEatCookie to qemuMigrationCookieParse Date: Tue, 29 Sep 2020 16:15:36 +0200 Message-Id: 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.84 on 10.5.11.23 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 | 38 ++++++++++++++++---------------- src/qemu/qemu_migration_cookie.c | 14 ++++++------ src/qemu/qemu_migration_cookie.h | 14 ++++++------ 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 7017058089..009b556d0a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2592,15 +2592,15 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver, /* Parse cookie earlier than adding the domain onto the * domain list. Parsing/validation may fail and there's no * point in having the domain in the list at that point. */ - if (!(mig =3D qemuMigrationEatCookie(driver, *def, origname, NULL, - cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_LOCKSTATE | - QEMU_MIGRATION_COOKIE_NBD | - QEMU_MIGRATION_COOKIE_MEMORY_HOTPLU= G | - QEMU_MIGRATION_COOKIE_CPU_HOTPLUG | - QEMU_MIGRATION_COOKIE_CPU | - QEMU_MIGRATION_COOKIE_ALLOW_REBOOT | - QEMU_MIGRATION_COOKIE_CAPS))) + if (!(mig =3D qemuMigrationCookieParse(driver, *def, origname, NULL, + cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_LOCKSTATE | + QEMU_MIGRATION_COOKIE_NBD | + QEMU_MIGRATION_COOKIE_MEMORY_HOTP= LUG | + QEMU_MIGRATION_COOKIE_CPU_HOTPLUG= | + QEMU_MIGRATION_COOKIE_CPU | + QEMU_MIGRATION_COOKIE_ALLOW_REBOO= T | + QEMU_MIGRATION_COOKIE_CAPS))) goto cleanup; if (!(vm =3D virDomainObjListAdd(driver->domains, *def, @@ -3112,9 +3112,9 @@ qemuMigrationSrcConfirmPhase(virQEMUDriverPtr driver, ? QEMU_MIGRATION_PHASE_CONFIRM3 : QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED); - if (!(mig =3D qemuMigrationEatCookie(driver, vm->def, priv->origname, = priv, - cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_STATS))) + if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, + cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_STATS))) return -1; if (retcode =3D=3D 0) @@ -3662,11 +3662,11 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver, } } - mig =3D qemuMigrationEatCookie(driver, vm->def, priv->origname, priv, - cookiein, cookieinlen, - cookieFlags | - QEMU_MIGRATION_COOKIE_GRAPHICS | - QEMU_MIGRATION_COOKIE_CAPS); + mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, + cookiein, cookieinlen, + cookieFlags | + QEMU_MIGRATION_COOKIE_GRAPHICS | + QEMU_MIGRATION_COOKIE_CAPS); if (!mig) goto error; @@ -5198,8 +5198,8 @@ qemuMigrationDstFinish(virQEMUDriverPtr driver, * even though VIR_MIGRATE_PERSIST_DEST was not used. */ cookie_flags |=3D QEMU_MIGRATION_COOKIE_PERSISTENT; - if (!(mig =3D qemuMigrationEatCookie(driver, vm->def, priv->origname, = priv, - cookiein, cookieinlen, cookie_flags= ))) + if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, + cookiein, cookieinlen, cookie_fla= gs))) goto endjob; if (flags & VIR_MIGRATE_OFFLINE) { diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 1596ab914b..c128f541dd 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1441,13 +1441,13 @@ qemuMigrationCookieFormat(qemuMigrationCookiePtr mi= g, qemuMigrationCookiePtr -qemuMigrationEatCookie(virQEMUDriverPtr driver, - const virDomainDef *def, - const char *origname, - qemuDomainObjPrivatePtr priv, - const char *cookiein, - int cookieinlen, - unsigned int flags) +qemuMigrationCookieParse(virQEMUDriverPtr driver, + const virDomainDef *def, + const char *origname, + qemuDomainObjPrivatePtr priv, + const char *cookiein, + int cookieinlen, + unsigned int flags) { g_autoptr(qemuMigrationCookie) mig =3D NULL; diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index dee1e9c8b9..f2801b2704 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -165,13 +165,13 @@ qemuMigrationCookieFormat(qemuMigrationCookiePtr mig, unsigned int flags); qemuMigrationCookiePtr -qemuMigrationEatCookie(virQEMUDriverPtr driver, - const virDomainDef *def, - const char *origname, - qemuDomainObjPrivatePtr priv, - const char *cookiein, - int cookieinlen, - unsigned int flags); +qemuMigrationCookieParse(virQEMUDriverPtr driver, + const virDomainDef *def, + const char *origname, + qemuDomainObjPrivatePtr priv, + const char *cookiein, + int cookieinlen, + unsigned int flags); void qemuMigrationCookieFree(qemuMigrationCookiePtr mig); --=20 2.26.2