From nobody Sun Feb 8 18:35:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1592393824; cv=none; d=zohomail.com; s=zohoarc; b=OLoiQ3RZPHcYX7JiVMP8N9WOcSUHHiv3qGxwrfGvpWW74UoEMc13kbxVduxFlmcV+tqE7EHipPbruHYR3Qh8rPPsVEEDKhvwFnSaxVFrU5/BsIzgGc+9zkIkIVK/iSrJ/yn502xOeq99TqQm1Azc4jy66soms+nMTpGQT3oZ/hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592393824; 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=PaW0X9hiOAkDbWJs7VIyE1uONZRi1GIO/iyIo8OXe1I=; b=EifF6UZ231K2ioGNPE7qWLTffeslCOMUecKuXvNmMr+z6H6HgShfBzoptle+iBMss2yhwB305IX1nLt9zVKxtkHgo+CL3QzmrGZJ45/KQNbKmGobZKslE8wwDZzzETHuCYpcJNe/bj41M+KVvJvGYbvesl2ygE3uvtfMKDSExGY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1592393824056349.6553222778882; Wed, 17 Jun 2020 04:37:04 -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-143-Q6bjHGU1MHqJd3BpCh9Gqg-1; Wed, 17 Jun 2020 07:36:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D502134D5; Wed, 17 Jun 2020 11:36:05 +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 5BC3F6106A; Wed, 17 Jun 2020 11:36:05 +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 2DCAE833D0; Wed, 17 Jun 2020 11:36:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05HBZoDg006767 for ; Wed, 17 Jun 2020 07:35:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 929A77BA14; Wed, 17 Jun 2020 11:35:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.194.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 139207A029 for ; Wed, 17 Jun 2020 11:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592393822; 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=PaW0X9hiOAkDbWJs7VIyE1uONZRi1GIO/iyIo8OXe1I=; b=A+4XwbaU3PQTyZheAKAgrHEJWrDfHmZVq9F2zM0m5HxnZVuTrcuKsIqtVGzr6P+yrJDVDD K2Gg06xssc7Km4DLcoiQAM9iZHilB70Xya/5jhX2R/vLnkuUNsQTwGnMP0rAYo/eY13CGb U9hd/7G3KUJhYxwl7asIScy/JYnAnpw= X-MC-Unique: Q6bjHGU1MHqJd3BpCh9Gqg-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 5/6] qemu: Rename qemuSecurityRestoreSavedStateLabel() Date: Wed, 17 Jun 2020 13:35:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The function calls virSecurityManagerDomainRestorePathLabel() after all. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_security.c | 8 ++++---- src/qemu/qemu_security.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3fad440272..80648f1d32 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6953,7 +6953,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED); } - if (qemuSecurityRestoreSavedStateLabel(driver, vm, path) < 0) + if (qemuSecurityDomainRestorePathLabel(driver, vm, path) < 0) VIR_WARN("failed to restore save state label on %s", path); return ret; } diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c index de4df23847..98f973ab12 100644 --- a/src/qemu/qemu_security.c +++ b/src/qemu/qemu_security.c @@ -615,9 +615,9 @@ qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver, =20 =20 int -qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, - virDomainObjPtr vm, - const char *savefile) +qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver, + virDomainObjPtr vm, + const char *path) { qemuDomainObjPrivatePtr priv =3D vm->privateData; pid_t pid =3D -1; @@ -631,7 +631,7 @@ qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr dri= ver, =20 if (virSecurityManagerDomainRestorePathLabel(driver->securityManager, vm->def, - savefile) < 0) + path) < 0) goto cleanup; =20 if (virSecurityManagerTransactionCommit(driver->securityManager, diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 4e701221cd..ed6b762662 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -101,9 +101,9 @@ int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr dri= ver, const char *path, bool allowSubtree); =20 -int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, +int qemuSecurityDomainRestorePathLabel(virQEMUDriverPtr driver, virDomainObjPtr vm, - const char *savefile); + const char *path); =20 int qemuSecurityCommandRun(virQEMUDriverPtr driver, virDomainObjPtr vm, --=20 2.26.2