From patchwork Tue Apr 22 19:26:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 883019 Delivered-To: patch@linaro.org Received: by 2002:a5d:474d:0:b0:38f:210b:807b with SMTP id o13csp2585181wrs; Tue, 22 Apr 2025 12:31:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV30NXCzGa0kqP+fThwxIl7UM/trY7ZTcAni8eFomA+x+il5hqVsLrkQWPAc7XEU6geR6kYyg==@linaro.org X-Google-Smtp-Source: AGHT+IG9DerRcLFjCsrf9Bn4YApXI9nCaXOM153cU5HHuFfX6S+mvG9bKTVaGw0zwiKct04EYzqb X-Received: by 2002:a05:620a:319a:b0:7c9:256d:f6b6 with SMTP id af79cd13be357-7c927f6b410mr2307909285a.2.1745350268272; Tue, 22 Apr 2025 12:31:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745350268; cv=none; d=google.com; s=arc-20240605; b=MUCOT7JRBJsX7Syr3XfjGIkd4I7bX9+YzFTAa6Ip+vKFxuRgmNil0jS8EtNSFCb668 fVIvXUKHtnpNj8sbFabsl3enV1cv7MlY4dpciFYGR4qBuCT8EKL03Ohw1EKxb8uRYBJM 0sfAJcYp8oIb3eWhccRWlKmx1WQkIXKnLuxyXnKy83dsKs8i8tv0aO994mlTwNqtQBjP 8p75yXK6kaJz3uRRahuzMEutK5luZpR8Si0G9AjF1Av3ufGOfTqFQGSBsnBgdO7W7DpO TlrlUGSbbpACLfH4yFcURX8gvowSFfEMSEou36SrJkv9dXo/beWAYdPc4G0zUhbz0HqO GOpg== 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=DjyUL8uy5y0HojL/nOSc2tWkWo5HF0zmm3N1He1l4AM=; fh=vm85eyWrvOAHduw3sqEA+cYBqvHB7M0MHFcRJg7VWOo=; b=P/DLOkLxxv+8RApYvHbWi+2xbJx6wH1uRTnxVT3IMXLkpQb71tNn0UZ2OIxrEMd4/X sdFr4YPPeM4iSlWpxRKIFubBR8lj46PCGz7LohlTk5b9nBgajxzYPYi8CpNBk0+Ekdrw /eikGkA2rUY0yUiL0VmqCJ8XqaJv2eGEnJ1WV2UytcAcBnXESq0c/5qFycou8Synw0tE dNuT4DjF4oZhyc0TNYNVXGA3VW9rbJOvd79MvbEEFTt5DnxO4AgYQ8uew2H252Q7Pofa I6jb0WjRsVCEndiSCuW6Q356qNtg+GVq9jqdpJqKQjgtVCyFUnEWPZpmC7lZNbQr4tGI 2qmw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=btcCTC+z; 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-47ae9cb8046si121905991cf.434.2025.04.22.12.31.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Apr 2025 12:31:08 -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=btcCTC+z; 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 1u7JIl-0002ei-QV; Tue, 22 Apr 2025 15:29:03 -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 1u7JIY-0002XA-Mt for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:28:50 -0400 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7JIU-0006Ek-U6 for qemu-devel@nongnu.org; Tue, 22 Apr 2025 15:28:50 -0400 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-3081fe5987eso4936948a91.3 for ; Tue, 22 Apr 2025 12:28:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745350125; x=1745954925; 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=DjyUL8uy5y0HojL/nOSc2tWkWo5HF0zmm3N1He1l4AM=; b=btcCTC+zkLilZ+zx75Fsph4u59nqhs5rAQnEHnmzrLY8NqtIUPeKahMkn1SN4xOznV PmztvobtGi0Az87Uqb92T/isOq5VfMu8MerPYIPjAraVnMX4KAaC2RCQ+hoAq8da88Us bdU6hR3pKGcRQ7qDQuAa984pqE3Wm+cjTu1OD734JTlMcaB/FtefVIeup7fPmuq5l7ey KDXKq4u86Aacc7lC4lTn5gaC7gDo2DMtV6liHENN8UUVBKne3UsV95sNk7uHZqgUAPaT dHDr3+ia9LPtTJmbX7iynmbFSjRkL4zPSLFaH54fCStm6zufyY1B27qIZ2oGwZ3uvh5U 3shA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745350125; x=1745954925; 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=DjyUL8uy5y0HojL/nOSc2tWkWo5HF0zmm3N1He1l4AM=; b=THWPHcdZJ/gdZEKQvi4WRPoc2aEAZ13ac4sGOaivEKqVntrJaJDKgkRzhBea/i+2Xu IT9NGP02Qz8nD7rhg8EGcbIxUB+ftO1WIDcu+zjLxnX0NeA86tiMjfB8EzF+N7XwWzgc befDc8IlVbITXpaN1384WpWptAXR9DMK5AOkvMw1ND43MqWk7sl7P93qRNJmOS5p7IN2 vGQqzEOA+5UsJ167BbnvLBt4K5V8NWM4XbRRV2evti4WJ9xbI4Z8VphsUCUO2B5GS1Bq A6mHDi5GaPgL8PsUVd08vzugYqk16rvkBcx8m5r1M9AERZRtgKyZ+HybaLu+AMUSLvpu hbmw== X-Gm-Message-State: AOJu0YyhpJgLgvsty5Wdo4lP7hdfgJWSnpTkE6Q+hSmcBh/eK+aVY7VR ZxPbYJMhHHgtWFqPtBsBZ8jpy9xJiqqPRSu7PiD4NVd36CTW8I6f/+p0wyb+kZUeK4vqKeHxrCz e X-Gm-Gg: ASbGncv2/Y+8+naZo7w+EbAVJoYDIIIxgKV4lfW/Me03h8ByOT68d9RCVh6899XwBCy MrkmNLHk/oXFqSgFtVsoksTEAvtg9SQ/AUABaa4tBsk6yfI8/F9pocjhudUdmtpqkn/frehcFF0 8hF5CK8UcUsGw/+uxi/FaPRhyeZaklGubqAb952MZgdgZU89WLlwKQDzsoVS+XO85Ls7xK1d4bW 3JS3YvWYr/bbqktf7JscMMcX15iQ3p0rY24NgjLP/VuRL1WqYGQPKtHJu9HuzHYYO4QiPqevcLJ cSY/0zCBBMDwId57BGH8w5UdnBYPVLHcczbpOnRvJgktoVC6giFSB5mXurxY56lOMnVnRYreY4M = X-Received: by 2002:a17:90b:5646:b0:2ee:f80c:6889 with SMTP id 98e67ed59e1d1-3087bcc8a9dmr27043662a91.33.1745350124621; Tue, 22 Apr 2025 12:28:44 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3087df21278sm9146865a91.29.2025.04.22.12.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 12:28:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: Pierrick Bouvier Subject: [PATCH 036/147] include/system: Move exec/ioport.h to system/ioport.h Date: Tue, 22 Apr 2025 12:26:25 -0700 Message-ID: <20250422192819.302784-37-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250422192819.302784-1-richard.henderson@linaro.org> References: <20250422192819.302784-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1034; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1034.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 Convert the existing includes with sed. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- hw/display/vga_int.h | 2 +- include/hw/char/parallel-isa.h | 2 +- include/hw/dma/i8257.h | 2 +- include/hw/ide/ide-bus.h | 2 +- include/hw/isa/isa.h | 2 +- include/{exec => system}/ioport.h | 6 ++---- hw/block/fdc-isa.c | 2 +- monitor/hmp-cmds.c | 2 +- system/ioport.c | 2 +- system/physmem.c | 2 +- system/qtest.c | 2 +- target/i386/nvmm/nvmm-all.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- tests/qtest/fuzz/qtest_wrappers.c | 2 +- MAINTAINERS | 2 +- 15 files changed, 16 insertions(+), 18 deletions(-) rename include/{exec => system}/ioport.h (97%) diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 60ad26e03e..747b5cc6cf 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -26,7 +26,7 @@ #define HW_VGA_INT_H #include "ui/console.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/memory.h" #include "hw/display/bochs-vbe.h" diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h index 5284b2ffec..3edaf9dbe4 100644 --- a/include/hw/char/parallel-isa.h +++ b/include/hw/char/parallel-isa.h @@ -12,7 +12,7 @@ #include "parallel.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "hw/isa/isa.h" #include "qom/object.h" diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 4342e4a91e..33b6286d5a 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -2,7 +2,7 @@ #define HW_I8257_H #include "hw/isa/isa.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "qom/object.h" #define TYPE_I8257 "i8257" diff --git a/include/hw/ide/ide-bus.h b/include/hw/ide/ide-bus.h index 4841a7dcd6..121b455fcd 100644 --- a/include/hw/ide/ide-bus.h +++ b/include/hw/ide/ide-bus.h @@ -1,7 +1,7 @@ #ifndef HW_IDE_BUS_H #define HW_IDE_BUS_H -#include "exec/ioport.h" +#include "system/ioport.h" #include "hw/ide/ide-dev.h" #include "hw/ide/ide-dma.h" diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 1d852011b3..a82c5f1004 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -4,7 +4,7 @@ /* ISA bus */ #include "system/memory.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "hw/qdev-core.h" #include "qom/object.h" diff --git a/include/exec/ioport.h b/include/system/ioport.h similarity index 97% rename from include/exec/ioport.h rename to include/system/ioport.h index ecea3575bc..780ea5a676 100644 --- a/include/exec/ioport.h +++ b/include/system/ioport.h @@ -21,8 +21,8 @@ * IO ports API */ -#ifndef IOPORT_H -#define IOPORT_H +#ifndef SYSTEM_IOPORT_H +#define SYSTEM_IOPORT_H #include "system/memory.h" @@ -39,9 +39,7 @@ typedef struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } -#ifndef CONFIG_USER_ONLY extern const MemoryRegionOps unassigned_io_ops; -#endif void cpu_outb(uint32_t addr, uint8_t val); void cpu_outw(uint32_t addr, uint16_t val); diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index a10c24aab1..561cfa47c1 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -42,7 +42,7 @@ #include "system/block-backend.h" #include "system/blockdev.h" #include "system/system.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 8ddcdd76c1..74a0f56566 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "system/address-spaces.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "exec/gdbstub.h" #include "gdbstub/enums.h" #include "monitor/hmp.h" diff --git a/system/ioport.c b/system/ioport.c index 5300716464..4f96e9119f 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -26,7 +26,7 @@ */ #include "qemu/osdep.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/memory.h" #include "system/address-spaces.h" #include "trace.h" diff --git a/system/physmem.c b/system/physmem.c index e61fea41b5..234e489199 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -51,7 +51,7 @@ #include "qemu/memalign.h" #include "qemu/memfd.h" #include "system/memory.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/dma.h" #include "system/hostmem.h" #include "system/hw_accel.h" diff --git a/system/qtest.c b/system/qtest.c index 5407289154..523a047995 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -16,7 +16,7 @@ #include "system/qtest.h" #include "system/runstate.h" #include "chardev/char-fe.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/memory.h" #include "exec/tswap.h" #include "hw/qdev-core.h" diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index 91f0e32366..17394d073d 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "system/address-spaces.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "qemu/accel.h" #include "system/nvmm.h" #include "system/cpus.h" diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index d58cb11cee..b64852e13e 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "system/address-spaces.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "gdbstub/helpers.h" #include "qemu/accel.h" #include "system/whpx.h" diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wrappers.c index 0580f8df86..d7adcbe3fd 100644 --- a/tests/qtest/fuzz/qtest_wrappers.c +++ b/tests/qtest/fuzz/qtest_wrappers.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "hw/core/cpu.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "fuzz.h" diff --git a/MAINTAINERS b/MAINTAINERS index 163814b4c6..fa4bbc2b7c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3105,7 +3105,7 @@ M: Peter Xu M: David Hildenbrand R: Philippe Mathieu-Daudé S: Supported -F: include/exec/ioport.h +F: include/system/ioport.h F: include/exec/memop.h F: include/system/memory.h F: include/exec/ram_addr.h