mbox

[PULL,00/15] Timer, virtio-scsi-test, build, memory changes for 2015-06-19

Message ID 1434699936-4433-1-git-send-email-pbonzini@redhat.com
State New
Headers show

Pull-request

git://github.com/bonzini/qemu.git tags/for-upstream

Message

Paolo Bonzini June 19, 2015, 7:45 a.m. UTC
The following changes since commit 93f6d1c16036aaf34055d16f54ea770fb8d6d280:

  Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging (2015-06-16 10:35:43 +0100)

are available in the git repository at:

  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 4e6ab89110c85f7163b875d9e900e97ab0a175b0:

  exec: clamp accesses against the MemoryRegionSection (2015-06-19 09:06:04 +0200)

----------------------------------------------------------------
* 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

----------------------------------------------------------------
Fam Zheng (5):
      tests: Link libqos virtio object to virtio-scsi-test
      libqos: Allow calling guest_free on NULL pointer
      libqos: Complete virtio device ID definition list
      tests: virtio-scsi: Move start/stop to individual test functions
      tests: virtio-scsi: Add test for unaligned WRITE SAME

Paolo Bonzini (2):
      exec: do not clamp accesses to MMIO regions
      exec: clamp accesses against the MemoryRegionSection

Paul Donohue (2):
      qemu-timer: Call clock reset notifiers on forward jumps
      mc146818rtc: Reset the periodic timer on load

Petr Matousek (1):
      i8254: fix out-of-bounds memory access in pit_ioport_read()

Pranith Kumar (1):
      qemu-log: Open file for logging when specified

Yossi Hindin (4):
      qemu-ga: adding vss-[un]install options
      qemu-ga: debug printouts to help troubleshoot installation
      qemu-ga: Introduce Windows MSI script
      qemu-ga: Building Windows MSI installation with configure/Makefile

 Makefile                  |  24 +++++-
 configure                 |  66 +++++++++++++++
 exec.c                    |   8 +-
 hw/timer/i8254.c          |   6 ++
 hw/timer/mc146818rtc.c    |   6 ++
 include/qemu/timer.h      |   9 +++
 qemu-timer.c              |   2 +-
 qga/channel-win32.c       |   2 +-
 qga/commands-win32.c      |   1 +
 qga/installer/qemu-ga.wxs | 145 +++++++++++++++++++++++++++++++++
 qga/main.c                |  10 ++-
 tests/Makefile            |   2 +-
 tests/libqos/malloc.c     |   3 +
 tests/libqos/virtio.h     |  10 ++-
 tests/virtio-scsi-test.c  | 201 ++++++++++++++++++++++++++++++++++++++++++++--
 vl.c                      |  13 ++-
 16 files changed, 485 insertions(+), 23 deletions(-)
 create mode 100644 qga/installer/qemu-ga.wxs

Comments

Peter Maydell June 19, 2015, 10:19 a.m. UTC | #1
On 19 June 2015 at 08:45, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 93f6d1c16036aaf34055d16f54ea770fb8d6d280:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging (2015-06-16 10:35:43 +0100)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 4e6ab89110c85f7163b875d9e900e97ab0a175b0:
>
>   exec: clamp accesses against the MemoryRegionSection (2015-06-19 09:06:04 +0200)
>
> ----------------------------------------------------------------
> * 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

Hi. I'm afraid this fails to build on 32 bit:

/root/qemu/tests/virtio-scsi-test.c: In function ‘qvirtio_scsi_pci_init’:
/root/qemu/tests/virtio-scsi-test.c:96:12: error: cast from pointer to
integer of different size [-Werror=pointer-to-int-cast]

thanks
-- PMM
Peter Maydell June 19, 2015, 3:34 p.m. UTC | #2
On 19 June 2015 at 11:19, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 19 June 2015 at 08:45, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> The following changes since commit 93f6d1c16036aaf34055d16f54ea770fb8d6d280:
>>
>>   Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20150615-1' into staging (2015-06-16 10:35:43 +0100)
>>
>> are available in the git repository at:
>>
>>   git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to 4e6ab89110c85f7163b875d9e900e97ab0a175b0:
>>
>>   exec: clamp accesses against the MemoryRegionSection (2015-06-19 09:06:04 +0200)
>>
>> ----------------------------------------------------------------
>> * 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
>
> Hi. I'm afraid this fails to build on 32 bit:
>
> /root/qemu/tests/virtio-scsi-test.c: In function ‘qvirtio_scsi_pci_init’:
> /root/qemu/tests/virtio-scsi-test.c:96:12: error: cast from pointer to
> integer of different size [-Werror=pointer-to-int-cast]

...incidentally, this is a good reason not to throw CVE fixes in
with other patches in a pull request, I think. What we seem to
have done recently is to either (a) directly apply the CVE patch
or (b) provide a single-patch pull request with only the CVE patch,
which means we can put the fixes into master on the day of
disclosure. (That will become more important as a property if we
can get our story for CVE patches on stable branches sorted out...)

thanks
-- PMM