[Qemu-commits] [qemu/qemu] 67633b: qemu-log: Open file for logging when specified

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 67633bb4f7743be2cb2e70b61e482ab92bf1724e
      
https://github.com/qemu/qemu/commit/67633bb4f7743be2cb2e70b61e482ab92bf1724e
  Author: Pranith Kumar <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  qemu-log: Open file for logging when specified

qemu-log defaults to stderr when there is no '-D' option mentioned on command
line. When '-D' option is specified, we also need to specify '-d' option for it
to use the specified logfile. When using monitor to enable logging this is
troublesome since there will be no '-d' option because of which monitor dumps
the logs to stderr.

Fix this by opening the log file when '-D' is specified on the command line.
Also fix an ancient comment which does not hold true since changing location and
log level has now been streamlined.

Signed-off-by: Pranith Kumar <address@hidden>
CC: Paolo Bonzini <address@hidden>
CC: Luiz Capitulino <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 5e031072e71eebab3d7d2ea4609e84bc928d893e
      
https://github.com/qemu/qemu/commit/5e031072e71eebab3d7d2ea4609e84bc928d893e
  Author: Yossi Hindin <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qemu-ga: adding vss-[un]install options

Existing command line options include '-s install' and '-s uninstall'.
These options install/uninstall both Windows QEMU GA service
and optional VSS COM server. The QEMU GA Windows service allows
always-on serving guest agent's QMP commands and VSS COM server
enables guest agent integration with Volume Shadow Service.

This commit introdices new options '-s vss-install' and '-s vss-uninstall',
affecting only GA VSS COM server registration. The new options are useful
for registering and unregistering the COM server during MSI installation,
upgrade and uninstallation.

Signed-off-by: Yossi Hindin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c69403fcd4a0cb89f838a212ab71e4a1a3464c95
      
https://github.com/qemu/qemu/commit/c69403fcd4a0cb89f838a212ab71e4a1a3464c95
  Author: Yossi Hindin <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M qga/channel-win32.c
    M qga/commands-win32.c

  Log Message:
  -----------
  qemu-ga: debug printouts to help troubleshoot installation

Debug printouts extended, helps installation troubleshooting

Signed-off-by: Yossi Hindin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 66ae13bb9eb2b16b59698e992bfcea61563b9d78
      
https://github.com/qemu/qemu/commit/66ae13bb9eb2b16b59698e992bfcea61563b9d78
  Author: Yossi Hindin <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    A qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Introduce Windows MSI script

The script enables building Windows MSI installation package on Linux with wixl 
tool.

Signed-off-by: Yossi Hindin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 9dacf32d2cbd66cbcce7944ebdfd6b2df20e33b8
      
https://github.com/qemu/qemu/commit/9dacf32d2cbd66cbcce7944ebdfd6b2df20e33b8
  Author: Yossi Hindin <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M Makefile
    M configure

  Log Message:
  -----------
  qemu-ga: Building Windows MSI installation with configure/Makefile

New options were added to enable Windows MSI installation package
creation:

Option --enable-guest-agent-msi, like the name suggests, enables building
Windows MSI package for QEMU guest agent; option --disable-guest-agent-msi
disables MSI package creation; by default, no MSI package is created

Signed-off-by: Yossi Hindin <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d4862a87e31a51de9eb260f25c9e99a75efe3235
      
https://github.com/qemu/qemu/commit/d4862a87e31a51de9eb260f25c9e99a75efe3235
  Author: Petr Matousek <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M hw/timer/i8254.c

  Log Message:
  -----------
  i8254: fix out-of-bounds memory access in pit_ioport_read()

Due converting PIO to the new memory read/write api we no longer provide
separate I/O region lenghts for read and write operations. As a result,
reading from PIT Mode/Command register will end with accessing
pit->channels with invalid index.

Fix this by ignoring read from the Mode/Command register.

This is CVE-2015-3214.

Reported-by: Matt Tait <address@hidden>
Fixes: 0505bcdec8228d8de39ab1a02644e71999e7c052
Cc: address@hidden
Signed-off-by: Petr Matousek <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ebe7d8b166c59b029521f8d95db011e5e0fc649d
      
https://github.com/qemu/qemu/commit/ebe7d8b166c59b029521f8d95db011e5e0fc649d
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M tests/Makefile

  Log Message:
  -----------
  tests: Link libqos virtio object to virtio-scsi-test

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 28452758c405e16d9890c44d6031d44233e8cb38
      
https://github.com/qemu/qemu/commit/28452758c405e16d9890c44d6031d44233e8cb38
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M tests/libqos/malloc.c

  Log Message:
  -----------
  libqos: Allow calling guest_free on NULL pointer

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: bea2f0982b335c13448dbde8a409107764fa8b59
      
https://github.com/qemu/qemu/commit/bea2f0982b335c13448dbde8a409107764fa8b59
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M tests/libqos/virtio.h

  Log Message:
  -----------
  libqos: Complete virtio device ID definition list

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 06b008d941fd3e9684d38a9b3181a1cf301c78d1
      
https://github.com/qemu/qemu/commit/06b008d941fd3e9684d38a9b3181a1cf301c78d1
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M tests/virtio-scsi-test.c

  Log Message:
  -----------
  tests: virtio-scsi: Move start/stop to individual test functions

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 397c767b2de5b918a7b890d02aae83d6dcb2a470
      
https://github.com/qemu/qemu/commit/397c767b2de5b918a7b890d02aae83d6dcb2a470
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M tests/virtio-scsi-test.c

  Log Message:
  -----------
  tests: virtio-scsi: Add test for unaligned WRITE SAME

This is an exercise for virtio-scsi tests using the libqos virtio
library. A few common routines are added to facilitate future extensions
of the test set.

The added test case is a regression test for the bug in d7f4b1999e.

Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: fb1a3a051d89975f26296163066bb0745ecca49d
      
https://github.com/qemu/qemu/commit/fb1a3a051d89975f26296163066bb0745ecca49d
  Author: Paul Donohue <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M include/qemu/timer.h
    M qemu-timer.c

  Log Message:
  -----------
  qemu-timer: Call clock reset notifiers on forward jumps

Commit 691a0c9c introduced a mechanism by which QEMU_CLOCK_HOST can
notify other parts of the emulator when the host clock has jumped
backward.  This is used to avoid stalling timers that were scheduled
based on the host clock.

However, if the host clock jumps forward, then timers that were
scheduled based on the host clock may fire rapidly and cause other
problems.  For example, the mc146818rtc periodic timer will block
execution of the VM and consume host CPU while firing every interrupt
for the time period that was skipped by the host clock.

To correct that problem, this commit fires the reset notification if the
host clock jumps forward by more than a hard-coded limit.  The limit is
currently set to a value of 60 seconds, which should be small enough to
prevent excessive timer loops, but large enough to avoid frequent resets
in idle VMs.

Signed-off-by: Paul Donohue <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ae46e23964ad45d5bc72374040e87d8f52ac2178
      
https://github.com/qemu/qemu/commit/ae46e23964ad45d5bc72374040e87d8f52ac2178
  Author: Paul Donohue <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M hw/timer/mc146818rtc.c

  Log Message:
  -----------
  mc146818rtc: Reset the periodic timer on load

When loading a VM from a snapshot or migration, clock changes can cause
the periodic timer to stall or loop rapidly.

qemu-timer has a reset notifier mechanism that is used to avoid timer
stalls or loops if the host clock changes while the VM is running when
using QEMU_CLOCK_HOST.  However, when loading a snapshot or migration,
qemu-timer is initialized and fires the reset notifier before
mc146818rtc is initialized and has registered its reset handler.  In
addition, this mechanism isn't used when using QEMU_CLOCK_REALTIME,
which might also change when loading a snapshot or migration.

To correct that problem, this commit resets the periodic timer after
loading from a snapshot or migration if the clock has either jumped
backward or has jumped forward by more than the clock jump limit that
is used by the reset notifier code in qemu-timer.

Signed-off-by: Paul Donohue <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 965eb2fcdfe919ecced6c34803535ad32dc1249c
      
https://github.com/qemu/qemu/commit/965eb2fcdfe919ecced6c34803535ad32dc1249c
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M exec.c

  Log Message:
  -----------
  exec: do not clamp accesses to MMIO regions

It is common for MMIO registers to overlap, for example a 4 byte register
at 0xcf8 (totally random choice... :)) and a 1 byte register at 0xcf9.
If these registers are implemented via separate MemoryRegions, it is
wrong to clamp the accesses as the value written would be truncated.

Hence for these regions the effects of commit 23820db (exec: Respect
as_translate_internal length clamp, 2015-03-16, previously applied as
commit c3c1bb99) must be skipped.

Tested-by: Hervé Poussineau <address@hidden>
Tested-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e4a511f8cc6f4a46d409fb5c9f72c38ba45f8d83
      
https://github.com/qemu/qemu/commit/e4a511f8cc6f4a46d409fb5c9f72c38ba45f8d83
  Author: Paolo Bonzini <address@hidden>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M exec.c

  Log Message:
  -----------
  exec: clamp accesses against the MemoryRegionSection

Because the clamping was done against the MemoryRegion,
address_space_rw was effectively broken if a write spanned
multiple sections that are not linear in underlying memory
(with the memory not being under an IOMMU).

This is visible with the MIPS rc4030 IOMMU, which is implemented
as a series of alias memory regions that point to the actual RAM.

Tested-by: Hervé Poussineau <address@hidden>
Tested-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: cb4e0f9ddf7d45de7e4716cbab661ea568bd0b6c
      
https://github.com/qemu/qemu/commit/cb4e0f9ddf7d45de7e4716cbab661ea568bd0b6c
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M Makefile
    M configure
    M exec.c
    M hw/timer/i8254.c
    M hw/timer/mc146818rtc.c
    M include/qemu/timer.h
    M qemu-timer.c
    M qga/channel-win32.c
    M qga/commands-win32.c
    A qga/installer/qemu-ga.wxs
    M qga/main.c
    M tests/Makefile
    M tests/libqos/malloc.c
    M tests/libqos/virtio.h
    M tests/virtio-scsi-test.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

* i8254 security fix
* Avoid long 100% CPU wait after restarting guests that use the periodic timer
* Fixes for access clamping (WinXP, MIPS)
* wixl/.msi support for qemu-ga on Windows

# gpg: Signature made Fri Jun 19 11:30:53 2015 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain 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:
  exec: clamp accesses against the MemoryRegionSection
  exec: do not clamp accesses to MMIO regions
  mc146818rtc: Reset the periodic timer on load
  qemu-timer: Call clock reset notifiers on forward jumps
  tests: virtio-scsi: Add test for unaligned WRITE SAME
  tests: virtio-scsi: Move start/stop to individual test functions
  libqos: Complete virtio device ID definition list
  libqos: Allow calling guest_free on NULL pointer
  tests: Link libqos virtio object to virtio-scsi-test
  i8254: fix out-of-bounds memory access in pit_ioport_read()
  qemu-ga: Building Windows MSI installation with configure/Makefile
  qemu-ga: Introduce Windows MSI script
  qemu-ga: debug printouts to help troubleshoot installation
  qemu-ga: adding vss-[un]install options
  qemu-log: Open file for logging when specified

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ad7020a7e7b2...cb4e0f9ddf7d