aboutsummaryrefslogtreecommitdiff
path: root/hw/spapr.c
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-08-14 13:22:13 +0200
committerAlexander Graf <agraf@suse.de>2012-08-15 19:43:15 +0200
commit3fc5acdeedfcea7c7d86040fa427ae785920b399 (patch)
tree43fb1157dd3f3195aa678d51e59e5bf90eb14ffc /hw/spapr.c
parent8c57b867b5d18b0d916797dfbac465b8aaa5bf5a (diff)
downloadqemu-3fc5acdeedfcea7c7d86040fa427ae785920b399.zip
qemu-3fc5acdeedfcea7c7d86040fa427ae785920b399.tar.gz
qemu-3fc5acdeedfcea7c7d86040fa427ae785920b399.tar.bz2
PPC: spapr: Remove global variable
Global variables are bad. Let's move spapr_has_graphics into the machine state struct. Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/spapr.c')
-rw-r--r--hw/spapr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/spapr.c b/hw/spapr.c
index 709673e..aa39d2d 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -83,7 +83,6 @@
#define PHANDLE_XICP 0x00001111
sPAPREnvironment *spapr;
-bool spapr_has_graphics;
qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num,
enum xics_irq_type type)
@@ -508,7 +507,7 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr,
}
}
- if (!spapr_has_graphics) {
+ if (!spapr->has_graphics) {
spapr_populate_chosen_stdout(fdt, spapr->vio_bus);
}
@@ -736,7 +735,7 @@ static void ppc_spapr_init(ram_addr_t ram_size,
/* Graphics */
if (spapr_vga_init(QLIST_FIRST(&spapr->phbs)->host_state.bus)) {
- spapr_has_graphics = true;
+ spapr->has_graphics = true;
}
if (rma_size < (MIN_RMA_SLOF << 20)) {