qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 917ddc: meson: fix dependencies for modinfo #


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 917ddc: meson: fix dependencies for modinfo #2
Date: Sat, 24 Jul 2021 06:25:59 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 917ddc27d86ae427d2aa7ff2d19eb7fdb642b68e
      
https://github.com/qemu/qemu/commit/917ddc27d86ae427d2aa7ff2d19eb7fdb642b68e
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: fix dependencies for modinfo #2

modinfo runs the preprocessor and therefore needs all generated input files
to be there.  The "depends" clause does not work in Meson 0.55.3, so for
now use "input".

Part #2: Update the rule for target-specific modules too.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20210723120156.1183920-1-kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3407259b20ccb5f53183bc50605da6f229dc2de2
      
https://github.com/qemu/qemu/commit/3407259b20ccb5f53183bc50605da6f229dc2de2
  Author: Lara Lazier <laramglazier@gmail.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M target/i386/tcg/sysemu/misc_helper.c
    M target/i386/tcg/sysemu/svm_helper.c

  Log Message:
  -----------
  target/i386: Added consistency checks for CR3

All MBZ in CR3 must be zero (APM2 15.5)
Added checks in both helper_vmrun and helper_write_crN.
When EFER.LMA is zero the upper 32 bits needs to be zeroed.

Signed-off-by: Lara Lazier <laramglazier@gmail.com>
Message-Id: <20210723112740.45962-1-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 5b8978d8042660de35b2c67c62ffeb6b42ff441e
      
https://github.com/qemu/qemu/commit/5b8978d8042660de35b2c67c62ffeb6b42ff441e
  Author: Claudio Fontana <cfontana@suse.de>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M target/i386/cpu.c
    M target/i386/host-cpu.c
    M target/i386/kvm/kvm-cpu.c
    M target/i386/tcg/tcg-cpu.c

  Log Message:
  -----------
  i386: do not call cpudef-only models functions for max, host, base

Some cpu properties have to be set only for cpu models in builtin_x86_defs,
registered with x86_register_cpu_model_type, and not for
cpu models "base", "max", and the subclass "host".

These properties are the ones set by function x86_cpu_apply_props,
(also including kvm_default_props, tcg_default_props),
and the "vendor" property for the KVM and HVF accelerators.

After recent refactoring of cpu, which also affected these properties,
they were instead set unconditionally for all x86 cpus.

This has been detected as a bug with Nested on AMD with cpu "host",
as svm was not turned on by default, due to the wrongful setting of
kvm_default_props via x86_cpu_apply_props, which set svm to "off".

Rectify the bug introduced in commit "i386: split cpu accelerators"
and document the functions that are builtin_x86_defs-only.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Fixes: f5cc5a5c ("i386: split cpu accelerators from cpu.c,"...)
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/477
Message-Id: <20210723112921.12637-1-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 4ade3ea145261fb6ae6c80b284f6912f3f7b87be
      
https://github.com/qemu/qemu/commit/4ade3ea145261fb6ae6c80b284f6912f3f7b87be
  Author: David Hildenbrand <david@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Replace Eduardo as "Host Memory Backends" maintainer

Edurdo asked me to take over co-maintaining "Host Memory Backends" with
Igor, as Eduardo has plenty of other things to look after.

Thanks a lot Eduardo for your excellent work in the past!

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20210723100532.27353-2-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 07b315ba92f508cd63ca0adeab58fbb13d0b5585
      
https://github.com/qemu/qemu/commit/07b315ba92f508cd63ca0adeab58fbb13d0b5585
  Author: David Hildenbrand <david@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Add Peter Xu and myself as co-maintainer of "Memory API"

Peter and myself volunteered to help out co-maintaining "Memory API"
with Paolo, so let's update the MAINTAINERS file.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20210723100532.27353-3-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9f04dd7f5a3dd6d9a4c34f4882dd1ef0b7936a2f
      
https://github.com/qemu/qemu/commit/9f04dd7f5a3dd6d9a4c34f4882dd1ef0b7936a2f
  Author: David Hildenbrand <david@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Add memory_mapping.h and memory_mapping.c to "Memory API"

Both files logically belong to "Memory API" and are not yet listed
anywhere else explicitly. Let's add them to "Memory API".

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Message-Id: <20210723100532.27353-4-david@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: eafadbbbac06a8d72baa976f4d3c42b0e5f8cfc8
      
https://github.com/qemu/qemu/commit/eafadbbbac06a8d72baa976f4d3c42b0e5f8cfc8
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml

  Log Message:
  -----------
  gitlab: only let pages be published from default branch

GitLab will happily publish pages generated by the latest CI pipeline
from any branch:

https://docs.gitlab.com/ee/user/project/pages/introduction.html

  "Remember that GitLab Pages are by default branch/tag agnostic
   and their deployment relies solely on what you specify in
   .gitlab-ci.yml. You can limit the pages job with the only
   parameter, whenever a new commit is pushed to a branch used
   specifically for your pages."

The current "pages" job is not limited, so it is happily publishing
docs content from any branch/tag in qemu.git that gets pushed to.
This means we're potentially publishing from the "staging" branch
or worse from outdated "stable-NNN" branches

This change restricts it to only publish from the default branch
in the main repository. For contributor forks, however, we allow
it to publish from any branch, since users will have arbitrarily
named topic branches in flight at any time.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210723113051.2792799-1-berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 18fa3ebc45262cebc7c9f0ba6f717452bdc51db7
      
https://github.com/qemu/qemu/commit/18fa3ebc45262cebc7c9f0ba6f717452bdc51db7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    A include/qapi/forward-visitor.h
    M qapi/meson.build
    A qapi/qapi-forward-visitor.c
    M tests/unit/meson.build
    A tests/unit/test-forward-visitor.c

  Log Message:
  -----------
  qapi: introduce forwarding visitor

This new adaptor visitor takes a single field of the adaptee, and exposes it
with a different name.

This will be used for QOM alias properties.  Alias targets can of course
have a different name than the alias property itself (e.g. a machine's
pflash0 might be an alias of a property named 'drive').  When the target's
getter or setter invokes the visitor, it will use a different name than
what the caller expects, and the visitor will not be able to find it
(or will consume erroneously).

The solution is for alias getters and setters to wrap the incoming
visitor, and forward the sole field that the target is expecting while
renaming it appropriately.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: cbc94d9702882128c52b72b252b8eb775b0e73af
      
https://github.com/qemu/qemu/commit/cbc94d9702882128c52b72b252b8eb775b0e73af
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-07-23 (Fri, 23 Jul 2021)

  Changed paths:
    M qom/object.c

  Log Message:
  -----------
  qom: use correct field name when getting/setting alias properties

Alias targets have a different name than the alias property itself
(e.g. a machine's pflash0 might be an alias of a property named 'drive').
When the target's getter or setter invokes the visitor, it will use
a different name than what the caller expects, and the visitor will
not be able to find it (or will consume erroneously).

The solution is for alias getters and setters to wrap the incoming
visitor, and forward the sole field that the target is expecting while
renaming it appropriately.

This bug has been there forever, but it was exposed after -M parsing
switched from QemuOptions and StringInputVisitor to keyval and
QObjectInputVisitor.  Before, the visitor ignored the name. Now, it
checks "drive" against what was passed on the command line and finds
that no such property exists.

Fixes: https://gitlab.com/qemu-project/qemu/-/issues/484
Reported-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a2376507f615495b1d16685449ce0ea78c2caf9d
      
https://github.com/qemu/qemu/commit/a2376507f615495b1d16685449ce0ea78c2caf9d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-24 (Sat, 24 Jul 2021)

  Changed paths:
    M .gitlab-ci.d/buildtest.yml
    M MAINTAINERS
    A include/qapi/forward-visitor.h
    M meson.build
    M qapi/meson.build
    A qapi/qapi-forward-visitor.c
    M qom/object.c
    M target/i386/cpu.c
    M target/i386/host-cpu.c
    M target/i386/kvm/kvm-cpu.c
    M target/i386/tcg/sysemu/misc_helper.c
    M target/i386/tcg/sysemu/svm_helper.c
    M target/i386/tcg/tcg-cpu.c
    M tests/unit/meson.build
    A tests/unit/test-forward-visitor.c

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

Bugfixes.

# gpg: Signature made Sat 24 Jul 2021 07:11:18 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:
  qom: use correct field name when getting/setting alias properties
  qapi: introduce forwarding visitor
  gitlab: only let pages be published from default branch
  MAINTAINERS: Add memory_mapping.h and memory_mapping.c to "Memory API"
  MAINTAINERS: Add Peter Xu and myself as co-maintainer of "Memory API"
  MAINTAINERS: Replace Eduardo as "Host Memory Backends" maintainer
  i386: do not call cpudef-only models functions for max, host, base
  target/i386: Added consistency checks for CR3
  meson: fix dependencies for modinfo #2

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


Compare: https://github.com/qemu/qemu/compare/a146af86c824...a2376507f615



reply via email to

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