[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH 3/6] xics/kvm: Skip rollback when KVM XICS is abse
From: |
David Gibson |
Subject: |
Re: [Qemu-ppc] [PATCH 3/6] xics/kvm: Skip rollback when KVM XICS is absent |
Date: |
Thu, 20 Jun 2019 18:04:07 +1000 |
User-agent: |
Mutt/1.12.0 (2019-05-25) |
On Mon, Jun 17, 2019 at 03:46:46PM +0200, Greg Kurz wrote:
> There is no need to rollback anything at this point, so just return an
> error.
>
> Signed-off-by: Greg Kurz <address@hidden>
Applied, thanks.
> ---
> hw/intc/xics_kvm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
> index 534515143ea8..377ff88701c2 100644
> --- a/hw/intc/xics_kvm.c
> +++ b/hw/intc/xics_kvm.c
> @@ -348,7 +348,7 @@ int xics_kvm_connect(SpaprMachineState *spapr, Error
> **errp)
> if (!kvm_enabled() || !kvm_check_extension(kvm_state, KVM_CAP_IRQ_XICS))
> {
> error_setg(errp,
> "KVM and IRQ_XICS capability must be present for
> in-kernel XICS");
> - goto fail;
> + return -1;
> }
>
> rc = kvmppc_define_rtas_kernel_token(RTAS_IBM_SET_XIVE, "ibm,set-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
- [Qemu-ppc] [PATCH 0/6] xics/kvm: Improve error handling, Greg Kurz, 2019/06/17
- [Qemu-ppc] [PATCH 1/6] xics/spapr: Drop unused function declaration, Greg Kurz, 2019/06/17
- [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