From patchwork Mon May 26 13:00:04 2025 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: 892619 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1189385wrz; Mon, 26 May 2025 06:01:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVfdL8dW6WmgI0UMzsk1Bwa5ba8+Sgm0ksjQobz9WdfAsKcXDMt9o3Zabj8T6Uo12hgFKkcQg==@linaro.org X-Google-Smtp-Source: AGHT+IH37FCQ2iR9sUVen5i5ySkcJWYeyYX6aINzOMK8LvQr5t7cPxGTo6SE74W5ZNvT+p4KY4+B X-Received: by 2002:ad4:5b81:0:b0:6e8:f4e2:26ef with SMTP id 6a1803df08f44-6fa9d2c7eccmr172828466d6.31.1748264490510; Mon, 26 May 2025 06:01:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748264490; cv=none; d=google.com; s=arc-20240605; b=NHAlTIMx547V5rfDTyTvwuqvjpsp6jphNmwRY1Ii1FaVlRbtW8u1Y/9aqX4jiP2XjK 5hkHdORv7lG7jAIharacf7OKhao3MK4WSWKjHefKFRp/7O+Yiy772A+c0BUN/yNul9+J lL2OnDjGUokUZ9ofsS/mQguzDPLjvQH05mOc6ONDEqNIo7uKzKwriuUIImF8AfMQO43X FCGWLj/gwbl9nMjCok2w83bx5lKtkZSNIhmpW87Fh8raIObOIFHgWbOKbXLniiMte07I ejZinpnsFb5R9KLdygDctnrOqtTovzLEDdKCfE5u4y+tacXB8hKzdRAxa2UzdewLX5X9 Eojg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=PQBQ//7O5VH+AZrfuLAW9/nheUoZW+EJtwdyA0eqKvI=; fh=5warfqeXceH2EQiaVD4wEaoZQbazeDH7eRialAh4wkI=; b=iN4lONeb/sd/t6x4JUHAP5TsHyv5i8W9O/2DaG1SPqEBK77CEq0axbw+iyIlq/nN0z qcBh13an4IgcBW4+/0/C86dtNB83UDp7gsSOuBWCm3ehMxjI0xPVG+PJEU3TV9vYYfUy A6qCsb+SbfofOCQX7Vi2hHlhOIqiry+KqkFqRYg2xIrsxDWQiwjnKNiK9Tfs/h4/zFlp zQrfL32k0ntJ+e2UtwCz5L+4qdyRc/KgSFnl7pkn37hkSwXs9e14quUyNej1SVYQ3nj2 7/Q5SU0jNXsKE/7DB30P7VBKU8CiYvLJGBtC26tHE3j8+I4ut18rqG8N/esuSLBV6rpW h2eA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tloeQC16; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6faa067bbeesi50714776d6.286.2025.05.26.06.01.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 May 2025 06:01:30 -0700 (PDT) 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=tloeQC16; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJXRU-0007kM-JF; Mon, 26 May 2025 09:00:36 -0400 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 1uJXRH-0007g1-Jy for qemu-devel@nongnu.org; Mon, 26 May 2025 09:00:26 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJXRF-0005Ui-Lc for qemu-devel@nongnu.org; Mon, 26 May 2025 09:00:23 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a4dd5f69e7so366970f8f.0 for ; Mon, 26 May 2025 06:00:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748264417; x=1748869217; darn=nongnu.org; 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=PQBQ//7O5VH+AZrfuLAW9/nheUoZW+EJtwdyA0eqKvI=; b=tloeQC16MzLDnbpq75WaiiZ0GlcRNNspfxqQ5V4py64ssjJEAtKrv7TliLfOv6FkjU SYltLnZWNoVkOdc10rUzaSi9CUrhQRZLlG/XCg0PZDGVmUpZeiIeC1RHNMdWkSeWHS/2 BM2drPb1QjkenfKJwkhY3TY0/2jA/xXaxf5CjDfi4G9CcP4XtEMd+FXi560iqWNGMQq2 ke4UKvkM/BJkfMRhfkBFbqee549XsOsmGrmPFpusJO2sQH/9mb6nQzOofYqmfnJ80TPr 1ip4pw2aH3TznH+szNasckZOZj6NsY4Nzs7rxsbJc11/N4nhxU04Iq+K+M1IXTmxDHn4 0IwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748264417; x=1748869217; 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=PQBQ//7O5VH+AZrfuLAW9/nheUoZW+EJtwdyA0eqKvI=; b=MCAfC0ZtfozzH028sy1mmTUjeUV0i4uxncpoWsmCU+WDUFPNv5MZ/Xj6V9hzVKTxSp +p4lpmn1irirOYhEN3yEMyq6rc/Bt4oFEA0tgy7W37uyF3seo0C7WY69J8Nl5xxhc3Js NoLCYAqCn3UPU3gdf7Tud0BCPXj9dQ7ryIsBczUx3tcRGVE1YZfvTDMg5YAPkc5Smxpl FvkM0S4RFnwWjfwcWrM3+NY0j+n1VrgTab5rnqFXTT2gvFdYIpH3y99H3Xq3bkhS9q4u YWHR97LOkWJoduOuB+3bZYEjcNQVsAN20eoybtwfIDu2HRx64t4a9bt+KXprMk9RmwpG MFWA== X-Gm-Message-State: AOJu0YzwiZDJuzj9kbx7UPFuDd+0qDyGui7aJ9F73qK1LiNszxp22nkR D6T3HGEB+PbBlKLu1Hgopn+xHU7/zE/rgAtOjpkmzwz4MSp6OXxhow0WvYR48pvE1/YuR4kyqrt RxJSuT9c1yw== X-Gm-Gg: ASbGncvBvF1oJP7RPMfTmtAUNuWgPAIhxHamdwz+olst64RiS5Pg6nkOQPjIjLTNTbB eFoYPQ4y61vfWuKQsPsWX/NN9JdoZ4PbdiqqSalL6PLYqdSEWoGbhJk/GKgTLRkprJuUV72VoXc TNcBM6Z6MCJ/x46Uj8HzPIdNpiUtWQeQXNSShcaaViOkHIqaSxI0DmjvHJPXq/dJ6XCcnNW0JZf TTK5rx3YelvvM+f2Sw+iY32ynMq1YxS5crGhb+4f6TEOglK7p0TRMoP2xAAouT77VlqXndoyHbz RHwX4+42Oh9PbI6otIE6XO+AmJSlSR6o8OMHmJnL5i/LdfajZ7bHQxcce4+urglSpWGGVR1eRkm h6t+RWluYzGwJs420GHwk+plPW1ko73xh X-Received: by 2002:adf:ec4d:0:b0:3a4:cf40:ff2d with SMTP id ffacd0b85a97d-3a4cf41007bmr4701214f8f.21.1748264417154; Mon, 26 May 2025 06:00:17 -0700 (PDT) Received: from localhost.localdomain (44.87.95.79.rev.sfr.net. [79.95.87.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f182538fsm245226775e9.7.2025.05.26.06.00.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 May 2025 06:00:16 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Mark Cave-Ayland , Nicholas Piggin , Yanan Wang , Daniel Henrique Barboza , Harsh Prateek Bora , Marcel Apfelbaum , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= , Zhao Liu , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost Subject: [PATCH 1/3] hw/ppc/spapr: Only create default devices when requested Date: Mon, 26 May 2025 15:00:04 +0200 Message-ID: <20250526130006.49817-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250526130006.49817-1-philmd@linaro.org> References: <20250526130006.49817-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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=unavailable 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 Only create default devices when requested, avoid have the machine implementation to modify the generic 'usb' boolean set from command line. Fixes: 4ee9ced979e ("hw/ppc/spapr: simplify usb controller creation logic") Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/spapr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 702f774cda9..bbcb4695d4c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3032,7 +3032,6 @@ static void spapr_machine_init(MachineState *machine) has_vga = spapr_vga_init(phb->bus, &error_fatal); if (has_vga) { spapr->want_stdout_path = !machine->enable_graphics; - machine->usb |= defaults_enabled() && !machine->usb_disabled; } else { spapr->want_stdout_path = true; } @@ -3040,7 +3039,7 @@ static void spapr_machine_init(MachineState *machine) if (machine->usb) { pci_create_simple(phb->bus, -1, "nec-usb-xhci"); - if (has_vga) { + if (has_vga && defaults_enabled()) { USBBus *usb_bus; usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS, From patchwork Mon May 26 13:00:05 2025 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: 892622 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1190360wrz; Mon, 26 May 2025 06:02:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUiRdvA4RnBsLCZJObrfY0NweQ42ks8/IBD0ZcXxjELqpzQGSPKXownwgQwFMlSaq+dECkJZA==@linaro.org X-Google-Smtp-Source: AGHT+IFHdiloYJzqtDuXu/O1ignYhgDcSOPI8wuMM42teaEfKuy3or9dJj8u//dF9BAtDdtvDLLr X-Received: by 2002:a05:600c:3115:b0:441:d437:ed19 with SMTP id 5b1f17b1804b1-44c91ad70afmr73859475e9.11.1748264565101; Mon, 26 May 2025 06:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748264565; cv=none; d=google.com; s=arc-20240605; b=lX6XcLh6uz8PXiOs8GEdpGYSQxobBk+mZztMNSAlgu071GajEQjMwCCts4ej81sPra Sto5HQ1RDZkm9qGiAA7qooriCB2MCIwquXD64uqchX5OMPhckPlELi0Pw1V41M0RRQqL qEfVo7nxe+q9Soiapbrec+R+NROLqFD+1CH5Rl4MGEZH/JCkLmzO+nQ6xuuc8me//gpc l6+tTk0ZnMDIBMIp/86v7t9CE7RZLTmsECVG8fn2EaRSOYB165d7Ej6e0h8f0m9UG8dj MtjgDIa7Z+saXCCQAjnD0brY4JiDmZ0En+ic7bc+mhYCoMGb/geYDSAg+zfoMF/NLDAy hCXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=FYVff6aW8pddrXfep/dx+jW+ATHbjPdcPUPMa5bC6bQ=; fh=5warfqeXceH2EQiaVD4wEaoZQbazeDH7eRialAh4wkI=; b=FWb0aUym86JysgYXGVjh+bVV/6JPI+8X8o3+kzpGdVzsgPG7E34mpuLnSrhw7swPnt Ub6LbKIRU8PyvnNifESfQWCO5/e+FcNCzISWFYr/1iQxAtAiiptn6Mty45gRimn9Hbxw mFJ+4f3ZzwLZ0xrKma/mVaMokZfVdd4cUPDpwv7wsC72mI4W/s+x3AwH6Gipx6ZshhZW MAWazIf882Zk/zd0vR/xAH9/j1XxU2eeC/E1cmWEBM5jcVmcQNJYxeTC/pK94SYqAt+C mVCTsrk6M0diwFEzePxm7G3uwxUy86u7nKTkgP4A7gXOcB8h3i86izZQNHYRDFAS+avT 5Uog==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RYAlQG7H; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ffacd0b85a97d-3a4ccc2c857si3708509f8f.534.2025.05.26.06.02.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 May 2025 06:02:45 -0700 (PDT) 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=RYAlQG7H; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJXRW-0007m2-5I; Mon, 26 May 2025 09:00:38 -0400 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 1uJXRS-0007jJ-VI for qemu-devel@nongnu.org; Mon, 26 May 2025 09:00:35 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJXRL-0005Vw-J5 for qemu-devel@nongnu.org; Mon, 26 May 2025 09:00:33 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-442ec3ce724so18538775e9.0 for ; Mon, 26 May 2025 06:00:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748264425; x=1748869225; darn=nongnu.org; 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=FYVff6aW8pddrXfep/dx+jW+ATHbjPdcPUPMa5bC6bQ=; b=RYAlQG7HVJvlBoq1HKiI71lWKH4vqPUv+FV99PdC6G3apMtJZJsOVuwfxNlnv9Z61v NUVdj1jyaFyu+iEQWxQ1zKqgUfV9UrBfTgN77bVW68OI2PzlODIIV+wh9wD6jtPs61Uz kwhpx1lnnwKtAQ8cYx43QKdMtpCeO+Tps2wb2emBANSbJmp0lLF4V+4rz51zwy9WF46M ai0zPzy89Br1GUUqbHWjLJL3Zf4QE04XYy8Ao5aei1wNX755xgPztvbIxFVRLr2qS2Am LBy5kG+ea8uca1qeEOMoFI3eXZZXoPf+GA67VgeKHH8xJENVMoU4UvZ3p3QokEwRRFTi nMbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748264425; x=1748869225; 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=FYVff6aW8pddrXfep/dx+jW+ATHbjPdcPUPMa5bC6bQ=; b=Jx3lpaIIgJPrWgx85ArAe6A5xUQ5mp9Fj7Me+3vyvxsoJyCeTdbCSVPJOhZTi5w/8j +TqePd/fJiJvsSQFGY/LmTsJizvtqJVpkudZgR/MbSJHvFmasQ6kDXIYO7ewiPygcgtu fWSMa8ziX1rhx+Qd6TJ99OeDgSuPnLavKVqKGU3ZnvoV1zBsJat2/nPQKDV/vk4aWPYn nB+iSJG+FaVPYY1ma7D0nDCvxrqfAsubgHMgils/6ARYeki3geSH2F+S+iNfP1V69Bun a/PJFNdStxdY2CI/QEM8c4W3mOWG+yWqhVPo9pGESetbJ41lrt/xP4/s8f06B/+lkgvB 05Qw== X-Gm-Message-State: AOJu0YxCAej0dj0Mvrkb5ANrghacuJWQ/fUTIdCoR8AOyf/D2YUM2O5x LYN2NBfk8ERv/qvd+4PBlTcwXDe5R50SqLk+KdO78N7MHKNZ0D8TY7HcEYxC4rm9Esxp9bgFphA YiDiAD9Z5yg== X-Gm-Gg: ASbGncuYtiRTNPoiYZ+uumu2YH85D0LABZ2Ph6bpwjbBCJUJT1dpEnNMdij2tstBAQ8 ecAPJzpazetlqx1wk+7rVvPxrfNVtt0HuIbt/rlHOVRQvIRVReAYPz1k3s7ddhwDDfIY9O+Zve8 Uacb1MlDzGaA7oF25/XqKS3+h2+kEjbC5eiIvdlEno0VuZ/q0noAwQo9sapBhh9MfaNFa2bo4pY CbYy2Z2N98ytRVEcDBeOoT3a1T4LcyDqNa2AcTtoSytZTdTS6+wFCcohcNLwyaII1bstbXFt69/ 6QO7w+XJzYmW50Zac0EYiYQSDuXQdoine2sh8UTJ53ZlwXhn+B6rQGsQ8x2gOO2PMuEwAapYCFs pV+N56P1Z7JRI6tgU/eK3Iw== X-Received: by 2002:a05:6000:2282:b0:3a3:4b8a:9a36 with SMTP id ffacd0b85a97d-3a4cb43315emr6986953f8f.11.1748264424644; Mon, 26 May 2025 06:00:24 -0700 (PDT) Received: from localhost.localdomain (44.87.95.79.rev.sfr.net. [79.95.87.44]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4d1d2f788sm5613392f8f.65.2025.05.26.06.00.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 May 2025 06:00:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Mark Cave-Ayland , Nicholas Piggin , Yanan Wang , Daniel Henrique Barboza , Harsh Prateek Bora , Marcel Apfelbaum , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= , Zhao Liu , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost Subject: [PATCH 2/3] hw/ppc/mac_newworld: Only create default devices when requested Date: Mon, 26 May 2025 15:00:05 +0200 Message-ID: <20250526130006.49817-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250526130006.49817-1-philmd@linaro.org> References: <20250526130006.49817-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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=unavailable 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 Only create default devices when requested, avoid have the machine implementation to modify the generic 'usb' boolean set from command line. Fixes: 59a0419856c ("hw/ppc/mac_newworld: simplify usb controller creation logic") Signed-off-by: Philippe Mathieu-Daudé --- hw/ppc/mac_newworld.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 0b6e096116a..7598d42cbc2 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -346,7 +346,6 @@ static void ppc_core99_init(MachineState *machine) sysbus_mmio_get_region(s, 3)); } - machine->usb |= defaults_enabled() && !machine->usb_disabled; has_pmu = (core99_machine->via_config != CORE99_VIA_CONFIG_CUDA); has_adb = (core99_machine->via_config == CORE99_VIA_CONFIG_CUDA || core99_machine->via_config == CORE99_VIA_CONFIG_PMU_ADB); @@ -427,7 +426,7 @@ static void ppc_core99_init(MachineState *machine) /* U3 needs to use USB for input because Linux doesn't support via-cuda on PPC64 */ - if (!has_adb || machine_arch == ARCH_MAC99_U3) { + if ((!has_adb || machine_arch == ARCH_MAC99_U3) && defaults_enabled()) { USBBus *usb_bus; usb_bus = USB_BUS(object_resolve_type_unambiguous(TYPE_USB_BUS, From patchwork Mon May 26 13:00:06 2025 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: 892620 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e53:0:b0:3a3:61c9:c5d4 with SMTP id j19csp1189402wrz; Mon, 26 May 2025 06:01:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU0UCKnbsuSIWti2//ZZ1Dv09cP/tdUf6tNNd8zGX4DNNEe2lScpz9tbGAtm1SfC6QKL1mlNg==@linaro.org X-Google-Smtp-Source: AGHT+IHq66mIlZaOHfSy5qGOaTX3enmep2Klmh+cbVZGXydBe1pu/Gta0vNce8UmA6EkJgGFdF0g X-Received: by 2002:a05:651c:40ce:b0:32a:62a2:f73e with SMTP id 38308e7fff4ca-32a62a2fc80mr4379401fa.4.1748264492096; Mon, 26 May 2025 06:01:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748264492; cv=none; d=google.com; s=arc-20240605; b=EXfnfbPs+5KprBBdXu0P5yhhJEodRedTJ8qRFB7gbGWJEvAVxIIJXOIpwV20wPtiZn 4iI30F0qThNm34iU+1P04JoKqfoEtIlphU040BS25tz5yLz7LYAT2oRMkKelr67iXDwD k5jmR3Z6dFGtPeIIz/dZHSqBhm7BC3bIZutlH/jU5t7G0jTxDksBH5CigO82gC9KJ8lj cyBlNsfFYmuW0lcDGr4RL9Zw4rOl4EcabK2ZJCKMARPofizF/saRGG/rggmoEErwvNis 88vmI3tVbsVg+b1aBKtP8W0Ms7mtL4yFzhkzsun984IljNT+6B6X5QCZISR91bgq9TqE VZTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Nx4cl2IML5QZ9Mvq/oiwPXRYTEV7oxhBzSYHaQYpoVA=; fh=5warfqeXceH2EQiaVD4wEaoZQbazeDH7eRialAh4wkI=; b=GXbDAPdXSxfa14PHyiFZ9OPMWtaStMuF7ywCYL1Dk4rwwHxGllp6t/ls3bu77Q68rb ezQZPuLlnnvBnPbZ5Rct+526xtOTXGgm7HY8CCYolioC4xMjMFCQjKmh0NjT8abcqXOE d/TfI55X/OPYDt+2c+xbX4cRaPhjlNzpUlJCOEhowqx4KziEvhtns973kQwzmW8jq8j6 wGBczVpkD1nLNNHddNskN2C+vbOckRrZ8C38Q0ta0qLSkBG1JdNxMdOs9Pn5XwkOu53a Vono3sB85ibwBc/J2MBEhSg/uHYo6gp4yq6Nn0PjM8Lny9TN8xfRp13lLzsjcGdSPgr5 ef3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uJTiwCnN; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 38308e7fff4ca-32a65357a0fsi3647341fa.488.2025.05.26.06.01.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 May 2025 06:01:32 -0700 (PDT) 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=uJTiwCnN; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uJXRa-0007p8-1U; Mon, 26 May 2025 09:00:42 -0400 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 1uJXRX-0007n3-MA for qemu-devel@nongnu.org; Mon, 26 May 2025 09:00:39 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uJXRS-0005Xf-3V for qemu-devel@nongnu.org; Mon, 26 May 2025 09:00:39 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cf848528aso23388355e9.2 for ; Mon, 26 May 2025 06:00:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748264432; x=1748869232; darn=nongnu.org; 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=Nx4cl2IML5QZ9Mvq/oiwPXRYTEV7oxhBzSYHaQYpoVA=; b=uJTiwCnNnhJHjSZoxJ9ZkYqFHGc/mSnE2qsa3yh+ePWED1ubxB05XdhnWW9NjyjVAI IFMEUfrlo4FGDd41BMYYWYC/ACdgif9QurDb8i6bJgYyoEruWXtO+iofc++Y5qthI/S7 B5/fxmJ9tVpZin1u3GdigmUgJUk9e+fLCEEDzyhq/aXP7BnXeWrojmiLkyShMapppx94 hKKjWWqLWCxay1x9G70YjpFIrWtyL0owvoGUN0OC2clCpNmpAxk7bT/0kW84tGgXThkX lr5f/U/TcCzqGK7GEB2HrvAnTzv16/JF+Jz55iIzxo89y0SZYti667Qo/GmmdEm/k6N5 /szw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748264432; x=1748869232; 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=Nx4cl2IML5QZ9Mvq/oiwPXRYTEV7oxhBzSYHaQYpoVA=; b=vfFchxRUlDr94TKq3Xc1r5GgyeiKcgrORm8nAyOgbeyvEcyDgtk0KwRTF+i7H5dTIA KJdNP739BrBHqJVzfi9qyDopdKVSK4dbx5ZRAZWqbrkWykC82fE+lZLCBJF4WtdH5CyF O3WQ9pW/kG7LuFVdBGFrLnLH7NVD+JPp/p2mtcIWS/YTMvAITZxLflLk1afDu3FzgbXR 7FOVYUArRGfLdW6j4D+2TrrDurPixbVfTQa4R4d6RdsACMb1V0A8wrjBvGnHFZut3Y53 CcB9JB4txBrdLw3NpdDi+DUO19Az/mONHc0EIJYkR7+j4Akeem5wO+iM6kLPuD0+sebc WRnQ== X-Gm-Message-State: AOJu0YwEbn62pc90vjXqJjjrZLuNb+8gg0nHte1HhjJtzJPTDxoS8Kfu 4Qmpb8QbkDP3zAUb4rgt1xifIiVJ6HL+TwgSBsJUiZKUqpIXSvcwleYcV7R23vsDw8P9qEbWipk 7c1QNx60qJA== X-Gm-Gg: ASbGncvpVpOMENL8qjXR7CmJh4QJ1BwT3FhBX10IZr2ZzAxYyht6z1i9i1pIbI4Vc0e ZZbCnl4puNGkmfTNM6WvV8MY8xCpS9aWU1TiHvD6dBsToDNGH6Qi7avvqc0XLS7n6vbEdgRW0kO nl8yLCAazflfsx9/BqplfQUObgR7ZgLX9njGNO2IznY4MhYcSgHtpMEdFFcGoW4LjdQZDU1BFiw AVi4DTnvhAAdLeO5gSaBA0mxuO6atupL0Rn9Q9Bvxyo86q4T35xWJDCBmF+wW0t0id1tUOO2WsX 5uO7Htqf6FQ5FbdogsNVfjtGIPasvXKhYxMUGm6IfPeRyOINZs/rBpYFN+5fFwaTc3MrJbthMeb +uVhSoKhBcz5zgavzezf5ew== X-Received: by 2002:a05:600c:6090:b0:43c:e305:6d50 with SMTP id 5b1f17b1804b1-44c932f9391mr67589455e9.24.1748264431714; Mon, 26 May 2025 06:00:31 -0700 (PDT) Received: from localhost.localdomain (44.87.95.79.rev.sfr.net. [79.95.87.44]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f7d975f4sm234864725e9.39.2025.05.26.06.00.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 May 2025 06:00:30 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Pierrick Bouvier , Mark Cave-Ayland , Nicholas Piggin , Yanan Wang , Daniel Henrique Barboza , Harsh Prateek Bora , Marcel Apfelbaum , =?utf-8?q?C=C3=A9dric_Le_Goa?= =?utf-8?q?ter?= , Zhao Liu , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost Subject: [PATCH 3/3] hw/boards: Remove MachineState::usb_disabled field Date: Mon, 26 May 2025 15:00:06 +0200 Message-ID: <20250526130006.49817-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250526130006.49817-1-philmd@linaro.org> References: <20250526130006.49817-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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, T_SPF_TEMPERROR=0.01 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 Commit c6e765035bc ("powerpc: fix -machine usb=no for newworld and pseries machines") added the MachineState::usb_disabled field. It is now unused, remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/boards.h | 1 - hw/core/machine.c | 1 - 2 files changed, 2 deletions(-) diff --git a/include/hw/boards.h b/include/hw/boards.h index a7b1fcffae3..7d9149242ea 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -406,7 +406,6 @@ struct MachineState { bool dump_guest_core; bool mem_merge; bool usb; - bool usb_disabled; char *firmware; bool iommu; bool suppress_vmdesc; diff --git a/hw/core/machine.c b/hw/core/machine.c index c3f3a5020d0..896b5067214 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -498,7 +498,6 @@ static void machine_set_usb(Object *obj, bool value, Error **errp) MachineState *ms = MACHINE(obj); ms->usb = value; - ms->usb_disabled = !value; } static bool machine_get_graphics(Object *obj, Error **errp)