From nobody Thu Apr 18 08:12:22 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1560244939; cv=none; d=zoho.com; s=zohoarc; b=BmgdfPwZTYoZoLqDZMvWdLcdeHUsKsJUi1ULH8WUofPpsUlCkkCYCJPrblup5Vh/rJ4+9YnePxhlme2NqkFYWf9MX7FUl21zQhsEBb8RTgWC1RE2Ug0CZ93BaQT9tFgfiARHgGIAlwge/LRO3VrZEJl5JgoxILLOWtfmeskCozk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560244939; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=XSI/BrUz73nbFXeGM8aArlF3YxEi4Z7B8BBeYsc2m08=; b=h0xAbAtVei/VCMMt6LNX0f68vL0gTVfJzv5jRWbICY+pgAQ6+kK77RqpEBFnKvVJMpbGGjdDp6B3oEOlepFU+dKFSPJmo2fLUnKxdALHH0jLyiFNeM8WrXc7O9LC9hzGz+IJ6/ID7K0LHl6rqFpWzLAk2FVh6EZloE/mDFlodZw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1560244938973156.01891716717603; Tue, 11 Jun 2019 02:22:18 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hacxW-0006Vr-F4; Tue, 11 Jun 2019 09:20:50 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hacxV-0006Vm-D1 for xen-devel@lists.xenproject.org; Tue, 11 Jun 2019 09:20:49 +0000 Received: from mxnavi-mail.mxnavi.com (unknown [116.90.87.199]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 30abe35e-8c2a-11e9-8980-bc764e045a96; Tue, 11 Jun 2019 09:20:46 +0000 (UTC) Received: from localhost.localdomain (61.161.186.150) by mxnavi-mail.mxnavi.com (116.90.87.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1591.10; Tue, 11 Jun 2019 17:17:34 +0800 X-Inumbo-ID: 30abe35e-8c2a-11e9-8980-bc764e045a96 From: Baodong Chen To: Date: Tue, 11 Jun 2019 17:20:37 +0800 Message-ID: <1560244837-31477-1-git-send-email-chenbaodong@mxnavi.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [61.161.186.150] X-ClientProxiedBy: mxnavi-mail.mxnavi.com (116.90.87.199) To mxnavi-mail.mxnavi.com (116.90.87.199) Subject: [Xen-devel] [PATCH] xen: superficial clean-ups X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Stefano Stabellini , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich , Baodong Chen , Dario Faggioli Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" * Remove redundant set 'DOMDYING_dead' domain_create() will set this when fail, thus no need set in arch_domain_create(). * Set error when really happened Signed-off-by: Baodong Chen --- xen/arch/arm/domain.c | 1 - xen/common/domain.c | 15 +++++++-------- xen/common/schedule.c | 4 +++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index ff330b3..c72be08 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -731,7 +731,6 @@ int arch_domain_create(struct domain *d, return 0; =20 fail: - d->is_dying =3D DOMDYING_dead; arch_domain_destroy(d); =20 return rc; diff --git a/xen/common/domain.c b/xen/common/domain.c index 90c6607..a6af5a6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -358,10 +358,9 @@ struct domain *domain_create(domid_t domid, */ if ( !is_system_domain(d) ) { - err =3D -ENOMEM; d->vcpu =3D xzalloc_array(struct vcpu *, config->max_vcpus); if ( !d->vcpu ) - goto fail; + goto no_mem; =20 d->max_vcpus =3D config->max_vcpus; } @@ -389,9 +388,8 @@ struct domain *domain_create(domid_t domid, =20 rwlock_init(&d->vnuma_rwlock); =20 - err =3D -ENOMEM; if ( !zalloc_cpumask_var(&d->dirty_cpumask) ) - goto fail; + goto no_mem; =20 rangeset_domain_initialise(d); =20 @@ -429,7 +427,7 @@ struct domain *domain_create(domid_t domid, d->iomem_caps =3D rangeset_new(d, "I/O Memory", RANGESETF_prettypr= int_hex); d->irq_caps =3D rangeset_new(d, "Interrupts", 0); if ( !d->iomem_caps || !d->irq_caps ) - goto fail; + goto no_mem; =20 if ( (err =3D xsm_domain_create(XSM_HOOK, d, config->ssidref)) != =3D 0 ) goto fail; @@ -449,11 +447,9 @@ struct domain *domain_create(domid_t domid, if ( (err =3D argo_init(d)) !=3D 0 ) goto fail; =20 - err =3D -ENOMEM; - d->pbuf =3D xzalloc_array(char, DOMAIN_PBUF_SIZE); if ( !d->pbuf ) - goto fail; + goto no_mem; =20 if ( (err =3D sched_init_domain(d, 0)) !=3D 0 ) goto fail; @@ -482,6 +478,9 @@ struct domain *domain_create(domid_t domid, =20 return d; =20 + no_mem: + err =3D -ENOMEM; + fail: ASSERT(err < 0); /* Sanity check paths leading here. */ err =3D err ?: -EILSEQ; /* Release build safety. */ diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 86341bc..d6cdcf8 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1894,9 +1894,11 @@ struct scheduler *scheduler_alloc(unsigned int sched= _id, int *perr) return NULL; =20 found: - *perr =3D -ENOMEM; if ( (sched =3D xmalloc(struct scheduler)) =3D=3D NULL ) + { + *perr =3D -ENOMEM; return NULL; + } memcpy(sched, schedulers[i], sizeof(*sched)); if ( (*perr =3D SCHED_OP(sched, init)) !=3D 0 ) { --=20 2.7.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel