From patchwork Mon Feb 13 10:56:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 653199 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2340742wrr; Mon, 13 Feb 2023 02:57:08 -0800 (PST) X-Google-Smtp-Source: AK7set/Z/xJpQgtDnLkWaenD+KlvcMT0nd/h1oJJNLx/9u3MADwlPOCBvkgKQaMMAa8W5Ubu+XnY X-Received: by 2002:a05:622a:15c7:b0:3b9:a6be:56f6 with SMTP id d7-20020a05622a15c700b003b9a6be56f6mr42322969qty.26.1676285828588; Mon, 13 Feb 2023 02:57:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676285828; cv=none; d=google.com; s=arc-20160816; b=V1+5yYA0JPp+PzLLL9swD/4C7FRN1XuySEgWgTfwRQccZ4GG73e/ASO/4dqKv2Hf5t ByQocxtEW39NY5arwRBrCraNK69WS/9TXOCPIknBzCN0hmmejCL6PwuPRTZaxz3LpLP8 YrDJh0ukyG+IDBNKx0Pf5Wibi9nElE5K7a2nJeGeXtI+jpwad7BAEM+bcfTVpkoLmNl3 a9ZGC7R9nRheZhhMb7rYjZ/p7rBx2yF5kaE6tggAWgoJHNHk9lnfLCvcqYYDlrL0crio HJzcRKK2sbv3Oj3CU5pppPm22wREV9TTC/JmhCf77h6AMcG4snZFnU/eBUMZiRYB8wyU xHjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FUJ+c15GRYrgsdfojyKynY0o/0XkUeheI9scGjw2Thg=; b=KanRaFu0r1fH+H8NdoH+GrT9d5zEjsn5Mv8KVYu29C16IZmsrjT+OhsybqcW1n8Wr7 459LVAsHTvsCQsSyJvEtehTXkX3HsIKGVn5+AZG8rYnb+gA613Iszuuxp4UtrhGDjvsG TTYmKbGIuEXCqYErhBHEDL5POuFBMDWsGvMiwNyF4KzX9lrBKRx5klbYmoVabOH7t2bF Fx0R6DJHhHkMMQW61jnc9mt+FhxuQYmD/yIHbdO1QfzPywt+qKtFfKO9fHCNNi/4Q/PH F0sZoYLoDwkv8Ll9HjBz7bvp8It2/xy1qZr41fr7HzDEsm6RmdU60V8aDr0PXMQV6h7W iU+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jkrVZq1m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o4-20020ac85a44000000b003ba1cbf3e3asi9813812qta.648.2023.02.13.02.57.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 02:57:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jkrVZq1m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRWVi-0006ie-1H; Mon, 13 Feb 2023 05:56:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRWVe-0006eN-GJ for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:56:34 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRWVa-0003dG-PE for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:56:34 -0500 Received: by mail-wm1-x32b.google.com with SMTP id m20-20020a05600c3b1400b003e1e754657aso2510094wms.2 for ; Mon, 13 Feb 2023 02:56:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FUJ+c15GRYrgsdfojyKynY0o/0XkUeheI9scGjw2Thg=; b=jkrVZq1m+qlc3A3KsZyDmeVxEWW2VyLqp1uspE0MPIj/QfqdfY5FwYxVsbKTuhUNAV Kume/BDzH6tg0HPCN1uEpnXBjVinYRGbUm5ygy+YiiHHMwdTR5BosdyXM3dEv6Jycvbx y1AA96LRiKNXhrWKdPMFM9lBUstEHNH/71HjFK3Tkmf0ogrXfMcgCPnL4FYNLX6tlA+Y pa9Nd1qsnCRVZXv/S9j01I/1pVnsCO84UzFd2eL53Dm6nuWFTv8hCF6Y8YeqigwDdKjc nJ1wh1ttfhYo3mdeIVJxSiyWXgIC5UvZ5UlSkqrtpZzU9s8S9EeR+qXIfFL5S4GVaude rL6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FUJ+c15GRYrgsdfojyKynY0o/0XkUeheI9scGjw2Thg=; b=JN3BQpt+F8/yMVmh/9lSJpuir2TmiQ8qHqSoRs02IGaKg4/MS+3VKW7+gfRq0e/t6a 0yAEH93NgW+ZykXV4mqQ3tQ2aOauUnjjSUhIMKcAQ4TasIuc9U5tqVN5VLfanyLpWD07 +4PYXaa9akWd+iqZe3u7586fjq5VDjszBJq282nYMRNWC6HTt2pG9kZBEBnZWw4I/Ja/ myEQmaAN2CsiUWIYqWYNkcrA7VwcvdQdSrB/5xNjDCr0sYs+tdZie1oohgR/SaAO3oN5 Kwc2DpdnOTXEINTgWzHYFbm1pWQrO2UTcYQNy8LvEiBoYNBVgT77IJ99muCZQIdEiQZK 99RA== X-Gm-Message-State: AO0yUKWiiVKkZsKsOJl+nec5GYiHSQ6zp6CREDz/nKqolAInAfgCCUlr V5BnUy2V8siseyEse4/MKEsexurXuvxXn44c X-Received: by 2002:a05:600c:4a9c:b0:3dd:1b6f:4f30 with SMTP id b28-20020a05600c4a9c00b003dd1b6f4f30mr23290416wmp.3.1676285777223; Mon, 13 Feb 2023 02:56:17 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id i16-20020a05600c4b1000b003dc4fd6e624sm13068169wmp.19.2023.02.13.02.56.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:56:16 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Peter Maydell , Gerd Hoffmann , "Edgar E . Iglesias" , Igor Mammedov , Samuel Thibault , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Mark Cave-Ayland , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 1/3] hw/qdev: Introduce QDEV_DECLARE_DEV_BUS_TYPES() macro Date: Mon, 13 Feb 2023 11:56:07 +0100 Message-Id: <20230213105609.6173-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213105609.6173-1-philmd@linaro.org> References: <20230213105609.6173-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Similarly to QOM OBJECT_DECLARE_TYPE() equivalent, introduce a QDev macro to declare common helpers for device sitting on a bus. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/qdev-core.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 93718be156..dc9909a2e7 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -717,6 +717,34 @@ void qdev_pass_gpios(DeviceState *dev, DeviceState *container, BusState *qdev_get_parent_bus(const DeviceState *dev); +/** + * QDEV_DECLARE_DEV_BUS_TYPES: + * @DeviceInstanceType: device instance struct name + * @DeviceClassType: device class struct name + * @DEVICE_OBJ_NAME: the device name in uppercase with underscore separators + * @BusInstanceType: bus instance struct name + * @DeviceClassType: bus class struct name + * @BUS_OBJ_NAME: the bus name in uppercase with underscore separators + * + * This macro is typically used in a header file, and will: + * + * - create the typedefs for the object and class structs + * - register the type for use with g_autoptr + * - provide four standard type cast functions + * + * The device state struct, device class struct, bus state struct need + * to be declared manually. + */ +#define QDEV_DECLARE_DEV_BUS_TYPES(DeviceInstanceType, DeviceClassType, \ + DEVICE_OBJ_NAME, \ + BusInstanceType, BUS_OBJ_NAME) \ + OBJECT_DECLARE_TYPE(DeviceInstanceType, DeviceClassType, DEVICE_OBJ_NAME) \ + OBJECT_DECLARE_SIMPLE_TYPE(BusInstanceType, BUS_OBJ_NAME) \ + \ + static inline G_GNUC_UNUSED BusInstanceType * \ + DEVICE_OBJ_NAME##_GET_BUS(const DeviceInstanceType *dev) \ + { return BUS_OBJ_NAME(qdev_get_parent_bus(DEVICE(dev))); } + /*** BUS API. ***/ DeviceState *qdev_find_recursive(BusState *bus, const char *id); From patchwork Mon Feb 13 10:56:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 653198 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2340733wrr; Mon, 13 Feb 2023 02:57:06 -0800 (PST) X-Google-Smtp-Source: AK7set8XIfgTyLdvAs2/FmgT+fU0dyYuhAztS10m+Iw8u5AK87vr0HSqedoikMpU/jbctGzXxKuZ X-Received: by 2002:a05:6214:2a4e:b0:56b:f6c3:11ee with SMTP id jf14-20020a0562142a4e00b0056bf6c311eemr46017416qvb.2.1676285826626; Mon, 13 Feb 2023 02:57:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676285826; cv=none; d=google.com; s=arc-20160816; b=CVXJt9pXFTZE1NR7S2rFLVohTSF1GkCItffXoxUCfIfSQaYnUWeWcLAYfOllo9JZIL 48cF9pOz+4k15LNR6031tUj3GlRtI3WjH386AuXUMH/LR8pkeLQ8NqmTNCgsuQJyyJmI kxjE3CHT6xKtK+KoHAihSRc6GtLmJuJlOd6V2rgDdBxdJqr2GVGFKg3qZJcA3Nx1ob8q IV7d7seyELBRVBt9oqrBnOlJBOdVi9sy9ycG1T/ZpUJUjcOhv/hVAHk0/6gyJs2upkkr XvTmOIcHb324p1EI1or1pqWIXyckg8FOVjUzv2fZs0zfpJUssDFRuORrw7h5Vay7Cgfe qtFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uAtLXsDM0eQOunnCiOEWBVbTBBIpljWj1BX7nIfwmRU=; b=IvJobni48oGZAXUKIVhr8Fh0lxj2UQsrZIMf7C7HXFvmR4wJPnwOH+hLIQST+nWD7S 9IMI2A3v1CbE9FCunILMy2XvKFzofh9j2+fM58yerlBSPjE6oUxZRsd36QFIHymxDAg3 lERD6lGiV6yfuvIpiqRX5liv2VlpBLG0KQHl+fz00YyRETs8LaNQxNQbVpNqA6QgIMro HneCkE8qcn1D/axl3xVvfQjVkHw0JaxKoEz3lSoMuzVj8VtMTmRXXYYqELv0Q8iDUUJx 1KZsz0PregqlZCInqygbQ+y+O73/F7a0BNdbHecEr/6gzSU72czy/RdAnmQciq23I73S XGQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="SS/Vznyy"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i20-20020a0cf114000000b005517fd5c54csi7449060qvl.516.2023.02.13.02.57.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 02:57:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="SS/Vznyy"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRWVh-0006iB-Ts; Mon, 13 Feb 2023 05:56:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRWVd-0006cL-R1 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:56:33 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRWVa-0003f6-T4 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:56:33 -0500 Received: by mail-wm1-x329.google.com with SMTP id f23-20020a05600c491700b003dff4480a17so8123646wmp.1 for ; Mon, 13 Feb 2023 02:56:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uAtLXsDM0eQOunnCiOEWBVbTBBIpljWj1BX7nIfwmRU=; b=SS/VznyyIjHBEiUz97tGxnbtKdCEXne3mDgS9XIVuN7pzGlhBKTatAsHSzXg/KlhMq CuzjzUyrDmrrz3BGoBTbKb28+wya5v5VWIQza8x3erB5fS8oBK9OwpX4hEwYAX2NDF0X ojCqve8ppauv7ldZikt1psDpu4A/rj5qyDplgDr+T95Ge08/rcbjmWptVbmfiEThmbeO MmWLoW0XTtpf0ng/eSY0TqP537qPJA1JeSH1EO0rYgGntEZkZPRnxWaN0UKnhe+edURp UyOw2/890Jp46cE2TDpWKpPsSn16Gx+zbEAnilYVefAdZEL0AVD6mIG8aET+HNB8HlFP Gc3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uAtLXsDM0eQOunnCiOEWBVbTBBIpljWj1BX7nIfwmRU=; b=xhe/UlovH7xxgUQ9JMXSGjHtDmcr+thQpWWONeTZC/XbwsXZeqn9Flw8I9xKh/zDJh kN47AmHXrH1SzFVh+Wao7c/iG9PFRP1WW11lTB+TUPU+qykqVfegMSQhN9y2GSkb6/Kg tPiMRlutC4b29ySEGjuXnzTvYA2lGVLwEc/6VW12IUo077+8cjjf+LGREeTx9XCr6a/6 60XrtP/nWl6Gu0l3QkKNqJHHqDuB53axoKV1Z28UI+EyFAeNAaBxfvUrMpopwOt8GawK vRAOtrWFXC7bqnnm6uoiSK9PuqIvaxHGcWMOb3z3mE84x7EH56Pp24DfyhBD+F6iDksc 2QoQ== X-Gm-Message-State: AO0yUKUiOqJHUuJwpSqx+Eb/zBhX3afe9Vkq0fVq5+CLutxVYPNsj1Gk 2WOLiOXhk+jhY7wdaldBX3YTP9sogzC4RqCT X-Received: by 2002:a05:600c:2ac8:b0:3c6:e61e:ae71 with SMTP id t8-20020a05600c2ac800b003c6e61eae71mr20812793wme.1.1676285782520; Mon, 13 Feb 2023 02:56:22 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id g10-20020a05600c310a00b003e1e8d794e1sm4701271wmo.13.2023.02.13.02.56.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:56:22 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Peter Maydell , Gerd Hoffmann , "Edgar E . Iglesias" , Igor Mammedov , Samuel Thibault , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Mark Cave-Ayland , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 2/3] hw/usb: Declare QOM macros using QDEV_DECLARE_DEV_BUS_TYPES() Date: Mon, 13 Feb 2023 11:56:08 +0100 Message-Id: <20230213105609.6173-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213105609.6173-1-philmd@linaro.org> References: <20230213105609.6173-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé --- include/hw/usb.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/hw/usb.h b/include/hw/usb.h index b2111bb1c7..09f345f5c5 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -266,8 +266,11 @@ struct USBDevice { const USBDescIface *ifaces[USB_MAX_INTERFACES]; }; +#define TYPE_USB_BUS "usb-bus" #define TYPE_USB_DEVICE "usb-device" -OBJECT_DECLARE_TYPE(USBDevice, USBDeviceClass, USB_DEVICE) + +QDEV_DECLARE_DEV_BUS_TYPES(USBDevice, USBDeviceClass, USB_DEVICE, + USBBus, USB_BUS) typedef void (*USBDeviceRealize)(USBDevice *dev, Error **errp); typedef void (*USBDeviceUnrealize)(USBDevice *dev); @@ -473,9 +476,6 @@ void hmp_info_usbhost(Monitor *mon, const QDict *qdict); /* usb-bus.c */ -#define TYPE_USB_BUS "usb-bus" -OBJECT_DECLARE_SIMPLE_TYPE(USBBus, USB_BUS) - struct USBBus { BusState qbus; USBBusOps *ops; From patchwork Mon Feb 13 10:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 653196 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp2340669wrr; Mon, 13 Feb 2023 02:56:55 -0800 (PST) X-Google-Smtp-Source: AK7set8HX3ga/e5FyWfDowTs/EQWZriwWhiWjp2kLq23G5F2BZ42tmaJt+T8Jc6JGgWxsy+7mfFO X-Received: by 2002:a05:6214:c63:b0:56e:b33c:d97b with SMTP id t3-20020a0562140c6300b0056eb33cd97bmr3429192qvj.17.1676285814892; Mon, 13 Feb 2023 02:56:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676285814; cv=none; d=google.com; s=arc-20160816; b=YUYOvll19ltKjQY19u/cGx0FFySa41GFufulCO84Jpryflm2uxeRwC6DG1Z071xgzz CECyM3/t2dPH0j2A0Y8LiZDjLq43YWeztdAEQm1FZhhT/8j7YTyGsWar3LsfOsbcYzNb XB8Z0B2hklOLLkd57VcwugiQn/+dbBrMmFXfFlw0wHVeVesnDyb3frtl/12FBXOXSbfK FS2MRXXCWCZwEk5e1BVEWQzw3P6ce3XijYdPYDSPfFPU+p+ScJ0KVxBlDlpu0uHPwQQP YmRxYcpbXznjLp70nG9J4277D8H1NXuES9hWFaJjBmRRmacdSdwsO/a6v9JGXRD2e6I1 2qDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aF98Ma9RkPF/Vf1N+Mxitvw+ZUTQ0aa8j86PfGUlqco=; b=cX3nZ0MKGSl7iAb5w8s09ziAHOPlsG+y8LmSksPyddIXxpzMqO748PXUgi+jGPCR4T XfLhfJ/JBRRo6bGKOLuGy8bcKAcMsK2dYHsNA9LjDd1ME1T4fu60ixr3GQ4ogD1zTsFy HVsrEfri9AOBhGS971cTZpPL7v9fDKSA4AZx2RyBBqkf0g/3M4dlSHClUFEHTQUkmpzL ZL68VLbrBzigotzWBAwdBTNMWs/cfKxsGKa/M9cM/+0BSvA56VvDODJGcLV+BSOAWHOg Xsji0exeVxYxcAoABNGOkF6Eei78jdsTKeidYEKvcEil7mkybN7mItUrkMDE6irkE1v7 60Yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tyI42Uep; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x22-20020a05620a259600b0072af978f33asi9328069qko.308.2023.02.13.02.56.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Feb 2023 02:56:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tyI42Uep; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pRWVh-0006hz-SU; Mon, 13 Feb 2023 05:56:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pRWVe-0006eR-GQ for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:56:34 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pRWVa-0003fL-T1 for qemu-devel@nongnu.org; Mon, 13 Feb 2023 05:56:33 -0500 Received: by mail-wr1-x433.google.com with SMTP id bk16so11693143wrb.11 for ; Mon, 13 Feb 2023 02:56:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aF98Ma9RkPF/Vf1N+Mxitvw+ZUTQ0aa8j86PfGUlqco=; b=tyI42UepU6YR1dfVpVjzyz+FOViUjOCXASljJk/gExyr30grL6ajWokHe8e7rqKEFT 0BdGH3zFcRA9oRjtzzyBFgJdZp5/r9X1brHqSZm0PSfXijIeFj3fl9J5Lx3uNxfJXnVi DwrlxJysuB2hoUQWezOwBFV6EXZDhRFCtESDf8jk9zgsFPiurCUD2S15suI7CHjyYJ3X 7HoV4wttVed0Fxl5+2dCtpBu7ZIP3ks+dPT3ZMDxk5R/kwv9HWjNoO8Mzja1XE1TMmK+ A1sBEuNhHh//7VRlGKrJWILHRmXcDrbcLUW0kzF0JF29XT6m8YmqPmc3Gq7TaUgpylzd rhyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aF98Ma9RkPF/Vf1N+Mxitvw+ZUTQ0aa8j86PfGUlqco=; b=tzfLJ51CAdlmHqAqghsRBkdt3RhaLo1vkkQSlUD3Hj1ui8KQnf7mjsYVm6Nj+q4g8n 71ih3khnfopiVh00/CdDLNXXOTsz7eZMkaX3iw8FmTnxWmOQQwT7CRdJAsxGF61xT6/f 26xWKnQKuEOl08neWP8YzXovhhdpUK0wmhFB0KLYLXhO54Dys1WrC40t1SGl14bGOemG 8VSZDuxENI4+q0kQ2pe+GbTEGXPIJi8SCvuvYgUmRq5gx2zbx5nAjMqG62yKrPWDVU4J 8VjQZ5N8qoXwsN0xMjCLkycq3yFy6EltbaxPFAK8jHN4VQVAoIAfAPLFIQ8Hfn8SCmLG QiSA== X-Gm-Message-State: AO0yUKWrkh0a2vnS+rYAAKoMt+AKSFO1HrC69BoliUb3oKHf4DDP2ht+ QRCQvu81KyoE4xUUuR+l9PwIw/aYOZPOZY4b X-Received: by 2002:a05:6000:1249:b0:2c5:5d1d:b244 with SMTP id j9-20020a056000124900b002c55d1db244mr1110571wrx.29.1676285788012; Mon, 13 Feb 2023 02:56:28 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id g9-20020a5d5409000000b002c558228b6dsm2866827wrv.12.2023.02.13.02.56.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 13 Feb 2023 02:56:27 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Eduardo Habkost Cc: Peter Maydell , Gerd Hoffmann , "Edgar E . Iglesias" , Igor Mammedov , Samuel Thibault , Paolo Bonzini , Markus Armbruster , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Mark Cave-Ayland , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 3/3] hw/usb: Use USB_DEVICE_GET_BUS() macro Date: Mon, 13 Feb 2023 11:56:09 +0100 Message-Id: <20230213105609.6173-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230213105609.6173-1-philmd@linaro.org> References: <20230213105609.6173-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Automatic conversion running: $ sed -i -e s/usb_bus_from_device/USB_DEVICE_GET_BUS/g \ $(git grep -wl usb_bus_from_device) then removing the usb_bus_from_device() function declaration. Signed-off-by: Philippe Mathieu-Daudé --- hw/usb/bus.c | 10 +++++----- hw/usb/core.c | 6 +++--- hw/usb/dev-hub.c | 4 ++-- hw/usb/dev-serial.c | 10 +++++----- hw/usb/hcd-xhci.c | 2 +- include/hw/usb.h | 5 ----- 6 files changed, 16 insertions(+), 21 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index d7c3c71435..fa154e1e79 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -427,7 +427,7 @@ void usb_unregister_port(USBBus *bus, USBPort *port) void usb_claim_port(USBDevice *dev, Error **errp) { - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); USBPort *port; USBDevice *hub; @@ -473,7 +473,7 @@ void usb_claim_port(USBDevice *dev, Error **errp) void usb_release_port(USBDevice *dev) { - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); USBPort *port = dev->port; assert(port != NULL); @@ -517,7 +517,7 @@ static void usb_mask_to_str(char *dest, size_t size, void usb_check_attach(USBDevice *dev, Error **errp) { - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); USBPort *port = dev->port; char devspeed[32], portspeed[32]; @@ -555,7 +555,7 @@ void usb_device_attach(USBDevice *dev, Error **errp) int usb_device_detach(USBDevice *dev) { - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); USBPort *port = dev->port; assert(port != NULL); @@ -583,7 +583,7 @@ static const char *usb_speed(unsigned int speed) static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent) { USBDevice *dev = USB_DEVICE(qdev); - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); monitor_printf(mon, "%*saddr %d.%d, port %s, speed %s, name %s%s\n", indent, "", bus->busnr, dev->addr, diff --git a/hw/usb/core.c b/hw/usb/core.c index 975f76250a..849e95b9e2 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -95,7 +95,7 @@ void usb_device_reset(USBDevice *dev) void usb_wakeup(USBEndpoint *ep, unsigned int stream) { USBDevice *dev = ep->dev; - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); if (!phase_check(PHASE_MACHINE_READY)) { /* @@ -556,7 +556,7 @@ void usb_packet_check_state(USBPacket *p, USBPacketState expected) return; } dev = p->ep->dev; - bus = usb_bus_from_device(dev); + bus = USB_DEVICE_GET_BUS(dev); trace_usb_packet_state_fault(bus->busnr, dev->port->path, p->ep->nr, p, usb_packet_state_name(p->state), usb_packet_state_name(expected)); @@ -567,7 +567,7 @@ void usb_packet_set_state(USBPacket *p, USBPacketState state) { if (p->ep) { USBDevice *dev = p->ep->dev; - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, p, usb_packet_state_name(p->state), usb_packet_state_name(state)); diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index a6b50dbc8d..fa094ec9bd 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -572,7 +572,7 @@ static void usb_hub_unrealize(USBDevice *dev) int i; for (i = 0; i < s->num_ports; i++) { - usb_unregister_port(usb_bus_from_device(dev), + usb_unregister_port(USB_DEVICE_GET_BUS(dev), &s->ports[i].port); } @@ -611,7 +611,7 @@ static void usb_hub_realize(USBDevice *dev, Error **errp) s->intr = usb_ep_get(dev, USB_TOKEN_IN, 1); for (i = 0; i < s->num_ports; i++) { port = &s->ports[i]; - usb_register_port(usb_bus_from_device(dev), + usb_register_port(USB_DEVICE_GET_BUS(dev), &port->port, s, i, &usb_hub_port_ops, USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL); usb_port_location(&port->port, dev->port, i+1); diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index 63047d79cf..4cfe27818b 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -190,7 +190,7 @@ static void usb_serial_set_flow_control(USBSerialState *s, uint8_t flow_control) { USBDevice *dev = USB_DEVICE(s); - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); /* TODO: ioctl */ s->flow_control = flow_control; @@ -200,7 +200,7 @@ static void usb_serial_set_flow_control(USBSerialState *s, static void usb_serial_set_xonxoff(USBSerialState *s, int xonxoff) { USBDevice *dev = USB_DEVICE(s); - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); s->xon = xonxoff & 0xff; s->xoff = (xonxoff >> 8) & 0xff; @@ -221,7 +221,7 @@ static void usb_serial_reset(USBSerialState *s) static void usb_serial_handle_reset(USBDevice *dev) { USBSerialState *s = USB_SERIAL(dev); - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); trace_usb_serial_reset(bus->busnr, dev->addr); @@ -261,7 +261,7 @@ static void usb_serial_handle_control(USBDevice *dev, USBPacket *p, int length, uint8_t *data) { USBSerialState *s = USB_SERIAL(dev); - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); int ret; trace_usb_serial_handle_control(bus->busnr, dev->addr, request, value); @@ -479,7 +479,7 @@ static void usb_serial_token_in(USBSerialState *s, USBPacket *p) static void usb_serial_handle_data(USBDevice *dev, USBPacket *p) { USBSerialState *s = USB_SERIAL(dev); - USBBus *bus = usb_bus_from_device(dev); + USBBus *bus = USB_DEVICE_GET_BUS(dev); uint8_t devep = p->ep->nr; struct iovec *iov; int i; diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index b89b618ec2..7d2ff9d46a 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3268,7 +3268,7 @@ static void xhci_complete(USBPort *port, USBPacket *packet) static void xhci_child_detach(USBPort *uport, USBDevice *child) { - USBBus *bus = usb_bus_from_device(child); + USBBus *bus = USB_DEVICE_GET_BUS(child); XHCIState *xhci = container_of(bus, XHCIState, bus); xhci_detach_slot(xhci, child->port); diff --git a/include/hw/usb.h b/include/hw/usb.h index 09f345f5c5..d859cdc11c 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -518,11 +518,6 @@ void usb_device_attach(USBDevice *dev, Error **errp); int usb_device_detach(USBDevice *dev); void usb_check_attach(USBDevice *dev, Error **errp); -static inline USBBus *usb_bus_from_device(USBDevice *d) -{ - return DO_UPCAST(USBBus, qbus, qdev_get_parent_bus(DEVICE(d))); -} - extern const VMStateDescription vmstate_usb_device; #define VMSTATE_USB_DEVICE(_field, _state) { \