|
 |
c401cc |
From 9c83aa21f3042d2857cbb251f48397eff4af7664 Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <9c83aa21f3042d2857cbb251f48397eff4af7664@dist-git>
|
|
|
c401cc |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
c401cc |
Date: Wed, 26 Feb 2014 14:55:09 +0100
|
|
|
c401cc |
Subject: [PATCH] qemu: Fix indentation in qemuTranslateDiskSourcePool
|
|
|
c401cc |
|
|
|
c401cc |
https://bugzilla.redhat.com/show_bug.cgi?id=1032370
|
|
|
c401cc |
|
|
|
c401cc |
Commit e1a4d08baf9a8cc86c8b5ca27da9aeedb34b5908 was pushed with bad
|
|
|
c401cc |
indentation the iSCSI pool translation code.
|
|
|
c401cc |
|
|
|
c401cc |
(cherry picked from commit 90f9ccb4f23f3edabb2bd9b700a6de88b486ed3d)
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
src/qemu/qemu_conf.c | 44 ++++++++++++++++++++++----------------------
|
|
|
c401cc |
1 file changed, 22 insertions(+), 22 deletions(-)
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
|
|
|
c401cc |
index a2a7f97..2f1f587 100644
|
|
|
c401cc |
--- a/src/qemu/qemu_conf.c
|
|
|
c401cc |
+++ b/src/qemu/qemu_conf.c
|
|
|
c401cc |
@@ -1385,28 +1385,28 @@ qemuTranslateDiskSourcePool(virConnectPtr conn,
|
|
|
c401cc |
}
|
|
|
c401cc |
|
|
|
c401cc |
switch (def->srcpool->mode) {
|
|
|
c401cc |
- case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT:
|
|
|
c401cc |
- case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST:
|
|
|
c401cc |
- def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST;
|
|
|
c401cc |
- /* fallthrough */
|
|
|
c401cc |
- case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST:
|
|
|
c401cc |
- def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK;
|
|
|
c401cc |
- if (!(def->src = virStorageVolGetPath(vol)))
|
|
|
c401cc |
- goto cleanup;
|
|
|
c401cc |
- break;
|
|
|
c401cc |
-
|
|
|
c401cc |
- case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT:
|
|
|
c401cc |
- def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK;
|
|
|
c401cc |
- def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI;
|
|
|
c401cc |
-
|
|
|
c401cc |
- if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0)
|
|
|
c401cc |
- goto cleanup;
|
|
|
c401cc |
-
|
|
|
c401cc |
- if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0)
|
|
|
c401cc |
- goto cleanup;
|
|
|
c401cc |
- break;
|
|
|
c401cc |
- }
|
|
|
c401cc |
- break;
|
|
|
c401cc |
+ case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DEFAULT:
|
|
|
c401cc |
+ case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_LAST:
|
|
|
c401cc |
+ def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST;
|
|
|
c401cc |
+ /* fallthrough */
|
|
|
c401cc |
+ case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_HOST:
|
|
|
c401cc |
+ def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_BLOCK;
|
|
|
c401cc |
+ if (!(def->src = virStorageVolGetPath(vol)))
|
|
|
c401cc |
+ goto cleanup;
|
|
|
c401cc |
+ break;
|
|
|
c401cc |
+
|
|
|
c401cc |
+ case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT:
|
|
|
c401cc |
+ def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK;
|
|
|
c401cc |
+ def->protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI;
|
|
|
c401cc |
+
|
|
|
c401cc |
+ if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0)
|
|
|
c401cc |
+ goto cleanup;
|
|
|
c401cc |
+
|
|
|
c401cc |
+ if (qemuAddISCSIPoolSourceHost(def, pooldef) < 0)
|
|
|
c401cc |
+ goto cleanup;
|
|
|
c401cc |
+ break;
|
|
|
c401cc |
+ }
|
|
|
c401cc |
+ break;
|
|
|
c401cc |
|
|
|
c401cc |
case VIR_STORAGE_POOL_MPATH:
|
|
|
c401cc |
case VIR_STORAGE_POOL_RBD:
|
|
|
c401cc |
--
|
|
|
c401cc |
1.9.0
|
|
|
c401cc |
|