From patchwork Wed Dec 12 21:48:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 10727143 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1432D14BD for ; Wed, 12 Dec 2018 21:50:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05ABA2B94B for ; Wed, 12 Dec 2018 21:50:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDFB62B97A; Wed, 12 Dec 2018 21:50:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F05032B94B for ; Wed, 12 Dec 2018 21:50:16 +0000 (UTC) Received: from localhost ([::1]:48282 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXCOW-0001kr-5Y for patchwork-qemu-devel@patchwork.kernel.org; Wed, 12 Dec 2018 16:50:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXCNH-0001jy-7v for qemu-devel@nongnu.org; Wed, 12 Dec 2018 16:49:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXCND-0005XD-UI for qemu-devel@nongnu.org; Wed, 12 Dec 2018 16:48:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXCND-0005WW-MY for qemu-devel@nongnu.org; Wed, 12 Dec 2018 16:48:55 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4E6404E93B for ; Wed, 12 Dec 2018 21:48:54 +0000 (UTC) Received: from localhost (ovpn-112-51.ams2.redhat.com [10.36.112.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id D67D560C44; Wed, 12 Dec 2018 21:48:52 +0000 (UTC) From: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= To: qemu-devel@nongnu.org Date: Thu, 13 Dec 2018 01:48:22 +0400 Message-Id: <20181212214850.29953-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 12 Dec 2018 21:48:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6 00/28] Generalize machine compatibility properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: imammedo@redhat.com, ehabkost@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi, 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) v6: - split "hw: apply machine compat properties without touching globals" - replace PC_COMPAT_* and HW_COMPAT_* defines with static arrays - add ARMCPUInfo *info in ARMCPUClass for "arm: replace instance_post_init()" patch - rebased, commit message updates, add some r-b tags v5: - replace the SET_COMPAT macros, use normal function instead (suggested by Eduardo) - replace the TYPE_COMPAT_PROPS interface approach for explicit object_apply_compat_props(), solving post-init ordering issues. - get back to coupling compat properties with machine, in qdev (although there is still some discussion how to improve this, it can be changed later) - mark the "arm: replace instance_post_init()" as RFC, since it is not longer required for this series - change machines version from 3.2 to 4.0 - add some r-b tags v4: - fix accel/machine compat props apply order inversion - split "qdev: do not mix compat props with global props": replace using current_machine by new compat_props global, introduce SET_COMPAT() macro, use GPtrArray. - add a comment about "qdev-props: call object_apply_global_props()" error reporting - add "arm: replace instance_post_init()", to solve the post-init ordering issue - add "hw/arm/virt: add virt-3.2 machine type" for completeness - commit message improvements - rebased, add r-b tags v3: - GlobalProperties improvements/cleanups - drop generalizing the -global idea - "replace" the set_globals flag with a TYPE_COMPAT_PROPS interface - update hw/i386 machine version to 3.2 - add "qom: make interface types abstract" interface cleanup v2: - replace "qom/user-creatable: add a few helper macros" patch for a more optimized "qom: make user_creatable_complete() specific to UserCreatable" - rename register_global_list() to register_global_properties() - call object_property_set_globals() after post-init - add and use a ObjectClass.set_globals flag, instead of dynamically check object class in object_property_set_globals() - use object "id" in >= 3.1 instead of canonical path, add compat property "x-use-canonical-path-for-ramblock-id" in base hostmem class. Marc-André Lureau (28): hw: apply accel compat properties without touching globals machines: replace COMPAT define with a static array hw: apply machine compat properties without touching globals machine: move compat properties out of globals hw: remove SET_MACHINE_COMPAT compat: replace PC_COMPAT_3_1 & HW_COMPAT_3_1 macros compat: replace PC_COMPAT_3_0 & HW_COMPAT_3_0 macros compat: replace PC_COMPAT_2_12 & HW_COMPAT_2_12 macros compat: replace PC_COMPAT_2_11 & HW_COMPAT_2_11 macros compat: replace PC_COMPAT_2_10 & HW_COMPAT_2_10 macros compat: replace PC_COMPAT_2_9 & HW_COMPAT_2_9 macros compat: replace PC_COMPAT_2_8 & HW_COMPAT_2_8 macros compat: replace PC_COMPAT_2_7 & HW_COMPAT_2_7 macros compat: replace PC_COMPAT_2_6 & HW_COMPAT_2_6 macros compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros include: remove compat.h compat: remove remaining PC_COMPAT macros qdev: make a separate helper function to apply compat properties qdev: all globals are now user-provided qdev-props: convert global_props to GPtrArray qdev-props: remove errp from GlobalProperty qdev-props: call object_apply_global_props() arm: replace instance_post_init() hostmem: use object id for memory region name with >= 4.0 include/hw/boards.h | 59 ++- include/hw/compat.h | 291 -------------- include/hw/i386/pc.h | 684 +++------------------------------ include/hw/qdev-core.h | 21 +- include/qom/object.h | 3 + include/sysemu/accel.h | 4 +- include/sysemu/hostmem.h | 3 +- target/arm/cpu-qom.h | 3 + target/arm/cpu.h | 2 + accel/accel.c | 12 - backends/hostmem-file.c | 8 +- backends/hostmem-memfd.c | 2 +- backends/hostmem-ram.c | 9 +- backends/hostmem.c | 36 ++ hw/arm/virt.c | 46 +-- hw/core/machine.c | 339 +++++++++++++++- hw/core/qdev-properties.c | 49 +-- hw/core/qdev.c | 15 + hw/i386/pc.c | 668 ++++++++++++++++++++++++++++++++ hw/i386/pc_piix.c | 603 +++++++++++++++-------------- hw/i386/pc_q35.c | 36 +- hw/ppc/spapr.c | 207 +++++----- hw/s390x/s390-virtio-ccw.c | 191 +++++---- hw/xen/xen-common.c | 41 +- qom/cpu.c | 1 - qom/object.c | 35 ++ target/arm/cpu.c | 30 +- target/arm/cpu64.c | 24 +- target/i386/cpu.c | 1 - target/sparc/cpu.c | 1 - tests/test-qdev-global-props.c | 57 +-- vl.c | 4 - 32 files changed, 1817 insertions(+), 1668 deletions(-) delete mode 100644 include/hw/compat.h