1. 02 11月, 2016 4 次提交
  2. 31 10月, 2016 19 次提交
  3. 29 10月, 2016 2 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20161028-1' into staging · 5b2ecaba
      Peter Maydell 提交于
      braille fixes and improvements.
      curses fix, switch to cursesw.
      gtk bugfixes.
      
      # gpg: Signature made Fri 28 Oct 2016 13:05:12 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # 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>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-ui-20161028-1:
        curses: Use cursesw instead of curses
        curses: fix left/right arrow translation
        ui/gtk: Fix non-working DELETE key
        gtk: fix compilation warning with gtk 3.22.2
        Defer BrlAPI tty acquisition to when guest starts using device
        Add dots keypresses support to the baum braille device
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5b2ecaba
    • P
      Merge remote-tracking branch 'remotes/vivier/tags/m68k-part2-pull-request' into staging · eb540e2c
      Peter Maydell 提交于
      # gpg: Signature made Fri 28 Oct 2016 09:44:23 BST
      # gpg:                using RSA key 0xF30C38BD3F2FBE3C
      # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
      # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
      # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier/tags/m68k-part2-pull-request:
        MAINTAINERS: update M68K entry
        target-m68k: immediate ops manage word and byte operands
        target-m68k: cmp manages word and bytes operands
        target-m68k: add/sub manage word and byte operands
        target-m68k: add addressing modes to neg
        target-m68k: introduce byte and word cc_ops
        target-m68k: some bit ops cleanup
        target-m68k: suba/adda can manage word operand
        target-m68k: and can manage word and byte operands
        target-m68k: or can manage word and byte operands
        target-m68k: eor can manage word and byte operands
        target-m68k: add addressing modes to not
        target-m68k: Inline addx, subx, negx
        target-m68k: add dbcc
        target-m68k: add addressing modes to scc
        target-m68k: add exg ops
        target-m68k: add linkl
        target-m68k: add bkpt instruction
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      eb540e2c
  4. 28 10月, 2016 15 次提交
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.8-20161028' into staging · 66a77ea6
      Peter Maydell 提交于
      ppc patch queue 2016-10-28
      
      This pull request supersedes and extends the one from 2016-10-26
      (which had a build bug).
      
      Highlights:
        * SLOF (pseries guest firmware) update
        * Enable a number of extra testcases on ppc / pseries
        * Added the 'powernv' machine type
          - Almost enough to be minimally usable
          - But still missing necessary interrupt controller updates
        * Cleanup and consolidation of NVRAM handling on several platforms
          with related firmware
        * Substantial cleanup to device tree construction
        * Some more POWER9 instruction emulation
        * Cleanup to handling of pseries option vectors and CAS reboot
          handling (host/guest feature negotiation mechanism)
        * Significant cleanups to handling of PCI devices in test cases
        * New hotplug event infrastructure
        * Memory hot unplug support for pseries
        * Several bug fixes
      
      The NVRAM cleanup affects some Sun sparc platforms as well as ppc
      ones, but have been tested by the sparc maintainer (Mark Cave-Ayland).
      
      The test additions also include substantial general changes to the
      test framework that aren't strictly ppc related.  They don't seem to
      break tests on other platforms, they're for the benefit of enabling
      tests on ppc and there isn't a specific maintainer for them, so
      they're included in this tree.
      
      # gpg: Signature made Fri 28 Oct 2016 02:37:19 BST
      # gpg:                using RSA key 0x6C38CACA20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
      # gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.8-20161028: (73 commits)
        ppc: allow certain HV interrupts to be delivered to guests
        spapr: Memory hot-unplug support
        spapr: use count+index for memory hotplug
        spapr: Add DRC count indexed hotplug identifier type
        spapr: add hotplug interrupt machine options
        spapr_events: add support for dedicated hotplug event source
        spapr: update spapr hotplug documentation
        target-ppc: Add xvcmpnesp, xvcmpnedp instructions
        target-ppc: add xscmp[eq,gt,ge,ne]dp instructions
        tests: Add pseries machine to the prom-env-test, too
        spapr_nvram: Pre-initialize the NVRAM to support the -prom-env parameter
        libqos: Change PCI accessors to take opaque BAR handle
        tests: Don't assume structure of PCI IO base in ahci-test
        tests: Use qpci_mem{read,write} in ivshmem-test
        libqos: Add 64-bit PCI IO accessors
        tests: Clean up IO handling in ide-test
        libqos: Implement mmio accessors in terms of mem{read,write}
        libqos: Add streaming accessors for PCI MMIO
        tests: Adjust tco-test to use qpci_legacy_iomap()
        libqos: Better handling of PCI legacy IO
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      66a77ea6
    • P
      Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-2016-10-27-1' into staging · 01b601f0
      Peter Maydell 提交于
      Merge qio 2016/10/27 v1
      
      # gpg: Signature made Thu 27 Oct 2016 13:54:03 BST
      # gpg:                using RSA key 0xBE86EBB415104FDF
      # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
      # gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
      # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF
      
      * remotes/berrange/tags/pull-qio-2016-10-27-1:
        main: set names for main loop sources created
        vnc: set name for all I/O channels created
        migration: set name for all I/O channels created
        char: set name for all I/O channels created
        nbd: set name for all I/O channels created
        io: add ability to set a name for IO channels
        io: Add a QIOChannelSocket cleanup test
        io: set LISTEN flag explicitly for listen sockets
        io: Introduce a qio_channel_set_feature() helper
        io: Use qio_channel_has_feature() where applicable
        io: Fix double shift usages on QIOChannel features
      
      Conflicts:
      	qemu-char.c
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      01b601f0
    • P
      Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging · fd209e4a
      Peter Maydell 提交于
      # gpg: Signature made Thu 27 Oct 2016 22:15:57 BST
      # gpg:                using RSA key 0x7DEF8106AAFC390E
      # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
      # Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
      #      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E
      
      * remotes/jnsnow/tags/ide-pull-request:
        qemu-iotests: Test creating floppy drives
        fdc: Move qdev properties to FloppyDrive
        fdc: Add a floppy drive qdev
        fdc: Add a floppy qbus
        macio: switch over to new byte-aligned DMA helpers
        dma-helpers: explicitly pass alignment into DMA helpers
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      fd209e4a
    • P
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · 9879b758
      Peter Maydell 提交于
      Block layer patches
      
      # gpg: Signature made Thu 27 Oct 2016 18:15:47 BST
      # gpg:                using RSA key 0x7F09B272C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      
      * remotes/kevin/tags/for-upstream: (23 commits)
        iotests: Add test for NBD's blockdev-add interface
        iotests: Add assert_json_filename_equal() method
        socket_scm_helper: Accept fd directly
        iotests.py: Allow concurrent qemu instances
        iotests.py: Add qemu_nbd function
        qapi: Allow blockdev-add for NBD
        block/nbd: Use SocketAddress options
        block/nbd: Accept SocketAddress
        block/nbd: Add nbd_has_filename_options_conflict()
        block/nbd: Use qdict_put()
        block/nbd: Default port in nbd_refresh_filename()
        block/nbd: Reject port parameter without host
        block/nbd: Drop trailing "." in error messages
        qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX
        block: Remove bdrv_aio_ioctl()
        raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl
        block: Introduce .bdrv_co_ioctl() driver callback
        block: Remove bdrv_ioctl()
        raw-posix: Don't use bdrv_ioctl()
        block: Use blk_co_ioctl() for all BB level ioctls
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9879b758
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-20161027-2' into staging · 86398328
      Peter Maydell 提交于
      seabios: update to 1.10.0 release.
      
      # gpg: Signature made Thu 27 Oct 2016 15:50:54 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # 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>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-seabios-20161027-2:
        seabios: update to 1.10.0 release.
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      86398328
    • S
      curses: Use cursesw instead of curses · 8ddc5bf9
      Samuel Thibault 提交于
      Use ncursesw package instead of curses on non-mingw, and check a few
      functions.
      Also take cflags from pkg-config, since cursesw headers may be in a
      separate, non-default directory.
      Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
      Message-id: 20161015195308.20473-3-samuel.thibault@ens-lyon.org
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      8ddc5bf9
    • S
      curses: fix left/right arrow translation · 697783a7
      Samuel Thibault 提交于
      In default VGA font, left/right arrow are glyphs 0x1a and 0x1b, not 0x0a and
      0x0b.
      Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
      Message-id: 20161015195308.20473-2-samuel.thibault@ens-lyon.org
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      697783a7
    • T
      ui/gtk: Fix non-working DELETE key · 85617885
      Thomas Huth 提交于
      GTK generates key events for the delete key with key->string[0] = 0x7f
      ... but this does not work right with the readline_handle_byte()
      function in util/readline.c, since this treats the keycode 127 as
      backspace. So let's add a special case for the GTK delete key to make
      this key behave right in the monitor interface of the GTK ui.
      
      Buglink: https://bugs.launchpad.net/qemu/+bug/1619438Signed-off-by: NThomas Huth <thuth@redhat.com>
      Message-id: 1477570647-7100-1-git-send-email-thuth@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      85617885
    • A
      gtk: fix compilation warning with gtk 3.22.2 · 76d8f93b
      Alberto Garcia 提交于
      gdk_screen_get_width() is deprecated since gtk 3.22.2, use
      gdk_monitor_get_geometry() instead if it's available.
      Signed-off-by: NAlberto Garcia <berto@igalia.com>
      Message-id: 20161026152108.12364-1-berto@igalia.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      76d8f93b
    • S
      Defer BrlAPI tty acquisition to when guest starts using device · cb78d4a1
      Samuel Thibault 提交于
      We do not want to catch the BrlAPI input/ouput immediately, but only
      when the guest has started discussing withour virtual device.
      
      This notably fixes input before the guest driver has started.
      Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      cb78d4a1
    • S
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20161027-1' into staging · b67d87f9
      Peter Maydell 提交于
      virtio-gpu: fix memory leak in virtio_gpu_resource_create_2d
      
      # gpg: Signature made Thu 27 Oct 2016 15:32:38 BST
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # 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>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-vga-20161027-1:
        virtio-gpu: fix memory leak in virtio_gpu_resource_create_2d
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b67d87f9
    • L
      MAINTAINERS: update M68K entry · 595a926d
      Laurent Vivier 提交于
      Add myself to be the M68K maintainer.
      Signed-off-by: NLaurent Vivier <laurent@vivier.eu>
      Reviewed-by: NThomas Huth <huth@tuxfamily.org>
      595a926d
    • L
    • L
      ff99b952