[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/67] usb: use local path for local headers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH 15/67] usb: use local path for local headers |
Date: |
Thu, 3 May 2018 22:50:48 +0300 |
When pulling in headers that are in the same directory as C file (as
opposed to one in include/), we should use its relative path, without a
directory. Directory based path works more or less by accident.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/usb/desc-msos.c | 2 +-
hw/usb/desc.c | 2 +-
hw/usb/dev-audio.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
hw/usb/dev-hid.c | 2 +-
hw/usb/dev-hub.c | 2 +-
hw/usb/dev-mtp.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/usb/dev-serial.c | 2 +-
hw/usb/dev-smartcard-reader.c | 2 +-
hw/usb/dev-storage.c | 2 +-
hw/usb/dev-uas.c | 2 +-
hw/usb/dev-wacom.c | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c
index 3652919..3a5ad7c 100644
--- a/hw/usb/desc-msos.c
+++ b/hw/usb/desc-msos.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
/*
* Microsoft OS Descriptors
diff --git a/hw/usb/desc.c b/hw/usb/desc.c
index 85c15ad..8b6eaea 100644
--- a/hw/usb/desc.c
+++ b/hw/usb/desc.c
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "trace.h"
/* ------------------------------------------------------------------ */
diff --git a/hw/usb/dev-audio.c b/hw/usb/dev-audio.c
index 3433452..ee43e49 100644
--- a/hw/usb/dev-audio.c
+++ b/hw/usb/dev-audio.c
@@ -32,7 +32,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "hw/hw.h"
#include "audio/audio.h"
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 0bbceae..eac7365 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "sysemu/bt.h"
#include "hw/bt.h"
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index c40019d..62d1829 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "qapi/error.h"
#include "qemu/timer.h"
#include "hw/input/hid.h"
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 752e30c..5d9743ef 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -26,7 +26,7 @@
#include "qemu-common.h"
#include "trace.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "qemu/error-report.h"
#define NUM_PORTS 8
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 6ecf70a..cda7335 100644
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -24,7 +24,7 @@
#include "qemu/iov.h"
#include "trace.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
/* ----------------------------------------------------------------------- */
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index aea7edc..385e090 100644
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qemu-common.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "net/net.h"
#include "qemu/error-report.h"
#include "qemu/queue.h"
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 2829dda..98d1ca3 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -14,7 +14,7 @@
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "chardev/char-serial.h"
#include "chardev/char-fe.h"
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index e646805..92e3651 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -39,7 +39,7 @@
#include "qemu-common.h"
#include "qemu/error-report.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "ccid.h"
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index b56c75a..f2f632a 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -14,7 +14,7 @@
#include "qemu/option.h"
#include "qemu/config-file.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "hw/scsi/scsi.h"
#include "ui/console.h"
#include "monitor/monitor.h"
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
index c218b53..aaf5a88 100644
--- a/hw/usb/dev-uas.c
+++ b/hw/usb/dev-uas.c
@@ -17,7 +17,7 @@
#include "qemu/error-report.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
#include "hw/scsi/scsi.h"
#include "scsi/constants.h"
diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index bf70013..ac0bc83 100644
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -29,7 +29,7 @@
#include "hw/hw.h"
#include "ui/console.h"
#include "hw/usb.h"
-#include "hw/usb/desc.h"
+#include "desc.h"
/* Interface requests */
#define WACOM_GET_REPORT 0x2101
--
MST
- [Qemu-devel] [PATCH 10/67] e1000e: use local path for local headers, (continued)
- [Qemu-devel] [PATCH 10/67] e1000e: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 08/67] ide: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 11/67] rocker: drop an unused include, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 12/67] ppc: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 13/67] vhost-scsi: drop an unused include, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 14/67] sd: fix up include, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 15/67] usb: use local path for local headers,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 17/67] colo: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 19/67] xtensa: relative include for parent directory, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 18/67] qga: use local path for local headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 23/67] slirp: add include directory headers, Michael S. Tsirkin, 2018/05/03
- [Qemu-devel] [PATCH 20/67] tests: relative include for child directory, Michael S. Tsirkin, 2018/05/03