From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
qemu-block@nongnu.org, "Thomas Huth" <huth@tuxfamily.org>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"David Hildenbrand" <david@redhat.com>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Kevin Wolf" <kwolf@redhat.com>, "Peter Xu" <peterx@redhat.com>,
"BALATON Zoltan" <balaton@eik.bme.hu>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Sergio Lopez" <slp@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Hanna Reitz" <hreitz@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Cédric Le Goater" <clg@kaod.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Juan Quintela" <quintela@redhat.com>,
"Frédéric Barrat" <fbarrat@linux.ibm.com>,
qemu-ppc@nongnu.org, "Michael S. Tsirkin" <mst@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH 03/12] hw/block/fdc-isa: Rename header to match source file
Date: Sun, 17 Dec 2023 15:41:39 +0100 [thread overview]
Message-ID: <20231217144148.15511-4-shentey@gmail.com> (raw)
In-Reply-To: <20231217144148.15511-1-shentey@gmail.com>
Rename the header which allows for exposing fdc-internal.h (dropping the
-internal suffix) which in turn allows for exposing struct FDCtrlISABus.
Exposing a device struct is in line with OOM/qdev guidelines.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
MAINTAINERS | 2 +-
hw/block/fdc-internal.h | 2 +-
include/hw/block/{fdc.h => fdc-isa.h} | 4 ++--
hw/block/fdc-isa.c | 2 +-
hw/block/fdc-sysbus.c | 2 +-
hw/block/fdc.c | 2 +-
hw/i386/pc.c | 2 +-
hw/isa/isa-superio.c | 2 +-
hw/mips/jazz.c | 2 +-
hw/sparc/sun4m.c | 2 +-
hw/sparc64/sun4u.c | 2 +-
stubs/cmos.c | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
rename include/hw/block/{fdc.h => fdc-isa.h} (92%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 695e0bd34f..b4718fcf59 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1948,7 +1948,7 @@ F: hw/block/fdc.c
F: hw/block/fdc-internal.h
F: hw/block/fdc-isa.c
F: hw/block/fdc-sysbus.c
-F: include/hw/block/fdc.h
+F: include/hw/block/fdc-isa.h
F: tests/qtest/fdc-test.c
T: git https://gitlab.com/jsnow/qemu.git ide
diff --git a/hw/block/fdc-internal.h b/hw/block/fdc-internal.h
index 036392e9fc..1728231a26 100644
--- a/hw/block/fdc-internal.h
+++ b/hw/block/fdc-internal.h
@@ -28,7 +28,7 @@
#include "exec/memory.h"
#include "exec/ioport.h"
#include "hw/block/block.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "qapi/qapi-types-block.h"
typedef struct FDCtrl FDCtrl;
diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc-isa.h
similarity index 92%
rename from include/hw/block/fdc.h
rename to include/hw/block/fdc-isa.h
index 35248c0837..95807fdc65 100644
--- a/include/hw/block/fdc.h
+++ b/include/hw/block/fdc-isa.h
@@ -1,5 +1,5 @@
-#ifndef HW_FDC_H
-#define HW_FDC_H
+#ifndef HW_FDC_ISA_H
+#define HW_FDC_ISA_H
#include "exec/hwaddr.h"
#include "qapi/qapi-types-block.h"
diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index 7ec075e470..6387dc94fa 100644
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -28,7 +28,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 86ea51d003..f18f0d19b0 100644
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qom/object.h"
#include "hw/sysbus.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "migration/vmstate.h"
#include "fdc-internal.h"
#include "trace.h"
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index d7cc4d3ec1..2bd6d925b5 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -28,7 +28,7 @@
*/
#include "qemu/osdep.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/timer.h"
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 0d732b7530..aeecf56e72 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "hw/i386/pc.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
#include "hw/hyperv/hv-balloon.h"
diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index 7dbfc374da..ea6cb4213f 100644
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -17,7 +17,7 @@
#include "sysemu/blockdev.h"
#include "chardev/char.h"
#include "hw/char/parallel.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "hw/isa/superio.h"
#include "hw/qdev-properties.h"
#include "hw/input/i8042.h"
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
index d33a76ad4d..bc74d1fd96 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -31,7 +31,7 @@
#include "hw/char/serial.h"
#include "hw/char/parallel.h"
#include "hw/isa/isa.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "net/net.h"
diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 17bf5f2879..751e52b282 100644
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -34,7 +34,7 @@
#include "hw/rtc/m48t59.h"
#include "migration/vmstate.h"
#include "hw/sparc/sparc32_dma.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "sysemu/reset.h"
#include "sysemu/runstate.h"
#include "sysemu/sysemu.h"
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index c871170378..9a88772f6f 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -39,7 +39,7 @@
#include "hw/rtc/m48t59.h"
#include "migration/vmstate.h"
#include "hw/input/i8042.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
#include "net/net.h"
#include "qemu/timer.h"
#include "sysemu/runstate.h"
diff --git a/stubs/cmos.c b/stubs/cmos.c
index 3fdbae2c69..32d921e065 100644
--- a/stubs/cmos.c
+++ b/stubs/cmos.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "hw/block/fdc.h"
+#include "hw/block/fdc-isa.h"
int cmos_get_fd_drive_type(FloppyDriveType fd0)
{
--
2.43.0
next prev parent reply other threads:[~2023-12-17 14:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-17 14:41 [PATCH 00/12] hw/isa/vt82c686: Implement relocation and toggling of SuperI/O functions Bernhard Beschow
2023-12-17 14:41 ` [PATCH 01/12] hw: Remove unused includes of hw/block/fdc.h Bernhard Beschow
2023-12-17 14:41 ` [PATCH 02/12] hw/i386/pc: No need to include hw/block/fdc.h in header Bernhard Beschow
2023-12-17 14:41 ` Bernhard Beschow [this message]
2023-12-17 14:41 ` [PATCH 04/12] hw/block/fdc: Expose internal header Bernhard Beschow
2023-12-17 15:47 ` BALATON Zoltan
2023-12-17 23:39 ` Bernhard Beschow
2023-12-18 10:54 ` BALATON Zoltan
2023-12-18 18:53 ` Bernhard Beschow
2023-12-18 23:44 ` BALATON Zoltan
2023-12-17 14:41 ` [PATCH 05/12] hw/block/fdc: Move constant #define to where it is imposed Bernhard Beschow
2023-12-17 14:41 ` [PATCH 06/12] hw/block/fdc-isa: Expose struct FDCtrlISABus Bernhard Beschow
2023-12-17 14:41 ` [PATCH 07/12] MAINTAINERS: Add include/hw/char/serial*.h to the "PC Chipset" section Bernhard Beschow
2023-12-17 14:41 ` [PATCH 08/12] hw/char/serial-isa: Export struct ISASerialState Bernhard Beschow
2023-12-17 14:41 ` [PATCH 09/12] exec/ioport: Resolve redundant .base attribute in struct MemoryRegionPortio Bernhard Beschow
2023-12-17 14:41 ` [PATCH 10/12] exec/ioport: Add portio_list_set_address() Bernhard Beschow
2023-12-17 14:41 ` [PATCH 11/12] exec/ioport: Add portio_list_set_enabled() Bernhard Beschow
2023-12-17 14:41 ` [PATCH 12/12] hw/isa/vt82c686: Implement relocation of SuperI/O functions Bernhard Beschow
2023-12-17 15:40 ` BALATON Zoltan
2023-12-17 23:47 ` Bernhard Beschow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231217144148.15511-4-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=aleksandar.rikalo@syrmia.com \
--cc=atar4qemu@gmail.com \
--cc=balaton@eik.bme.hu \
--cc=clg@kaod.org \
--cc=david@redhat.com \
--cc=eduardo@habkost.net \
--cc=farosas@suse.de \
--cc=fbarrat@linux.ibm.com \
--cc=hpoussin@reactos.org \
--cc=hreitz@redhat.com \
--cc=huth@tuxfamily.org \
--cc=jiaxun.yang@flygoat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=leobras@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mst@redhat.com \
--cc=npiggin@gmail.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.org \
--cc=slp@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).