From nobody Sun Feb 8 01:30:49 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=1669824940; cv=none; d=zohomail.com; s=zohoarc; b=cYNGesv8WQrwnAJbNiJ79cGFaSboVb5rORRlZE+ryjCaviRq/rhtSrdIFgNAsWMBcTxqpVIo6qTSQRZ+V6JrXJjg6KfDc308lm48hEdTdNizhfmBd+VMkeqixipHjLegIaRyei743dnUVOFWmpie2xWlN3wYyjNWoP9UQoBSqV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669824940; 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=ffaXpOn7bWq/CBoE4f3SuswDORG7NInYQbp04cvJHWU=; b=cu8q76p8rUMKjDPMGQBiWLOSbH9Lkk0rYE2D9NjPLkv9ea6+QoHpDsR6LzQ1HTA672vNZahuZl3FRI5dOI3he4Q4k4F2XY/Rdb3+YX31NsqD658GR3p6PeH3EU/girMZkODSynHHBn13oWvUVFduS8C1bmCBV0WU20Tc+D7/BLk= 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 1669824940875243.12346719833818; Wed, 30 Nov 2022 08:15:40 -0800 (PST) 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-639-XOeLypxCN-GDMgMqWmE5hw-1; Wed, 30 Nov 2022 11:15:35 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 67F1B185A792; Wed, 30 Nov 2022 16:15:32 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 568FB492B04; Wed, 30 Nov 2022 16:15:32 +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 312F019465B8; Wed, 30 Nov 2022 16:15:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 89E181946586 for ; Wed, 30 Nov 2022 15:14:01 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7BA9F40C6E16; Wed, 30 Nov 2022 15:14:01 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C35F40C6E15 for ; Wed, 30 Nov 2022 15:14:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669824939; 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=ffaXpOn7bWq/CBoE4f3SuswDORG7NInYQbp04cvJHWU=; b=bAz8TPOrnEVwqJQELq/YGRbCscjbmoqCZAkThaMfzHVc8MGSD6phcgPstOMuzUt5FGTqvB ujImmd3TqR9DyxRgpApGwe2Q0zwYsWqbpqDc2eOeQmjtOR3rvpeaRzvIM+fLbH5w51WqUa iwcA0Bfjq/QL3lZRlMfuLuFuXA2MGp8= X-MC-Unique: XOeLypxCN-GDMgMqWmE5hw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] qemu: Reorder qemuMigrationCookieParse arguments Date: Wed, 30 Nov 2022 16:12:58 +0100 Message-Id: <27218020384334e0cb364ba330da28a707e0e58e.1669821130.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1669824941068100002 Content-Type: text/plain; charset="utf-8" When an internal API takes a vm pointer, it's usually just after the driver argument. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 30 ++++++++++++++---------------- src/qemu/qemu_migration_cookie.c | 4 ++-- src/qemu/qemu_migration_cookie.h | 4 ++-- tests/qemumigrationcookiexmltest.c | 4 ++-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6d3810c79c..64c656ef2f 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3316,7 +3316,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *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 qemuMigrationCookieParse(driver, *def, origname, NULL, + if (!(mig =3D qemuMigrationCookieParse(driver, NULL, *def, origname, N= ULL, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_LOCKSTATE | QEMU_MIGRATION_COOKIE_NBD | @@ -3324,8 +3324,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver, QEMU_MIGRATION_COOKIE_CPU_HOTPLUG= | QEMU_MIGRATION_COOKIE_CPU | QEMU_MIGRATION_COOKIE_CAPS | - QEMU_MIGRATION_COOKIE_BLOCK_DIRTY= _BITMAPS, - NULL))) + QEMU_MIGRATION_COOKIE_BLOCK_DIRTY= _BITMAPS))) goto cleanup; =20 if (!(vm =3D virDomainObjListAdd(driver->domains, def, @@ -3466,9 +3465,9 @@ qemuMigrationDstPrepareResume(virQEMUDriver *driver, goto cleanup; } =20 - if (!(mig =3D qemuMigrationCookieParse(driver, def, origname, NULL, + if (!(mig =3D qemuMigrationCookieParse(driver, vm, def, origname, NULL, cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_CAPS, vm))) + QEMU_MIGRATION_COOKIE_CAPS))) goto cleanup; =20 priv->origname =3D g_strdup(origname); @@ -3936,9 +3935,9 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, if (qemuMigrationJobStartPhase(vm, phase) < 0) return -1; =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, + if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, priv, cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_STATS, vm))) + QEMU_MIGRATION_COOKIE_STATS))) return -1; =20 if (retcode =3D=3D 0) @@ -4769,13 +4768,12 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } } =20 - mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, + mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, = priv, cookiein, cookieinlen, cookieFlags | QEMU_MIGRATION_COOKIE_GRAPHICS | QEMU_MIGRATION_COOKIE_CAPS | - QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMA= PS, - vm); + QEMU_MIGRATION_COOKIE_BLOCK_DIRTY_BITMA= PS); if (!mig) goto error; =20 @@ -5060,9 +5058,9 @@ qemuMigrationSrcResume(virDomainObj *vm, =20 VIR_DEBUG("vm=3D%p", vm); =20 - mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname, priv, + mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, = priv, cookiein, cookieinlen, - QEMU_MIGRATION_COOKIE_CAPS, vm); + QEMU_MIGRATION_COOKIE_CAPS); if (!mig) return -1; =20 @@ -6458,8 +6456,8 @@ qemuMigrationDstFinishOffline(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(qemuMigrationCookie) mig =3D NULL; =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, - cookiein, cookieinlen, cookie_fla= gs, vm))) + if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, priv, + cookiein, cookieinlen, cookie_fla= gs))) return NULL; =20 if (qemuMigrationDstPersist(driver, vm, mig, false) < 0) @@ -6654,8 +6652,8 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, VIR_DEBUG("vm=3D%p, flags=3D0x%lx, retcode=3D%d", vm, flags, retcode); =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm->def, priv->origname= , priv, - cookiein, cookieinlen, cookie_fla= gs, vm))) + if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, priv, + cookiein, cookieinlen, cookie_fla= gs))) goto error; =20 if (retcode !=3D 0) { diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 4d070e438d..da12f58bda 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1490,13 +1490,13 @@ qemuMigrationCookieFormat(qemuMigrationCookie *mig, =20 qemuMigrationCookie * qemuMigrationCookieParse(virQEMUDriver *driver, + virDomainObj *vm, const virDomainDef *def, const char *origname, qemuDomainObjPrivate *priv, const char *cookiein, int cookieinlen, - unsigned int flags, - virDomainObj *vm) + unsigned int flags) { g_autoptr(qemuMigrationCookie) mig =3D NULL; =20 diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index 07776aaa8b..f9927175fa 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -189,13 +189,13 @@ qemuMigrationCookieFormat(qemuMigrationCookie *mig, =20 qemuMigrationCookie * qemuMigrationCookieParse(virQEMUDriver *driver, + virDomainObj *vm, const virDomainDef *def, const char *origname, qemuDomainObjPrivate *priv, const char *cookiein, int cookieinlen, - unsigned int flags, - virDomainObj *vm); + unsigned int flags); =20 void qemuMigrationCookieFree(qemuMigrationCookie *mig); diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookie= xmltest.c index 6f650213e2..bb19baad54 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -141,13 +141,13 @@ testQemuMigrationCookieParse(const void *opaque) g_auto(virBuffer) actual =3D VIR_BUFFER_INITIALIZER; =20 if (!(data->cookie =3D qemuMigrationCookieParse(&driver, + data->vm, data->vm->def, NULL, priv, data->xmlstr, data->xmlstrlen, - data->cookieParseFlags, - data->vm))) { + data->cookieParseFlags))= ) { VIR_TEST_DEBUG("\nfailed to parse qemu migration cookie:\n%s\n", d= ata->xmlstr); return -1; } --=20 2.38.1 From nobody Sun Feb 8 01:30:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1669824491; cv=none; d=zohomail.com; s=zohoarc; b=igoohS3Ab7I/FLZM0q0FyAXrs0iQKasvw2AWptvtval/jjKyG38JYe/V1kG3paHv1sUwKXrWWuCwJS94EyJ+pkHGxMkSxcAT7w/jobqi4h8+jm8VPwyeuyKlFdqy414kGSjmCoKtPyyh0+nRfgYQnwf+afbSHkYK0nCd9nsyv1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669824491; 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=oFvCVCNt9VCNfmckEAPHAgE49rJS6G0lXJH7G2lT0Ng=; b=ZaDcIU+k0MzS8at+YxK+J4iO+BUJ6l3/B1M9jjhcSzNsYGHPhzEui9SyhzJ/ur6d2s6H7WRXIF8L4kmRDWKUgwGN+QeQPrzc6y/hbKrw0T4M7ioelMAPwPFyEOUd5hfHMd8PQfFJ8RrueGbTGyUuZP7bVfH1I4BbBuQ8xTcnukM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1669824491521939.279751717791; Wed, 30 Nov 2022 08:08:11 -0800 (PST) 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-151-etqM3tmCN0SpKdlIC8yHGA-1; Wed, 30 Nov 2022 11:07:18 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C4E180600A; Wed, 30 Nov 2022 16:07:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 57C9C492CA4; Wed, 30 Nov 2022 16:07:13 +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 1E55A19465A0; Wed, 30 Nov 2022 16:07:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 902811946586 for ; Wed, 30 Nov 2022 15:14:02 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 831A4492B15; Wed, 30 Nov 2022 15:14:02 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44617492B04 for ; Wed, 30 Nov 2022 15:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669824490; 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=oFvCVCNt9VCNfmckEAPHAgE49rJS6G0lXJH7G2lT0Ng=; b=De+MRNqN4i9XXbMWBxcj5o+rUifUkTURm/VW/hk1QFhiRMlm1PwcRvA+XI8IwxnxPVO9P9 GXM7pNU0u6nz7kB0AsxsuvY42G2KGXxI0kLg1OM6vwWUgM5JqWsSYic1vZjpyS1l3G2gYY CZoWva5g2sUd3lcjsllBmyWs41bRxqA= X-MC-Unique: etqM3tmCN0SpKdlIC8yHGA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] qemu: Replace priv with qemuCaps in qemuMigrationCookieParse Date: Wed, 30 Nov 2022 16:12:59 +0100 Message-Id: <7625eb3145d0385dc52d6e37851ab8825e1751a4.1669821130.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: 1669824492000100001 Content-Type: text/plain; charset="utf-8" QEMU capabilities is the only thing we use from priv so we can just pass that directly. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 15 ++++++++++----- src/qemu/qemu_migration_cookie.c | 8 ++------ src/qemu/qemu_migration_cookie.h | 2 +- tests/qemumigrationcookiexmltest.c | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 64c656ef2f..49bde48c01 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3935,7 +3935,8 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver, if (qemuMigrationJobStartPhase(vm, phase) < 0) return -1; =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, priv, + if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, + priv->qemuCaps, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_STATS))) return -1; @@ -4768,7 +4769,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } } =20 - mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, = priv, + mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, + priv->qemuCaps, cookiein, cookieinlen, cookieFlags | QEMU_MIGRATION_COOKIE_GRAPHICS | @@ -5058,7 +5060,8 @@ qemuMigrationSrcResume(virDomainObj *vm, =20 VIR_DEBUG("vm=3D%p", vm); =20 - mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, = priv, + mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->origname, + priv->qemuCaps, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_CAPS); if (!mig) @@ -6456,7 +6459,8 @@ qemuMigrationDstFinishOffline(virQEMUDriver *driver, qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(qemuMigrationCookie) mig =3D NULL; =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, priv, + if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, + priv->qemuCaps, cookiein, cookieinlen, cookie_fla= gs))) return NULL; =20 @@ -6652,7 +6656,8 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, VIR_DEBUG("vm=3D%p, flags=3D0x%lx, retcode=3D%d", vm, flags, retcode); =20 - if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, priv, + if (!(mig =3D qemuMigrationCookieParse(driver, vm, vm->def, priv->orig= name, + priv->qemuCaps, cookiein, cookieinlen, cookie_fla= gs))) goto error; =20 diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index da12f58bda..e151f33e99 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -1493,7 +1493,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver, virDomainObj *vm, const virDomainDef *def, const char *origname, - qemuDomainObjPrivate *priv, + virQEMUCaps *qemuCaps, const char *cookiein, int cookieinlen, unsigned int flags) @@ -1514,11 +1514,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver, return NULL; =20 if (cookiein && cookieinlen && - qemuMigrationCookieXMLParseStr(mig, - driver, - priv ? priv->qemuCaps : NULL, - cookiein, - flags) < 0) + qemuMigrationCookieXMLParseStr(mig, driver, qemuCaps, cookiein, fl= ags) < 0) return NULL; =20 if (flags & QEMU_MIGRATION_COOKIE_PERSISTENT && diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index f9927175fa..0fc406761b 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -192,7 +192,7 @@ qemuMigrationCookieParse(virQEMUDriver *driver, virDomainObj *vm, const virDomainDef *def, const char *origname, - qemuDomainObjPrivate *priv, + virQEMUCaps *qemuCaps, const char *cookiein, int cookieinlen, unsigned int flags); diff --git a/tests/qemumigrationcookiexmltest.c b/tests/qemumigrationcookie= xmltest.c index bb19baad54..0e5f956a2a 100644 --- a/tests/qemumigrationcookiexmltest.c +++ b/tests/qemumigrationcookiexmltest.c @@ -144,7 +144,7 @@ testQemuMigrationCookieParse(const void *opaque) data->vm, data->vm->def, NULL, - priv, + priv->qemuCaps, data->xmlstr, data->xmlstrlen, data->cookieParseFlags))= ) { --=20 2.38.1 From nobody Sun Feb 8 01:30:49 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=1669823467; cv=none; d=zohomail.com; s=zohoarc; b=iovyRKCRyGT/1k0djJM9EvOQpSa/UnXR8F5kXpKxCG4/pfqldaHzHuqr7BakvOWHgIdYyUUpI92Ol8YqoE5xtpYEP51ZEijHU28Mdnqqpr/Ymzj/C96h6AOia354+o7hEjOvXbnVTaXg0WqvmSu02QMHvpAxvj/EPoBiyUtf7vo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669823467; 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=NEa8QB39qsCuZcV5W2/BbfuNbILSm294KH5KuPrLWvM=; b=cqCZ1F1UdLKgeFj7ugvn5hS2sbfVkLtkrr9lucvDX7CTLEb6nm+rxh7958kOftFf1b5FdcpSyPGDG94s8DeCosN+bfv5DQyf/Z9Ufo3jh5XsSQ5uuqX6wV4dUxNfrUwsj9WhVOYlL0WsSB7wWNa2HyH+hp5DkF5wHICKe+zGFuE= 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 1669823467039532.1732453850556; Wed, 30 Nov 2022 07:51:07 -0800 (PST) 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-645-JhNJO5AxPeGnT-Trhgd55g-1; Wed, 30 Nov 2022 10:50:58 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C3BFC101E150; Wed, 30 Nov 2022 15:50:55 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 14431492B10; Wed, 30 Nov 2022 15:50:55 +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 BDA6319465A0; Wed, 30 Nov 2022 15:50:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AB1391946586 for ; Wed, 30 Nov 2022 15:14:03 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8F88940C6EC4; Wed, 30 Nov 2022 15:14:03 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id 50B3740C6E14 for ; Wed, 30 Nov 2022 15:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669823465; 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=NEa8QB39qsCuZcV5W2/BbfuNbILSm294KH5KuPrLWvM=; b=IGS1JsBykKCGsWlKtT8Cn60H9O9M5wLrKGJbkn5s0SQU8A7vEcOm70ZJpMlHYfYa0ou+E3 rBCJ/+cUetUWuDi5cBzUx490jC3JK5jGMf8CASbFzzaSXvd77TF/PupjaDDqZMgayyj8KQ CX9tabE1t5kggpPZw0AbQhdQzHDeewk= X-MC-Unique: JhNJO5AxPeGnT-Trhgd55g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] qemu: Reindent qemuMigrationCookieParse prototype arguments Date: Wed, 30 Nov 2022 16:13:00 +0100 Message-Id: <5cd223b4443fcce8c2a377f4dce2e5140d18057c.1669821130.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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: 1669823467443100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration_cookie.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_coo= kie.h index 0fc406761b..254372234d 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -190,12 +190,12 @@ qemuMigrationCookieFormat(qemuMigrationCookie *mig, qemuMigrationCookie * qemuMigrationCookieParse(virQEMUDriver *driver, virDomainObj *vm, - const virDomainDef *def, - const char *origname, + const virDomainDef *def, + const char *origname, virQEMUCaps *qemuCaps, - const char *cookiein, - int cookieinlen, - unsigned int flags); + const char *cookiein, + int cookieinlen, + unsigned int flags); =20 void qemuMigrationCookieFree(qemuMigrationCookie *mig); --=20 2.38.1