Skip to content

Commit

Permalink
hw/ide: Remove the include/hw/ide.h legacy file
Browse files Browse the repository at this point in the history
There was only one prototype left in this legacy file. Move it to
ide-dev.h to finally get rid of it.

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-7-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 9ad5b51 commit f75c811
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 12 deletions.
1 change: 0 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1937,7 +1937,6 @@ IDE
M: John Snow <jsnow@redhat.com>
L: qemu-block@nongnu.org
S: Odd Fixes
F: include/hw/ide.h
F: include/hw/ide/
F: hw/ide/
F: hw/block/block.c
Expand Down
9 changes: 0 additions & 9 deletions include/hw/ide.h

This file was deleted.

2 changes: 2 additions & 0 deletions include/hw/ide/ide-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,6 @@ typedef struct IDEDrive {

void ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind, Error **errp);

void ide_drive_get(DriveInfo **hd, int max_bus);

#endif
3 changes: 1 addition & 2 deletions include/hw/ide/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
/*
* QEMU IDE Emulation -- internal header file
* only files in hw/ide/ are supposed to include this file.
* non-internal declarations are in hw/ide.h
* non-internal declarations are in hw/include/ide-*.h
*/

#include "hw/ide.h"
#include "hw/ide/ide-bus.h"

/* debug IDE devices */
Expand Down

0 comments on commit f75c811

Please sign in to comment.