mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr: Replace spapr_vio_qirq() helper with spapr_vio_irq_pulse() helper 

Every caller of spapr_vio_qirq() immediately calls qemu_irq_pulse() with
the result, so we might as well just fold that into the helper.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
David Gibson 2019-09-23 15:50:09 +10:00
parent 258aa5ce1c
commit 7678b74a94
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/char/spapr_vty.c
View File

@ -5,7 +5,6 @@
#include "cpu.h" #include "cpu.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "hw/irq.h"
#include "hw/ppc/spapr.h" #include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h" #include "hw/ppc/spapr_vio.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
@ -37,7 +36,7 @@ static void vty_receive(void *opaque, const uint8_t *buf, int size)
if ((dev->in == dev->out) && size) { if ((dev->in == dev->out) && size) {
/* toggle line to simulate edge interrupt */ /* toggle line to simulate edge interrupt */
qemu_irq_pulse(spapr_vio_qirq(&dev->sdev)); spapr_vio_irq_pulse(&dev->sdev);
} }
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (dev->in - dev->out >= VTERM_BUFSIZE) { if (dev->in - dev->out >= VTERM_BUFSIZE) {

3
hw/net/spapr_llan.c
View File

@ -27,7 +27,6 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "cpu.h" #include "cpu.h"
#include "hw/irq.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "net/net.h" #include "net/net.h"
@ -267,7 +266,7 @@ static ssize_t spapr_vlan_receive(NetClientState *nc, const uint8_t *buf,
} }
if (sdev->signal_state & 1) { if (sdev->signal_state & 1) {
qemu_irq_pulse(spapr_vio_qirq(sdev)); spapr_vio_irq_pulse(sdev);
} }
return size; return size;

3
hw/ppc/spapr_vio.c
View File

@ -23,7 +23,6 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "hw/irq.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "elf.h" #include "elf.h"
@ -294,7 +293,7 @@ int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq)
dev->crq.qnext = (dev->crq.qnext + 16) % dev->crq.qsize; dev->crq.qnext = (dev->crq.qnext + 16) % dev->crq.qsize;
if (dev->signal_state & 1) { if (dev->signal_state & 1) {
qemu_irq_pulse(spapr_vio_qirq(dev)); spapr_vio_irq_pulse(dev);
} }
return 0; return 0;

5
include/hw/ppc/spapr_vio.h
View File

@ -24,6 +24,7 @@
#include "hw/ppc/spapr.h" #include "hw/ppc/spapr.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"
#include "hw/irq.h"
#define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device" #define TYPE_VIO_SPAPR_DEVICE "vio-spapr-device"
#define VIO_SPAPR_DEVICE(obj) \ #define VIO_SPAPR_DEVICE(obj) \
@ -84,11 +85,11 @@ extern SpaprVioDevice *spapr_vio_find_by_reg(SpaprVioBus *bus, uint32_t reg);
void spapr_dt_vdevice(SpaprVioBus *bus, void *fdt); void spapr_dt_vdevice(SpaprVioBus *bus, void *fdt);
extern gchar *spapr_vio_stdout_path(SpaprVioBus *bus); extern gchar *spapr_vio_stdout_path(SpaprVioBus *bus);
static inline qemu_irq spapr_vio_qirq(SpaprVioDevice *dev) static inline void spapr_vio_irq_pulse(SpaprVioDevice *dev)
{ {
SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine()); SpaprMachineState *spapr = SPAPR_MACHINE(qdev_get_machine());
return spapr_qirq(spapr, dev->irq); qemu_irq_pulse(spapr_qirq(spapr, dev->irq));
} }
static inline bool spapr_vio_dma_valid(SpaprVioDevice *dev, uint64_t taddr, static inline bool spapr_vio_dma_valid(SpaprVioDevice *dev, uint64_t taddr,