[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v2 13/18] guest memory protection: Move side effect out of machine_
From: |
David Gibson |
Subject: |
[RFC v2 13/18] guest memory protection: Move side effect out of machine_set_memory_encryption() |
Date: |
Thu, 21 May 2020 13:42:59 +1000 |
When the "memory-encryption" property is set, we also disable KSM
merging for the guest, since it won't accomplish anything.
We want that, but doing it in the property set function itself is
thereoretically incorrect, in the unlikely event of some configuration
environment that set the property then cleared it again before
constructing the guest.
But more important, it makes some other cleanups we want more
difficult. So, instead move this logic to machine_run_board_init()
conditional on the final value of the property.
Signed-off-by: David Gibson <address@hidden>
---
hw/core/machine.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/hw/core/machine.c b/hw/core/machine.c
index bb3a7b18b1..e75f0b73d0 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -429,14 +429,6 @@ static void machine_set_memory_encryption(Object *obj,
const char *value,
g_free(ms->memory_encryption);
ms->memory_encryption = g_strdup(value);
-
- /*
- * With memory encryption, the host can't see the real contents of RAM,
- * so there's no point in it trying to merge areas.
- */
- if (value) {
- machine_set_mem_merge(obj, false, errp);
- }
}
static bool machine_get_nvdimm(Object *obj, Error **errp)
@@ -1129,6 +1121,15 @@ void machine_run_board_init(MachineState *machine)
}
}
+ if (machine->memory_encryption) {
+ /*
+ * With guest memory protection, the host can't see the real
+ * contents of RAM, so there's no point in it trying to merge
+ * areas.
+ */
+ machine_set_mem_merge(OBJECT(machine), false, &error_abort);
+ }
+
machine_class->init(machine);
}
--
2.26.2
- [RFC v2 03/18] target/i386: sev: Rename QSevGuestInfo, (continued)
- [RFC v2 03/18] target/i386: sev: Rename QSevGuestInfo, David Gibson, 2020/05/20
- [RFC v2 08/18] target/i386: sev: Remove redundant handle field, David Gibson, 2020/05/20
- [RFC v2 09/18] target/i386: sev: Unify SEVState and SevGuestState, David Gibson, 2020/05/20
- [RFC v2 05/18] target/i386: sev: Partial cleanup to sev_state global, David Gibson, 2020/05/20
- [RFC v2 11/18] guest memory protection: Handle memory encrption via interface, David Gibson, 2020/05/20
- [RFC v2 06/18] target/i386: sev: Remove redundant cbitpos and reduced_phys_bits fields, David Gibson, 2020/05/20
- [RFC v2 13/18] guest memory protection: Move side effect out of machine_set_memory_encryption(),
David Gibson <=
- [RFC v2 15/18] guest memory protection: Decouple kvm_memcrypt_*() helpers from KVM, David Gibson, 2020/05/20
- [RFC v2 18/18] guest memory protection: Alter virtio default properties for protected guests, David Gibson, 2020/05/20
- [RFC v2 17/18] spapr: Added PEF based guest memory protection, David Gibson, 2020/05/20
- [RFC v2 10/18] guest memory protection: Add guest memory protection interface, David Gibson, 2020/05/20
- [RFC v2 12/18] guest memory protection: Perform KVM init via interface, David Gibson, 2020/05/20
- [RFC v2 16/18] guest memory protection: Add Error ** to GuestMemoryProtection::kvm_init, David Gibson, 2020/05/20