| Message ID | 20181219091248.9641-1-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | ui/cocoa: Include less of the generated modular QAPI headers | expand |
On Wed, Dec 19, 2018 at 10:12:48AM +0100, Markus Armbruster wrote: > Avoids pointless recompilation. Missed in commit 112ed241f5d. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > Untested; I don't have access to a Mac. > > ui/cocoa.m | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/ui/cocoa.m b/ui/cocoa.m > index ecf12bfc2e..43e751693c 100644 > --- a/ui/cocoa.m > +++ b/ui/cocoa.m > @@ -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> > -- > 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
Roman Bolshakov <r.bolshakov@yadro.com> writes: > On Wed, Dec 19, 2018 at 10:12:48AM +0100, Markus Armbruster wrote: >> Avoids pointless recompilation. Missed in commit 112ed241f5d. >> >> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> --- >> Untested; I don't have access to a Mac. >> >> ui/cocoa.m | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/ui/cocoa.m b/ui/cocoa.m >> index ecf12bfc2e..43e751693c 100644 >> --- a/ui/cocoa.m >> +++ b/ui/cocoa.m >> @@ -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> >> -- >> 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 Will do, thanks!
On 12/19/18 10:12 AM, Markus Armbruster wrote: > Avoids pointless recompilation. Missed in commit 112ed241f5d. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > 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 > > ui/cocoa.m | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/ui/cocoa.m b/ui/cocoa.m > index ecf12bfc2e..43e751693c 100644 > --- a/ui/cocoa.m > +++ b/ui/cocoa.m > @@ -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> >
diff --git a/ui/cocoa.m b/ui/cocoa.m index ecf12bfc2e..43e751693c 100644 --- a/ui/cocoa.m +++ b/ui/cocoa.m @@ -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>
Avoids pointless recompilation. Missed in commit 112ed241f5d. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- Untested; I don't have access to a Mac. ui/cocoa.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)