[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: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 6/6] xics/kvm: Add proper rollback to xics_kvm_init() |
Date: |
Thu, 20 Jun 2019 18:32:57 +1000 |
User-agent: |
Mutt/1.12.0 (2019-05-25) |
On Mon, Jun 17, 2019 at 03:47:03PM +0200, 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>
Applied, thanks.
> ---
> 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");
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
- Re: [Qemu-ppc] [PATCH 3/6] xics/kvm: Skip rollback when KVM XICS is absent, (continued)