1. 03 3月, 2015 1 次提交
  2. 02 3月, 2015 3 次提交
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging · b8a173b2
      Peter Maydell 提交于
      * remotes/ehabkost/tags/x86-pull-request:
        target-i386: Move APIC ID compatibility code to pc.c
        target-i386: Require APIC ID to be explicitly set before CPU realize
        target-i386: Set APIC ID using cpu_index on CONFIG_USER
        linux-user: Check for cpu_init() errors
        target-i386: Move CPUX86State.cpuid_apic_id to X86CPU.apic_id
        target-i386: Simplify error handling on cpu_x86_init_user()
        target-i386: Eliminate cpu_init() function
        target-i386: Rename cpu_x86_init() to cpu_x86_init_user()
        target-i386: Move topology.h to include/hw/i386
        target-i386: Eliminate unnecessary get_cpuid_vendor() function
        target-i386: Simplify listflags() function
      
      Conflicts:
      	target-i386/cpu.c
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b8a173b2
    • P
      Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging · 5de09046
      Peter Maydell 提交于
      QOM infrastructure fixes and device conversions
      
      * Assertion fix for device_add with non-device types
      * Documentation fix
      * qdev_init() error reporting cleanups
      
      # gpg: Signature made Tue Feb 24 13:56:33 2015 GMT using RSA key ID 3E7E013F
      # gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
      # gpg:                 aka "Andreas Färber <afaerber@suse.com>"
      
      * remotes/afaerber/tags/qom-devices-for-peter:
        parallel: parallel_hds_isa_init() shouldn't fail
        parallel: Factor out common parallel_hds_isa_init()
        serial: serial_hds_isa_init() shouldn't fail
        serial: Factor out common serial_hds_isa_init()
        etsec: Replace qdev_init() by qdev_init_nofail()
        leon3: Replace unchecked qdev_init() by qdev_init_nofail()
        ide/isa: Replace unchecked qdev_init() by qdev_init_nofail()
        qdev: Improve qdev_init_nofail()'s error reporting
        qom: Fix typo, 'my_class_init' -> 'derived_class_init'
        qdev: Avoid type assertion in qdev_build_hotpluggable_device_list()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5de09046
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging · 2dffe551
      Peter Maydell 提交于
      NUMA fixes queue
      
      # gpg: Signature made Mon Feb 23 19:28:42 2015 GMT using RSA key ID 984DC5A6
      # gpg: Can't check signature: public key not found
      
      * remotes/ehabkost/tags/numa-pull-request:
        numa: Rename set_numa_modes() to numa_post_machine_init()
        numa: Rename option parsing functions
        numa: Move QemuOpts parsing to set_numa_nodes()
        numa: Make max_numa_nodeid static
        numa: Move NUMA globals to numa.c
        vl.c: Remove unnecessary zero-initialization of NUMA globals
        numa: Move NUMA declarations from sysemu.h to numa.h
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      2dffe551
  3. 26 2月, 2015 15 次提交
  4. 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
  5. 24 2月, 2015 18 次提交