[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 6/6] xics/kvm: Add proper rollback to xics_kvm_ini
From: |
Cédric Le Goater |
Subject: |
Re: [Qemu-ppc] [PATCH 6/6] xics/kvm: Add proper rollback to xics_kvm_init() |
Date: |
Tue, 18 Jun 2019 09:18:17 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 |
On 17/06/2019 15:47, Greg Kurz wrote:
> Make xics_kvm_disconnect() able to undo the changes of a partial execution
> of xics_kvm_connect() and use it to perform rollback.
>
> Note that kvmppc_define_rtas_kernel_token(0) never fails, no matter the
> RTAS call has been defined or not.
>
> Signed-off-by: Greg Kurz <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Thanks,
C.
> ---
> hw/intc/xics_kvm.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index 4bfbe1a84092..51433b19b076 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -421,10 +421,7 @@ int xics_kvm_connect(SpaprMachineState *spapr, Error
> **errp)
>
> fail:
> error_propagate(errp, local_err);
> - kvmppc_define_rtas_kernel_token(0, "ibm,set-xive");
> - kvmppc_define_rtas_kernel_token(0, "ibm,get-xive");
> - kvmppc_define_rtas_kernel_token(0, "ibm,int-on");
> - kvmppc_define_rtas_kernel_token(0, "ibm,int-off");
> + xics_kvm_disconnect(spapr, NULL);
> return -1;
> }
>
> @@ -448,8 +445,10 @@ void xics_kvm_disconnect(SpaprMachineState *spapr, Error
> **errp)
> * removed from the list of devices of the VM. The VCPU presenters
> * are also detached from the device.
> */
> - close(kernel_xics_fd);
> - kernel_xics_fd = -1;
> + if (kernel_xics_fd != -1) {
> + close(kernel_xics_fd);
> + kernel_xics_fd = -1;
> + }
>
> kvmppc_define_rtas_kernel_token(0, "ibm,set-xive");
> kvmppc_define_rtas_kernel_token(0, "ibm,get-xive");
>
- [Qemu-ppc] [PATCH 3/6] xics/kvm: Skip rollback when KVM XICS is absent, (continued)
- [Qemu-ppc] [PATCH 3/6] xics/kvm: Skip rollback when KVM XICS is absent, Greg Kurz, 2019/06/17
- [Qemu-ppc] [PATCH 2/6] xics/spapr: Rename xics_kvm_init(), Greg Kurz, 2019/06/17
- [Qemu-ppc] [PATCH 4/6] xics/kvm: Always use local_err in xics_kvm_init(), Greg Kurz, 2019/06/17
- [Qemu-ppc] [PATCH 6/6] xics/kvm: Add proper rollback to xics_kvm_init(), Greg Kurz, 2019/06/17
- [Qemu-ppc] [PATCH 5/6] xics/kvm: Add error propagation to ic*_set_kvm_state() functions, Greg Kurz, 2019/06/17