From nobody Sat May 18 05:34:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588593758; cv=none; d=zohomail.com; s=zohoarc; b=EeUI26SEcQNZFRZjC7AOJOIQmS9wZ7X62ZuEF6WvjLOoLClvqsc1yGehB3EXs1fC7TrboM2+bs8iwCwHeq30cfLxRmV1EKRrUg9KF3iMiCwIHKujzCGYg2hHwF32pOK+fGxbPRUHFW3GyYGPsbb7fuZEgMTxUHTWXXZ3IRJQ9Cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588593758; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SkzVF0IAQenJ+vuaRxVd2feGaJRdUO/UKBkIdIBtTMo=; b=XMWlAbwQd8e5OhLcqQyiSrmW2i+1FJjAHAr+dyntUrTKQSTu4wD2xEaEmaZS7PIfm5ELge18v59fnhq/WXd7qvKKFRNfg1dPk+pKIjdDosrS04Amo2mFbk68bEfvRjGrpv4xw4EJBfEO2L58dcPnZv/+lteq2Thge7TiPGS7iZw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588593758699878.4826737563767; Mon, 4 May 2020 05:02:38 -0700 (PDT) Received: from localhost ([::1]:41108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVZnx-0008NS-Cd for importer@patchew.org; Mon, 04 May 2020 08:02:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVZie-0001rD-GW; Mon, 04 May 2020 07:57:08 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37285) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVZid-0001Fr-ES; Mon, 04 May 2020 07:57:08 -0400 Received: by mail-wr1-x436.google.com with SMTP id k1so20572753wrx.4; Mon, 04 May 2020 04:57:01 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id n12sm5660984wrj.95.2020.05.04.04.56.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 04:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SkzVF0IAQenJ+vuaRxVd2feGaJRdUO/UKBkIdIBtTMo=; b=GvkFTPWlo9th21HoDj9u0RN32gvbPgLDzGaL4aAOI944ux9Nfi0xmD2ExWRUEQreaq 4aEcbSEnqy3D76vFVJ30KHcuDu1e1s2jAaJdHrKqzIafH722ZZGWhUJ9OJ3DPx8DlxdS iGVIAs1AUBCBOIL5wReot7rcYesswRVUa+aUJsCU3J559CdHVRuZT76ebu3O8ymIdlcj 2eFwvzf1nghft+SyeISgxfV174LNcqNNnBmG1O6pyKj0NxgxAUAEWfID0GUzlSQiT/Au 2g3e+xL9HD5vKTXadE3fYVSwAQNV3kyM5Uia+dttYoQ/0opgfn6LrEtXBmtl+gNVP4CH zWqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SkzVF0IAQenJ+vuaRxVd2feGaJRdUO/UKBkIdIBtTMo=; b=QH1lNkygYGuuLnnlvRKQ5gtGIu0Si16H68C4wrAVf8nYr0lQoM8DmcITh+kPgJl7bm okmkUMdC7im2z8ezXkz2dv9AFLdHEgKEJt1SvGRaNzv2oHylglKOdU/Mwy23i9ZExpjr nBkEUp6AWz6DzjPKiqICCnY8U9z2IiKoLg+n89FkzjUhbIs3Gp68OoV2O7/ebM23xBi2 F4/WSHSlvqFEjym66m80Jmns3B76vX5bH4icA9WvdHQoloJ4hI0m1c1yfarhO6A8gqkO kJLf2dX5uL4xiYyJznW6GFV2YZNbKEzcHIRHDf6qdKeoMUtgxALpXfFmeE6NNkGZM27h GtFw== X-Gm-Message-State: AGi0PuZLs23XXJ6tptbyJstT4dzz+V27fmMg7mLs95VuHy9OLLCDTFkT mcCyJKQajPDwKhPK7tFGIgV9jLaF X-Google-Smtp-Source: APiQypKjfVvmr9Jb1ZL6HMB7lWwFglrCR/bgs8OQGIlB0pPhwuIYKnhsaTL2sZHuWaSnDFBejpAxdQ== X-Received: by 2002:a5d:68c7:: with SMTP id p7mr3200590wrw.29.1588593420030; Mon, 04 May 2020 04:57:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 1/3] qom/object: Move Object typedef to 'qemu/typedefs.h' Date: Mon, 4 May 2020 13:56:54 +0200 Message-Id: <20200504115656.6045-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504115656.6045-1-f4bug@amsat.org> References: <20200504115656.6045-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We use the Object type all over the place. Forward declare it in "qemu/typedefs.h". Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/qemu/typedefs.h | 1 + include/qom/object.h | 2 -- include/qom/qom-qobject.h | 2 -- include/sysemu/sysemu.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h index 375770a80f..b03ec9f40a 100644 --- a/include/qemu/typedefs.h +++ b/include/qemu/typedefs.h @@ -75,6 +75,7 @@ typedef struct NetFilterState NetFilterState; typedef struct NICInfo NICInfo; typedef struct NodeInfo NodeInfo; typedef struct NumaNodeMem NumaNodeMem; +typedef struct Object Object; typedef struct ObjectClass ObjectClass; typedef struct PCIBridge PCIBridge; typedef struct PCIBus PCIBus; diff --git a/include/qom/object.h b/include/qom/object.h index 784c97c0e1..1edc12e64c 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -20,8 +20,6 @@ struct TypeImpl; typedef struct TypeImpl *Type; =20 -typedef struct Object Object; - typedef struct TypeInfo TypeInfo; =20 typedef struct InterfaceClass InterfaceClass; diff --git a/include/qom/qom-qobject.h b/include/qom/qom-qobject.h index 77cd717e3f..82136e6e80 100644 --- a/include/qom/qom-qobject.h +++ b/include/qom/qom-qobject.h @@ -13,8 +13,6 @@ #ifndef QEMU_QOM_QOBJECT_H #define QEMU_QOM_QOBJECT_H =20 -#include "qom/object.h" - /* * object_property_get_qobject: * @obj: the object diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index ef81302e1a..ca4458e451 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -5,7 +5,6 @@ #include "qemu/timer.h" #include "qemu/notify.h" #include "qemu/uuid.h" -#include "qom/object.h" =20 /* vl.c */ =20 --=20 2.21.3 From nobody Sat May 18 05:34:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1588593571; cv=none; d=zohomail.com; s=zohoarc; b=MC3uEOHl+RaOZVeIrrpl6V/BsfbPnNz/5k4sJzE9gsnQu/iEHXCN/e6mpvQkpCy6MtMYNb/CcASgo5t463ZPqXvWIrnydVRm0XsiQv5sVv1TCXUFCxgVrnUEq+VdUJhkQC5HelQoNYTeEmp8VWj5QfpY/FtzO4XCMnsvBMcy2Vw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588593571; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=obSCKk2me/00cEpyiCftGc/OOp6WIYGJzAVVhOdRcgM=; b=HFLfODMcMaJAbBCNlxaxDFlGB/DbPftyA10m9LBqwjQjI601eALtYNqgHp7Ra2ZGRy7NuUfDU/5w2+IXoSP40lx0/Sde0nRz/uCS9gk2nIjxwuZFfkrnu/yM1hIHMgxd1GG1mWyQ7FX6d1hDVvPiB0wWB0zUlo3LCuUX2hUvnvs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15885935710686.958845322661546; Mon, 4 May 2020 04:59:31 -0700 (PDT) Received: from localhost ([::1]:59462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVZkv-00048J-PO for importer@patchew.org; Mon, 04 May 2020 07:59:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVZie-0001r4-AC; Mon, 04 May 2020 07:57:08 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:35673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVZid-0001G2-Cm; Mon, 04 May 2020 07:57:08 -0400 Received: by mail-wm1-x342.google.com with SMTP id r26so8716515wmh.0; Mon, 04 May 2020 04:57:02 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id n12sm5660984wrj.95.2020.05.04.04.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 04:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=obSCKk2me/00cEpyiCftGc/OOp6WIYGJzAVVhOdRcgM=; b=Dn19oVHRhyI9z8SLrPicRhninDKG8BnO9a0o/KM9ulRZdhfRSNjJSm0Rc+j61SaZTE o0o5XLi4KhPXAyEDkz0l0JXLN/neIM+mUbHue4v2oCsmxr6szKEABQ1Tl9+ArDy4to0Z LafyZ3+HAYn5wellh+HdsKZqBzKoCeXac3HAtt26sXDMzSicHMq+9NJDfCfCPNaOoG8I 0D1yHcIQO+YiHHTrzChP4knCLUNbCaN2lYJTh4/qQwnxCtkcrRqa7Z8URQ8AHuO5q2re nXxyCPI6C/6bz7XZ7YYAo17GuUNx5Wwd32G7Q4G1vCsqlYOV9m/BOghU+b5+2dsh0xdP mLdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=obSCKk2me/00cEpyiCftGc/OOp6WIYGJzAVVhOdRcgM=; b=phl18hdeLjBNdpSuewW1E/y4xof2fM3AAIiIsu438/E6/knqHaycEmaZRIsl5Zfk/g bEcbUbDOfX3XfKjxKxIZPrHjdwt8hqSsC0kgmKtJFF6Qn08E63gUHVL6Cs1vQQRy7+n8 6P68zhkbWkWkMAuj/wo+H/f3Z8AvEtNg5xUSiI8ks2fyo+tpVZoGwXeuYIYiTtDP0Qkd KgQIMKk0gZ3mzLg8xj1iJjPU1EKS6owMSCYFjoOuNNJqjdpe1GqJaAFY6Z4GoFl3pzz/ Dj8jepHcQ1Z3pVJWiYZ0xD6OWZkG3HVH8mDwFeJxQXmR6PS5tfJEyEAb94JLYlEYIgM7 cAew== X-Gm-Message-State: AGi0PuYNgHAmOjSbzR1OiOBd3dMxyuh370bONttgecpqOCFU4B44HThK n/jqTL4S+VSSyELaim9xf2wdjh07 X-Google-Smtp-Source: APiQypI+rAq8eJ5GbY9KHUvJk/iDG3foPZfD8mGwmlHLDVneOMhV7voMAqRB7qOnNxNLTeynmHBomg== X-Received: by 2002:a1c:bad4:: with SMTP id k203mr14006080wmf.15.1588593421110; Mon, 04 May 2020 04:57:01 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 2/3] io/task: Move 'qom/object.h' header to source Date: Mon, 4 May 2020 13:56:55 +0200 Message-Id: <20200504115656.6045-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504115656.6045-1-f4bug@amsat.org> References: <20200504115656.6045-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We need "qom/object.h" to call object_ref()/object_unref(), and to test the TYPE_DUMMY. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Add missing header in tests/test-io-task.c (patchew) --- include/io/task.h | 2 -- io/task.c | 1 + tests/test-io-task.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/io/task.h b/include/io/task.h index 1abbfb8b65..6818dfedd0 100644 --- a/include/io/task.h +++ b/include/io/task.h @@ -21,8 +21,6 @@ #ifndef QIO_TASK_H #define QIO_TASK_H =20 -#include "qom/object.h" - typedef struct QIOTask QIOTask; =20 typedef void (*QIOTaskFunc)(QIOTask *task, diff --git a/io/task.c b/io/task.c index 1ae7b86488..53c0bed686 100644 --- a/io/task.c +++ b/io/task.c @@ -22,6 +22,7 @@ #include "io/task.h" #include "qapi/error.h" #include "qemu/thread.h" +#include "qom/object.h" #include "trace.h" =20 struct QIOTaskThreadData { diff --git a/tests/test-io-task.c b/tests/test-io-task.c index aa8b653bfa..c8a3813d49 100644 --- a/tests/test-io-task.c +++ b/tests/test-io-task.c @@ -20,6 +20,7 @@ =20 #include "qemu/osdep.h" =20 +#include "qom/object.h" #include "io/task.h" #include "qapi/error.h" #include "qemu/module.h" --=20 2.21.3 From nobody Sat May 18 05:34:54 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1588593562; cv=none; d=zohomail.com; s=zohoarc; b=XNYTMZiTd97aplDjI8bkA7sFb/Axcr8b2W3/A3HwZGh5b1iR+lcEEYz9VdCVxjyhtCe/213+TTGRgJ4ng4MBeGc6m59xaAFU/GdO02IDFufmMA8T6IqR5GOm7qZbN6gfMJqTo0tqSyew9Mq5Row22ncCaPWZTk+DB0qMzb24Nbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588593562; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f+EbD9Q86u44mnUNC8LdzOT84sTEw0zjnLN96ls2FY8=; b=Mgz/nI+DsFRw2AS6ODJybwi3Ljc55VxN9ATTIAx5Iouh8L4WyWzD8PHufVuOPQu+EmU2F/EgcIltgcoO6yuNmrQ4LH+63qhtvfO3BVhwcLoTsEMJG2LuPr5G/bTeNE2NllS3hT57I3qh1O92YFvLs9ePohoeOzN2ElAZgwFWuD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588593562661358.43647739780897; Mon, 4 May 2020 04:59:22 -0700 (PDT) Received: from localhost ([::1]:58514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jVZkn-0003lR-CS for importer@patchew.org; Mon, 04 May 2020 07:59:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jVZie-0001qs-2O; Mon, 04 May 2020 07:57:08 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jVZid-0001G9-Cd; Mon, 04 May 2020 07:57:07 -0400 Received: by mail-wr1-x441.google.com with SMTP id d15so20574349wrx.3; Mon, 04 May 2020 04:57:04 -0700 (PDT) Received: from x1w.redhat.com (26.red-88-21-207.staticip.rima-tde.net. [88.21.207.26]) by smtp.gmail.com with ESMTPSA id n12sm5660984wrj.95.2020.05.04.04.57.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 04:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f+EbD9Q86u44mnUNC8LdzOT84sTEw0zjnLN96ls2FY8=; b=OnCK6mhU9G9SVkGhpY5pbKk+MRkuYS47AV66uu4tzs2/gtCqXvvvnHH7JudFKDPPHF htrPx2KMZjAZy9uKmL4GL4bKGwJKnM/X/jejPyctXNd5xEGeYj5Iadeq+Pjwr/vGD+PD S2RytjYaE6aJ96hOOgEMMAQNnxwEHvueFhLJYsB/Kh8f0TUk5kGdNHyWpRFVYfn6uKrQ nuMHYaTnKmJwSkcwvb380WneVcgxRglW43+lhBGQbOFInNJvUj1Qqy+hnK+iUrHaS5Q1 R+GKpQH7ZUTgrmjgZM5YxObCj9F4s0j8P4bareMfZwi+myQ0wDPx41gvK/0QRuiI5myA pWLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f+EbD9Q86u44mnUNC8LdzOT84sTEw0zjnLN96ls2FY8=; b=sTC+ywQtm3abwI2QxEShTRWsXe3FIuYkx5qeuqagj+I7hB3kY1ggXx8u6hUEvPuLp8 lVXv3tDXMvW0TCASCH3GcwfU5sgfFJorynyk43oIgiBUCn+HEcvl1DsNmntZuTeP0bww bvJJRPPSSNMjX0NXqsU1DoLIMdbP/v+IyGkxerdPvSLl39vPISSoH7N09KP1vP3EcYr0 1Tc9QwGC4q55mTVLm9lbePb1xng6oyyVL1dtczPGhw1uHO/GtAB/Do5LQOQRk73ZpRep sqChbHeXCsyEMoApH4yiwWs8IRTQww25ZjsN6Feaj4BSsNCrq0IUChaBbfPTe0vkfdEX Fzmw== X-Gm-Message-State: AGi0PuZZooCteVsZq6Up1Xs3+lgEIv+9Nie6YjHx/x8ymXs91mFEkkPx nbOWmd48zXpyT22F4lGlT/Nk3Qva X-Google-Smtp-Source: APiQypJsyuG2c/A4OQ3/iYixKP3P+ijzEYV8F+Bo2y915r7C5w8QQ8mnDS1SQ80UjthvbFgDUwf8PQ== X-Received: by 2002:adf:c7c3:: with SMTP id y3mr17461703wrg.196.1588593423019; Mon, 04 May 2020 04:57:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 3/3] qom/object: Make reparenting error more verbose Date: Mon, 4 May 2020 13:56:56 +0200 Message-Id: <20200504115656.6045-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200504115656.6045-1-f4bug@amsat.org> References: <20200504115656.6045-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::441; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Display child and parent names when reparenting occurs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- qom/object.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index be700e831f..417fd90aa5 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1683,7 +1683,12 @@ void object_property_add_child(Object *obj, const ch= ar *name, ObjectProperty *op; =20 if (child->parent !=3D NULL) { - error_setg(errp, "child object is already parented"); + error_setg(errp, "child object '%s' is already parented (parent: '= %s') " + "can not be children '%s' of '%s'", + object_get_typename(child), + object_get_typename(child->parent), + name, + object_get_typename(obj)); return; } =20 --=20 2.21.3