Permalink
Commits on Aug 15, 2012
  1. prep: Use pc87312 device instead of collection of random ISA devices

    We can't however replace the built-in IDE controller, as the one in
    pc87312 is only single-channel and can use only IRQ 14. Therefore the
    pc87312's IDE function gets disabled via the config property.
    
    PReP emulation also gains a parallel port emulation this way.
    
    Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
    [AF: Use TYPE_PC87312 constant, add to ppc64-softmmu and to MAINTAINERS]
    Signed-off-by: Andreas Färber <andreas.faerber@web.de>
    Hervé Poussineau committed with Apr 14, 2012
  2. prep: Add pc87312 Super I/O emulation

    This provides floppy and IDE controllers as well as serial and parallel
    ports. However, dynamic configuration of devices is not yet supported.
    
    Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
    [AF: QOM'ify, split out header, create CharDriverState if absent]
    Signed-off-by: Andreas Färber <andreas.faerber@web.de>
    Hervé Poussineau committed with Apr 14, 2012
  3. prep: Include devices for ppc64 as well

    Allows running qemu-system-ppc64 -M prep for consistency.
    
    Reported-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Andreas Färber <andreas.faerber@web.de>
    Acked-by: Hervé Poussineau <hpoussineau@reactos.org>
    committed Aug 15, 2012
  4. win32: provide separate macros for weak decls and definitions

    mingw32 seems to want the declaration to also carry the weak attribute.
    Strangely, gcc on Linux absolutely does not want the declaration to be marked
    as weak.  This may not be the right fix, but it seems to do the trick.
    
    Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
    Anthony Liguori committed Aug 15, 2012
  5. Merge remote-tracking branch 'stefanha/trivial-patches' into staging

    * stefanha/trivial-patches:
      ivshmem, qdev-monitor: fix order of qerror parameters
      iov_send_recv(): Handle zero bytes case even if OS does not
      framebuffer: Fix spelling in comment (leight -> height)
      Spelling fix in comment (peripherans -> peripherals)
      docs: Fix spelling (propery -> property)
      trace: Fix "Qemu" -> "QEMU"
      cputlb.c: Fix out of date comment
      ehci: fix assertion typo
      Makefile: Avoid explicit list of directories in clean target
    Anthony Liguori committed Aug 15, 2012
  6. Merge remote-tracking branch 'kwolf/for-anthony' into staging

    * kwolf/for-anthony:
      qemu-iotests: Fix 030 after switch to GenericError
      block: Flush parent to OS with cache=unsafe
      iscsi: Fix NULL dereferences / races between task completion and abort
      monitor: Clean up fd sets on monitor disconnect
      block: Enable qemu_open/close to work with fd sets
      block: Convert close calls to qemu_close
      block: Convert open calls to qemu_open
      block: Prevent detection of /dev/fdset/ as floppy
      qapi: Introduce add-fd, remove-fd, query-fdsets
      qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg
    Anthony Liguori committed Aug 15, 2012
  7. Merge remote-tracking branch 'qemu-kvm/uq/master' into staging

    * qemu-kvm/uq/master:
      update-linux-headers.sh: Pull in asm-generic/kvm_para.h
      kvmvapic: Disable if there is insufficient memory
      kvm: i8254: Finish time conversion fix
      kvm: i8254: Cache kernel clock offset in KVMPITState
    Anthony Liguori committed Aug 15, 2012
  8. Merge remote-tracking branch 'stefanha/tracing' into staging

    * stefanha/tracing:
      trace/simple: Replace asprintf by g_strdup_printf
      trace/simple: Fix compiler warning for 32 bit hosts
      trace: avoid pointer aliasing in trace_record_finish()
      trace: drop unused TraceBufferRecord->next_tbuf_idx field
      trace: remove unnecessary write_to_buffer() typecasting
      trace: rename TraceRecordHeader to TraceLogHeader
    Anthony Liguori committed Aug 15, 2012
  9. ivshmem, qdev-monitor: fix order of qerror parameters

    Now that the QERR_ macros no longer contain a json dictionary,
    the order of some parameters needs to be fixed for them to appear
    correctly.
    
    Signed-off-by: Alberto Garcia <agarcia@igalia.com>
    Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    bertogg committed with Stefan Hajnoczi Aug 14, 2012
  10. iov_send_recv(): Handle zero bytes case even if OS does not

    POSIX allows sendmsg() and recvmsg() to fail EMSGSIZE if passed a zero
    msg.msg_iovlen (in particular the MacOS X implementation will do this).
    Handle the case where iov_send_recv() is passed a zero byte count
    explicitly, to avoid accidentally depending on the OS to treat zero
    msg_iovlen as a no-op.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Acked-by: Michael Tokarev <mjt@tls.msk.ru>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    pm215 committed with Stefan Hajnoczi Aug 11, 2012
  11. framebuffer: Fix spelling in comment (leight -> height)

    Signed-off-by: Stefan Weil <sw@weilnetz.de>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    stweil committed with Stefan Hajnoczi Aug 11, 2012
  12. Spelling fix in comment (peripherans -> peripherals)

    Signed-off-by: Stefan Weil <sw@weilnetz.de>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    stweil committed with Stefan Hajnoczi Aug 10, 2012
  13. docs: Fix spelling (propery -> property)

    Signed-off-by: Stefan Weil <sw@weilnetz.de>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    stweil committed with Stefan Hajnoczi Aug 10, 2012
  14. trace: Fix "Qemu" -> "QEMU"

    Signed-off-by: Stefan Weil <sw@weilnetz.de>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    stweil committed with Stefan Hajnoczi Aug 10, 2012
  15. cputlb.c: Fix out of date comment

    The comment about the return address from get_page_addr_code() was
    well out of date as phys_ram_base has not existed for some time.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    pm215 committed with Stefan Hajnoczi Aug 10, 2012
  16. ehci: fix assertion typo

    Signed-off-by: Alejandro Martinez Ruiz <alex@securiforest.com>
    Reviewed-by: Andreas Färber <afaerber@suse.de>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    unleashed committed with Stefan Hajnoczi Aug 14, 2012
  17. Makefile: Avoid explicit list of directories in clean target

    Avoid having an explicit list of directories in the 'clean'
    target by using 'find' to remove all .o and .d files instead.
    
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Eric Blake <eblake@redhat.com>
    Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    pm215 committed with Stefan Hajnoczi Aug 15, 2012
  18. qemu-iotests: Fix 030 after switch to GenericError

    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    Kevin Wolf committed Aug 15, 2012
  19. block: Flush parent to OS with cache=unsafe

    Commit 29cdb25 already added a comment that no unnecessary flushes to
    disk will occur, this patch makes the code even get to the point of the
    comment. This is mostly theoretical because in practice we only stack
    one format on top of one protocol, the former implementing flush_to_os
    and the latter only flush_to_disk. It starts to matter when drivers that
    are not on top implement flush_to_os.
    
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
    Kevin Wolf committed Aug 15, 2012
  20. iscsi: Fix NULL dereferences / races between task completion and abort

    Signed-off-by: Stefan Priebe <s.priebe@profihost.ag>
    Acked-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Stefan Priebe committed with Kevin Wolf Aug 15, 2012
  21. monitor: Clean up fd sets on monitor disconnect

    Fd sets are shared by all monitor connections.  Fd sets are considered
    to be in use while at least one monitor is connected.  When the last
    monitor disconnects, all fds that are members of an fd set with no
    outstanding dup references are closed.  This prevents any fd leakage
    associated with a client disconnect prior to using a passed fd.
    
    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
  22. block: Enable qemu_open/close to work with fd sets

    When qemu_open is passed a filename of the "/dev/fdset/nnn"
    format (where nnn is the fdset ID), an fd with matching access
    mode flags will be searched for within the specified monitor
    fd set.  If the fd is found, a dup of the fd will be returned
    from qemu_open.
    
    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
  23. block: Convert close calls to qemu_close

    This patch converts all block layer close calls, that correspond
    to qemu_open calls, to qemu_close.
    
    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
  24. block: Convert open calls to qemu_open

    This patch converts all block layer open calls to qemu_open.
    
    Note that this adds the O_CLOEXEC flag to the changed open paths
    when the O_CLOEXEC macro is defined.
    
    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
  25. block: Prevent detection of /dev/fdset/ as floppy

    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
  26. qapi: Introduce add-fd, remove-fd, query-fdsets

    This patch adds support that enables passing of file descriptors
    to the QEMU monitor where they will be stored in specified file
    descriptor sets.
    
    A file descriptor set can be used by a client like libvirt to
    store file descriptors for the same file.  This allows the
    client to open a file with different access modes (O_RDWR,
    O_WRONLY, O_RDONLY) and add/remove the passed fds to/from an fd
    set as needed.  This will allow QEMU to (in a later patch in this
    series) "open" and "reopen" the same file by dup()ing the fd in
    the fd set that corresponds to the file, where the fd has the
    matching access mode flag that QEMU requests.
    
    The new QMP commands are:
      add-fd: Add a file descriptor to an fd set
      remove-fd: Remove a file descriptor from an fd set
      query-fdsets: Return information describing all fd sets
    
    Note: These commands are not compatible with the existing getfd
    and closefd QMP commands.
    
    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
  27. qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg

    Set the close-on-exec flag for the file descriptor received
    via SCM_RIGHTS.
    
    Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
    Signed-off-by: Kevin Wolf <kwolf@redhat.com>
    Corey Bryant committed with Kevin Wolf Aug 14, 2012
Commits on Aug 14, 2012
  1. update-linux-headers.sh: Pull in asm-generic/kvm_para.h

    Add asm-generic/kvm_para.h to the set of non-architecture specific
    KVM kernel headers we copy into QEMU. This header may be included
    by an architecture's kvm_para.h header.
    
    Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    pm215 committed with Marcelo Tosatti Jul 25, 2012
  2. kvmvapic: Disable if there is insufficient memory

    We need at least 1M of RAM to map the option ROM. Otherwise, we will
    corrupt host memory or even crash:
    
        $ qemu-system-x86_64 -nodefaults --enable-kvm -vnc :0 -m 640k
        Segmentation fault (core dumped)
    
    Reported-and-tested-by: Markus Armbruster <armbru@redhat.com>
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    jan-kiszka committed with Marcelo Tosatti Aug 14, 2012
  3. kvm: i8254: Finish time conversion fix

    0cdd3d1 fixed reading back the counter load time from the kernel
    while assuming the kernel would always update its load time on writing
    the state. That is only true for channel 1, and so pit_get_channel_info
    returned wrong output pin states for high counter values.
    
    Fix this by applying the offset also on kvm_pit_put. Now we also need to
    update the offset when we write the state while the VM is stopped as it
    keeps on changing in that state.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    jan-kiszka committed with Marcelo Tosatti Aug 14, 2012
  4. kvm: i8254: Cache kernel clock offset in KVMPITState

    To prepare the final fix for clock calibration issues with the in-kernel
    PIT, we want to cache the offset between vmclock and the clock used by
    the in-kernel PIT. So far, we only need to update it when the VM state
    changes between running and stopped because we only read the in-kernel
    PIT state while the VM is running.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    jan-kiszka committed with Marcelo Tosatti Aug 14, 2012
  5. Merge remote-tracking branch 'origin/master' into staging

    * origin/master:
      linux-user: ARM: Ignore immediate value for svc in thumb mode
      linux-user: Use init_guest_space when -R and -B are specified
      linux-user: Factor out guest space probing into a function
      flatload: fix bss clearing
      linux-user: make host_to_target_cmsg support SO_TIMESTAMP cmsg_type
      linux-user: make do_setsockopt support SOL_RAW ICMP_FILTER socket option
      linux-user: pass sockaddr from host to target
      x86: switch to AREG0 free mode
      x86: avoid AREG0 in segmentation helpers
      x86: avoid AREG0 for misc helpers
      x86: use wrappers for memory access helpers
      x86: avoid AREG0 for SMM helpers
      x86: avoid AREG0 for SVM helpers
      x86: avoid AREG0 for integer helpers
      x86: avoid AREG0 for condition code helpers
      x86: avoid AREG0 for FPU helpers
      linux-user: Move target_to_host_errno_table[] setup out of ioctl loop
      linux-user: Fix SNDCTL_DSP_MAP{IN, OUT}BUF ioctl definitions
      linux-user: Fix incorrect TARGET_BLKBSZGET, TARGET_BLKBSZSET
    Anthony Liguori committed Aug 14, 2012
  6. Merge branch 'linux-user.next' of git://git.linaro.org/people/pmaydel…

    …l/qemu-arm
    
    * 'linux-user.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
      linux-user: ARM: Ignore immediate value for svc in thumb mode
      linux-user: Use init_guest_space when -R and -B are specified
      linux-user: Factor out guest space probing into a function
      flatload: fix bss clearing
      linux-user: make host_to_target_cmsg support SO_TIMESTAMP cmsg_type
      linux-user: make do_setsockopt support SOL_RAW ICMP_FILTER socket option
      linux-user: pass sockaddr from host to target
      linux-user: Move target_to_host_errno_table[] setup out of ioctl loop
      linux-user: Fix SNDCTL_DSP_MAP{IN, OUT}BUF ioctl definitions
      linux-user: Fix incorrect TARGET_BLKBSZGET, TARGET_BLKBSZSET
    blueswirl committed Aug 14, 2012
  7. linux-user: ARM: Ignore immediate value for svc in thumb mode

    When running in thumb mode, Linux doesn't evaluate the immediate value
    of the svc instruction, but instead just always assumes the syscall number
    to be in r7.
    
    This fixes executing go_bootstrap while building go for me.
    
    Signed-off-by: Alexander Graf <agraf@suse.de>
    Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    agraf committed with pm215 May 29, 2012
  8. linux-user: Use init_guest_space when -R and -B are specified

    Roll the code used to initialize the guest memory space when -R
    or -B is used into 'init_guest_space' and then call 'init_guest_space'
    from the driver.  This way the reserved guest memory space can
    be probed for.  Calling 'mmap' just once as is currently done is not
    guaranteed to succeed since the host address space validation might fail.
    
    Signed-off-by: Meador Inge <meadori@codesourcery.com>
    [PMM: Fixed minor whitespace errors.]
    Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    meadori committed with pm215 Jul 26, 2012