From nobody Mon Nov 25 13:25:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1600100855; cv=none; d=zohomail.com; s=zohoarc; b=HmgT3cNFtIJLb9yxtiy90yNOzXCwrycw0gtCuKvxOE/Hv/bCcJqtT58ri+SIHThsMNEW9zoG441uo33pI6GXmpiGVIGREnb7OBToFX20+MYcg9J1nKZzK35qznIjoZSv+kyRB2X7b1wRTHSgkR0Br90qC4SHOvckYPSCMJDiv1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600100855; 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=F66yw3VPqgLt/HewVdEA+irapzdCeT8CWZY0uKS+e7E=; b=nc1OwWBkarxhCMxyTLI7uguSVPGR+S4jd+72tuRwoBVAE22QcsrxdeUdqrFdFthGCh/041R4W8R7shU9H+AgwT8miSQvwiKOPC0v6doWkQYgV8xMl+NSEvjQMXdlZzu1iW7heV1oSavMTboZL5OuYHAOL7O/JGv9DVG1xLR/Q6I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1600100855391134.30512027390546; Mon, 14 Sep 2020 09:27:35 -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-86-VguUq_WGM9WiZO9wVSX8fQ-1; Mon, 14 Sep 2020 12:27:31 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1DDBD801ADE; Mon, 14 Sep 2020 16:27:26 +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 911697B7AD; Mon, 14 Sep 2020 16:27:24 +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 F3CA98C7C9; Mon, 14 Sep 2020 16:27:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08EGNZRM005165 for ; Mon, 14 Sep 2020 12:23:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 10C7927BD0; Mon, 14 Sep 2020 16:23:35 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8398527BBF for ; Mon, 14 Sep 2020 16:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600100854; 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=F66yw3VPqgLt/HewVdEA+irapzdCeT8CWZY0uKS+e7E=; b=ZbtT3NPQGVIBf7hI4xCr1yJzz49UD11gm789xXQF2iX3CfPg9PwE4mNKEghuf5ggypsLgE Z0aj+49I5OR5acW2zIFRQn3lFjk1XkeZZjNZuqqF/icZm7kcp7uvN10lfZJVU9INcoi+6d RKoasTe5EDMS3COlUecjRnRiJpPPvvw= X-MC-Unique: VguUq_WGM9WiZO9wVSX8fQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] qemustatusxml2xml: backup-pull: Test private data formatting/parsing Date: Mon, 14 Sep 2020 18:23:27 +0200 Message-Id: <6dc3c9d3b7574687e313778b506b86680d013279.1600100538.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Modify the test case to enable TLS and add private data containing aliases of objects corresponding to a TLS setup. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/qemustatusxml2xmldata/backup-pull-in.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/qemustatusxml2xmldata/backup-pull-in.xml b/tests/qemusta= tusxml2xmldata/backup-pull-in.xml index 1db978a3ac..faaed67e38 100644 --- a/tests/qemustatusxml2xmldata/backup-pull-in.xml +++ b/tests/qemustatusxml2xmldata/backup-pull-in.xml @@ -254,12 +254,18 @@ 12345 - + + + + + + + --=20 2.26.2 From nobody Mon Nov 25 13:25:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1600101092; cv=none; d=zohomail.com; s=zohoarc; b=iAUNwUb+ewChWI1J3FV9zlrfeiYkO7aRToSHMvO+UzYMlQb4w+tz7EM1m/cZEO9lGe+nx+gVmHCvSR/Rb0fkCKTnD7q8fYZO9wg02OZVrmCcni15TmfSR+fZ/FY9acaZGnV/Txz6UaKUPTJSL1p2edKIuvMxllB7y9rZ/drU0qQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600101092; 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=HfjDU5/DdmKdbuTxJW3dAgb4C7ANrhQydA8bMlp/GCs=; b=WYHR5Vj5fDimtyaxjIX7yjQUkUrpqkTWnMCn36DGfqbQpIViWwXFCeW4GLHC5/dGD9m9XG4chpbvHyTtplJFqQGO9oZAZ3aglxD160juqikUNwZIYZQgNcILrUBCTa+SFEykMr8io1Z8LZSRGHToN7Y79jXJztnVQiOM1kwKxE0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 160010109270475.65199192121315; Mon, 14 Sep 2020 09:31:32 -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-144-_BWI7zNTNmqgvsTa6inE_Q-1; Mon, 14 Sep 2020 12:31:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 30C84801AD9; Mon, 14 Sep 2020 16:31:24 +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 0EFED5C699; Mon, 14 Sep 2020 16:31:24 +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 CB3E48C7C9; Mon, 14 Sep 2020 16:31:23 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08EGNaiN005172 for ; Mon, 14 Sep 2020 12:23:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 02E0B27BBF; Mon, 14 Sep 2020 16:23:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E39127BDD for ; Mon, 14 Sep 2020 16:23:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600101091; 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=HfjDU5/DdmKdbuTxJW3dAgb4C7ANrhQydA8bMlp/GCs=; b=cu0jTaBnDaeGfrEbqk7FPosDnm58+dwt5ZB9IBgXNRzrSZpQYLUOeVrSxnVlI+XKPA4198 b/toVtefEL6HWVCMdt80OhTgUJ94arGBzkWjwZQbVrpQi0RkwyuSLBkDiUOEUtS+eVMKCe QBv84VQNJoTF23uZH6Z/Hztzd2jfE0U= X-MC-Unique: _BWI7zNTNmqgvsTa6inE_Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: backup: Remove note that TLS should be implemented Date: Mon, 14 Sep 2020 18:23:28 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Commit 423576679a5 implementing TLS forgot to remove the comment. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_backup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index a402730d38..2f1a612803 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -805,7 +805,6 @@ qemuBackupBegin(virDomainObjPtr vm, if (qemuDomainObjEnterMonitorAsync(priv->driver, vm, QEMU_ASYNC_JOB_BA= CKUP) < 0) goto endjob; - /* TODO: TLS is a must-have for the modern age */ if (pull) { if (tlsSecretProps) rc =3D qemuMonitorAddObject(priv->mon, &tlsSecretProps, &tlsSe= cretAlias); --=20 2.26.2 From nobody Mon Nov 25 13:25:00 2024 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=1600101127; cv=none; d=zohomail.com; s=zohoarc; b=lWqVm89KK245xHMSCXPaj9cUR+Jziu/pXh9hdlq/1BlgBzQ8+h9AMq0VMtgpD7cnGS1XggUoN99JIQBfLqsWcCxfakWPGoJ/5T5iVmh0TJHx0BYi2Bh/AuXG2SUISkVoFhvqdFDVNhQV/vLTwpn7/kbu0bwUFtyn385I4N9Epok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600101127; 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=3MD2+hYk8ey2hyXJZNr8BefA1WVzNL4DXyf7CWTRcUQ=; b=CclfzFK8eGjVPK7j4FqvSCQqBg2+UJlLZ5KCS6BSVjRz/w+6KeJ9WQVFw3VQkFO7yYT6Cwv7MDSQGD3TRY57LN31gfNLgwJCa64Ux6eCRK+eTqXs6Cbv9e0887c9RkieSz52j2SoqdijhVywnl2mOR5Y2LQ9CnXM7cD7N6l0yME= 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 160010112701362.463972655732846; Mon, 14 Sep 2020 09:32:07 -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-579-A_osa7csMdGn8YPYWzoS5g-1; Mon, 14 Sep 2020 12:31:32 -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 CC54A1091060; Mon, 14 Sep 2020 16:31:26 +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 A68B07512F; Mon, 14 Sep 2020 16:31:26 +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 763158C7D2; Mon, 14 Sep 2020 16:31:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08EGNacV005182 for ; Mon, 14 Sep 2020 12:23:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA51E27BD0; Mon, 14 Sep 2020 16:23:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6043627BBF for ; Mon, 14 Sep 2020 16:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600101125; 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=3MD2+hYk8ey2hyXJZNr8BefA1WVzNL4DXyf7CWTRcUQ=; b=KpYtWPUXP5SdYJOHCoLMtaaQX67ukvDQGbdDBSQ9FjCUlV4S5j0R/NodRTaLsAkpTgXtlw bIEzF7fQwTDYn5llxXouxLH2rW68zmU1BW2oA2C6ddS9A/aH631BGBw8f5l/THVdoikWEx NnOwEzQqtX+1EQAjhU9Tpjecnz9EzJ0= X-MC-Unique: A_osa7csMdGn8YPYWzoS5g-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] qemu: backup: Write TLS cert and secret object aliases into status XML Date: Mon, 14 Sep 2020 18:23:29 +0200 Message-Id: <8d541f4406b30156b95aadfd4232ce27e09b04c0.1600100538.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.002 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We've put the aliases into the backup job definition after the status XML was already writted so they didn't appear in the on-disk state. Move the code putting them into the private definition earlier, so that the status XML update done by saving blockjobs already writes them out. Also add a note notifying that the block job status update writes the status XML. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1870488 Fixes: 423576679a5 Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_backup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index 2f1a612803..4e61a5e52b 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -825,6 +825,9 @@ qemuBackupBegin(virDomainObjPtr vm, goto endjob; job_started =3D true; + priv->backup->tlsAlias =3D g_steal_pointer(&tlsAlias); + priv->backup->tlsSecretAlias =3D g_steal_pointer(&tlsSecretAlias); + /* qemuBackupDiskStarted saves the status XML */ qemuBackupDiskStarted(vm, dd, ndd); if (chk) { @@ -848,9 +851,6 @@ qemuBackupBegin(virDomainObjPtr vm, } } - priv->backup->tlsAlias =3D g_steal_pointer(&tlsAlias); - priv->backup->tlsSecretAlias =3D g_steal_pointer(&tlsSecretAlias); - ret =3D 0; endjob: --=20 2.26.2