feat:support convert qcow2 img to overlaybd

Author: xiecl666

src/tools/CMakeLists.txt

@@ -16,7 +16,7 @@ add_executable(overlaybd-zfile overlaybd-zfile.cpp)
 target_include_directories(overlaybd-zfile PUBLIC ${PHOTON_INCLUDE_DIR})
 target_link_libraries(overlaybd-zfile photon_static overlaybd_lib)
 
-add_executable(overlaybd-apply overlaybd-apply.cpp)
+add_executable(overlaybd-apply overlaybd-apply.cpp qcow2converter.cpp)
 target_include_directories(overlaybd-apply PUBLIC ${PHOTON_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIRS})
 target_link_libraries(overlaybd-apply photon_static overlaybd_lib overlaybd_image_lib checksum_lib)
 set_target_properties(overlaybd-apply PROPERTIES INSTALL_RPATH "/opt/overlaybd/lib")

src/tools/overlaybd-apply.cpp

@@ -41,6 +41,8 @@
 #include "CLI11.hpp"
 #include "comm_func.h"
 #include "sha256file.h"
+#include "qcow2converter.h"
+
 
 using namespace std;
 using namespace photon::fs;
@@ -81,6 +83,7 @@ class FIFOFile : public VirtualReadOnlyFile {
 
 int main(int argc, char **argv) {
     std::string image_config_path, input_path, gz_index_path, config_path, sha256_checksum;
+    std::string qcow2_path;
     string tarheader;
     bool raw = false, mkfs = false, verbose = false;
 
@@ -92,8 +95,8 @@ int main(int argc, char **argv) {
     app.add_option("--service_config_path", config_path, "overlaybd image service config path")->type_name("FILEPATH")->check(CLI::ExistingFile)->default_val("/etc/overlaybd/overlaybd.json");
     app.add_option("--gz_index_path", gz_index_path, "build gzip index if layer is gzip, only used with turboOCIv1")->type_name("FILEPATH");
     app.add_option("--checksum", sha256_checksum, "sha256 checksum for origin uncompressed data");
-    app.add_option("input_path", input_path, "input OCIv1 tar layer path")->type_name("FILEPATH")->check(CLI::ExistingFile)->required();
-
+    app.add_option("input_path", input_path, "input OCIv1 tar layer path")->type_name("FILEPATH")->check(CLI::ExistingFile);
+    app.add_option("--from_qcow2", qcow2_path, "convert from qcow2 image file instead of tar")->type_name("FILEPATH")->check(CLI::ExistingFile);
     app.add_option("image_config_path", image_config_path, "overlaybd image config path")->type_name("FILEPATH")->check(CLI::ExistingFile)->required();
     CLI11_PARSE(app, argc, argv);
 
@@ -103,6 +106,33 @@ int main(int argc, char **argv) {
 
     ImageService *imgservice = nullptr;
     photon::fs::IFile *imgfile = nullptr;
+
+    // --- qcow2 mode: convert qcow2 directly to overlaybd LSMT layer ---
+    if (!qcow2_path.empty()) {
+        create_overlaybd(config_path, image_config_path, imgservice, imgfile);
+        if (imgfile == nullptr) {
+            fprintf(stderr, "failed to create image file\n");
+            exit(-1);
+        }
+
+        int ret = convert_qcow2_to_imgfile(qcow2_path.c_str(), imgfile,
+                                            DEFAULT_BLOCK_SIZE, verbose, true);
+        delete imgfile;
+        delete imgservice;
+
+        if (ret != 0) {
+            fprintf(stderr, "qcow2 conversion failed\n");
+            exit(-1);
+        }
+        printf("qcow2 to overlaybd conversion done\n");
+        return 0;
+    }
+
+    // --- tar mode: normal overlaybd-apply flow ---
+    if (input_path.empty()) {
+        fprintf(stderr, "Either input_path (tar) or --from_qcow2 is required\n");
+        exit(-1);
+    }
     if (raw) {
         imgfile = open_file(image_config_path.c_str(), O_RDWR, 0644);
     } else {