[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/24] PPC: spapr: Remove global variable
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 13/24] PPC: spapr: Remove global variable |
Date: |
Wed, 15 Aug 2012 11:58:51 +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 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)) {
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
- [Qemu-devel] [PATCH 02/24] pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt, (continued)
- [Qemu-devel] [PATCH 02/24] pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 04/24] PPC: e500: change internal references away from mpc8544ds, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 01/24] pseries pci: removed redundant busdev, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 05/24] PPC: e500: split mpc8544ds machine from generic e500 code, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 06/24] PPC: e500: add generic e500 platform, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 07/24] ppc: Fix bug in handling of PAPR hypercall exits, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 08/24] Revert "PPC: e500: Use new MPIC dt format", Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 11/24] xbzrle: fix compilation on ppc32, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 09/24] Add one new file vga-pci.h and cleanup on all platforms, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 13/24] PPC: spapr: Remove global variable,
Alexander Graf <=
- [Qemu-devel] [PATCH 10/24] spapr: Add support for -vga option, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 12/24] PPC: spapr: Rework VGA select logic, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 15/24] pseries: Remove extraneous prints, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 19/24] pseries: Export find_phb() utility function for PCI code, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 17/24] pseries: Separate PCI RTAS setup from common from emulation specific PCI setup, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 16/24] pseries: Rework irq assignment to avoid carrying qemu_irqs around, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 22/24] pseries dma: DMA window params added to PHB and DT population changed, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 20/24] pseries: Add trace event for PCI irqs, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 23/24] pseries: Update SLOF firmware image, Alexander Graf, 2012/08/15
- [Qemu-devel] [PATCH 24/24] openpic: Added BRR1 register, Alexander Graf, 2012/08/15