From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: eblake@redhat.com, peter.maydell@linaro.org,
Gerd Hoffmann <kraxel@redhat.com>,
Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [Qemu-devel] [PATCH v2 14/20] usb: use local path for local headers
Date: Fri, 25 May 2018 19:48:01 +0300 [thread overview]
Message-ID: <1527266793-301361-15-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1527266793-301361-1-git-send-email-mst@redhat.com>
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.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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 3d59fe4..560c61c 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 f745192..2131e33 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
next prev parent reply other threads:[~2018-05-25 16:48 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-25 16:47 [Qemu-devel] [PATCH v2 00/20] include cleanups Michael S. Tsirkin
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 01/20] block: use local path for local headers Michael S. Tsirkin
2018-05-25 18:25 ` Eric Blake
2018-05-25 21:41 ` Philippe Mathieu-Daudé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 02/20] crypto: " Michael S. Tsirkin
2018-05-25 21:40 ` Philippe Mathieu-Daudé
2018-06-01 12:22 ` Daniel P. Berrangé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 03/20] hppa: " Michael S. Tsirkin
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 04/20] migration: drop an unused include Michael S. Tsirkin
2018-05-25 18:27 ` Eric Blake
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 06/20] display: use local path for local headers Michael S. Tsirkin
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 05/20] trace: " Michael S. Tsirkin
2018-05-25 21:29 ` Philippe Mathieu-Daudé
2018-05-25 21:49 ` Michael S. Tsirkin
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 07/20] ide: " Michael S. Tsirkin
2018-05-25 21:39 ` Philippe Mathieu-Daudé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 08/20] ioapic: fix up includes Michael S. Tsirkin
2018-05-25 21:37 ` Philippe Mathieu-Daudé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 09/20] e1000e: use local path for local headers Michael S. Tsirkin
2018-05-25 21:36 ` Philippe Mathieu-Daudé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 10/20] rocker: drop an unused include Michael S. Tsirkin
2018-05-25 21:34 ` Philippe Mathieu-Daudé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 11/20] ppc: use local path for local headers Michael S. Tsirkin
2018-05-25 22:43 ` Philippe Mathieu-Daudé
2018-05-25 16:47 ` [Qemu-devel] [PATCH v2 12/20] vhost-scsi: drop an unused include Michael S. Tsirkin
2018-05-26 4:29 ` Philippe Mathieu-Daudé
2018-05-25 16:48 ` Michael S. Tsirkin [this message]
2018-05-25 21:35 ` [Qemu-devel] [PATCH v2 14/20] usb: use local path for local headers Philippe Mathieu-Daudé
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 13/20] sd: fix up include Michael S. Tsirkin
2018-05-25 21:31 ` Philippe Mathieu-Daudé
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 15/20] migration: use local path for local headers Michael S. Tsirkin
2018-05-25 18:24 ` Eric Blake
2018-05-25 20:56 ` Michael S. Tsirkin
2018-05-25 18:27 ` Juan Quintela
2018-05-25 20:57 ` Michael S. Tsirkin
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 16/20] colo: " Michael S. Tsirkin
2018-05-26 4:31 ` Philippe Mathieu-Daudé
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 17/20] qga: " Michael S. Tsirkin
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 18/20] trace: " Michael S. Tsirkin
2018-05-25 21:32 ` Philippe Mathieu-Daudé
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 19/20] ui: " Michael S. Tsirkin
2018-05-25 16:48 ` [Qemu-devel] [PATCH v2 20/20] arch_init: sort architectures Michael S. Tsirkin
2018-05-28 11:13 ` Laszlo Ersek
2018-05-25 18:32 ` [Qemu-devel] [PATCH v2 00/20] include cleanups Eric Blake
2018-05-25 21:54 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1527266793-301361-15-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=eblake@redhat.com \
--cc=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=samuel.thibault@ens-lyon.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).