From nobody Sun Feb 8 15:07:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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 170.10.129.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=1654087932; cv=none; d=zohomail.com; s=zohoarc; b=Xd9NdWB6qbZ8tIfinapP8YuOGpHhmGAFyKshrdfTrazRU8Dc5TF+COZBohfO+JQdrFwdo1gL9/QTHeHMAWd02Jv7mWo4LXw4kTgTG43Dkb3OnQ7DkcwoT6PFMGGScSWM+W+XC2X3rLSfvQ2quBZvxLUhPn37+etj+98eEq+UlDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654087932; h=Content-Type:Content-Transfer-Encoding:Cc: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=MD0W2sRkisrUCK0Q11G5q3yBw1b03TjrGW9ECgMciZo=; b=FypZwnkr/s9oGsHdRW+9UpmeMVku3O/q4RkdEMmc8pSnnqLeeqAYh2xMZcDDt12vrE03N8UMhqxnbRoUieCRt92PpD7qaoxAvhC6WWj9p854N/LX9Iklrv8+U0Zddzk2i3AZ+JxOVuJb1cBSxn560jNOi+FG+FwR8H/q4Uayhro= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1654087932110484.07739949191864; Wed, 1 Jun 2022 05:52:12 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-JGkObXnnOxWvPgyHG1y3CQ-1; Wed, 01 Jun 2022 08:51:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E25D8339B7; Wed, 1 Jun 2022 12:50:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 579192166B2C; Wed, 1 Jun 2022 12:50:48 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 948241940368; Wed, 1 Jun 2022 12:50:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3824C194E103 for ; Wed, 1 Jun 2022 12:50:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 13AA41415108; Wed, 1 Jun 2022 12:50:29 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E68DD1415103; Wed, 1 Jun 2022 12:50:28 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 8A450245B6C; Wed, 1 Jun 2022 14:50:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654087931; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=MD0W2sRkisrUCK0Q11G5q3yBw1b03TjrGW9ECgMciZo=; b=C594ViHCoBNHhSlzWTisnIyWX1opYUmAgx39IwoEOSGjg4ulcpzZYk1CpmypG42axu0/Rq Gjf+BPD95JhR0yWBWT7ZO4oLUCVk6BSTK9vVFrBl5XA7wHR2ZE17XCu9tWL8BBwmApmT9G DTaNXdUrJimV6Iiz0xIEZ5GSaFEQ/MU= X-MC-Unique: JGkObXnnOxWvPgyHG1y3CQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH v2 32/81] qemu: Separate cookie parsing for qemuMigrationDstFinishOffline Date: Wed, 1 Jun 2022 14:49:32 +0200 Message-Id: <3a813db44731678ea51dc868e7f93f455f38fc78.1654087150.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Krempa , Pavel Hrdina Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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) X-ZM-MESSAGEID: 1654087934163100015 Content-Type: text/plain; charset="utf-8" To keep all cookie handling (parsing and formatting) in the same function. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa Reviewed-by: Pavel Hrdina --- Notes: Version 2: - no change src/qemu/qemu_migration.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 01e47e46cc..3c69ddbd45 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5812,11 +5812,19 @@ static virDomainPtr qemuMigrationDstFinishOffline(virQEMUDriver *driver, virConnectPtr dconn, virDomainObj *vm, - qemuMigrationCookie *mig, + int cookie_flags, + const char *cookiein, + int cookieinlen, char **cookieout, int *cookieoutlen) { virDomainPtr dom =3D NULL; + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(qemuMigrationCookie) mig =3D NULL; + + if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, + cookiein, cookieinlen, cookie_fla= gs))) + return NULL; =20 if (qemuMigrationDstPersist(driver, vm, mig, false) < 0) return NULL; @@ -6019,13 +6027,11 @@ qemuMigrationDstFinish(virQEMUDriver *driver, * even though VIR_MIGRATE_PERSIST_DEST was not used. */ cookie_flags |=3D QEMU_MIGRATION_COOKIE_PERSISTENT; =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, - cookiein, cookieinlen, cookie_fla= gs))) - goto error; - if (flags & VIR_MIGRATE_OFFLINE) { if (retcode =3D=3D 0) { - dom =3D qemuMigrationDstFinishOffline(driver, dconn, vm, mig, + dom =3D qemuMigrationDstFinishOffline(driver, dconn, vm, + cookie_flags, + cookiein, cookieinlen, cookieout, cookieoutlen); } =20 @@ -6033,6 +6039,10 @@ qemuMigrationDstFinish(virQEMUDriver *driver, goto cleanup; } =20 + if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, + cookiein, cookieinlen, cookie_fla= gs))) + goto error; + if (retcode !=3D 0) { /* Check for a possible error on the monitor in case Finish was ca= lled * earlier than monitor EOF handler got a chance to process the er= ror --=20 2.35.1