From nobody Sun Feb 8 15:25:13 2026 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 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 1580673725328100.48053300508207; Sun, 2 Feb 2020 12:02:05 -0800 (PST) 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-302-bd574gQpNTq_s7vauIjLkA-1; Sun, 02 Feb 2020 15:02:01 -0500 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 546D08017CC; Sun, 2 Feb 2020 20:01:56 +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 2A39660BE1; Sun, 2 Feb 2020 20:01:56 +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 A4DF938A1; Sun, 2 Feb 2020 20:01:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 012K1tMo003443 for ; Sun, 2 Feb 2020 15:01:55 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4718B5DA82; Sun, 2 Feb 2020 20:01:55 +0000 (UTC) Received: from icr.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2D965D9CA for ; Sun, 2 Feb 2020 20:01:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580673724; 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=8sjFaQsJ3sR+k2U9mT+tLPDrP2bJGbeig9f3XTacB44=; b=an6Kx3S18R5e4p4yreAKv4IjA5YrRUpo7VsbVcTkLNWm7zTXXVZ8J2b9sBXUSKQkkPHsi4 4Maavcuzfcp2kCVRNQSlRnfXo1Q2uirLt+BU1RDF0+XCOpEkqwi39YvHEmJiJuDusglR5d 3W+HJPZkVMnZ39dj6YvdqJQWDXEJDeI= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] qemu: tpm: remove unused labels Date: Sun, 2 Feb 2020 21:01:47 +0100 Message-Id: <50ed0b35c02f65d39ab9dd739a136ff5c6ed71bc.1580673678.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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-MC-Unique: bd574gQpNTq_s7vauIjLkA-1 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" Remove all the labels that are now redundant. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_tpm.c | 74 +++++++++++++++++---------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index f9cea2ffde..f3562d7dfe 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -125,11 +125,10 @@ qemuTPMCreateEmulatorStorage(const char *storagepath, uid_t swtpm_user, gid_t swtpm_group) { - int ret =3D -1; g_autofree char *swtpmStorageDir =3D g_path_get_dirname(storagepath); =20 if (qemuTPMEmulatorInitStorage(swtpmStorageDir) < 0) - goto cleanup; + return -1; =20 *created =3D false; =20 @@ -141,16 +140,13 @@ qemuTPMCreateEmulatorStorage(const char *storagepath, virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not create directory %s as %u:%d"), storagepath, swtpm_user, swtpm_group); - goto cleanup; + return -1; } =20 if (virFileChownFiles(storagepath, swtpm_user, swtpm_group) < 0) - goto cleanup; - - ret =3D 0; + return -1; =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -427,7 +423,6 @@ qemuTPMEmulatorRunSetup(const char *storagepath, { g_autoptr(virCommand) cmd =3D NULL; int exitstatus; - int ret =3D -1; char uuid[VIR_UUID_STRING_BUFLEN]; g_autofree char *vmid =3D NULL; g_autofree char *swtpm_setup =3D virTPMGetSwtpmSetup(); @@ -444,7 +439,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, =20 cmd =3D virCommandNew(swtpm_setup); if (!cmd) - goto cleanup; + return -1; =20 virUUIDFormat(vmuuid, uuid); vmid =3D g_strdup_printf("%s:%s", vmname, uuid); @@ -469,10 +464,10 @@ qemuTPMEmulatorRunSetup(const char *storagepath, virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, _("%s does not support passing a passphrase using a file " "descriptor"), swtpm_setup); - goto cleanup; + return -1; } if ((pwdfile_fd =3D qemuTPMSetupEncryption(secretuuid, cmd)) < 0) - goto cleanup; + return -1; =20 virCommandAddArg(cmd, "--pwdfile-fd"); virCommandAddArgFormat(cmd, "%d", pwdfile_fd); @@ -506,13 +501,10 @@ qemuTPMEmulatorRunSetup(const char *storagepath, _("Could not run '%s'. exitstatus: %d; " "Check error log '%s' for details."), swtpm_setup, exitstatus, logfile); - goto cleanup; + return -1; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } =20 =20 @@ -673,11 +665,11 @@ qemuTPMEmulatorStop(const char *swtpmStateDir, return; =20 if (!virFileExists(pathname)) - goto cleanup; + return; =20 cmd =3D virCommandNew(swtpm_ioctl); if (!cmd) - goto cleanup; + return; =20 virCommandAddArgList(cmd, "--unix", pathname, "-s", NULL); =20 @@ -689,9 +681,6 @@ qemuTPMEmulatorStop(const char *swtpmStateDir, =20 /* clean up the socket */ unlink(pathname); - - cleanup: - return; } =20 =20 @@ -700,19 +689,17 @@ qemuExtTPMInitPaths(virQEMUDriverPtr driver, virDomainDefPtr def) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D 0; =20 switch (def->tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: - ret =3D qemuTPMEmulatorInitPaths(def->tpm, cfg->swtpmStorageDir, - def->uuid); - break; + return qemuTPMEmulatorInitPaths(def->tpm, cfg->swtpmStorageDir, + def->uuid); case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: break; } =20 - return ret; + return 0; } =20 =20 @@ -721,28 +708,25 @@ qemuExtTPMPrepareHost(virQEMUDriverPtr driver, virDomainDefPtr def) { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - int ret =3D 0; g_autofree char *shortName =3D NULL; =20 switch (def->tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: shortName =3D virDomainDefGetShortName(def); if (!shortName) - goto cleanup; + return -1; =20 - ret =3D qemuTPMEmulatorPrepareHost(def->tpm, cfg->swtpmLogDir, - def->name, cfg->swtpm_user, - cfg->swtpm_group, - cfg->swtpmStateDir, cfg->user, - shortName); - break; + return qemuTPMEmulatorPrepareHost(def->tpm, cfg->swtpmLogDir, + def->name, cfg->swtpm_user, + cfg->swtpm_group, + cfg->swtpmStateDir, cfg->user, + shortName); case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: break; } =20 - cleanup: - return ret; + return 0; } =20 =20 @@ -875,7 +859,7 @@ qemuExtTPMStop(virQEMUDriverPtr driver, case VIR_DOMAIN_TPM_TYPE_EMULATOR: shortName =3D virDomainDefGetShortName(vm->def); if (!shortName) - goto cleanup; + return; =20 qemuTPMEmulatorStop(cfg->swtpmStateDir, shortName); qemuSecurityCleanupTPMEmulator(driver, vm); @@ -885,7 +869,6 @@ qemuExtTPMStop(virQEMUDriverPtr driver, break; } =20 - cleanup: return; } =20 @@ -897,30 +880,27 @@ qemuExtTPMSetupCgroup(virQEMUDriverPtr driver, { g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_autofree char *shortName =3D NULL; - int ret =3D -1, rc; + int rc; pid_t pid; =20 switch (def->tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: shortName =3D virDomainDefGetShortName(def); if (!shortName) - goto cleanup; + return -1; rc =3D qemuTPMEmulatorGetPid(cfg->swtpmStateDir, shortName, &pid); if (rc < 0 || (rc =3D=3D 0 && pid =3D=3D (pid_t)-1)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not get process id of swtpm")); - goto cleanup; + return -1; } if (virCgroupAddProcess(cgroup, pid) < 0) - goto cleanup; + return -1; break; case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: break; } =20 - ret =3D 0; - - cleanup: - return ret; + return 0; } --=20 2.19.2