From nobody Wed May 14 09:51:37 2025 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; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526250763087997.8062657540944; Sun, 13 May 2018 15:32:43 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 3AF8830C6D5E; Sun, 13 May 2018 22:32:41 +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 053ED60180; Sun, 13 May 2018 22:32:40 +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 6A77F4BB79; Sun, 13 May 2018 22:32:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4DMWXkc022297 for ; Sun, 13 May 2018 18:32:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 780D73091AA6; Sun, 13 May 2018 22:32:33 +0000 (UTC) Received: from mx1.redhat.com (ext-mx07.extmail.prod.ext.phx2.redhat.com [10.5.110.31]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6FAEF30B7C40 for ; Sun, 13 May 2018 22:32:31 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) (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 3A755C05A1DA for ; Sun, 13 May 2018 22:32:30 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id q3-v6so10321753wrj.6 for ; Sun, 13 May 2018 15:32:30 -0700 (PDT) Received: from clem.localdomain ([78.194.94.51]) by smtp.gmail.com with ESMTPSA id p7-v6sm9101486wrj.85.2018.05.13.15.32.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 13 May 2018 15:32:28 -0700 (PDT) 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:in-reply-to :references; bh=TKh4d7eJtBGbx8ltige9h7JH7+KBdf6CtfuyEpUFdLs=; b=BQamt1yNKTo/FXXM0cF/wCdEFG51qM2DQ43LCSzDIfkdjz4HWWmp151jZkk5plCdqA YIogYMRXsbxi6C0uFgPxhGKMB2g3MIJ2O1jheFN6QB/3c1wsUG0JiCGUcs5zSWCIh0NV YMrcAtrNN7jqadkOaU8HcDxy0y7AuIrBsLOZ+uuo8tg/VkJvJEIrZv3/0ElDwEVh1eA+ wz/tpcFAwM0A3SuckKP9wQY/F1ifAc86VNiIFFsgJxlj3gNEmHHlC+/Ca01V7Txwe9S1 UXOMP0lraqTrmlF9qJ0jmPuzNu6sQCTEz4jvOHKOF+z3Z25JPPmK6U4d/R8ve+YfUDfE YH+A== X-Gm-Message-State: ALKqPwdg+O7Y2FPeAFqy1iQVOGWCVgqNWUcOPAoGsvvPdZ0NCgIUe2UZ qZHCff7iJn0MpoBxUe0bVjuhBg== X-Google-Smtp-Source: AB8JxZrPfPicDVNfeOujFQOEOhGyFcy7pbvho1M0UbxwHRR43oUbAGYaipZNk5/GtBWdOtCDcN1cbg== X-Received: by 2002:adf:88a3:: with SMTP id f32-v6mr4950100wrf.199.1526250748517; Sun, 13 May 2018 15:32:28 -0700 (PDT) From: clem@lse.epita.fr To: libvir-list@redhat.com Date: Mon, 14 May 2018 00:32:14 +0200 Message-Id: <20180513223215.5387-3-clem@lse.epita.fr> In-Reply-To: <20180513223215.5387-1-clem@lse.epita.fr> References: <20180513223215.5387-1-clem@lse.epita.fr> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sun, 13 May 2018 22:32:30 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Sun, 13 May 2018 22:32:30 +0000 (UTC) for IP:'209.85.128.196' DOMAIN:'mail-wr0-f196.google.com' HELO:'mail-wr0-f196.google.com' FROM:'clementinehayat@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.117 (FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.128.196 mail-wr0-f196.google.com 209.85.128.196 mail-wr0-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.31 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.24 X-loop: libvir-list@redhat.com Cc: Clementine Hayat Subject: [libvirt] [PATCH 2/3] lxc: start using virDomainObjCheckActive 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: , MIME-Version: 1.0 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Sun, 13 May 2018 22:32:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Clementine Hayat Signed-off-by: Clementine Hayat --- src/lxc/lxc_driver.c | 65 +++++++++----------------------------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4097cef934..c9a5576c42 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1508,11 +1508,8 @@ lxcDomainDestroyFlags(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 priv =3D vm->privateData; ret =3D virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); @@ -2382,11 +2379,8 @@ lxcDomainBlockStats(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)= ) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2468,11 +2462,8 @@ lxcDomainBlockStatsFlags(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)= ) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -2876,11 +2867,8 @@ lxcDomainInterfaceStats(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (!(net =3D virDomainNetFind(vm->def, device))) goto endjob; @@ -3100,11 +3088,8 @@ static int lxcDomainSuspend(virDomainPtr dom) if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (virDomainObjGetState(vm, NULL) !=3D VIR_DOMAIN_PAUSED) { if (lxcFreezeContainer(vm) < 0) { @@ -3155,11 +3140,8 @@ static int lxcDomainResume(virDomainPtr dom) if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 state =3D virDomainObjGetState(vm, NULL); if (state =3D=3D VIR_DOMAIN_RUNNING) { @@ -3214,11 +3196,8 @@ lxcDomainOpenConsole(virDomainPtr dom, if (virDomainOpenConsoleEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto cleanup; - } =20 if (dev_name) { for (i =3D 0; i < vm->def->nconsoles; i++) { @@ -3292,11 +3271,8 @@ lxcDomainSendProcessSignal(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 /* * XXX if the kernel has /proc/$PID/ns/pid we can @@ -3391,11 +3367,8 @@ lxcDomainShutdownFlags(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (priv->initpid =3D=3D 0) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -3474,11 +3447,8 @@ lxcDomainReboot(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_MODIFY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (priv->initpid =3D=3D 0) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -5111,11 +5081,8 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr do= m, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (!priv->initpid) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -5199,11 +5166,8 @@ lxcDomainMemoryStats(virDomainPtr dom, if (virLXCDomainObjBeginJob(driver, vm, LXC_JOB_QUERY) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not active")); + if (virDomainObjCheckActive(vm) < 0) goto endjob; - } =20 if (virCgroupGetMemSwapUsage(priv->cgroup, &swap_usage) < 0) goto endjob; @@ -5441,11 +5405,8 @@ lxcDomainGetCPUStats(virDomainPtr dom, if (virDomainGetCPUStatsEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); + if (virDomainObjCheckActive(vm) < 0) goto cleanup; - } =20 if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_CPUACC= T)) { virReportError(VIR_ERR_OPERATION_INVALID, --=20 2.17.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list