[Qemu-commits] [qemu/qemu] 8fe6bb: qga: distinguish binary modes in "guest_file_open_...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8fe6bbca7176c9dfb35083a71bda95c1856e2ed5
      
https://github.com/qemu/qemu/commit/8fe6bbca7176c9dfb35083a71bda95c1856e2ed5
  Author: Laszlo Ersek <address@hidden>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: distinguish binary modes in "guest_file_open_modes" map

In Windows guests this may make a difference.

Since the original patch (commit c689b4f1) sought to be pedantic and to
consider theoretical corner cases of portability, we should fix it up
where it failed to come through in that pursuit.

Suggested-by: Eric Blake <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 2b720018060179b394f8ce736983373ab80dd37c
      
https://github.com/qemu/qemu/commit/2b720018060179b394f8ce736983373ab80dd37c
  Author: Laszlo Ersek <address@hidden>
  Date:   2013-05-13 (Mon, 13 May 2013)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: unlink just created guest-file if fchmod() or fdopen() fails on it

We shouldn't allow guest filesystem pollution on error paths.

Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 6d46895b51103fa26c97ee0e0d895c004e9594d7
      
https://github.com/qemu/qemu/commit/6d46895b51103fa26c97ee0e0d895c004e9594d7
  Author: KONRAD Frederic <address@hidden>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M hw/virtio/virtio-bus.c

  Log Message:
  -----------
  virtio: add virtio_bus_get_dev_path.

This adds virtio_bus_get_dev_path to fix migration id string which is wrong
since the virtio refactoring.

Signed-off-by: KONRAD Frederic <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Cc: mdroth <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 8db165b36ef893ac69af0452f20eeb78e7b26b5a
      
https://github.com/qemu/qemu/commit/8db165b36ef893ac69af0452f20eeb78e7b26b5a
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M main-loop.c

  Log Message:
  -----------
  main-loop: narrow win32 pollfds_fill() event bitmasks

pollfds_fill() and pollfds_poll() translate GPollFD to rfds/wfds/xfds
for sockets on win32.  select(2) is the underlying system call which is
used to monitor sockets for activity.

Currently file descriptors that monitor G_IO_ERR will be included in
both rfds and wfds.  As a result, select(2) will report writability on
file descriptors where we only really wanted to monitor readability
(with errors).

slirp_pollfds_poll() hit this issue: UDP sockets are blocking sockets so
we hang in sorecvfrom() when G_IO_ERR is set due to the socket being
writable (we only wanted to check for readability).

This patch fixes the slirp_pollfds_poll() hang.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 3cb8c205e36531a07dff1d8414c9e2cbf04c980b
      
https://github.com/qemu/qemu/commit/3cb8c205e36531a07dff1d8414c9e2cbf04c980b
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2013-05-16 (Thu, 16 May 2013)

  Changed paths:
    M main-loop.c

  Log Message:
  -----------
  main-loop: partial revert of 5e3bc73

This patch reverts part of 5e3bc735d93dd23f074b5116fd11e1ad8cd4962f.

Paolo Bonzini wrote this patch and commented:

"WSAEventSelect is edge-triggered and the event will not be signaled if
the socket handler does not consume all the data in the socket buffer."

Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 77417f10701d330c7005b0f0a2c0cef9e05d430d
      
https://github.com/qemu/qemu/commit/77417f10701d330c7005b0f0a2c0cef9e05d430d
  Author: Michael Roth <address@hidden>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M migration.c

  Log Message:
  -----------
  Revert "migration: don't account sleep time for calculating bandwidth"

This reverts commit 7161082c8d8cf167c508976887a0a63f4db92b51.

Reverting this patch fixes a divide-by-zero error in qemu that can be
fairly reliably triggered by doing block migration. In this case, the
configuration/error was:

source: temp/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -L temp-bios
-M pc-i440fx-1.4 -m 512M -kernel boot/vmlinuz-x86_64 -initrd
boot/test-initramfs-x86_64.img.gz -vga std -append seed=1234 -drive
file=disk1.img,if=virtio -drive file=disk2.img,if=virtio -device
virtio-net-pci,netdev=net0 -netdev user,id=net0 -monitor
unix:/tmp/vm-hmp.sock,server,nowait -qmp
unix:/tmp/vm-qmp.sock,server,nowait -vnc :100

16837 Floating point exception(core dumped)

target: temp/x86_64-softmmu/qemu-system-x86_64 -enable-kvm -L temp-bios
-M pc-i440fx-1.4 -m 512M -kernel boot/vmlinuz-x86_64 -initrd
boot/test-initramfs-x86_64.img.gz -vga std -append seed=1234 -drive
file=target_disk1.img,if=virtio -drive file=target_disk2.img,if=virtio
-device virtio-net-pci,netdev=net0 -netdev user,id=net0 -incoming
unix:/tmp/migrate.sock -monitor
unix:/tmp/vm-hmp-incoming.sock,server,nowait -qmp
unix:/tmp/vm-qmp-incoming.sock,server,nowait -vnc :101

Receiving block device images
20 %
21 %
load of migration failed

This revert potentially re-introduces a bug that was present in 1.4,
but fixes a prevalent issue with block migration so we should revert
it for now and take an updated patch later.

Conflicts:

        migration.c

* fixed up to remove logic introduced in 7161082c while leaving
  changes in HEAD intact

Signed-off-by: Michael Roth <address@hidden>
Message-id: address@hidden
Signed-off-by: Anthony Liguori <address@hidden>


  Commit: ce4cc31695ee7e647ef5a3a3c1258089794dcb83
      
https://github.com/qemu/qemu/commit/ce4cc31695ee7e647ef5a3a3c1258089794dcb83
  Author: Anthony Liguori <address@hidden>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  Merge remote-tracking branch 'mdroth/qga-pull-2013-05-13' into staging

* mdroth/qga-pull-2013-05-13:
  qga: unlink just created guest-file if fchmod() or fdopen() fails on it
  qga: distinguish binary modes in "guest_file_open_modes" map

Signed-off-by: Anthony Liguori <address@hidden>


  Commit: 91b96cdc5befe56e7d9651189d0cbf06fc3f3902
      
https://github.com/qemu/qemu/commit/91b96cdc5befe56e7d9651189d0cbf06fc3f3902
  Author: Anthony Liguori <address@hidden>
  Date:   2013-05-17 (Fri, 17 May 2013)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for 1.5.0-rc3 release

Signed-off-by: Anthony Liguori <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c49fdf137f0f...91b96cdc5bef