diff options
| author |   Alexander Graf <agraf@suse.de> | 2012-08-14 13:22:13 +0200 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2012-08-15 19:43:15 +0200 |
| commit | 3fc5acdeedfcea7c7d86040fa427ae785920b399 (patch) | |
| tree | 43fb1157dd3f3195aa678d51e59e5bf90eb14ffc | |
| parent | 8c57b867b5d18b0d916797dfbac465b8aaa5bf5a (diff) | |
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>
| -rw-r--r-- | hw/spapr.c | 5 | ||||
| -rw-r--r-- | hw/spapr.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/spapr.c b/hw/spapr.c index 709673e76..aa39d2d2c 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)) { diff --git a/hw/spapr.h b/hw/spapr.h index 9153f29a6..fe40e7d00 100644 --- a/hw/spapr.h +++ b/hw/spapr.h @@ -23,6 +23,7 @@ typedef struct sPAPREnvironment { int next_irq; int rtc_offset; char *cpu_model; + bool has_graphics; } sPAPREnvironment; #define H_SUCCESS 0 |