| Message ID | 20210303182219.1631042-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel: Introduce AccelvCPUState opaque structure | expand |
On 3/3/21 7:22 PM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > include/hw/core/cpu.h | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) Typo in patch subject "Group" ;) > > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index c005d3dc2d8..074199ce73c 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -393,10 +393,6 @@ struct CPUState { > */ > uintptr_t mem_io_pc; > > - int kvm_fd; > - struct KVMState *kvm_state; > - struct kvm_run *kvm_run; > - > /* Used for events with 'vcpu' and *without* the 'disabled' properties */ > DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS); > DECLARE_BITMAP(trace_dstate, CPU_TRACE_DSTATE_MAX_EVENTS); > @@ -416,6 +412,12 @@ struct CPUState { > uint32_t can_do_io; > int32_t exception_index; > > + /* Accelerator-specific fields. */ > + int kvm_fd; > + struct KVMState *kvm_state; > + struct kvm_run *kvm_run; > + struct hax_vcpu_state *hax_vcpu; > + int hvf_fd; > /* shared by kvm, hax and hvf */ > bool vcpu_dirty; > > @@ -426,10 +428,6 @@ struct CPUState { > > bool ignore_memory_transaction_failures; > > - struct hax_vcpu_state *hax_vcpu; > - > - int hvf_fd; > - > /* track IOMMUs whose translations we've cached in the TCG TLB */ > GArray *iommu_notifiers; > }; >
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index c005d3dc2d8..074199ce73c 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -393,10 +393,6 @@ struct CPUState { */ uintptr_t mem_io_pc; - int kvm_fd; - struct KVMState *kvm_state; - struct kvm_run *kvm_run; - /* Used for events with 'vcpu' and *without* the 'disabled' properties */ DECLARE_BITMAP(trace_dstate_delayed, CPU_TRACE_DSTATE_MAX_EVENTS); DECLARE_BITMAP(trace_dstate, CPU_TRACE_DSTATE_MAX_EVENTS); @@ -416,6 +412,12 @@ struct CPUState { uint32_t can_do_io; int32_t exception_index; + /* Accelerator-specific fields. */ + int kvm_fd; + struct KVMState *kvm_state; + struct kvm_run *kvm_run; + struct hax_vcpu_state *hax_vcpu; + int hvf_fd; /* shared by kvm, hax and hvf */ bool vcpu_dirty; @@ -426,10 +428,6 @@ struct CPUState { bool ignore_memory_transaction_failures; - struct hax_vcpu_state *hax_vcpu; - - int hvf_fd; - /* track IOMMUs whose translations we've cached in the TCG TLB */ GArray *iommu_notifiers; };
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- include/hw/core/cpu.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)