From 70e2337030fb242b0a7870e781b57055110400a1 Mon Sep 17 00:00:00 2001 From: John Snow Date: Tue, 18 Jul 2017 11:47:57 -0400 Subject: [PATCH] ahci: split public and private interface MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Complete the split by renaming ahci_public.h --> ahci.h and moving the current ahci.h to hw/ide/ahci_internal.h. Adjust ahci_internal.h to now load ahci.h instead of ahci_public.h. Finalize the split by switching external users to the new header. Signed-off-by: John Snow Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-id: 20170623220926.11479-4-jsnow@redhat.com Signed-off-by: John Snow --- hw/ide/ahci.c | 2 +- include/hw/ide/ahci.h => hw/ide/ahci_internal.h | 2 +- hw/ide/ich.c | 2 +- include/hw/ide/{ahci_public.h => ahci.h} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename include/hw/ide/ahci.h => hw/ide/ahci_internal.h (99%) rename include/hw/ide/{ahci_public.h => ahci.h} (100%) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index e3cdbc81a3..406a1b5579 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -32,7 +32,7 @@ #include "sysemu/dma.h" #include "hw/ide/internal.h" #include "hw/ide/pci.h" -#include "hw/ide/ahci.h" +#include "hw/ide/ahci_internal.h" #define DEBUG_AHCI 0 diff --git a/include/hw/ide/ahci.h b/hw/ide/ahci_internal.h similarity index 99% rename from include/hw/ide/ahci.h rename to hw/ide/ahci_internal.h index 70a0140b36..1e21169e79 100644 --- a/include/hw/ide/ahci.h +++ b/hw/ide/ahci_internal.h @@ -24,7 +24,7 @@ #ifndef HW_IDE_AHCI_INTERNAL_H #define HW_IDE_AHCI_INTERNAL_H -#include "hw/ide/ahci_public.h" +#include "hw/ide/ahci.h" #include "hw/sysbus.h" #define AHCI_MEM_BAR_SIZE 0x1000 diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 989fca5e9f..9472a60cab 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -69,7 +69,7 @@ #include "sysemu/block-backend.h" #include "sysemu/dma.h" #include "hw/ide/pci.h" -#include "hw/ide/ahci.h" +#include "hw/ide/ahci_internal.h" #define ICH9_MSI_CAP_OFFSET 0x80 #define ICH9_SATA_CAP_OFFSET 0xA8 diff --git a/include/hw/ide/ahci_public.h b/include/hw/ide/ahci.h similarity index 100% rename from include/hw/ide/ahci_public.h rename to include/hw/ide/ahci.h -- 2.11.4.GIT