proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-08 01:52:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PPC: spapr: Remove global variable

Browse Source 
Global variables are bad. Let's move spapr_has_graphics into the
machine state struct.

Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexander Graf 2012-08-14 13:22:13 +02:00
parent 8c57b867b5
commit 3fc5acdeed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/spapr.c
View File

@ -83,7 +83,6 @@
#define PHANDLE_XICP 0x00001111 #define PHANDLE_XICP 0x00001111
sPAPREnvironment *spapr; sPAPREnvironment *spapr;
bool spapr_has_graphics;
qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num, qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num,
enum xics_irq_type type) 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); spapr_populate_chosen_stdout(fdt, spapr->vio_bus);
} }
@ -736,7 +735,7 @@ static void ppc_spapr_init(ram_addr_t ram_size,
/* Graphics */ /* Graphics */
if (spapr_vga_init(QLIST_FIRST(&spapr->phbs)->host_state.bus)) { 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)) { if (rma_size < (MIN_RMA_SLOF << 20)) {

1
hw/spapr.h
View File

@ -23,6 +23,7 @@ typedef struct sPAPREnvironment {
int next_irq; int next_irq;
int rtc_offset; int rtc_offset;
char *cpu_model; char *cpu_model;
bool has_graphics;
} sPAPREnvironment; } sPAPREnvironment;
#define H_SUCCESS 0 #define H_SUCCESS 0