From c3fd4a75e9c837e79b3ee1a35304a32b7a8d84da Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 15 Sep 2009 17:55:05 +0100 Subject: [PATCH] Move storage drivers into src/storage/ * daemon/qemud.c, src/Makefile.am: Adapt for changed paths * src/storage*.c, src/storage/*.h, src/parthelpre.c: Move to src/storage/ --- daemon/qemud.c | 2 +- src/Makefile.am | 20 ++++++++++---------- src/{ => storage}/parthelper.c | 0 src/{ => storage}/storage_backend.c | 0 src/{ => storage}/storage_backend.h | 0 src/{ => storage}/storage_backend_disk.c | 0 src/{ => storage}/storage_backend_disk.h | 0 src/{ => storage}/storage_backend_fs.c | 0 src/{ => storage}/storage_backend_fs.h | 0 src/{ => storage}/storage_backend_iscsi.c | 0 src/{ => storage}/storage_backend_iscsi.h | 0 src/{ => storage}/storage_backend_logical.c | 0 src/{ => storage}/storage_backend_logical.h | 0 src/{ => storage}/storage_backend_mpath.c | 0 src/{ => storage}/storage_backend_mpath.h | 0 src/{ => storage}/storage_backend_scsi.c | 0 src/{ => storage}/storage_backend_scsi.h | 0 src/{ => storage}/storage_driver.c | 0 src/{ => storage}/storage_driver.h | 0 19 files changed, 11 insertions(+), 11 deletions(-) rename src/{ => storage}/parthelper.c (100%) rename src/{ => storage}/storage_backend.c (100%) rename src/{ => storage}/storage_backend.h (100%) rename src/{ => storage}/storage_backend_disk.c (100%) rename src/{ => storage}/storage_backend_disk.h (100%) rename src/{ => storage}/storage_backend_fs.c (100%) rename src/{ => storage}/storage_backend_fs.h (100%) rename src/{ => storage}/storage_backend_iscsi.c (100%) rename src/{ => storage}/storage_backend_iscsi.h (100%) rename src/{ => storage}/storage_backend_logical.c (100%) rename src/{ => storage}/storage_backend_logical.h (100%) rename src/{ => storage}/storage_backend_mpath.c (100%) rename src/{ => storage}/storage_backend_mpath.h (100%) rename src/{ => storage}/storage_backend_scsi.c (100%) rename src/{ => storage}/storage_backend_scsi.h (100%) rename src/{ => storage}/storage_driver.c (100%) rename src/{ => storage}/storage_driver.h (100%) diff --git a/daemon/qemud.c b/daemon/qemud.c index d14567c929..aa7ea9d6d5 100644 --- a/daemon/qemud.c +++ b/daemon/qemud.c @@ -87,7 +87,7 @@ #include "interface_driver.h" #endif #ifdef WITH_STORAGE_DIR -#include "storage_driver.h" +#include "storage/storage_driver.h" #endif #ifdef WITH_NODE_DEVICES #include "node_device.h" diff --git a/src/Makefile.am b/src/Makefile.am index a7725869ba..8360879c2c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -187,34 +187,34 @@ SECRET_DRIVER_SOURCES = \ # Storage backend specific impls STORAGE_DRIVER_SOURCES = \ - storage_driver.h storage_driver.c \ - storage_backend.h storage_backend.c + storage/storage_driver.h storage/storage_driver.c \ + storage/storage_backend.h storage/storage_backend.c # Network driver generic impl APIs NODE_DEVICE_CONF_SOURCES = \ node_device_conf.c node_device_conf.h STORAGE_DRIVER_FS_SOURCES = \ - storage_backend_fs.h storage_backend_fs.c + storage/storage_backend_fs.h storage/storage_backend_fs.c STORAGE_DRIVER_LVM_SOURCES = \ - storage_backend_logical.h \ - storage_backend_logical.c + storage/storage_backend_logical.h \ + storage/storage_backend_logical.c STORAGE_DRIVER_ISCSI_SOURCES = \ - storage_backend_iscsi.h storage_backend_iscsi.c + storage/storage_backend_iscsi.h storage/storage_backend_iscsi.c STORAGE_DRIVER_SCSI_SOURCES = \ - storage_backend_scsi.h storage_backend_scsi.c + storage/storage_backend_scsi.h storage/storage_backend_scsi.c STORAGE_DRIVER_MPATH_SOURCES = \ - storage_backend_mpath.h storage_backend_mpath.c + storage/storage_backend_mpath.h storage/storage_backend_mpath.c STORAGE_DRIVER_DISK_SOURCES = \ - storage_backend_disk.h storage_backend_disk.c + storage/storage_backend_disk.h storage/storage_backend_disk.c STORAGE_HELPER_DISK_SOURCES = \ - parthelper.c + storage/parthelper.c # Security framework and drivers for various models diff --git a/src/parthelper.c b/src/storage/parthelper.c similarity index 100% rename from src/parthelper.c rename to src/storage/parthelper.c diff --git a/src/storage_backend.c b/src/storage/storage_backend.c similarity index 100% rename from src/storage_backend.c rename to src/storage/storage_backend.c diff --git a/src/storage_backend.h b/src/storage/storage_backend.h similarity index 100% rename from src/storage_backend.h rename to src/storage/storage_backend.h diff --git a/src/storage_backend_disk.c b/src/storage/storage_backend_disk.c similarity index 100% rename from src/storage_backend_disk.c rename to src/storage/storage_backend_disk.c diff --git a/src/storage_backend_disk.h b/src/storage/storage_backend_disk.h similarity index 100% rename from src/storage_backend_disk.h rename to src/storage/storage_backend_disk.h diff --git a/src/storage_backend_fs.c b/src/storage/storage_backend_fs.c similarity index 100% rename from src/storage_backend_fs.c rename to src/storage/storage_backend_fs.c diff --git a/src/storage_backend_fs.h b/src/storage/storage_backend_fs.h similarity index 100% rename from src/storage_backend_fs.h rename to src/storage/storage_backend_fs.h diff --git a/src/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c similarity index 100% rename from src/storage_backend_iscsi.c rename to src/storage/storage_backend_iscsi.c diff --git a/src/storage_backend_iscsi.h b/src/storage/storage_backend_iscsi.h similarity index 100% rename from src/storage_backend_iscsi.h rename to src/storage/storage_backend_iscsi.h diff --git a/src/storage_backend_logical.c b/src/storage/storage_backend_logical.c similarity index 100% rename from src/storage_backend_logical.c rename to src/storage/storage_backend_logical.c diff --git a/src/storage_backend_logical.h b/src/storage/storage_backend_logical.h similarity index 100% rename from src/storage_backend_logical.h rename to src/storage/storage_backend_logical.h diff --git a/src/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c similarity index 100% rename from src/storage_backend_mpath.c rename to src/storage/storage_backend_mpath.c diff --git a/src/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h similarity index 100% rename from src/storage_backend_mpath.h rename to src/storage/storage_backend_mpath.h diff --git a/src/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c similarity index 100% rename from src/storage_backend_scsi.c rename to src/storage/storage_backend_scsi.c diff --git a/src/storage_backend_scsi.h b/src/storage/storage_backend_scsi.h similarity index 100% rename from src/storage_backend_scsi.h rename to src/storage/storage_backend_scsi.h diff --git a/src/storage_driver.c b/src/storage/storage_driver.c similarity index 100% rename from src/storage_driver.c rename to src/storage/storage_driver.c diff --git a/src/storage_driver.h b/src/storage/storage_driver.h similarity index 100% rename from src/storage_driver.h rename to src/storage/storage_driver.h