1. 01 11月, 2017 13 次提交
  2. 31 10月, 2017 22 次提交
  3. 30 10月, 2017 5 次提交
    • P
      Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into staging · abf6e752
      Peter Maydell 提交于
      s390x: fixups for 2.11
      
      - missing \r in the BIOS console output
      - CPU type name is now "s390x-cpu"
      - fixup for the host-model on z14 and older machine versions
      
      # gpg: Signature made Mon 30 Oct 2017 08:34:15 GMT
      # gpg:                using RSA key 0x117BBC80B5A61C7C
      # gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
      # Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C
      
      * remotes/borntraeger/tags/s390x-20171030:
        s390-*.img: update s390 bios with latest fixes
        s390-ccw: print carriage return with new lines
        s390x/kvm: use cpu model for gscb on compat machines
        target/s390x: change CPU type name to "s390x-cpu"
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      abf6e752
    • P
      Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20171029' into staging · 21dab18b
      Peter Maydell 提交于
      migration/next for 20171029
      
      # gpg: Signature made Sun 29 Oct 2017 13:07:43 GMT
      # gpg:                using RSA key 0xF487EF185872D723
      # gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
      # gpg:                 aka "Juan Quintela <quintela@trasno.org>"
      # Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723
      
      * remotes/juanquintela/tags/migration/20171029:
        tests: check that migration parameters are really assigned
        tests: Don't abuse global_qtest
        tests: Factorize out migrate_test_start/end
        tests: Refactor setting of parameters/capabilities
        tests: rename postcopy-test to migration-test
        migration: Make xbzrle_cache_size a migration parameter
        migration: No need to return the size of the cache
        migration: Don't play games with the requested cache size
        migration: Make sure that we pass the right cache size
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      21dab18b
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging · ab752f23
      Peter Maydell 提交于
      x86/cpu/numa queue, 2017-10-27
      
      # gpg: Signature made Fri 27 Oct 2017 15:17:12 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-and-machine-pull-request: (39 commits)
        x86: Skip check apic_id_limit for Xen
        numa: fixup parsed NumaNodeOptions earlier
        mips: r4k: replace cpu_model with cpu_type
        mips: mipssim: replace cpu_model with cpu_type
        mips: Magnum/Acer Pica 61: replace cpu_model with cpu_type
        mips: fulong2e: replace cpu_model with cpu_type
        mips: malta/boston: replace cpu_model with cpu_type
        mips: use object_new() instead of gnew()+object_initialize()
        sparc: leon3: use generic cpu_model parsing
        sparc: sparc: use generic cpu_model parsing
        sparc: sun4u/sun4v/niagara: use generic cpu_model parsing
        sparc: cleanup cpu type name composition
        tricore: use generic cpu_model parsing
        tricore: cleanup cpu type name composition
        unicore32: use generic cpu_model parsing
        unicore32: cleanup cpu type name composition
        xtensa: lx60/lx200/ml605/kc705: use generic cpu_model parsing
        xtensa: sim: use generic cpu_model parsing
        xtensa: cleanup cpu type name composition
        sh4: remove SuperHCPUClass::name field
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      ab752f23
    • C
      s390-*.img: update s390 bios with latest fixes · 7a4ec18d
      Christian Borntraeger 提交于
      includes
      7618c0ae ("s390-ccw: print carriage return with new lines")
      a8fbbf1d ("s390: set DHCP client architecure id for netboot")
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      7a4ec18d
    • C
      s390-ccw: print carriage return with new lines · 7618c0ae
      Collin L. Walling 提交于
      The sclp console in the s390 bios writes raw data,
      leading console emulators (such as virsh console) to
      treat a new line ('\n') as just a new line instead
      of as a Unix line feed. Because of this, output
      appears in a "stair case" pattern.
      
      Let's print \r\n on every occurrence of a new line
      in the string passed to write to amend this issue.
      
      This is in sync with the guest Linux code in
      drivers/s390/char/sclp_vt220.c which also does a line feed
      conversion in the console part of the driver.
      
      This fixes the s390-ccw and s390-netboot output like
      $ virsh start test --console
      Domain test started
      Connected to domain test
      Escape character is ^]
      Network boot starting...
                                Using MAC address: 02:01:02:03:04:05
                                                                      Requesting information via DHCP:  010
      Signed-off-by: NCollin L. Walling <walling@linux.vnet.ibm.com>
      Message-Id: <1509120893-28054-1-git-send-email-walling@linux.vnet.ibm.com>
      Reviewed-by: NHalil Pasic <pasic@linux.vnet.ibm.com>
      Acked-by: NCornelia Huck <cohuck@redhat.com>
      Reviewed-by: NAlexander Graf <agraf@suse.de>
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      7618c0ae