1. 16 8月, 2014 2 次提交
    • P
      Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-08-15' into staging · 142f4ac5
      Peter Maydell 提交于
      trivial patches for 2014-08-15
      
      # gpg: Signature made Fri 15 Aug 2014 16:13:03 BST using RSA key ID A4C3D7DB
      # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
      # gpg:                 aka "Michael Tokarev <mjt@debian.org>"
      # 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: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
      #      Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514  66A7 BEE5 9D74 A4C3 D7DB
      
      * remotes/mjt/tags/trivial-patches-2014-08-15:
        ivshmem: check the value returned by fstat()
        l2cap: fix access to freed memory
        intc: i8259: Convert Array allocation to g_new0
        ppc: convert g_new(qemu_irq usages to g_new0
        ssi: xilinx_spi: Initialise CS GPIOs as NULL
        vl: free err
        qemu-options.hx: fix typo about l2tpv3
        vmxnet3: don't use 'Yoda conditions'
        vl: don't use 'Yoda conditions'
        spice: don't use 'Yoda conditions'
        don't use 'Yoda conditions'
        isa-bus: don't use 'Yoda conditions'
        audio: don't use 'Yoda conditions'
        usb: don't use 'Yoda conditions'
        CODING_STYLE: Section about conditional statement
        pci-host: update uncorresponding description
        pci-host: update obsolete reference about piix_pci.c
        qemu-options.hx: fix a typo of chardev
        memory: Update obsolete comment about AddrRange field type
        apic: Fix reported DFR content
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      142f4ac5
    • P
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · f2c85a2f
      Peter Maydell 提交于
      post-2.1 bugfixes
      
      A bunch of fixes that missed 2.1 by a small margin.
      If we do 2.1.1, some of these would be good candidates,
      added Cc qemu-stable as appropriate.
      Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Thu 14 Aug 2014 17:07:25 BST using RSA key ID D28D5469
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>"
      
      * remotes/mst/tags/for_upstream:
        pc: Get rid of pci-info leftovers
        e1000: use symbolic constants to init phy ctrl & status registers
        e1000: correctly handle phy_ctrl reserved & self-clearing bits
        ivshmem: fix building when debug mode is enabled
        acpi: align RSDP
        numa: show hex number in error message for consistency and prefix them with 0x
        pc-dimm: fix up error message
        pc-dimm: validate node property
        hw:i386: typo fix: MEMORY_HOPTLUG_DEVICE -> MEMORY_HOTPLUG_DEVICE
        hw/audio/intel-hda: Fix MSI capability address
        pc: Create 2.2 machine type
        pci: Use bus master address space for delivering MSI/MSI-X messages
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      f2c85a2f
  2. 15 8月, 2014 38 次提交