Am 16.06.2013 20:32, schrieb Andreas Färber:
> Signed-off-by: Andreas Färber <afaer...@suse.de>
> ---
> default-configs/ppcemb-softmmu.mak | 1 +
> hw/intc/openpic_kvm.c | 50
> +++++++++++++++++++++++---------------
> hw/ppc/e500.c | 2 +-
> include/hw/ppc/openpic.h | 1 +
> 4 files changed, 34 insertions(+), 20 deletions(-)
>
> diff --git a/default-configs/ppcemb-softmmu.mak
> b/default-configs/ppcemb-softmmu.mak
> index be93e03..97be9f6 100644
> --- a/default-configs/ppcemb-softmmu.mak
> +++ b/default-configs/ppcemb-softmmu.mak
> @@ -38,5 +38,6 @@ CONFIG_XILINX=y
> CONFIG_XILINX_ETHLITE=y
> CONFIG_OPENPIC=y
> CONFIG_E500=$(CONFIG_FDT)
> +CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
> # For PReP
> CONFIG_MC146818RTC=y
> diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
> index 17d0a35..8818b5d 100644
> --- a/hw/intc/openpic_kvm.c
> +++ b/hw/intc/openpic_kvm.c
> @@ -31,8 +31,14 @@
> #include "sysemu/kvm.h"
> #include "qemu/log.h"
>
> +#define KVM_OPENPIC(obj) \
> + OBJECT_CHECK(KVMOpenPICState, (obj), TYPE_KVM_OPENPIC)
> +
> typedef struct KVMOpenPICState {
> + /*< private >*/
> SysBusDevice busdev;
Missed the field name, hiding another occurrence of FROM_SYSBUS() in
kvm_openpic_connect_vcpu(). v2 sent.
Andreas
> + /*< public >*/
> +
> MemoryRegion mem;
> MemoryListener mem_listener;
> uint32_t fd;
[snip]
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
