From patchwork Sat Nov 6 23:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 1551824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=PXSQ5c6L; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmtsM2l4kz9sVc for ; Sun, 7 Nov 2021 10:30:29 +1100 (AEDT) Received: from localhost ([::1]:59078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjV8j-0001NT-HS for incoming@patchwork.ozlabs.org; Sat, 06 Nov 2021 19:30:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjV8C-0001N1-H4 for qemu-devel@nongnu.org; Sat, 06 Nov 2021 19:29:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjV88-0000B2-Nj for qemu-devel@nongnu.org; Sat, 06 Nov 2021 19:29:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636241387; h=from:from: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; bh=mYs9w+TU8A8Kwh3aAef272qquxD3vmzyplq4dxBKtMM=; b=PXSQ5c6L9DfW8e+91qbTl22vaxlQ0DI8VKHJhzsMd3YQrByXMA+c+JBJ0MR1Tul4dgiHeo BkyBUlDRBI8Ln8uZ4ep2EFFQpwcwgiEEst5mqIkRQsmzW0VaAUF/Eat0RQASvLKHpX1z1+ oIDOVwKB+ipwaOmGnFPvDL9wWby+/PA= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-550-ytgH-O1CPXmvwlUWAP4yhQ-1; Sat, 06 Nov 2021 19:29:45 -0400 X-MC-Unique: ytgH-O1CPXmvwlUWAP4yhQ-1 Received: by mail-wm1-f69.google.com with SMTP id l4-20020a05600c1d0400b00332f47a0fa3so4628515wms.8 for ; Sat, 06 Nov 2021 16:29:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mYs9w+TU8A8Kwh3aAef272qquxD3vmzyplq4dxBKtMM=; b=zgPqpYjwtpe2BuzP+rBHFPN60NRWGnm0EdYi+bfTGXmnTdv/VDheVZ7Q2SVxCxjlLS lPX68dBbDUHRjcq0Mvpw3pnZ+Rfrmjr7GI7ZTLsRnxmID3oKpry+BYdOn6zw57pHiZQC OqZYn0t201bR8TMMn2usldKN/DhiwGZMx+uF0HicwemVeadj+L9Y7P6qEwB94FQ6460+ FSETHijwF71ONrlr9xcnzLZ0vt2NdocDbudIi2dYesoArbhY1z4lKDS56skS+mEsdj3q GXmu3vnhrYmcj/+RevNj1BDEYO11cEzBott/U/6gqIWaL7IMnHKypW7wQPIjQm7B9vr0 o9xg== X-Gm-Message-State: AOAM5322B001jhVDC0ci84qGZMkrJkaS36qHIbGoz4gUTZZEBgmAHSd0 UGnlDovOEFCJg20emNWtCy0JauUaDoT3B0hdS71eG2CCBR1TD1O/wodLx6tzZ1NUcEfNm3nAUL4 OwXxBz/Rkw8AF4ZZuuB+S0ot3NGNAlnNwGB1Qjh/ArKzj4QcaDw7152GC75BOXkSXu4w= X-Received: by 2002:a1c:7c14:: with SMTP id x20mr41266725wmc.75.1636241384381; Sat, 06 Nov 2021 16:29:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2WaD70xsx8XvhDniGo2BFjocogpUBEiVKyN28LuiaTA/R8m7d691y3llLkeePHr5XgYlaOA== X-Received: by 2002:a1c:7c14:: with SMTP id x20mr41266699wmc.75.1636241384117; Sat, 06 Nov 2021 16:29:44 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id s26sm9545610wmc.0.2021.11.06.16.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Nov 2021 16:29:43 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 1/2] migration: Check that postcopy fd's are not NULL Date: Sun, 7 Nov 2021 00:29:40 +0100 Message-Id: <20211106232941.46184-2-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211106232941.46184-1-quintela@redhat.com> References: <20211106232941.46184-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.735, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Eric Blake , "Dr. David Alan Gilbert" , Juan Quintela Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If postcopy has finished, it frees the array. But vhost-user unregister it at cleanup time. fixes: c4f7538 Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/postcopy-ram.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index e721f69d0f..d18b5d05b2 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -1457,6 +1457,10 @@ void postcopy_unregister_shared_ufd(struct PostCopyFD *pcfd) MigrationIncomingState *mis = migration_incoming_get_current(); GArray *pcrfds = mis->postcopy_remote_fds; + if (!pcrfds) { + /* migration has already finished and freed the array */ + return; + } for (i = 0; i < pcrfds->len; i++) { struct PostCopyFD *cur = &g_array_index(pcrfds, struct PostCopyFD, i); if (cur->fd == pcfd->fd) { From patchwork Sat Nov 6 23:29:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 1551825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=g6DcRsJS; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HmtsN0k21z9sXM for ; Sun, 7 Nov 2021 10:30:32 +1100 (AEDT) Received: from localhost ([::1]:59156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjV8n-0001Qy-VZ for incoming@patchwork.ozlabs.org; Sat, 06 Nov 2021 19:30:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjV8C-0001N2-MY for qemu-devel@nongnu.org; Sat, 06 Nov 2021 19:29:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:22732) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjV89-0000BD-Bm for qemu-devel@nongnu.org; Sat, 06 Nov 2021 19:29:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636241388; h=from:from: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; bh=WBocdxEvetR8i5U0Y7CdMI5VGrRQcVltzEW6WBPQ+KQ=; b=g6DcRsJSpvVSBE4Igf07gX5iVgp3EO+qkTEHi4uu0yzUvHBqyC+zo6ACp3kybBHEJ4nR1H z+SCkY1VBOAyk+K1Hu8kzVCnu3Gbkk6K5G1jDrSjzOJnluAAQ5ud6UtVTvLMA8ItqcNf3F xzCJpIKgTSAPfrrS8y9JodN3xyPx7V8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-kA8aB35wN621OMdb44R_cQ-1; Sat, 06 Nov 2021 19:29:47 -0400 X-MC-Unique: kA8aB35wN621OMdb44R_cQ-1 Received: by mail-wr1-f71.google.com with SMTP id p17-20020adff211000000b0017b902a7701so2776096wro.19 for ; Sat, 06 Nov 2021 16:29:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WBocdxEvetR8i5U0Y7CdMI5VGrRQcVltzEW6WBPQ+KQ=; b=b34r3ZqiwC8CuDOcFcWZhIQ2QPm40zUpFCwF1Ad8JC4H5qPsNE0AGdY/8V4kDN9xET TFamH8xjoB3qBoyhU1oeW+bl5ka6lZ9I1P9LsECndh7Zqx7BpnEMXJ2xdf71Npfcjv28 +tFNT1HYuUghZ8LeMXh1wLbpB+i4n8PWqqMwSYtUqPjVcIJQxz2OzxHaxczt7fdKV95U RsjotBIVUFohOZCqhkf0Bi+MWBPwk1c5pw1hS9mL92r3bGEQZGpjnW8yX7a3UuMZ4mzH HffT+6Toe9qecS62FAJavnYuRUrVCvoDAWdWuMFRhFrAzXHaaGhs7AKv4I0jv3X6qgrP CulQ== X-Gm-Message-State: AOAM532Pko9Up+HS/enkNim3hCVK8fOB+JMfKGtRzVvVHMGeTQ873H+a uUS7PQqR3pYPVryq5Cvq5Tv45QElucWY8j0fZn4YG1Vmq/T3wqyePwCqn8nT53qTGqzp6ozv+bl kOgG3jcPtx8qiEe8SzdIvUgiYc9NByBLdvx5dmhor/36fjKY/pLXMy2C1ErYEnJzCdZk= X-Received: by 2002:a05:6000:1a85:: with SMTP id f5mr29968405wry.361.1636241385878; Sat, 06 Nov 2021 16:29:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbgXaTfMCElkJi/JLJyoprXZmtMoCgno0VkCWPa3CcsvkiJ6DRPa2EIa32i0hdoThZcowf0g== X-Received: by 2002:a05:6000:1a85:: with SMTP id f5mr29968363wry.361.1636241385540; Sat, 06 Nov 2021 16:29:45 -0700 (PDT) Received: from localhost (static-233-86-86-188.ipcom.comunitel.net. [188.86.86.233]) by smtp.gmail.com with ESMTPSA id o12sm8185582wmq.12.2021.11.06.16.29.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Nov 2021 16:29:44 -0700 (PDT) From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PULL 2/2] docs: fix qemu incorrect tag Date: Sun, 7 Nov 2021 00:29:41 +0100 Message-Id: <20211106232941.46184-3-quintela@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211106232941.46184-1-quintela@redhat.com> References: <20211106232941.46184-1-quintela@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.735, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juan Quintela , Eric Blake , =?utf-8?b?SHltYW4gSHVhbmco6buE5YuHKQ==?= , Markus Armbruster , "Dr. David Alan Gilbert" , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Hyman Huang(黄勇) The patchset merged in 71864eadd9a ("migration/dirtyrate: introduce struct and adjust DirtyRateStat") was targeting QEMU 6.1 but got merged later, so correct the tag for 6.2. Signed-off-by: Hyman Huang(黄勇) Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Juan Quintela Signed-off-by: Juan Quintela --- qapi/migration.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 87146ceea2..f0aefdab64 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1740,7 +1740,7 @@ # # @dirty-rate: dirty rate. # -# Since: 6.1 +# Since: 6.2 # ## { 'struct': 'DirtyRateVcpu', @@ -1774,7 +1774,7 @@ # # @dirty-bitmap: calculate dirtyrate by dirty bitmap. # -# Since: 6.1 +# Since: 6.2 # ## { 'enum': 'DirtyRateMeasureMode', @@ -1796,13 +1796,13 @@ # @calc-time: time in units of second for sample dirty pages # # @sample-pages: page count per GB for sample dirty pages -# the default value is 512 (since 6.1) +# the default value is 512 (since 6.2) # # @mode: mode containing method of calculate dirtyrate includes -# 'page-sampling' and 'dirty-ring' (Since 6.1) +# 'page-sampling' and 'dirty-ring' (Since 6.2) # # @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring -# mode specified (Since 6.1) +# mode specified (Since 6.2) # # Since: 5.2 #