qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] b138e6: Revert "memory: Drop FlatRange.romd_m


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] b138e6: Revert "memory: Drop FlatRange.romd_mode"
Date: Tue, 31 May 2016 03:00:05 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b138e654a0525f009e7e7c96fc67d74baf3e011b
      
https://github.com/qemu/qemu/commit/b138e654a0525f009e7e7c96fc67d74baf3e011b
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M memory.c

  Log Message:
  -----------
  Revert "memory: Drop FlatRange.romd_mode"

This reverts commit 5b5660adf1fdb61db14ec681b10463b8cba633f1,
as it breaks the UEFI guest firmware (known as ArmVirtPkg or AAVMF)
running in the "virt" machine type of "qemu-system-aarch64":

Contrary to the commit message, (a->mr == b->mr) does *not* imply
that (a->romd_mode == b->romd_mode): the pflash device model calls
memory_region_rom_device_set_romd() -- for switching between the above
modes --, and that function changes mr->romd_mode but the current
AddressSpaceDispatch's FlatRange keeps the old value.  Therefore
region_del/region_add are not called on the KVM MemoryListener.

Reported-by: Drew Jones <address@hidden>
Tested-by: Drew Jones <address@hidden>
Analyzed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e7c9136977cb99c6eb52c9139f7b8d8b5fa87db9
      
https://github.com/qemu/qemu/commit/e7c9136977cb99c6eb52c9139f7b8d8b5fa87db9
  Author: xiaoqiang zhao <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/char/escc.c

  Log Message:
  -----------
  hw/char: QOM'ify escc.c

* Drop the old SysBus init function and use instance_init
* Call qemu_chr_add_handlers in the realize callback

Signed-off-by: xiaoqiang zhao <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8290de92b83e843390571b36dc9e09a9fb75abf0
      
https://github.com/qemu/qemu/commit/8290de92b83e843390571b36dc9e09a9fb75abf0
  Author: xiaoqiang zhao <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/char/etraxfs_ser.c
    M hw/cris/axis_dev88.c
    M include/hw/cris/etraxfs.h

  Log Message:
  -----------
  hw/char: QOM'ify etraxfs_ser.c

* Drop the old SysBus init function and use instance_init
* Call qemu_chr_add_handlers in the realize callback
* Use qdev chardev prop instead of qemu_char_get_next_serial
* Add etraxfs_ser_create function to create etraxfs serial device

Signed-off-by: xiaoqiang zhao <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c2ddaa62b6979c8f30569059180f66af7bba1224
      
https://github.com/qemu/qemu/commit/c2ddaa62b6979c8f30569059180f66af7bba1224
  Author: xiaoqiang zhao <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/char/lm32_juart.c
    M hw/lm32/lm32.h
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist.c

  Log Message:
  -----------
  hw/char: QOM'ify lm32_juart.c

* Drop the old SysBus init function
* Call qemu_chr_add_handlers in the realize callback
* Use qdev chardev prop instead of qemu_char_get_next_serial

Signed-off-by: xiaoqiang zhao <address@hidden>
Message-Id: <address@hidden>
Tested-by: Michael Walle <address@hidden>
Acked-by: Michael Walle <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7aaefcaf6628de1e25eb59a7790a0ae0f9a628f6
      
https://github.com/qemu/qemu/commit/7aaefcaf6628de1e25eb59a7790a0ae0f9a628f6
  Author: xiaoqiang zhao <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/char/lm32_uart.c
    M hw/lm32/lm32.h
    M hw/lm32/lm32_boards.c

  Log Message:
  -----------
  hw/char: QOM'ify lm32_uart.c

* Drop the old SysBus init function and use instance_init
* Call qemu_chr_add_handlers in the realize callback
* Use qdev chardev prop instead of qemu_char_get_next_serial
* Add lm32_uart_create function to create lm32 uart device

Signed-off-by: xiaoqiang zhao <address@hidden>
Message-Id: <address@hidden>
Tested-by: Michael Walle <address@hidden>
Acked-by: Michael Walle <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: e269fbe23163661c3147dee04c01bbb3b2550d42
      
https://github.com/qemu/qemu/commit/e269fbe23163661c3147dee04c01bbb3b2550d42
  Author: xiaoqiang zhao <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/char/milkymist-uart.c
    M hw/lm32/milkymist-hw.h
    M hw/lm32/milkymist.c

  Log Message:
  -----------
  hw/char: QOM'ify milkymist-uart.c

drop the qemu_char_get_next_serial and use chardev prop instead

Signed-off-by: xiaoqiang zhao <address@hidden>
Message-Id: <address@hidden>
Tested-by: Michael Walle <address@hidden>
Acked-by: Michael Walle <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 353ab969730742b7392414d62f4ba9632e8cf22c
      
https://github.com/qemu/qemu/commit/353ab969730742b7392414d62f4ba9632e8cf22c
  Author: Eric Blake <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M nbd/server.c

  Log Message:
  -----------
  nbd: Don't trim unrequested bytes

Similar to commit df7b97ff, we are mishandling clients that
give an unaligned NBD_CMD_TRIM request, and potentially
trimming bytes that occur before their request; which in turn
can cause potential unintended data loss (unlikely in
practice, since most clients are sane and issue aligned trim
requests).  However, while we fixed read and write by switching
to the byte interfaces of blk_, we don't yet have a byte
interface for discard.  On the other hand, trim is advisory, so
rounding the user's request to simply ignore the first and last
unaligned sectors (or the entire request, if it is sub-sector
in length) is just fine.

CC: address@hidden
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 60b412dd18362bd4ddc44ba7022aacb6af074b5d
      
https://github.com/qemu/qemu/commit/60b412dd18362bd4ddc44ba7022aacb6af074b5d
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M Makefile
    R scripts/kvm/kvm_stat
    R scripts/kvm/kvm_stat.texi

  Log Message:
  -----------
  kvm_stat: Remove

The source has moved to the Linux kernel tree.

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


  Commit: 3e831b40e015ba34dfb55ff11f767001839425ff
      
https://github.com/qemu/qemu/commit/3e831b40e015ba34dfb55ff11f767001839425ff
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/scsi/vmw_pvscsi.c

  Log Message:
  -----------
  scsi: pvscsi: check command descriptor ring buffer size (CVE-2016-4952)

Vmware Paravirtual SCSI emulation uses command descriptors to
process SCSI commands. These descriptors come with their ring
buffers. A guest could set the ring buffer size to an arbitrary
value leading to OOB access issue. Add check to avoid it.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Cc: address@hidden
Message-Id: <address@hidden>
Reviewed-by: Shmulik Ladkani <address@hidden>
Reviewed-by: Dmitry Fleytman <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 06630554ccbdd25780aa03c3548aaff1eb56dffd
      
https://github.com/qemu/qemu/commit/06630554ccbdd25780aa03c3548aaff1eb56dffd
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/scsi/mptsas.c

  Log Message:
  -----------
  scsi: mptsas: infinite loop while fetching requests

The LSI SAS1068 Host Bus Adapter emulator in Qemu, periodically
looks for requests and fetches them. A loop doing that in
mptsas_fetch_requests() could run infinitely if 's->state' was
not operational. Move check to avoid such a loop.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Cc: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 1b85898025c4cd95dce673d15e67e60e98e91731
      
https://github.com/qemu/qemu/commit/1b85898025c4cd95dce673d15e67e60e98e91731
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  scsi: megasas: use appropriate property buffer size

When setting MegaRAID SAS controller properties via MegaRAID
Firmware Interface(MFI) commands, a user supplied size parameter
is used to set property value. Use appropriate size value to avoid
OOB access issues.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d37af740730dbbb93960cd318e040372d04d6dcf
      
https://github.com/qemu/qemu/commit/d37af740730dbbb93960cd318e040372d04d6dcf
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  scsi: megasas: initialise local configuration data buffer

When reading MegaRAID SAS controller configuration via MegaRAID
Firmware Interface(MFI) commands, routine megasas_dcmd_cfg_read
uses an uninitialised local data buffer. Initialise this buffer
to avoid stack information leakage.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: b60bdd1f1ee1616b7a9aeeffb4088e1ce2710fb2
      
https://github.com/qemu/qemu/commit/b60bdd1f1ee1616b7a9aeeffb4088e1ce2710fb2
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  scsi: megasas: check 'read_queue_head' index value

While doing MegaRAID SAS controller command frame lookup, routine
'megasas_lookup_frame' uses 'read_queue_head' value as an index
into 'frames[MEGASAS_MAX_FRAMES=2048]' array. Limit its value
within array bounds to avoid any OOB access.

Reported-by: Li Qiang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a6b3167fa0e825aebb5a7cd8b437b6d41584a196
      
https://github.com/qemu/qemu/commit/a6b3167fa0e825aebb5a7cd8b437b6d41584a196
  Author: Peter Lieven <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M block/iscsi.c

  Log Message:
  -----------
  block/iscsi: avoid potential overflow of acb->task->cdb

at least in the path via virtio-blk the maximum size is not
restricted.

Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 141af038dd1e73ed32e473046adeb822537c1152
      
https://github.com/qemu/qemu/commit/141af038dd1e73ed32e473046adeb822537c1152
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M hw/bt/hci-csr.c

  Log Message:
  -----------
  bt: rewrite csrhci_write to avoid out-of-bounds writes

The usage of INT_MAX in this function confuses Coverity.  I think
the defect is bogus, however there is no protection against
getting more than sizeof(s->inpkt) bytes from the character device
backend.

Rewrite the function to only fill in as much data as needed from
buf into s->inpkt.  The plen variable is replaced by a simple
state machine and there is no need anymore to shift contents to
the beginning of s->inpkt.

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


  Commit: 56ebe02203f033a8399f7f6ea6972225ed87101c
      
https://github.com/qemu/qemu/commit/56ebe02203f033a8399f7f6ea6972225ed87101c
  Author: Emilio G. Cota <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M docs/atomics.txt

  Log Message:
  -----------
  docs/atomics: update atomic_read/set comparison with Linux

Recently Linux did a mass conversion of its atomic_read/set calls
so that they at least are READ/WRITE_ONCE. See Linux's commit
62e8a325 ("atomic, arch: Audit atomic_{read,set}()"). It seems though
that their documentation hasn't been updated to reflect this.

The appended updates our documentation to reflect the change, which
means there is effectively no difference between our atomic_read/set
and the current Linux implementation.

While at it, fix the statement that a barrier is implied by
atomic_read/set, which is incorrect. Volatile/atomic semantics prevent
transformations pertaining the variable they apply to; this, however,
has no effect on surrounding statements like barriers do. For more
details on this, see:
  https://gcc.gnu.org/onlinedocs/gcc/Volatiles.html

Signed-off-by: Emilio G. Cota <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: c983895258a771f8a5e4a53950bfb7fd2216651c
      
https://github.com/qemu/qemu/commit/c983895258a771f8a5e4a53950bfb7fd2216651c
  Author: Emilio G. Cota <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M include/qemu/atomic.h

  Log Message:
  -----------
  atomics: emit an smp_read_barrier_depends() barrier only for Alpha and Thread 
Sanitizer

For correctness, smp_read_barrier_depends() is only required to
emit a barrier on Alpha hosts. However, we are currently emitting
a consume fence unconditionally, and most compilers currently treat
consume and acquire fences as equivalent.

Fix it by keeping the consume fence if we're compiling with Thread
Sanitizer, since this might help prevent false warnings. Otherwise,
only emit the barrier for Alpha hosts. Note that we still guarantee
that smp_read_barrier_depends() is a compiler barrier.

Signed-off-by: Emilio G. Cota <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 15487aa132109891482f79d78a30d6cfd465a391
      
https://github.com/qemu/qemu/commit/15487aa132109891482f79d78a30d6cfd465a391
  Author: Emilio G. Cota <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M include/qemu/atomic.h

  Log Message:
  -----------
  atomics: do not emit consume barrier for atomic_rcu_read

Currently we emit a consume-load in atomic_rcu_read.  Because of
limitations in current compilers, this is overkill for non-Alpha hosts
and it is only useful to make Thread Sanitizer work.

This patch leaves the consume-load in atomic_rcu_read when
compiling with Thread Sanitizer enabled, and resorts to a
relaxed load + smp_read_barrier_depends otherwise.

On an RMO host architecture, such as aarch64, the performance
improvement of this change is easily measurable. For instance,
qht-bench performs an atomic_rcu_read on every lookup. Performance
before and after applying this patch:

$ tests/qht-bench -d 5 -n 1
Before: 9.78 MT/s
After:  10.96 MT/s

Signed-off-by: Emilio G. Cota <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a4a0e4b258b2034559a546927794f477025d55d6
      
https://github.com/qemu/qemu/commit/a4a0e4b258b2034559a546927794f477025d55d6
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M docs/atomics.txt

  Log Message:
  -----------
  docs/atomics: update comparison with Linux

Over time, some differences between QEMU and Linux atomics are getting
smoothed.  In particular, Linux grew atomic_fetch_or (and in general
the differences regarding RMW operations were not described accurately)
and smp_load_acquire/smp_store_release.  Also, set_mb was renamed to
smp_store_mb().  Include these changes in the documentation.

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


  Commit: a8ff4316795c7051b38727ec4a81c65dfcf63dc6
      
https://github.com/qemu/qemu/commit/a8ff4316795c7051b38727ec4a81c65dfcf63dc6
  Author: Paul Durrant <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M xen-hvm.c

  Log Message:
  -----------
  xen-hvm: ignore background I/O sections

Since Xen will correctly handle accesses to unimplemented I/O ports (by
returning all 1's for reads and ignoring writes) there is no need for
QEMU to register backgroud I/O sections.

This patch therefore adds checks to xen_io_add/del so that sections with
memory-region ops pointing at 'unassigned_io_ops' are ignored.

Signed-off-by: Paul Durrant <address@hidden>
Cc: Stefano Stabellini <address@hidden>
Cc: Anthony Perard <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Acked-by: Anthony PERARD <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 993935f315b75436f7664debdd1bf68622aabc2b
      
https://github.com/qemu/qemu/commit/993935f315b75436f7664debdd1bf68622aabc2b
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

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

  Log Message:
  -----------
  scsi-disk: introduce a common base class

This will be the place to add DMAIOFuncs in the next patch.  There
are also a couple DeviceClass members that can be moved to the
abstract class's initialization function.

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


  Commit: fcaafb1001b9c42817714dd3b2aadcfdb997b53d
      
https://github.com/qemu/qemu/commit/fcaafb1001b9c42817714dd3b2aadcfdb997b53d
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

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

  Log Message:
  -----------
  scsi-disk: introduce dma_readv and dma_writev

These are replacements for blk_aio_readv and blk_aio_writev that allow
customization of the data path.  They reuse the DMA helpers' DMAIOFunc
callback type, so that the same function can be used in either the
QEMUSGList or the bounce-buffered case.

This customization will be needed in the next patch to do zero-copy
SG_IO on scsi-block.

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


  Commit: 94f8ba1125ee7dfc7aa46166c8e3312e5ad949df
      
https://github.com/qemu/qemu/commit/94f8ba1125ee7dfc7aa46166c8e3312e5ad949df
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

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

  Log Message:
  -----------
  scsi-disk: add need_fua_emulation to SCSIDiskClass

scsi-block will be able to do FUA just by passing the request through
to the LUN (which is also more efficient); there is no need to emulate
it like we do for scsi-disk.

Add a new method to distinguish this.

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


  Commit: 5b956f415a356449a4171d5e0c7d9a25bbc84b5a
      
https://github.com/qemu/qemu/commit/5b956f415a356449a4171d5e0c7d9a25bbc84b5a
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

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

  Log Message:
  -----------
  scsi-disk: introduce scsi_disk_req_check_error

Commonize all the checks for canceled requests and errors.  The next patch
will add another case to check for, in order to handle passthrough commands.

There is no semantic change here; the only nontrivial modification is in
scsi_write_do_fua, where cancellation has been checked earlier by both
callers.  Thus, the check is replaced with an assertion.

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


  Commit: 8fdc7839e40f43a426bc7e858cf1dbfe315a3804
      
https://github.com/qemu/qemu/commit/8fdc7839e40f43a426bc7e858cf1dbfe315a3804
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

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

  Log Message:
  -----------
  scsi-block: always use SG_IO

Using pread/pwrite or io_submit has the advantage of eliminating the
bounce buffer, but drops the SCSI status.  This keeps the guest from
seeing unit attention codes, as well as statuses such as RESERVATION
CONFLICT.  Because we know scsi-block operates on an SBC device we can
still use the DMA helpers with SG_IO; just remember to patch the CDBs
if the transfer is split into multiple segments.

This means that scsi-block will always use the thread-pool unfortunately,
instead of respecting aio=native.

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


  Commit: 063143d5b1fde0fdcbae30bc7d6d14e76fa607d2
      
https://github.com/qemu/qemu/commit/063143d5b1fde0fdcbae30bc7d6d14e76fa607d2
  Author: Fam Zheng <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

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

  Log Message:
  -----------
  scsi-generic: Merge block max xfer len in INQUIRY response

The rationale is similar to the above mode sense response interception:
this is practically the only channel to communicate restraints from
elsewhere such as host and block driver.

The scsi bus we attach onto can have a larger max xfer len than what is
accepted by the host file system (guarding between the host scsi LUN and
QEMU), in which case the SG_IO we generate would get -EINVAL.

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


  Commit: 4ff87573df3606856a92c14eef3393a63d736d11
      
https://github.com/qemu/qemu/commit/4ff87573df3606856a92c14eef3393a63d736d11
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M exec.c
    M hw/misc/ivshmem.c
    M hw/virtio/vhost-user.c
    M include/exec/memory.h
    M include/exec/ram_addr.h
    M memory.c

  Log Message:
  -----------
  memory: remove qemu_get_ram_fd, qemu_set_ram_fd, qemu_ram_block_host_ptr

Remove direct uses of ram_addr_t and optimize memory_region_{get,set}_fd
now that a MemoryRegion knows its RAMBlock directly.

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f615f39616c4fd1a3a3b078af8d75bb4be6390de
      
https://github.com/qemu/qemu/commit/f615f39616c4fd1a3a3b078af8d75bb4be6390de
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M exec.c
    M include/exec/cpu-common.h
    M migration/postcopy-ram.c

  Log Message:
  -----------
  exec: remove ram_addr argument from qemu_ram_block_from_host

Of the two callers, one does not use it, and the other can compute
it itself based on the other output argument (offset) and the RAMBlock.

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 07bdaa4196b51bc7ffa7c3f74e9e4a9dc8a7966a
      
https://github.com/qemu/qemu/commit/07bdaa4196b51bc7ffa7c3f74e9e4a9dc8a7966a
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M cputlb.c
    M exec.c
    M hw/virtio/vhost-user.c
    M include/exec/cpu-common.h
    M include/exec/memory.h
    M memory.c
    M target-i386/kvm.c

  Log Message:
  -----------
  memory: split memory_region_from_host from qemu_ram_addr_from_host

Move the old qemu_ram_addr_from_host to memory_region_from_host and
make it return an offset within the region.  For qemu_ram_addr_from_host
return the ram_addr_t directly, similar to what it was before
commit 1b5ec23 ("memory: return MemoryRegion from qemu_ram_addr_from_host",
2013-07-04).

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 0878d0e11ba8013dd759c6921cbf05ba6a41bd71
      
https://github.com/qemu/qemu/commit/0878d0e11ba8013dd759c6921cbf05ba6a41bd71
  Author: Paolo Bonzini <address@hidden>
  Date:   2016-05-29 (Sun, 29 May 2016)

  Changed paths:
    M exec.c
    M include/exec/memory.h
    M memory.c
    M scripts/dump-guest-memory.py

  Log Message:
  -----------
  exec: hide mr->ram_addr from qemu_get_ram_ptr users

Let users of qemu_get_ram_ptr and qemu_ram_ptr_length pass in an
address that is relative to the MemoryRegion.  This basically means
what address_space_translate returns.

Because the semantics of the second parameter change, rename the
function to qemu_map_ram_ptr.

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


  Commit: 07e070aac4eeb186905148461f331e43f2b828aa
      
https://github.com/qemu/qemu/commit/07e070aac4eeb186905148461f331e43f2b828aa
  Author: Peter Maydell <address@hidden>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M Makefile
    M block/iscsi.c
    M cputlb.c
    M docs/atomics.txt
    M exec.c
    M hw/bt/hci-csr.c
    M hw/char/escc.c
    M hw/char/etraxfs_ser.c
    M hw/char/lm32_juart.c
    M hw/char/lm32_uart.c
    M hw/char/milkymist-uart.c
    M hw/cris/axis_dev88.c
    M hw/lm32/lm32.h
    M hw/lm32/lm32_boards.c
    M hw/lm32/milkymist-hw.h
    M hw/lm32/milkymist.c
    M hw/misc/ivshmem.c
    M hw/scsi/megasas.c
    M hw/scsi/mptsas.c
    M hw/scsi/scsi-disk.c
    M hw/scsi/scsi-generic.c
    M hw/scsi/vmw_pvscsi.c
    M hw/virtio/vhost-user.c
    M include/exec/cpu-common.h
    M include/exec/memory.h
    M include/exec/ram_addr.h
    M include/hw/cris/etraxfs.h
    M include/qemu/atomic.h
    M memory.c
    M migration/postcopy-ram.c
    M nbd/server.c
    M scripts/dump-guest-memory.py
    R scripts/kvm/kvm_stat
    R scripts/kvm/kvm_stat.texi
    M target-i386/kvm.c
    M xen-hvm.c

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

* docs/atomics fixes and atomic_rcu_* optimization (Emilio)
* NBD bugfix (Eric)
* Memory fixes and cleanups (Paolo, Paul)
* scsi-block support for SCSI status, including persistent
  reservations (Paolo)
* kvm_stat moves to the Linux repository
* SCSI bug fixes (Peter, Prasad)
* Killing qemu_char_get_next_serial, non-ARM parts (Xiaoqiang)

# gpg: Signature made Sun 29 May 2016 08:11:20 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"

* remotes/bonzini/tags/for-upstream: (30 commits)
  exec: hide mr->ram_addr from qemu_get_ram_ptr users
  memory: split memory_region_from_host from qemu_ram_addr_from_host
  exec: remove ram_addr argument from qemu_ram_block_from_host
  memory: remove qemu_get_ram_fd, qemu_set_ram_fd, qemu_ram_block_host_ptr
  scsi-generic: Merge block max xfer len in INQUIRY response
  scsi-block: always use SG_IO
  scsi-disk: introduce scsi_disk_req_check_error
  scsi-disk: add need_fua_emulation to SCSIDiskClass
  scsi-disk: introduce dma_readv and dma_writev
  scsi-disk: introduce a common base class
  xen-hvm: ignore background I/O sections
  docs/atomics: update comparison with Linux
  atomics: do not emit consume barrier for atomic_rcu_read
  atomics: emit an smp_read_barrier_depends() barrier only for Alpha and Thread 
Sanitizer
  docs/atomics: update atomic_read/set comparison with Linux
  bt: rewrite csrhci_write to avoid out-of-bounds writes
  block/iscsi: avoid potential overflow of acb->task->cdb
  scsi: megasas: check 'read_queue_head' index value
  scsi: megasas: initialise local configuration data buffer
  scsi: megasas: use appropriate property buffer size
  ...

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


Compare: https://github.com/qemu/qemu/compare/d6550e9ed2e1...07e070aac4ee

reply via email to

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