qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 2d3885: rules.mak: Allow .mo-objs and .mo-cfl


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 2d3885: rules.mak: Allow .mo-objs and .mo-cflags in -y var...
Date: Mon, 03 Nov 2014 07:00:09 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2d38853239ac17984e81fee169d80384784c6401
      
https://github.com/qemu/qemu/commit/2d38853239ac17984e81fee169d80384784c6401
  Author: Fam Zheng <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  rules.mak: Allow .mo-objs and .mo-cflags in -y variables

Expand %.mo-objs in -y nested objects, so that we can write combined
object -cflags rules like what will be done in the coming patch.

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


  Commit: 98001e7b085b19b2b03ca5fdf44d063c204cc325
      
https://github.com/qemu/qemu/commit/98001e7b085b19b2b03ca5fdf44d063c204cc325
  Author: Fam Zheng <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M ui/Makefile.objs

  Log Message:
  -----------
  ui: Use the new ".mo-cflags" rule syntax for SDL_CFLAGS

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


  Commit: 1894df02811f6b79ea3ffbf1084599d96f316173
      
https://github.com/qemu/qemu/commit/1894df02811f6b79ea3ffbf1084599d96f316173
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  scsi: Rename scsi_*_length() to scsi_*_xfer(), add scsi_cdb_length()

scsi_cdb_length() does not return the length of the cdb, but
the transfersize encoded in the cdb. So rename it to scsi_cdb_xfer()
and also rename all other related functions to end with _xfer.

We can then add a new scsi_cdb_length() which actually does return the
length of the cdb.  With that DEBUG_SCSI can now display the correct
CDB buffer.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d97ae3684863960d12633c845f648d50ce767273
      
https://github.com/qemu/qemu/commit/d97ae3684863960d12633c845f648d50ce767273
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M hw/scsi/mfi.h

  Log Message:
  -----------
  megasas: fixup MFI_DCMD_LD_LIST_QUERY

The MFI_DCMD_LD_LIST_QUERY function is using a different format than
MFI_DCMD_LD_LIST, so we need to implement it differently.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7bd908491c4e62767fa959959f3560fb54e34c19
      
https://github.com/qemu/qemu/commit/7bd908491c4e62767fa959959f3560fb54e34c19
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M trace-events

  Log Message:
  -----------
  megasas: simplify trace event messages

The trace events already contain the function name, so the actual
message doesn't need to contain any of these informations.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3f2cd4dd47719497540fb0e0aa0635e127f2838f
      
https://github.com/qemu/qemu/commit/3f2cd4dd47719497540fb0e0aa0635e127f2838f
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M hw/scsi/mfi.h

  Log Message:
  -----------
  megasas: fixup device mapping

Logical drives can only be addressed with the 'target_id' number;
LUN numbers cannot be selected.
Physical drives can be selected with both, target and LUN id.

So we should disallow LUN numbers not equal to 0 when in
RAID mode.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e23d04984a78490d8aaa5c45724a3a334933331f
      
https://github.com/qemu/qemu/commit/e23d04984a78490d8aaa5c45724a3a334933331f
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M hw/scsi/mfi.h
    M include/hw/pci/pci_ids.h

  Log Message:
  -----------
  megasas: add MegaRAID SAS 2108 emulation

The 2108 chip supports MSI and MSI-X, so update the emulation
to support both chips.

Signed-off-by: Hannes Reinecke <address@hidden>
[Make VMStateDescription const. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e74a43154d17ff771bb591e780f64eac0cb2e452
      
https://github.com/qemu/qemu/commit/e74a43154d17ff771bb591e780f64eac0cb2e452
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  megasas: Fix typo in megasas_dcmd_ld_get_list()

The check for a valid command buffer size was inverted.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 77bb6b171043d03f7e4f5212beaa4e6cb3fd6528
      
https://github.com/qemu/qemu/commit/77bb6b171043d03f7e4f5212beaa4e6cb3fd6528
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M trace-events

  Log Message:
  -----------
  megasas: Decode register names

To ease debugging we should be decoding
the register names.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8d72db68fe7b45c7e01f815c4ac3e6c7ac0e26c1
      
https://github.com/qemu/qemu/commit/8d72db68fe7b45c7e01f815c4ac3e6c7ac0e26c1
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M hw/scsi/scsi-bus.c
    M include/hw/scsi/scsi.h
    M trace-events

  Log Message:
  -----------
  megasas: Clear unit attention on initial reset

The EFI firmware doesn't handle unit attentions properly,
so we need to clear the Power On/Reset unit attention upon
initial reset.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 96f8f23a1e900796494a54e8b56610e1a7db2a89
      
https://github.com/qemu/qemu/commit/96f8f23a1e900796494a54e8b56610e1a7db2a89
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M trace-events

  Log Message:
  -----------
  megasas: Ignore duplicate init_firmware commands

The windows driver is sending several init_firmware commands
when in MSI-X mode. It is, however, using only the first
queue. So disregard any additional init_firmware commands
until the HBA is reset.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 200b6966cdd393045ef042f0777faf660115ab22
      
https://github.com/qemu/qemu/commit/200b6966cdd393045ef042f0777faf660115ab22
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  megasas: Implement DCMD_CLUSTER_RESET_LD

Some implementations use DCMD_CLUSTER_RESET_LD to simulate
a device reset.

Signed-off-by: Hannes Reinecke <address@hidden>
[Compare against id, not lun. - Paolo]
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: aaf2a859b6758ad9b3a6fa242b0453bd7d8b7615
      
https://github.com/qemu/qemu/commit/aaf2a859b6758ad9b3a6fa242b0453bd7d8b7615
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M trace-events

  Log Message:
  -----------
  megasas: Update queue logging

Improve queue logging by displaying head and tail pointer
of the completion queue.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6df5718bd3ec56225c44cf96440c723c1b611b87
      
https://github.com/qemu/qemu/commit/6df5718bd3ec56225c44cf96440c723c1b611b87
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M trace-events

  Log Message:
  -----------
  megasas: Rework frame queueing algorithm

Windows requires the frames to be unmapped, otherwise we run
into a race condition where the updated frame data is not
visible to the guest.
With that we can simplify the queue algorithm and use a bitmap
for tracking free frames.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7957ee71c7733ca20178a49ba7de2b84bbc53d29
      
https://github.com/qemu/qemu/commit/7957ee71c7733ca20178a49ba7de2b84bbc53d29
  Author: Hannes Reinecke <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/megasas.c
    M trace-events

  Log Message:
  -----------
  megasas: Fixup MSI-X handling

MSI-X works slightly different than INTx; the doorbell
registers are not necessarily used as MSI-X interrupts
are directed anyway. So the head pointer on the
reply queue needs to be updated as soon as a frame
is completed, and we can set the doorbell only
when in INTx mode.

Signed-off-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: b154537ad07598377ebf98252fb7d2aff127983b
      
https://github.com/qemu/qemu/commit/b154537ad07598377ebf98252fb7d2aff127983b
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M include/hw/i386/pc.h
    M qemu-options.hx
    M vl.c

  Log Message:
  -----------
  -machine vmport=off: Allow disabling of VMWare ioport emulation

This is a pc & q35 only machine opt.

VMWare apparently doesn't like running under QEMU due to our
incomplete emulation of it's special IO Port.  This adds a
pc & q35 property to allow it to be turned off.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Don Slutz <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e4dc3f5909ab90520bc1a27b381c3017ff65ed68
      
https://github.com/qemu/qemu/commit/e4dc3f5909ab90520bc1a27b381c3017ff65ed68
  Author: Nikunj A Dadhania <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/misc/vfio.c
    M include/exec/memory.h
    M memory.c
    M memory_mapping.c

  Log Message:
  -----------
  Add skip_dump flag to ignore memory region during dump

The PCI MMIO might be disabled or the device in the reset state.
Make sure we do not dump these memory regions.

Signed-off-by: Nikunj A Dadhania <address@hidden>
Acked-by: Alex Williamson <address@hidden>
CC: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 522abf69995ca20680ab048cad003796be36ef77
      
https://github.com/qemu/qemu/commit/522abf69995ca20680ab048cad003796be36ef77
  Author: Gonglei <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl.c: Fix Coverity complaining for vmstate_dump_file

commit abfd9ce3(migration: dump vmstate info as a json
file for static analysis) introduce a new command,
'-dump-vmstate', that takes a filename
as an argument.  When executed, QEMU will dump the vmstate information
for the machine type it's invoked with to the file, and quit.

However, only one instance of the -dump-vmstate option is supported.
If more were given, the vmstate_dump_file variable would be overwritten.

This fix also helps silence a Coverity error.

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


  Commit: 076893d3d06fe8642b8912591b9222bcb81f85aa
      
https://github.com/qemu/qemu/commit/076893d3d06fe8642b8912591b9222bcb81f85aa
  Author: Pavel Dovgalyuk <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/i386/kvmvapic.c

  Log Message:
  -----------
  kvmvapic: patch_instruction fix

When QEMU works in icount mode cpu_restore_state function performs two actions:
restoring the program counter and updating icount to the correct value.
kvmvapic's patch_instruction function is called by cpu_report_tpr_access
function which also invokes cpu_restore_state. It results to calling
cpu_restore_state twice - in cpu_report_tpr_access and in patch_instruction.
When icount is disabled second call is safe. But when icount is enabled,
cpu_restore_state modifies instructions counter twice, which leads to incorrect
behavior. This patch removes useless cpu_restore_state call from kvmvapic.

Signed-off-by: Pavel Dovgalyuk <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>


  Commit: c1d4096b0f033d0a52c542f0948403783c3682e9
      
https://github.com/qemu/qemu/commit/c1d4096b0f033d0a52c542f0948403783c3682e9
  Author: Fam Zheng <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  iscsi: Refuse to open as writable if the LUN is write protected

Before, when a write protected iSCSI target is attached as scsi-disk
with BDRV_O_RDWR, we report it as writable, while in fact all writes
will fail.

One way to improve this is to report write protect flag as true to
guest, but a even better way is to refuse using a write protected LUN to
guest.

Target write protect flag is checked with a mode sense query.

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


  Commit: 93bd49aff9081bbe9440192db9da3676941f77a3
      
https://github.com/qemu/qemu/commit/93bd49aff9081bbe9440192db9da3676941f77a3
  Author: Fam Zheng <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

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

  Log Message:
  -----------
  virtio-scsi: Fix memory leak when realize failed

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


  Commit: fb7b5c0df6e3c501973ce4d57eb2b1d4344a519d
      
https://github.com/qemu/qemu/commit/fb7b5c0df6e3c501973ce4d57eb2b1d4344a519d
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M hw/scsi/scsi-generic.c
    M include/hw/scsi/scsi.h

  Log Message:
  -----------
  scsi: devirtualize unrealize of SCSI devices

All implementations are the same.

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


  Commit: 0ba1f53191221b541b938df86a39eeccfb87f996
      
https://github.com/qemu/qemu/commit/0ba1f53191221b541b938df86a39eeccfb87f996
  Author: Fam Zheng <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

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

  Log Message:
  -----------
  virtio-scsi: Fix num_queue input validation

We need to count the ctrlq and eventq, and also cleanup before
returning. Besides, the format string should be unsigned.

The number could never be less than zero.

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


  Commit: 763952d08b9c89726151a72f90bca90d0828302d
      
https://github.com/qemu/qemu/commit/763952d08b9c89726151a72f90bca90d0828302d
  Author: Michael Ellerman <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M scripts/kvm/kvm_stat

  Log Message:
  -----------
  kvm_stat: Only consider online cpus

In kvm_stat we grovel through /sys to find out how many cpus are in the
system. However if a cpu is offline it will still be present in /sys,
and the perf_event_open() will fail.

Modify the logic to only return online cpus. We need to be careful on
systems which don't support cpu hotplug, the online file will not be
present at all.

Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 27d318a88583b2bb263292a4d35931a3bc8d2b7a
      
https://github.com/qemu/qemu/commit/27d318a88583b2bb263292a4d35931a3bc8d2b7a
  Author: Michael Ellerman <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M scripts/kvm/kvm_stat

  Log Message:
  -----------
  kvm_stat: Fix the non-x86 exit reasons

In kvm_stat we have a dictionary of exit reasons for s390. Firstly these
are not s390 specific, they are the generic exit reasons. So rename the
dictionary to reflect that, and add it separately to filters[].

Secondly, the values are defined using hex, but in the kernel header
they are decimal. That means values above 9 in kvm_stat are incorrect.

While we're there, fix the whitespace to match the rest of the file.

Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 4d4103ff32ee4c88857727515b5e596a1debc227
      
https://github.com/qemu/qemu/commit/4d4103ff32ee4c88857727515b5e596a1debc227
  Author: Michael Ellerman <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M scripts/kvm/kvm_stat

  Log Message:
  -----------
  kvm_stat: Rework platform detection

The current platform detection is a little bit messy. We look for lines
in /proc/cpuinfo starting with 'flags' OR 'vendor-id', and scan both
for values we know will only occur in one or the other. We also keep
scanning once we've found a value, which could be a feature, but isn't
in this case.

We'd also like to add another platform, powerpc, which will just make it
worse. So clean it up in preparation.

Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a15d5642a03a0b6c6cf327e497e688d1ba4c676d
      
https://github.com/qemu/qemu/commit/a15d5642a03a0b6c6cf327e497e688d1ba4c676d
  Author: Michael Ellerman <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M scripts/kvm/kvm_stat

  Log Message:
  -----------
  kvm_stat: Abstract ioctl numbers

Unfortunately ioctl numbers are platform specific, so abstract them out
of the code so they can be overridden. As it happens x86 and s390 share
the same values, so nothing needs to change yet.

Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 4725398f9309d05936fec2eaaa6e97e01e25545e
      
https://github.com/qemu/qemu/commit/4725398f9309d05936fec2eaaa6e97e01e25545e
  Author: Michael Ellerman <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M scripts/kvm/kvm_stat

  Log Message:
  -----------
  kvm_stat: Add powerpc support

Add support for powerpc platforms. We use uname -m, which allows us to
detect ppc, ppc64 and ppc64le/el.

Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e64e353590c2584b41cd1db925f67042a05f4250
      
https://github.com/qemu/qemu/commit/e64e353590c2584b41cd1db925f67042a05f4250
  Author: Pavel Dovgalyuk <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M target-i386/translate.c

  Log Message:
  -----------
  i386: fix breakpoints handling in icount mode

This patch fixes instructions counting when execution is stopped on
breakpoint (e.g. set from gdb). Without a patch extra instruction is translated
and icount is incremented by invalid value (which equals to number of
executed instructions + 1).

Signed-off-by: Pavel Dovgalyuk <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Pavel Dovgalyuk <address@hidden>


  Commit: a2e9011b4164894594bf0b2a2a59e9c55c58c17b
      
https://github.com/qemu/qemu/commit/a2e9011b4164894594bf0b2a2a59e9c55c58c17b
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: Check ivshmem_read() size argument

The third argument to the fd_read() callback implemented by
ivshmem_read() is the number of bytes, not a flags field.  Fix this and
check we received enough bytes before accessing the buffer pointer.

Cc: Cam Macdonell <address@hidden>
Reported-by: Sebastian Krahmer <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
[AF: Handle partial reads via FIFO]
Reported-by: Peter Maydell <address@hidden>
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 363ba1c72fed4425e7917afc36722584aaeaad8a
      
https://github.com/qemu/qemu/commit/363ba1c72fed4425e7917afc36722584aaeaad8a
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: validate incoming_posn value from server

Check incoming_posn to avoid out-of-bounds array accesses if the ivshmem
server on the host sends invalid values.

Cc: Cam Macdonell <address@hidden>
Reported-by: Sebastian Krahmer <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
[AF: Tighten upper bound check for posn in close_guest_eventfds()]
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 34bc07c5282a631c2663ae1ded0a186f46f64612
      
https://github.com/qemu/qemu/commit/34bc07c5282a631c2663ae1ded0a186f46f64612
  Author: Sebastian Krahmer <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: Fix potential OOB r/w access

Fix OOB access via malformed incoming_posn parameters
and check that requested memory is actually alloc'ed.

Signed-off-by: Sebastian Krahmer <address@hidden>
[AF: Rebased, cleanups, avoid fd leak]
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3a31cff11203bf62ebafa6d74b1fcf2aba345eed
      
https://github.com/qemu/qemu/commit/3a31cff11203bf62ebafa6d74b1fcf2aba345eed
  Author: Andreas Färber <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: Fix fd leak on error

Reported-by: Stefan Hajnoczi <address@hidden>
Cc: address@hidden
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: dbc464d401f989bbca7812b068c3aded1d834f79
      
https://github.com/qemu/qemu/commit/dbc464d401f989bbca7812b068c3aded1d834f79
  Author: Andrew Jones <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/misc/ivshmem.c

  Log Message:
  -----------
  ivshmem: use error_report

Replace all the fprintf(stderr, ...) calls with error_report.
Also make sure exit() consistently uses the error code 1. A few calls
used -1. While at it cleanup some indentation in the printf argument
lists.

Signed-off-by: Andrew Jones <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ace386b4e0e088ed1d42fba697fbb68219aceee6
      
https://github.com/qemu/qemu/commit/ace386b4e0e088ed1d42fba697fbb68219aceee6
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-10-31 (Fri, 31 Oct 2014)

  Changed paths:
    M hw/scsi/virtio-scsi-dataplane.c

  Log Message:
  -----------
  virtio-scsi: fix dataplane

Commit 361dcc7 (virtio-scsi: dataplane: fail setup gracefully, 2014-10-15)
actually broke successful dataplane setup in a not-so-graceful manner:

    qemu-system-x86_64: .../util/rfifolock.c:71: rfifolock_unlock: Assertion 
`r->nesting > 0' failed.

due to a missing return statement.

Fixes: 361dcc790db8c87b2e46ab610739191ced894c44
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f67d23b1ae32b97064fa8f05330efbb09e5d4b07
      
https://github.com/qemu/qemu/commit/f67d23b1ae32b97064fa8f05330efbb09e5d4b07
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M block/iscsi.c
    M hw/i386/kvmvapic.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/misc/ivshmem.c
    M hw/misc/vfio.c
    M hw/scsi/megasas.c
    M hw/scsi/mfi.h
    M hw/scsi/scsi-bus.c
    M hw/scsi/scsi-disk.c
    M hw/scsi/scsi-generic.c
    M hw/scsi/virtio-scsi-dataplane.c
    M hw/scsi/virtio-scsi.c
    M include/exec/memory.h
    M include/hw/i386/pc.h
    M include/hw/pci/pci_ids.h
    M include/hw/scsi/scsi.h
    M memory.c
    M memory_mapping.c
    M qemu-options.hx
    M rules.mak
    M scripts/kvm/kvm_stat
    M target-i386/translate.c
    M trace-events
    M ui/Makefile.objs
    M vl.c

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

The last round of patches for soft freeze.  Includes ivshmem bugfixes,
megasas 2108 emulation, and other small patches here and there.

# gpg: Signature made Fri 31 Oct 2014 17:17:54 GMT 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: (35 commits)
  virtio-scsi: fix dataplane
  ivshmem: use error_report
  ivshmem: Fix fd leak on error
  ivshmem: Fix potential OOB r/w access
  ivshmem: validate incoming_posn value from server
  ivshmem: Check ivshmem_read() size argument
  i386: fix breakpoints handling in icount mode
  kvm_stat: Add powerpc support
  kvm_stat: Abstract ioctl numbers
  kvm_stat: Rework platform detection
  kvm_stat: Fix the non-x86 exit reasons
  kvm_stat: Only consider online cpus
  virtio-scsi: Fix num_queue input validation
  scsi: devirtualize unrealize of SCSI devices
  virtio-scsi: Fix memory leak when realize failed
  iscsi: Refuse to open as writable if the LUN is write protected
  kvmvapic: patch_instruction fix
  vl.c: Fix Coverity complaining for vmstate_dump_file
  Add skip_dump flag to ignore memory region during dump
  -machine vmport=off: Allow disabling of VMWare ioport emulation
  ...

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


Compare: https://github.com/qemu/qemu/compare/0a2923f84884...f67d23b1ae32

reply via email to

[Prev in Thread] Current Thread [Next in Thread]