usb: use local path for local headers

When pulling in headers that are in the same directory as the C file (as
opposed to one in include/), we should use its relative path, without a
directory.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

diff --git a/hw/usb/desc-msos.c b/hw/usb/desc-msos.c
index 3652919815777d637ed4f716772f9c1ce2d0b819..3a5ad7c8d0f819b80160a680bc4fe68f24533556 100644 (file)
--- 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 85c15addc5fc41256f1c3753ad6b35ad1b286055..8b6eaea4079e24a7488fb4fcc7b8f36a65585381 100644 (file)
--- 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 343345235c9b2f38d0d8dabd956af866999c8b50..ee43e4914d8805a272dfbdcc8211f01f8bbe763b 100644 (file)
--- 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 0bbceaea0bc527956f50effaf11c1cd319c2ca62..eac7365b0aea4acbcffa08ec7d63e9431ab90641 100644 (file)
--- 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 c40019df96f4ea13bba3c066e1296ed37a3a46b0..62d18290dc05aee076bf4a01c42e256a9d2aa5d0 100644 (file)
--- 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 752e30c305a2dc1ac5dabc62c413e8413b3de6c2..5d9743ef93439bf41428092a279319a65503041a 100644 (file)
--- 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 3d59fe494431d85f01852c4d8f15a691d2a4263e..560c61c7c17ec28f87506e003cd11af246dcb752 100644 (file)
--- 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 aea7edcf31ea2d115a511bf6339b7791f664e50a..385e090336788cba0c0dce94e8ea451f49964c30 100644 (file)
--- 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 2829dda391b05f0302af87432a8f0b439600b321..98d1ca3c9136898d869e2f813818e59ff07c2084 100644 (file)
--- 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 f7451923f4bf93da55874fb7db9651b869765b6b..2131e33d27dc5fd18dd4ce59924e10e035db5d55 100644 (file)
--- 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 b56c75a73a0d46590ca2bb0e368932272fa2e36b..f2f632aeb03b0d85f0d04d10b949d4c5491fa4d9 100644 (file)
--- 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 c218b53f0969030a9fd537e21f659282c101c1dd..aaf5a88095109d0d0f92560155bfa2723d541af6 100644 (file)
--- 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 bf70013059759dfcf3c6f3ba2033bfc4a6889df6..ac0bc83b5299ff6df091f9a74e37f991740db095 100644 (file)
--- 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