commit 2a27de8322a91f73bbfbf6734c6490436b062c72
author Andrew Scull <ascull@google.com> Wed Sep 29 13:44:20 2021 +0100
committer Andrew Scull <ascull@google.com> Wed Sep 29 13:48:39 2021 +0100
tree fab8669ffa7a6ce1f5598c4af3189a0582919062
parent 9190551df4ba7b68235afb3b386e0ec18b50cfcb

misc_writer: Remove option to clear pKVM flag

Only expose options to explicitly enabled and disable pKVM from
userspace. If the default state is needed, it's the responsibility of
userspace to know which is the default state and apply it.

Bug: 192819132
Test: See option is removed from CLI
Change-Id: I38ea76e9a024da54b785315d0766bfa0758c45eb

misc_writer/include/misc_writer/misc_writer.h

diff --git a/misc_writer/include/misc_writer/misc_writer.h b/misc_writer/include/misc_writer/misc_writer.h
index f962075..3c22c16 100644
--- a/misc_writer/include/misc_writer/misc_writer.h
+++ b/misc_writer/include/misc_writer/misc_writer.h
@@ -34,7 +34,6 @@
   kClearSotaFlag,
   kSetEnablePkvmFlag,
   kSetDisablePkvmFlag,
-  kClearPkvmFlag,
 
   kUnset = -1,
 };

misc_writer/misc_writer.cpp

diff --git a/misc_writer/misc_writer.cpp b/misc_writer/misc_writer.cpp
index 4c5d0f7..0d867c2 100644
--- a/misc_writer/misc_writer.cpp
+++ b/misc_writer/misc_writer.cpp
@@ -66,13 +66,9 @@
       break;
     case MiscWriterActions::kSetEnablePkvmFlag:
     case MiscWriterActions::kSetDisablePkvmFlag:
-    case MiscWriterActions::kClearPkvmFlag:
       offset = override_offset.value_or(kPkvmFlagOffsetInVendorSpace);
-      content = (action_ == MiscWriterActions::kSetEnablePkvmFlag)
-                    ? kEnablePkvmFlag
-                    : (action_ == MiscWriterActions::kSetDisablePkvmFlag)
-                        ? kDisablePkvmFlag
-                        : std::string(strlen(kDisablePkvmFlag), 0);
+      content = (action_ == MiscWriterActions::kSetEnablePkvmFlag) ? kEnablePkvmFlag
+                                                                   : kDisablePkvmFlag;
       break;
     case MiscWriterActions::kUnset:
       LOG(ERROR) << "The misc writer action must be set";

misc_writer/misc_writer_main.cpp

diff --git a/misc_writer/misc_writer_main.cpp b/misc_writer/misc_writer_main.cpp
index 4684612..7c5e27a 100644
--- a/misc_writer/misc_writer_main.cpp
+++ b/misc_writer/misc_writer_main.cpp
@@ -44,7 +44,6 @@
   std::cerr << "  --clear-sota         Clear the silent OTA flag\n";
   std::cerr << "  --set-enable-pkvm    Write the enable pKVM flag\n";
   std::cerr << "  --set-disable-pkvm   Write the disable pKVM flag\n";
-  std::cerr << "  --clear-pkvm         Clear the pKVM flag\n";
   std::cerr << "Writes the given hex string to the specified offset in vendor space in /misc "
                "partition.\nDefault offset is used for each action unless "
                "--override-vendor-space-offset is specified.\n";
@@ -61,7 +60,6 @@
     { "override-vendor-space-offset", required_argument, nullptr, 0 },
     { "set-enable-pkvm", no_argument, nullptr, 0 },
     { "set-disable-pkvm", no_argument, nullptr, 0 },
-    { "clear-pkvm", no_argument, nullptr, 0 },
     { nullptr, 0, nullptr, 0 },
   };
 
@@ -72,7 +70,6 @@
     { "clear-sota", MiscWriterActions::kClearSotaFlag },
     { "set-enable-pkvm", MiscWriterActions::kSetEnablePkvmFlag },
     { "set-disable-pkvm", MiscWriterActions::kSetDisablePkvmFlag },
-    { "clear-pkvm", MiscWriterActions::kClearPkvmFlag },
   };
 
   std::unique_ptr<MiscWriter> misc_writer;