← Back to branch summary

~ubuntu-branches/ubuntu/vivid/qemu/vivid

« back to all changes in this revision

Viewing changes to backends/baum.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-02-25 22:31:43 UTC
  • mfrom: (1.8.5)
  • Revision ID: package-import@ubuntu.com-20140225223143-odhqxfc60wxrjl15
Tags: 2.0.0~rc1+dfsg-0ubuntu1
https://launchpad.net/bugs/1294823
https://launchpad.net/bugs/1295072
* Merge 2.0.0-rc1
* debian/rules: consolidate ppc filter entries.
* Move qemu-system-arch64 into qemu-system-arm
* debian/patches/define-trusty-machine-type.patch: define a trusty machine
  type, currently the same as pc-i440fx-2.0, to put is in a better position
  to enable live migrations from trusty onward.  (LP: #1294823)
* debian/control: build-dep on libfdt >= 1.4.0  (LP: #1295072)
* Merge latest upstream git to commit dc9528f
* Debian/rules:
  - remove -enable-uname-release=2.6.32
  - don't make the aarch64 target Ubuntu-specific.
* Remove patches which are now upstream:
  - fix-smb-security-share.patch
  - slirp-smb-redirect-port-445-too.patch 
  - linux-user-Implement-sendmmsg-syscall.patch (better version is upstream)
  - signal-added-a-wrapper-for-sigprocmask-function.patch
  - ubuntu/signal-sigsegv-protection-on-do_sigprocmask.patch
  - ubuntu/Don-t-block-SIGSEGV-at-more-places.patch
  - ubuntu/ppc-force-cpu-threads-count-to-be-power-of-2.patch
* add link for /usr/share/qemu/bios-256k.bin
* Remove all linaro patches.
* Remove all arm64/ patches.  Many but not all are upstream.
* Remove CVE-2013-4377.patch which is upstream.
* debian/control-in: don't make qemu-system-aarch64 ubuntu-specific

Show diffs side-by-side

added added

removed removed

Lines of Context:
backends/baum.c
566
566
    BaumDriverState *baum;
567
567
    CharDriverState *chr;
568
568
    brlapi_handle_t *handle;
569
 
#ifdef CONFIG_SDL
 
569
#if defined(CONFIG_SDL)
 
570
#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)
570
571
    SDL_SysWMinfo info;
571
572
#endif
 
573
#endif
572
574
    int tty;
573
575
 
574
576
    baum = g_malloc0(sizeof(BaumDriverState));
595
597
        goto fail;
596
598
    }
597
599
 
598
 
#ifdef CONFIG_SDL
 
600
#if defined(CONFIG_SDL)
 
601
#if SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0)
599
602
    memset(&info, 0, sizeof(info));
600
603
    SDL_VERSION(&info.version);
601
604
    if (SDL_GetWMInfo(&info))
602
605
        tty = info.info.x11.wmwindow;
603
606
    else
604
607
#endif
 
608
#endif
605
609
        tty = BRLAPI_TTY_DEFAULT;
606
610
 
607
611
    if (brlapi__enterTtyMode(handle, tty, NULL) == -1) {