diff options
author | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 12:59:26 -0800 |
---|---|---|
committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-19 12:59:26 -0800 |
commit | 38dc74907e2b2ce2249b8b84eae1a1664b122835 (patch) | |
tree | 2ab9ec1eab6b6b696b3b6fa1d287eac5211eba79 /vl.c | |
parent | 7af31519e220efc0572cacec5ac65dc54e73985d (diff) | |
parent | 0478f37ce258438d74164dd182b0ae125f174ec6 (diff) | |
download | qemu-38dc74907e2b2ce2249b8b84eae1a1664b122835.zip qemu-38dc74907e2b2ce2249b8b84eae1a1664b122835.tar.gz qemu-38dc74907e2b2ce2249b8b84eae1a1664b122835.tar.bz2 |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Jan Krupa (4) and others
# Via Michael Tokarev
* mjt/trivial-patches:
hw/i386/Makefile.obj: use $(PYTHON) to run .py scripts consistently
configure: Use -B switch only for Python versions which support it
qga: Fix shutdown command of guest agent to work with SysV
console: Remove unused debug code
qga: Fix compilation for old versions of MinGW
.travis.yml: basic compile and check recipes
pci-assign: Fix error_report of pci-stub message
qapi: Fix comment for create-type to match code.
vl: fix build when configured with no graphic support
usb: drop unused USBNetState.inpkt field
qemu-char: add missing characters used in keymaps
qemu-char: add support for U-prefixed symbols
qemu-char: add Czech keymap file
qemu-char: add Czech characters to VNC keysyms
Message-id: 1384684850-6777-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -4270,6 +4270,7 @@ int main(int argc, char **argv, char **envp) /* init local displays */ switch (display_type) { case DT_NOGRAPHIC: + (void)ds; /* avoid warning if no display is configured */ break; #if defined(CONFIG_CURSES) case DT_CURSES: |