Call stop_encrypted() even for nominally unencrypted volumes

qubes/api/admin.py

@@ -766,9 +766,6 @@ async def vm_volume_set_ephemeral(self, untrusted_payload):
 
         self.fire_event_for_permission(newvalue=newvalue)
 
-        if not self.dest.is_halted():
-            raise qubes.exc.QubesVMNotHaltedError(self.dest)
-
         self.dest.volumes[self.arg].ephemeral = newvalue
         self.app.save()
 

qubes/storage/__init__.py

@@ -857,16 +857,12 @@ async def start(self):
                 pass
 
     async def stop(self):
-        """Execute the stop method on each volume"""
+        """Stop each volume"""
         await qubes.utils.void_coros_maybe(
-            # pylint: disable=line-too-long
-            (
-                vol.stop_encrypted(
-                    vol.encrypted_volume_path(self.vm.name, name)
-                )
-                if vol.ephemeral
-                else vol.stop()
-            )
+            # Always call stop_encrypted() - which can handle an unencrypted
+            # volume as well - to correctly clean up even if the ephemeral
+            # property became False while the volume was already started.
+            vol.stop_encrypted(vol.encrypted_volume_path(self.vm.name, name))
             for name, vol in self.vm.volumes.items()
         )
         for vol in self.vm.volumes.values():