From nobody Mon Feb 9 09:29:45 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=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635548528; cv=none; d=zohomail.com; s=zohoarc; b=mJcQlrI/qY972iqCyAQy/mG07+7cnTZOAIB87UHKsKQog8XJrKcromE8SZgfI/gGuBex5mbXIaWt5z+Lon+cF6xxBbXOWf17vfQAwUMQS7MaADTxf2b93+y70xw5TRuFUyV1YEsI6S4T+xH19o9T7nt1DNad/Esu3IeW8QTpxnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635548528; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Q2fDFAc7gOIKhashE6Z5lpWxdStHb3k+AZEzvZL+GxU=; b=bsiQr+dGOrvM+jm5zUFtyzX3lPKl69thcSqmOh5We5Hlcciade1a0735yHM4Qd1/SFMvUy20W7hgyETFGyIttqCs9xUHFHE1qw1LZ+l0n3wLkRVnh2Cl41glEugkF3giS4MGETntx3wjv3l6n+gzBhKQgMPL4JGW1poRUV7D/a4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1635548528394107.4914296004116; Fri, 29 Oct 2021 16:02:08 -0700 (PDT) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-421-qyqbpcGbORaM68woyvjj7g-1; Fri, 29 Oct 2021 19:02:04 -0400 Received: by mail-wr1-f69.google.com with SMTP id k8-20020a5d5248000000b001763e7c9ce5so3023935wrc.22 for ; Fri, 29 Oct 2021 16:02:03 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id m34sm5465765wms.25.2021.10.29.16.02.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Oct 2021 16:02:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635548527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2fDFAc7gOIKhashE6Z5lpWxdStHb3k+AZEzvZL+GxU=; b=MYWHDBg+0ADWAXqpwgqgeGdtdTh9WdCY9IKupfWOBhXIYWu9pOHTmfnfB0ekYjGFGL80po xmcFbno30LUdVSPRxK+PxURe8sByDEgPZC16NYlc7vKyuvAojUcK8WVfYzBS6eKdUEHVnf S/9TovVhzUss2c/rpfgxGR4Pa8vFoPg= X-MC-Unique: qyqbpcGbORaM68woyvjj7g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q2fDFAc7gOIKhashE6Z5lpWxdStHb3k+AZEzvZL+GxU=; b=TqcxvNEgc5Tig5gZamAkpufUW8J+JXWKkoJzaH5ciVt8Vqxzk2oK77u7/1R5ZSdZ+f Ka4Z/ltvvAg2kiGcx0HxdzaxeHpK0yG17WCjQo0VXy+Dh8F66RvWUdK3bdEVZcwnrj38 WxWqp48FkRGzzzYmte2/PN45JLMUfIiMY9xcpQ/Ik9IZGmTIAD/eBHMoAtnSITNpx3FW UKqHuVprVnNZVWmd1tur+/1ypkUl1yg7ZXb4DKyFer93nfuCz/d9A4hMAeHGtooJLYa6 nk2DtHjfxy6rXB6Bhuc2kpcos+O7RIeEYyGLUuvjvcZB1PP2uEZnJ8Zavr5deqBkeSYp 2QJw== X-Gm-Message-State: AOAM531O3phBWqQy7ByXnjt0xFoLEmfgVSIxKe1M6f9v0qx7qJodqJpT BinETAwBMgufN5+xNkrkz/WBLva3jCYt9au0bRreGpAiWXKaEuA4ZU2YmWQDdv9I7DbvDj4nVpY qi1B3VphGOGsfXg== X-Received: by 2002:a1c:9a16:: with SMTP id c22mr7459164wme.160.1635548522940; Fri, 29 Oct 2021 16:02:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQG9w/QB44HVwDMNYUNEl0fIIEo3NlqkQGCmSiNb0t7Twi0YKWXHqfiI67mdWPjqij9YdvKw== X-Received: by 2002:a1c:9a16:: with SMTP id c22mr7459151wme.160.1635548522811; Fri, 29 Oct 2021 16:02:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , "Dr. David Alan Gilbert" , Marcel Apfelbaum , Damien Hedde , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 3/5] hw/core: Remove uses of QERR_DEVICE_NO_HOTPLUG Date: Sat, 30 Oct 2021 01:01:45 +0200 Message-Id: <20211029230147.2465055-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211029230147.2465055-1-philmd@redhat.com> References: <20211029230147.2465055-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635548530606100001 QERR_DEVICE_NO_HOTPLUG definition is obsolete since 2015 (commit 4629ed1e989, "qerror: Finally unused, clean up"). Replace the two uses and drop the definition. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster --- include/qapi/qmp/qerror.h | 3 --- hw/core/qdev.c | 3 ++- softmmu/qdev-monitor.c | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 596fce0c54e..f49ae01cdb0 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -26,9 +26,6 @@ #define QERR_DEVICE_IN_USE \ "Device '%s' is in use" =20 -#define QERR_DEVICE_NO_HOTPLUG \ - "Device '%s' does not support hotplugging" - #define QERR_FEATURE_DISABLED \ "The feature '%s' is not enabled" =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 7f06403752d..14375861c36 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -734,7 +734,8 @@ static void device_set_realized(Object *obj, bool value= , Error **errp) static int unattached_count; =20 if (dev->hotplugged && !dc->hotpluggable) { - error_setg(errp, QERR_DEVICE_NO_HOTPLUG, object_get_typename(obj)); + error_setg(errp, "Device '%s' does not support hotplugging", + object_get_typename(obj)); return; } =20 diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index 4851de51a5c..35a885a6623 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -896,7 +896,7 @@ void qdev_unplug(DeviceState *dev, Error **errp) } =20 if (!dc->hotpluggable) { - error_setg(errp, QERR_DEVICE_NO_HOTPLUG, + error_setg(errp, "Device '%s' does not support hotplugging", object_get_typename(OBJECT(dev))); return; } --=20 2.31.1