[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/12] milkymist: Move DT_NOGRAPHIC check outside mi
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 08/12] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create() |
Date: |
Wed, 11 Nov 2015 17:09:12 -0200 |
DT_NOGRAPHIC handling will be moved to a MachineState field, and
it will be easier to change milkymist_init() to check that field.
Cc: Michael Walle <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/lm32/milkymist-hw.h | 4 ----
hw/lm32/milkymist.c | 4 +++-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/lm32/milkymist-hw.h b/hw/lm32/milkymist-hw.h
index c8dfb4d..f857d28 100644
--- a/hw/lm32/milkymist-hw.h
+++ b/hw/lm32/milkymist-hw.h
@@ -108,10 +108,6 @@ static inline DeviceState *milkymist_tmu2_create(hwaddr
base,
int nelements;
int ver_major, ver_minor;
- if (display_type == DT_NOGRAPHIC) {
- return NULL;
- }
-
/* check that GLX will work */
d = XOpenDisplay(NULL);
if (d == NULL) {
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index 13976b3..e46283a 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -163,7 +163,9 @@ milkymist_init(MachineState *machine)
milkymist_memcard_create(0x60004000);
milkymist_ac97_create(0x60005000, irq[4], irq[5], irq[6], irq[7]);
milkymist_pfpu_create(0x60006000, irq[8]);
- milkymist_tmu2_create(0x60007000, irq[9]);
+ if (display_type != DT_NOGRAPHIC) {
+ milkymist_tmu2_create(0x60007000, irq[9]);
+ }
milkymist_minimac2_create(0x60008000, 0x30000000, irq[10], irq[11]);
milkymist_softusb_create(0x6000f000, irq[15],
0x20000000, 0x1000, 0x20020000, 0x2000);
--
2.1.0
- [Qemu-devel] [PATCH 07/12] stubs: spice initialization stubs, (continued)
- [Qemu-devel] [PATCH 07/12] stubs: spice initialization stubs, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 05/12] stubs: cocoa_display_init() stub, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 09/12] vl: Replace DT_NOGRAPHIC with MachineState field, Eduardo Habkost, 2015/11/11
- Re: [Qemu-devel] [PATCH 09/12] vl: Replace DT_NOGRAPHIC with MachineState field, Peter Maydell, 2015/11/13
- Re: [Qemu-devel] [PATCH 09/12] vl: Replace DT_NOGRAPHIC with MachineState field, Paolo Bonzini, 2015/11/13
- Re: [Qemu-devel] [PATCH 09/12] vl: Replace DT_NOGRAPHIC with MachineState field, Eduardo Habkost, 2015/11/13
[Qemu-devel] [PATCH 08/12] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create(),
Eduardo Habkost <=
[Qemu-devel] [PATCH 11/12] vl: Move DisplayType typedef to vl.c, Eduardo Habkost, 2015/11/11
[Qemu-devel] [PATCH 10/12] vl: Make display_type a local variable, Eduardo Habkost, 2015/11/11
[Qemu-devel] [PATCH 12/12] vl: Make display_remote a local variable, Eduardo Habkost, 2015/11/11
Re: [Qemu-devel] [PATCH 00/12] vl: graphics stubs + #ifdef cleanup, eliminate some global vars, Paolo Bonzini, 2015/11/12