On 5/20/20 8:42 PM, David Gibson wrote: > 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 <david@xxxxxxxxxxxxxxxxxxxxx> > --- > hw/core/machine.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@xxxxxxxxxx> r~