From patchwork Fri May 2 18:56:42 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: 886634 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp961055wrq; Fri, 2 May 2025 11:58:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWgTRCp0XFn4Oemt2gxCx1gChvGR8Ae5n0mGdgvPUvb8j7kgRSsJ7jHMsDVCLEq4awKN1cqog==@linaro.org X-Google-Smtp-Source: AGHT+IEAgBDNVFaxUqzQmM3lz0QjuYaiUvPnIJH6z0OPECVTSXTgGuBNB9dI3Uyz64fzp8amoxaB X-Received: by 2002:a05:622a:480c:b0:48a:e2ec:a3cf with SMTP id d75a77b69052e-48c3106a23emr71777901cf.4.1746212319911; Fri, 02 May 2025 11:58:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746212319; cv=none; d=google.com; s=arc-20240605; b=M+iJSto2y9oLOdG8KxNT4adQ7qDmUO8z55mv6mUurg2kMCQtHpXrXZ0yROnBJeBUTL aA0myEqzIVH8KjwMFUWMrW3nedDcKP/CCXT3eG76x2zIX0X69mcSjq/PliSwh83hw77X Zhwpsmpg8WlsAyGV7PGLyEa2ae3tfqTaZLYQeaZkaOuuS2M54gNRtTVxCoNNkGt01R0f J73/oZqSGwOMoQQebaBVBKZ2oGkKAiKKwBYTvUzXgdU4EYuKC8yhYGyoKkyAklJmkDQz SQSTi5MPRlRInZ7GH+wYTxZxknVarLdcDKYRxuRo2aVk58eRMSezZ9GEiiCsgpuP6tpO i5Ew== 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=wdDlI5qLVUtiJXLSpG9OpY8RG/p/SqrqX/ncOt5okGA=; fh=zA7MiWWYdZ7nPYzFPsisQ1XfjLk8wRfRNbrxI2kr3EE=; b=JjI433K5jTJYK0xASeltWh9pmd2uHk3CLlyJdwb0U82NHeujFguuGLNy+AHpo4EHK2 zKZGDniPozxM/5Wno6EgdzCM7npbpR4/80A/g5OcVc3motOVNpGEI+U2nR1TzX++83sA +FCu7S5MIenqUDaKsZ7ZpUD+rmUI0OTMgt2w5PG18qNo5ML6100sX+9h14zRUB/elUyY j4bsKF8hVfhg5CKbWeHmON9ONVBj8W8Wt4Q4KJZtwh28alZKNJi7w7SqOWypDABF7N/r hWLXpluGrJj40fg85UcXko0DW2Oa/s61EyzyJw6B23ksYvFOKBoR52eMdz5Q2+ubUBnd zy2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="BO/+snOk"; 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 d75a77b69052e-48b987245b6si36680251cf.392.2025.05.02.11.58.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 May 2025 11:58:39 -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="BO/+snOk"; 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 1uAvag-0006Wf-JZ; Fri, 02 May 2025 14:58:30 -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 1uAvaB-0005k8-Ey for qemu-devel@nongnu.org; Fri, 02 May 2025 14:58:12 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAva7-0005Xp-T7 for qemu-devel@nongnu.org; Fri, 02 May 2025 14:57:57 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-ac339f53df9so496270766b.1 for ; Fri, 02 May 2025 11:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746212273; x=1746817073; 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=wdDlI5qLVUtiJXLSpG9OpY8RG/p/SqrqX/ncOt5okGA=; b=BO/+snOkPJunjr+lJRkPsOtZSUkcRnuiexGnj5Tyy5GeTYm9QVhb7mNzD5L23pi48X Sb5ZcENQFPn9mX1HwPnLZe/z49BunhzofGS2i1jbGVOKgUuSttVpLDKx0LEp9CG5v604 w0XRuYrMyGRELMTdgIHRACmnSwT1RdpUL/23tPcjAXSwCQjdo7+7o8qU/RJRwBQ0QuL+ uTR4RGca09YaRIgGVdxPepeA3aNjgdDK0vm8LwvqOd37WKgvwoeboGMumToDByb959yW 66T6nIWXMMXzIT1y+bNmNHQnYXBWIdGZNBYrnKALWBlMJ/aeZmoYiqBHin8z8naZXIQC pz9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746212273; x=1746817073; 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=wdDlI5qLVUtiJXLSpG9OpY8RG/p/SqrqX/ncOt5okGA=; b=toqFEo/dPBsVQd5MtqJSZGP9lO7+YiQbL2wHYJgxhx355YmwoEQi9/X2fZd8CIHE0z //ytaydwfZSFUCFhMAvasWN430NnmV3SGUVbdtE5gE7oWERGZ3D5PFRfMJ+e2H/Z/eVg hKAwgmuUBgiaC2HVZMXiDOaqo9ZMVWOvWsj2qp/yMhtholmKP4DknydGnq/Fjuwotgq5 mur7X86JMFOXQHs4L1TwNonOzBh25Q3qsaQSs4TPENOgLAvmO8bdKCgD+mLtvYRYvd+H 9iwFRD0xNRgRq/lwRGP1wh2N8yAbc9N0dwKo+gBTW2yeSlQreuh16jcnMWAIGKYvjIYx KwOA== X-Gm-Message-State: AOJu0YymTikEO+LeW5oeNR5bfsAOboLQbqL8OV0kchGIXynkFGwqwSUJ AT/ZjkQDyjvgSW2rlW8xV3ZqTAhwB/fCi0vvsrg2DcPDUDE2MjhAe2K3EupuNa5KRuv5sCseYzF i X-Gm-Gg: ASbGncuQ35SuhmyBoqlcpYDkgqGY2iy7yS3lcSOwlI33jTRZowOy9IW3nO2bKIp2ww4 +KSqC6Mlc+PRDXF3KWeA7fmAmrO5S//o53dUzikv2e7l/JCaaOs6X5WVndNMz4E0q5S5j1/nVQc Wci6F0/ZY/u2rYraB3Q+SZ1m/e7RF19gYcHFTabDCgyQkflscfsuYX7fDLh3odaYlAcOnNWVtX2 XQKp5G+lJ9XXU2txbU1DcPpm5651QCZWAfDovOcjLLZlWtWc5k0u31Ca0CQ7vD+TlrFa3lF+G93 cgwv0mqk3BfUyXP3jHRc+/xqlBqU8yCIPr/L+w6EYrD8lPlGnT23EMIHX9Gy7XjZVVE5xD61za5 jThhCpZ5TGUhxUMX7inIa X-Received: by 2002:a17:907:7b87:b0:ac3:b613:a651 with SMTP id a640c23a62f3a-ad17ad87102mr421439666b.17.1746212272985; Fri, 02 May 2025 11:57:52 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad1894c0276sm86005966b.108.2025.05.02.11.57.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 02 May 2025 11:57:52 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Igor Mammedov , Huacai Chen , Amit Shah , Marcel Apfelbaum , Sergio Lopez , Ani Sinha , Paolo Bonzini , Eduardo Habkost , Jiaxun Yang , Jason Wang , Richard Henderson , Yanan Wang , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Yi Liu , "Michael S. Tsirkin" , Mark Cave-Ayland Subject: [PATCH v3 10/19] hw/virtio/virtio-mmio: Remove VirtIOMMIOProxy::format_transport_address field Date: Fri, 2 May 2025 20:56:42 +0200 Message-ID: <20250502185652.67370-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250502185652.67370-1-philmd@linaro.org> References: <20250502185652.67370-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.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 The VirtIOMMIOProxy::format_transport_address boolean was only set in the hw_compat_2_6[] array, via the 'format_transport_address=off' property. We removed all machines using that array, lets remove that property, simplifying virtio_mmio_bus_get_dev_path(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland --- include/hw/virtio/virtio-mmio.h | 1 - hw/virtio/virtio-mmio.c | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/include/hw/virtio/virtio-mmio.h b/include/hw/virtio/virtio-mmio.h index aa492620228..8b19ec2291a 100644 --- a/include/hw/virtio/virtio-mmio.h +++ b/include/hw/virtio/virtio-mmio.h @@ -66,7 +66,6 @@ struct VirtIOMMIOProxy { uint32_t guest_page_shift; /* virtio-bus */ VirtioBusState bus; - bool format_transport_address; /* Fields only used for non-legacy (v2) devices */ uint32_t guest_features[2]; VirtIOMMIOQueue vqs[VIRTIO_QUEUE_MAX]; diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 532c67107ba..b7ee115b990 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -752,8 +752,6 @@ static void virtio_mmio_pre_plugged(DeviceState *d, Error **errp) /* virtio-mmio device */ static const Property virtio_mmio_properties[] = { - DEFINE_PROP_BOOL("format_transport_address", VirtIOMMIOProxy, - format_transport_address, true), DEFINE_PROP_BOOL("force-legacy", VirtIOMMIOProxy, legacy, true), DEFINE_PROP_BIT("ioeventfd", VirtIOMMIOProxy, flags, VIRTIO_IOMMIO_FLAG_USE_IOEVENTFD_BIT, true), @@ -815,19 +813,6 @@ static char *virtio_mmio_bus_get_dev_path(DeviceState *dev) virtio_mmio_proxy = VIRTIO_MMIO(virtio_mmio_bus->parent); proxy_path = qdev_get_dev_path(DEVICE(virtio_mmio_proxy)); - /* - * If @format_transport_address is false, then we just perform the same as - * virtio_bus_get_dev_path(): we delegate the address formatting for the - * device on the virtio-mmio bus to the bus that the virtio-mmio proxy - * (i.e., the device that implements the virtio-mmio bus) resides on. In - * this case the base address of the virtio-mmio transport will be - * invisible. - */ - if (!virtio_mmio_proxy->format_transport_address) { - return proxy_path; - } - - /* Otherwise, we append the base address of the transport. */ section = memory_region_find(&virtio_mmio_proxy->iomem, 0, 0x200); assert(section.mr);