From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel@redhat.com>,
qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 15/21] vl: Move DisplayType typedef to vl.c
Date: Fri, 20 May 2016 17:28:35 -0300 [thread overview]
Message-ID: <1463776121-13529-16-git-send-email-ehabkost@redhat.com> (raw)
In-Reply-To: <1463776121-13529-1-git-send-email-ehabkost@redhat.com>
Now the type is only used inside vl.c and doesn't need to be in a
header file.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/sysemu/sysemu.h | 10 ----------
vl.c | 9 +++++++++
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 7e9f93e..618169c 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -131,16 +131,6 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name,
int qemu_loadvm_state(QEMUFile *f);
-typedef enum DisplayType
-{
- DT_DEFAULT,
- DT_CURSES,
- DT_SDL,
- DT_COCOA,
- DT_GTK,
- DT_NONE,
-} DisplayType;
-
extern int autostart;
typedef enum {
diff --git a/vl.c b/vl.c
index 0d10ceb..aaf9134 100644
--- a/vl.c
+++ b/vl.c
@@ -2077,6 +2077,15 @@ static void select_vgahw(const char *p)
}
}
+typedef enum DisplayType {
+ DT_DEFAULT,
+ DT_CURSES,
+ DT_SDL,
+ DT_COCOA,
+ DT_GTK,
+ DT_NONE,
+} DisplayType;
+
static DisplayType select_display(const char *p)
{
const char *opts;
--
2.5.5
next prev parent reply other threads:[~2016-05-20 22:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-20 20:28 [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20 Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 01/21] pc-dimm: correct comment of MemoryHotplugState Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 02/21] vl: Use exit(1) when requested VGA interface is unavailable Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw() Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 05/21] vl: Add DT_COCOA DisplayType value Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 06/21] vnc: Initialization stubs Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 08/21] sdl: Initialization stubs Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 10/21] gtk: Initialization stubs Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 11/21] spice: Initialization stubs on qemu-spice.h Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 12/21] milkymist: Move DT_NOGRAPHIC check outside milkymist_tmu2_create() Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 13/21] vl: Replace DT_NOGRAPHIC with machine option Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 14/21] vl: Make display_type a local variable Eduardo Habkost
2016-05-20 20:28 ` Eduardo Habkost [this message]
2016-05-20 20:28 ` [Qemu-devel] [PULL 16/21] vl: Make display_remote " Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 17/21] vl: Simplify global property registration Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 18/21] machine: add properties to compat_props incrementaly Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 20/21] vl: Use &error_fatal when parsing monitor options Eduardo Habkost
2016-05-20 20:28 ` [Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd} Eduardo Habkost
2016-05-23 10:27 ` [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463776121-13529-16-git-send-email-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).