refactor: remove clone_vm and extend build_from_snapshot to accept uffd

These two functions were doing a similar thing. Let's extend the
build_from_snapshot to support uffd and drop the newly introduced
clone_vm.

Signed-off-by: Riccardo Mancini <[email protected]>

Author: Manciukic

tests/framework/microvm.py

@@ -1279,11 +1279,13 @@ def build(self, kernel=None, rootfs=None, **kwargs):
             vm.ssh_key = ssh_key
         return vm
 
-    def build_from_snapshot(self, snapshot: Snapshot):
+    def build_from_snapshot(self, snapshot: Snapshot, uffd_handler_name=None):
         """Build a microvm from a snapshot"""
         vm = self.build()
         vm.spawn()
-        vm.restore_from_snapshot(snapshot, resume=True)
+        vm.restore_from_snapshot(
+            snapshot, resume=True, uffd_handler_name=uffd_handler_name
+        )
         return vm
 
     def build_n_from_snapshot(
@@ -1342,18 +1344,6 @@ def build_n_from_snapshot(
             last_snapshot.delete()
         current_snapshot.delete()
 
-    def clone_uvm(self, uvm, uffd_handler_name=None):
-        """
-        Clone the given VM and start it.
-        """
-        snapshot = uvm.snapshot_full()
-        restored_vm = self.build()
-        restored_vm.spawn()
-        restored_vm.restore_from_snapshot(
-            snapshot, resume=True, uffd_handler_name=uffd_handler_name
-        )
-        return restored_vm
-
     def kill(self):
         """Clean up all built VMs"""
         for vm in self.vms:

tests/integration_tests/performance/test_hotplug_memory.py

@@ -65,7 +65,8 @@ def uvm_resumed_memhp(
     uvm = uvm_booted_memhp(
         uvm_plain, rootfs, microvm_factory, vhost_user, memhp_config, huge_pages, None
     )
-    return microvm_factory.clone_uvm(uvm, uffd_handler_name=uffd_handler)
+    snapshot = uvm.snapshot_full()
+    return microvm_factory.build_from_snapshot(snapshot, uffd_handler_name=uffd_handler)
 
 
 @pytest.fixture(
@@ -282,7 +283,8 @@ def test_snapshot_restore_persistence(uvm_plain_6_1, microvm_factory):
 
     _, checksum_before, _ = uvm.ssh.check_output("sha256sum /dev/shm/mem_hp_test")
 
-    restored_vm = microvm_factory.clone_uvm(uvm)
+    snapshot = uvm.make_snapshot(snapshot_type)
+    restored_vm = microvm_factory.build_from_snapshot(snapshot)
 
     _, checksum_after, _ = restored_vm.ssh.check_output(
         "sha256sum /dev/shm/mem_hp_test"