1. 06 6月, 2014 7 次提交
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 26edf8cc
      Peter Maydell 提交于
      pc,pci,virtio,qdev fixes, tests
      
      new tests for SMBIOS
      SMBIOS fixes
      pc, pci fixes
      qdev patches stayed on list for a month with no review,
      as I told people on KVM forum I'm merging stuch patches
      if they look fine.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      * remotes/mst/tags/for_upstream:
        qdev: Add test of qdev_prop_check_global
        qdev: Display warning about unused -global
        tests: add smbios testing
        tests: rename acpi-test to bios-tables-test
        virtio-balloon: return empty data when no stats are available
        pcie_host: Turn pcie_host_init() into an instance_init
        SMBIOS: Fix type 17 field sizes
        SMBIOS: Update Type 0 struct generator for machines >= 2.1
        SMBIOS: Fix endian-ness when populating multi-byte fields
        serial-pci: Set prog interface field of pci config to 16550 compatible
      
      Conflicts:
      	include/hw/i386/pc.h
      [PMM: fixed trivial conflict in pc.h]
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      26edf8cc
    • P
      Merge remote-tracking branch 'remotes/bonzini/softmmu-smap' into staging · 31e25e3e
      Peter Maydell 提交于
      * remotes/bonzini/softmmu-smap: (33 commits)
        target-i386: cleanup x86_cpu_get_phys_page_debug
        target-i386: fix protection bits in the TLB for SMEP
        target-i386: support long addresses for 4MB pages (PSE-36)
        target-i386: raise page fault for reserved bits in large pages
        target-i386: unify reserved bits and NX bit check
        target-i386: simplify pte/vaddr calculation
        target-i386: raise page fault for reserved physical address bits
        target-i386: test reserved PS bit on PML4Es
        target-i386: set correct error code for reserved bit access
        target-i386: introduce support for 1 GB pages
        target-i386: introduce do_check_protect label
        target-i386: tweak handling of PG_NX_MASK
        target-i386: commonize checks for PAE and non-PAE
        target-i386: commonize checks for 4MB and 4KB pages
        target-i386: commonize checks for 2MB and 4KB pages
        target-i386: fix coding standards in x86_cpu_handle_mmu_fault
        target-i386: simplify SMAP handling in MMU_KSMAP_IDX
        target-i386: fix kernel accesses with SMAP and CPL = 3
        target-i386: move check_io helpers to seg_helper.c
        target-i386: rename KSMAP to KNOSMAP
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      31e25e3e
    • P
      Merge remote-tracking branch 'remotes/rth/tcg-next' into staging · 9d48d3f0
      Peter Maydell 提交于
      * remotes/rth/tcg-next:
        TCG: Fix tcg_gen_extr_i64_tl for 32bit
        tcg: Remove TCG_TARGET_HAS_new_ldst
        tci: Convert to new ldst opcodes
        tcg-i386: Fix win64 qemu store
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9d48d3f0
    • P
      Merge remote-tracking branch 'remotes/kvm/uq/master' into staging · 9f0355b5
      Peter Maydell 提交于
      * remotes/kvm/uq/master:
        kvm: Fix eax for cpuid leaf 0x40000000
        kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation
        kvm: Enable -cpu option to hide KVM
        kvm: Ensure negative return value on kvm_init() error handling path
        target-i386: set CC_OP to CC_OP_EFLAGS in cpu_load_eflags
        target-i386: get CPL from SS.DPL
        target-i386: rework CPL checks during task switch, preparing for next patch
        target-i386: fix segment flags for SMM and VM86 mode
        target-i386: Fix vm86 mode regression introduced in fd460606.
        kvm_stat: allow choosing between tracepoints and old stats
        kvmclock: Ensure time in migration never goes backward
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      9f0355b5
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-10' into staging · d4f005db
      Peter Maydell 提交于
      updates for docs/multiseat.txt
      input: add support for kbd delays
      
      # gpg: Signature made Wed 04 Jun 2014 08:22:39 BST 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-input-10:
        docs/multiseat.txt: add note about spice
        docs/multiseat.txt: gtk joined the party
        docs/multiseat.txt: use autoseat
        input/vnc: use kbd delays in press_key
        input/curses: add kbd delay between keydown and keyup events
        input: use kbd delays for send_key monitor command
        input: add support for kbd delays
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      d4f005db
    • D
      qdev: Add test of qdev_prop_check_global · 711e2f1e
      Don Slutz 提交于
      This will generate a warning from "make check":
      
      ...
      GTESTER tests/test-qdev-global-props
      Warning: "-global dynamic-prop-type-bad.prop3=103" not used
      GTESTER tests/check-qom-interface
      ...
      
      If the warning is not generated, the test will fail.
      Signed-off-by: NDon Slutz <dslutz@verizon.com>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      711e2f1e
    • D
      qdev: Display warning about unused -global · 9f9260a3
      Don Slutz 提交于
      This can help a user understand why -global was ignored.
      
      For example: with "-vga cirrus"; "-global vga.vgamem_mb=16" is just
      ignored when "-global cirrus-vga.vgamem_mb=16" is not.
      
      This is currently clear when the wrong property is provided:
      
      out/x86_64-softmmu/qemu-system-x86_64 -global cirrus-vga.vram_size_mb=16 -monitor pty -vga cirrus
      char device redirected to /dev/pts/20 (label compat_monitor0)
      qemu-system-x86_64: Property '.vram_size_mb' not found
      Aborted (core dumped)
      
      vs
      
      out/x86_64-softmmu/qemu-system-x86_64 -global vga.vram_size_mb=16 -monitor pty -vga cirrus
      char device redirected to /dev/pts/20 (label compat_monitor0)
      VNC server running on `::1:5900'
      ^Cqemu: terminating on signal 2
      Signed-off-by: NDon Slutz <dslutz@verizon.com>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      9f9260a3
  2. 05 6月, 2014 33 次提交