[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 2/6] xics/spapr: Rename xics_kvm_init()
From: |
Greg Kurz |
Subject: |
[Qemu-ppc] [PATCH 2/6] xics/spapr: Rename xics_kvm_init() |
Date: |
Mon, 17 Jun 2019 15:46:41 +0200 |
User-agent: |
StGit/unknown-version |
Switch to using the connect/disconnect terminology like we already do for
XIVE.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/intc/xics_kvm.c | 2 +-
hw/ppc/spapr_irq.c | 2 +-
include/hw/ppc/xics_spapr.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index c7f8f5edd257..534515143ea8 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -331,7 +331,7 @@ void ics_kvm_set_irq(ICSState *ics, int srcno, int val)
}
}
-int xics_kvm_init(SpaprMachineState *spapr, Error **errp)
+int xics_kvm_connect(SpaprMachineState *spapr, Error **errp)
{
int rc;
CPUState *cs;
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index 84b9b32fe40f..ff3df0bbd8cf 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -237,7 +237,7 @@ static const char
*spapr_irq_get_nodename_xics(SpaprMachineState *spapr)
static void spapr_irq_init_kvm_xics(SpaprMachineState *spapr, Error **errp)
{
if (kvm_enabled()) {
- xics_kvm_init(spapr, errp);
+ xics_kvm_connect(spapr, errp);
}
}
diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
index 330448126223..5dabc9a1388f 100644
--- a/include/hw/ppc/xics_spapr.h
+++ b/include/hw/ppc/xics_spapr.h
@@ -33,7 +33,7 @@
void spapr_dt_xics(SpaprMachineState *spapr, uint32_t nr_servers, void *fdt,
uint32_t phandle);
-int xics_kvm_init(SpaprMachineState *spapr, Error **errp);
+int xics_kvm_connect(SpaprMachineState *spapr, Error **errp);
void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp);
bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr);
void xics_spapr_init(SpaprMachineState *spapr);
- [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 <=
- [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