Revert "vm_tools: Remove GetDnsSettings dbus API from concierge"
This reverts commit 19b4c82f4f3c3792bcd69f313199cfc36fc350a3.
Reason for revert: This function is used by PluginVm
Please be careful before deleting functions. The original commit
for this code does explain how it is used.
https://chromium.googlesource.com/chromiumos/platform2/+/42de9993dd102485ec307e96158491e8985cbf34
Original change's description:
> vm_tools: Remove GetDnsSettings dbus API from concierge
>
> This API appears to be unused, so delete it.
>
> BUG=none
> TEST=CQ
>
> Change-Id: I697aa2bceefb1cce44b6e0ab9cfc2434e1aa82a5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/4190922
> Reviewed-by: Abhishek Bhardwaj <abhishekbh@chromium.org>
> Tested-by: Abhishek Bhardwaj <abhishekbh@chromium.org>
> Commit-Queue: Fergus Dall <sidereal@google.com>
Bug: b:243451864
Change-Id: I4cece6cf48a7b0916d48255d0dd322daae79af84
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/4235618
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Tested-by: Joel Hockey <joelhockey@chromium.org>
Auto-Submit: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Timothy Loh <timloh@chromium.org>
Reviewed-by: Fergus Dall <sidereal@google.com>
Reviewed-by: Timothy Loh <timloh@chromium.org>
NOKEYCHECK=True
GitOrigin-RevId: cc65166c5f0dd65e34f2c29a42bceaf21eb02920
diff --git a/dbus/vm_concierge/concierge_service.proto b/dbus/vm_concierge/concierge_service.proto
index ad3e904..ee57da9 100644
--- a/dbus/vm_concierge/concierge_service.proto
+++ b/dbus/vm_concierge/concierge_service.proto
@@ -1202,7 +1202,8 @@
repeated UsbDeviceMessage usb_devices = 2;
}
-// Message broadcast via DnsSettingsChanged signal.
+// Response sent back by vm_concierge after it receives a GetDnsSettings call.
+// Also being broadcast via DnsSettingsChanged signal.
message DnsSettings {
// List of DNS servers.
repeated string nameservers = 1;
diff --git a/dbus/vm_concierge/dbus-constants.h b/dbus/vm_concierge/dbus-constants.h
index b01e07b..e884e28 100644
--- a/dbus/vm_concierge/dbus-constants.h
+++ b/dbus/vm_concierge/dbus-constants.h
@@ -34,6 +34,7 @@
const char kDetachUsbDeviceMethod[] = "DetachUsbDevice";
const char kListUsbDeviceMethod[] = "ListUsbDevices";
const char kStartPluginVmMethod[] = "StartPluginVm";
+const char kGetDnsSettingsMethod[] = "GetDnsSettings";
const char kStartArcVmMethod[] = "StartArcVm";
const char kSetVmCpuRestrictionMethod[] = "SetVmCpuRestriction";
const char kAdjustVmMethod[] = "AdjustVm";