From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 18 Jan 2021 14:50:57 +0000 (+0000)
Subject: xen/domain: Reposition config copying in domain_create()
X-Git-Tag: archive/raspbian/4.16.0+51-g0941d6cb-1+rpi1~2^2~42^2~1129
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1839011c7eccd1b119d71a36b07ed914bfa9c5da;p=xen.git

xen/domain: Reposition config copying in domain_create()

This is cleanup for two pending series which will copy more data than just
flags from config.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/common/domain.c b/xen/common/domain.c
index d151be3f36..164c9d14e9 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -421,14 +421,15 @@ struct domain *domain_create(domid_t domid,
     if ( (d = alloc_domain_struct()) == NULL )
         return ERR_PTR(-ENOMEM);
 
-    d->options = config ? config->flags : 0;
-
     /* Sort out our idea of is_system_domain(). */
     d->domain_id = domid;
 
     /* Debug sanity. */
     ASSERT(is_system_domain(d) ? config == NULL : config != NULL);
 
+    if ( config )
+        d->options = config->flags;
+
     /* Sort out our idea of is_control_domain(). */
     d->is_privileged = is_priv;