From nobody Thu May 2 23:27:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1556459443; cv=none; d=zoho.com; s=zohoarc; b=iuQGUyO7Fh6ZvM9j/oYoGxP9MvWSBKCcc6i9/CBKc5X3fEpk77XeceYyQD6uALTSHK/R6wexo/XI7DvtpCoOB8baSnUjLtAlqUoFWFAjr0gplKnVtSRxj2GY+RwrbV/aUMVIHw1pCncIde2gt8op4BpbCV73r0RTTVCEuVhfrrQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556459443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=ZH0PI1MLLYZY2SHalBZexRSZeLpWQNZ2/kjn6IJterM=; b=TUDIPpN3TZXlHyGD/5inXuF4AQp8ZsNb6J+iywvfu+SQGG1GP0SWt3IXtUaZ9blsF2X6J73+zNEHRR2RKUiGNsiR6sJs/AVz8zmpRsuUIgvSVlouR0bG7eGeWI5GqTL2AO37Tcpi7ri85t+F/sg1K5Rsr2C3ZkqAuooSb8eCLlQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1556459443487936.2794440379761; Sun, 28 Apr 2019 06:50:43 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 5ECE93082211; Sun, 28 Apr 2019 13:50:39 +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 EEEC517A88; Sun, 28 Apr 2019 13:50:35 +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 3FEB41819AFA; Sun, 28 Apr 2019 13:50:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3SDnNgr003901 for ; Sun, 28 Apr 2019 09:49:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 30854620D8; Sun, 28 Apr 2019 13:49:23 +0000 (UTC) Received: from mx1.redhat.com (ext-mx13.extmail.prod.ext.phx2.redhat.com [10.5.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2AFEB60557 for ; Sun, 28 Apr 2019 13:49:20 +0000 (UTC) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DBA2C3089FE4 for ; Sun, 28 Apr 2019 13:49:19 +0000 (UTC) Received: by mail-lf1-f53.google.com with SMTP id j11so5973033lfm.0 for ; Sun, 28 Apr 2019 06:49:19 -0700 (PDT) Received: from localhost.localdomain ([5.107.102.243]) by smtp.googlemail.com with ESMTPSA id y7sm6811990lfg.76.2019.04.28.06.49.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 06:49:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SKAOAWuiCR4/56rDSnclVJaLq03qEonFyPXhoII0Klg=; b=YdwYehmE98qyy++8578234MwRn0LnGTii+wWQ2mG8Zu2L8T1yXg2kPZY9Oax//bTV+ QMG/R5HlRcdHC1HgZKeGK85saXyuzbe+WPYEuBstDP2NWQ10zeZxBlM0u7L5wNl41Khh 061pi4uAaxV6FxB/iHiT85ZXD3g48jZYA1v/IaEr7Fdb3ulQkqmPRQsJfV9bTPu37OP2 1n+4bhat0IUoGgykUeNQhrRchCHKaKQUNLj4G42XDqocQCRF3tfkIjZvg4zQA9AUPyeC RrjxR3/+lhrTShYWo+b5vhBNvX6Hk5yWn2i9t7nnBv1XFhuM+slffSaNiukG7hjdWSj/ zEGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SKAOAWuiCR4/56rDSnclVJaLq03qEonFyPXhoII0Klg=; b=Px6ItqObPQ8Ehp8R2rb5WDyZfNKbnEzX5Yjz4KbIycPTeKSZ9CHDBYsa2vJYQ/an8u GI3a5wkkx3I8oeb61X/7GHZCjbdEy7hbCIwyYP1srge1zCsn91nOt3vvyF512d4EVFUi cNBIQkjflywjVJAJxVJsmgpF6zrhIhwguwMnHw3wFl7ykHNDqgVA3PsDsR9ct+wvDoff zQ6dIql4D0Aj5AlBLTAuxIV6ws0FiRmFPtK14T3PlqISGazWlgGZG0k6Nja5QNoFOP68 a82tTAfeglzpeJs2wXIpXv28eSKPZT2XG8nJKT4umTGvbRkVrWal6bzMUlkK/ar7nm8R s5EA== X-Gm-Message-State: APjAAAVr47fsULjS3oXd5Z/nmsJEzuqrjbP7tzNIc0yzPrXgduTLUdK1 A/dZDpzSckCOKRwj285p59koNZ7ZOJA= X-Google-Smtp-Source: APXvYqzs9bSyG1izwYaJpMinV/s9LI6CDExzW4fr870BRgIa99S+SajCRa2RKqKrUItFC4HxVgbYRg== X-Received: by 2002:a19:384d:: with SMTP id d13mr10205880lfj.38.1556459357839; Sun, 28 Apr 2019 06:49:17 -0700 (PDT) From: Syed Humaid To: libvir-list@redhat.com Date: Sun, 28 Apr 2019 17:49:05 +0400 Message-Id: <20190428134905.346-1-syedhumaidbinharoon@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Sun, 28 Apr 2019 13:49:20 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Sun, 28 Apr 2019 13:49:20 +0000 (UTC) for IP:'209.85.167.53' DOMAIN:'mail-lf1-f53.google.com' HELO:'mail-lf1-f53.google.com' FROM:'syedhumaidbinharoon@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.11 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS) 209.85.167.53 mail-lf1-f53.google.com 209.85.167.53 mail-lf1-f53.google.com X-Scanned-By: MIMEDefang 2.84 on 10.5.110.42 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Syed Humaid Subject: [libvirt] [PATCH v1] qemu: Convert to virErrorPreserveLast/virErrorRestore 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: , Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Sun, 28 Apr 2019 13:50:40 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replaced usage of virSaveLastError and virSetError/virFreeError with virErrorPreserveLast and virErrorRestore respectively. Signed-off-by: Syed Humaid --- src/qemu/qemu_cgroup.c | 7 ++----- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 28 ++++++++-------------------- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index ca76c4fdfa..c8d9ae4808 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -1123,10 +1123,7 @@ qemuSetupCgroupVcpuBW(virCgroupPtr cgroup, if (period) { virErrorPtr saved =3D virSaveLastError(); ignore_value(virCgroupSetCpuCfsPeriod(cgroup, old_period)); - if (saved) { - virSetError(saved); - virFreeError(saved); - } + virErrorRestore(&saved); } =20 return -1; @@ -1334,7 +1331,7 @@ qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorA= llNodesDataPtr data) if (!data) return; =20 - err =3D virSaveLastError(); + virErrorPreserveLast(&err); virCgroupSetCpusetMems(data->emulatorCgroup, data->emulatorMemMask); virSetError(err); virFreeError(err); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1425d97b1e..9772e4f9af 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9119,7 +9119,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver, error: /* free up any resources in the network driver * but don't overwrite the original error */ - originalError =3D virSaveLastError(); + virErrorPreserveLast(&originalError); for (i =3D 0; last_good_net !=3D -1 && i <=3D last_good_net; i++) virDomainConfNWFilterTeardown(def->nets[i]); virSetError(originalError); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 960aaff3c7..dff1d7b1a5 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8042,7 +8042,7 @@ void qemuDomainObjTaint(virQEMUDriverPtr driver, /* We don't care about errors logging taint info, so * preserve original error, and clear any error that * is raised */ - orig_err =3D virSaveLastError(); + virErrorPreserveLast(&orig_err); =20 if (!(timestamp =3D virTimeStringNow())) goto cleanup; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f48d9256e4..51b16f5aa1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6844,7 +6844,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, * must manually kill it and ignore any error related to * the process */ - orig_err =3D virSaveLastError(); + virErrorPreserveLast(&orig_err); VIR_FORCE_CLOSE(intermediatefd); VIR_FORCE_CLOSE(*fd); } @@ -6855,10 +6855,7 @@ qemuDomainSaveImageStartVM(virConnectPtr conn, } VIR_DEBUG("Decompression binary stderr: %s", NULLSTR(errbuf)); =20 - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); } VIR_FORCE_CLOSE(intermediatefd); =20 @@ -14398,7 +14395,7 @@ qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver AT= TRIBUTE_UNUSED, =20 agent =3D qemuDomainObjEnterAgent(vm); if (!report) - err =3D virSaveLastError(); + virErrorPreserveLast(&err);=20 thawed =3D qemuAgentFSThaw(agent); if (!report) virSetError(err); @@ -15308,7 +15305,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr= driver, =20 error: if (ret < 0) { - orig_err =3D virSaveLastError(); + virErrorPreserveLast(&orig_err); for (i =3D 0; i < snapdef->ndisks; i++) { if (!diskdata[i].src) continue; @@ -15351,10 +15348,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPt= r driver, virJSONValueFree(actions); virObjectUnref(cfg); =20 - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); =20 return ret; } @@ -17773,7 +17767,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (qemuDomainObjExitMonitor(driver, vm) < 0) ret =3D -1; if (ret < 0) { - monitor_error =3D virSaveLastError(); + virErrorPreserveLast(&monitor_error); qemuDomainDiskChainElementRevoke(driver, vm, mirror); goto endjob; } @@ -17795,10 +17789,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, VIR_WARN("%s", _("unable to remove just-created copy target")); virStorageFileDeinit(mirror); qemuDomainObjEndJob(driver, vm); - if (monitor_error) { - virSetError(monitor_error); - virFreeError(monitor_error); - } + virErrorRestore(&monitor_error); qemuBlockJobStartupFinalize(job); =20 cleanup: @@ -18196,10 +18187,7 @@ qemuDomainBlockCommit(virDomainPtr dom, if (top_parent && top_parent !=3D disk->src) qemuDomainDiskChainElementPrepare(driver, vm, top_parent, true= , false); =20 - if (orig_err) { - virSetError(orig_err); - virFreeError(orig_err); - } + virErrorRestore(&orig_err); } qemuBlockJobStartupFinalize(job); qemuDomainObjEndJob(driver, vm); --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list