From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 08/28] libxl: libxl__destroy_domid: Bring dm destruction together Date: Tue, 22 Dec 2015 18:44:43 +0000 Message-ID: <1450809903-3393-9-git-send-email-ian.jackson@eu.citrix.com> References: <1450809903-3393-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1450809903-3393-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Ian Jackson , Wei Liu , Ian Campbell , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org Change the order of operations so that the dm determination and destruction occur together. The functional change is that the xenstore reads relating to the dm determination now occur after the pci devices have been removed and the domain has been paused. This should not have any visible effect. Signed-off-by: Ian Jackson --- v6: New patch. --- tools/libxl/libxl.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index d96189d..1ac5d81 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1621,6 +1621,19 @@ void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) goto out; } + if (libxl__device_pci_destroy_all(gc, domid) < 0) + LOG(ERROR, "pci shutdown failed for domid %d", domid); + rc = xc_domain_pause(ctx->xch, domid); + if (rc < 0) { + LOGEV(ERROR, rc, "xc_domain_pause failed for %d", domid); + } + + dom_path = libxl__xs_get_dompath(gc, domid); + if (!dom_path) { + rc = ERROR_FAIL; + goto out; + } + switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: if (libxl_get_stubdom_id(CTX, domid)) { @@ -1639,18 +1652,6 @@ void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) abort(); } - dom_path = libxl__xs_get_dompath(gc, domid); - if (!dom_path) { - rc = ERROR_FAIL; - goto out; - } - - if (libxl__device_pci_destroy_all(gc, domid) < 0) - LOG(ERROR, "pci shutdown failed for domid %d", domid); - rc = xc_domain_pause(ctx->xch, domid); - if (rc < 0) { - LOGEV(ERROR, rc, "xc_domain_pause failed for %d", domid); - } if (dm_present) { if (libxl__destroy_device_model(gc, domid) < 0) LOG(ERROR, "libxl__destroy_device_model failed for %d", domid); -- 1.7.10.4