Merge remote-tracking branch 'remotes/elmarco/tags/machine-props-pull-request' into staging
Generalize machine compatibility properties
During "[PATCH v2 05/10] qom/globals: generalize
object_property_set_globals()" review, Eduardo suggested to rework the
GlobalProperty handling, so that -global is limited to QDev only and
we avoid mixing the machine compats and the user-provided -global
properties (instead of generalizing -global to various object kinds,
like I proposed in v2).
"qdev: do not mix compat props with global props" patch decouples a
bit user-provided -global from machine compat properties. This allows
to get rid of "user_provided" and "errp" fields in following patches.
A new compat property "x-use-canonical-path-for-ramblock-id" is added
to hostmem for legacy canonical path names, set to true for -file and
-memfd with qemu < 4.0.
(this series was initially titled "[PATCH v2 00/10] hostmem: use
object "id" for memory region name with >= 3.1", but its focus is more
in refactoring the global and compatilibity properties handling now)
# gpg: Signature made Mon 07 Jan 2019 12:22:43 GMT
# gpg: using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/machine-props-pull-request: (28 commits)
hostmem: use object id for memory region name with >= 4.0
arm: replace instance_post_init()
qdev-props: call object_apply_global_props()
qdev-props: remove errp from GlobalProperty
qdev-props: convert global_props to GPtrArray
qdev: all globals are now user-provided
qdev: make a separate helper function to apply compat properties
compat: remove remaining PC_COMPAT macros
include: remove compat.h
compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros
compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros
compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros
compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros
compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros
compat: replace PC_COMPAT_2_6 & HW_COMPAT_2_6 macros
compat: replace PC_COMPAT_2_7 & HW_COMPAT_2_7 macros
compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros
compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 macros
compat: replace PC_COMPAT_2_10 & HW_COMPAT_2_10 macros
compat: replace PC_COMPAT_2_11 & HW_COMPAT_2_11 macros
...
Signed-off-by:
Peter Maydell <peter.maydell@linaro.org>
Showing
- accel/accel.c 0 additions, 12 deletionsaccel/accel.c
- backends/hostmem-file.c 4 additions, 4 deletionsbackends/hostmem-file.c
- backends/hostmem-memfd.c 1 addition, 1 deletionbackends/hostmem-memfd.c
- backends/hostmem-ram.c 4 additions, 5 deletionsbackends/hostmem-ram.c
- backends/hostmem.c 36 additions, 0 deletionsbackends/hostmem.c
- hw/arm/virt.c 9 additions, 37 deletionshw/arm/virt.c
- hw/core/machine.c 329 additions, 18 deletionshw/core/machine.c
- hw/core/qdev-properties.c 18 additions, 31 deletionshw/core/qdev-properties.c
- hw/core/qdev.c 15 additions, 0 deletionshw/core/qdev.c
- hw/i386/pc.c 674 additions, 0 deletionshw/i386/pc.c
- hw/i386/pc_piix.c 260 additions, 248 deletionshw/i386/pc_piix.c
- hw/i386/pc_q35.c 25 additions, 11 deletionshw/i386/pc_q35.c
- hw/ppc/spapr.c 101 additions, 106 deletionshw/ppc/spapr.c
- hw/s390x/s390-virtio-ccw.c 90 additions, 106 deletionshw/s390x/s390-virtio-ccw.c
- hw/xen/xen-common.c 21 additions, 20 deletionshw/xen/xen-common.c
- include/hw/boards.h 42 additions, 17 deletionsinclude/hw/boards.h
- include/hw/compat.h 0 additions, 299 deletionsinclude/hw/compat.h
- include/hw/i386/pc.h 47 additions, 642 deletionsinclude/hw/i386/pc.h
- include/hw/qdev-core.h 14 additions, 9 deletionsinclude/hw/qdev-core.h
- include/qom/object.h 3 additions, 0 deletionsinclude/qom/object.h
Loading
Please register or sign in to comment