Skip to content

Commits

Permalink
for-upstream
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

Commits on Mar 16, 2015

  1. virtio: Fix memory leaks reported by Coverity

    All four leaks are similar, so fix them in one patch.
    Success path was not doing memory free.
    
    Signed-off-by: Stefan Weil <sw@weilnetz.de>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    stweil authored and kvaneesh committed Mar 16, 2015
    Copy the full SHA
    4ed7b2c View commit details
    Browse the repository at this point in the history
  2. virtfs-proxy: Fix possible overflow

    It's detected by coverity. The socket name specified
    should fit in the sockadd_un.sun_path. If not abort.
    
    Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
    Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    shannonz88 authored and kvaneesh committed Mar 16, 2015
    Copy the full SHA
    25ee9a7 View commit details
    Browse the repository at this point in the history
  3. fsdev/virtfs-proxy-helper: Fix improper use of negative value

    It's detected by coverity. Check the return value of proxy_marshal.
    
    Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
    Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    shannonz88 authored and kvaneesh committed Mar 16, 2015
    Copy the full SHA
    821c447 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2015

  1. hw/9pfs/virtio-9p-posix-acl: Fix out-of-bounds access

    It's detected by coverity. Fix out-of-bounds access of the function mp_dacl_listxattr.
    
    Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
    Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    shannonz88 authored and kvaneesh committed Mar 13, 2015
    Copy the full SHA
    9005c3b View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2015

  1. 9pfs-proxy: tiny cleanups in proxy_pwritev and proxy_preadv

    Don't compare syscall return with -1, use "<0" condition.
    Don't introduce useless local variables when we already
    have similar variable
    Rename local variable to be consistent with other usages
    Finally make the two methods, read and write, to be similar to each other
    
    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Michael Tokarev authored and kvaneesh committed Mar 12, 2015
    Copy the full SHA
    7752efc View commit details
    Browse the repository at this point in the history
  2. 9pfs-local: simplify/optimize local_mapped_attr_path()

    Omit one unnecessary memory allocation for components
    of the path and create the resulting path directly given
    lengths of the components.
    
    Do not use basename(3) because there are 2 versions of
    this function which differs when argument ends with
    slash character, use strrchr() instead so we have
    consistent result.  This also makes sure the function
    will do the right thing in corner cases (eg, empty
    pathname is given), when basename(3) return entirely
    another string.
    
    Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
    Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Michael Tokarev authored and kvaneesh committed Mar 12, 2015
    Copy the full SHA
    1b6f85e View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150311' into…

    … staging
    
    MIPS patches 2015-03-11
    
    Changes:
    * use VMStateDescription for MIPS CPU
    
    # gpg: Signature made Wed Mar 11 15:01:52 2015 GMT using RSA key ID 0B29DA6B
    # gpg: Can't check signature: public key not found
    
    * remotes/lalrae/tags/mips-20150311:
      target-mips: add missing MSACSR and restore fp_status and hflags
      target-mips: replace cpu_save/cpu_load with VMStateDescription
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    ee74801 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2…

    …0150311' into staging
    
    target-arm queue:
     * fix a bug in bitops.h
     * implement SD card support on integratorcp
     * add a missing 'compatible' property for Cortex-A57
     * add Netduino 2 machine model
     * fix command line parsing bug for CPU options with multiple CPUs
    
    # gpg: Signature made Wed Mar 11 14:14:22 2015 GMT using RSA key ID 14360CDE
    # gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
    
    * remotes/pmaydell/tags/pull-target-arm-20150311:
      bitops.h: sextract64() return type should be int64_t, not uint64_t
      integrator/cp: Implement CARDIN and WPROT signals
      integrator/cp: Model CP control registers as sysbus device
      target-arm: Add missing compatible property to A57
      netduino2: Add the Netduino 2 Machine
      stm32f205: Add the stm32f205 SoC
      stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG
      stm32f2xx_USART: Add the stm32f2xx USART Controller
      stm32f2xx_timer: Add the stm32f2xx Timer
      hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    d598911 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20150310…

    …' into staging
    
    s390x/kvm: Features and fixes for 2.3
    
    - an extension to the elf loader to allow relocations
    - make the ccw bios relocatable. This allows for bigger ramdisks
      or smaller guests
    - Handle all slow SIGPs in QEMU (instead of kernel) for better
      compliance and correctness
    - tell the KVM module the maximum guest size. This allows KVM
      to reduce the number or page table levels
    - Several fixes/cleanups
    
    # gpg: Signature made Wed Mar 11 10:17:13 2015 GMT using RSA key ID B5A61C7C
    # gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
    
    * remotes/borntraeger/tags/s390x-20150310:
      s390-ccw: rebuild BIOS
      s390/bios: Make the s390-ccw.img relocatable
      elf-loader: Provide the possibility to relocate s390 ELF files
      s390-ccw.img: Reinitialize guessing on reboot
      s390-ccw.img: Allow bigger ramdisk sizes or offsets
      s390x/kvm: passing max memory size to accelerator
      virtio-ccw: Convert to realize()
      virtio-s390: Convert to realize()
      virtio-s390: s390_virtio_device_init() can't fail, simplify
      s390x/kvm: enable the new SIGP handling in user space
      s390x/kvm: deliver SIGP RESTART directly if stopped
      s390x: add function to deliver restart irqs
      s390x/kvm: SIGP START is only applicable when STOPPED
      s390x/kvm: implement handling of new SIGP orders
      s390x/kvm: trace all SIGP orders
      s390x/kvm: helper to set the SIGP status in SigpInfo
      s390x/kvm: pass the SIGP instruction parameter to the SIGP handler
      s390x/kvm: more details for SIGP handler with one destination vcpu
      s390x: introduce defines for SIGP condition codes
      synchronize Linux headers to 4.0-rc3
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    165fa40 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'remotes/amit/tags/vser-for-2.3-1' into …

    …staging
    
    virtio-serial: fix crash on port hotplug when a previously-added port
    did not have the 'name' property set.
    
    # gpg: Signature made Wed Mar 11 11:13:53 2015 GMT using RSA key ID 854083B6
    # gpg: Good signature from "Amit Shah <amit@amitshah.net>"
    # gpg:                 aka "Amit Shah <amit@kernel.org>"
    # gpg:                 aka "Amit Shah <amitshah@gmx.net>"
    
    * remotes/amit/tags/vser-for-2.3-1:
      virtio-serial: fix segfault on NULL port names
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    9159eb9 View commit details
    Browse the repository at this point in the history
  5. target-mips: add missing MSACSR and restore fp_status and hflags

    Save MSACSR state. Also remove fp_status, msa_fp_status, hflags and restore
    them in post_load() from the architectural registers.
    Float exception flags are not present in vmstate. Information they carry
    is used only by softfloat caller who translates them into MIPS FCSR.Cause,
    FCSR.Flags and then they are cleared. Therefore there is no need for saving
    them in vmstate.
    
    Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
    Reviewed-by: Richard Henderson <rth@twiddle.net>
    Leon Alrae committed Mar 11, 2015
    Copy the full SHA
    6445111 View commit details
    Browse the repository at this point in the history
  6. target-mips: replace cpu_save/cpu_load with VMStateDescription

    Create VMStateDescription for MIPS CPU. The new structure contains exactly the
    same fields as before, therefore leaving existing version_id.
    
    Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
    Leon Alrae committed Mar 11, 2015
    Copy the full SHA
    04cd796 View commit details
    Browse the repository at this point in the history
  7. bitops.h: sextract64() return type should be int64_t, not uint64_t

    The documentation for sextract64() claims that the return type is
    an int64_t, but the code itself disagrees. Fix the return type to
    conform to the documentation and to bring it into line with
    sextract32(), which returns int32_t.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Richard Henderson <rth@twiddle.net>
    Message-id: 1423231328-15662-1-git-send-email-peter.maydell@linaro.org
    pm215 committed Mar 11, 2015
    Copy the full SHA
    4f99505 View commit details
    Browse the repository at this point in the history
  8. integrator/cp: Implement CARDIN and WPROT signals

    This allows to use the SD card emulation of the board: Forward the
    signals from the pl181 top the CP control register emulation, report the
    current state via CP_INTREG, deliver CARDIN IRQ to the secondary
    interrupt controller and also support clearing that line via CP_INTREG.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Message-id: c55d9fb28d19ec83625cb0074b3b6f2e5958caf6.1426004843.git.jan.kiszka@siemens.com
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    jan-kiszka authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    83d0cf8 View commit details
    Browse the repository at this point in the history
  9. integrator/cp: Model CP control registers as sysbus device

    No new features yet, just encapsulation.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Message-id: 3829c7c7e01cd3ccf15a1198f114e4d675974ae0.1426004843.git.jan.kiszka@siemens.com
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    jan-kiszka authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    ffc8542 View commit details
    Browse the repository at this point in the history
  10. target-arm: Add missing compatible property to A57

    Signed-off-by: Ryota Ozaki <ozaki.ryota@gmail.com>
    Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Message-id: 1424097799-11002-1-git-send-email-ozaki.ryota@gmail.com
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    ozaki-r authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    0458b7b View commit details
    Browse the repository at this point in the history
  11. netduino2: Add the Netduino 2 Machine

    This patch adds the Netduino 2 Machine.
    
    This is a Cortex-M3 based machine. Information can be found at:
    http://www.netduino.com/netduino2/specs.htm
    
    Signed-off-by: Alistair Francis <alistair@alistair23.me>
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Message-id: 5bd999824f14252c122c4501cc973cee986eadd7.1424175342.git.alistair@alistair23.me
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    alistair23 authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    da6bd92 View commit details
    Browse the repository at this point in the history
  12. stm32f205: Add the stm32f205 SoC

    This patch adds the stm32f205 SoC. This will be used by the
    Netduino 2 to create a machine.
    
    Signed-off-by: Alistair Francis <alistair@alistair23.me>
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Message-id: 48d509747a1ea0d8a7d5480560495e679990f9d2.1424175342.git.alistair@alistair23.me
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    alistair23 authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    db63552 View commit details
    Browse the repository at this point in the history
  13. stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG

    This patch adds the stm32f2xx System Configuration
    Controller. This is used to configure what memory is mapped
    at address 0 (although that is not supported) as well
    as configure how the EXTI interrupts work (also not
    supported at the moment).
    
    This device is not required for basic examples, but more
    complex systems will require it (as well as the EXTI device)
    
    Signed-off-by: Alistair Francis <alistair@alistair23.me>
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Message-id: 5d499d7b60b61d5d6dcb310b2e55411b1f53794e.1424175342.git.alistair@alistair23.me
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    alistair23 authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    bbbbd90 View commit details
    Browse the repository at this point in the history
  14. stm32f2xx_USART: Add the stm32f2xx USART Controller

    This patch adds the stm32f2xx USART controller
    (UART also uses the same controller).
    
    Signed-off-by: Alistair Francis <alistair@alistair23.me>
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Message-id: 762c6c0d2a41d574932bc4445ec9bfffe6da8798.1424175342.git.alistair@alistair23.me
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    alistair23 authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    73af5d1 View commit details
    Browse the repository at this point in the history
  15. stm32f2xx_timer: Add the stm32f2xx Timer

    This patch adds the stm32f2xx timers: TIM2, TIM3, TIM4 and TIM5
    to QEMU.
    
    Signed-off-by: Alistair Francis <alistair@alistair23.me>
    Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
    Message-id: 155091a323390f8da3cca496e4c611c493e62a77.1424175342.git.alistair@alistair23.me
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    alistair23 authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    be28470 View commit details
    Browse the repository at this point in the history
  16. hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1

    The recently introduced feature that allows 32 bit guests to be
    executed under KVM on a 64-bit host incorrectly handles the case
    where more than 1 cpu is specified using '-smp N'
    
    For instance, this invocation of qemu
    
      qemu-system-aarch64 -M virt -cpu cortex-a57,aarch64=off -smp 2
    
    produces the following error
    
      qemu-system-aarch64: Expected key=value format, found aarch64
    
    which is caused by the destructive parsing performed by
    cpu_common_parse_features(), resulting in subsequent attempts
    to parse the CPU option string (for each additional CPU) to fail.
    
    So duplicate the string before parsing it, and free it directly
    afterwards.
    
    Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
    Reviewed-by: Greg Bellows <greg.bellows@linaro.org>
    Message-id: 1425402380-10488-1-git-send-email-ard.biesheuvel@linaro.org
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Ard Biesheuvel authored and pm215 committed Mar 11, 2015
    Copy the full SHA
    886bc7a View commit details
    Browse the repository at this point in the history
  17. Merge remote-tracking branch 'remotes/afaerber/tags/qom-cpu-for-peter…

    …' into staging
    
    QOM CPUState and X86CPU
    
    * Add CPUClass documentation
    * Clean up X86CPU APIC realization
    * Cleanups around cpu_init()
    
    # gpg: Signature made Tue Mar 10 17:27:28 2015 GMT using RSA key ID 3E7E013F
    # gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
    # gpg:                 aka "Andreas Färber <afaerber@suse.com>"
    
    * remotes/afaerber/tags/qom-cpu-for-peter:
      cpu: Make cpu_init() return QOM CPUState object
      unicore32: Use uc32_cpu_init()
      m68k: Use cpu_m68k_init()
      target-unicore32: Make uc32_cpu_init() return UniCore32CPU
      target-i386: Clean up misuse of qdev_init() in realize method
      cpu: Add missing documentation for some CPUClass methods
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    8d86e34 View commit details
    Browse the repository at this point in the history
  18. Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request'…

    … into staging
    
    X86 patches queued in the last few weeks. Mostly code cleanup and changes on
    code assigning APIC ID.
    
    # gpg: Signature made Mon Mar  9 20:40:38 2015 GMT using RSA key ID 984DC5A6
    # gpg: Can't check signature: public key not found
    
    * remotes/ehabkost/tags/x86-pull-request:
      target-i386: Require APIC ID to be explicitly set before CPU realize
      target-i386: Move APIC ID compatibility code to pc.c
      target-i386: Move CPUX86State::cpuid_apic_id to X86CPU::apic_id
      target-i386: Remove unused APIC ID default code
      target-i386: Eliminate unnecessary get_cpuid_vendor() function
      target-i386: Simplify listflags() function
      target-i386: Move topology.h to include/hw/i386
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    4841237 View commit details
    Browse the repository at this point in the history
  19. virtio-serial: fix segfault on NULL port names

    Commit d0a0bfe added checks for port
    names, but didn't add a check to ensure port->name is non-NULL.  This
    results in a SIGSEGV when adding a port when one of the previously-added
    ports didn't have the 'name' property set.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1192775
    
    Reported-by: vivian zhang <vivianzhang@redhat.com>
    Reviewed-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Amit Shah <amit.shah@redhat.com>
    Amit Shah committed Mar 11, 2015
    Copy the full SHA
    b18a755 View commit details
    Browse the repository at this point in the history
  20. s390-ccw: rebuild BIOS

    rebuild bios to get latest changes:
    
    s390/bios: Make the s390-ccw.img relocatable
    s390-ccw.img: Reinitialize guessing on reboot
    s390-ccw.img: Allow bigger ramdisk sizes or offsets
    
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    borntraeger committed Mar 11, 2015
    Copy the full SHA
    2d5eeef View commit details
    Browse the repository at this point in the history
  21. s390/bios: Make the s390-ccw.img relocatable

    The current bios sits at location 0x7e00000 in the guest RAM
    and thus prevents loading of bigger ramdisks. By making the
    image relocatable we can move it to the end of the RAM so that
    it is getting out of the way.
    
    Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
    Message-Id: <1425895973-15239-3-git-send-email-thuth@linux.vnet.ibm.com>
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    [Fixup build failure on 32 bit hosts]
    huth authored and borntraeger committed Mar 11, 2015
    Copy the full SHA
    d884c86 View commit details
    Browse the repository at this point in the history
  22. Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed…

    …' into staging
    
    qemu-sparc update
    
    # gpg: Signature made Tue Mar 10 13:39:51 2015 GMT using RSA key ID AE0F321F
    # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
    
    * remotes/mcayland/tags/qemu-sparc-signed:
      sun4u: switch m48t59 NVRAM to MMIO access
      MAINTAINERS: add myself as SPARC maintainer
      doc: minor updates to SPARC32 and SPARC64 documentation
      m48t59: add m48t59 sysbus device
      m48t59: introduce new base-year qdev property
      m48t59: let init functions return a Nvram object
      m48t59: add a Nvram interface
      m48t59: register a QOM type for each nvram type we support
      m48t59: move ISA ports/memory regions registration to QOM constructor
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 11, 2015
    Copy the full SHA
    4ba4df4 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2015

  1. Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150310-1…

    …' into staging
    
    vnc bugfixes.
    
    # gpg: Signature made Tue Mar 10 10:37:51 2015 GMT 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-vnc-20150310-1:
      Fix crash when connecting to VNC through websocket
      vnc: -readconfig fix
      vnc: set id at parse time not init time
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 10, 2015
    Copy the full SHA
    21025c2 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into…

    … staging
    
    - scsi: improvements to error reporting and conversion to realize,
      Coverity/sparse fix for iscsi driver
    - RCU fallout: fix -daemonize and s390x system emulation
    - KVM: kvm_stat improvements and new man page
    - x86: SYSRET fix for VxWorks
    
    # gpg: Signature made Tue Mar 10 10:18:45 2015 GMT using RSA key ID 78C7AE83
    # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
    # gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
    # 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: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
    #      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83
    
    * remotes/bonzini/tags/for-upstream:
      x86: fix SS selector in SYSRET
      scsi: Convert remaining PCI HBAs to realize()
      scsi: Improve error reporting for invalid drive property
      hw: Propagate errors through qdev_prop_set_drive()
      scsi: Clean up duplicated error in legacy if=scsi code
      cpus: initialize cpu->memory_dispatch
      rcu: handle forks safely
      qemu-thread: do not use PTHREAD_MUTEX_ERRORCHECK
      kvm_stat: add kvm_stat.1 man page
      kvm_stat: add column headers to text UI
      iscsi: Fix check for username
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    pm215 committed Mar 10, 2015
    Copy the full SHA
    23a7a28 View commit details
    Browse the repository at this point in the history
  3. cpu: Make cpu_init() return QOM CPUState object

    Instead of making cpu_init() return CPUArchState, return CPUState.
    
    Changes were made using the Coccinelle semantic patch below.
    
      @@
      typedef CPUState;
      identifier e;
      expression args;
      type CPUArchState;
      @@
      -   e =
      +   cpu =
              cpu_init(args);
      -   if (!e) {
      +   if (!cpu) {
              ...
          }
      -   cpu = ENV_GET_CPU(env);
      +   e = cpu->env_ptr;
    
      @@
      identifier new_env, new_cpu, env, cpu;
      type CPUArchState;
      expression args;
      @@
      -{
      -   CPUState *cpu = ENV_GET_CPU(env);
      -   CPUArchState *new_env = cpu_init(args);
      -   CPUState *new_cpu = ENV_GET_CPU(new_env);
      +{
      +   CPUState *cpu = ENV_GET_CPU(env);
      +   CPUState *new_cpu = cpu_init(args);
      +   CPUArchState *new_env = new_cpu->env_ptr;
          ...
      }
    
      @@
      identifier c, cpu_init_func, cpu_model;
      type StateType, CPUType;
      @@
      -static inline StateType* cpu_init(const char *cpu_model)
      -{
      -   CPUType *c = cpu_init_func(cpu_model);
      (
      -   if (c == NULL) {
      -       return NULL;
      -   }
      -   return &c->env;
      |
      -   if (c) {
      -       return &c->env;
      -   }
      -   return NULL;
      )
      -}
      +#define cpu_init(cpu_model) CPU(cpu_init_func(cpu_model))
    
      @@
      identifier cpu_init_func;
      identifier model;
      @@
      -#define cpu_init(model) (&cpu_init_func(model)->env)
      +#define cpu_init(model) CPU(cpu_init_func(model))
    
    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    Cc: Blue Swirl <blauwirbel@gmail.com>
    Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
    Cc: Riku Voipio <riku.voipio@iki.fi>
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Peter Maydell <peter.maydell@linaro.org>
    Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Michael Walle <michael@walle.cc>
    Cc: Aurelien Jarno <aurelien@aurel32.net>
    Cc: Leon Alrae <leon.alrae@imgtec.com>
    Cc: Anthony Green <green@moxielogic.com>
    Cc: Jia Liu <proljc@gmail.com>
    Cc: Alexander Graf <agraf@suse.de>
    Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
    Cc: Max Filippov <jcmvbkbc@gmail.com>
    [AF: Fixed up cpu_copy() manually]
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ehabkost authored and afaerber committed Mar 10, 2015
    Copy the full SHA
    2994fd9 View commit details
    Browse the repository at this point in the history
  4. unicore32: Use uc32_cpu_init()

    Instead of using the legacy cpu_init() function, use uc32_cpu_init() to
    create a UniCore32CPU object.
    
    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ehabkost authored and afaerber committed Mar 10, 2015
    Copy the full SHA
    c3898f7 View commit details
    Browse the repository at this point in the history
  5. m68k: Use cpu_m68k_init()

    Instead of using the legacy cpu_init() function, use cpu_m68k_init()
    directly to create a M68kCPU object.
    
    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ehabkost authored and afaerber committed Mar 10, 2015
    Copy the full SHA
    eeff620 View commit details
    Browse the repository at this point in the history
  6. target-unicore32: Make uc32_cpu_init() return UniCore32CPU

    This way, the cpu_init() function in target-unicore32 will follow the
    same pattern used on all other architectures.
    
    Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    ehabkost authored and afaerber committed Mar 10, 2015
    Copy the full SHA
    4197966 View commit details
    Browse the repository at this point in the history
  7. target-i386: Clean up misuse of qdev_init() in realize method

    x86_cpu_apic_realize() calls qdev_init() to realize the APIC.
    qdev_init()'s error handling has unwanted side effects: it unparents
    the device, and it calls qerror_report_err().
    
    qerror_report_err() is always inappropriate in realize methods,
    because it doesn't return the Error object.  It either reports the
    error to stderr or the human monitor, or it stores it in the QMP
    monitor, where it makes the QMP command fail even though the realize
    method succeeded.
    
    Fortunately, qdev_init() can't actually fail here, because realize
    can't fail for any of the three possible APIC device models.
    
    Clean up by cutting out the qdev_init() middle-man: set property
    "realized" directly.
    
    Signed-off-by: Markus Armbruster <armbru@redhat.com>
    Reviewed-by: Igor Mammedov <imammedo@redhat.com>
    Signed-off-by: Andreas Färber <afaerber@suse.de>
    Markus Armbruster authored and afaerber committed Mar 10, 2015
    Copy the full SHA
    6e8e265 View commit details
    Browse the repository at this point in the history
Older