| Message ID | 20180718154200.26777-16-dplotnikov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | Background snapshots | expand |
On Wed, Jul 18, 2018 at 06:41:58PM +0300, Denis Plotnikov wrote: > Is done with support of the KVM patch returning the faulting address. > > Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> I feel like these two kvm-related patches can be put at the end of the series as an extension to kvm support. E.g., without these kvm patches one should still be able to do live snapshot with TCG. Then even if your KVM patches are not settled (along with the header update) there's still chance that your framework can be merged first. > --- > target/i386/kvm.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/target/i386/kvm.c b/target/i386/kvm.c > index 3ac5302bc5..55b8860d1a 100644 > --- a/target/i386/kvm.c > +++ b/target/i386/kvm.c > @@ -45,6 +45,8 @@ > #include "hw/pci/msi.h" > #include "hw/pci/msix.h" > #include "migration/blocker.h" > +#include "migration/savevm.h" > +#include "migration/ram.h" > #include "exec/memattrs.h" > #include "trace.h" > > @@ -3130,6 +3132,18 @@ static bool host_supports_vmx(void) > return ecx & CPUID_EXT_VMX; > } > > +static int kvm_handle_fail_mem_access(CPUState *cpu) > +{ > + struct kvm_run *run = cpu->kvm_run; > + int ret = ram_process_page_fault((void *)run->fail_mem_access.hva); > + > + if (ret >= 0) { > + cpu_resume(cpu); > + } > + > + return ret; > +} > + > #define VMX_INVALID_GUEST_STATE 0x80000021 > > int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > @@ -3188,6 +3202,9 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > ioapic_eoi_broadcast(run->eoi.vector); > ret = 0; > break; > + case KVM_EXIT_FAIL_MEM_ACCESS: > + ret = kvm_handle_fail_mem_access(cs); > + break; > default: > fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); > ret = -1; > -- > 2.17.0 > > Regards,
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 3ac5302bc5..55b8860d1a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -45,6 +45,8 @@ #include "hw/pci/msi.h" #include "hw/pci/msix.h" #include "migration/blocker.h" +#include "migration/savevm.h" +#include "migration/ram.h" #include "exec/memattrs.h" #include "trace.h" @@ -3130,6 +3132,18 @@ static bool host_supports_vmx(void) return ecx & CPUID_EXT_VMX; } +static int kvm_handle_fail_mem_access(CPUState *cpu) +{ + struct kvm_run *run = cpu->kvm_run; + int ret = ram_process_page_fault((void *)run->fail_mem_access.hva); + + if (ret >= 0) { + cpu_resume(cpu); + } + + return ret; +} + #define VMX_INVALID_GUEST_STATE 0x80000021 int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) @@ -3188,6 +3202,9 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) ioapic_eoi_broadcast(run->eoi.vector); ret = 0; break; + case KVM_EXIT_FAIL_MEM_ACCESS: + ret = kvm_handle_fail_mem_access(cs); + break; default: fprintf(stderr, "KVM: unknown exit reason %d\n", run->exit_reason); ret = -1;
Is done with support of the KVM patch returning the faulting address. Signed-off-by: Denis Plotnikov <dplotnikov@virtuozzo.com> --- target/i386/kvm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)