1. 11 6月, 2014 5 次提交
    • G
      gtk: cleanup backend dependencies · 0a337ed0
      Gerd Hoffmann 提交于
      Make configure detect gtk x11 backend and link libX11 then.  Make
      gtk backend specific code properly #ifdef'ed on the GTK_WINDOWING_*
      backends at runtime).  Our gtk ui code should build and run fine on
      any platform now.
      
      This also fixes the linker failute due to the new XkbGetKeyboard call
      added by commit 3158a348.
      
      Cc: Richard Henderson <rth@twiddle.net>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NDaniel P. Berrange <berrange@redhat.com>
      0a337ed0
    • G
      gtk: factor out keycode mapping · 932f2d7e
      Gerd Hoffmann 提交于
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      932f2d7e
    • P
      Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-06-10' into staging · b780bf8e
      Peter Maydell 提交于
      trivial patches for 2014-06-10
      
      # gpg: Signature made Tue 10 Jun 2014 17:07:19 BST using RSA key ID A4C3D7DB
      # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@debian.org>"
      # gpg: WARNING: This key is not certified with a trusted signature!
      # gpg:          There is no indication that the signature belongs to the owner.
      # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
      #      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB
      
      * remotes/mjt/tags/trivial-patches-2014-06-10: (25 commits)
        virtio.c: fix error message
        hw: vmware_vga: don't return cursorx when the driver asks for cursory register
        migration: Plug memory leak in migrate-set-cache-size command
        libcacard: Clean up dead stores before g_free()
        libcacard: Drop superfluous conditionals around g_free()
        cpu/x86: correctly set errors in x86_cpu_parse_featurestr
        smbios: use g_free directly on NULL pointers
        vdi: remove double conversion
        apb: Fix compiler warnings (large constants)
        hw/net/ne2000-isa: Register vmstate struct
        target-microblaze: Delete unused sign_extend() function
        hw/misc/milkymist-softusb: Remove unused softusb_{read, write}_pmem()
        target-i386/translate.c: Remove unused tcg_gen_lshift()
        hw/isa/pc87312: Remove unused function is_parallel_epp()
        hw/intc/openpic: Remove unused function IRQ_testbit()
        hw/dma/xilinx_axidma: Remove unused stream_halted() function
        util/qemu-sockets.c: Avoid unused variable warnings
        hw/sd/sd.c: Drop unused sd_acmd_type[] array
        hw/i386/pc.c: Remove unused parallel_io and parallel_irq variables
        slirp: Remove unused zero_ethaddr[] variable
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b780bf8e
    • M
      virtio.c: fix error message · 1a285899
      Michael Tokarev 提交于
      Suggested-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      1a285899
    • N
      hw: vmware_vga: don't return cursorx when the driver asks for cursory register · e2bb4ae7
      Nicolas Owens 提交于
      hello qemu-*@nongnu.org, this is my first contribution. apologies if
      something is incorrect.
      
      this patch fixes vmware_vga.c so that it actually returns the cursory
      register when asked for, instead of cursorx.
      Signed-off-by: NNicolas Owens <mischief@offblast.org>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      e2bb4ae7
  2. 10 6月, 2014 35 次提交