1. 22 1月, 2018 1 次提交
    • P
      Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging · f7c6b96c
      Peter Maydell 提交于
      # gpg: Signature made Fri 19 Jan 2018 22:31:27 GMT
      # 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:
        hw/ide: Remove duplicated definitions from ahci_internal.h
        ide: abort TRIM operation for invalid range
        ide: move ide_sect_range_ok() up
        ide: pass IDEState to trim AIO callback
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f7c6b96c
  2. 20 1月, 2018 5 次提交
    • J
      hw/ide: Remove duplicated definitions from ahci_internal.h · 3161906d
      John Snow 提交于
      The same definitions can also be found in include/hw/ide/ahci.h
      so let's remove these #defines from ahci_internal.h.
      Signed-off-by: NThomas Huth <thuth@redhat.com>
      Message-id: 1512457825-3847-1-git-send-email-thuth@redhat.com
      [Maintainer edit: publicize object names, privatize object macros.]
      Signed-off-by: NJohn Snow <jsnow@redhat.com>
      3161906d
    • A
      ide: abort TRIM operation for invalid range · 947858b0
      Anton Nefedov 提交于
      ATA8-ACS3, 7.9 DATA SET MANAGEMENT - 06h, DMA
      
          7.9.5 Error Outputs
          If the Trim bit is set to one and:
            a) the device detects an invalid LBA Range Entry; or
            b) count is greater than IDENTIFY DEVICE data word 105
               (see 7.16.7.55),
          then the device shall return command aborted.
          A device may trim one or more LBA Range Entries before it returns
          command aborted. See table 209.
      
      This check is not in the common ide_dma_cb() as the range for TRIM
      is harder to reach: it is not in LBA/count registers and the buffer has
      to be parsed first.
      Signed-off-by: NAnton Nefedov <anton.nefedov@virtuozzo.com>
      Message-id: 1512735034-35327-4-git-send-email-anton.nefedov@virtuozzo.com
      Signed-off-by: NJohn Snow <jsnow@redhat.com>
      947858b0
    • A
      ide: move ide_sect_range_ok() up · d8b070fe
      Anton Nefedov 提交于
      to use it without a forward declaration in the commit to follow
      Signed-off-by: NAnton Nefedov <anton.nefedov@virtuozzo.com>
      Message-id: 1512735034-35327-3-git-send-email-anton.nefedov@virtuozzo.com
      Signed-off-by: NJohn Snow <jsnow@redhat.com>
      d8b070fe
    • A
      ide: pass IDEState to trim AIO callback · ef0e64a9
      Anton Nefedov 提交于
      It will be needed to handle invalid requests
      Signed-off-by: NAnton Nefedov <anton.nefedov@virtuozzo.com>
      Message-id: 1512735034-35327-2-git-send-email-anton.nefedov@virtuozzo.com
      Signed-off-by: NJohn Snow <jsnow@redhat.com>
      ef0e64a9
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging · b384cd95
      Peter Maydell 提交于
      machine queue, 2018-01-19
      
      # gpg: Signature made Fri 19 Jan 2018 16:30:19 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/machine-next-pull-request:
        fw_cfg: fix memory corruption when all fw_cfg slots are used
        possible_cpus: add CPUArchId::type field
        nvdimm: add 'unarmed' option
        nvdimm: add a macro for property "label-size"
        hostmem-file: add "align" option
        scripts: Remove fixed entries from the device-crash-test
        qdev: Check for the availability of a hotplug controller before adding a device
        qdev_monitor: Simplify error handling in qdev_device_add()
        q35: Allow only supported dynamic sysbus devices
        xen: Add only xen-sysdev to dynamic sysbus device list
        spapr: Allow only supported dynamic sysbus devices
        ppc: e500: Allow only supported dynamic sysbus devices
        hw/arm/virt: Allow only supported dynamic sysbus devices
        machine: Replace has_dynamic_sysbus with list of allowed devices
        numa: fix missing '-numa cpu' in '-help' output
        qemu-options: document memory-backend-ram
        qemu-options: document missing memory-backend-file options
        memfd: remove needless include
        memfd: split qemu_memfd_alloc()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b384cd95
  3. 19 1月, 2018 34 次提交