File 15120b8c-libxl-no-resume-on-suspend-fail.patch of Package libvirt

Overview Repositories Revisions Requests Users Attributes Meta

File 15120b8c-libxl-no-resume-on-suspend-fail.patch of Package libvirt (Revision be63a46e8f5f9039c4d00045712a4931)

Currently displaying revision be63a46e8f5f9039c4d00045712a4931 , Show latest

commit 15120b8c61014a9263cb53314076da9a44e39621
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Wed Jul 15 17:29:15 2015 -0600

libxl: don't attempt to resume domain when suspend fails
    
    Failure of libxl_domain_suspend() does not leave the domain in
    a suspended state, so no need to call libxl_domain_resume(),
    which btw will fail with "domain not suspended".
    
    Signed-off-by: Jim Fehlig <jfehlig@suse.com>

Index: libvirt-1.2.18/src/libxl/libxl_migration.c
===================================================================
--- libvirt-1.2.18.orig/src/libxl/libxl_migration.c
+++ libvirt-1.2.18/src/libxl/libxl_migration.c
@@ -178,7 +178,6 @@ libxlDoMigrateSend(libxlDriverPrivatePtr
                    int sockfd)
 {
     libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver);
-    virObjectEventPtr event = NULL;
     int xl_flags = 0;
     int ret;
 
@@ -188,24 +187,11 @@ libxlDoMigrateSend(libxlDriverPrivatePtr
     ret = libxl_domain_suspend(cfg->ctx, vm->def->id, sockfd,
                                xl_flags, NULL);
     if (ret != 0) {
-        /* attempt to resume the domain on failure */
-        if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) != 0) {
-            VIR_DEBUG("Failed to resume domain following failed migration");
-            virDomainObjSetState(vm, VIR_DOMAIN_PAUSED,
-                                 VIR_DOMAIN_PAUSED_MIGRATION);
-            event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED,
-                                             VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED);
-            ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm));
-        }
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failed to send migration data to destination host"));
         ret = -1;
-        goto cleanup;
     }
 
- cleanup:
-    if (event)
-        libxlDomainEventQueue(driver, event);
     virObjectUnref(cfg);
     return ret;
 }

Places

File 15120b8c-libxl-no-resume-on-suspend-fail.patch of Package libvirt (Revision be63a46e8f5f9039c4d00045712a4931)

Places