From nobody Sat May 4 20:21:40 2024 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; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com 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 162644942598719.0690802693955; Fri, 16 Jul 2021 08:30:25 -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-574-KqqnsY51MOmEhLg98c6nBg-1; Fri, 16 Jul 2021 11:30:23 -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 0048491276; Fri, 16 Jul 2021 15:30:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8AF0A5D6AB; Fri, 16 Jul 2021 15:30:17 +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 87FA94EA2A; Fri, 16 Jul 2021 15:30:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16GFUEAp001148 for ; Fri, 16 Jul 2021 11:30:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4CA4F113B74; Fri, 16 Jul 2021 15:30:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 46EC4518C for ; Fri, 16 Jul 2021 15:30:11 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9DB9880270C for ; Fri, 16 Jul 2021 15:30:11 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-556-MToc-c_jMY6U3yFu1ArcJg-1; Fri, 16 Jul 2021 11:30:09 -0400 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2052.outbound.protection.outlook.com [104.47.10.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-26-oQ_wbIe_Mr28wVpzDcTUZA-1; Fri, 16 Jul 2021 17:30:07 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM0PR04MB4387.eurprd04.prod.outlook.com (2603:10a6:208:73::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.23; Fri, 16 Jul 2021 15:30:06 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::a835:c9e1:adaf:572c]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::a835:c9e1:adaf:572c%9]) with mapi id 15.20.4331.026; Fri, 16 Jul 2021 15:30:06 +0000 Received: from localhost (192.225.177.165) by AM6PR0502CA0046.eurprd05.prod.outlook.com (2603:10a6:20b:56::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Fri, 16 Jul 2021 15:30:05 +0000 X-MC-Unique: KqqnsY51MOmEhLg98c6nBg-1 X-MC-Unique: MToc-c_jMY6U3yFu1ArcJg-1 X-MC-Unique: oQ_wbIe_Mr28wVpzDcTUZA-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH] qemu: migration: Use correct flag when preparing block dirty bitmaps Date: Fri, 16 Jul 2021 09:30:03 -0600 Message-ID: <20210716153003.2990-1-jfehlig@suse.com> X-ClientProxiedBy: AM6PR0502CA0046.eurprd05.prod.outlook.com (2603:10a6:20b:56::23) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2657d05f-f0ab-4cdd-af4c-08d9486e96c5 X-MS-TrafficTypeDiagnostic: AM0PR04MB4387: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:792 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: JqG5cdX8KqllG4S1VD1L7y1Q7I9N2LiDCrvYz5vTpnXyrfSbu1ke0gkD3LjjhETrtfMzoaom3pkDp2IBDQC1p3hUYY07H/XH2T2ZoWyeHpHaWbhB/9q+unSNMeMMSooffEObZgwFN6lfwPj1jVihZCFBJceKBBHthLuYvDhKOuQ/hjTXjjGu5k9fVy1wFdASKuMJfVPB7pyGLnPq7gZ0vbtMcE13Itk7fyYKkrf4t0VxE721IveWK7yDuo/CoWeCWe2J+iqUAh+SUDf6bc429bkFtBKU3KuwK5laLSwVX+gAsUx9nDTlup4Rzfln0jqR8eYrGHUmLfl08tVdnFPW7TMJ/MmzcShQsT+N45awDXlX6SGRo5xRKfaePiU+oi90ZvrpoR1KKN+0oAC5fBn7oevdNkOUHcLCpYpsxhH/cFoqEOtN7jCETo/lYCqyx2mSBwgmb2wv7APIb7GKodGTVXiQYnecg7ltjQ6P2waaUInWWD7F5KlB+gfFtP+yd4OAJSzcuTuFUFLKXu1vOKtrqC2M3XyP2nrXnjbpxTILIG1jjTom8kfMjaZdC/QU0EvT4+LBrpfTS85XAIHDMk+I+aLyuoHsXSebJ/4xmxR/Qexm00r17zfAo6oiODMyrxtBXELO0oBAh1/wKSFQ3D2rUVGxfnrX2ApHr2Ti5s6+zixKkEs/m9GwTZsr7145H1K6RN2Wn6GP6JHL/zqJ37yu33/BXYmZKnml1Egxb9RlaO0rp1PF6sn5vSyx9S+1oj/UOORJM1WMXOeQ78xERVVw2Q== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(39860400002)(346002)(396003)(366004)(376002)(136003)(83380400001)(8936002)(478600001)(966005)(38100700002)(1076003)(316002)(66556008)(66476007)(6916009)(86362001)(6486002)(66946007)(186003)(26005)(2906002)(5660300002)(8676002)(36756003)(2616005)(956004)(6496006)(14143004); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5WPzaSyKWie8sgAdZlLR+Gn8a36WaYy//nvNz14sojT9fLtyDhwfeFesoXqt?= =?us-ascii?Q?nrc8z1PSd+lZGn8Y1S0ofDoWXsnTtCKd8BWQXjyePrUbU2PzPdtnLXsvK/xq?= =?us-ascii?Q?IPjq7OytlfHH0vi2eoHM3ASqJ5klqjkR9P99Va3fQSoT1evP2emqCh3xn2l8?= =?us-ascii?Q?zsCY63v3orz0KDSfmQsG7Ky8xn1mJ0jfOhF3KsZVzg1ODFekCryJD/hxqGEt?= =?us-ascii?Q?rIdTR11a8/1y+pWgzoBvyoBj7+nD2FtqruKNh8Uu8xysmU1PiG3RTwFSjemx?= =?us-ascii?Q?nunI7uYb3uqe/DaVTIDPCYSGOmQnv6dmp1dj0DniTiR4XpI2X+tZMN86uL33?= =?us-ascii?Q?VDKzT+KoXPuHmjNVO7S2CABQG/GNLDVQ9T5xe2YlPBNpF0Yyu0dfVUk+BZ4j?= =?us-ascii?Q?6ljpRLLG6/T4u9WcQMr5jWHwsYkt3PHXXVsMBO+MJNxtyS/F7no8YeUk/Xle?= =?us-ascii?Q?+vNSN3GccQUlSnaHr8rErcN2rOgGzf3Fq6ipAbX9Sm4kMlehwvTmIrgCpzHr?= =?us-ascii?Q?8mUYBOQ5OJ836lnJ2Gi+4tCDh2UbxBfdBEdK04ghQ5VpxicunwTsHyBfBJDR?= =?us-ascii?Q?YVUiWo3R7meRo6c0D19oRAVizaqlsVmTqav5JUNAEKdzScn1jHeEFYaX5r8l?= =?us-ascii?Q?Qxf1MIqrCJWSoTq/2fSVmbK4fnGvgMVQqWouFJrqqMHxJTlC/nnxyjWADDhB?= =?us-ascii?Q?dQYrvJxcd2qYsvsWwpr7z5o536YwJ/7r6M2/vUr4o6vDODBK5EIKmKq6ArOA?= =?us-ascii?Q?Y3T0Zpr4cvLWn8lSGQC9k2JGAlwoRqzf/Vh87Qq3aSk5fBznQSeDM84yuMET?= =?us-ascii?Q?Xrz3gKjyd0tWIxI46rfzlZbnMk/wcJGbP88jC5iCkmKKwTwRWnM1pLdlWTfa?= =?us-ascii?Q?PSZxLJzQYXmNmFHwhbdGv47ht8wl/Yp48LsHvcTV8/224vDyUEKvZ4UYbQgb?= =?us-ascii?Q?5fJTWLQuiucDQb6Z3F4o8rcIedO5hZTHjqcqZKcT0vqjO3g3G563ehnBPKLh?= =?us-ascii?Q?KL8vlfkQuOkE+QbP56kBKr2iuXaeuXPXG5yj79/WULDMip/2fk4DV4APUuhl?= =?us-ascii?Q?4ICywTGaq02TYt0DDStbAl6ehVav2yOCwCwL+o5Bf1sWnZdqzun/CNG8qozQ?= =?us-ascii?Q?oWWRLZik9IAQD4WhifhaCM4FNKVP8TpMKWF8zKSJesMixmzrq0YRfq3aLckN?= =?us-ascii?Q?UpM9Q2sHAxuMtsHjBavzu+EHbBQKWT8T08K0Prz1qlFQLC7Ya2UrCpaOGiNA?= =?us-ascii?Q?MiPEGYVUOqW+/ESqkb/HwUTmTqGsXiH4qDSmJLZp8FzTCyccjHYZIjXZhLRb?= =?us-ascii?Q?+g8VPr5/MalMvl1ViHZD5JEh?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2657d05f-f0ab-4cdd-af4c-08d9486e96c5 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jul 2021 15:30:06.3483 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WNp9T/Phbpu7iSuO7///Lhb6FSoR+Z59HCDY8CY4T4bOC9K+c9sbIVX3qYY8FYVUXiVaVNJUmZe90p7AU+R5dg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4387 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 16GFUEAp001148 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-ZM-MESSAGEID: 1626449427171100001 Content-Type: text/plain; charset="utf-8" qemuMigrationSrcRunPrepareBlockDirtyBitmaps receives the flags parameter from qemuMigrationSrcRun, where flags are based on the main API enum values. Similar to commit f58349c9c6, use the main API enum instead of internal driver enum when checking flags in qemuMigrationSrcRunPrepareBlockDirtyBitmaps. Signed-off-by: Jim Fehlig Reviewed-by: Peter Krempa --- Noticed by visiual inspection while investigating a bug report similar to https://bugzilla.redhat.com/show_bug.cgi?id=3D1978526 src/qemu/qemu_migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 2ec7b7c48b..ba8c0bd2d0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3972,7 +3972,7 @@ qemuMigrationSrcRunPrepareBlockDirtyBitmaps(virDomain= Obj *vm, * directly, otherwise we must create merged bitmaps from the whole * chain */ =20 - if (!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC) && + if (!(flags & VIR_MIGRATE_NON_SHARED_INC) && qemuMigrationSrcRunPrepareBlockDirtyBitmapsMerge(vm, mig) < 0) return -1; =20 --=20 2.31.1