| Message ID | 1447354938-1575-6-git-send-email-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 12 November 2015 at 19:02, Eduardo Habkost <ehabkost@redhat.com> wrote: > One less #ifdef in vl.c. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > Changes v1 -> v2: > * Move stub file to stubs/ui/ > --- > stubs/ui/Makefile.objs | 1 + > stubs/ui/cocoa.c | 10 ++++++++++ > vl.c | 2 -- > 3 files changed, 11 insertions(+), 2 deletions(-) > create mode 100644 stubs/ui/cocoa.c > > diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs > index 2e4c924..ce9a0ce 100644 > --- a/stubs/ui/Makefile.objs > +++ b/stubs/ui/Makefile.objs > @@ -1,3 +1,4 @@ > stub-obj-y += vnc.o > stub-obj-y += curses.o > stub-obj-y += sdl.o > +stub-obj-y += cocoa.o > diff --git a/stubs/ui/cocoa.c b/stubs/ui/cocoa.c > new file mode 100644 > index 0000000..ef07a8a > --- /dev/null > +++ b/stubs/ui/cocoa.c > @@ -0,0 +1,10 @@ > +#include "qemu-common.h" > +#include "ui/console.h" > +#include "qemu/error-report.h" > + > +void cocoa_display_init(DisplayState *ds, int full_screen) > +{ > + /* This must never be called if CONFIG_COCA is disabled */ "CONFIG_COCOA". thanks -- PMM
On Tue, Nov 17, 2015 at 02:45:17PM +0000, Peter Maydell wrote: > On 12 November 2015 at 19:02, Eduardo Habkost <ehabkost@redhat.com> wrote: [...] > > +void cocoa_display_init(DisplayState *ds, int full_screen) > > +{ > > + /* This must never be called if CONFIG_COCA is disabled */ > > "CONFIG_COCOA". Will be fixed in next version. Thanks!
diff --git a/stubs/ui/Makefile.objs b/stubs/ui/Makefile.objs index 2e4c924..ce9a0ce 100644 --- a/stubs/ui/Makefile.objs +++ b/stubs/ui/Makefile.objs @@ -1,3 +1,4 @@ stub-obj-y += vnc.o stub-obj-y += curses.o stub-obj-y += sdl.o +stub-obj-y += cocoa.o diff --git a/stubs/ui/cocoa.c b/stubs/ui/cocoa.c new file mode 100644 index 0000000..ef07a8a --- /dev/null +++ b/stubs/ui/cocoa.c @@ -0,0 +1,10 @@ +#include "qemu-common.h" +#include "ui/console.h" +#include "qemu/error-report.h" + +void cocoa_display_init(DisplayState *ds, int full_screen) +{ + /* This must never be called if CONFIG_COCA is disabled */ + error_report("Cocoa support is disabled"); + abort(); +} diff --git a/vl.c b/vl.c index 5292648..ea83e17 100644 --- a/vl.c +++ b/vl.c @@ -4573,11 +4573,9 @@ int main(int argc, char **argv, char **envp) case DT_SDL: sdl_display_init(ds, full_screen, no_frame); break; -#if defined(CONFIG_COCOA) case DT_COCOA: cocoa_display_init(ds, full_screen); break; -#endif #if defined(CONFIG_GTK) case DT_GTK: gtk_display_init(ds, full_screen, grab_on_hover);
One less #ifdef in vl.c. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Changes v1 -> v2: * Move stub file to stubs/ui/ --- stubs/ui/Makefile.objs | 1 + stubs/ui/cocoa.c | 10 ++++++++++ vl.c | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 stubs/ui/cocoa.c