mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spapr/xive: Convert KVM device fd checks to assert()

Browse Source 
All callers guard these functions with an xive_in_kernel() helper. Make
it clear that they are only to be called when the KVM XIVE device exists.

Note that the check on xive is dropped in kvmppc_xive_disconnect(). It
really cannot be NULL since it comes from set_active_intc() which only
passes pointers to allocated objects.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <159679994169.876294.11026653581505077112.stgit@bahia.lan>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-08-07 13:32:21 +02:00 committed by David Gibson
parent e519cdd9bc
commit a490711934
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
hw/intc/spapr_xive_kvm.c
View File

@ -79,10 +79,7 @@ void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, Error **errp)
uint64_t state[2]; uint64_t state[2];
int ret; int ret;
/* The KVM XIVE device is not in use yet */ assert(xive->fd != -1);
if (xive->fd == -1) {
return;
}
/* word0 and word1 of the OS ring. */ /* word0 and word1 of the OS ring. */
state[0] = *((uint64_t *) &tctx->regs[TM_QW1_OS]); state[0] = *((uint64_t *) &tctx->regs[TM_QW1_OS]);
@ -101,10 +98,7 @@ void kvmppc_xive_cpu_get_state(XiveTCTX *tctx, Error **errp)
uint64_t state[2] = { 0 }; uint64_t state[2] = { 0 };
int ret; int ret;
/* The KVM XIVE device is not in use */ assert(xive->fd != -1);
if (xive->fd == -1) {
return;
}
ret = kvm_get_one_reg(tctx->cs, KVM_REG_PPC_VP_STATE, state); ret = kvm_get_one_reg(tctx->cs, KVM_REG_PPC_VP_STATE, state);
if (ret != 0) { if (ret != 0) {
@ -156,10 +150,7 @@ void kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **errp)
unsigned long vcpu_id; unsigned long vcpu_id;
int ret; int ret;
/* The KVM XIVE device is not in use */ assert(xive->fd != -1);
if (xive->fd == -1) {
return;
}
/* Check if CPU was hot unplugged and replugged. */ /* Check if CPU was hot unplugged and replugged. */
if (kvm_cpu_is_enabled(tctx->cs)) { if (kvm_cpu_is_enabled(tctx->cs)) {
@ -245,10 +236,7 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
SpaprXive *xive = SPAPR_XIVE(xsrc->xive); SpaprXive *xive = SPAPR_XIVE(xsrc->xive);
uint64_t state = 0; uint64_t state = 0;
/* The KVM XIVE device is not in use */ assert(xive->fd != -1);
if (xive->fd == -1) {
return -ENODEV;
}
if (xive_source_irq_is_lsi(xsrc, srcno)) { if (xive_source_irq_is_lsi(xsrc, srcno)) {
state |= KVM_XIVE_LEVEL_SENSITIVE; state |= KVM_XIVE_LEVEL_SENSITIVE;
@ -592,10 +580,7 @@ static void kvmppc_xive_change_state_handler(void *opaque, int running,
void kvmppc_xive_synchronize_state(SpaprXive *xive, Error **errp) void kvmppc_xive_synchronize_state(SpaprXive *xive, Error **errp)
{ {
/* The KVM XIVE device is not in use */ assert(xive->fd != -1);
if (xive->fd == -1) {
return;
}
/* /*
* When the VM is stopped, the sources are masked and the previous * When the VM is stopped, the sources are masked and the previous
@ -622,10 +607,7 @@ int kvmppc_xive_pre_save(SpaprXive *xive)
{ {
Error *local_err = NULL; Error *local_err = NULL;
/* The KVM XIVE device is not in use */ assert(xive->fd != -1);
if (xive->fd == -1) {
return 0;
}
/* EAT: there is no extra state to query from KVM */ /* EAT: there is no extra state to query from KVM */
@ -845,10 +827,7 @@ void kvmppc_xive_disconnect(SpaprInterruptController *intc)
XiveSource *xsrc; XiveSource *xsrc;
size_t esb_len; size_t esb_len;
/* The KVM XIVE device is not in use */ assert(xive->fd != -1);
if (!xive || xive->fd == -1) {
return;
}
/* Clear the KVM mapping */ /* Clear the KVM mapping */
xsrc = &xive->source; xsrc = &xive->source;