1. 30 7月, 2012 1 次提交
    • A
      Merge commit 'quintela/migration-next-v5' into staging · e6a76719
      Anthony Liguori 提交于
      * commit '6c779f22':
        Change ram_save_block to return -1 if there are no more changes
        ram: save_live_setup() we don't need to synchronize the dirty bitmap.
        ram: iterate phase
        ram: save_live_complete() only do one loop
        ram: save_live_setup() don't need to sent pages
        savevm: split save_live into stage2 and stage3
        savevm: split save_live_setup from save_live_state
        savevm: introduce is_active method
        savevm: Refactor cancel operation in its own operation
        savevm: remove SaveLiveStateHandler
        savevm: remove SaveSetParamsHandler
        savevm: Live migration handlers register the struct directly
        savevm: Use a struct to pass all handlers
      e6a76719
  2. 29 7月, 2012 3 次提交
    • V
      x86: Fixed incorrect segment base address addition in 64-bits mode · 7162ab21
      Vitaly Chipounov 提交于
      According to the Intel manual
      "Intel® 64 and IA-32 Architectures Software Developer’s Manual
      Volume 3", "3.4.4 Segment Loading Instructions in IA-32e Mode":
      
      "When in compatibility mode, FS and GS overrides operate as defined by
      32-bit mode behavior regardless of the value loaded into the upper 32
      linear-address bits of the hidden descriptor register base field.
      Compatibility mode ignores the upper 32 bits when calculating an effective address."
      
      However, the code misses the 64-bit mode case, where an instruction with
      address and segment size override would be translated incorrectly. For example,
      inc dword ptr gs:260h[ebx*4] gets incorrectly translated to:
      
      (uint32_t)(gs.base + ebx * 4 + 0x260)
      instead of
      gs.base + (uint32_t)(ebx * 4 + 0x260)
      Signed-off-by: NVitaly Chipounov <vitaly.chipounov@epfl.ch>
      Reviewed-by: NMax Filippov <jcmvbkbc@gmail.com>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      7162ab21
    • P
      place qemu-sockets.c contributions since 2012-01-13 under GPLv2+ · e6d91ab6
      Paolo Bonzini 提交于
      Past contributions since 2012-01-13 were only made by Red Hat people,
      so they are already available under GPLv2+.
      Signed-off-by: NPaolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: NStefan Weil <sw@weilnetz.de>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      e6d91ab6
    • D
      build: Fix linking failure for qemu-ga · 54c2e502
      Dunrong Huang 提交于
      This patch will fix the following linking failed:
      
        LINK  qemu-ga
      gcc: error: qga/../qapi-generated/qga-qapi-types.o: No such file or directory
      gcc: error: qga/../qapi-generated/qga-qapi-visit.o: No such file or directory
      gcc: error: qga/../qapi-generated/qga-qmp-marshal.o: No such file or directory
      make: *** [qemu-ga] Error 1
      
      Commit cdc976b0 changes the
      dependencies of qemu-ga to depend "../qapi-generated/qga-qapi-types.o",
      which will be expanded to "qga/../qapi-generated/qga-qapi-types.o" when
      building qemu-ga.
      
      In top-level Makefile, we defined a target "qapi-generated/qga-qapi-types.o"
      which was not equal to "qga/../qapi-generated/qga-qapi-types" in the
      Makefile world. So "No such file" error happened when qemu-ga was linking.
      
      The easy approach to fix is to change the target name to
      "qga/../qapi-generated/qga-qapi-types.o", but it is weird.
      
      So, in order to solve it more graciously, I move those temporary
      files(qga-qapi-*.{c,h}) qemu-ga depends on to qemu-ga/qapi-generated,
      this makes dependencies more clearer.
      Signed-off-by: NDunrong Huang <riegamaths@gmail.com>
      Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
      54c2e502
  3. 28 7月, 2012 23 次提交
  4. 24 7月, 2012 4 次提交
    • A
      Merge remote-tracking branch 'stefanha/net' into staging · a2114348
      Anthony Liguori 提交于
      * stefanha/net:
        remove unused QemuOpts parameter from net init functions
        convert net_init_bridge() to NetClientOptions
        convert net_init_tap() to NetClientOptions
        convert net_init_vde() to NetClientOptions
        convert net_init_socket() to NetClientOptions
        convert net_init_slirp() to NetClientOptions
        convert net_init_dump() to NetClientOptions
        convert net_init_nic() to NetClientOptions
        convert net_client_init() to OptsVisitor
        hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated)
        qapi schema: add Netdev types
        qapi schema: remove trailing whitespace
        qapi: introduce OptsVisitor
        expose QemuOpt and QemuOpts struct definitions to interested parties
        qapi: introduce "size" type
        qapi: generate C types for fixed-width integers
        qapi: add test case for deallocating traversal of incomplete structure
        qapi: fix error propagation
        MAINTAINERS: Replace net maintainer Mark McLoughlin with Stefan Hajnoczi
      a2114348
    • A
      Merge remote-tracking branch 'stefanha/trivial-patches' into staging · ef6bbdf9
      Anthony Liguori 提交于
      * stefanha/trivial-patches:
        Fix some more Qemus in documentation and help text
        qdev: Fix Open Firmware comment
        cpus.c: Make all_cpu_threads_idle() static
        Use macro QEMU_PACKED for new packed structures
        Recognize PCID feature
        powerpc pci: fixed packing of ranges[]
      ef6bbdf9
    • A
      Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging · 400006c2
      Anthony Liguori 提交于
      * pmaydell/arm-devs.for-upstream:
        exynos4210: add Exynos4210 i2c implementation
        hw/exynos4210_rtc.c: remove unnecessary code
        hw/exynos4210_rtc.c: Fix calculating for value of year
        hw/vexpress.c: Allow >4GB of RAM for Cortex-A15 daughterboard
        hw/arm_boot.c: Support DTBs which use 64 bit addresses
        device_tree: Add support for reading device tree properties
        hw/arm_boot.c: Check for RAM sizes exceeding ATAGS capacity
        hw/arm_boot.c: Consistently use ram_size from arm_boot_info struct
        hw/arm_boot.c: Make ram_size a uint64_t
        hw/pl011.c: Avoid crash on read when no chr backend present
      400006c2
    • A
      Merge remote-tracking branch 'stefanha/tracing' into staging · 903f650b
      Anthony Liguori 提交于
      * stefanha/tracing:
        Update simpletrace.py for new log format
        Simpletrace v2: Support multiple arguments, strings.
        monitor: remove unused do_info_trace
        trace: added ability to comment out events in the list
      903f650b
  5. 23 7月, 2012 9 次提交