[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] PPC: spapr: Remove global variable
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH] PPC: spapr: Remove global variable |
Date: |
Tue, 14 Aug 2012 13:22:45 +0200 |
Global variables are bad. Let's move spapr_has_graphics into the
machine state struct.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/spapr.c | 5 ++---
hw/spapr.h | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/spapr.c b/hw/spapr.c
index 31c4e53..b3d14c3 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);
}
@@ -737,7 +736,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 9153f29..fe40e7d 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
--
1.6.0.2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [PATCH] PPC: spapr: Remove global variable,
Alexander Graf <=