ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/ppc: include fdt helper routine in a common file 

spapr_pci would also be a good candidate but the macro _FDT is
slightly different. It returns and does not exit.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Cédric Le Goater 2016-07-25 16:24:41 +02:00 committed by David Gibson
parent 1b1746a436
commit 7804c353a9
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ppc/spapr.c
View File

@ -47,6 +47,7 @@
#include "hw/ppc/ppc.h" #include "hw/ppc/ppc.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "hw/ppc/fdt.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/pci-host/spapr.h" #include "hw/pci-host/spapr.h"
@ -299,16 +300,6 @@ static hwaddr spapr_node0_size(void)
return machine->ram_size; return machine->ram_size;
} }
#define _FDT(exp) \
do { \
int ret = (exp); \
if (ret < 0) { \
fprintf(stderr, "qemu: error creating device tree: %s: %s\n", \
#exp, fdt_strerror(ret)); \
exit(1); \
} \
} while (0)
static void add_str(GString *s, const gchar *s1) static void add_str(GString *s, const gchar *s1)
{ {
g_string_append_len(s, s1, strlen(s1) + 1); g_string_append_len(s, s1, strlen(s1) + 1);

11
hw/ppc/spapr_events.c
View File

@ -32,6 +32,7 @@
#include "hw/qdev.h" #include "hw/qdev.h"
#include "sysemu/device_tree.h" #include "sysemu/device_tree.h"
#include "hw/ppc/fdt.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/pci/pci.h" #include "hw/pci/pci.h"
@ -210,16 +211,6 @@ struct hp_log_full {
#define EVENT_MASK_HOTPLUG 0x10000000 #define EVENT_MASK_HOTPLUG 0x10000000
#define EVENT_MASK_IO 0x08000000 #define EVENT_MASK_IO 0x08000000
#define _FDT(exp) \
do { \
int ret = (exp); \
if (ret < 0) { \
fprintf(stderr, "qemu: error creating device tree: %s: %s\n", \
#exp, fdt_strerror(ret)); \
exit(1); \
} \
} while (0)
void spapr_events_fdt_skel(void *fdt, uint32_t check_exception_irq) void spapr_events_fdt_skel(void *fdt, uint32_t check_exception_irq)
{ {
uint32_t irq_ranges[] = {cpu_to_be32(check_exception_irq), cpu_to_be32(1)}; uint32_t irq_ranges[] = {cpu_to_be32(check_exception_irq), cpu_to_be32(1)};

23
include/hw/ppc/fdt.h Normal file
View File

@ -0,0 +1,23 @@
/*
* QEMU PowerPC helper routines for the device tree.
*
* Copyright (C) 2016 IBM Corp.
*
* This code is licensed under the GPL version 2 or later. See the
* COPYING file in the top-level directory.
*/
#ifndef PPC_FDT_H
#define PPC_FDT_H
#define _FDT(exp) \
do { \
int ret = (exp); \
if (ret < 0) { \
fprintf(stderr, "qemu: error creating device tree: %s: %s\n", \
#exp, fdt_strerror(ret)); \
exit(1); \
} \
} while (0)
#endif /* PPC_FDT_H */