[Qemu-commits] [qemu/qemu] 76f67b: meson: Propagate gnutls dependency to migration

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 76f67bac79f6d915c7760d46c2be58731def8f03
      
https://github.com/qemu/qemu/commit/76f67bac79f6d915c7760d46c2be58731def8f03
  Author: Jessica Clarke <jrtc27@jrtc27.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M migration/meson.build

  Log Message:
  -----------
  meson: Propagate gnutls dependency to migration

Commit 3eacf70bb5a83e4775ad8003cbca63a40f70c8c2 neglected to fix this
for softmmu configs, which pull in migration's use of gnutls.

This fixes the following compilation failure on Arm-based Macs:

  In file included from migration/multifd.c:23:
  In file included from migration/tls.h:25:
  In file included from include/io/channel-tls.h:26:
  In file included from include/crypto/tlssession.h:24:
  include/crypto/tlscreds.h:28:10: fatal error: 'gnutls/gnutls.h' file not found
  #include <gnutls/gnutls.h>
           ^~~~~~~~~~~~~~~~~
  1 error generated.

(as well as for channel.c and tls.c)

Signed-off-by: Jessica Clarke <jrtc27@jrtc27.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20210320171221.37437-1-jrtc27@jrtc27.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 10b8eb94c0902b58d83df84a9eeae709a3480e82
      
https://github.com/qemu/qemu/commit/10b8eb94c0902b58d83df84a9eeae709a3480e82
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M target/i386/tcg/translate.c

  Log Message:
  -----------
  target/i386: Verify memory operand for lcall and ljmp

These two opcodes only allow a memory operand.

Lacking the check for a register operand, we used the A0 temp
without initialization, which led to a tcg abort.

Buglink: https://bugs.launchpad.net/qemu/+bug/1921138
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210324164650.128608-1-richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a061a71e0d8f259fbb241485f6601bd02c7d086a
      
https://github.com/qemu/qemu/commit/a061a71e0d8f259fbb241485f6601bd02c7d086a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M qapi/qom.json

  Log Message:
  -----------
  qapi: qom: do not use target-specific conditionals

ObjectType and ObjectOptions are defined in a target-independent file,
therefore they do not have access to target-specific configuration
symbols such as CONFIG_PSERIES or CONFIG_SEV.  For this reason,
pef-guest and sev-guest are currently omitted when compiling the
generated QAPI files.  In addition, this causes ObjectType to have
different definitions depending on the file that is including
qapi-types-qom.h (currently this is not causing any issues, but it
is wrong).

Define the two enum entries and the SevGuestProperties type
unconditionally to avoid the issue.  We do not expect to have
many target-dependent user-creatable classes, so it is not
particularly problematic.

Reported-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 7cebff0d0374d2ffd94f3bffe6ea922bb9091563
      
https://github.com/qemu/qemu/commit/7cebff0d0374d2ffd94f3bffe6ea922bb9091563
  Author: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M replay/replay.c

  Log Message:
  -----------
  replay: fix recursive checkpoints

Record/replay uses checkpoints to synchronize the execution
of the threads and timers. Hardware events such as BH are
processed at the checkpoints too.
Event processing can cause refreshing the virtual timers
and calling the icount-related functions, that also use checkpoints.
This patch prevents recursive processing of such checkpoints,
because they have their own records in the log and should be
processed later.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Message-Id: 
<161700476500.1140362.10108444973730452257.stgit@pasha-ThinkPad-X280>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: cb4d9e38bd2a9077716d2e41778cd0bb155ae119
      
https://github.com/qemu/qemu/commit/cb4d9e38bd2a9077716d2e41778cd0bb155ae119
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M qom/object_interfaces.c

  Log Message:
  -----------
  Revert "qom: use qemu_printf to print help for user-creatable objects"

This reverts commit 6d9abb6de9cc53a508823db0283061824f2f98a2.

The real code change had already been added by Kevin's commit da0a932bbf
("hmp: QAPIfy object_add") and commit 6d9abb6d just added a duplicated
include statement as a left-over of a rebase.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210328054758.2351461-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fe852ac2b3725055bb210270e3aca5a0ed4b6217
      
https://github.com/qemu/qemu/commit/fe852ac2b3725055bb210270e3aca5a0ed4b6217
  Author: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M softmmu/cpu-timers.c
    M softmmu/icount.c
    M softmmu/timers-state.h

  Log Message:
  -----------
  icount: get rid of static variable

This patch moves static last_delta variable into timers_state
structure to allow correct vmstate operations with icount shift=auto enabled.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Message-Id: <161701335066.1180180.7104085247702343395.stgit@pasha-ThinkPad-X280>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 46967b1a43dead33fa0c4afecd91b456693d1c4f
      
https://github.com/qemu/qemu/commit/46967b1a43dead33fa0c4afecd91b456693d1c4f
  Author: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M replay/replay-events.c

  Log Message:
  -----------
  replay: notify CPU on event

This patch enables vCPU notification to wake it up
when new async event comes in replay mode.

The motivation of this patch is the following.
Consider recorded block async event. It is saved into the log
with one of the checkpoints. This checkpoint may be passed in
vCPU loop. In replay mode when this async event is read from
the log, and block thread task is not finished yet, vCPU thread
goes to sleep. That is why this patch adds waking up the vCPU
to process this finished event.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Message-Id: <161726519158.1476949.7614181684462079836.stgit@pasha-ThinkPad-X280>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b9e40bac9c7a9f7301e190aa597e84f95657b5b7
      
https://github.com/qemu/qemu/commit/b9e40bac9c7a9f7301e190aa597e84f95657b5b7
  Author: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M target/openrisc/translate.c

  Log Message:
  -----------
  target/openrisc: fix icount handling for timer instructions

This patch adds icount handling to mfspr/mtspr instructions
that may deal with hardware timers.

Signed-off-by: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
Message-Id: <161700376169.1135890.8707223959310729949.stgit@pasha-ThinkPad-X280>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Stafford Horne <shorne@gmail.com>


  Commit: c7328271cf31a01a72234be4b913c1d5c12bf824
      
https://github.com/qemu/qemu/commit/c7328271cf31a01a72234be4b913c1d5c12bf824
  Author: Miroslav Rezanina <mrezanin@redhat.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: Do not use default_feature for EXESUF

Commit "c87ea11631 configure: add --without-default-features" use
default_feature to set default values for configure option. This value
is used for EXESUF too.

However, EXESUF is not option to be tested, it is just append to any
binary name so using --without-default-features set EXESUF to "n"o and
all binaries using it has form <name>no (e.g. qemu-imgno).

This is not expected behavior as disabling features should not cause
generating different binary names.

Reverting back to setting EXESUF to empty value unless needed otherwise.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
Message-Id: <20210331081845.105089-1-mrezanin@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a5158a963e7f1bd8d43de54a6471941faf9f5b4e
      
https://github.com/qemu/qemu/commit/a5158a963e7f1bd8d43de54a6471941faf9f5b4e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M target/hexagon/meson.build

  Log Message:
  -----------
  hexagon: do not specify executables as inputs

gen_semantics is an executable, not an input.  Meson 0.57 special cases
the first argument and @INPUT@ is not expanded there.  Fix that by
not including it in the input, only in the command.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 2008b34a5926701caf6e7a78ee7b92975455f351
      
https://github.com/qemu/qemu/commit/2008b34a5926701caf6e7a78ee7b92975455f351
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M target/hexagon/meson.build

  Log Message:
  -----------
  hexagon: do not specify Python scripts as inputs

Python scripts are not inputs, and putting them in @INPUT@.  This
puts requirements on the command line format, keeping all inputs
close to the name of the script.  Avoid that by not including the
script in the command and not in the inputs.

Also wrap "PYTHONPATH" usage with "env", since setting the environment
this way is not valid under Windows.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c81cfb89bc440466c1f128b64a8fbca256477b60
      
https://github.com/qemu/qemu/commit/c81cfb89bc440466c1f128b64a8fbca256477b60
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    A docs/devel/code-of-conduct.rst
    A docs/devel/conflict-resolution.rst
    M docs/devel/index.rst

  Log Message:
  -----------
  docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document

In an ideal world, we would all get along together very well, always be
polite and never end up in huge conflicts. And even if there are conflicts,
we would always handle each other fair and respectfully. Unfortunately,
this is not an ideal world and sometimes people forget how to interact with
each other in a professional and respectful way. Fortunately, this seldom
happens in the QEMU community, but for such rare cases it is preferrable
to have a basic code of conduct document available to show to people
who are misbehaving.  In case that does not help yet, we should also have
a conflict resolution policy ready that can be applied in the worst case.

The Code of Conduct document tries to be short and to the point while
trying to remain friendly and welcoming; it is based on the Fedora Code
of Conduct[1] with extra detail added based on the Contributor Covenant
1.3.0[2].  Other proposals included the Contributor Covenant 1.3.0 itself
or the Django Code of Conduct[3] (which is also a derivative of Fedora's)
but, in any case, there was agreement on keeping the conflict resolution
policy separate from the CoC itself.

An important point is whether to apply the code of conduct to violations
that occur outside public spaces.  The text herein restricts that to
individuals acting as a representative or a member of the project or
its community.  This is intermediate between the Contributor Covenant
(which only mentions representatives of the community, for example using
an official project e-mail address or posting via an official social media
account), and the Django Code of Conduct, which says that violations of
this code outside these spaces "may" be considered but otherwise applies
no limit.

The conflict resolution policy is based on the Drupal Conflict Resolution
Policy[4] and its derivative, the Mozilla Consequence Ladder[5].

[1] https://www.fedoraproject.com/code-of-conduct/
[2] https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/
[3] https://www.djangoproject.com/conduct/
[4] https://www.drupal.org/conflict-resolution
[5] 
https://github.com/mozilla/diversity/blob/master/code-of-conduct-enforcement/consequence-ladder.md

Co-developed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Edmondson <david.edmondson@oracle.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 00084bab87c43be20638de7f191d1a1faed134cc
      
https://github.com/qemu/qemu/commit/00084bab87c43be20638de7f191d1a1faed134cc
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-04-01 (Thu, 01 Apr 2021)

  Changed paths:
    M configure
    A docs/devel/code-of-conduct.rst
    A docs/devel/conflict-resolution.rst
    M docs/devel/index.rst
    M migration/meson.build
    M qapi/qom.json
    M qom/object_interfaces.c
    M replay/replay-events.c
    M replay/replay.c
    M softmmu/cpu-timers.c
    M softmmu/icount.c
    M softmmu/timers-state.h
    M target/hexagon/meson.build
    M target/i386/tcg/translate.c
    M target/openrisc/translate.c

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

* Bugfixes
* Code of conduct and conflict resolution policy

# gpg: Signature made Thu 01 Apr 2021 12:21:10 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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-gitlab/tags/for-upstream:
  docs: Add a QEMU Code of Conduct and Conflict Resolution Policy document
  hexagon: do not specify Python scripts as inputs
  hexagon: do not specify executables as inputs
  configure: Do not use default_feature for EXESUF
  target/openrisc: fix icount handling for timer instructions
  replay: notify CPU on event
  icount: get rid of static variable
  Revert "qom: use qemu_printf to print help for user-creatable objects"
  replay: fix recursive checkpoints
  qapi: qom: do not use target-specific conditionals
  target/i386: Verify memory operand for lcall and ljmp
  meson: Propagate gnutls dependency to migration

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/1bd16067b652...00084bab87c4