Skip to contentSkip to conversation

ui/cocoa: Include less of the generated modular QAPI headers

PATCH Superseded Markus Armbruster 3 participants 4 messages Dec 19, 2018

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Markus Armbruster

author
#0 lore raw

PATCH 1/1 ui/cocoa: Include less of the generated modular QAPI headers

Avoids pointless recompilation. Missed in commit 112ed241f5d.

Signed-off-by Markus Armbruster <[email protected]>

---
Untested; I don't have access to a Mac.

 ui/cocoa.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ui/cocoa.m +2 -1
index ecf12bfc2e..43e751693c 100644
@@ -32,7 +32,8 @@
 #include "ui/input.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
-#include "qapi/qapi-commands.h"
+#include "qapi/qapi-commands-block-core.h"
+#include "qapi/qapi-commands-misc.h"
 #include "sysemu/blockdev.h"
 #include "qemu-version.h"
 #include <Carbon/Carbon.h>
Signature · 1 line
2.17.2
#1 lore raw
Quoted 27 lines · Markus Armbruster

Avoids pointless recompilation. Missed in commit 112ed241f5d.

Signed-off-by Markus Armbruster <[email protected]>

---
Untested; I don't have access to a Mac.

 ui/cocoa.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ui/cocoa.m +2 -1
index ecf12bfc2e..43e751693c 100644
@@ -32,7 +32,8 @@
 #include "ui/input.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
-#include "qapi/qapi-commands.h"
+#include "qapi/qapi-commands-block-core.h"
+#include "qapi/qapi-commands-misc.h"
 #include "sysemu/blockdev.h"
 #include "qemu-version.h"
 #include <Carbon/Carbon.h>
Signature · 1 line
2.17.2

Hi Markus,

You should change change qapi/qapi-commands-block-core.h to qapi/qapi-commands-block.h to avoid:

ui/cocoa.m:1225:5: warning: implicit declaration of function 'qmp_eject' is invalid in C99 [-Wimplicit-function-declaration]
qmp_eject(true, [drive cStringUsingEncoding: NSASCIIStringEncoding],
^
ui/cocoa.m:1225:5: warning: this function declaration is not a prototype [-Wstrict-prototypes]

Thanks,
Roman

author
#2 lore raw
Quoted 34 lines · Roman Bolshakov
Quoted 27 lines · Markus Armbruster

Avoids pointless recompilation. Missed in commit 112ed241f5d.

Signed-off-by Markus Armbruster <[email protected]>

---
Untested; I don't have access to a Mac.

 ui/cocoa.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ui/cocoa.m +2 -1
index ecf12bfc2e..43e751693c 100644
@@ -32,7 +32,8 @@
 #include "ui/input.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
-#include "qapi/qapi-commands.h"
+#include "qapi/qapi-commands-block-core.h"
+#include "qapi/qapi-commands-misc.h"
 #include "sysemu/blockdev.h"
 #include "qemu-version.h"
 #include <Carbon/Carbon.h>
Signature · 1 line
2.17.2

Hi Markus,

You should change change qapi/qapi-commands-block-core.h to qapi/qapi-commands-block.h to avoid:

Quoted 7 lines

ui/cocoa.m:1225:5: warning: implicit declaration of function 'qmp_eject' is invalid in C99 [-Wimplicit-function-declaration]
qmp_eject(true, [drive cStringUsingEncoding: NSASCIIStringEncoding],
^
ui/cocoa.m:1225:5: warning: this function declaration is not a prototype [-Wstrict-prototypes]

Thanks,
Roman

Will do, thanks!

#3 lore raw
In reply to Markus Armbruster
Quoted 5 lines · Markus Armbruster

Avoids pointless recompilation. Missed in commit 112ed241f5d.

Signed-off-by Markus Armbruster <[email protected]>

---
Untested; I don't have access to a Mac.

You kinda do, open a GitHub account and enable Travis-CI (free for public projects), then pushing a branch to your GitHub will trigger a Travis build:

https://travis-ci.org/philmd/qemu/jobs/470146270#L3047

Quoted 19 lines
 ui/cocoa.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
ui/cocoa.m +2 -1
index ecf12bfc2e..43e751693c 100644
@@ -32,7 +32,8 @@
 #include "ui/input.h"
 #include "sysemu/sysemu.h"
 #include "qapi/error.h"
-#include "qapi/qapi-commands.h"
+#include "qapi/qapi-commands-block-core.h"
+#include "qapi/qapi-commands-misc.h"
 #include "sysemu/blockdev.h"
 #include "qemu-version.h"
 #include <Carbon/Carbon.h>