1. 11 Dec, 2012 14 commits
  2. 10 Dec, 2012 5 commits
    • Anthony Liguori's avatar
      Merge remote-tracking branch 'afaerber/qom-cpu' into staging · 1c97e303
      Anthony Liguori authored
      
      
      * afaerber/qom-cpu:
        target-i386: Postpone cpuid_level update to realize time
        target-i386: Use define for cpuid vendor string size
        target-i386: Separate feature string parsing from CPU model lookup
        target-i386/cpu.c: Coding style fixes
        qdev: qdev_create(): use error_report() instead of hw_error()
        sysemu.h: Include qemu-types.h instead of qemu-common.h
        Create qemu-types.h for struct typedefs
        qlist.h: Do not include qemu-common.h
        qga/channel-posix.c: Include headers it needs
        qapi/qmp-registry.c: Include headers it needs
        ui/vnc-palette.c: Include headers it needs
        user: Rename qemu-types.h to qemu-user-types.h
        user: Move *-user/qemu-types.h to main directory
      Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
      1c97e303
    • Anthony Liguori's avatar
      Merge remote-tracking branch 'stefanha/trivial-patches' into staging · 7c12fd9b
      Anthony Liguori authored
      
      
      * stefanha/trivial-patches:
        pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path
        qemu-options: Fix space at EOL
        Fix spelling in comments and documentation
        Clean up pci_drive_hot_add()'s use of BlockInterfaceType
        arm: a9mpcore: remove un-used ptimer_iomem field
        target-sparc: Remove t0, t1 from CPUSPARCState
        target-m68k: Remove t1 from CPUM68KState
        target-alpha: Remove t0, t1 from CPUAlphaState
        s390x: Spelling fixes (endianess -> endianness, occured -> occurred)
        Fix comments (adress -> address, layed -> laid, wierd -> weird)
        Fix spelling (prefered -> preferred)
        configure: Remove stray debug output
        sd: Send debug printfery to stderr not stdout
      
      Conflicts:
      	configure
      
      Resolve spelling conflict in configure.
      Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
      7c12fd9b
    • Anthony Liguori's avatar
      Merge remote-tracking branch 'kraxel/acpi.1' into staging · 8385b173
      Anthony Liguori authored
      
      
      * kraxel/acpi.1:
        acpi: drop debug port
        q35: update lpc pci config space according to configured devices
        apci: switch piix4 pci hotplug to memory api
        acpi: remove acpi_gpe_blk
        apci: switch piix4 gpe to memory api
        acpi: fix piix4 smbus mapping
        acpi: switch smbus to memory api
        acpi: cleanup ich9 memory region
        apci: switch ich9 smi to memory api
        apci: switch ich9 gpe to memory api
        acpi: cleanup vt82c686 memory region
        acpi: cleanup piix4 memory region
        apci: switch evt to memory api
        apci: switch cnt to memory api
        apci: switch timer to memory api
        apci: switch vt82c686 to memory api
        apci: switch ich9 to memory api
        apci: switch piix4 to memory api
      
      Conflicts:
      	hw/lpc_ich9.c
      
      Resolved merge conflict due to apm_init adding an argument.
      Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
      8385b173
    • Anthony Liguori's avatar
      Merge remote-tracking branch 'aneesh/for-upstream' into staging · 16ef55ca
      Anthony Liguori authored
      
      
      * aneesh/for-upstream:
        virtfs-proxy-helper: use setresuid and setresgid
      Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
      16ef55ca
    • Anthony Liguori's avatar
      Merge remote-tracking branch 'kraxel/usb.74' into staging · c62adbee
      Anthony Liguori authored
      
      
      * kraxel/usb.74:
        usb-tablet: Allow connecting to ehci
        ehci: Lower timer freq when the periodic schedule is idle
        usb: Allow overriding of usb_desc at the device level
        usb: Don't allow USB_RET_ASYNC for interrupt packets
        usb: Call wakeup when data becomes available for all devices with int eps
        add pc-1.4
      Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
      c62adbee
  3. 08 Dec, 2012 21 commits