1. 01 5月, 2014 3 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-6' into staging · 051b9980
      Peter Maydell 提交于
      gtk: collection of fixes and cleanups by Cole Robinson
      
      # gpg: Signature made Tue 29 Apr 2014 10:44:44 BST using RSA key ID D3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      
      * remotes/kraxel/tags/pull-gtk-6:
        gtk: Fix accelerators being triggered twice with gtk3
        gtk: Fix -serial vc
        gtk: Use ctrl+alt+q for quit accelerator
        gtk: Remove use of deprecated stock items
        gtk: Don't use deprecated vte_terminal_get_adjustment
        gtk: Don't use deprecated gtk_image_menu_item_new_with_mnemonic
        configure: Re-run make if gtkabi/sdlabi is changed
        configure: Document --with-gtkabi
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      051b9980
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-2' into staging · 52b08670
      Peter Maydell 提交于
      sdl2: mouse wheel support, ui config notify
      
      # gpg: Signature made Tue 29 Apr 2014 11:17:01 BST using RSA key ID D3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      
      * remotes/kraxel/tags/pull-sdl-2:
        sdl2: Support mouse wheel
        sdl2: add ui info setting.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      52b08670
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-4' into staging · 61e5b75c
      Peter Maydell 提交于
      hda-audio: fix non-mixer codecs
      
      # gpg: Signature made Tue 29 Apr 2014 10:03:44 BST using RSA key ID D3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      
      * remotes/kraxel/tags/pull-audio-4:
        hda-audio: fix non-mixer codecs
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      61e5b75c
  2. 29 4月, 2014 25 次提交
  3. 28 4月, 2014 12 次提交
    • P
      Merge remote-tracking branch 'remotes/otubo/seccomp' into staging · e2da502c
      Peter Maydell 提交于
      * remotes/otubo/seccomp:
        seccomp: add shmctl(), mlock(), and munlock() to the syscall whitelist
        seccomp: add timerfd_create and timerfd_settime to the whitelist
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e2da502c
    • P
      Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-04-28' into staging · 93156cef
      Peter Maydell 提交于
      trivial patches for 2014-04-28
      
      # gpg: Signature made Mon 28 Apr 2014 05:56:01 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-04-28:
        slirp/smb: Move ncalrpc directory to tmp
        po: add proper Language: tags to .po files
        po/Makefile: fix $SRC_PATH reference
        init_paths: fix minor memory leak
        virtfs-proxy-helper: fix call to accept
        net/net.c: remove unnecessary semicolon
        Add QEMU logo (SVG file)
        vl: avoid closing stdout with 'writeconfig'
        xilinx: Fix typo in comment (Marvel -> Marvell)
        vl: Eliminate a superfluous local variable
        vl: Remove useless 'continue'
        gitignore: cleanups #2
        tests/.gitignore: Ignore test-rfifolock
        move test-* from .gitignore to tests/.gitignore
        configure: Improve help behavior
        vl: convert -m to QemuOpts
        qemu-option: introduce qemu_find_opts_singleton
        misc: Use cpu_physical_memory_read and cpu_physical_memory_write
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      93156cef
    • P
      Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging · 13de54ee
      Peter Maydell 提交于
      * remotes/qmp-unstable/queue/qmp:
        monitor: fix qmp_getfd() fd leak in error case
        HMP: support specifying dump format for dump-guest-memory
        HMP: fix doc of dump-guest-memory
        qmp: object-add: Validate class before creating object
        monitor: Add device_add and device_del completion.
        monitor: Add command_completion callback to mon_cmd_t.
        monitor: Fix drive_del id argument type completion.
        error: Remove some unused headers
        qerror.h: Replace QERR_NOT_SUPPORTED with QERR_UNSUPPORTED
        qerror.h: Remove QERR defines that are only used once
        qerror.h: Remove unused error classes
        error: Print error_report() to stderr if using qmp
        monitor: Remove unused monitor_print_filename
        error: Privatize error_print_loc
        vnc: Remove default_mon usage
        slirp: Remove default_mon usage
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      13de54ee
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · a41b2c99
      Peter Maydell 提交于
      Block pull request
      
      # gpg: Signature made Fri 25 Apr 2014 17:05:13 BST using RSA key ID 81AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      
      * remotes/stefanha/tags/block-pull-request:
        iscsi: Don't use error_is_set() to suppress additional errors
        blockdev: Clean up fragile use of error_is_set()
        nbd: Use return values instead of error_is_set(errp)
        qemu-img: Consistently name Error * objects err, and not errp
        Use error_is_set() only when necessary (again)
        block: Expose host_* drivers in blockdev-add
        MAINTAINERS: Add qemu-img/io to block subsystem
        qemu-iotests: Improve and make use of QMPTestCase.wait_until_completed()
        doc: add -drive rerror=,werror= to qemu --help output
        block: Prevent coroutine stack overflow when recursing in bdrv_open_backing_file.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a41b2c99
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging · d09a18d4
      Peter Maydell 提交于
      Net patches
      
      # gpg: Signature made Fri 25 Apr 2014 15:07:31 BST using RSA key ID 81AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      
      * remotes/stefanha/tags/net-pull-request:
        net: Don't use error_is_set() to suppress additional errors
        net: Make qmp_query_rx_filter() with name argument more obvious
        net: xilinx_axienet.c: Add phy soft reset bit clearing
        net/net.c: Remove unnecessary semicolon
        pcnet: remove duplicate assignment
        tap: Avoid extra iterations while closing file fd
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d09a18d4
    • P
      Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140425' into staging · 4a39cbb0
      Peter Maydell 提交于
      Some s390x patches:
      
      - gdb stubs to make it compile if gdb support is pulled in
      - linux-headers update for new oneregs
      - two onereg enhancements
      
      # gpg: Signature made Fri 25 Apr 2014 12:42:46 BST using RSA key ID C6F02FAF
      # gpg: Can't check signature: public key not found
      
      * remotes/cohuck/tags/s390x-20140425:
        s390x/kvm: sync gbea and pp register
        s390x/kvm: rework KVM synchronize to tracing for some ONEREGS
        linux-headers update
        s390x: empty function stubs in preparation for __KVM_HAVE_GUEST_DEBUG
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4a39cbb0
    • M
      slirp/smb: Move ncalrpc directory to tmp · b87b8a8b
      Michael Buesch 提交于
      The smbd forked by qemu still uses the default ncalrpc directory
      in /var/run/samba. This may lead to problems, if /var/run/samba
      does not exist (for example if /var/run is a tmpfs and the host
      smbd was not started).
      
      This leads to the following error message from samba
      and an unworkable smbd:
      	Failed to create pipe directory /var/run/samba/ncalrpc - No such file or directory
      
      Fix this by pointing smbd to /tmp/qemu-smb.%d.%d/ncalrpc as ncalrpc directory.
      Smbd will create the actual ncalrpc subdirectory on its own.
      Signed-off-by: NMichael Buesch <m@bues.ch>
      Cc: Jan Kiszka <jan.kiszka@siemens.com>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      (Applying this to -trivial because it _is_ rather trivial
       and because Jan does not reply for months)
      b87b8a8b
    • M
      po: add proper Language: tags to .po files · 7a308421
      Michael Tokarev 提交于
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      7a308421
    • M
      po/Makefile: fix $SRC_PATH reference · b920cad6
      Michael Tokarev 提交于
      The rule for messages.po appears to be slightly wrong.
      Move the `cd' command within parens.
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      Tested-by: NStefan Weil <sw@weilnetz.de>
      b920cad6
    • K
      init_paths: fix minor memory leak · 00a9caca
      Kirill Batuzov 提交于
      Fields "name" (created with strdup in new_entry) and "pathname"
      (created with g_strdup_printf in new_entry) of pathelem struct should
      be freed before the whole struct is.
      Signed-off-by: NKirill Batuzov <batuzovk@ispras.ru>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      00a9caca
    • T
      virtfs-proxy-helper: fix call to accept · b0f9300c
      Tim Comer 提交于
      The current code calls accept() without initializing the size parameter
      which means the accept call might write too much to the stack.
      
      URL: https://bugs.gentoo.org/486714Signed-off-by: NTim Comer <comer0@gmail.com>
      Signed-off-by: NMike Frysinger <vapier@gentoo.org>
      Reviewed-by: NPaolo Bonzini <pbonzini@redhat.com>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      b0f9300c
    • I
      net/net.c: remove unnecessary semicolon · 9057698d
      Igor Ryzhov 提交于
      Signed-off-by: NIgor Ryzhov <iryzhov@arccn.ru>
      Reviewed-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      9057698d