Skip to contentSkip to conversation

hw/boards: make it safe to include for linux-user

PATCH In review Michael S. Tsirkin 3 participants 6 messages Mar 10, 2015

lore
Share & tools
lore

Michael S. Tsirkin

author
#0 lore raw

PATCH 1/1 hw/boards: make it safe to include for linux-user

Make it safe to include hw/boards.h in exec.c
for linux-user configurations.
We don't need any of its contents though.

Signed-off-by Michael S. Tsirkin <[email protected]>

---

Already on my tree as Marcel's patches needed this.

 include/hw/boards.h | 4 ++++
 1 file changed, 4 insertions(+)
include/hw/boards.h +4 -0
index 1f21bdf..0bf00f7 100644
@@ -3,6 +3,8 @@
 #ifndef HW_BOARDS_H
 #define HW_BOARDS_H
 
+#if !defined(CONFIG_USER_ONLY)
+
 #include "qemu/typedefs.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"

@@ -154,3 +156,5 @@ struct MachineState {
 };
 
 #endif
+
+#endif
Signature · 1 line
MST
#1 lore raw

Am 10.03.2015 um 18:33 schrieb Michael S. Tsirkin:

Quoted 8 lines

Make it safe to include hw/boards.h in exec.c
for linux-user configurations.
We don't need any of its contents though.

Signed-off-by Michael S. Tsirkin <[email protected]>

---

Already on my tree as Marcel's patches needed this.

Why? Which patches?

Andreas

Quoted 24 lines
 include/hw/boards.h | 4 ++++
 1 file changed, 4 insertions(+)
include/hw/boards.h +4 -0
index 1f21bdf..0bf00f7 100644
@@ -3,6 +3,8 @@
 #ifndef HW_BOARDS_H
 #define HW_BOARDS_H
 
+#if !defined(CONFIG_USER_ONLY)
+
 #include "qemu/typedefs.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"

@@ -154,3 +156,5 @@ struct MachineState {
 };
 
 #endif
+
+#endif
Signature · 3 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)
author
#2 lore raw
Quoted 5 lines · Andreas Färber

Am 10.03.2015 um 18:33 schrieb Michael S. Tsirkin:

Quoted 4 lines

Make it safe to include hw/boards.h in exec.c
for linux-user configurations.
We don't need any of its contents though.

Quoted 8 lines
Quoted 4 lines
Signed-off-by Michael S. Tsirkin <[email protected]>

---

Already on my tree as Marcel's patches needed this.

Why? Which patches?

Andreas

This one:
machine: query dump-guest-core machine property rather than qemu opts

Quoted 30 lines
Quoted 24 lines
 include/hw/boards.h | 4 ++++
 1 file changed, 4 insertions(+)
include/hw/boards.h +4 -0
index 1f21bdf..0bf00f7 100644
@@ -3,6 +3,8 @@
 #ifndef HW_BOARDS_H
 #define HW_BOARDS_H
 
+#if !defined(CONFIG_USER_ONLY)
+
 #include "qemu/typedefs.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/accel.h"

@@ -154,3 +156,5 @@ struct MachineState {
 };
 
 #endif
+
+#endif
Signature · 3 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)
#3 lore raw

Am 10.03.2015 um 18:41 schrieb Michael S. Tsirkin:

Quoted 9 lines · Andreas Färber
Quoted 8 lines

Am 10.03.2015 um 18:33 schrieb Michael S. Tsirkin:

Quoted 7 lines

Make it safe to include hw/boards.h in exec.c
for linux-user configurations.
We don't need any of its contents though.

Signed-off-by Michael S. Tsirkin <[email protected]>

---

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Already on my tree as Marcel's patches needed this.

Why? Which patches?

Andreas

This one:
machine: query dump-guest-core machine property rather than qemu opts

Let's please find a better way to fix that. hw/boards.h shouldn't be used outside softmmu code.

Andreas

Signature · 3 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu,
Graham Norton; HRB 21284 (AG Nürnberg)
#4 lore raw
Quoted 14 lines · Andreas Färber

Am 10.03.2015 um 18:41 schrieb Michael S. Tsirkin:

Quoted 13 lines · Andreas Färber
Quoted 12 lines

Am 10.03.2015 um 18:33 schrieb Michael S. Tsirkin:

Quoted 8 lines

Make it safe to include hw/boards.h in exec.c
for linux-user configurations.
We don't need any of its contents though.

Signed-off-by Michael S. Tsirkin <[email protected]>

---

Already on my tree as Marcel's patches needed this.

Why? Which patches?

Quoted 7 lines
Quoted 4 lines
Quoted 1 line

Andreas

This one:
machine: query dump-guest-core machine property rather than qemu opts

Let's please find a better way to fix that. hw/boards.h shouldn't be used outside softmmu code.

Agreed.

-- PMM

author
#5 lore raw
Quoted 20 lines · Peter Maydell
Quoted 19 lines · Andreas Färber

Am 10.03.2015 um 18:41 schrieb Michael S. Tsirkin:

Quoted 17 lines · Andreas Färber
Quoted 5 lines

Am 10.03.2015 um 18:33 schrieb Michael S. Tsirkin:

Quoted 4 lines

Make it safe to include hw/boards.h in exec.c
for linux-user configurations.
We don't need any of its contents though.

Quoted 8 lines
Quoted 4 lines
Signed-off-by Michael S. Tsirkin <[email protected]>

---

Already on my tree as Marcel's patches needed this.

Why? Which patches?

Andreas

This one:
machine: query dump-guest-core machine property rather than qemu opts

Quoted 6 lines
Quoted 2 lines

Let's please find a better way to fix that. hw/boards.h shouldn't be used outside softmmu code.

Agreed.

-- PMM

What is prefered?

#ifndef USER
#include "hw/boards.h"
#endif

?