[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/20] hw/ide/atapi: Restrict 'scsi/constants.h' inclusion
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/20] hw/ide/atapi: Restrict 'scsi/constants.h' inclusion |
Date: |
Wed, 15 Feb 2023 12:26:58 +0100 |
Only atapi.c requires the SCSI constants. No need to include
it in all files including "hw/ide/internal.h".
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/ide/atapi.c | 1 +
include/hw/ide/internal.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 0a9aa6f009..0c36bd0afd 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -27,6 +27,7 @@
#include "hw/ide/internal.h"
#include "hw/scsi/scsi.h"
#include "sysemu/block-backend.h"
+#include "scsi/constants.h"
#include "trace.h"
#define ATAPI_SECTOR_BITS (2 + BDRV_SECTOR_BITS)
diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index fc0aa81a88..29a8e79817 100644
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -13,7 +13,6 @@
#include "hw/isa/isa.h"
#include "sysemu/dma.h"
#include "hw/block/block.h"
-#include "scsi/constants.h"
/* debug IDE devices */
#define USE_DMA_CDROM
--
2.38.1
- [PATCH 02/20] hw/ide/mmio: Use CamelCase for MMIO_IDE state name, (continued)
- [PATCH 02/20] hw/ide/mmio: Use CamelCase for MMIO_IDE state name, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 03/20] hw/ide/mmio: Extract TYPE_MMIO_IDE declarations to 'hw/ide/mmio.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 04/20] hw/ide/isa: Extract TYPE_ISA_IDE declarations to 'hw/ide/isa.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 05/20] hw/ide/isa: Remove intermediate ISAIDEState::irq variable, Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 06/20] hw/ide/atapi: Restrict 'scsi/constants.h' inclusion,
Philippe Mathieu-Daudé <=
- [PATCH 07/20] hw/ide: Remove unused 'qapi/qapi-types-run-state.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 08/20] hw/ide: Include 'exec/ioport.h' instead of 'hw/isa/isa.h', Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 09/20] hw/ide: Un-inline ide_set_irq(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 10/20] hw/ide: Rename ide_set_irq() -> ide_bus_set_irq(), Philippe Mathieu-Daudé, 2023/02/15
- [PATCH 11/20] hw/ide: Rename ide_create_drive() -> ide_bus_create_drive(), Philippe Mathieu-Daudé, 2023/02/15