Merge #3123

3123: [daemon] Remove hyperkit migration support r=andrei-toterman a=townsend2010



Co-authored-by: Chris Townsend <[email protected]>

3rd-party/submodule_info.md

@@ -51,11 +51,6 @@ Version: 1.9.4 |
 <https://github.com/open-source-parsers/jsoncpp.git> |
 <https://github.com/open-source-parsers/jsoncpp/releases>
 
-### HyperKit
-Version: v0.20210107 |
-<https://github.com/moby/hyperkit.git> |
-<https://github.com/moby/hyperkit/releases>
-
 ### POCO
 Version: 1.12.4 |
 <https://github.com/pocoproject/poco.git> |

README.md

@@ -2,7 +2,7 @@
 
 Multipass is a lightweight VM manager for Linux, Windows and macOS. It's designed
 for developers who want a fresh Ubuntu environment with a single command. It uses
-KVM on Linux, Hyper-V on Windows and HyperKit on macOS to run the VM with minimal
+KVM on Linux, Hyper-V on Windows and QEMU on macOS to run the VM with minimal
 overhead. It can also use VirtualBox on Windows and macOS.
 Multipass will fetch images for you and keep them up to date.
 

include/multipass/fetch_type.h

@@ -23,8 +23,7 @@ namespace multipass
 {
 enum class FetchType
 {
-    ImageOnly,
-    ImageKernelAndInitrd
+    ImageOnly
 };
 }
 #endif //MULTIPASS_FETCH_TYPE_H

include/multipass/vm_image.h

@@ -28,8 +28,6 @@ class VMImage
 {
 public:
     Path image_path;
-    Path kernel_path;
-    Path initrd_path;
     std::string id;
     std::string original_release;
     std::string current_release;

include/multipass/vm_image_info.h

@@ -32,8 +32,6 @@ class VMImageInfo
     QString release_title;
     bool supported;
     QString image_location;
-    QString kernel_location;
-    QString initrd_location;
     QString id;
     QString stream_location;
     QString version;
@@ -43,10 +41,10 @@ class VMImageInfo
 
 inline bool operator==(const VMImageInfo& a, const VMImageInfo& b)
 {
-    return std::tie(a.aliases, a.os, a.release, a.release_title, a.supported, a.image_location, a.kernel_location,
-                    a.initrd_location, a.id, a.stream_location, a.version, a.size, a.verify) ==
-           std::tie(b.aliases, b.os, b.release, b.release_title, b.supported, b.image_location, b.kernel_location,
-                    b.initrd_location, b.id, b.stream_location, b.version, b.size, b.verify);
+    return std::tie(a.aliases, a.os, a.release, a.release_title, a.supported, a.image_location, a.id, a.stream_location,
+                    a.version, a.size, a.verify) == std::tie(b.aliases, b.os, b.release, b.release_title, b.supported,
+                                                             b.image_location, b.id, b.stream_location, b.version,
+                                                             b.size, b.verify);
 }
 }
 #endif // MULTIPASS_VM_IMAGE_INFO_H

src/client/cli/cmd/launch.cpp

@@ -564,8 +564,6 @@ mp::ReturnCode cmd::Launch::request_launch(const ArgParser* parser)
                                      grpc::ClientReaderWriterInterface<LaunchRequest, LaunchReply>* client) {
         std::unordered_map<int, std::string> progress_messages{
             {LaunchProgress_ProgressTypes_IMAGE, "Retrieving image: "},
-            {LaunchProgress_ProgressTypes_KERNEL, "Retrieving kernel image: "},
-            {LaunchProgress_ProgressTypes_INITRD, "Retrieving initrd image: "},
             {LaunchProgress_ProgressTypes_EXTRACT, "Extracting image: "},
             {LaunchProgress_ProgressTypes_VERIFY, "Verifying image: "},
             {LaunchProgress_ProgressTypes_WAITING, "Preparing image: "}};

src/daemon/CMakeLists.txt

@@ -37,7 +37,6 @@ target_link_libraries(daemon
   petname
   platform
   rpc
-  scope_guard # TODO hk migration, remove
   settings
   simplestreams
   ssh

src/daemon/custom_image_host.cpp

@@ -50,8 +50,6 @@ struct CustomImageInfo
     QString os;
     QString release;
     QString release_string;
-    QString kernel_location;
-    QString initrd_location;
 };
 
 const QMap<QString, QMap<QString, CustomImageInfo>> multipass_image_info{
@@ -61,33 +59,13 @@ const QMap<QString, QMap<QString, CustomImageInfo>> multipass_image_info{
         {"core", "core16"},
         "Ubuntu",
         "core-16",
-        "Core 16",
-        "",
-        ""}},
+        "Core 16"}},
       {{"ubuntu-core-18-amd64.img.xz"},
-       {"https://cdimage.ubuntu.com/ubuntu-core/18/stable/current/",
-        {"core18"},
-        "Ubuntu",
-        "core-18",
-        "Core 18",
-        "",
-        ""}},
+       {"https://cdimage.ubuntu.com/ubuntu-core/18/stable/current/", {"core18"}, "Ubuntu", "core-18", "Core 18"}},
       {{"ubuntu-core-20-amd64.img.xz"},
-       {"https://cdimage.ubuntu.com/ubuntu-core/20/stable/current/",
-        {"core20"},
-        "Ubuntu",
-        "core-20",
-        "Core 20",
-        "",
-        ""}},
+       {"https://cdimage.ubuntu.com/ubuntu-core/20/stable/current/", {"core20"}, "Ubuntu", "core-20", "Core 20"}},
       {{"ubuntu-core-22-amd64.img.xz"},
-       {"https://cdimage.ubuntu.com/ubuntu-core/22/stable/current/",
-        {"core22"},
-        "Ubuntu",
-        "core-22",
-        "Core 22",
-        "",
-        ""}}}}};
+       {"https://cdimage.ubuntu.com/ubuntu-core/22/stable/current/", {"core22"}, "Ubuntu", "core-22", "Core 22"}}}}};
 
 auto base_image_info_for(mp::URLDownloader* url_downloader, const QString& image_url, const QString& hash_url,
                          const QString& image_file)
@@ -140,8 +118,6 @@ auto full_image_info_for(const QMap<QString, CustomImageInfo>& custom_image_info
                                         image_info.second.release_string,
                                         true,      // supported
                                         image_url, // image_location
-                                        image_info.second.kernel_location,
-                                        image_info.second.initrd_location,
                                         base_image_info.hash, // id
                                         "",
                                         base_image_info.last_modified, // version