From patchwork Fri Nov 22 11:19:39 2024 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: 844917 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:8b:b0:382:43a8:7b94 with SMTP id m11csp2790815wrx; Fri, 22 Nov 2024 03:21:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWZ3pDh7H7geYPQe1pmKaqSyNiN/sTRGBPKCcez3U5+OctMPdBa1LJy99Bng6f5AkdgoMyVSw==@linaro.org X-Google-Smtp-Source: AGHT+IFfiUIHp+gthxWSVZb1wB/19a140wF5Rz/bzLN0VtdfHZfNFpxB0LrXJQkJgwz7Z51Sscmt X-Received: by 2002:ad4:574b:0:b0:6cb:ce17:e80d with SMTP id 6a1803df08f44-6d4510167d7mr47226826d6.18.1732274470858; Fri, 22 Nov 2024 03:21:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1732274470; cv=none; d=google.com; s=arc-20240605; b=Hl4bj3eOO1PVKIXXFU0BqpXibHgF3g/CWU+d50Q7wPKxxoDnvN8gxX0F91at0bdU/3 29YL9cE5kIZ7kQs61Ef85CvPyHCR/hNYzgFrgy/4r1TXcEJSGafDU2lugzuObUTFGf7O a8m4Zgu5aN4zgookNs1QFvoBzub7VqCf7d7jSuC16zyzUIKYHkjluGY2XoiJzS1/jViM lJUDC4YMvHq3x6lQWY/RL47LlQyb7SJ9xqPlL4cU73aMZjFzB2egUQGKJyMmqJ9U45nJ ADag6aW9HHzLmb7yNo3NlO9wVoaZFwbqDDM0xtmrJi6LzSuy64Z9cnv5EIa2f2e3Db89 NWHw== 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=w2mewmHu7F82WCCsJ8/YlP7drCNs4XevivVXJNwCNSg=; fh=wBvcyqQhEU6e0ZqmVxQYHE0ci9Ai55t9//i9ttilHeA=; b=S0kDA9LafpBorHHbEKAnqg5H+nhRAJY7NeY9gw/Szjvr/MI42E7DhHBu1GnQ9Shjgx XmYTWrTLDA+w+IornUaQy3ltBenv7q1jmdh5GRBGHlpUKWStxkGLcLmAXwFLLKw88E5z 0LyLyQiohw4byPQufiv27YA4GyNuuOdVXFvEBWDeEGHM8Dfog1xpW1LzQzNc1b6eLOxy tXs4O5ZOsm+i5kCGJ7UyAipo+y2+av80PKcvJfA/IcpqgBgpdDkdLleBOK/BFYc69Meq 1TMDe5suJakBLw74S+BYPiJVnIwHGoPM2HE/vMEtMqi0JGcqw2qTUzDgoqTZOKZ+ULqC 7t6w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fxsoW62U; 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-6d451b67cbasi17583146d6.399.2024.11.22.03.21.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 22 Nov 2024 03:21:10 -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=fxsoW62U; 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 1tERhv-0007m8-7h; Fri, 22 Nov 2024 06:20:15 -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 1tERho-0007iJ-E7 for qemu-devel@nongnu.org; Fri, 22 Nov 2024 06:20:10 -0500 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tERhl-0006Cb-M1 for qemu-devel@nongnu.org; Fri, 22 Nov 2024 06:20:08 -0500 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2ffa97d99d6so4370311fa.1 for ; Fri, 22 Nov 2024 03:20:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1732274402; x=1732879202; 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=w2mewmHu7F82WCCsJ8/YlP7drCNs4XevivVXJNwCNSg=; b=fxsoW62UNWtBGsKAI0pFbqa/XNHXDJssjeKlZxUT/d/wwpTsDc+GQRH9lROeEAGZNX HaFxUIcGtFLO6xXYKNmdYMKRt7mqAnkqWjb8gCD57Yt5jeU7seMLYQjyJfGJ18D9WOby mP/kIDl75lqbLa2yUTqLbtV9NvCvltht7L5AMKiPCXFTx9Xz750pkxeQci0Unsyq/Igg AOGIZqqv81DVgOkrReGnY1tbbdBFLudEXQ2m6JRHizNtM+KTDT6ziFP/7NBJJYV7XPiG yBlbjeUbXaZ1mC1Oq7rb8p9r8gV32gxLV3uNVehhXOvAJvc8XJ6nFXEpr0PvI80tTSC5 h4Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732274402; x=1732879202; 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=w2mewmHu7F82WCCsJ8/YlP7drCNs4XevivVXJNwCNSg=; b=goPIwCmCdVgRadAH2zy6y5pbN1E6CMRJRRbqgeQrW/f1nH4CIBrx1RFzTEePm43SNu LPYXbPGcwDwepbb7MpzoSpFANhe5T0lce5pcDbgsctF97Eh+XGT4TARiF3aUr/qZkt2j IfnRVuyrMuYYMam+oA5sCyp8mbz9FuYyLUaYshUB3i1IXEUN9odspoVWpU28TnmcI6h3 29mFns/5N2BvUk4Mcseag1FSdHH5Z9x4bYt1c+TnWLdfataWQiGM3luXleRFuvsfeuAt UDeLNwuUQHE9TeNHxnmw1J5lik5RzYpdrFOk4C8zt4qczSa4h02RFEG1PHrvpDrCmFrX lLfw== X-Gm-Message-State: AOJu0YyJc+Ugk5S8VcrEa8rBptgYKoilBlQzfTvp3q8erD41sVOuUwho J6hiPAOc4agJ4dWu1bKT9enR7SwVgv4c6+XP39n/ZB0yTVHyDorfOg0vOEA3CVc+hiOJwYwigy5 4 X-Gm-Gg: ASbGncskSFNH2G4r+byux6kbRjg2a2hZ2SnEbVByY7Tb+BhSbtOfnKQS8Lq4VDQcxQQ tEjUKYtL6PSA/cCJpvzmghEn3A19qx089smQ9vavuVUpK+F1TASeXsgikUSP3jpnvbv2ZjfZW18 wz1g5Z0QY+X9salHjot9dkvCm1RRy4XRMjqfUW70LcAQqShgJc30FtFLQjeOdqZ5lD5Un/H8wEB mdwoS3/yyXbu3l46gNmwidz7bQKpfN47tz2OjpJcsKzDb3j9mwBaLxJk65c/0z0rRRxFd0DzKLF X-Received: by 2002:a05:6512:3e23:b0:539:e94d:2d3d with SMTP id 2adb3069b0e04-53dd35a4f38mr1136485e87.7.1732274402028; Fri, 22 Nov 2024 03:20:02 -0800 (PST) Received: from localhost.localdomain ([176.187.211.33]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-433cde114d5sm24055655e9.17.2024.11.22.03.20.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 22 Nov 2024 03:20:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, "Michael S. Tsirkin" , Mark Cave-Ayland , Aleksandar Rikalo , Harsh Prateek Bora , qemu-ppc@nongnu.org, Laurent Vivier , =?utf-8?q?Herv=C3=A9_Poussineau?= , Artyom Tarasenko , Thomas Huth , Richard Henderson , Thomas Huth , Peter Maydell , Paolo Bonzini , Fam Zheng , Helge Deller , Daniel Henrique Barboza , Nicholas Piggin , Marcel Apfelbaum Subject: [PATCH 3/3] hw/scsi/esp: Call scsi_bus_legacy_handle_cmdline() once Date: Fri, 22 Nov 2024 12:19:39 +0100 Message-ID: <20241122111939.11936-4-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241122111939.11936-1-philmd@linaro.org> References: <20241122111939.11936-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=philmd@linaro.org; helo=mail-lj1-x22f.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 Call scsi_bus_legacy_handle_cmdline() once in the DeviceRealize handler, just after scsi_bus_init(). Signed-off-by: Philippe Mathieu-Daudé --- hw/m68k/next-cube.c | 2 -- hw/m68k/q800.c | 2 -- hw/mips/jazz.c | 2 -- hw/scsi/esp.c | 1 + hw/sparc/sun4m.c | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 08886d432c..f0fdbef7ae 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -851,8 +851,6 @@ static void next_scsi_init(DeviceState *pcdev) next_pc->scsi_reset = qdev_get_gpio_in(dev, 0); next_pc->scsi_dma = qdev_get_gpio_in(dev, 1); - - scsi_bus_legacy_handle_cmdline(&esp->bus); } static void next_escc_init(DeviceState *pcdev) diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index 556604e1dc..816a662fd9 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -487,8 +487,6 @@ static void q800_machine_init(MachineState *machine) memory_region_add_subregion(&m->macio, ESP_PDMA - IO_BASE, sysbus_mmio_get_region(sysbus, 1)); - scsi_bus_legacy_handle_cmdline(&esp->bus); - /* Apple Sound Chip */ object_initialize_child(OBJECT(machine), "asc", &m->asc, TYPE_ASC); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 0e43c9f0ba..71badb0616 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -347,8 +347,6 @@ static void mips_jazz_init(MachineState *machine, sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(rc4030, 5)); sysbus_mmio_map(sysbus, 0, 0x80002000); - scsi_bus_legacy_handle_cmdline(&esp->bus); - /* Floppy */ for (n = 0; n < MAX_FD; n++) { fds[n] = drive_get(IF_FLOPPY, 0, n); diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index ac841dc32e..a1d2f6f380 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -1542,6 +1542,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error **errp) qdev_init_gpio_in(dev, sysbus_esp_gpio_demux, 2); scsi_bus_init(&s->bus, sizeof(s->bus), dev, &esp_scsi_info); + scsi_bus_legacy_handle_cmdline(&s->bus); } static void sysbus_esp_hard_reset(DeviceState *dev) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index d52e6a7213..26e0af43bf 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -338,7 +338,6 @@ static void *sparc32_dma_init(hwaddr dma_base, sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base); sysbus_mmio_map(SYS_BUS_DEVICE(esp), 0, esp_base); - scsi_bus_legacy_handle_cmdline(&esp->esp.bus); sysbus_mmio_map(SYS_BUS_DEVICE(lance), 0, le_base);