1. 19 1月, 2018 30 次提交
  2. 18 1月, 2018 10 次提交
    • P
      Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-17' into staging · b4d6ed1c
      Peter Maydell 提交于
      pull-nbd-2018-01-17
      
      - Vladimir Sementsov-Ogievskiy/Eric Blake: 0/6 NBD server refactoring
      
      # gpg: Signature made Thu 18 Jan 2018 02:21:55 GMT
      # gpg:                using RSA key 0xA7A16B4A2527436A
      # gpg: Good signature from "Eric Blake <eblake@redhat.com>"
      # gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
      # gpg:                 aka "[jpeg image of size 6874]"
      # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A
      
      * remotes/ericb/tags/pull-nbd-2018-01-17:
        nbd/server: structurize option reply sending
        nbd/server: Add helper functions for parsing option payload
        nbd/server: Add va_list form of nbd_negotiate_send_rep_err()
        nbd/server: Better error for NBD_OPT_EXPORT_NAME failure
        nbd/server: refactor negotiation functions parameters
        nbd/server: Hoist nbd_reject_length() earlier
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b4d6ed1c
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging · 5cad8ca5
      Peter Maydell 提交于
      x86 queue, 2018-01-17
      
      Highlight: new CPU models that expose CPU features that guests
      can use to mitigate CVE-2017-5715 (Spectre variant #2).
      
      # gpg: Signature made Thu 18 Jan 2018 02:00:03 GMT
      # 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:
        i386: Add EPYC-IBPB CPU model
        i386: Add new -IBRS versions of Intel CPU models
        i386: Add FEAT_8000_0008_EBX CPUID feature word
        i386: Add spec-ctrl CPUID bit
        i386: Add support for SPEC_CTRL MSR
        i386: Change X86CPUDefinition::model_id to const char*
        target/i386: add clflushopt to "Skylake-Server" cpu model
        pc: add 2.12 machine types
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5cad8ca5
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180117' into staging · 6e03cc5c
      Peter Maydell 提交于
      ppc patch queue 2017-01-17
      
      Another pull request for ppc related patches.  The most interesting
      thing here is the new capabilities framework for the pseries machine
      type.  This gives us better handling of several existing
      incompatibilities between TCG, PR and HV KVM, as well as new ones that
      arise with POWER9.  Further, it will allow reasonable handling of the
      advertisement of features necessary to mitigate the recent CVEs
      (Spectre and Meltdown).
      
      In addition there's:
           * Improvide handling of different "vsmt" modes
           * Significant enhancements to the "pnv" machine type
           * Assorted other bugfixes
      
      # gpg: Signature made Wed 17 Jan 2018 02:21:50 GMT
      # 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.12-20180117: (22 commits)
        target-ppc: Fix booke206 tlbwe TLB instruction
        target/ppc: add support for POWER9 HILE
        ppc/pnv: change initrd address
        ppc/pnv: fix XSCOM core addressing on POWER9
        ppc/pnv: introduce pnv*_is_power9() helpers
        ppc/pnv: change core mask for POWER9
        ppc/pnv: use POWER9 DD2 processor
        tests/boot-serial-test: fix powernv support
        ppc/pnv: Update skiboot firmware image
        spapr: Adjust default VSMT value for better migration compatibility
        spapr: Allow some cases where we can't set VSMT mode in the kernel
        target/ppc: Clarify compat mode max_threads value
        ppc: Change Power9 compat table to support at most 8 threads/core
        spapr: Remove unnecessary 'options' field from sPAPRCapabilityInfo
        hw/ppc/spapr_caps: Rework spapr_caps to use uint8 internal representation
        spapr: Handle Decimal Floating Point (DFP) as an optional capability
        spapr: Handle VMX/VSX presence as an spapr capability flag
        target/ppc: Clean up probing of VMX, VSX and DFP availability on KVM
        spapr: Validate capabilities on migration
        spapr: Treat Hardware Transactional Memory (HTM) as an optional capability
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      6e03cc5c
    • J
      cocoa.m: Fix scroll wheel support · ae7313e7
      John Arbuckle 提交于
      When using a mouse's scroll wheel in a guest with
      the cocoa front-end, the mouse pointer moves up
      and down instead of scrolling the window. This
      patch fixes this problem.
      Signed-off-by: NJohn Arbuckle <programmingkidx@gmail.com>
      Message-id: 20180108180707.7976-1-programmingkidx@gmail.com
      Reviewed-by: NPeter Maydell <peter.maydell@linaro.org>
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ae7313e7
    • V
      nbd/server: structurize option reply sending · 1d17922a
      Vladimir Sementsov-Ogievskiy 提交于
      Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-Id: <20171122101958.17065-6-vsementsov@virtuozzo.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      1d17922a
    • E
      nbd/server: Add helper functions for parsing option payload · 894e0280
      Eric Blake 提交于
      Rather than making every callsite perform length sanity checks
      and error reporting, add the helper functions nbd_opt_read()
      and nbd_opt_drop() that use the length stored in the client
      struct; also add an assertion that optlen is 0 before any
      option (ie. any previous option was fully handled), complementing
      the assertion added in an earlier patch that optlen is 0 after
      all negotiation completes.
      
      Note that the call in nbd_negotiate_handle_export_name() does
      not use the new helper (in part because the server cannot
      reply to NBD_OPT_EXPORT_NAME - it either succeeds or the
      connection drops).
      
      Based on patches by Vladimir Sementsov-Ogievskiy.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Message-Id: <20180110230825.18321-6-eblake@redhat.com>
      894e0280
    • E
      nbd/server: Add va_list form of nbd_negotiate_send_rep_err() · 41f5dfaf
      Eric Blake 提交于
      This will be useful for the next patch.
      
      Based on a patch by Vladimir Sementsov-Ogievskiy
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Message-Id: <20180110230825.18321-5-eblake@redhat.com>
      41f5dfaf
    • E
      nbd/server: Better error for NBD_OPT_EXPORT_NAME failure · 32f158a6
      Eric Blake 提交于
      When a client abruptly disconnects before we've finished reading
      the name sent with NBD_OPT_EXPORT_NAME, we are better off logging
      the failure as EIO (we can't communicate with the client), rather
      than EINVAL (the client sent bogus data).
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Message-Id: <20180110230825.18321-4-eblake@redhat.com>
      32f158a6
    • V
      nbd/server: refactor negotiation functions parameters · 0cfae925
      Vladimir Sementsov-Ogievskiy 提交于
      Instead of passing currently negotiating option and its length to
      many of negotiation functions let's just store them on NBDClient
      struct to be state-variables of negotiation phase.
      
      This unifies semantics of negotiation functions and allows
      tracking changes of remaining option length in future patches.
      
      Asssert that optlen is back to 0 after negotiation (including
      old-style connections which don't negotiate), although we need
      more patches before we can assert optlen is 0 between options
      during negotiation.
      Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-Id: <20171122101958.17065-2-vsementsov@virtuozzo.com>
      [eblake: rebase, commit message tweak, assert !optlen after
      negotiation completes]
      Signed-off-by: NEric Blake <eblake@redhat.com>
      0cfae925
    • E
      nbd/server: Hoist nbd_reject_length() earlier · a16a7907
      Eric Blake 提交于
      No semantic change, but will make it easier for an upcoming patch
      to refactor code without having to add forward declarations.  Fix
      a poor comment while at it.
      Signed-off-by: NEric Blake <eblake@redhat.com>
      Reviewed-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Message-Id: <20180110230825.18321-2-eblake@redhat.com>
      a16a7907