Skip to content
Snippets Groups Projects
  1. Jun 12, 2015
    • Fam Zheng's avatar
      net/socket: Drop net_socket_can_send · 6e99c631
      Fam Zheng authored
      
      This callback is called by main loop before polling s->fd, if it returns
      false, the fd will not be polled in this iteration.
      
      This is redundant with checks inside read callback. After this patch,
      the data will be sent to peer when it arrives. If the device can't
      receive, it will be queued to incoming_queue, and when the device status
      changes, this queue will be flushed.
      
      If the peer is not ready, disable the read poll until send completes.
      
      Signed-off-by: default avatarFam Zheng <famz@redhat.com>
      Message-id: 1433400324-7358-6-git-send-email-famz@redhat.com
      Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
      6e99c631
    • Fam Zheng's avatar
      netmap: Drop netmap_can_send · e8dd1d9c
      Fam Zheng authored
      
      This callback is called by main loop before polling s->fd, if it returns
      false, the fd will not be polled in this iteration.
      
      This is redundant with checks inside read callback. After this patch,
      the data will be copied from s->fd to s->iov when it arrives. If the
      device can't receive, it will be queued to incoming_queue, and when the
      device status changes, this queue will be flushed.
      
      Also remove the qemu_can_send_packet() check in netmap_send. If it's
      true, we are good; if it's false, the qemu_sendv_packet_async would
      return 0 and read poll will be disabled until netmap_send_completed is
      called.
      
      Signed-off-by: default avatarFam Zheng <famz@redhat.com>
      Message-id: 1433400324-7358-5-git-send-email-famz@redhat.com
      Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
      e8dd1d9c
    • Fam Zheng's avatar
      l2tpv3: Drop l2tpv3_can_send · 95b1416a
      Fam Zheng authored
      
      This callback is called by main loop before polling s->fd, if it returns
      false, the fd will not be polled in this iteration.
      
      This is redundant with checks inside read callback. After this patch,
      the data will be copied from s->fd to s->msgvec when it arrives. If the
      device can't receive, it will be queued to incoming_queue, and when the
      device status changes, this queue will be flushed.
      
      Signed-off-by: default avatarFam Zheng <famz@redhat.com>
      Message-id: 1433400324-7358-4-git-send-email-famz@redhat.com
      Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
      95b1416a
    • Fam Zheng's avatar
      stubs: Add qemu_set_fd_handler · 0bc12c4f
      Fam Zheng authored
      
      Some qemu_set_fd_handler2 stub callers will be converted to
      call qemu_set_fd_handler, add this stub for them before making the
      change.
      
      Signed-off-by: default avatarFam Zheng <famz@redhat.com>
      Message-id: 1433400324-7358-2-git-send-email-famz@redhat.com
      Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
      0bc12c4f
  2. Jun 11, 2015
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · d8e3b729
      Peter Maydell authored
      
      pc, acpi, virtio
      
      Most notably this includes virtio 1 patches
      Still not all devices converted, and not fully spec compliant,
      so disabled by default.
      
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Thu Jun 11 12:53:08 2015 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: (42 commits)
        i386/acpi-build: fix PXB workarounds for unsupported BIOSes
        i386/acpi-build: more traditional _UID and _HID for PXB root buses
        vhost-scsi: move qdev properties into vhost-scsi.c
        virtio-9p-device: move qdev properties into virtio-9p-device.c
        virtio-serial-bus: move qdev properties into virtio-serial-bus.c
        virtio-rng: move qdev properties into virtio-rng.c
        virtio-scsi: move qdev properties into virtio-scsi.c
        virtio-net.h: Remove unsed DEFINE_VIRTIO_NET_PROPERTIES
        virtio-net: move qdev properties into virtio-net.c
        virtio-input: emulated devices [pci]
        virtio-input: core code & base class [pci]
        pci: add PCI_CLASS_INPUT_*
        virtio-pci: fill VirtIOPCIRegions early.
        virtio-pci: drop identical virtio_pci_cap
        virtio-pci: move cap type to VirtIOPCIRegion
        virtio-pci: move virtio_pci_add_mem_cap call to virtio_pci_modern_region_map
        virtio-pci: add virtio_pci_modern_region_map()
        virtio-pci: add virtio_pci_modern_regions_init()
        virtio-pci: add struct VirtIOPCIRegion for virtio-1 regions
        virtio-balloon: switch to virtio_add_feature
        ...
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      d8e3b729
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20150611-1' into staging · afa25c4b
      Peter Maydell authored
      
      sdl2: fix crash in handle_windowevent() when restoring the screen size
      
      # gpg: Signature made Thu Jun 11 08:57:38 2015 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-sdl-20150611-1:
        sdl2: fix crash in handle_windowevent() when restoring the screen size
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      afa25c4b
    • Eric Auger's avatar
      hw/vfio/platform: replace g_malloc0_n by g_new0 · 0b70743d
      Eric Auger authored
      
      g_malloc0_n() is introduced since glib-2.24 while QEMU currently
      requires glib-2.22. This may cause a link error on some distributions.
      
      Signed-off-by: default avatarEric Auger <eric.auger@linaro.org>
      Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
      Acked-by: default avatarAlex Williamson <alex.williamson@redhat.com>
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      0b70743d
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150611-1' into staging · 169b7133
      Peter Maydell authored
      
      spice: fix segfault in qemu_spice_create_update, ui_info tweaks.
      
      # gpg: Signature made Thu Jun 11 08:48:49 2015 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/spice/tags/pull-spice-20150611-1:
        spice: ui_info tweaks
        spice-display: fix segfault in qemu_spice_create_update
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      169b7133
    • Laszlo Ersek's avatar
      i386/acpi-build: fix PXB workarounds for unsupported BIOSes · 4ebc736e
      Laszlo Ersek authored
      
      The patch
      
        apci: fix PXB behaviour if used with unsupported BIOS
      
      uses the following condition to see if a "PXB mem/IO chunk" has *not* been
      configured by the BIOS:
      
        (!range_base || range_base > range_limit)
      
      When this condition evaluates to true, said patch *omits* the
      corresponding entry from the _CRS.
      
      Later on the patch checks for the opposite condition (with the intent of
      *adding* entries to the _CRS if the "PXB mem/IO chunks" *have* been
      configured). Unfortunately, the condition was negated incorrectly: only
      the first ! operator was removed, which led to the nonsensical expression
      
        (range_base || range_base > range_limit)
      
      leading to bogus entries in the _CRS, and causing BSOD in Windows Server
      2012 R2 when it runs on OVMF.
      
      The correct negative of the condition seen at the top is
      
        (range_base && range_base <= range_limit)
      
      Fix the expressions.
      
      Cc: Marcel Apfelbaum <marcel@redhat.com>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
      Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
      Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      4ebc736e
    • Laszlo Ersek's avatar
      i386/acpi-build: more traditional _UID and _HID for PXB root buses · c96d9286
      Laszlo Ersek authored
      
      The ACPI specification permits the _HID and _UID objects to evaluate to
      strings. (See "6.1.5 _HID (Hardware ID)" and "6.1.12 _UID (Unique ID)" in
      the ACPI v6.0 spec.)
      
      With regard to related standards, the UEFI specification can also express
      a device address composed from string _HID and _UID identifiers, inside
      the Expanded ACPI Device Path Node. (See "9.3.3 ACPI Device Path", Table
      49, in the UEFI v2.5 spec.)
      
      However, numeric (integer) contents for both _HID and _UID are more
      traditional. They are recommended by the UEFI spec for size reasons:
      
        [...] the ACPI Device Path node is smaller and should be used if
        possible to reduce the size of device paths that may potentially be
        stored in nonvolatile storage [...]
      
      External tools support them better (for example the --acpi_hid and
      --acpi_uid options of "efibootmgr" only take numeric identifiers).
      Finally, numeric _HID and _UID contents are existing practice in the QEMU
      source.
      
      This patch was tested with a Fedora 20 LiveCD and a preexistent Windows
      Server 2012 R2 guest. Using "acpidump" and "iasl" in the Fedora guest, we
      get, in the SSDT:
      
      > Scope (\_SB)
      > {
      >   Device (PC04)
      >   {
      >     Name (_UID, 0x04)  // _UID: Unique ID
      >     Name (_HID, EisaId ("PNP0A03") /* PCI Bus */)  // _HID: Hardware ID
      
      Cc: Marcel Apfelbaum <marcel@redhat.com>
      Cc: Michael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarLaszlo Ersek <lersek@redhat.com>
      Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
      Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      c96d9286
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150611-1' into staging · 39e16a5b
      Peter Maydell authored
      
      gtk: don't exit early in case gtk init fails
      
      # gpg: Signature made Thu Jun 11 10:38:29 2015 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-gtk-20150611-1:
        gtk: don't exit early in case gtk init fails
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      39e16a5b
    • Gerd Hoffmann's avatar
    • Gerd Hoffmann's avatar
      spice: ui_info tweaks · 5a9259a0
      Gerd Hoffmann authored
      
      Use the new dpy_ui_info_supported function.
      Clarifies the control flow.
      
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      5a9259a0
    • Gerd Hoffmann's avatar
      spice-display: fix segfault in qemu_spice_create_update · c6e48470
      Gerd Hoffmann authored
      Although it is pretty unusual the stride for the guest image and the
      mirror image maintained by spice-display can be different.  So use
      separate variables for them.
      
      https://bugzilla.redhat.com/show_bug.cgi?id=1163047
      
      
      
      Cc: qemu-stable@nongnu.org
      Reported-by: default avatarperrier vincent <clownix@clownix.net>
      Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
      c6e48470
  3. Jun 10, 2015
Loading