1. 05 3月, 2019 8 次提交
  2. 04 3月, 2019 30 次提交
  3. 01 3月, 2019 2 次提交
    • P
      Merge remote-tracking branch 'remotes/cminyard/tags/i2c-for-release-20190228' into staging · 20b084c4
      Peter Maydell 提交于
      This has been out there long enough, I need to get this in.
      
      This was changed a little bit since my post on Feb 20 (to which
      there were no comments) due to changes I had to work around:
      
      Change b296b664 "smbus: Add a helper to generate SPD EEPROM
      data" added a function to include/hw/i2c/smbus.h, which I had to move to
      include/hw/smbus_eeprom.h.
      
      There were some changes to hw/i2c/Makefile.objs that I had to fix up.
      
      Beyond that, no changes.
      
      Thanks,
      
      -corey
      
      # gpg: Signature made Thu 28 Feb 2019 18:05:49 GMT
      # gpg:                using RSA key FD0D5CE67CE0F59A6688268661F38C90919BFF81
      # gpg: Good signature from "Corey Minyard <cminyard@mvista.com>" [unknown]
      # gpg:                 aka "Corey Minyard <minyard@acm.org>" [unknown]
      # gpg:                 aka "Corey Minyard <corey@minyard.net>" [unknown]
      # gpg:                 aka "Corey Minyard <minyard@mvista.com>" [unknown]
      # 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: FD0D 5CE6 7CE0 F59A 6688  2686 61F3 8C90 919B FF81
      
      * remotes/cminyard/tags/i2c-for-release-20190228:
        i2c: Verify that the count passed in to smbus_eeprom_init() is valid
        i2c:smbus_eeprom: Add a reset function to smbus_eeprom
        i2c:smbus_eeprom: Add vmstate handling to the smbus eeprom
        i2c:smbus_eeprom: Add a size constant for the smbus_eeprom size
        i2c:smbus_eeprom: Add normal type name and cast to smbus_eeprom.c
        i2c:smbus_slave: Add an SMBus vmstate structure
        i2c:pm_smbus: Fix state transfer
        migration: Add a VMSTATE_BOOL_TEST() macro
        i2c:pm_smbus: Fix pm_smbus handling of I2C block read
        boards.h: Ignore migration for SMBus devices on older machines
        i2c:smbus: Make white space in switch statements consistent
        i2c:smbus_eeprom: Get rid of the quick command
        i2c:smbus: Simplify read handling
        i2c:smbus: Simplify write operation
        i2c:smbus: Correct the working of quick commands
        i2c: Don't check return value from i2c_recv()
        arm:i2c: Don't mask return from i2c_recv()
        i2c: have I2C receive operation return uint8_t
        i2c: Split smbus into parts
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      20b084c4
    • P
      Merge remote-tracking branch 'remotes/aperard/tags/pull-xen-20190228' into staging · f0ce2e17
      Peter Maydell 提交于
      Xen queue
      
      * xen-block fixes
      
      # gpg: Signature made Thu 28 Feb 2019 17:31:05 GMT
      # gpg:                using RSA key F80C006308E22CFD8A92E7980CF5572FD7FB55AF
      # gpg:                issuer "anthony.perard@citrix.com"
      # gpg: Good signature from "Anthony PERARD <anthony.perard@gmail.com>" [marginal]
      # gpg:                 aka "Anthony PERARD <anthony.perard@citrix.com>" [marginal]
      # gpg: WARNING: This key is not certified with sufficiently trusted signatures!
      # gpg:          It is not certain that the signature belongs to the owner.
      # Primary key fingerprint: 5379 2F71 024C 600F 778A  7161 D8D5 7199 DF83 42C8
      #      Subkey fingerprint: F80C 0063 08E2 2CFD 8A92  E798 0CF5 572F D7FB 55AF
      
      * remotes/aperard/tags/pull-xen-20190228:
        xen-block: stop leaking memory in xen_block_drive_create()
        xen-block: report error condition from vbd_name_to_disk()
        xen-block: remove redundant assignment
        dataplane/xen-block: remove dead code
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f0ce2e17