1. 31 7月, 2017 11 次提交
  2. 29 7月, 2017 4 次提交
  3. 28 7月, 2017 12 次提交
  4. 27 7月, 2017 13 次提交
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170727-pull-request' into staging · e01151de
      Peter Maydell 提交于
      ui: keymap fixes for 2.10
      
      # gpg: Signature made Thu 27 Jul 2017 15:00:06 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/ui-20170727-pull-request:
        ps2: fix sending of PAUSE/BREAK scancodes
        ui: drop altgr and altgr_r QKeyCodes
        ps2: enable multimedia keys
        ui: add multimedia keys
        ui: update keymaps
        ui: move qemu_input_linux_to_qcode()
        ui: add next and prior keysyms
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e01151de
    • D
      ps2: fix sending of PAUSE/BREAK scancodes · 7c388dbd
      Daniel P. Berrange 提交于
      The processing of the scancodes for PAUSE/BREAK  has been broken since
      the conversion to qcodes in:
      
        commit 8c10e0ba
        Author: Hervé Poussineau <hpoussin@reactos.org>
        Date:   Thu Sep 15 22:06:26 2016 +0200
      
          ps2: use QEMU qcodes instead of scancodes
      
      When using a VNC client, with the raw scancode extension, the client
      will send a scancode of 0xc6 for both PAUSE and BREAK. There is mistakenly
      no entry in the qcode_to_number table for this scancode, so
      ps2_keyboard_event() just generates a log message and discards the
      scancode
      
      When using a SPICE client, it will also send 0xc6 for BREAK, but
      will send 0xe1 0x1d 0x45 0xe1 0x9d 0xc5 for PAUSE. There is no
      entry in the qcode_to_number table for the scancode 0xe1 because
      it is a special XT keyboard prefix not mapping to any QKeyCode.
      Again ps2_keyboard_event() just generates a log message and discards
      the scancode. The following 0x1d, 0x45, 0x9d, 0xc5 scancodes get
      handled correctly. Rather than trying to handle 3 byte sequences
      of scancodes in the PS/2 driver, special case the SPICE input
      code so that it captures the 3 byte pause sequence and turns it
      into a Pause QKeyCode.
      Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
      Message-id: 20170727113243.23991-1-berrange@redhat.com
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      7c388dbd
    • G
      ui: drop altgr and altgr_r QKeyCodes · 912092b8
      Gerd Hoffmann 提交于
      The right alt key (alt_r aka KEY_RIGHTALT) is used for AltGr.
      The altgr and altgr_r keys simply don't exist.  Drop them.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 20170727104720.30061-1-kraxel@redhat.com
      912092b8
    • G
      ps2: enable multimedia keys · 0500cb1d
      Gerd Hoffmann 提交于
      Fixes: 8c10e0baSigned-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 20170726152918.11995-6-kraxel@redhat.com
      0500cb1d
    • G
      ui: add multimedia keys · 37810e80
      Gerd Hoffmann 提交于
      Add multimedia keys to QKeyCodes and to the keymaps.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 20170726152918.11995-5-kraxel@redhat.com
      37810e80
    • G
      ui: update keymaps · 9ade7759
      Gerd Hoffmann 提交于
      Add recently added QKeyCodes to the keymaps.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 20170726152918.11995-4-kraxel@redhat.com
      9ade7759
    • G
      ui: move qemu_input_linux_to_qcode() · 606eb0c6
      Gerd Hoffmann 提交于
      Move from input-linux.c to input-keymap.c and export it,
      so the function is available elsewhere too.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 20170726152918.11995-3-kraxel@redhat.com
      606eb0c6
    • G
      ui: add next and prior keysyms · d52a1a91
      Gerd Hoffmann 提交于
      Page-up and Page-down were renamed.  Add the names to the keysym list
      so we can parse both old and new names.  The keypad versions are already
      present in the vnc map.
      Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-id: 20170726152918.11995-2-kraxel@redhat.com
      d52a1a91
    • P
      Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20170726.0' into staging · 6be37cc5
      Peter Maydell 提交于
      VFIO fixes 2017-07-26
      
       - Error path use after free bug fixes (Philippe Mathieu-Daudé)
      
      # gpg: Signature made Wed 26 Jul 2017 18:49:00 BST
      # gpg:                using RSA key 0x239B9B6E3BB08B22
      # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
      # gpg:                 aka "Alex Williamson <alex@shazbot.org>"
      # gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
      # gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"
      # Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22
      
      * remotes/awilliam/tags/vfio-fixes-20170726.0:
        vfio/pci: fix use of freed memory
        vfio/platform: fix use of freed memory
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6be37cc5
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging · 2dca6d9e
      Peter Maydell 提交于
      x86 bug fix for -rc1
      
      Fix for a bug in "-cpu max" that breaks libvirt usage of
      query-cpu-model-expansion.
      
      # gpg: Signature made Wed 26 Jul 2017 19:35:28 BST
      # gpg:                using RSA key 0x2807936F984DC5A6
      # gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
      # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6
      
      * remotes/ehabkost/tags/x86-pull-request:
        target/i386: Don't use x86_cpu_load_def() on "max" CPU model
        target/i386: Define CPUID_MODEL_ID_SZ macro
        target/i386: Use host_vendor_fms() in max_x86_cpu_initfn()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2dca6d9e
    • E
      target/i386: Don't use x86_cpu_load_def() on "max" CPU model · bd182022
      Eduardo Habkost 提交于
      When commit 0bacd8b3 ('i386: Don't set CPUClass::cpu_def on
      "max" model') removed the CPUClass::cpu_def field, we kept using
      the x86_cpu_load_def() helper directly in max_x86_cpu_initfn(),
      emulating the previous behavior when CPUClass::cpu_def was set.
      
      However, x86_cpu_load_def() is intended to help initialization of
      CPU models from the builtin_x86_defs table, and does lots of
      other steps that are not necessary for "max".
      
      One of the things x86_cpu_load_def() do is to set the properties
      listed at tcg_default_props/kvm_default_props.  We must not do
      that on the "max" CPU model, otherwise under KVM we will
      incorrectly report all KVM features as always available, and the
      "svm" feature as always unavailable.  The latter caused the bug
      reported at:
      
        https://bugzilla.redhat.com/show_bug.cgi?id=1467599
        ("Unable to start domain: the CPU is incompatible with host CPU:
        Host CPU does not provide required features: svm")
      
      Replace x86_cpu_load_def() with simple object_property_set*()
      calls.  In addition to fixing the above bug, this makes the KVM
      branch in max_x86_cpu_initfn() very similar to the existing TCG
      branch.
      
      For reference, the full list of steps performed by
      x86_cpu_load_def() is:
      
      * Setting min-level and min-xlevel.  Already done by
        max_x86_cpu_initfn().
      * Setting family/model/stepping/model-id.  Done by the code added
        to max_x86_cpu_initfn() in this patch.
      * Copying def->features.  Wrong because "-cpu max" features need to
        be calculated at realize time.  This was not a problem in the
        current code because host_cpudef.features was all zeroes.
      * x86_cpu_apply_props() calls.  This causes the bug above, and
        shouldn't be done.
      * Setting CPUID_EXT_HYPERVISOR.  Not needed because it is already
        reported by x86_cpu_get_supported_feature_word(), and because
        "-cpu max" features need to be calculated at realize time.
      * Setting CPU vendor to host CPU vendor if on KVM mode.
        Redundant, because max_x86_cpu_initfn() already sets it to the
        host CPU vendor.
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Message-Id: <20170712162058.10538-5-ehabkost@redhat.com>
      Reviewed-by: NIgor Mammedov <imammedo@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      bd182022
    • E
      target/i386: Define CPUID_MODEL_ID_SZ macro · 7d8050b5
      Eduardo Habkost 提交于
      Document cpu_x86_fill_model_id() and define CPUID_MODEL_ID_SZ to
      help callers use the right buffer size.
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Message-Id: <20170712162058.10538-4-ehabkost@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      7d8050b5
    • E
      target/i386: Use host_vendor_fms() in max_x86_cpu_initfn() · bfef6248
      Eduardo Habkost 提交于
      The existing code duplicated the logic in host_vendor_fms(), so
      reuse the helper function instead.
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      Message-Id: <20170712162058.10538-3-ehabkost@redhat.com>
      Reviewed-by: NIgor Mammedov <imammedo@redhat.com>
      Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
      bfef6248