| Message ID | 20211002125317.3418648-20-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | target/i386/sev: Housekeeping SEV + measured Linux SEV guest | expand |
On 02/10/21 14:53, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/monitor/hmp-target.h | 1 + > include/monitor/hmp.h | 1 - > target/i386/sev-sysemu-stub.c | 2 +- > target/i386/sev.c | 2 +- > 4 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h > index dc53add7eef..96956d0fc41 100644 > --- a/include/monitor/hmp-target.h > +++ b/include/monitor/hmp-target.h > @@ -49,6 +49,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict); > void hmp_mce(Monitor *mon, const QDict *qdict); > void hmp_info_local_apic(Monitor *mon, const QDict *qdict); > void hmp_info_io_apic(Monitor *mon, const QDict *qdict); > +void hmp_info_sev(Monitor *mon, const QDict *qdict); > void hmp_info_sgx(Monitor *mon, const QDict *qdict); > > #endif /* MONITOR_HMP_TARGET_H */ > diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h > index 3baa1058e2c..6bc27639e01 100644 > --- a/include/monitor/hmp.h > +++ b/include/monitor/hmp.h > @@ -124,7 +124,6 @@ void hmp_info_ramblock(Monitor *mon, const QDict *qdict); > void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); > void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); > void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict); > -void hmp_info_sev(Monitor *mon, const QDict *qdict); > void hmp_info_replay(Monitor *mon, const QDict *qdict); > void hmp_replay_break(Monitor *mon, const QDict *qdict); > void hmp_replay_delete_break(Monitor *mon, const QDict *qdict); > diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c > index 1836b32e4fc..b2a4033a030 100644 > --- a/target/i386/sev-sysemu-stub.c > +++ b/target/i386/sev-sysemu-stub.c > @@ -13,7 +13,7 @@ > > #include "qemu/osdep.h" > #include "monitor/monitor.h" > -#include "monitor/hmp.h" > +#include "monitor/hmp-target.h" > #include "qapi/qapi-commands-misc-target.h" > #include "qapi/qmp/qerror.h" > #include "qapi/error.h" > diff --git a/target/i386/sev.c b/target/i386/sev.c > index 7caaa117ff7..c6d8fc52eb2 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -32,7 +32,7 @@ > #include "migration/blocker.h" > #include "qom/object.h" > #include "monitor/monitor.h" > -#include "monitor/hmp.h" > +#include "monitor/hmp-target.h" > #include "qapi/qapi-commands-misc-target.h" > #include "qapi/qmp/qerror.h" > #include "exec/confidential-guest-support.h" > This is only a cleanup, isn't it? The #ifdef is already in hmp-commands-info.hx. Anyway, Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> but please adjust the commit message in v4. Paolo
On 10/4/21 10:26, Paolo Bonzini wrote: > On 02/10/21 14:53, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> include/monitor/hmp-target.h | 1 + >> include/monitor/hmp.h | 1 - >> target/i386/sev-sysemu-stub.c | 2 +- >> target/i386/sev.c | 2 +- >> 4 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h >> index dc53add7eef..96956d0fc41 100644 >> --- a/include/monitor/hmp-target.h >> +++ b/include/monitor/hmp-target.h >> @@ -49,6 +49,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict); >> void hmp_mce(Monitor *mon, const QDict *qdict); >> void hmp_info_local_apic(Monitor *mon, const QDict *qdict); >> void hmp_info_io_apic(Monitor *mon, const QDict *qdict); >> +void hmp_info_sev(Monitor *mon, const QDict *qdict); >> void hmp_info_sgx(Monitor *mon, const QDict *qdict); >> #endif /* MONITOR_HMP_TARGET_H */ >> diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h >> index 3baa1058e2c..6bc27639e01 100644 >> --- a/include/monitor/hmp.h >> +++ b/include/monitor/hmp.h >> @@ -124,7 +124,6 @@ void hmp_info_ramblock(Monitor *mon, const QDict >> *qdict); >> void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); >> void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); >> void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict); >> -void hmp_info_sev(Monitor *mon, const QDict *qdict); >> void hmp_info_replay(Monitor *mon, const QDict *qdict); >> void hmp_replay_break(Monitor *mon, const QDict *qdict); >> void hmp_replay_delete_break(Monitor *mon, const QDict *qdict); >> diff --git a/target/i386/sev-sysemu-stub.c >> b/target/i386/sev-sysemu-stub.c >> index 1836b32e4fc..b2a4033a030 100644 >> --- a/target/i386/sev-sysemu-stub.c >> +++ b/target/i386/sev-sysemu-stub.c >> @@ -13,7 +13,7 @@ >> #include "qemu/osdep.h" >> #include "monitor/monitor.h" >> -#include "monitor/hmp.h" >> +#include "monitor/hmp-target.h" >> #include "qapi/qapi-commands-misc-target.h" >> #include "qapi/qmp/qerror.h" >> #include "qapi/error.h" >> diff --git a/target/i386/sev.c b/target/i386/sev.c >> index 7caaa117ff7..c6d8fc52eb2 100644 >> --- a/target/i386/sev.c >> +++ b/target/i386/sev.c >> @@ -32,7 +32,7 @@ >> #include "migration/blocker.h" >> #include "qom/object.h" >> #include "monitor/monitor.h" >> -#include "monitor/hmp.h" >> +#include "monitor/hmp-target.h" >> #include "qapi/qapi-commands-misc-target.h" >> #include "qapi/qmp/qerror.h" >> #include "exec/confidential-guest-support.h" >> > > > This is only a cleanup, isn't it? The #ifdef is already in > hmp-commands-info.hx. IIUC the prototype is exposed to all targets, while with this patch, only to the files including "monitor/hmp-target.h". You are right the command is only added for TARGET_I386 in hmp-commands-info.hx. > > Anyway, > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> > > but please adjust the commit message in v4. OK, thanks.
diff --git a/include/monitor/hmp-target.h b/include/monitor/hmp-target.h index dc53add7eef..96956d0fc41 100644 --- a/include/monitor/hmp-target.h +++ b/include/monitor/hmp-target.h @@ -49,6 +49,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict); void hmp_mce(Monitor *mon, const QDict *qdict); void hmp_info_local_apic(Monitor *mon, const QDict *qdict); void hmp_info_io_apic(Monitor *mon, const QDict *qdict); +void hmp_info_sev(Monitor *mon, const QDict *qdict); void hmp_info_sgx(Monitor *mon, const QDict *qdict); #endif /* MONITOR_HMP_TARGET_H */ diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h index 3baa1058e2c..6bc27639e01 100644 --- a/include/monitor/hmp.h +++ b/include/monitor/hmp.h @@ -124,7 +124,6 @@ void hmp_info_ramblock(Monitor *mon, const QDict *qdict); void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict); void hmp_info_vm_generation_id(Monitor *mon, const QDict *qdict); void hmp_info_memory_size_summary(Monitor *mon, const QDict *qdict); -void hmp_info_sev(Monitor *mon, const QDict *qdict); void hmp_info_replay(Monitor *mon, const QDict *qdict); void hmp_replay_break(Monitor *mon, const QDict *qdict); void hmp_replay_delete_break(Monitor *mon, const QDict *qdict); diff --git a/target/i386/sev-sysemu-stub.c b/target/i386/sev-sysemu-stub.c index 1836b32e4fc..b2a4033a030 100644 --- a/target/i386/sev-sysemu-stub.c +++ b/target/i386/sev-sysemu-stub.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "monitor/monitor.h" -#include "monitor/hmp.h" +#include "monitor/hmp-target.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qmp/qerror.h" #include "qapi/error.h" diff --git a/target/i386/sev.c b/target/i386/sev.c index 7caaa117ff7..c6d8fc52eb2 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -32,7 +32,7 @@ #include "migration/blocker.h" #include "qom/object.h" #include "monitor/monitor.h" -#include "monitor/hmp.h" +#include "monitor/hmp-target.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qmp/qerror.h" #include "exec/confidential-guest-support.h"
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/monitor/hmp-target.h | 1 + include/monitor/hmp.h | 1 - target/i386/sev-sysemu-stub.c | 2 +- target/i386/sev.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-)