OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

openpic: move KVM-specific declarations into separate openpic_kvm.h file

Browse Source 
This is needed before the next patch because the target-dependent kvm stub
uses the existing kvm_openpic_connect_vcpu() declaration, making it impossible
to move the device-specific declarations into the same file without breaking
ppc-linux-user compilation.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Mark Cave-Ayland 2018-02-28 20:32:39 +00:00 committed by David Gibson
parent 017812df5d
commit 8d085cf03b
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/intc/openpic_kvm.c
View File

@ -30,6 +30,7 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/ppc/openpic.h" #include "hw/ppc/openpic.h"
#include "hw/ppc/openpic_kvm.h"
#include "hw/pci/msi.h" #include "hw/pci/msi.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"

1
hw/ppc/e500.c
View File

@ -29,6 +29,7 @@
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "sysemu/device_tree.h" #include "sysemu/device_tree.h"
#include "hw/ppc/openpic.h" #include "hw/ppc/openpic.h"
#include "hw/ppc/openpic_kvm.h"
#include "hw/ppc/ppc.h" #include "hw/ppc/ppc.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "elf.h" #include "elf.h"

3
include/hw/ppc/openpic.h
View File

@ -28,7 +28,4 @@ enum {
#define OPENPIC_MAX_IRQ (OPENPIC_MAX_SRC + OPENPIC_MAX_IPI + \ #define OPENPIC_MAX_IRQ (OPENPIC_MAX_SRC + OPENPIC_MAX_IPI + \
OPENPIC_MAX_TMR) OPENPIC_MAX_TMR)
#define TYPE_KVM_OPENPIC "kvm-openpic"
int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs);
#endif /* OPENPIC_H */ #endif /* OPENPIC_H */

7
include/hw/ppc/openpic_kvm.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef OPENPIC_KVM_H
#define OPENPIC_KVM_H
#define TYPE_KVM_OPENPIC "kvm-openpic"
int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs);
#endif /* OPENPIC_KVM_H */

2
target/ppc/kvm-stub.c
View File

@ -12,7 +12,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "cpu.h" #include "cpu.h"
#include "hw/ppc/openpic.h" #include "hw/ppc/openpic_kvm.h"
int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs) int kvm_openpic_connect_vcpu(DeviceState *d, CPUState *cs)
{ {