# HG changeset patch
# User Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
# Date 1295541153 0
# Node ID 0592d6ca9177179f5a2724baa7598b3317415da3
# Parent 051a1b1b8f8a46b0ad9daa1301ce4e88d8e41884
libxl: do not attempt to write "shutdown" dm-command
libxl_domain_destroy writes the command "shutdown" to the xenstore
node with which it communicates with qemu. However:
- qemu does not understand this command and ignores it (printing a
message)
- libxl doesn't wait for the answer and immediately pauses the domain
anyway
- destroy is the ungraceful (force) operation and should not
negotiate with qemu anyway
- even in the graceful shutdown case, there would actually be nothing
that qemu needs to do.
Under some circumstances, this entry in xenstore will survive the
domain's death, ie be leaked.
So remove the erroneous code.
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/libxl/libxl.c | 5 -----
1 files changed, 5 deletions(-)
diff -r 051a1b1b8f8a -r 0592d6ca9177 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Wed Jan 19 18:24:26 2011 +0000
+++ b/tools/libxl/libxl.c Thu Jan 20 16:32:33 2011 +0000
@@ -682,11 +682,6 @@ int libxl_domain_destroy(libxl_ctx *ctx,
if (libxl_device_pci_shutdown(ctx, domid) < 0)
LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "pci shutdown failed for domid %d",
domid);
- if (dm_present) {
- xs_write(ctx->xsh, XBT_NULL,
- libxl__sprintf(&gc,
"/local/domain/0/device-model/%d/command", domid),
- "shutdown", strlen("shutdown"));
- }
rc = xc_domain_pause(ctx->xch, domid);
if (rc < 0) {
LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "xc_domain_pause failed
for %d", domid);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|