Skip to content

Commit

Permalink
hw/ide: Stop exposing internal.h to non-IDE files
Browse files Browse the repository at this point in the history
include/hw/ide/internal.h is currently included by include/hw/ide/pci.h
and thus exposed to a lot of files that are not part of the IDE subsystem.
Stop including internal.h there and use the appropriate new headers
ide-bus.h and ide-dma.h instead.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-ID: <20240220085505.30255-8-thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
  • Loading branch information
huth authored and philmd committed Feb 21, 2024
1 parent f75c811 commit 3197526
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion hw/i386/pc.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "hw/i386/fw_cfg.h"
#include "hw/i386/vmport.h"
#include "sysemu/cpus.h"
#include "hw/ide/internal.h"
#include "hw/ide/ide-bus.h"
#include "hw/timer/hpet.h"
#include "hw/loader.h"
#include "hw/rtc/mc146818rtc.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ide/cmd646.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "sysemu/reset.h"

#include "hw/ide/pci.h"
#include "hw/ide/internal.h"
#include "trace.h"

/* CMD646 specific */
Expand Down
1 change: 1 addition & 0 deletions hw/ide/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "sysemu/dma.h"
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "hw/ide/internal.h"
#include "hw/ide/pci.h"
#include "trace.h"

Expand Down
1 change: 1 addition & 0 deletions hw/ide/piix.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/pci/pci.h"
#include "hw/ide/internal.h"
#include "hw/ide/piix.h"
#include "hw/ide/pci.h"
#include "trace.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ide/sii3112.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/

#include "qemu/osdep.h"
#include "hw/ide/internal.h"
#include "hw/ide/pci.h"
#include "qemu/module.h"
#include "trace.h"
Expand Down
1 change: 1 addition & 0 deletions hw/ide/via.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/

#include "qemu/osdep.h"
#include "hw/ide/internal.h"
#include "hw/pci/pci.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
Expand Down
2 changes: 1 addition & 1 deletion include/hw/ide/pci.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef HW_IDE_PCI_H
#define HW_IDE_PCI_H

#include "hw/ide/internal.h"
#include "hw/ide/ide-bus.h"
#include "hw/pci/pci_device.h"
#include "qom/object.h"

Expand Down

0 comments on commit 3197526

Please sign in to comment.