Attachment #286331 for bug #380343

View | Details | Raw Unified | Return to bug 380343
Collapse All | Expand All




        goto out;
    }

    if (nr_disks > 0) {
        int blktap_enabled = -1;
        for (i = 0; i < nr_disks; i++) {
            switch (disks[i].backend) {
            case DISK_BACKEND_TAP:
                if (blktap_enabled == -1)
                    blktap_enabled = libxl__blktap_enabled(&gc);
                if (!blktap_enabled) {
                    ret = 1;
                    goto out;
                }
                break;

            case DISK_BACKEND_QDISK:
                ret = 1;
                goto out;

            case DISK_BACKEND_PHY:
            case DISK_BACKEND_UNKNOWN:
                break;
            }
        }
    }

out:
    libxl__free_all(&gc);

Return to bug 380343

Lines 828-835 Link Here

(-)xen-4.1.1.orig/tools/libxl/libxl_dm.c (-2 / +23 lines)
828	goto out;	828	goto out;
829	}	829	}
830		830
831	if (nr_disks > 0 && !libxl__blktap_enabled(&gc))	831	if (nr_disks > 0) {
832	ret = 1;	832	int blktap_enabled = -1;
		833	for (i = 0; i < nr_disks; i++) {
		834	switch (disks[i].backend) {
		835	case DISK_BACKEND_TAP:
		836	if (blktap_enabled == -1)
		837	blktap_enabled = libxl__blktap_enabled(&gc);
		838	if (!blktap_enabled) {
		839	ret = 1;
		840	goto out;
		841	}
		842	break;
		843
		844	case DISK_BACKEND_QDISK:
		845	ret = 1;
		846	goto out;
		847
		848	case DISK_BACKEND_PHY:
		849	case DISK_BACKEND_UNKNOWN:
		850	break;
		851	}
		852	}
		853	}
833		854
834	out:	855	out:
835	libxl__free_all(&gc);	856	libxl__free_all(&gc);