Snap for 4628106 from 7dfe7495d581c43e374b01ab9f78cce0093dd302 to pi-release
Change-Id: I1ab8f7eef3d008326bab1e08199d47ac1c3d90ca
diff --git a/dbus/vm_concierge/dbus-constants.h b/dbus/vm_concierge/dbus-constants.h
index 454b644..43ca67e 100644
--- a/dbus/vm_concierge/dbus-constants.h
+++ b/dbus/vm_concierge/dbus-constants.h
@@ -17,6 +17,7 @@
const char kStopAllVmsMethod[] = "StopAllVms";
const char kGetVmInfoMethod[] = "GetVmInfo";
const char kCreateDiskImageMethod[] = "CreateDiskImage";
+const char kDestroyDiskImageMethod[] = "DestroyDiskImage";
} // namespace concierge
} // namespace vm_tools
diff --git a/dbus/vm_concierge/service.proto b/dbus/vm_concierge/service.proto
index 9606aaf..132a174 100644
--- a/dbus/vm_concierge/service.proto
+++ b/dbus/vm_concierge/service.proto
@@ -3,6 +3,7 @@
// found in the LICENSE file.
syntax = "proto3";
+option optimize_for = LITE_RUNTIME;
// This file defines messages used for starting, stopping, and managing VMs.
package vm_tools.concierge;
@@ -149,6 +150,12 @@
// Unable to create the disk image.
DISK_STATUS_FAILED = 3;
+
+ // Specified Disk does not exist.
+ DISK_STATUS_DOES_NOT_EXIST = 4;
+
+ // The specified disk was destroyed.
+ DISK_STATUS_DESTROYED = 5;
}
// Request to concierge to create a disk image.
@@ -182,3 +189,25 @@
// The failure reason if the disk image could not be created or doesn't exist.
string failure_reason = 3;
}
+
+// Request to concierge to destroy a disk image.
+message DestroyDiskImageRequest {
+ // The cryptohome id for the user's encrypted storage.
+ string cryptohome_id = 1;
+
+ // The path to the disk image. This must be a relative path.
+ string disk_path = 2;
+
+ // The storage location for the disk image.
+ StorageLocation storage_location = 3;
+}
+
+// Response to a DestroyDiskImageRequest.
+message DestroyDiskImageResponse {
+ // If DISK_STATUS_DESTROYED, the disk image has been successfully destroyed.
+ // If DISK_STATUS_DOES_NOT_EXIST, the disk image had already been removed.
+ DiskImageStatus status = 1;
+
+ // The failure reason if the disk image could not be destroyed or doesn't exist.
+ string failure_reason = 3;
+}