1. 27 Nov, 2017 3 commits
  2. 24 Nov, 2017 4 commits
  3. 23 Nov, 2017 5 commits
  4. 22 Nov, 2017 4 commits
    • Daniel Henrique Barboza's avatar
      migration/ram.c: do not set 'postcopy_running' in POSTCOPY_INCOMING_END · acab30b8
      Daniel Henrique Barboza authored
      When migrating a VM with 'migrate_set_capability postcopy-ram on'
      a postcopy_state is set during the process, ending up with the
      state POSTCOPY_INCOMING_END when the migration is over. This
      postcopy_state is taken into account inside ram_load to check
      how it will load the memory pages. This same ram_load is called when
      in a loadvm command.
      Inside ram_load, the logic to see if we're at postcopy_running state
      postcopy_running = postcopy_state_get() >= POSTCOPY_INCOMING_LISTENING
      postcopy_state_get() returns this enum type:
      typedef enum {
      } PostcopyState;
      In the case where ram_load is executed and postcopy_state is
      POSTCOPY_INCOMING_END, postcopy_running will be set to 'true' and
      ram_load will behave like a postcopy is in progress. This scenario isn't
      achievable in a migration but it is reproducible when executing
      savevm/loadvm after migrating with 'postcopy-ram on', causing loadvm
      to fail with Error -22:
      (qemu) migrate_set_capability postcopy-ram on
      (qemu) migrate tcp:
      (qemu) migrate_set_capability postcopy-ram on
      ubuntu1704-intel login:
      Ubuntu 17.04 ubuntu1704-intel ttyS0
      ubuntu1704-intel login: (qemu)
      (qemu) savevm test1
      (qemu) loadvm test1
      Unknown combination of migration flags: 0x4 (postcopy mode)
      error while loading state for instance 0x0 of device 'ram'
      Error -22 while loading VM state
      This patch fixes this problem by changing the existing logic for
      postcopy_advised and postcopy_running in ram_load, making them
      'false' if we're at POSTCOPY_INCOMING_END state.
      Signed-off-by: 's avatarDaniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
      CC: Juan Quintela <quintela@redhat.com>
      CC: Dr. David Alan Gilbert <dgilbert@redhat.com>
      Reviewed-by: 's avatarPeter Xu <peterx@redhat.com>
      Reviewed-by: 's avatarJuan Quintela <quintela@redhat.com>
      Reported-by: 's avatarBalamuruhan S <bala24@linux.vnet.ibm.com>
      Signed-off-by: 's avatarJuan Quintela <quintela@redhat.com>
    • Laurent Vivier's avatar
      ppc: fix VTB migration · 6dd836f5
      Laurent Vivier authored
      Migration of a system under stress (for example, with
      "stress-ng --numa 2") triggers on the destination
      some kernel watchdog messages like:
      NMI watchdog: BUG: soft lockup - CPU#0 stuck for 3489660870s!
      NMI watchdog: BUG: soft lockup - CPU#1 stuck for 3489660884s!
      This problem appears with the changes introduced by
          42043e4f spapr: clock should count only if vm is running
      I think this commit only triggers the problem.
      Kernel computes the soft lockup duration using the
      Virtual Timebase register (VTB), not using the Timebase
      Register (TBR, the one 42043e4f stops).
      It appears VTB is not migrated, so this patch adds it in
      the list of the SPRs to migrate, and fixes the problem.
      For the migration, I've tested a migration from qemu-2.8.0 and
      pseries-2.8.0 to a patched master (qemu-2.11.0-rc1). The received
      VTB is 0 (as is it not initialized by qemu-2.8.0), but the value
      seems to be ignored by KVM and a non zero VTB is used by the kernel.
      I have no explanation for that, but as the original problem appears
      only with SMP system under stress I suspect some problems in KVM
      (I think because VTB is shared by all threads of a core).
      Signed-off-by: 's avatarLaurent Vivier <lvivier@redhat.com>
      Signed-off-by: 's avatarDavid Gibson <david@gibson.dropbear.id.au>
    • David Gibson's avatar
      spapr: Implement bug in spapr-vty device to be compatible with PowerVM · 6c3bc244
      David Gibson authored
      The spapr-vty device implements the PAPR defined virtual console,
      which is also implemented by IBM's proprietary PowerVM hypervisor.
      PowerVM's implementation has a bug where it inserts an extra \0 after
      every \r going to the guest.  Because of that Linux's guest side
      driver has a workaround which strips \0 characters that appear
      immediately after a \r.
      That means that when running under qemu, sending a binary stream from
      host to guest via spapr-vty which happens to include a \r\0 sequence
      will get corrupted by that workaround.
      To deal with that, this patch duplicates PowerVM's bug, inserting an
      extra \0 after each \r.  Ugly, but the best option available.
      Signed-off-by: 's avatarDavid Gibson <david@gibson.dropbear.id.au>
      Reviewed-by: 's avatarThomas Huth <thuth@redhat.com>
      Reviewed-by: 's avatarGreg Kurz <groug@kaod.org>
    • Thomas Huth's avatar
      hw/ppc/spapr: Fix virtio-scsi bootindex handling for LUNs >= 256 · bac658d1
      Thomas Huth authored
      LUNs >= 256 have to be encoded with the so-called "flat space
      addressing method" for virtio-scsi, where an additional bit has to
      be set. SLOF already took care of this with the following commit:
       (see https://bugzilla.redhat.com/show_bug.cgi?id=1431584 for details)
      But QEMU does not use this encoding yet for device tree paths
      that have to be handed over to SLOF to deal with the "bootindex"
      property, so SLOF currently fails to boot from virtio-scsi devices
      with LUNs >= 256 in the right boot order. Fix it by using the bit
      to indicate the "flat space addressing method" for LUNs >= 256.
      Signed-off-by: 's avatarThomas Huth <thuth@redhat.com>
      Signed-off-by: 's avatarDavid Gibson <david@gibson.dropbear.id.au>
  5. 21 Nov, 2017 24 commits
    • Anthony PERARD's avatar
      migration, xen: Fix block image lock issue on live migration · 5d6c599f
      Anthony PERARD authored
      When doing a live migration of a Xen guest with libxl, the images for
      block devices are locked by the original QEMU process, and this prevent
      the QEMU at the destination to take the lock and the migration fail.
      >From QEMU point of view, once the RAM of a domain is migrated, there is
      two QMP commands, "stop" then "xen-save-devices-state", at which point a
      new QEMU is spawned at the destination.
      Release locks in "xen-save-devices-state" so the destination can takes
      them, if it's a live migration.
      This patch add the "live" parameter to "xen-save-devices-state" which
      default to true so older version of libxenlight can work with newer
      version of QEMU.
      Signed-off-by: 's avatarAnthony PERARD <anthony.perard@citrix.com>
      Reviewed-by: 's avatarDr. David Alan Gilbert <dgilbert@redhat.com>
      Reviewed-by: 's avatarJuan Quintela <quintela@redhat.com>
      Signed-off-by: 's avatarJuan Quintela <quintela@redhat.com>
    • Peter Maydell's avatar
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging · 64807cd7
      Peter Maydell authored
      # gpg: Signature made Tue 21 Nov 2017 17:01:33 GMT
      # gpg:                using RSA key 0xBDBE7B27C0DE3057
      # gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
      # gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
      # gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
      # Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057
      * remotes/cody/tags/block-pull-request:
        qemu-iotest: add test for blockjob coroutine race condition
        qemu-iotests: add option in common.qemu for mismatch only
        coroutine: abort if we try to schedule or enter a pending coroutine
        blockjob: do not allow coroutine double entry or entry-after-completion
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Jeff Cody's avatar
    • Jeff Cody's avatar
      qemu-iotests: add option in common.qemu for mismatch only · a2339699
      Jeff Cody authored
      Add option to echo response to QMP / HMP command only on mismatch.
      Useful for ignore all normal responses, but catching things like
      Signed-off-by: 's avatarJeff Cody <jcody@redhat.com>
      Reviewed-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
    • Jeff Cody's avatar
      coroutine: abort if we try to schedule or enter a pending coroutine · 6133b39f
      Jeff Cody authored
      The previous patch fixed a race condition, in which there were
      coroutines being executing doubly, or after coroutine deletion.
      We can detect common scenarios when this happens, and print an error
      message and abort before we corrupt memory / data, or segfault.
      This patch will abort if an attempt to enter a coroutine is made while
      it is currently pending execution, either in a specific AioContext bh,
      or pending execution via a timer.  It will also abort if a coroutine
      is scheduled, before a prior scheduled run has occurred.
      We cannot rely on the existing co->caller check for recursive re-entry
      to catch this, as the coroutine may run and exit with
      COROUTINE_TERMINATE before the scheduled coroutine executes.
      (This is the scenario that was occurring and fixed in the previous
      This patch also re-orders the Coroutine struct elements in an attempt to
      optimize caching.
      Signed-off-by: 's avatarJeff Cody <jcody@redhat.com>
      Reviewed-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
    • Jeff Cody's avatar
      blockjob: do not allow coroutine double entry or entry-after-completion · 4afeffc8
      Jeff Cody authored
      When block_job_sleep_ns() is called, the co-routine is scheduled for
      future execution.  If we allow the job to be re-entered prior to the
      scheduled time, we present a race condition in which a coroutine can be
      entered recursively, or even entered after the coroutine is deleted.
      The job->busy flag is used by blockjobs when a coroutine is busy
      executing. The function 'block_job_enter()' obeys the busy flag,
      and will not enter a coroutine if set.  If we sleep a job, we need to
      leave the busy flag set, so that subsequent calls to block_job_enter()
      are prevented.
      This changes the prior behavior of block_job_cancel() being able to
      immediately wake up and cancel a job; in practice, this should not be an
      issue, as the coroutine sleep times are generally very small, and the
      cancel will occur the next time the coroutine wakes up.
      This fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508708Signed-off-by: 's avatarJeff Cody <jcody@redhat.com>
      Reviewed-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging · fc7dbc11
      Peter Maydell authored
      Block layer patches for 2.11.0-rc2
      # gpg: Signature made Tue 21 Nov 2017 15:09:12 GMT
      # gpg:                using RSA key 0x7F09B272C88F2FD6
      # gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
      # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6
      * remotes/kevin/tags/for-upstream:
        iotests: Fix 176 on 32-bit host
        block: Close a BlockDriverState completely even when bs->drv is NULL
        block: Error out on load_vm with active dirty bitmaps
        block: Add errp to bdrv_all_goto_snapshot()
        block: Add errp to bdrv_snapshot_goto()
        block: Don't request I/O permission with BDRV_O_NO_IO
        block: Don't use BLK_PERM_CONSISTENT_READ for format probing
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Daniel P. Berrange's avatar
      build: disarm the TCG unit test trap · 7c3d1917
      Daniel P. Berrange authored
      Developers sometimes mistakenly run 'make test' instead of 'make check'.
      'make test' triggers the ancient, unmaintained tcg unit tests in
      tests/tcg/Makefile which have long since ceased compiling.
      Even if someone fixes the TCG tests, it makes little sense to put
      them in a 'make test' target, rather they should be 'make check-tcg',
      possibly wired up as a dependency of 'make check'.
      In the meantime, this patch disarms the 'make test' trap by simply
      deleting it so users get an immediate error. This should be enough
      for them to remember to type 'make check' instead (or 'make help'
      to learn). It also deletes 'make speed' which is another route
      into the tcg tests.
      Signed-off-by: 's avatarDaniel P. Berrange <berrange@redhat.com>
      Reviewed-by: 's avatarKashyap Chamarthy <kchamart@redhat.com>
      Reviewed-by: 's avatarDaniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
      Message-id: 20171121142538.22072-1-berrange@redhat.com
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Kevin Wolf's avatar
      Merge remote-tracking branch 'mreitz/tags/pull-block-2017-11-21' into queue-block · 4fd0295c
      Kevin Wolf authored
      Block patches for 2.11.0-rc2
      # gpg: Signature made Tue Nov 21 14:54:28 2017 CET
      # gpg:                using RSA key F407DB0061D5CF40
      # gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
      # Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40
      * mreitz/tags/pull-block-2017-11-21:
        iotests: Fix 176 on 32-bit host
        block: Close a BlockDriverState completely even when bs->drv is NULL
      Signed-off-by: 's avatarKevin Wolf <kwolf@redhat.com>
    • Eric Blake's avatar
      iotests: Fix 176 on 32-bit host · 2807746f
      Eric Blake authored
      The contents of a qcow2 bitmap are rounded up to a size that
      matches the number of bits available for the granularity, but
      that granularity differs for 32-bit hosts (our default 64k
      cluster allows for 2M bitmap coverage per 'long') and 64-bit
      hosts (4M bitmap per 'long').  If the image is a multiple of
      2M but not 4M, then the number of bytes occupied by the array
      of longs in memory differs between architecture, thus
      resulting in different SHA256 hashes.
      Furthermore (but untested by me), if our computation of the
      SHA256 hash is at all endian-dependent because of how we store
      data in memory, that's another variable we'd have to account
      for (ideally, we specified the bitmap stored in qcow2 as
      fixed-endian on disk, because the same qcow2 file must be
      usable across any architecture; but that says nothing about
      how we represent things in memory).  But we already have test
      165 to validate that bitmaps are stored correctly on disk,
      while this test is merely testing that the bitmap exists.
      So for this test, the easiest solution is to filter out the
      actual hash value.  Broken in commit 4096974e.
      Reported-by: 's avatarMax Reitz <mreitz@redhat.com>
      Signed-off-by: 's avatarEric Blake <eblake@redhat.com>
      Message-id: 20171117190422.23626-1-eblake@redhat.com
      Reviewed-by: 's avatarJohn Snow <jsnow@redhat.com>
      Reviewed-by: 's avatarMax Reitz <mreitz@redhat.com>
      Signed-off-by: 's avatarMax Reitz <mreitz@redhat.com>
    • Alberto Garcia's avatar
      block: Close a BlockDriverState completely even when bs->drv is NULL · 50a3efb0
      Alberto Garcia authored
      bdrv_close() skips much of its logic when bs->drv is NULL. This is
      fine when we're closing a BlockDriverState that has just been created
      (because e.g the initialization process failed), but it's not enough
      in other cases.
      For example, when a valid qcow2 image is found to be corrupted then
      QEMU marks it as such in the file header and then sets bs->drv to
      NULL in order to make the BlockDriverState unusable. When that BDS is
      later closed then many of its data structures are not freed (leaking
      their memory) and none of its children are detached. This results in
      bdrv_close_all() failing to close all BDSs and making this assertion
      fail when QEMU is being shut down:
         bdrv_close_all: Assertion `QTAILQ_EMPTY(&all_bdrv_states)' failed.
      This patch makes bdrv_close() do the full uninitialization process
      in all cases. This fixes the problem with corrupted images and still
      works fine with freshly created BDSs.
      Signed-off-by: 's avatarAlberto Garcia <berto@igalia.com>
      Message-id: 20171106145345.12038-1-berto@igalia.com
      Reviewed-by: 's avatarEric Blake <eblake@redhat.com>
      Signed-off-by: 's avatarMax Reitz <mreitz@redhat.com>
    • Kevin Wolf's avatar
      block: Error out on load_vm with active dirty bitmaps · 70a5afed
      Kevin Wolf authored
      Loading a snapshot invalidates the bitmap. Just marking all blocks dirty
      is not a useful response in practice, instead the user needs to be aware
      that we switch to a completely different state. If they are okay with
      losing the dirty bitmap, they can just explicitly delete it.
      This effectively reverts commit 04dec3c3.
      Signed-off-by: 's avatarKevin Wolf <kwolf@redhat.com>
      Reviewed-by: 's avatarEric Blake <eblake@redhat.com>
      Reviewed-by: 's avatarDenis V. Lunev <den@openvz.org>
      Reviewed-by: 's avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Reviewed-by: 's avatarJohn Snow <jsnow@redhat.com>
    • Kevin Wolf's avatar
    • Kevin Wolf's avatar
    • Kevin Wolf's avatar
      block: Don't request I/O permission with BDRV_O_NO_IO · 1f4ad7d3
      Kevin Wolf authored
      'qemu-img info' makes sense even when BLK_PERM_CONSISTENT_READ cannot be
      granted because of a block job in a running qemu process. It already
      sets BDRV_O_NO_IO to indicate that it doesn't access the guest visible
      data at all.
      Check the BDRV_O_NO_IO flags in blk_new_open(), so that I/O related
      permissions are not unnecessarily requested and 'qemu-img info' can work
      even if BLK_PERM_CONSISTENT_READ cannot be granted.
      Signed-off-by: 's avatarKevin Wolf <kwolf@redhat.com>
      Reviewed-by: 's avatarFam Zheng <famz@redhat.com>
      Reviewed-by: 's avatarAlberto Garcia <berto@igalia.com>
    • Kevin Wolf's avatar
      block: Don't use BLK_PERM_CONSISTENT_READ for format probing · dacaa162
      Kevin Wolf authored
      For format probing, we don't really care whether all of the image
      content is consistent. The only thing we're looking at is the image
      header, and specifically the magic numbers that are expected to never
      change, no matter how inconsistent the guest visible disk content is.
      Therefore, don't request BLK_PERM_CONSISTENT_READ. This allows to use
      format probing, e.g. in the context of 'qemu-img info', even while the
      guest visible data in the image is inconsistent during a running block
      Signed-off-by: 's avatarKevin Wolf <kwolf@redhat.com>
      Reviewed-by: 's avatarFam Zheng <famz@redhat.com>
    • Stefan Hajnoczi's avatar
      Use HTTPS for qemu.org and other domains · 70b7fba9
      Stefan Hajnoczi authored
      qemu.org enabled HTTPS in 2017 and it should be used instead of HTTP.
      There are also URLs to json.org, openvpn.net, and other domains that
      support HTTPS.
      This patch updates the qemu.org domains everywhere and also third-party
      domains that I have checked.
      Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      Message-id: 20171121120435.28728-3-stefanha@redhat.com
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Stefan Hajnoczi's avatar
      Use qemu.org domain name · 1b3bbc68
      Stefan Hajnoczi authored
      The owner of qemu.org has delegated authority to modify DNS records to
      the QEMU Project.  This has allowed us to use the domain name without
      worries about IP address changes or technical issues disrupting service.
      The issues described in commit 85938981
      ("Use qemu-project.org domain name") have therefore been mitigated.
      This patch switches back to consistently using qemu.org instead of
      qemu-project.org in documentation, version.rc, and the Windows installer
      The git submodules and SeaBIOS still use qemu-project.org for the time
      being.  This will be fixed in the QEMU 2.12 release cycle.
      Signed-off-by: 's avatarStefan Hajnoczi <stefanha@redhat.com>
      Message-id: 20171121120435.28728-2-stefanha@redhat.com
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Michael Roth's avatar
      scripts/make-release: ship u-boot source as a tarball · d0dead3b
      Michael Roth authored
      The u-boot sources we ship currently cause problems with unpacking on
      a case-insensitive filesystem due to path conflicts. This has been
      fixed in upstream u-boot via commit 610eec7f, but since it is not
      yet included in an official release we implement this approach as a
      temporary workaround.
      Once we move to a u-boot containing commit 610eec7f we should revert
      this patch.
      Cc: qemu-stable@nongnu.org
      Cc: Alexander Graf <agraf@suse.de>
      Cc: Richard Henderson <richard.henderson@linaro.org>
      Cc: Thomas Huth <thuth@redhat.com>
      Cc: Peter Maydell <peter.maydell@linaro.org>
      Suggested-by: 's avatarRichard Henderson <richard.henderson@linaro.org>
      Signed-off-by: 's avatarMichael Roth <mdroth@linux.vnet.ibm.com>
      Reviewed-by: 's avatarThomas Huth <thuth@redhat.com>
      Message-id: 20171107205201.10207-1-mdroth@linux.vnet.ibm.com
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Peter Maydell's avatar
      accel/tcg: Handle atomic accesses to notdirty memory correctly · 34d49937
      Peter Maydell authored
      To do a write to memory that is marked as notdirty, we need
      to invalidate any TBs we have cached for that memory, and
      update the cpu physical memory dirty flags for VGA and migration.
      The slowpath code in notdirty_mem_write() does all this correctly,
      but the new atomic handling code in atomic_mmu_lookup() doesn't
      do anything at all, it just clears the dirty bit in the TLB.
      The effect of this bug is that if the first write to a notdirty
      page for which we have cached TBs is by a guest atomic access,
      we fail to invalidate the TBs and subsequently will execute
      incorrect code. This can be seen by trying to run 'javac' on AArch64.
      Use the new notdirty_call_before() and notdirty_call_after()
      functions to correctly handle the update to notdirty memory
      in the atomic codepath.
      Cc: qemu-stable@nongnu.org
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: 's avatarPaolo Bonzini <pbonzini@redhat.com>
      Reviewed-by: 's avatarRichard Henderson <richard.henderson@linaro.org>
      Message-id: 1511201308-23580-3-git-send-email-peter.maydell@linaro.org
    • Peter Maydell's avatar
      exec.c: Factor out before/after actions for notdirty memory writes · 27266271
      Peter Maydell authored
      The function notdirty_mem_write() has a sequence of actions
      it has to do before and after the actual business of writing
      data to host RAM to ensure that dirty flags are correctly
      updated and we flush any TCG translations for the region.
      We need to do this also in other places that write directly
      to host RAM, most notably the TCG atomic helper functions.
      Pull out the before and after pieces into their own functions.
      We use an API where the prepare function stashes the various
      bits of information about the write into a struct for the
      complete function to use, because in the calls for the atomic
      helpers the place where the complete function will be called
      doesn't have the information to hand.
      Cc: qemu-stable@nongnu.org
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: 's avatarRichard Henderson <richard.henderson@linaro.org>
      Reviewed-by: 's avatarPaolo Bonzini <pbonzini@redhat.com>
      Message-id: 1511201308-23580-2-git-send-email-peter.maydell@linaro.org
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2017-11-20-tag' into staging · a61d3439
      Peter Maydell authored
      qemu-ga patch queue for 2.11
      * fix potential overflow in network interface stats reporting
      # gpg: Signature made Mon 20 Nov 2017 20:56:05 GMT
      # gpg:                using RSA key 0x3353C9CEF108B584
      # gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
      # gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
      # gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
      # Primary key fingerprint: CEAC C9E1 5534 EBAB B82D  3FA0 3353 C9CE F108 B584
      * remotes/mdroth/tags/qga-pull-2017-11-20-tag:
        qga: replace GetIfEntry with GetIfEntry2 for interface stats
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20171120' into staging · 1b4e6e8c
      Peter Maydell authored
      late linux-user fixes for Qemu 2.11
      # gpg: Signature made Mon 20 Nov 2017 21:19:00 GMT
      # gpg:                using RSA key 0xB44890DEDE3C9BC0
      # gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
      # gpg:                 aka "Riku Voipio <riku.voipio@linaro.org>"
      # Primary key fingerprint: FF82 03C8 C391 98AE 0581  41EF B448 90DE DE3C 9BC0
      * remotes/riku/tags/pull-linux-user-20171120:
        linux-user: Fix calculation of auxv length
        linux-user: Handle rt_sigaction correctly for SPARC
        linux-user/sparc: Put address for data faults where linux-user expects it
        linux-user/ppc: Report correct fault address for data faults
        linux-user/s390x: Mask si_addr for SIGSEGV
        linux-user: return EINVAL from prctl(PR_*_SECCOMP)
        linux-user: fix 'finshed' typo in comment
        linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64
        linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB
        linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK
        linux-user/hppa: Fix TARGET_MAP_TYPE
        linux-user/hppa: Fix typo for TARGET_NR_epoll_wait
        linux-user/hppa: Fix cpu_clone_regs
        linux-user/hppa: Fix TARGET_SA_* defines
        linux-user: Restrict usage of sa_restorer
      Signed-off-by: 's avatarPeter Maydell <peter.maydell@linaro.org>