From nobody Sun May 5 04:50:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1580207508810876.4509819814056; Tue, 28 Jan 2020 02:31:48 -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-27-ogDl9VqGOMSLvp-UuvZdow-1; Tue, 28 Jan 2020 05:31:45 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54ADC8010E1; Tue, 28 Jan 2020 10:31:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD6668E9E4; Tue, 28 Jan 2020 10:31:39 +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 5CF1F18089C8; Tue, 28 Jan 2020 10:31:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVZCp013995 for ; Tue, 28 Jan 2020 05:31:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 89A965C21A; Tue, 28 Jan 2020 10:31:35 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 145935C545 for ; Tue, 28 Jan 2020 10:31:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207507; 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=ZF//0AURjwoxj5gLfLpSqcjM3MVzNjgmaFIne4sTp28=; b=YgKetmDCPXvDorkgE8EajH0H9a/d9RgZOV0pjyhssQNXiDfTfLFwBinzL6n9QA4A+HHvoA JRnhNj2xMEtGJuDiRPIU340tqv7ZEgm7R36eI33Fd/2I3K4vJsv7wuMBpXbetN5v2ESHEB CNyLfVM5w1KQELzWy+AhuteVCErRFUE= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] qemu: use g_auto in qemuExtTPMStartEmulator Date: Tue, 28 Jan 2020 11:31:17 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 X-MC-Unique: ogDl9VqGOMSLvp-UuvZdow-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" Use the g_auto macros wherever possible to eliminate the cleanup section. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 262e6c4f07..c2132250eb 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -794,12 +794,12 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, bool incomingMigration) { int ret =3D -1; - virCommandPtr cmd =3D NULL; + g_autoptr(virCommand) cmd =3D NULL; int exitstatus =3D 0; - char *errbuf =3D NULL; - virQEMUDriverConfigPtr cfg; + g_autofree char *errbuf =3D NULL; + g_autoptr(virQEMUDriverConfig) cfg =3D NULL; virDomainTPMDefPtr tpm =3D vm->def->tpm; - char *shortName =3D virDomainDefGetShortName(vm->def); + g_autofree char *shortName =3D virDomainDefGetShortName(vm->def); int cmdret =3D 0, timeout, rc; pid_t pid; =20 @@ -855,12 +855,6 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, ret =3D 0; =20 cleanup: - VIR_FREE(shortName); - VIR_FREE(errbuf); - virCommandFree(cmd); - - virObjectUnref(cfg); - return ret; =20 error: --=20 2.21.0 From nobody Sun May 5 04:50:40 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 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1580207526258731.9818729568034; Tue, 28 Jan 2020 02:32:06 -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-238-Nj9_AR3dNlSpPvgzTPNM3w-1; Tue, 28 Jan 2020 05:32:02 -0500 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 AFBEE107ACCA; Tue, 28 Jan 2020 10:31:57 +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 8AC3D863C9; Tue, 28 Jan 2020 10:31:57 +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 3988385974; Tue, 28 Jan 2020 10:31:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVaZl014000 for ; Tue, 28 Jan 2020 05:31:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 57A785C21B; Tue, 28 Jan 2020 10:31:36 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6B955C21A for ; Tue, 28 Jan 2020 10:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207525; 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=1EM+LnEun6AIchSrFazUOumvqWaGBUQ8MyIqc8gupwU=; b=F9/RfV7HWomJ1QJlF3nFEjXR71DYNowVtZw8W0FSeCnt0+JVdTZR1kDGVZwdGCcURQTYbt qP+ebgQAV97Dtzw496p/JG7xU7M4RdzHV+eLh79MOnZGZg+QCU4fLWT/mY3TnibQFAKcNB 6pDrJE+sweXWaPq5qMtrtHVNkAk+zMo= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 02/10] qemu: eliminate ret variable in qemuExtTPMStartEmulator Date: Tue, 28 Jan 2020 11:31:18 +0100 Message-Id: <78e55652f4f05a3a9deefbd674210cb501133d83.1580207305.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 X-MC-Unique: Nj9_AR3dNlSpPvgzTPNM3w-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" Now that the cleanup section is empty, eliminate the cleanup label as well as the 'ret' variable. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index c2132250eb..21792f6992 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -793,7 +793,6 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, virDomainObjPtr vm, bool incomingMigration) { - int ret =3D -1; g_autoptr(virCommand) cmd =3D NULL; int exitstatus =3D 0; g_autofree char *errbuf =3D NULL; @@ -817,23 +816,23 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, cfg->swtpm_group, cfg->swtpmStateDir, shortName, incomingMigration))) - goto cleanup; + return -1; =20 if (qemuExtDeviceLogCommand(driver, vm, cmd, "TPM Emulator") < 0) - goto cleanup; + return -1; =20 virCommandSetErrorBuffer(cmd, &errbuf); =20 if (qemuSecurityStartTPMEmulator(driver, vm, cmd, cfg->swtpm_user, cfg->swtpm_group, &exitstatus, &cmdret) < 0) - goto cleanup; + return -1; =20 if (cmdret < 0 || exitstatus !=3D 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Could not start 'swtpm'. exitstatus: %d, " "error: %s"), exitstatus, errbuf); - goto cleanup; + return -1; } =20 /* check that the swtpm has written its pid into the file */ @@ -852,15 +851,12 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, if (timeout <=3D 0) goto error; =20 - ret =3D 0; - - cleanup: - return ret; + return 0; =20 error: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("swtpm failed to start")); - goto cleanup; + return -1; } =20 =20 --=20 2.21.0 From nobody Sun May 5 04:50:40 2024 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 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 1580207537021488.42449858443854; Tue, 28 Jan 2020 02:32:17 -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-397-TyxTzu5_PqWQ0Q2bQza7Cw-1; Tue, 28 Jan 2020 05:32:08 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1B6FC108442C; Tue, 28 Jan 2020 10:32:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DFFCA10027AB; Tue, 28 Jan 2020 10:32:02 +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 80D07180880B; Tue, 28 Jan 2020 10:32:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVbQx014008 for ; Tue, 28 Jan 2020 05:31:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 242775C21B; Tue, 28 Jan 2020 10:31:37 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3E025C21A for ; Tue, 28 Jan 2020 10:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207535; 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=tU/l9vq2fytHwPyqoP2KiEfdTV7/cbBn/ohSYnmrdtY=; b=ZKwsXuHrWjzP6U8YWsICWUGPI53xuTx1uYoZABpxJ7kZgChaNM47cfvqYsgYzpCzm35VyN 40vSfp8TZeYG72u/vSG3mBlmyxmRsDZdGF6GGQFr+SQfUabQdgFSUSXinczBFYJ5xcQNwa Xpo6DYNDNA3uENxk22+h6yj+lHH26K4= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 03/10] qemu: eliminate ret variable in qemuExtTPMStart Date: Tue, 28 Jan 2020 11:31:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.22 X-MC-Unique: TyxTzu5_PqWQ0Q2bQza7Cw-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" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_tpm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 21792f6992..6741373583 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -865,19 +865,18 @@ qemuExtTPMStart(virQEMUDriverPtr driver, virDomainObjPtr vm, bool incomingMigration) { - int ret =3D 0; virDomainTPMDefPtr tpm =3D vm->def->tpm; =20 switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: - ret =3D qemuExtTPMStartEmulator(driver, vm, incomingMigration); - break; + return qemuExtTPMStartEmulator(driver, vm, incomingMigration); + case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: break; } =20 - return ret; + return 0; } =20 =20 --=20 2.21.0 From nobody Sun May 5 04:50:40 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 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 1580207530672942.1657772178404; Tue, 28 Jan 2020 02:32:10 -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-414-cn2kuZyYMxKO7gfAVusQDQ-1; Tue, 28 Jan 2020 05:32:03 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 81FB7100550E; Tue, 28 Jan 2020 10:31:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5509A5DA85; Tue, 28 Jan 2020 10:31:58 +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 10B2418089D5; Tue, 28 Jan 2020 10:31:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVbi6014015 for ; Tue, 28 Jan 2020 05:31:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id E54A45C3FA; Tue, 28 Jan 2020 10:31:37 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 709455C21B for ; Tue, 28 Jan 2020 10:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207529; 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=lZImdkgKQFUebh2p+gymeXYs/wbpuWa9bZ8sESYYFDA=; b=CtfPBREhJe6b/P3Ovj7PPM4RQ+ADrFWvh35ZHwTyCfcGDOiwlaZnsimJxRP2SaSEx28UJh 3YzLSdbCNEEEgpBM5ESUzFCJtOn3HC7TRZdakt9eWNUUgu2td9I1+N1I0itu0r8DDBQCQN RpP1KYSenljlwX0pE5k7+n162Hgusbg= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 04/10] qemu: use def instead of vm->def in qemuExtDevicesStart Date: Tue, 28 Jan 2020 11:31:20 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.14 X-MC-Unique: cn2kuZyYMxKO7gfAVusQDQ-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" We have a helper variable to make the code more concise, use it consistently. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_extdevice.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 463f76c21a..1869a42f11 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -159,11 +159,11 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, int ret =3D 0; size_t i; =20 - if (qemuExtDevicesInitPaths(driver, vm->def) < 0) + if (qemuExtDevicesInitPaths(driver, def) < 0) return -1; =20 - for (i =3D 0; i < vm->def->nvideos; i++) { - virDomainVideoDefPtr video =3D vm->def->videos[i]; + for (i =3D 0; i < def->nvideos; i++) { + virDomainVideoDefPtr video =3D def->videos[i]; =20 if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER)= { ret =3D qemuExtVhostUserGPUStart(driver, vm, video); @@ -172,7 +172,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, } } =20 - if (vm->def->tpm) + if (def->tpm) ret =3D qemuExtTPMStart(driver, vm, incomingMigration); =20 for (i =3D 0; i < def->nnets; i++) { --=20 2.21.0 From nobody Sun May 5 04:50:40 2024 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 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 158020753933214.442882801184396; Tue, 28 Jan 2020 02:32:19 -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-25-glmDlGCcOCCgBtj1Cm6eMw-1; Tue, 28 Jan 2020 05:32:14 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 31936107B785; Tue, 28 Jan 2020 10:32:07 +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 0BFBB1001DDE; Tue, 28 Jan 2020 10:32:07 +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 B87D58596E; Tue, 28 Jan 2020 10:32:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVcS9014020 for ; Tue, 28 Jan 2020 05:31:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id B27545C21B; Tue, 28 Jan 2020 10:31:38 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D6AB5C3FA for ; Tue, 28 Jan 2020 10:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207538; 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=bdkpBMDl2ihJfuWH+W23qUopPnhtPr+Th8GzwiuxNV8=; b=DJ4vUgAfHRJU550RHUB+xK275t9kZcKGx87QObZJ6GaXhlk/BLipTzJi/14Tbq2dlahe3L YPqCuIdu0ad/gHeJpLBTLT5Fq8HTn6RoIvDXLwdJjt/1/0jZZjf6NLAqgPP0FM9TVo+pm4 sVGEx9OjGFPV+wxBZIT/lLFUYdRHQRE= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] qemu: eliminate ret in qemuExtDevicesStart Date: Tue, 28 Jan 2020 11:31:21 +0100 Message-Id: <1c01df220362966e8676eb2474c48011a1a5edd3.1580207305.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.22 X-MC-Unique: glmDlGCcOCCgBtj1Cm6eMw-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" All the callees return either 0 or -1 so there is no need for propagating the value. And we bail on the first error. Remove the variable to make the function simpler. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_extdevice.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 1869a42f11..9c0c0fd573 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -156,7 +156,6 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, bool incomingMigration) { virDomainDefPtr def =3D vm->def; - int ret =3D 0; size_t i; =20 if (qemuExtDevicesInitPaths(driver, def) < 0) @@ -166,14 +165,13 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, virDomainVideoDefPtr video =3D def->videos[i]; =20 if (video->backend =3D=3D VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER)= { - ret =3D qemuExtVhostUserGPUStart(driver, vm, video); - if (ret < 0) - return ret; + if (qemuExtVhostUserGPUStart(driver, vm, video) < 0) + return -1; } } =20 - if (def->tpm) - ret =3D qemuExtTPMStart(driver, vm, incomingMigration); + if (def->tpm && qemuExtTPMStart(driver, vm, incomingMigration) < 0) + return -1; =20 for (i =3D 0; i < def->nnets; i++) { virDomainNetDefPtr net =3D def->nets[i]; @@ -184,7 +182,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, return -1; } =20 - return ret; + return 0; } =20 =20 --=20 2.21.0 From nobody Sun May 5 04:50:40 2024 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 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1580207541492804.7465233045388; Tue, 28 Jan 2020 02:32:21 -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-419-TMMWa2F0Mmetv3BAMeF6GQ-1; Tue, 28 Jan 2020 05:32:18 -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 5D8CB18C43C7; Tue, 28 Jan 2020 10:32:12 +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 3523A60BE0; Tue, 28 Jan 2020 10:32:12 +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 CD1F585977; Tue, 28 Jan 2020 10:32:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVdwM014030 for ; Tue, 28 Jan 2020 05:31:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id 811AB5C3FA; Tue, 28 Jan 2020 10:31:39 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C4165C21B for ; Tue, 28 Jan 2020 10:31:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207540; 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=JjimbbMTNG6e+gyAQll3IbidkCEn+A+RYF4KAt6V7x8=; b=fE9S63ZCZwhokNmo9CQ4+26b5JLFe1chKX2uYdgi2ep736lAx0bWRYsMrBK59FY4v3jlSC 9PKDVxR5Bw7eB5R/D8mYekrpirA5NNw6eM+kzL81LfAiXTO5vyficY9p3EWWcFC2LnU+b2 53pbBnx4C9nINuhTbBtPcpdn4A48S2U= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] conf: remove outdated comments Date: Tue, 28 Jan 2020 11:31:22 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: TMMWa2F0Mmetv3BAMeF6GQ-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" Some *ParseXML functions have comments stating what kind of device they parse with an outdated list of parameters, with the exception of virDomainFSDefParseXML which claims to parse a disk. Remove them, assuming the function names are descriptive enough. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/conf/domain_conf.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 853cfddf1b..70501c4ffc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7598,9 +7598,6 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr) } =20 =20 -/* Parse the XML definition for a device address - * @param node XML nodeset to parse for device address definition - */ static int virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, xmlNodePtr node, @@ -10040,9 +10037,6 @@ virDomainDiskDefParsePrivateData(xmlXPathContextPtr= ctxt, #define VENDOR_LEN 8 #define PRODUCT_LEN 16 =20 -/* Parse the XML definition for a disk - * @param node XML nodeset to parse for disk definition - */ static virDomainDiskDefPtr virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, @@ -10721,9 +10715,6 @@ virDomainControllerModelTypeToString(virDomainContr= ollerDefPtr def, } =20 =20 -/* Parse the XML definition for a controller - * @param node XML nodeset to parse for controller definition - */ static virDomainControllerDefPtr virDomainControllerDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, @@ -11094,9 +11085,6 @@ virDomainNetGenerateMAC(virDomainXMLOptionPtr xmlop= t, } =20 =20 -/* Parse the XML definition for a disk - * @param node XML nodeset to parse for disk definition - */ static virDomainFSDefPtr virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, @@ -11521,10 +11509,6 @@ virDomainChrSourceReconnectDefParseXML(virDomainCh= rSourceReconnectDefPtr def, } =20 =20 -/* Parse the XML definition for a network interface - * @param node XML nodeset to parse for net definition - * @return 0 on success, -1 on failure - */ static virDomainNetDefPtr virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, @@ -12909,7 +12893,6 @@ virDomainChrDefNew(virDomainXMLOptionPtr xmlopt) } =20 /* Parse the XML definition for a character device - * @param node XML nodeset to parse for net definition * * The XML we're dealing with looks like * --=20 2.21.0 From nobody Sun May 5 04:50:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.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 207.211.31.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 [207.211.31.120]) by mx.zohomail.com with SMTPS id 1580207586252780.6631083097897; Tue, 28 Jan 2020 02:33:06 -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-343-yIFixi0gPhSDxHhOGNuDeQ-1; Tue, 28 Jan 2020 05:32:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A341B1800D41; Tue, 28 Jan 2020 10:32:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 66F8979AC; Tue, 28 Jan 2020 10:32:02 +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 DD0311808855; Tue, 28 Jan 2020 10:32:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVeBx014038 for ; Tue, 28 Jan 2020 05:31:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4DFB25C21A; Tue, 28 Jan 2020 10:31:40 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCA5D5C21B for ; Tue, 28 Jan 2020 10:31:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207585; 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=hVM2sf6dHx98ZWwMxnBzO9MOi6/BYQovBtd/0SITs3o=; b=CC5IspytXd5+aIls3VMad59muUIQz2SH98is/wIn2xq0/ct35BG8PE37su6qQXHRBOLXV7 Dbw/WHFk1IngphiTiOQ6aE5/BvIRUqQCF6bIolDKNtTKUMJruysLhgnU+pfnatuhu/EeF/ mlSaOnJy+9bdMoIkoRKTYtY+Sq1pmxU= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] conf: unmark xmlopt as unused in virDomainDeviceInfoParseXML Date: Tue, 28 Jan 2020 11:31:23 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.23 X-MC-Unique: yIFixi0gPhSDxHhOGNuDeQ-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" It is used by the user-alias handling code. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 70501c4ffc..9f7fe2aa78 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7599,7 +7599,7 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr) =20 =20 static int -virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, +virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, virDomainDeviceInfoPtr info, unsigned int flags) --=20 2.21.0 From nobody Sun May 5 04:50:40 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 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 1580207512092737.3841231911051; Tue, 28 Jan 2020 02:31:52 -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-202-nfZWOZYkMFGE19X321Ygeg-1; Tue, 28 Jan 2020 05:31:47 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A3B6107B78B; Tue, 28 Jan 2020 10:31:42 +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 6EC894FA9; Tue, 28 Jan 2020 10:31:42 +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 DE5B385953; Tue, 28 Jan 2020 10:31:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVfBg014048 for ; Tue, 28 Jan 2020 05:31:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id 1A9915C3FA; Tue, 28 Jan 2020 10:31:41 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 997DA5C21A for ; Tue, 28 Jan 2020 10:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207510; 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=EoPgHWDLejxcQE+6d96locg3SVeOKNj8w+QN9N6zKI4=; b=ineFDkj++gbszacq4gy3GbQ2CMh8qbQJAYtF1yy5IpWKrvuLzX7TBI6PoF6JNfVE5tC4bu 7040TieWVcx0X3k902G+Ka9bc1sg1d+MARCk0sBH+JCKgYZdDUyEAtElIqteldMelqYpXE CwGmEzZl1JiAtiIGJfuIbwXnFnD+EHA= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] include: add a space before ending a comment Date: Tue, 28 Jan 2020 11:31:24 +0100 Message-Id: <8134ffb8aaed672dffaa2ec79f342d59cef6af31.1580207305.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.84 on 10.5.11.23 X-MC-Unique: nfZWOZYkMFGE19X321Ygeg-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" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- include/libvirt/libvirt-domain.h | 8 ++++---- include/libvirt/libvirt-host.h | 2 +- include/libvirt/virterror.h | 5 ++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index faba90b040..5846e93d98 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -1428,7 +1428,7 @@ char * virDomainGetSchedulerType(vir= DomainPtr domain, # define VIR_DOMAIN_BLKIO_DEVICE_WRITE_BPS "device_write_bytes_sec" =20 =20 -/* Set Blkio tunables for the domain*/ +/* Set Blkio tunables for the domain */ int virDomainSetBlkioParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags); @@ -1436,7 +1436,7 @@ int virDomainGetBlkioParameters(virDomainPtr doma= in, virTypedParameterPtr params, int *nparams, unsigned int flags); =20 -/* Manage memory parameters. */ +/* Manage memory parameters. */ =20 /** * VIR_DOMAIN_MEMORY_PARAM_UNLIMITED: @@ -1483,7 +1483,7 @@ int virDomainGetBlkioParameters(virDomainPtr doma= in, =20 # define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "swap_hard_limit" =20 -/* Set memory tunables for the domain*/ +/* Set memory tunables for the domain */ int virDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params, int nparams, unsigned int flags); @@ -1768,7 +1768,7 @@ struct _virDomainBlockInfo { * holes, similar to 'du') */ unsigned long long physical; /* host physical size in bytes of * the image container (last - * offset, similar to 'ls')*/ + * offset, similar to 'ls') */ }; =20 int virDomainGetBlockInfo(virDomainPtr dom, diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index b87d634813..6972834175 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -167,7 +167,7 @@ struct _virNodeInfo { unsigned int sockets; /* number of CPU sockets per node if nodes > 1, 1 in case of unusual NUMA topology */ unsigned int cores; /* number of cores per socket, total number of - processors in case of unusual NUMA topology*/ + processors in case of unusual NUMA topology */ unsigned int threads; /* number of threads per core, 1 in case of unusual numa topology */ }; diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index b7aa2a0ec3..0f1c32283d 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -313,15 +313,14 @@ typedef enum { was denied */ VIR_ERR_DBUS_SERVICE =3D 89, /* error from a dbus service */ VIR_ERR_STORAGE_VOL_EXIST =3D 90, /* the storage vol already exist= s */ - VIR_ERR_CPU_INCOMPATIBLE =3D 91, /* given CPU is incompatible wit= h host - CPU*/ + VIR_ERR_CPU_INCOMPATIBLE =3D 91, /* given CPU is incompatible wit= h host CPU */ VIR_ERR_XML_INVALID_SCHEMA =3D 92, /* XML document doesn't validate= against schema */ VIR_ERR_MIGRATE_FINISH_OK =3D 93, /* Finish API succeeded but it i= s expected to return NULL */ VIR_ERR_AUTH_UNAVAILABLE =3D 94, /* authentication unavailable */ VIR_ERR_NO_SERVER =3D 95, /* Server was not found */ VIR_ERR_NO_CLIENT =3D 96, /* Client was not found */ VIR_ERR_AGENT_UNSYNCED =3D 97, /* guest agent replies with wron= g id - to guest-sync command (DEPRECAT= ED)*/ + to guest-sync command (DEPRECAT= ED) */ VIR_ERR_LIBSSH =3D 98, /* error in libssh transport dri= ver */ VIR_ERR_DEVICE_MISSING =3D 99, /* fail to find the desired devi= ce */ VIR_ERR_INVALID_NWFILTER_BINDING =3D 100, /* invalid nwfilter binding= */ --=20 2.21.0 From nobody Sun May 5 04:50:40 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 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1580207545183323.225132662399; Tue, 28 Jan 2020 02:32:25 -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-176-4nmwJROrNuq5y-IKsNbOGQ-1; Tue, 28 Jan 2020 05:32:21 -0500 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 2AA5618C43C4; Tue, 28 Jan 2020 10:32:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F240F863C9; Tue, 28 Jan 2020 10:32:15 +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 A3CA0180CB3B; Tue, 28 Jan 2020 10:32:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVg1n014055 for ; Tue, 28 Jan 2020 05:31:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 113A95C21A; Tue, 28 Jan 2020 10:31:42 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 684395C3FA for ; Tue, 28 Jan 2020 10:31:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207543; 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=a6gLs5QoGpAAZE1xcSSs3IIi0Rv3zYhqQjnlZ/Fkpn8=; b=hvD58for36cTynOk72gksBHJQsipI5OrLx5l5JGsLqAeqioAhwE3Q5/ESdCKMf8QE4Gvm3 ciJ49DozgnpcnPNhAaRCKQXNbhdgiAT496gifDWkStkZyNpimlpD9hd9u6Fi1fRPvmcQvL I11ICvMxS8KL+IFzzS1eWEg6XYDIFhE= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] Add a space before ending a comment Date: Tue, 28 Jan 2020 11:31:25 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 X-MC-Unique: 4nmwJROrNuq5y-IKsNbOGQ-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" Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/conf/capabilities.h | 2 +- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 8 ++-- src/conf/storage_conf.h | 2 +- src/esx/esx_network_driver.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/libxl/libxl_conf.h | 2 +- src/libxl/xen_xm.c | 2 +- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_controller.c | 4 +- src/lxc/lxc_process.c | 2 +- src/network/bridge_driver.c | 2 +- src/network/bridge_driver_linux.c | 2 +- src/openvz/openvz_conf.c | 4 +- src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_interface.c | 2 +- src/remote/remote_daemon.c | 2 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetsshsession.c | 4 +- src/security/security_apparmor.c | 2 +- src/storage/storage_util.c | 2 +- src/test/test_driver.c | 4 +- src/util/virarch.h | 2 +- src/util/vircommand.c | 2 +- src/util/virnetdevbandwidth.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virnetlink.c | 4 +- src/util/virperf.h | 6 +-- src/util/virresctrl.c | 2 +- src/vbox/vbox_common.c | 65 ++++++++++++++++--------------- src/vbox/vbox_snapshot_conf.c | 28 ++++++------- src/vbox/vbox_tmpl.c | 2 +- src/vz/vz_driver.c | 2 +- tests/objecteventtest.c | 2 +- tests/qemuagenttest.c | 2 +- tests/vboxsnapshotxmltest.c | 2 +- tests/vshtabletest.c | 2 +- tools/virsh-domain-monitor.c | 2 +- tools/virsh-domain.c | 8 ++-- tools/virsh-pool.c | 2 +- 48 files changed, 109 insertions(+), 108 deletions(-) diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 75f29666c9..e2581fac8b 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -150,7 +150,7 @@ struct _virCapsHostCache { =20 struct _virCapsHostMemBWNode { unsigned int id; - virBitmapPtr cpus; /* All CPUs that belong to this node*/ + virBitmapPtr cpus; /* All CPUs that belong to this node */ virResctrlInfoMemBWPerNode control; }; =20 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 837d77581c..8fca3df874 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -507,7 +507,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt, goto cleanup; } =20 - /* ensure that the string can be passed to qemu*/ + /* ensure that the string can be passed to qemu */ if (strchr(vendor_id, ',')) { virReportError(VIR_ERR_XML_ERROR, "%s", _("vendor id is invalid")); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f7fe2aa78..8e1d498c68 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4444,7 +4444,7 @@ virDomainDefPostParseMemory(virDomainDefPtr def, =20 if (numaMemory) { /* update the sizes in XML if nothing was set in the XML or ABI up= date - * is supported*/ + * is supported */ virDomainDefSetMemoryTotal(def, numaMemory + hotplugMemory); } else { /* verify that the sum of memory modules doesn't exceed the total @@ -7723,7 +7723,7 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node, ignore_value(virStringParseYesNo(autoAddress, &usbsrc->autoAddress= )); =20 /* Product can validly be 0, so we need some extra help to determine - * if it is uninitialized*/ + * if it is uninitialized */ got_product =3D false; got_vendor =3D false; =20 @@ -12333,7 +12333,7 @@ virDomainChrDefaultTargetType(int devtype) =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: - /* No target type yet*/ + /* No target type yet */ break; } =20 @@ -12364,7 +12364,7 @@ virDomainChrTargetTypeFromString(int devtype, =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: - /* No target type yet*/ + /* No target type yet */ ret =3D 0; break; } diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index c0baeffc1c..daa21a127b 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -209,7 +209,7 @@ struct _virStoragePoolSource { /* Vendor of the source */ char *vendor; =20 - /* Product name of the source*/ + /* Product name of the source */ char *product; =20 /* Pool type specific format such as filesystem type, diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 0d52818e18..d46fc9253d 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -508,7 +508,7 @@ esxNetworkUndefine(virNetworkPtr network) if (esxVI_EnsureSession(priv->primary) < 0) return -1; =20 - /* Lookup HostVirtualSwitch and HostPortGroup list*/ + /* Lookup HostVirtualSwitch and HostPortGroup list */ if (esxVI_LookupHostVirtualSwitchByName(priv->primary, network->name, &hostVirtualSwitch, esxVI_Occurrence_RequiredItem)= < 0 || diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index e41e84e3e2..86decdc853 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -397,7 +397,7 @@ libxlMakeDomBuildInfo(virDomainDefPtr def, char xlCPU[32]; =20 /* enable nested HVM only if global nested_hvm option enable i= t and - * host support it*/ + * host support it */ if (ARCH_IS_X86(def->os.arch)) { vmx =3D virCPUCheckFeature(caps->host.arch, caps->host.cpu= , "vmx"); svm =3D virCPUCheckFeature(caps->host.arch, caps->host.cpu= , "svm"); diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 4b5d240684..b61c52f1a5 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -138,7 +138,7 @@ struct _libxlDriverPrivate { /* Immutable pointer, immutable object */ virPortAllocatorRangePtr migrationPorts; =20 - /* Immutable pointer, lockless APIs*/ + /* Immutable pointer, lockless APIs */ virSysinfoDefPtr hostsysinfo; =20 /* Immutable pointer. lockless access */ diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c index 54eb6fc97d..3883725efc 100644 --- a/src/libxl/xen_xm.c +++ b/src/libxl/xen_xm.c @@ -122,7 +122,7 @@ xenParseXMDisk(char *entry, int hvm) * The DEST-DEVICE is optionally post-fixed with disk type */ =20 - /* Extract the source file path*/ + /* Extract the source file path */ if (!(offset =3D strchr(head, ','))) goto error; =20 diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index 65c38139c4..7ea228ce37 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1177,7 +1177,7 @@ int main(int argc, char **argv) { } } =20 - /* Read the config file if it exists*/ + /* Read the config file if it exists */ if (remote_config_file && virLockDaemonConfigLoadFile(config, remote_config_file, implicit_c= onf) < 0) { VIR_ERROR(_("Can't load config file: %s: %s"), diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 488f3b459d..97be2be0a1 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -949,7 +949,7 @@ int main(int argc, char **argv) { } } =20 - /* Read the config file if it exists*/ + /* Read the config file if it exists */ if (remote_config_file && virLogDaemonConfigLoadFile(config, remote_config_file, implicit_co= nf) < 0) { VIR_ERROR(_("Can't load config file: %s: %s"), diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 59782d9cb2..f2f0e0a570 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -80,7 +80,7 @@ struct _virLXCDriver { /* Immutable pointer, Immutable object */ virDomainXMLOptionPtr xmlopt; =20 - /* Immutable pointer, lockless APIs*/ + /* Immutable pointer, lockless APIs */ virSysinfoDefPtr hostsysinfo; =20 /* Atomic inc/dec only */ diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 42c631ed0b..723680aa8f 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -672,7 +672,7 @@ static int virLXCControllerSetupLoopDevices(virLXCContr= ollerPtr ctrl) =20 /* The NBD device will be cleaned up while the cgroup will end. * For this we need to remember the qemu-nbd pid and add it to - * the cgroup*/ + * the cgroup */ if (virLXCControllerAppendNBDPids(ctrl, fs->src->path) < 0) return -1; } else { @@ -737,7 +737,7 @@ static int virLXCControllerSetupLoopDevices(virLXCContr= ollerPtr ctrl) =20 /* The NBD device will be cleaned up while the cgroup will end. * For this we need to remember the qemu-nbd pid and add it to - * the cgroup*/ + * the cgroup */ if (virLXCControllerAppendNBDPids(ctrl, virDomainDiskGetSource= (disk)) < 0) return -1; } else { diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index af8593d6a5..2e860e2fae 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -493,7 +493,7 @@ virLXCProcessSetupNamespaces(virLXCDriverPtr driver, =20 for (i =3D 0; i < VIR_LXC_DOMAIN_NAMESPACE_LAST; i++) nsFDs[i] =3D -1; - /*If there are no namespace to be opened just return success*/ + /* If there are no namespaces to be opened just return success */ if (lxcDef =3D=3D NULL) return 0; =20 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index b66135f2d9..8a6de9d382 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4059,7 +4059,7 @@ networkDestroy(virNetworkPtr net) =20 virNetworkObjDeleteAllPorts(obj, driver->stateDir); =20 - /* @def replaced in virNetworkObjUnsetDefTransient*/ + /* @def replaced in virNetworkObjUnsetDefTransient */ def =3D virNetworkObjGetDef(obj); =20 event =3D virNetworkEventLifecycleNew(def->name, diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 9de8e93c60..7bbde5c6a9 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -565,7 +565,7 @@ networkAddGeneralIPv4FirewallRules(virFirewallPtr fw, iptablesAddTcpOutput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 53); iptablesAddUdpOutput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 53); =20 - /* allow TFTP requests through to dnsmasq if necessary & back out*/ + /* allow TFTP requests through to dnsmasq if necessary & back out */ if (ipv4def && ipv4def->tftproot) { iptablesAddUdpInput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 69); iptablesAddUdpOutput(fw, VIR_FIREWALL_LAYER_IPV4, def->bridge, 69); diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index e9ee1a7bf4..bc45e96fab 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -233,7 +233,7 @@ openvzReadNetworkConf(virDomainDefPtr def, } else if (ret > 0) { token =3D strtok_r(temp, ";", &saveptr); while (token !=3D NULL) { - /*add new device to list*/ + /* add new device to list */ if (VIR_ALLOC(net) < 0) goto error; =20 @@ -243,7 +243,7 @@ openvzReadNetworkConf(virDomainDefPtr def, char cpy_temp[32]; int len; =20 - /*parse string*/ + /* parse string */ do { char *next =3D strchrnul(p, ','); if (STRPREFIX(p, "ifname=3D")) { diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 62644f3129..e3245aec4d 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1498,7 +1498,7 @@ Version: 2.2 if ((fp =3D fopen("/proc/vz/vestat", "r")) =3D=3D NULL) return -1; =20 - /*search line with VEID=3Dvpsid*/ + /* search line with VEID=3Dvpsid */ while (1) { ret =3D getline(&line, &line_size, fp); if (ret < 0) { @@ -1508,7 +1508,7 @@ Version: 2.2 =20 if (sscanf(line, "%d %llu %llu %llu", &readvps, &usertime, &nicetime, &systime) =3D=3D 4 - && readvps =3D=3D vpsid) { /*found vpsid*/ + && readvps =3D=3D vpsid) { /* found vpsid */ /* convert jiffies to nanoseconds */ *cpuTime =3D (1000ull * 1000ull * 1000ull * (usertime + nicetime + systime) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 56af9e9a0e..0e72057052 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -123,7 +123,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */ =20 /* 55 */ - X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/ + X_QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc */ QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=3Dstring */ X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */ X_QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=3Don|off */ @@ -232,7 +232,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_DTB, /* -dtb file */ QEMU_CAPS_SCSI_MEGASAS, /* -device megasas */ X_QEMU_CAPS_IPV6_MIGRATION, /* -incoming [::] */ - X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx*/ + X_QEMU_CAPS_MACHINE_OPT, /* -machine xxxx */ =20 /* 135 */ X_QEMU_CAPS_MACHINE_USB_OPT, /* -machine xxx,usb=3Don/off */ diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 4ab1999568..cedf232223 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -301,7 +301,7 @@ struct _virQEMUDriver { /* Immutable pointer, immutable object */ virPortAllocatorRangePtr migrationPorts; =20 - /* Immutable pointer, lockless APIs*/ + /* Immutable pointer, lockless APIs */ virSysinfoDefPtr hostsysinfo; =20 /* Immutable pointer. lockless access */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b0c0e1a19b..5bfff6042f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7408,7 +7408,7 @@ qemuDomainDeviceDefValidateControllerPCI(const virDom= ainControllerDef *cont, } =20 /* For all other pci-root and pcie-root controllers, though, - * the index must be zero*/ + * the index must be zero */ if (cont->idx !=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Index for '%s' controllers must be 0"), @@ -12324,7 +12324,7 @@ qemuDomainGetMemorySizeAlignment(virDomainDefPtr de= f) return 256 * 1024; =20 /* Align memory size. QEMU requires rounding to next 4KiB block. - * We'll take the "traditional" path and round it to 1MiB*/ + * We'll take the "traditional" path and round it to 1MiB */ =20 return 1024; } diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 9e3bcc434d..b663e05391 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2211,7 +2211,7 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, continue; =20 /* First IDE controller lives on the PIIX3 at slot=3D1, function= =3D1, - dealt with earlier on*/ + dealt with earlier on */ if (cont->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_IDE && cont->idx =3D=3D 0) continue; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 048855b533..c24543d323 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15190,7 +15190,7 @@ qemuDomainSnapshotPrepare(virDomainObjPtr vm, } =20 /* internal snapshot requires a disk image to store the memory image t= o, and - * also disks can't be excluded from an internal snapshot*/ + * also disks can't be excluded from an internal snapshot */ if ((def->memory =3D=3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL && !foun= d_internal) || (found_internal && forbid_internal)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 31d455505b..7ed78cfe26 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -283,7 +283,7 @@ qemuDomainChangeMediaLegacy(virQEMUDriverPtr driver, return -1; =20 } else { - /* otherwise report possible errors from the attempt to eject the = media*/ + /* otherwise report possible errors from the attempt to eject the = media */ if (rc < 0) return -1; } diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index bb62b53c04..c514c804ea 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -685,7 +685,7 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def, vhostnet_path =3D "/dev/vhost-net"; =20 /* If running a plain QEMU guest, or - * if the config says explicitly to not use vhost, return now*/ + * if the config says explicitly to not use vhost, return now */ if (def->virtType !=3D VIR_DOMAIN_VIRT_KVM || net->driver.virtio.name =3D=3D VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) { *vhostfdSize =3D 0; diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 33697988b6..c427864ce1 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -1135,7 +1135,7 @@ int main(int argc, char **argv) { } } =20 - /* Read the config file if it exists*/ + /* Read the config file if it exists */ if (remote_config_file && daemonConfigLoadFile(config, remote_config_file, implicit_conf) < = 0) { VIR_ERROR(_("Can't load config file: %s: %s"), diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 000b937cdd..e62cfe64bc 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -1241,7 +1241,7 @@ virNetClientCallDispatch(virNetClientPtr client) return virNetClientCallDispatchMessage(client); =20 case VIR_NET_STREAM: /* Stream protocol */ - case VIR_NET_STREAM_HOLE: /* Sparse stream protocol*/ + case VIR_NET_STREAM_HOLE: /* Sparse stream protocol */ return virNetClientCallDispatchStream(client); =20 case VIR_NET_CALL: diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index ed8e948835..63773ecfc2 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -345,7 +345,7 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) } =20 /* calculate remote key hash, using MD5 algorithm that is - * usual in OpenSSH. The returned value should *NOT* be freed*/ + * usual in OpenSSH. The returned value should *NOT* be freed = */ if (!(keyhash =3D libssh2_hostkey_hash(sess->session, LIBSSH2_HOSTKEY_HASH_MD5)= )) { virReportError(VIR_ERR_SSH, "%s", @@ -925,7 +925,7 @@ virNetSSHOpenChannel(virNetSSHSessionPtr sess) return -1; } =20 - /* nonblocking mode - currently does nothing*/ + /* nonblocking mode - currently does nothing */ libssh2_channel_set_blocking(sess->channel, 0); =20 /* channel open */ diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 7cea788931..ca02631f7f 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -256,7 +256,7 @@ use_apparmor(void) rc =3D profile_status(libvirt_daemon, 1); if (rc < 0) { rc =3D profile_status("libvirtd", 1); - /* Error or unconfined should all result in -1*/ + /* Error or unconfined should all result in -1 */ if (rc < 0) rc =3D -1; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 987d937b04..62b0d9b66f 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -3123,7 +3123,7 @@ typedef enum { VIR_STORAGE_PARTED_DIFFERENT, /* Valid label found but not match for= mat */ VIR_STORAGE_PARTED_UNKNOWN, /* No or unrecognized label */ VIR_STORAGE_PARTED_NOPTTYPE, /* Did not find the Partition Table ty= pe */ - VIR_STORAGE_PARTED_PTTYPE_UNK, /* Partition Table type unknown*/ + VIR_STORAGE_PARTED_PTTYPE_UNK, /* Partition Table type unknown */ } virStorageBackendPARTEDResult; =20 /** diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 1908185743..47c1fc588f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4960,7 +4960,7 @@ static int testDomainBlockStats(virDomainPtr domain, goto error; } =20 - /* No significance to these numbers, just enough to mix it up*/ + /* No significance to these numbers, just enough to mix it up */ statbase =3D g_get_real_time(); stats->rd_req =3D statbase / 10; stats->rd_bytes =3D statbase / 20; @@ -5119,7 +5119,7 @@ testDomainInterfaceStats(virDomainPtr domain, if (!(net =3D virDomainNetFind(privdom->def, device))) goto error; =20 - /* No significance to these numbers, just enough to mix it up*/ + /* No significance to these numbers, just enough to mix it up */ statbase =3D g_get_real_time(); stats->rx_bytes =3D statbase / 10; stats->rx_packets =3D statbase / 100; diff --git a/src/util/virarch.h b/src/util/virarch.h index 233b83f31b..c3890606ec 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -63,7 +63,7 @@ typedef enum { VIR_ARCH_SH4EB, /* SuperH4 32 BE http://en.wikipedia.org/wi= ki/SuperH */ VIR_ARCH_SPARC, /* Sparc 32 BE http://en.wikipedia.org/wi= ki/Sparc */ VIR_ARCH_SPARC64, /* Sparc 64 BE http://en.wikipedia.org/wi= ki/Sparc */ - VIR_ARCH_UNICORE32, /* UniCore 32 LE http://en.wikipedia.org/wi= ki/Unicore*/ + VIR_ARCH_UNICORE32, /* UniCore 32 LE http://en.wikipedia.org/wi= ki/Unicore */ VIR_ARCH_X86_64, /* x86 64 LE http://en.wikipedia.org/wi= ki/X86 */ =20 VIR_ARCH_XTENSA, /* XTensa 32 LE http://en.wikipedia.org/wi= ki/Xtensa#Processor_Cores */ diff --git a/src/util/vircommand.c b/src/util/vircommand.c index dd37b0b8dc..24ba86f99d 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2456,7 +2456,7 @@ virCommandDoAsyncIOHelper(void *opaque) { virCommandPtr cmd =3D opaque; if (virCommandProcessIO(cmd) < 0) { - /* If something went wrong, save errno or -1*/ + /* If something went wrong, save errno or -1 */ cmd->has_error =3D errno ? errno : -1; } } diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 094821cd30..5fd7186760 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -501,7 +501,7 @@ virNetDevBandwidthEqual(const virNetDevBandwidth *a, return false; } =20 - /*out*/ + /* out */ if (a->out) { if (!b->out) return false; diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index 5ca96132c4..5a85f2cb64 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -961,7 +961,7 @@ virNetDevVPortProfileOpCommon(const char *ifname, int i= findex, return rc; } =20 - if (setlink_only) /*for re-associations on existing links*/ + if (setlink_only) /* for re-associations on existing links */ return 0; =20 if (!nltarget_kernel && diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 710b4f5f51..cc86b6e315 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -62,12 +62,12 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetlinkHandle, virNetl= inkFree); typedef struct _virNetlinkEventSrvPrivate virNetlinkEventSrvPrivate; typedef virNetlinkEventSrvPrivate *virNetlinkEventSrvPrivatePtr; struct _virNetlinkEventSrvPrivate { - /*Server*/ + /* Server */ virMutex lock; int eventwatch; int netlinkfd; virNetlinkHandle *netlinknh; - /*Events*/ + /* Events */ int handled; size_t handlesCount; size_t handlesAlloc; diff --git a/src/util/virperf.h b/src/util/virperf.h index 3102b42af9..db61f94888 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -36,7 +36,7 @@ typedef enum { VIR_PERF_EVENT_BRANCH_INSTRUCTIONS, /* Count of branch instructions for applications */ VIR_PERF_EVENT_BRANCH_MISSES, /* Count of branch misses for applicati= ons */ - VIR_PERF_EVENT_BUS_CYCLES, /* Count of bus cycles for applicatio= ns*/ + VIR_PERF_EVENT_BUS_CYCLES, /* Count of bus cycles for applicatio= ns */ VIR_PERF_EVENT_STALLED_CYCLES_FRONTEND, /* Count of stalled cpu cycles= in the frontend of the instruc= tion processor pipeline */ @@ -44,8 +44,8 @@ typedef enum { the backend of the instructi= on processor pipeline */ VIR_PERF_EVENT_REF_CPU_CYCLES, /* Count of ref cpu cycles */ - VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time*/ - VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time*/ + VIR_PERF_EVENT_CPU_CLOCK, /* Count of cpu clock time */ + VIR_PERF_EVENT_TASK_CLOCK, /* Count of task clock time */ VIR_PERF_EVENT_PAGE_FAULTS, /* Count of total page faults */ VIR_PERF_EVENT_CONTEXT_SWITCHES, /* Count of context switches */ VIR_PERF_EVENT_CPU_MIGRATIONS, /* Count of cpu migrations */ diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 684d2ce398..615166469c 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -234,7 +234,7 @@ virResctrlInfoMonFree(virResctrlInfoMonPtr mon) } =20 =20 -/* virResctrlAlloc and virResctrlMonitor*/ +/* virResctrlAlloc and virResctrlMonitor */ =20 /* * virResctrlAlloc and virResctrlMonitor are representing a resource contr= ol diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index fc67b716da..7cd9b7be20 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -617,7 +617,7 @@ static int vboxConnectIsSecure(virConnectPtr conn G_GNU= C_UNUSED) =20 static int vboxConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { - /* No encryption is needed, or used on the local transport*/ + /* No encryption is needed, or used on the local transport */ return 0; } =20 @@ -769,7 +769,7 @@ static virDomainPtr vboxDomainLookupByID(virConnectPtr = conn, int id) =20 VBOX_IID_INITIALIZE(&iid); /* Internal vbox IDs start from 0, the public libvirt ID - * starts from 1, so refuse id =3D=3D 0, and adjust the rest*/ + * starts from 1, so refuse id =3D=3D 0, and adjust the rest */ if (id =3D=3D 0) { virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching id %d"), id); @@ -4592,7 +4592,7 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; =20 rc =3D gVBoxAPI.UIMachine.SaveSettings(machine); - /*It may failed when the machine is not mutable.*/ + /* It may failed when the machine is not mutable. */ rc =3D gVBoxAPI.UIMachine.GetSettingsFilePath(machine, &settingsFilePa= th); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4601,7 +4601,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } VBOX_UTF16_TO_UTF8(settingsFilePath, &settingsFilePath_Utf8); =20 - /*Getting the machine name to retrieve the machine location path.*/ + /* Getting the machine name to retrieve the machine location path. */ rc =3D gVBoxAPI.UIMachine.GetName(machine, &machineNameUtf16); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4618,7 +4618,7 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } =20 - /*We create the xml struct with the settings file path.*/ + /* We create the xml struct with the settings file path. */ snapshotMachineDesc =3D virVBoxSnapshotConfLoadVboxFile(settingsFilePa= th_Utf8, machineLocationPath); if (snapshotMachineDesc =3D=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4646,8 +4646,8 @@ vboxSnapshotRedefine(virDomainPtr dom, &realReadWrit= eDisksPath); realReadOnlyDisksPathSize =3D virVBoxSnapshotConfGetRODisksPathsFr= omLibvirtXML(currentSnapshotXmlFilePath, &= realReadOnlyDisksPath); - /*The read-only disk number is necessarily greater or equal to the - *read-write disk number*/ + /* The read-only disk number is necessarily greater or equal to the + * read-write disk number */ if (realReadOnlyDisksPathSize < realReadWriteDisksPathSize) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("The read only disk number must be greater or= equal to the " @@ -4769,9 +4769,9 @@ vboxSnapshotRedefine(virDomainPtr dom, _("Unable to know if disk is in media registry"= )); goto cleanup; } - if (diskInMediaRegistry =3D=3D 1) /*Nothing to do.*/ + if (diskInMediaRegistry =3D=3D 1) /* Nothing to do. */ continue; - /*The read only disk is not in the media registry*/ + /* The read only disk is not in the media registry */ =20 VBOX_UTF8_TO_UTF16(def->parent.dom->disks[it]->src->path, &locatio= nUtf); rc =3D gVBoxAPI.UIVirtualBox.OpenMedium(data->vboxObj, @@ -4807,7 +4807,7 @@ vboxSnapshotRedefine(virDomainPtr dom, VBOX_UTF16_TO_UTF8(formatUtf, &format); VBOX_UTF16_FREE(formatUtf); =20 - /*This disk is already in the media registry*/ + /* This disk is already in the media registry */ IMedium *parentReadOnlyMedium =3D NULL; rc =3D gVBoxAPI.UIMedium.GetParent(readOnlyMedium, &parentReadOnly= Medium); if (NS_FAILED(rc)) { @@ -4857,7 +4857,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } } =20 - /*Now, we can unregister the machine*/ + /* Now, we can unregister the machine */ rc =3D gVBoxAPI.UIMachine.Unregister(machine, CleanupMode_DetachAllReturnHardDisk= sOnly, &aMediaSize, @@ -4890,7 +4890,7 @@ vboxSnapshotRedefine(virDomainPtr dom, VBOX_UTF16_TO_UTF8(locationUtf16, &locationUtf8); VBOX_UTF16_FREE(locationUtf16); if (strstr(locationUtf8, "fake") !=3D NULL) { - /*we delete the fake disk because we don't need it anymore= */ + /* we delete the fake disk because we don't need it anymor= e */ IProgress *progress =3D NULL; resultCodeUnion resultCode; rc =3D gVBoxAPI.UIMedium.DeleteStorage(medium, &progress); @@ -4925,7 +4925,7 @@ vboxSnapshotRedefine(virDomainPtr dom, VBOX_UTF8_FREE(locationUtf8); } } - /*Close all disks that failed to close normally.*/ + /* Close all disks that failed to close normally. */ for (it =3D 0; it < snapshotMachineDesc->mediaRegistry->ndisks; it++) { if (vboxCloseDisksRecursively(dom, snapshotMachineDesc->mediaRegis= try->disks[it]->location) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -4933,9 +4933,9 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } } - /*Here, all disks are closed or deleted*/ + /* Here, all disks are closed or deleted */ =20 - /*We are now going to create and fill the Snapshot xml struct*/ + /* We are now going to create and fill the Snapshot xml struct */ if (VIR_ALLOC(newSnapshotPtr) < 0) goto cleanup; =20 @@ -4957,7 +4957,8 @@ vboxSnapshotRedefine(virDomainPtr dom, =20 newSnapshotPtr->storageController =3D g_strdup(snapshotMachineDesc->st= orageController); =20 - /*We get the parent disk uuid from the parent disk location to correct= ly fill the storage controller.*/ + /* We get the parent disk uuid from the parent disk location + * to correctly fill the storage controller. */ for (it =3D 0; it < def->parent.dom->ndisks; it++) { char *location =3D NULL; const char *uuidReplacing =3D NULL; @@ -4966,7 +4967,7 @@ vboxSnapshotRedefine(virDomainPtr dom, location =3D def->parent.dom->disks[it]->src->path; if (!location) goto cleanup; - /*Replacing the uuid*/ + /* Replacing the uuid */ uuidReplacing =3D virVBoxSnapshotConfHardDiskUuidByLocation(snapsh= otMachineDesc, location); if (uuidReplacing =3D=3D NULL) goto cleanup; @@ -5120,7 +5121,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } =20 if (needToChangeStorageController) { - /*We need to append this disk in the storage controller*/ + /* We need to append this disk in the storage controller */ char *tmp =3D NULL; resultSize =3D virStringSearch(snapshotMachineDesc->storag= eController, VBOX_UUID_REGEX, @@ -5142,7 +5143,7 @@ vboxSnapshotRedefine(virDomainPtr dom, =20 VIR_FREE(tmp); } - /*Close disk*/ + /* Close disk */ rc =3D gVBoxAPI.UIMedium.Close(medium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5152,7 +5153,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } } } else { - /*Create a "fake" disk to avoid corrupting children snapshot disks= .*/ + /* Create a "fake" disk to avoid corrupting children snapshot disk= s. */ for (it =3D 0; it < def->parent.dom->ndisks; it++) { IMedium *medium =3D NULL; PRUnichar *locationUtf16 =3D NULL; @@ -5259,7 +5260,7 @@ vboxSnapshotRedefine(virDomainPtr dom, goto cleanup; } newHardDisk =3D NULL; /* Consumed by above */ - /*Adding the fake disk to the machine storage controllers*/ + /* Adding the fake disk to the machine storage controllers */ =20 resultSize =3D virStringSearch(snapshotMachineDesc->storageCon= troller, VBOX_UUID_REGEX, @@ -5280,7 +5281,7 @@ vboxSnapshotRedefine(virDomainPtr dom, snapshotMachineDesc->storageController =3D g_strdup(tmp); =20 VIR_FREE(tmp); - /*Closing the "fake" disk*/ + /* Closing the "fake" disk */ rc =3D gVBoxAPI.UIMedium.Close(newMedium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -5348,7 +5349,7 @@ vboxSnapshotRedefine(virDomainPtr dom, } } =20 - /*Now, we rewrite the 'machineName'.vbox file to redefine the machine.= */ + /* Now, we rewrite the 'machineName'.vbox file to redefine the machine= . */ if (virVBoxSnapshotConfSaveVboxFile(snapshotMachineDesc, settingsFileP= ath_Utf8) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to serialize the machine description")); @@ -6872,7 +6873,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) } VBOX_UTF16_TO_UTF8(settingsFilePathUtf16, &settingsFilepath); =20 - /*Getting the machine name to retrieve the machine location path.*/ + /* Getting the machine name to retrieve the machine location path. */ rc =3D gVBoxAPI.UIMachine.GetName(machine, &machineNameUtf16); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -7027,7 +7028,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) _("Unable to add hard disk to the media= registry")); goto cleanup; } - /*Adding fake disks to the machine storage controllers*/ + /* Adding fake disks to the machine storage controllers */ =20 resultSize =3D virStringSearch(snapshotMachineDesc->storag= eController, VBOX_UUID_REGEX, @@ -7048,7 +7049,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) snapshotMachineDesc->storageController =3D g_strdup(tmp); =20 VIR_FREE(tmp); - /*Closing the "fake" disk*/ + /* Closing the "fake" disk */ rc =3D gVBoxAPI.UIMedium.Close(newMedium); if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -7093,7 +7094,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) } } } - /*We remove the read write disks from the media registry*/ + /* We remove the read write disks from the media registry */ for (it =3D 0; it < def->ndisks; it++) { const char *uuidRW =3D virVBoxSnapshotConfHardDiskUuidByLocation(snapshotMachineDesc, @@ -7109,7 +7110,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) goto cleanup; } } - /*If the parent snapshot is not NULL, we remove the-read only disks fr= om the media registry*/ + /* If the parent snapshot is not NULL, we remove the-read only disks f= rom the media registry */ if (def->parent.parent_name !=3D NULL) { for (it =3D 0; it < def->parent.dom->ndisks; it++) { const char *uuidRO =3D @@ -7149,7 +7150,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) rc =3D gVBoxAPI.UIMedium.GetLocation(medium, &locationUtf16); VBOX_UTF16_TO_UTF8(locationUtf16, &locationUtf8); if (isCurrent && strstr(locationUtf8, "fake") !=3D NULL) { - /*we delete the fake disk because we don't need it anymore*/ + /* we delete the fake disk because we don't need it anymore */ IProgress *progress =3D NULL; resultCodeUnion resultCode; rc =3D gVBoxAPI.UIMedium.DeleteStorage(medium, &progress); @@ -7181,7 +7182,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) VBOX_UTF8_FREE(locationUtf8); } =20 - /*removing the snapshot*/ + /* removing the snapshot */ if (virVBoxSnapshotConfRemoveSnapshot(snapshotMachineDesc, def->parent= .name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Unable to remove snapshot %s"), def->parent.name= ); @@ -7201,7 +7202,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) } } =20 - /*Registering the machine*/ + /* Registering the machine */ if (virVBoxSnapshotConfSaveVboxFile(snapshotMachineDesc, settingsFilep= ath) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to serialize the machine description")); @@ -7593,7 +7594,7 @@ vboxConnectListAllDomains(virConnectPtr conn, =20 if (doms) { /* safe to ignore, new size will be equal or less than - * previous allocation*/ + * previous allocation */ ignore_value(VIR_REALLOC_N(doms, count + 1)); *domains =3D doms; doms =3D NULL; diff --git a/src/vbox/vbox_snapshot_conf.c b/src/vbox/vbox_snapshot_conf.c index 4cd4e3a983..3876955981 100644 --- a/src/vbox/vbox_snapshot_conf.c +++ b/src/vbox/vbox_snapshot_conf.c @@ -64,7 +64,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlN= odePtr diskNode, hardDisk->children[i]->parent =3D hardDisk; } uuid =3D virXMLPropString(diskNode, "uuid"); - /*we use virStringSearch because the uuid is between brackets*/ + /* we use virStringSearch because the uuid is between brackets */ resultSize =3D virStringSearch(uuid, VBOX_UUID_REGEX, 1, @@ -83,7 +83,7 @@ virVBoxSnapshotConfCreateVBoxSnapshotConfHardDiskPtr(xmlN= odePtr diskNode, goto cleanup; } if (location[0] !=3D '/') { - /*The location is a relative path, so we must change it into an ab= solute one. */ + /* The location is a relative path, so we must change it into an a= bsolute one. */ tmp =3D g_strdup_printf("%s%s", machineLocation, location); hardDisk->location =3D g_strdup(tmp); } else { @@ -194,7 +194,7 @@ virVBoxSnapshotConfRetrieveSnapshot(xmlNodePtr snapshot= Node, goto cleanup; =20 uuid =3D virXMLPropString(snapshotNode, "uuid"); - /*we use virStringSearch because the uuid is between brackets*/ + /* we use virStringSearch because the uuid is between brackets */ resultSize =3D virStringSearch(uuid, VBOX_UUID_REGEX, 1, @@ -385,7 +385,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, goto cleanup; =20 /* We change the date format from "yyyy-MM-dd hh:mm:ss.msec+timeZone" - * to "yyyy-MM-ddThh:mm:ssZ"*/ + * to "yyyy-MM-ddThh:mm:ssZ" */ firstRegexResult =3D virStringSearch(snapshot->timeStamp, "([0-9]{4}-[0-9]{2}-[0-9]{2})", 1, @@ -403,13 +403,13 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, if (xmlNewProp(node, BAD_CAST "timeStamp", BAD_CAST timeStamp) =3D=3D = NULL) goto cleanup; =20 - /*node description*/ + /* node description */ if (snapshot->description !=3D NULL) { descriptionNode =3D xmlNewNode(NULL, BAD_CAST "Description"); xmlNodeSetContent(descriptionNode, BAD_CAST snapshot->description); xmlAddChild(node, descriptionNode); } - /*hardware*/ + /* hardware */ parseError =3D xmlParseInNodeContext(node, snapshot->hardware, (int)strlen(snapshot->hardware), @@ -422,7 +422,7 @@ virVBoxSnapshotConfSerializeSnapshot(xmlNodePtr node, } xmlAddChild(node, hardwareNode); =20 - /*storageController*/ + /* storageController */ if (xmlParseInNodeContext(node, snapshot->storageController, (int)strlen(snapshot->storageController), 0, @@ -620,7 +620,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, goto cleanup; } =20 - /*Retrieve MachineNode*/ + /* Retrieve MachineNode */ cur =3D xmlDocGetRootElement(xml); xPathContext->node =3D cur; machineNode =3D virXPathNode("./vbox:Machine", xPathContext); @@ -645,7 +645,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, =20 currentSnapshotAttribute =3D virXMLPropString(machineNode, "currentSna= pshot"); if (currentSnapshotAttribute !=3D NULL) { - /*we use virStringSearch because the uuid is between brackets*/ + /* we use virStringSearch because the uuid is between brackets */ searchResultSize =3D virStringSearch(currentSnapshotAttribute, VBOX_UUID_REGEX, 1, @@ -699,7 +699,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, } machineDescription->storageController =3D virXMLNodeToString(xml, cur); =20 - /*retrieve mediaRegistry*/ + /* retrieve mediaRegistry */ cur =3D virXPathNode("./vbox:MediaRegistry", xPathContext); if (cur =3D=3D NULL) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -713,7 +713,7 @@ virVBoxSnapshotConfLoadVboxFile(const char *filePath, goto cleanup; } =20 - /*retrieve snapshot*/ + /* retrieve snapshot */ xPathContext->node =3D machineNode; cur =3D virXPathNode("./vbox:Snapshot", xPathContext); if (cur !=3D NULL) { @@ -763,8 +763,8 @@ virVBoxSnapshotConfAddSnapshotToXmlMachine(virVBoxSnaps= hotConfSnapshotPtr snapsh return -1; } =20 - /*If parent is NULL and the machine has no snapshot yet, - *it means that the added snapshot is the first snapshot*/ + /* If parent is NULL and the machine has no snapshot yet, + * it means that the added snapshot is the first snapshot */ if (snapshotParentName =3D=3D NULL) { if (machine->snapshot !=3D NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -829,7 +829,7 @@ virVBoxSnapshotConfAddHardDiskToMediaRegistry(virVBoxSn= apshotConfHardDiskPtr har _("Unable to get the parent disk")); return -1; } - /*Hard disk found*/ + /* Hard disk found */ if (VIR_EXPAND_N(parentDisk->children, parentDisk->nchildren, 1) < 0) return -1; =20 diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 872825d86f..a2d3db4307 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1074,7 +1074,7 @@ _consoleTakeSnapshot(IConsole *console, PRUnichar *na= me, IMachine *machine; nsresult rc; PRUnichar *id =3D NULL; - bool bpause =3D true; /*NO live snapshot*/ + bool bpause =3D true; /* NO live snapshot */ =20 rc =3D console->vtbl->GetMachine(console, &machine); =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index e8a7522732..c4b2049958 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4143,7 +4143,7 @@ static virStateDriver vzStateDriver =3D { .stateCleanup =3D vzStateCleanup, }; =20 -/* Parallels domain type backward compatibility*/ +/* Parallels domain type backward compatibility */ static virHypervisorDriver parallelsHypervisorDriver; static virConnectDriver parallelsConnectDriver =3D { .localOnly =3D true, diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index dac6938b63..80889339bd 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -864,7 +864,7 @@ mymain(void) ret =3D EXIT_FAILURE; =20 /* Network event tests */ - /* Tests requiring the test network not to be set up*/ + /* Tests requiring the test network not to be set up */ if (virTestRun("Network createXML start event ", testNetworkCreateXML,= &test) < 0) ret =3D EXIT_FAILURE; if (virTestRun("Network (un)define events", testNetworkDefine, &test) = < 0) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index a45ce4f44a..86fbfbaa4c 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -616,7 +616,7 @@ testQemuAgentCPU(const void *data) if (qemuAgentSetVCPUs(qemuMonitorTestGetAgent(test), cpuinfo, nvcpus) = < 0) goto cleanup; =20 - /* try to hotplug two, second one will fail*/ + /* try to hotplug two, second one will fail */ if (qemuMonitorTestAddAgentSyncResponse(test) < 0) goto cleanup; =20 diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index d1a7522931..dbeebec196 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -147,4 +147,4 @@ int main(void) return EXIT_AM_SKIP; } =20 -#endif /*WITH_VBOX*/ +#endif /* WITH_VBOX */ diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index f2e0554f0a..27837f4122 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -142,7 +142,7 @@ testUnicode(const void *opaque G_GNUC_UNUSED) return ret; } =20 -/* Point of this test is to see how table behaves with right to left writi= ng*/ +/* Point of this test is to see how table behaves with right to left writi= ng */ static int testUnicodeArabic(const void *opaque G_GNUC_UNUSED) { diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 933e2aa75f..9b8c69fa9d 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1565,7 +1565,7 @@ static const vshCmdInfo info_list[] =3D { {.name =3D NULL} }; =20 -/* compare domains, pack NULLed ones at the end*/ +/* compare domains, pack NULLed ones at the end */ static int virshDomainSorter(const void *a, const void *b) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e64e08e5da..8d56eedffe 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3666,7 +3666,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) const char *vol_string =3D NULL; /* string containing volumes to dele= te */ char **vol_list =3D NULL; /* tokenized vol_string */ int nvol_list =3D 0; - virshUndefineVolume *vols =3D NULL; /* info about the volumes to delet= e*/ + virshUndefineVolume *vols =3D NULL; /* info about the volumes to delet= e */ size_t nvols =3D 0; xmlDocPtr doc =3D NULL; xmlXPathContextPtr ctxt =3D NULL; @@ -7105,7 +7105,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } =20 - /* Pin mode: pinning specified vcpu to specified physical cpus*/ + /* Pin mode: pinning specified vcpu to specified physical cpus */ if (!(cpumap =3D virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; =20 @@ -7212,7 +7212,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) goto cleanup; } =20 - /* Pin mode: pinning emulator threads to specified physical cpus*/ + /* Pin mode: pinning emulator threads to specified physical cpus */ if (!(cpumap =3D virshParseCPUList(ctl, &cpumaplen, cpulist, maxcpu))) goto cleanup; =20 @@ -11831,7 +11831,7 @@ virshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) if (!xmlStrEqual(n1->name, n2->name)) return false; =20 - /* Iterate over n2 attributes and check if n1 contains them*/ + /* Iterate over n2 attributes and check if n1 contains them */ attr =3D n2->properties; while (attr) { if (attr->type =3D=3D XML_ATTRIBUTE_NODE) { diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 9c32449fbb..d190eed2b1 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1363,7 +1363,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC= _UNUSED) if (!table) goto cleanup; =20 - /* Insert the pool info rows into table*/ + /* Insert the pool info rows into table */ for (i =3D 0; i < list->npools; i++) { if (vshTableRowAppend(table, virStoragePoolGetName(list->pools[i]), --=20 2.21.0 From nobody Sun May 5 04:50:40 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 Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1580207525444581.5275071544683; Tue, 28 Jan 2020 02:32: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-136-OJ8YQfEpOyWvwmlGYPW04w-1; Tue, 28 Jan 2020 05:32:01 -0500 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 9412B18C43C2; Tue, 28 Jan 2020 10:31:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 697A35C21B; Tue, 28 Jan 2020 10:31: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 212D418089CE; Tue, 28 Jan 2020 10:31:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 00SAVgkC014063 for ; Tue, 28 Jan 2020 05:31:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id D802D5C545; Tue, 28 Jan 2020 10:31:42 +0000 (UTC) Received: from lpt.redhat.com (unknown [10.43.2.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63A275C21A for ; Tue, 28 Jan 2020 10:31:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580207524; 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=ISKb9IW0W5JxHXpnrE2l6ZEh+KCshWnP13tkJF3WLTs=; b=TN9kNba4Dnxb8fp/ShOdha3Las4V0B2rITcfpkyp7LhEGCQvbsOdHBRjlutz/NM3dVCNyW qOgeJ3weFn103pvnAnf2vlJmGrTEJZFp90cM1pz6RM5Bifk/rKaDPJrdWgHeSLqJ3r2jV8 ZKBQE40To3Bh1nG+qNhtyM1fWCqB9eU= From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] vz: fix typos of 'explicitly' Date: Tue, 28 Jan 2020 11:31:26 +0100 Message-Id: <342e97ad42b55632ae34fe07980debdae6979277.1580207305.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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 X-MC-Unique: OJ8YQfEpOyWvwmlGYPW04w-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" Also add a space before ending a comment. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/vz/vz_driver.c | 2 +- src/vz/vz_sdk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index c4b2049958..1443fdcc8a 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -341,7 +341,7 @@ vzDriverObjNew(void) ignore_value(prlsdkLoadDomains(driver)); =20 /* As far as waitDomainJob finally calls virReportErrorHelper - * and we are not going to report it, reset it expicitly*/ + * and we are not going to report it, reset it explicitly */ virResetLastError(); =20 return driver; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 32e0046763..877692aeba 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3186,7 +3186,7 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet,= virDomainNetDefPtr net) : VIR_SOCKET_ADDR_IPV6_ALL), VIR_SOCKET_ADDR_FAMILY(addrdst))); /* virSocketAddrParse raises an error - * and we are not going to report it, reset it expicitly*/ + * and we are not going to report it, reset it explicitly */ virResetLastError(); =20 if (!virSocketAddrEqual(addrdst, &zero)) { --=20 2.21.0