1. 26 2月, 2015 2 次提交
    • P
      Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150218' into staging · 11d39a13
      Peter Maydell 提交于
      Features for s390x/kvm
      
      1. guest reIPL changes (Fan Zhang)
      Implements subcode 5 and 6 of diag 0x308. This allows to use
      /sys/firmware/[re]ipl/ccw/* and the chreipl and lsreipl tools in
      Linux. In addition to the normal "change the disk" this also
      allows to switch from booting an external kernel into rebooting
      from a disk.
      
      2. Memory page table walking (Thomas Huth)
      Fix several page table walking functions, used in several places
      like gdb server and instruction handling. Also use these functions
      in several I/O related functions.
      
      # gpg: Signature made Wed Feb 18 09:13:22 2015 GMT using RSA key ID B5A61C7C
      # gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
      
      * remotes/borntraeger/tags/s390x-20150218: (29 commits)
        s390x/helper: Remove s390_cpu_physical_memory_map
        s390x/pci: Rework memory access in zpci instruction
        s390x/ioinst: Rework memory access in TPI instruction
        s390x/ioinst: Rework memory access in CHSC instruction
        s390x/ioinst: Rework memory access in STCRW instruction
        s390x/ioinst: Rework memory access in TSCH instruction
        s390x/ioinst: Set condition code in ioinst_handle_tsch() handler
        s390x/ioinst: Rework memory access in STSCH instruction
        s390x/ioinst: Rework memory access in SSCH instruction
        s390x/ioinst: Rework memory access in MSCH instruction
        s390x/css: Make schib parameter of css_do_msch const
        s390x/mmu: Add function for accessing guest memory
        s390x/kvm: Add function for injecting pgm access exceptions
        s390x/mmu: Clean up mmu_translate_asc()
        s390x/mmu: Check bit 52 in page table entry
        s390x/mmu: Renaming related to the ASCE confusion
        s390x/mmu: Add support for read-only regions
        s390x/mmu: Fix the exception codes for illegal table entries
        s390x/mmu: Fix exception types when checking the ASCEs
        s390x/mmu: Fix translation exception code in lowcore
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      11d39a13
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-02-18' into staging · c5c6d7f8
      Peter Maydell 提交于
      Clean up around error_get_pretty(), qerror_report_err()
      
      # gpg: Signature made Wed Feb 18 10:10:07 2015 GMT using RSA key ID EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      
      * remotes/armbru/tags/pull-error-2015-02-18:
        qemu-char: Avoid qerror_report_err() outside QMP command handlers
        qemu-img: Avoid qerror_report_err() outside QMP command handlers
        vl: Avoid qerror_report_err() outside QMP command handlers
        tpm: Avoid qerror_report_err() outside QMP command handlers
        numa: Avoid qerror_report_err() outside QMP command handlers
        net: Avoid qerror_report_err() outside QMP command handlers
        monitor: Avoid qerror_report_err() outside QMP command handlers
        monitor: Clean up around monitor_handle_fd_param()
        error: Use error_report_err() where appropriate
        error: New convenience function error_report_err()
        vhost-scsi: Improve error reporting for invalid vhostfd
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c5c6d7f8
  2. 25 2月, 2015 3 次提交
    • P
      Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' into staging · 68b459ea
      Peter Maydell 提交于
      hmp: Normalize HMP command handler names
      
      # gpg: Signature made Wed Feb 18 10:59:44 2015 GMT using RSA key ID EB918653
      # gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
      # gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
      
      * remotes/armbru/tags/pull-monitor-2015-02-18:
        hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
        hmp: Name HMP command handler functions hmp_COMMAND()
        hmp: Clean up declarations for long-gone info handlers
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      68b459ea
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150218-1' into staging · 3d30395f
      Peter Maydell 提交于
      usb: error handling fixes from Markus, make sysbus ehci arm-only.
      
      # gpg: Signature made Wed Feb 18 09:54:13 2015 GMT using RSA key ID D3E87138
      # 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>"
      
      * remotes/kraxel/tags/pull-usb-20150218-1:
        Make sysbus EHCI devices ARM only by default
        PPC: Don't use legacy -usbdevice support for setting up board
        r2d: Don't use legacy -usbdevice support for setting up board
        usb: Change usb_create_simple() to abort on failure
        usb: Suppress bogus error when automatic usb-hub creation fails
        usb: Do not prefix error_setg() messages with "Error: "
        usb: Improve -usbdevice error reporting a bit
        usb: usb_create() can't fail, drop useless error handling
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3d30395f
    • P
      Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-02-16-v2-tag' into staging · c28d4869
      Peter Maydell 提交于
      tag for qga-pull-2015-02-16-v2
      
      v2:
      
      * generalized QAPI function definition for guest-memory-block-size
        to guest-memory-block-info for future extensibility (Eric)
      
      # gpg: Signature made Tue Feb 17 22:36:08 2015 GMT using RSA key ID F108B584
      # gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
      # gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
      # gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
      # 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: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584
      
      * remotes/mdroth/tags/qga-pull-2015-02-16-v2-tag:
        qemu-ga-win: Fail loudly on bare 'set-time'
        qga: add memory block command that unsupported
        qga: implement qmp_guest_get_memory_block_info() for Linux with sysfs
        qga: implement qmp_guest_set_memory_blocks() for Linux with sysfs
        qga: implement qmp_guest_get_memory_blocks() for Linux with sysfs
        qga: introduce three guest memory block commmands with stubs
        qga: implement file commands for Windows guest
        guest agent: guest-file-open: refactoring
        utils: drop strtok_r from envlist_parse
        qga: add guest-set-user-password command
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c28d4869
  3. 24 2月, 2015 4 次提交
    • P
      Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging · 73104fd3
      Peter Maydell 提交于
      - vhost-scsi: add bootindex property
      - RCU: fix MemoryRegion lifetime issues in PCI; document the rules;
      convert of AddressSpaceDispatch and RAMList
      - KVM: add kvm_exit reasons for aarch64
      
      # gpg: Signature made Mon Feb 16 16:32:32 2015 GMT using RSA key ID 78C7AE83
      # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
      # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
      # 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: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
      #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
      
      * remotes/bonzini/tags/for-upstream: (21 commits)
        Convert ram_list to RCU
        exec: convert ram_list to QLIST
        cosmetic changes preparing for the following patches
        exec: protect mru_block with RCU
        rcu: add g_free_rcu
        rcu: introduce RCU-enabled QLIST
        exec: RCUify AddressSpaceDispatch
        exec: make iotlb RCU-friendly
        exec: introduce cpu_reload_memory_map
        docs: clarify memory region lifecycle
        pci: split shpc_cleanup and shpc_free
        pcie: remove mmconfig memory leak and wrap mmconfig update with transaction
        memory: keep the owner of the AddressSpace alive until do_address_space_destroy
        rcu: run RCU callbacks under the BQL
        rcu: do not let RCU callbacks pile up indefinitely
        vhost-scsi: set the bootable value of channel/target/lun
        vhost-scsi: add a property for booting
        vhost-scsi: expose the TYPE_FW_PATH_PROVIDER interface
        vhost-scsi: add bootindex property
        qdev: support to get a device firmware path directly
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      73104fd3
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · 3dc10613
      Peter Maydell 提交于
      Pull request
      
      v2:
       * Fix C11 typedef redefinitions in ahci and libqos malloc [Peter]
       * Fix lx -> PRIx64 format specifiers in ahci [Peter]
      
      # gpg: Signature made Mon Feb 16 15:45:53 2015 GMT using RSA key ID 81AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      
      * remotes/stefanha/tags/block-pull-request: (65 commits)
        block: Keep bdrv_check*_request()'s return value
        block: Remove "growable" from BDS
        block: Clamp BlockBackend requests
        qemu-io: Use BlockBackend
        qemu-io: Remove "growable" option
        qemu-io: Use blk_new_open() in openfile()
        qemu-nbd: Use blk_new_open() in main()
        qemu-img: Use BlockBackend as far as possible
        qemu-img: Use blk_new_open() in img_rebase()
        qemu-img: Use blk_new_open() in img_open()
        block/xen: Use blk_new_open() in blk_connect()
        blockdev: Use blk_new_open() in blockdev_init()
        iotests: Add test for driver=qcow2, format=qcow2
        block: Add Error parameter to bdrv_find_protocol()
        block: Add blk_new_open()
        block: Lift some BDS functions to the BlockBackend
        iotests: Add test for qemu-img convert to NBD
        qemu-img: Fix qemu-img convert -n
        qemu-iotests: Add 093 for IO throttling
        qemu-iotests: Allow caller to disable underscore convertion for qmp
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3dc10613
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150216-1' into staging · 3dd2d1a3
      Peter Maydell 提交于
      vnc: fixup some QemuOpts conversion fallout.
      
      # gpg: Signature made Mon Feb 16 08:13:32 2015 GMT using RSA key ID D3E87138
      # 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>"
      
      * remotes/kraxel/tags/pull-vnc-20150216-1:
        vnc: fix coverity warning
        ui/vnc: optimize full scanline updates
        vnc: auto assian an id when calling change vnc qmp interface
        vnc: introduce an wrapper for auto assign vnc id
        vnc: using bool type instead of int for QEMU_OPT_BOOL
        vnc: correct missing property about vnc_display
        vnc: fix qemu crash when not configure vnc option
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      3dd2d1a3
    • P
      Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150213-2' into staging · bf2fd13a
      Peter Maydell 提交于
      MIPS patches 2015-02-13
      
      Changes:
      * bug fixes, cleanups and minor improvements
      
      # gpg: Signature made Sat Feb 14 17:01:37 2015 GMT using RSA key ID 0B29DA6B
      # gpg: Can't check signature: public key not found
      
      * remotes/lalrae/tags/mips-20150213-2:
        linux-user: correct stat structure in MIPS N32
        target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction
        target-mips: fix broken snapshotting
        target-mips: use CP0EnLo_XI instead of magic number
        target-mips: ll and lld cause AdEL exception for unaligned address
        target-mips: fix detection of the end of the page during translation
        target-mips: Make CP0.Status.CU1 read-only for the 5Kc and 5KEc processors
        isa: remove isa_mem_base variable
        gt64xxx: remove isa_mem_base usage
        piix4: use PCI address space instead of system memory
        mips: remove isa_mem_base usage
        jazz: remove usage of isa_mem_base
        jazz: do not explode QEMUMachineInitArgs structure
        isa: add memory space parameter to isa_bus_new
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      bf2fd13a
  4. 18 2月, 2015 31 次提交