From nobody Mon Feb 9 02:13:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1627930530062545.9824086495031; Mon, 2 Aug 2021 11:55:30 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-RQMcjFxCP9ODp9iSJxUEYg-1; Mon, 02 Aug 2021 14:55:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DACA91006C88; Mon, 2 Aug 2021 18:55:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9120A101E663; Mon, 2 Aug 2021 18:55:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 51AB64BB7C; Mon, 2 Aug 2021 18:55:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 172Isph9006367 for ; Mon, 2 Aug 2021 14:54:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id 355422147011; Mon, 2 Aug 2021 18:54:51 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 300D0214700E for ; Mon, 2 Aug 2021 18:54:51 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 149D396B061 for ; Mon, 2 Aug 2021 18:54:51 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2139.outbound.protection.outlook.com [40.107.21.139]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-575-C5runEhtMNKlnpWHhDmjQQ-1; Mon, 02 Aug 2021 14:54:47 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4405.eurprd08.prod.outlook.com (2603:10a6:20b:b7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Mon, 2 Aug 2021 18:54:43 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::44b9:68ac:bdc7:e23c]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::44b9:68ac:bdc7:e23c%8]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 18:54:43 +0000 Received: from localhost.localdomain (185.215.60.211) by HE1PR05CA0240.eurprd05.prod.outlook.com (2603:10a6:3:fb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Mon, 2 Aug 2021 18:54:41 +0000 X-MC-Unique: RQMcjFxCP9ODp9iSJxUEYg-1 X-MC-Unique: C5runEhtMNKlnpWHhDmjQQ-1 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 5/8] qdev: improve find_device_state() to distinguish simple not found case Date: Mon, 2 Aug 2021 21:54:13 +0300 Message-ID: <20210802185416.50877-6-vsementsov@virtuozzo.com> In-Reply-To: <20210802185416.50877-1-vsementsov@virtuozzo.com> References: <20210802185416.50877-1-vsementsov@virtuozzo.com> X-ClientProxiedBy: HE1PR05CA0240.eurprd05.prod.outlook.com (2603:10a6:3:fb::16) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdfaba5d-f219-466b-54ac-08d955e6fd7e X-MS-TrafficTypeDiagnostic: AM6PR08MB4405: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:108 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: WUDPXWY3SZEkylaRf5WywLpo3fLBL2SLdxk1K/ZnHhPsI6cudwMNVBBE/ZDq8jC78GZtY6ttW5JD5J44kCZOIhMlJ2O03WdI4ifxLeDmdW4QLSsS0XZ+L/+IofLfCwMyMvIPaGnAvYBjQbFJmX9QYsy4aglWTOGt+a/hh4HabVD7vuvabw3KbCRz1l/6vf4bMnYgJila51ySJWTtRufQCl0KsVQ8TaDY2aVsVF7K8x6UeWqT3+Lev9yF7Ui10tlvWNAXT6qYEvmMwAeTNgz9hKFtEZTYPCzJjeMj7oHvzqeC29bCqwqckl0BCvB1QUDXs9Yh55pJsZoxu3KBxfVQ6v63z6ElLbaOz9zo1utVJQHj2dPZr5329C6jYQiS4nnyrBtDid1U64k4wex+4tfUFyWwRxQP4epDq+6+iTuaragvWJItuw4mwIbx85btQle6ODUOc9UtpZjoYczyXkXzrnfMWzl0vSkCn8wVgffovcIgLMNhmJIoJIMHj271qcpMgmmZkGZyqzZ0WgmYkfF87XY4ioQku6nKaEL4oqG9ClUbYP5VFOgEc0EHyArNEMDj3IgzkGJmkTp9RZ8oKqd+wJ+M/rLJTNAa3PMM6pnVw2ipnnDuxDsj/NDJoa2s0sglsc22WObTw/3nWSij1fxYq7amC9oQzHyXszYhJ84NjTOrTSAyLfCh0BnK69b4HQNt02zOH0Y2n4aTevpZ+D7ehg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(39840400004)(396003)(136003)(376002)(346002)(186003)(2906002)(316002)(5660300002)(26005)(6916009)(2616005)(956004)(38100700002)(7416002)(38350700002)(4326008)(36756003)(86362001)(6512007)(66476007)(66946007)(66556008)(8936002)(6486002)(478600001)(1076003)(6506007)(8676002)(83380400001)(6666004)(52116002); DIR:OUT; SFP:1102 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ts3vMJhu2GZgK58TpZ4fqP1+ehEvOkHPgLbSGRm21Kd2L9o+5ouHbrGXRQpr?= =?us-ascii?Q?14mnyrEK9h783OemnZTQxb4ISX2DjtOf03wi+9V8IYdXEboqwQluk+zBQy4t?= =?us-ascii?Q?5i3KL86T6kJDHipJIlbLyV2oNUjj2m0Cst4yKXEgOcWAR2ICl140L+fBbmX1?= =?us-ascii?Q?6fZfbKBNLNkkDpgfX5Z7AAMEYWaN+ztYU9bHKRaxVRLaJY94asK31LVVuZkj?= =?us-ascii?Q?rBAVRDQWNS3S08ksiLoxQxAzfNBJ2QdQ2Ztf6Mf8B6HZuDqU3SpLbDLHwwr2?= =?us-ascii?Q?l0ETgG6dsY9IF/8rZWSgyPb/9kzgtJm/1RNM/aR33bWNzRg7KDDTgclYfr0j?= =?us-ascii?Q?cv4UBv/b2gHyG7pg4B5ZKtbd+sKxkfxBidr9fXpgx9pI20LjPinmJSZACMpJ?= =?us-ascii?Q?mbqu9EITy3JwivRuC6Gr8dYfNFvmsGEgnufEHxKnXmjfuDL0IVW6EeTqBv4c?= =?us-ascii?Q?X9A0zthjgDm2LZozBZxVuALs1sYvT398psZmu/zqLNNbppM+oI7WgNDJFd1+?= =?us-ascii?Q?qgaJE93vW+mL/e3ony+pGxRy0vD/o6x41gpBMG9YY1nIKYiAEMUnnLILGbS4?= =?us-ascii?Q?BDOUgbEl1c4cz3CgPwWlD3xs+6vtxj13YvkVIvyO5oyloZGmVCV+HtHevKoM?= =?us-ascii?Q?aGpkRYgXJveKw3kAOEtSTcL2aFJ39ABGO4XrNI21WmuCh9ys9iT+0LJztzlQ?= =?us-ascii?Q?l/T0JmhYr1pvyjktgEzCIi7HdBpxUknOLIYKryBnWXGagXv404tamTMWg/dC?= =?us-ascii?Q?sBJQEhlGlm/XSh2aD1WVCHQrsmnHOy7qDEEakXMbUJJ/P0S71zIdP8FE24G3?= =?us-ascii?Q?t7t2rYVRbLt2w3Ul6OXHv18SuW1aU00fxQc+f6qbnZ/yO3LuZTNWmcQDRTTj?= =?us-ascii?Q?RYk12i1XrNhKjCN76xAyS9KfPJEJ8j1yIJeXM9iQjKuAAGQGMkWrqnXbdJ16?= =?us-ascii?Q?mWcrhPTAlLPLKkOM7ik77FrBL6XPj93yb7D72lLcPwsogYwJiFxiS4y+LTUj?= =?us-ascii?Q?zsApirauQWlSUQVhBT7fJlYEiu0CBV9DExCHBOOl1y3e9gO5mEQFB+91zppr?= =?us-ascii?Q?w/b97eYPXK7w7uWaI/RTebojogsc1BqPaZ0XECpz+zmHkqdDxXik8zlmCJEC?= =?us-ascii?Q?V69uf/FCM5NbFn01OvGuV42iT6EfAd6DwFIGoJ/g0Yr8X/IebAlZgqOPn8tN?= =?us-ascii?Q?f+ebVlc7nBs2MBupw1JArpgwWJNxMVfAQTve0axFEcVcSr9oQiaHIFrwk0Zy?= =?us-ascii?Q?JjzLAMSYnTiYUoJtf1ElDZX+cbOUb9Q8dBG49/NpdyqqmntatZeclRudFiDw?= =?us-ascii?Q?xSTUl6LBLweKfZY8hnUCTQIC?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: cdfaba5d-f219-466b-54ac-08d955e6fd7e X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 18:54:43.5381 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NDj34qlxU/JqQgRUSPmAH78CFcAbR35VFoamZ/SVJC93FBpS2Ssno0iA/jLofn7pnNK9XDQlLi7XMmNfrqqJgiEeWf9PXe98LbaqF5C1R5k= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4405 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 172Isph9006367 X-loop: libvir-list@redhat.com Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, ehabkost@redhat.com, libvir-list@redhat.com, dim@virtuozzo.com, igor@virtuozzo.com, qemu-devel@nongnu.org, armbru@redhat.com, pkrempa@redhat.com, yur@virtuozzo.com, nshirokovskiy@virtuozzo.com, stefanha@redhat.com, den@openvz.org, pbonzini@redhat.com, mreitz@redhat.com, eblake@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1627930531933100001 Content-Type: text/plain; charset="utf-8" We'll need this for realizing qdev_find_child() in the next commit. Signed-off-by: Vladimir Sementsov-Ogievskiy --- softmmu/qdev-monitor.c | 48 +++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 721dec2d82..0117989009 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -819,7 +819,12 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, = Error **errp) object_unref(OBJECT(dev)); } =20 -static DeviceState *find_device_state(const char *id, Error **errp) +/* + * Returns: 1 when found, @dev set + * 0 not found, @dev and @errp untouched + * <0 error, or id is ambiguous, @errp set + */ +static int find_device_state(const char *id, DeviceState **dev, Error **er= rp) { Object *obj; =20 @@ -835,17 +840,16 @@ static DeviceState *find_device_state(const char *id,= Error **errp) } =20 if (!obj) { - error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, - "Device '%s' not found", id); - return NULL; + return 0; } =20 if (!object_dynamic_cast(obj, TYPE_DEVICE)) { error_setg(errp, "%s is not a hotpluggable device", id); - return NULL; + return -EINVAL; } =20 - return DEVICE(obj); + *dev =3D DEVICE(obj); + return 1; } =20 void qdev_unplug(DeviceState *dev, Error **errp) @@ -894,16 +898,25 @@ void qdev_unplug(DeviceState *dev, Error **errp) =20 void qmp_device_del(const char *id, Error **errp) { - DeviceState *dev =3D find_device_state(id, errp); - if (dev !=3D NULL) { - if (dev->pending_deleted_event) { - error_setg(errp, "Device %s is already in the " - "process of unplug", id); - return; + int ret; + DeviceState *dev; + + ret =3D find_device_state(id, &dev, errp); + if (ret <=3D 0) { + if (ret =3D=3D 0) { + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, + "Device '%s' not found", id); } + return; + } =20 - qdev_unplug(dev, errp); + if (dev->pending_deleted_event) { + error_setg(errp, "Device %s is already in the " + "process of unplug", id); + return; } + + qdev_unplug(dev, errp); } =20 void hmp_device_add(Monitor *mon, const QDict *qdict) @@ -925,11 +938,16 @@ void hmp_device_del(Monitor *mon, const QDict *qdict) =20 BlockBackend *blk_by_qdev_id(const char *id, Error **errp) { + int ret; DeviceState *dev; BlockBackend *blk; =20 - dev =3D find_device_state(id, errp); - if (dev =3D=3D NULL) { + ret =3D find_device_state(id, &dev, errp); + if (ret <=3D 0) { + if (ret =3D=3D 0) { + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, + "Device '%s' not found", id); + } return NULL; } =20 --=20 2.29.2