1. 08 6月, 2012 1 次提交
    • M
      virtio-serial-bus: use correct lengths in control_out() message · 45270ad8
      Michael Tokarev 提交于
      Original code has one thing to process (cur_len), requests to
      convert from iovec to buf another thing (len which is actually max_len),
      and processes something else (copied).  Whole thing is very difficult
      to understand, even if it does a right thing.  The iov_to_buf()
      conversion in this case will always return cur_len, because it is
      the length of the iovec it was asked to process, and the size we
      asked to convert is the same or larger, and iov_to_buf() will stop
      at reaching either iov or buf.
      
      Make the code saner by doing the only sane thing: dropping `copied'
      which is always the same as `cur_len' but just introduces questions.
      Signed-off-by: NMichael Tokarev <mjt@tls.msk.ru>
      45270ad8
  2. 07 6月, 2012 1 次提交
  3. 06 6月, 2012 4 次提交
    • A
      Merge remote-tracking branch 'qmp/queue/qmp' into staging · 34941700
      Anthony Liguori 提交于
      * qmp/queue/qmp: (29 commits)
        Add 'query-events' command to QMP to query async events
        qapi: convert netdev_del
        qapi: convert netdev_add
        net: net_client_init(): use error_set()
        net: purge the monitor object from all init functions
        qemu-config: introduce qemu_find_opts_err()
        qemu-config: find_list(): use error_set()
        qerror: introduce QERR_INVALID_OPTION_GROUP
        qemu-option: qemu_opts_from_qdict(): use error_set()
        qemu-option: introduce qemu_opt_set_err()
        qemu-option: opt_set(): use error_set()
        qemu-option: qemu_opts_validate(): use error_set()
        qemu-option: qemu_opt_parse(): use error_set()
        qemu-option: parse_option_size(): use error_set()
        qemu-option: parse_option_bool(): use error_set()
        qemu-option: parse_option_number(): use error_set()
        qemu-option: qemu_opts_create(): use error_set()
        introduce a new monitor command 'dump-guest-memory' to dump guest's memory
        make gdb_id() generally avialable and rename it to cpu_index()
        target-i386: Add API to get note's size
        ...
      34941700
    • A
      Merge remote-tracking branch 'afaerber-or/qom-cpu-3' into staging · e1ae9a7a
      Anthony Liguori 提交于
      * afaerber-or/qom-cpu-3: (74 commits)
        Kill off cpu_state_reset()
        linux-user: Use cpu_reset() after cpu_init() / cpu_copy()
        bsd-user: Use cpu_reset() in after cpu_init()
        leon3: Store SPARCCPU in ResetData
        leon3: Use cpu_sparc_init() to obtain SPARCCPU
        sun4u: Store SPARCCPU in ResetData
        sun4u: Let cpu_devinit() return SPARCCPU
        sun4u: Use cpu_sparc_init() to obtain SPARCCPU
        sun4m: Pass SPARCCPU to {main,secondary}_cpu_reset()
        sun4m: Use cpu_sparc_init() to obtain SPARCCPU
        target-sparc: Let cpu_sparc_init() return SPARCCPU
        cpu-exec: Use cpu_reset() in cpu_exec() for TARGET_PPC
        virtex_ml507: Pass PowerPCCPU to main_cpu_reset()
        virtex_ml507: Let ppc440_init_xilinx() return PowerPCCPU
        virtex_ml507: Use cpu_ppc_init() to obtain PowerPCCPU
        ppc_prep: Pass PowerPCCPU to ppc_prep_reset()
        ppc_prep: Use cpu_ppc_init() to obtain PowerPCCPU
        ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_reset()
        ppc_oldworld: Use cpu_ppc_init() to obtain PowerPCCPU
        ppc_newworld: Pass PowerPCCPU to ppc_core99_reset()
        ...
      e1ae9a7a
    • A
      Merge remote-tracking branch 'qemu-kvm/uq/master' into staging · 6e72ae46
      Anthony Liguori 提交于
      * qemu-kvm/uq/master:
        kvm: Fix build for non-CAP_IRQ_ROUTING targets
      6e72ae46
    • J
      kvm: Fix build for non-CAP_IRQ_ROUTING targets · d3d3bef0
      Jan Kiszka 提交于
      A type definition and a KVMState field initialization escaped the
      required wrapping with KVM_CAP_IRQ_ROUTING. Also, we need to provide a
      dummy kvm_irqchip_release_virq as virtio-pci references (but does not
      use) it.
      Signed-off-by: NJan Kiszka <jan.kiszka@siemens.com>
      Acked-by: NBen Collins <bcollins@ubuntu.com>
      Tested-by: NAndreas Färber <afaerber@suse.de>
      Signed-off-by: NAvi Kivity <avi@redhat.com>
      d3d3bef0
  4. 05 6月, 2012 34 次提交