[Qemu-devel] [PATCH v2 00/20] include cleanups

[Qemu-devel] [PATCH v2 00/20] include cleanups

[Michael S. Tsirkin]

Right now, a local header can be included with either

#include "foo.h"
    or
#include "dir/foo.h"

since the later doesn't tell you where the header is
(in source or include directory), the former is preferable.

I intend to look for ways to prevent the second way from working, but
that will take time. For now, fix all instances for the later way I
could find.

In a couple of places I just dropped the include instead.

Finally, arch_init huge list of includes is sorted, which will be
helpful in future cleanups.

This was part of the include path cleanup patchset
(https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg00739.html).

Changes from v1
    drop patches not dealing with local headers
    stop saying include through root works by accident -
        it's not by accident, just not how we'd like code to look like
    address comments by eric, philip, others

Michael S. Tsirkin (20):
  block: use local path for local headers
  crypto: use local path for local headers
  hppa: use local path for local headers
  migration: drop an unused include
  trace: use local path for local headers
  display: use local path for local headers
  ide: use local path for local headers
  ioapic: fix up includes
  e1000e: use local path for local headers
  rocker: drop an unused include
  ppc: use local path for local headers
  vhost-scsi: drop an unused include
  sd: fix up include
  usb: use local path for local headers
  migration: use local path for local headers
  colo: use local path for local headers
  qga: use local path for local headers
  trace: use local path for local headers
  ui: use local path for local headers
  arch_init: sort architectures

 crypto/block-luks.h             |  2 +-
 crypto/block-qcow.h             |  2 +-
 crypto/ivgen-essiv.h            |  2 +-
 crypto/ivgen-plain.h            |  2 +-
 crypto/ivgen-plain64.h          |  2 +-
 hw/hppa/hppa_sys.h              |  2 +-
 include/migration/vmstate.h     |  2 +-
 trace/control.h                 |  2 +-
 arch_init.c                     | 16 ++++++++--------
 block/crypto.c                  |  2 +-
 block/nbd.c                     |  2 +-
 block/qcow.c                    |  2 +-
 block/qcow2-bitmap.c            |  2 +-
 block/qcow2-cluster.c           |  2 +-
 block/qcow2-refcount.c          |  2 +-
 block/qcow2-snapshot.c          |  2 +-
 block/qcow2.c                   |  4 ++--
 block/vhdx-endian.c             |  2 +-
 block/vhdx-log.c                |  2 +-
 block/vhdx.c                    |  2 +-
 crypto/block-luks.c             |  2 +-
 crypto/block-qcow.c             |  2 +-
 crypto/block.c                  |  6 +++---
 crypto/cipher.c                 |  6 +++---
 crypto/ivgen-essiv.c            |  2 +-
 crypto/ivgen-plain.c            |  2 +-
 crypto/ivgen-plain64.c          |  2 +-
 crypto/ivgen.c                  |  8 ++++----
 crypto/tlscreds.c               |  2 +-
 crypto/tlscredsanon.c           |  2 +-
 crypto/tlscredsx509.c           |  2 +-
 hw/display/bcm2835_fb.c         |  2 +-
 hw/hppa/machine.c               |  2 +-
 hw/ide/ahci-allwinner.c         |  2 +-
 hw/ide/ahci.c                   |  2 +-
 hw/ide/ich.c                    |  2 +-
 hw/intc/ioapic.c                |  3 +--
 hw/net/e1000e.c                 |  2 +-
 hw/net/rocker/rocker_fp.c       |  1 -
 hw/ppc/ppc440_uc.c              |  2 +-
 hw/ppc/sam460ex.c               |  4 ++--
 hw/scsi/vhost-scsi-common.c     |  1 -
 hw/sd/milkymist-memcard.c       |  2 +-
 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 +-
 migration/block-dirty-bitmap.c  |  2 +-
 migration/page_cache.c          |  2 +-
 migration/ram.c                 |  4 ++--
 migration/savevm.c              |  1 +
 migration/vmstate.c             |  2 +-
 net/colo-compare.c              |  2 +-
 net/colo.c                      |  2 +-
 net/filter-rewriter.c           |  2 +-
 qga/channel-posix.c             |  2 +-
 qga/channel-win32.c             |  4 ++--
 qga/commands-posix.c            |  2 +-
 qga/commands-win32.c            |  4 ++--
 qga/commands.c                  |  2 +-
 qga/guest-agent-command-state.c |  2 +-
 qga/main.c                      |  4 ++--
 qga/vss-win32.c                 |  6 +++---
 trace/qmp.c                     |  2 +-
 ui/gtk.c                        |  2 +-
 ui/input-keymap.c               |  2 +-
 ui/input-legacy.c               |  2 +-
 ui/spice-input.c                |  2 +-
 77 files changed, 97 insertions(+), 99 deletions(-)

-- 
MST

[Qemu-devel] [PATCH v2 01/20] block: use local path for local headers

[Michael S. Tsirkin]

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>
---
 block/crypto.c         | 2 +-
 block/nbd.c            | 2 +-
 block/qcow.c           | 2 +-
 block/qcow2-bitmap.c   | 2 +-
 block/qcow2-cluster.c  | 2 +-
 block/qcow2-refcount.c | 2 +-
 block/qcow2-snapshot.c | 2 +-
 block/qcow2.c          | 4 ++--
 block/vhdx-endian.c    | 2 +-
 block/vhdx-log.c       | 2 +-
 block/vhdx.c           | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/block/crypto.c b/block/crypto.c
index 7e7ad2d..bc322b5 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -29,7 +29,7 @@
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/error.h"
 #include "qemu/option.h"
-#include "block/crypto.h"
+#include "crypto.h"
 
 typedef struct BlockCrypto BlockCrypto;
 
diff --git a/block/nbd.c b/block/nbd.c
index 3e1693c..ff8333e 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -27,7 +27,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "block/nbd-client.h"
+#include "nbd-client.h"
 #include "qapi/error.h"
 #include "qemu/uri.h"
 #include "block/block_int.h"
diff --git a/block/qcow.c b/block/qcow.c
index 3ba2ca2..1f866af 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -37,7 +37,7 @@
 #include "qapi/qapi-visit-block-core.h"
 #include "crypto/block.h"
 #include "migration/blocker.h"
-#include "block/crypto.h"
+#include "crypto.h"
 
 /**************************************************************/
 /* QEMU COW block driver with compression and encryption support */
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 6e93ec4..60d5290 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -30,7 +30,7 @@
 #include "qemu/cutils.h"
 
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 
 /* NOTICE: BME here means Bitmaps Extension and used as a namespace for
  * _internal_ constants. Please do not use this _internal_ abbreviation for
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 1aee726..0d74584 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -28,7 +28,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/bswap.h"
 #include "trace.h"
 
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 2dc2300..4032362 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/range.h"
 #include "qemu/bswap.h"
 #include "qemu/cutils.h"
diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 74293be..bb6a5b7 100644
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/bswap.h"
 #include "qemu/error-report.h"
 #include "qemu/cutils.h"
diff --git a/block/qcow2.c b/block/qcow2.c
index 6d53247..db13109 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -27,7 +27,7 @@
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include <zlib.h>
-#include "block/qcow2.h"
+#include "qcow2.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-block-core.h"
@@ -39,7 +39,7 @@
 #include "qemu/bswap.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/qapi-visit-block-core.h"
-#include "block/crypto.h"
+#include "crypto.h"
 
 /*
   Differences with QCOW:
diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
index 429d755..41fbdd2 100644
--- a/block/vhdx-endian.c
+++ b/block/vhdx-endian.c
@@ -19,7 +19,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/bswap.h"
-#include "block/vhdx.h"
+#include "vhdx.h"
 
 /*
  * All the VHDX formats on disk are little endian - the following
diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 0ac4863..d2f1b98 100644
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -24,7 +24,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/bswap.h"
-#include "block/vhdx.h"
+#include "vhdx.h"
 
 
 typedef struct VHDXLogSequence {
diff --git a/block/vhdx.c b/block/vhdx.c
index 0b1e21c..79c68a2 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -23,7 +23,7 @@
 #include "qemu/option.h"
 #include "qemu/crc32c.h"
 #include "qemu/bswap.h"
-#include "block/vhdx.h"
+#include "vhdx.h"
 #include "migration/blocker.h"
 #include "qemu/uuid.h"
 #include "qapi/qmp/qdict.h"
-- 
MST

[Qemu-devel] [PATCH v2 02/20] crypto: use local path for local headers

[Michael S. Tsirkin]

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>
---
 crypto/block-luks.h    | 2 +-
 crypto/block-qcow.h    | 2 +-
 crypto/ivgen-essiv.h   | 2 +-
 crypto/ivgen-plain.h   | 2 +-
 crypto/ivgen-plain64.h | 2 +-
 crypto/block-luks.c    | 2 +-
 crypto/block-qcow.c    | 2 +-
 crypto/block.c         | 6 +++---
 crypto/cipher.c        | 6 +++---
 crypto/ivgen-essiv.c   | 2 +-
 crypto/ivgen-plain.c   | 2 +-
 crypto/ivgen-plain64.c | 2 +-
 crypto/ivgen.c         | 8 ++++----
 crypto/tlscreds.c      | 2 +-
 crypto/tlscredsanon.c  | 2 +-
 crypto/tlscredsx509.c  | 2 +-
 16 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/crypto/block-luks.h b/crypto/block-luks.h
index b2d8a35..befd8b2 100644
--- a/crypto/block-luks.h
+++ b/crypto/block-luks.h
@@ -21,7 +21,7 @@
 #ifndef QCRYPTO_BLOCK_LUKS_H
 #define QCRYPTO_BLOCK_LUKS_H
 
-#include "crypto/blockpriv.h"
+#include "blockpriv.h"
 
 extern const QCryptoBlockDriver qcrypto_block_driver_luks;
 
diff --git a/crypto/block-qcow.h b/crypto/block-qcow.h
index 3e2c0a8..6988fb2 100644
--- a/crypto/block-qcow.h
+++ b/crypto/block-qcow.h
@@ -21,7 +21,7 @@
 #ifndef QCRYPTO_BLOCK_QCOW_H
 #define QCRYPTO_BLOCK_QCOW_H
 
-#include "crypto/blockpriv.h"
+#include "blockpriv.h"
 
 extern const QCryptoBlockDriver qcrypto_block_driver_qcow;
 
diff --git a/crypto/ivgen-essiv.h b/crypto/ivgen-essiv.h
index 4a00af8..f34dbab 100644
--- a/crypto/ivgen-essiv.h
+++ b/crypto/ivgen-essiv.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include "crypto/ivgenpriv.h"
+#include "ivgenpriv.h"
 
 #ifndef QCRYPTO_IVGEN_ESSIV_H__
 #define QCRYPTO_IVGEN_ESSIV_H__
diff --git a/crypto/ivgen-plain.h b/crypto/ivgen-plain.h
index 0fe8835..16e1ae5 100644
--- a/crypto/ivgen-plain.h
+++ b/crypto/ivgen-plain.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include "crypto/ivgenpriv.h"
+#include "ivgenpriv.h"
 
 #ifndef QCRYPTO_IVGEN_PLAIN_H__
 #define QCRYPTO_IVGEN_PLAIN_H__
diff --git a/crypto/ivgen-plain64.h b/crypto/ivgen-plain64.h
index c410445..f8611bd 100644
--- a/crypto/ivgen-plain64.h
+++ b/crypto/ivgen-plain64.h
@@ -18,7 +18,7 @@
  *
  */
 
-#include "crypto/ivgenpriv.h"
+#include "ivgenpriv.h"
 
 #ifndef QCRYPTO_IVGEN_PLAIN64_H__
 #define QCRYPTO_IVGEN_PLAIN64_H__
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index d418ac3..5738124 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "qemu/bswap.h"
 
-#include "crypto/block-luks.h"
+#include "block-luks.h"
 
 #include "crypto/hash.h"
 #include "crypto/afsplit.h"
diff --git a/crypto/block-qcow.c b/crypto/block-qcow.c
index 8817d6a..4284e05 100644
--- a/crypto/block-qcow.c
+++ b/crypto/block-qcow.c
@@ -27,7 +27,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 
-#include "crypto/block-qcow.h"
+#include "block-qcow.h"
 #include "crypto/secret.h"
 
 #define QCRYPTO_BLOCK_QCOW_SECTOR_SIZE 512
diff --git a/crypto/block.c b/crypto/block.c
index f206d5e..e59d114 100644
--- a/crypto/block.c
+++ b/crypto/block.c
@@ -20,9 +20,9 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "crypto/blockpriv.h"
-#include "crypto/block-qcow.h"
-#include "crypto/block-luks.h"
+#include "blockpriv.h"
+#include "block-qcow.h"
+#include "block-luks.h"
 
 static const QCryptoBlockDriver *qcrypto_block_drivers[] = {
     [Q_CRYPTO_BLOCK_FORMAT_QCOW] = &qcrypto_block_driver_qcow,
diff --git a/crypto/cipher.c b/crypto/cipher.c
index bcbfb3d..b3af579 100644
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -150,11 +150,11 @@ qcrypto_cipher_munge_des_rfb_key(const uint8_t *key,
 #endif /* CONFIG_GCRYPT || CONFIG_NETTLE */
 
 #ifdef CONFIG_GCRYPT
-#include "crypto/cipher-gcrypt.c"
+#include "cipher-gcrypt.c"
 #elif defined CONFIG_NETTLE
-#include "crypto/cipher-nettle.c"
+#include "cipher-nettle.c"
 #else
-#include "crypto/cipher-builtin.c"
+#include "cipher-builtin.c"
 #endif
 
 QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c
index aeaa8fc..43e258c 100644
--- a/crypto/ivgen-essiv.c
+++ b/crypto/ivgen-essiv.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
-#include "crypto/ivgen-essiv.h"
+#include "ivgen-essiv.h"
 
 typedef struct QCryptoIVGenESSIV QCryptoIVGenESSIV;
 struct QCryptoIVGenESSIV {
diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c
index bf2fb7a..06f4145 100644
--- a/crypto/ivgen-plain.c
+++ b/crypto/ivgen-plain.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
-#include "crypto/ivgen-plain.h"
+#include "ivgen-plain.h"
 
 static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,
                                     const uint8_t *key, size_t nkey,
diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c
index e4679a1..fbb7724 100644
--- a/crypto/ivgen-plain64.c
+++ b/crypto/ivgen-plain64.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/bswap.h"
-#include "crypto/ivgen-plain.h"
+#include "ivgen-plain.h"
 
 static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,
                                     const uint8_t *key, size_t nkey,
diff --git a/crypto/ivgen.c b/crypto/ivgen.c
index f664351..6a2b3ad 100644
--- a/crypto/ivgen.c
+++ b/crypto/ivgen.c
@@ -21,10 +21,10 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 
-#include "crypto/ivgenpriv.h"
-#include "crypto/ivgen-plain.h"
-#include "crypto/ivgen-plain64.h"
-#include "crypto/ivgen-essiv.h"
+#include "ivgenpriv.h"
+#include "ivgen-plain.h"
+#include "ivgen-plain64.h"
+#include "ivgen-essiv.h"
 
 
 QCryptoIVGen *qcrypto_ivgen_new(QCryptoIVGenAlgorithm alg,
diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index 3cd4103..02255a6 100644
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "crypto/tlscredspriv.h"
+#include "tlscredspriv.h"
 #include "trace.h"
 
 #define DH_BITS 2048
diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index 1464220..7ad66d1 100644
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "crypto/tlscredsanon.h"
-#include "crypto/tlscredspriv.h"
+#include "tlscredspriv.h"
 #include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "trace.h"
diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index 50eb54f..98ee042 100644
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -20,7 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "crypto/tlscredsx509.h"
-#include "crypto/tlscredspriv.h"
+#include "tlscredspriv.h"
 #include "crypto/secret.h"
 #include "qapi/error.h"
 #include "qom/object_interfaces.h"
-- 
MST

[Qemu-devel] [PATCH v2 03/20] hppa: use local path for local headers

[Michael S. Tsirkin]

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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/hppa/hppa_sys.h | 2 +-
 hw/hppa/machine.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/hppa/hppa_sys.h b/hw/hppa/hppa_sys.h
index a182d1f..f98cc8d 100644
--- a/hw/hppa/hppa_sys.h
+++ b/hw/hppa/hppa_sys.h
@@ -10,7 +10,7 @@
 #include "hw/i386/pc.h"
 #include "hw/irq.h"
 
-#include "hw/hppa/hppa_hardware.h"
+#include "hppa_hardware.h"
 
 PCIBus *dino_init(MemoryRegion *, qemu_irq *, qemu_irq *);
 
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index a1d6b0e..aba269b 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -16,7 +16,7 @@
 #include "hw/ide.h"
 #include "hw/timer/i8254.h"
 #include "hw/char/serial.h"
-#include "hw/hppa/hppa_sys.h"
+#include "hppa_sys.h"
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
-- 
MST

[Qemu-devel] [PATCH v2 04/20] migration: drop an unused include

[Michael S. Tsirkin]

we just need a struct name, let's add a forward
declaration instead of an include.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/migration/vmstate.h | 2 +-
 migration/savevm.c          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index df463fd..5877cae 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -27,7 +27,7 @@
 #ifndef QEMU_VMSTATE_H
 #define QEMU_VMSTATE_H
 
-#include "migration/qjson.h"
+typedef struct QJSON QJSON;
 
 typedef struct VMStateInfo VMStateInfo;
 typedef struct VMStateDescription VMStateDescription;
diff --git a/migration/savevm.c b/migration/savevm.c
index 4251125..da724c5 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -55,6 +55,7 @@
 #include "io/channel-buffer.h"
 #include "io/channel-file.h"
 #include "sysemu/replay.h"
+#include "qjson.h"
 
 #ifndef ETH_P_RARP
 #define ETH_P_RARP 0x8035
-- 
MST

[Qemu-devel] [PATCH v2 05/20] trace: use local path for local headers

[Michael S. Tsirkin]

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>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 trace/control.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trace/control.h b/trace/control.h
index 1903e22..eb65c8e 100644
--- a/trace/control.h
+++ b/trace/control.h
@@ -267,6 +267,6 @@ char *trace_opt_parse(const char *optarg);
 uint32_t trace_get_vcpu_event_count(void);
 
 
-#include "trace/control-internal.h"
+#include "control-internal.h"
 
 #endif /* TRACE__CONTROL_H */
-- 
MST

[Qemu-devel] [PATCH v2 06/20] display: use local path for local headers

[Michael S. Tsirkin]

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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/display/bcm2835_fb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 7eab927..3355f4c 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/display/bcm2835_fb.h"
-#include "hw/display/framebuffer.h"
+#include "framebuffer.h"
 #include "ui/pixel_ops.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "qemu/log.h"
-- 
MST

[Qemu-devel] [PATCH v2 07/20] ide: use local path for local headers

[Michael S. Tsirkin]

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/ide/ahci-allwinner.c | 2 +-
 hw/ide/ahci.c           | 2 +-
 hw/ide/ich.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
index 2fd9507..f98e6cb 100644
--- a/hw/ide/ahci-allwinner.c
+++ b/hw/ide/ahci-allwinner.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"
-#include "hw/ide/ahci_internal.h"
+#include "ahci_internal.h"
 
 #include "trace.h"
 
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index e22d7be..24dbad5 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -31,7 +31,7 @@
 #include "sysemu/dma.h"
 #include "hw/ide/internal.h"
 #include "hw/ide/pci.h"
-#include "hw/ide/ahci_internal.h"
+#include "ahci_internal.h"
 
 #include "trace.h"
 
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index 134478e..51c935a 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -67,7 +67,7 @@
 #include "hw/isa/isa.h"
 #include "sysemu/dma.h"
 #include "hw/ide/pci.h"
-#include "hw/ide/ahci_internal.h"
+#include "ahci_internal.h"
 
 #define ICH9_MSI_CAP_OFFSET     0x80
 #define ICH9_SATA_CAP_OFFSET    0xA8
-- 
MST

[Qemu-devel] [PATCH v2 08/20] ioapic: fix up includes

[Michael S. Tsirkin]

include files shouldn't have the "include/" part,
that is implied.

Also, drop an unused include.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/intc/ioapic.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 36139a4..c45f073 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -28,9 +28,8 @@
 #include "hw/i386/apic.h"
 #include "hw/i386/ioapic.h"
 #include "hw/i386/ioapic_internal.h"
-#include "include/hw/pci/msi.h"
+#include "hw/pci/msi.h"
 #include "sysemu/kvm.h"
-#include "target/i386/cpu.h"
 #include "hw/i386/apic-msidef.h"
 #include "hw/i386/x86-iommu.h"
 #include "trace.h"
-- 
MST

[Qemu-devel] [PATCH v2 09/20] e1000e: use local path for local headers

[Michael S. Tsirkin]

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/net/e1000e.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 16a9417..cda8d48 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -41,7 +41,7 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 
-#include "hw/net/e1000_regs.h"
+#include "e1000_regs.h"
 
 #include "e1000x_common.h"
 #include "e1000e_core.h"
-- 
MST

[Qemu-devel] [PATCH v2 10/20] rocker: drop an unused include

[Michael S. Tsirkin]

We don't use net/clients.h, drop that include.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/net/rocker/rocker_fp.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c
index 27b17c8..4aa7da7 100644
--- a/hw/net/rocker/rocker_fp.c
+++ b/hw/net/rocker/rocker_fp.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "net/clients.h"
 #include "qapi/qapi-types-rocker.h"
 #include "rocker.h"
 #include "rocker_hw.h"
-- 
MST

[Qemu-devel] [PATCH v2 11/20] ppc: use local path for local headers

[Michael S. Tsirkin]

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>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/ppc440_uc.c | 2 +-
 hw/ppc/sam460ex.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index e312fdb..123f4ac 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -20,7 +20,7 @@
 #include "hw/ppc/ppc.h"
 #include "hw/pci/pci.h"
 #include "sysemu/block-backend.h"
-#include "hw/ppc/ppc440.h"
+#include "ppc440.h"
 
 /*****************************************************************************/
 /* L2 Cache as SRAM */
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index a48e6e6..cb2ab1d 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -27,8 +27,8 @@
 #include "elf.h"
 #include "exec/address-spaces.h"
 #include "exec/memory.h"
-#include "hw/ppc/ppc440.h"
-#include "hw/ppc/ppc405.h"
+#include "ppc440.h"
+#include "ppc405.h"
 #include "hw/block/flash.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"
-- 
MST

[Qemu-devel] [PATCH v2 12/20] vhost-scsi: drop an unused include

[Michael S. Tsirkin]

No reason for vhost-scsi to pull in migration headers directly.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/scsi/vhost-scsi-common.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
index 77e9897..e2a5828 100644
--- a/hw/scsi/vhost-scsi-common.c
+++ b/hw/scsi/vhost-scsi-common.c
@@ -17,7 +17,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "migration/migration.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-scsi-common.h"
 #include "hw/virtio/virtio-scsi.h"
-- 
MST

[Qemu-devel] [PATCH v2 13/20] sd: fix up include

[Michael S. Tsirkin]

include files shouldn't have the "include/" part,
that is implied.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/sd/milkymist-memcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
index 5570c1e..fe1cccc 100644
--- a/hw/sd/milkymist-memcard.c
+++ b/hw/sd/milkymist-memcard.c
@@ -27,7 +27,7 @@
 #include "hw/sysbus.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
-#include "include/qapi/error.h"
+#include "qapi/error.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/sd/sd.h"
-- 
MST

[Qemu-devel] [PATCH v2 14/20] usb: use local path for local headers

[Michael S. Tsirkin]

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

[Qemu-devel] [PATCH v2 15/20] migration: use local path for local headers

[Michael S. Tsirkin]

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 <mst@redhat.com>
---
 migration/block-dirty-bitmap.c | 2 +-
 migration/page_cache.c         | 2 +-
 migration/ram.c                | 4 ++--
 migration/vmstate.c            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index 8819aab..eeccaff 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -66,7 +66,7 @@
 #include "qemu/error-report.h"
 #include "migration/misc.h"
 #include "migration/migration.h"
-#include "migration/qemu-file.h"
+#include "qemu-file.h"
 #include "migration/vmstate.h"
 #include "migration/register.h"
 #include "qemu/hbitmap.h"
diff --git a/migration/page_cache.c b/migration/page_cache.c
index 96268c3..acc252b 100644
--- a/migration/page_cache.c
+++ b/migration/page_cache.c
@@ -18,7 +18,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/host-utils.h"
-#include "migration/page_cache.h"
+#include "page_cache.h"
 
 #ifdef DEBUG_CACHE
 #define DPRINTF(fmt, ...) \
diff --git a/migration/ram.c b/migration/ram.c
index 5bcbf7a..e7d6cf6 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -41,7 +41,7 @@
 #include "migration/misc.h"
 #include "qemu-file.h"
 #include "postcopy-ram.h"
-#include "migration/page_cache.h"
+#include "page_cache.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-migration.h"
@@ -51,7 +51,7 @@
 #include "exec/target_page.h"
 #include "qemu/rcu_queue.h"
 #include "migration/colo.h"
-#include "migration/block.h"
+#include "block.h"
 #include "sysemu/sysemu.h"
 #include "qemu/uuid.h"
 #include "savevm.h"
diff --git a/migration/vmstate.c b/migration/vmstate.c
index 0b3282c..0a09636 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -14,7 +14,7 @@
 #include "qemu-common.h"
 #include "migration.h"
 #include "migration/vmstate.h"
-#include "migration/savevm.h"
+#include "savevm.h"
 #include "qemu-file.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"
-- 
MST

[Qemu-devel] [PATCH v2 16/20] colo: use local path for local headers

[Michael S. Tsirkin]

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.

Reviewed-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 net/colo-compare.c    | 2 +-
 net/colo.c            | 2 +-
 net/filter-rewriter.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 23b2d2c..c3a2be4 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -25,7 +25,7 @@
 #include "net/queue.h"
 #include "chardev/char-fe.h"
 #include "qemu/sockets.h"
-#include "net/colo.h"
+#include "colo.h"
 #include "sysemu/iothread.h"
 
 #define TYPE_COLO_COMPARE "colo-compare"
diff --git a/net/colo.c b/net/colo.c
index 8426265..6dda4ed 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -14,7 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "trace.h"
-#include "net/colo.h"
+#include "colo.h"
 
 uint32_t connection_key_hash(const void *opaque)
 {
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 62dad2d..f584e4e 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "trace.h"
-#include "net/colo.h"
+#include "colo.h"
 #include "net/filter.h"
 #include "net/net.h"
 #include "qemu-common.h"
-- 
MST

[Qemu-devel] [PATCH v2 17/20] qga: use local path for local headers

[Michael S. Tsirkin]

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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 qga/channel-posix.c             | 2 +-
 qga/channel-win32.c             | 4 ++--
 qga/commands-posix.c            | 2 +-
 qga/commands-win32.c            | 4 ++--
 qga/commands.c                  | 2 +-
 qga/guest-agent-command-state.c | 2 +-
 qga/main.c                      | 4 ++--
 qga/vss-win32.c                 | 6 +++---
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index b812bf4..5a925a9 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -2,7 +2,7 @@
 #include <termios.h>
 #include "qapi/error.h"
 #include "qemu/sockets.h"
-#include "qga/channel.h"
+#include "channel.h"
 
 #ifdef CONFIG_SOLARIS
 #include <stropts.h>
diff --git a/qga/channel-win32.c b/qga/channel-win32.c
index 7e6dc4d..b3597a8 100644
--- a/qga/channel-win32.c
+++ b/qga/channel-win32.c
@@ -1,8 +1,8 @@
 #include "qemu/osdep.h"
 #include <windows.h>
 #include <io.h>
-#include "qga/guest-agent-core.h"
-#include "qga/channel.h"
+#include "guest-agent-core.h"
+#include "channel.h"
 
 typedef struct GAChannelReadState {
     guint thread_id;
diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index 0dc219d..eae8171 100644
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -16,7 +16,7 @@
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <dirent.h>
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index 2d48394..70ee537 100644
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -32,8 +32,8 @@
 #include <wtsapi32.h>
 #include <wininet.h>
 
-#include "qga/guest-agent-core.h"
-#include "qga/vss-win32.h"
+#include "guest-agent-core.h"
+#include "vss-win32.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
diff --git a/qga/commands.c b/qga/commands.c
index a64b34c..cce3010 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qga-qapi-commands.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
diff --git a/qga/guest-agent-command-state.c b/qga/guest-agent-command-state.c
index e609d32..18bcb59 100644
--- a/qga/guest-agent-command-state.c
+++ b/qga/guest-agent-command-state.c
@@ -10,7 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 
 struct GACommandState {
     GSList *groups;
diff --git a/qga/main.c b/qga/main.c
index 1e1cec7..ea7540e 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -23,12 +23,12 @@
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qstring.h"
-#include "qga/guest-agent-core.h"
+#include "guest-agent-core.h"
 #include "qemu/module.h"
 #include "qga-qapi-commands.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/error.h"
-#include "qga/channel.h"
+#include "channel.h"
 #include "qemu/bswap.h"
 #include "qemu/help_option.h"
 #include "qemu/sockets.h"
diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index 0199c2a..a541f3a 100644
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -14,9 +14,9 @@
 #include <windows.h>
 #include "qapi/error.h"
 #include "qemu/error-report.h"
-#include "qga/guest-agent-core.h"
-#include "qga/vss-win32.h"
-#include "qga/vss-win32/requester.h"
+#include "guest-agent-core.h"
+#include "vss-win32.h"
+#include "vss-win32/requester.h"
 
 #define QGA_VSS_DLL "qga-vss.dll"
 
-- 
MST

[Qemu-devel] [PATCH v2 18/20] trace: use local path for local headers

[Michael S. Tsirkin]

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>
---
 trace/qmp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trace/qmp.c b/trace/qmp.c
index 756086c..ea99b00 100644
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -10,7 +10,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-trace.h"
-#include "trace/control.h"
+#include "control.h"
 
 
 static CPUState *get_cpu(bool has_vcpu, int vcpu, Error **errp)
-- 
MST

[Qemu-devel] [PATCH v2 19/20] ui: use local path for local headers

[Michael S. Tsirkin]

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>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 ui/gtk.c          | 2 +-
 ui/input-keymap.c | 2 +-
 ui/input-legacy.c | 2 +-
 ui/spice-input.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index dbce970..903f136 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -66,7 +66,7 @@
 #define VC_SCALE_STEP   0.25
 
 #ifdef GDK_WINDOWING_X11
-#include "ui/x_keymap.h"
+#include "x_keymap.h"
 
 /* Gtk2 compat */
 #ifndef GDK_IS_X11_DISPLAY
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 3d4e66b..87cc301 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -1,6 +1,6 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
 #include "ui/input.h"
 
 #include "standard-headers/linux/input.h"
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index e5d4db1..549654e 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -26,7 +26,7 @@
 #include "qapi/qapi-commands-ui.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
 #include "ui/input.h"
 
 struct QEMUPutMouseEntry {
diff --git a/ui/spice-input.c b/ui/spice-input.c
index 3d41aa1..a426c03 100644
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -23,7 +23,7 @@
 #include "qemu-common.h"
 #include "ui/qemu-spice.h"
 #include "ui/console.h"
-#include "ui/keymaps.h"
+#include "keymaps.h"
 #include "ui/input.h"
 
 /* keyboard bits */
-- 
MST

[Qemu-devel] [PATCH v2 20/20] arch_init: sort architectures

[Michael S. Tsirkin]

Sort alphabetically. Will help us see if anything is missing (e.g. tile
is not there now).

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 arch_init.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 9597218..f4f3f61 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -52,14 +52,14 @@ int graphic_depth = 32;
 #define QEMU_ARCH QEMU_ARCH_ARM
 #elif defined(TARGET_CRIS)
 #define QEMU_ARCH QEMU_ARCH_CRIS
-#elif defined(TARGET_I386)
-#define QEMU_ARCH QEMU_ARCH_I386
 #elif defined(TARGET_HPPA)
 #define QEMU_ARCH QEMU_ARCH_HPPA
-#elif defined(TARGET_M68K)
-#define QEMU_ARCH QEMU_ARCH_M68K
+#elif defined(TARGET_I386)
+#define QEMU_ARCH QEMU_ARCH_I386
 #elif defined(TARGET_LM32)
 #define QEMU_ARCH QEMU_ARCH_LM32
+#elif defined(TARGET_M68K)
+#define QEMU_ARCH QEMU_ARCH_M68K
 #elif defined(TARGET_MICROBLAZE)
 #define QEMU_ARCH QEMU_ARCH_MICROBLAZE
 #elif defined(TARGET_MIPS)
@@ -80,12 +80,12 @@ int graphic_depth = 32;
 #define QEMU_ARCH QEMU_ARCH_SH4
 #elif defined(TARGET_SPARC)
 #define QEMU_ARCH QEMU_ARCH_SPARC
-#elif defined(TARGET_XTENSA)
-#define QEMU_ARCH QEMU_ARCH_XTENSA
-#elif defined(TARGET_UNICORE32)
-#define QEMU_ARCH QEMU_ARCH_UNICORE32
 #elif defined(TARGET_TRICORE)
 #define QEMU_ARCH QEMU_ARCH_TRICORE
+#elif defined(TARGET_UNICORE32)
+#define QEMU_ARCH QEMU_ARCH_UNICORE32
+#elif defined(TARGET_XTENSA)
+#define QEMU_ARCH QEMU_ARCH_XTENSA
 #endif
 
 const uint32_t arch_type = QEMU_ARCH;
-- 
MST

Re: [Qemu-devel] [PATCH v2 15/20] migration: use local path for local headers

[Eric Blake]

On 05/25/2018 11:48 AM, Michael S. Tsirkin wrote:
> When pulling in headers that are in the same directory as C file (as

s/as C/as the C/ (here and in many other messages)

> opposed to one in include/), we should use its relative path, without a
> directory. Directory based path works more or less by accident.

Missed trimming this out of your commit message.

Or, if you want, on many of these commits, you could be more explicit 
about intention:

When pulling in headers that are in the same directory as the C file (as 
opposed to one in include/), we prefer to use its relative path without 
a directory, rather than relying on the global -I$(SRC_DIR) that may be 
removed in a later patch.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v2 01/20] block: use local path for local headers

[Eric Blake]

On 05/25/2018 11:47 AM, Michael S. Tsirkin wrote:
> When pulling in headers that are in the same directory as C file (as

s/as C/as the C/

> opposed to one in include/), we should use its relative path, without a
> directory.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>   block/crypto.c         | 2 +-
>   block/nbd.c            | 2 +-
>   block/qcow.c           | 2 +-
>   block/qcow2-bitmap.c   | 2 +-
>   block/qcow2-cluster.c  | 2 +-
>   block/qcow2-refcount.c | 2 +-
>   block/qcow2-snapshot.c | 2 +-
>   block/qcow2.c          | 4 ++--
>   block/vhdx-endian.c    | 2 +-
>   block/vhdx-log.c       | 2 +-
>   block/vhdx.c           | 2 +-
>   11 files changed, 12 insertions(+), 12 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v2 15/20] migration: use local path for local headers

[Juan Quintela]

"Michael S. Tsirkin" <mst@redhat.com> wrote:
> 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.

I don't agree with the comment that they work by accident, it is
"by-design".  But if you want to change the design, I agree with
removing "$ROOT" from the default include path.

>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Reviewed-by: Juan Quintela <quintela@redhat.com>

Later, Juan.

Re: [Qemu-devel] [PATCH v2 04/20] migration: drop an unused include

[Eric Blake]

On 05/25/2018 11:47 AM, Michael S. Tsirkin wrote:
> we just need a struct name, let's add a forward
> declaration instead of an include.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>   include/migration/vmstate.h | 2 +-
>   migration/savevm.c          | 1 +
>   2 files changed, 2 insertions(+), 1 deletion(-)

I'm okay with the patch as-is, but the commit message could possibly be 
improved:

In the vmstate.h file, we just need a struct name. Use a forward 
declaration instead of an include, then adjust the one affected .c file 
to include the file that is no longer implicit from the header.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v2 00/20] include cleanups

[Eric Blake]

On 05/25/2018 11:47 AM, Michael S. Tsirkin wrote:
> Right now, a local header can be included with either
> 
> #include "foo.h"
>      or
> #include "dir/foo.h"
> 
> since the later doesn't tell you where the header is
> (in source or include directory), the former is preferable.
> 
> I intend to look for ways to prevent the second way from working, but
> that will take time. For now, fix all instances for the later way I
> could find.
> 
> In a couple of places I just dropped the include instead.
> 
> Finally, arch_init huge list of includes is sorted, which will be
> helpful in future cleanups.
> 
> This was part of the include path cleanup patchset
> (https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg00739.html).
> 
> Changes from v1
>      drop patches not dealing with local headers
>      stop saying include through root works by accident -
>          it's not by accident, just not how we'd like code to look like

You mostly did that, but I still think some of the commit messages can 
be improved. See 15/20.

>      address comments by eric, philip, others

At any rate, I think we are getting closer; and splitting this into a 
less-controversial part compared to the rest of v1 makes it more likely 
that this half can go in soon.  Many of the patches are independent, but 
it's still probably easier if this goes in through one tree (Paolo's 
misc tree, perhaps?), once you've collected reviews.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v2 15/20] migration: use local path for local headers

[Michael S. Tsirkin]

On Fri, May 25, 2018 at 01:24:08PM -0500, Eric Blake wrote:
> On 05/25/2018 11:48 AM, Michael S. Tsirkin wrote:
> > When pulling in headers that are in the same directory as C file (as
> 
> s/as C/as the C/ (here and in many other messages)

Will fix, thanks.

> > opposed to one in include/), we should use its relative path, without a
> > directory. Directory based path works more or less by accident.
> 
> Missed trimming this out of your commit message.

Will fix, thanks.

> Or, if you want, on many of these commits, you could be more explicit about
> intention:
> 
> When pulling in headers that are in the same directory as the C file (as
> opposed to one in include/), we prefer to use its relative path without a
> directory, rather than relying on the global -I$(SRC_DIR) that may be
> removed in a later patch.

I'm no longer sure we'll be able to.

> -- 
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3266
> Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v2 15/20] migration: use local path for local headers

[Michael S. Tsirkin]

On Fri, May 25, 2018 at 08:27:03PM +0200, Juan Quintela wrote:
> "Michael S. Tsirkin" <mst@redhat.com> wrote:
> > 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.
> 
> I don't agree with the comment that they work by accident,

Oh I removed this from most commit messages but somehow this one managed
to sneek in.  I agree, will drop this sentence.

> it is
> "by-design".  But if you want to change the design, I agree with
> removing "$ROOT" from the default include path.
> 
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> Reviewed-by: Juan Quintela <quintela@redhat.com>
> 
> Later, Juan.

Thanks!

Re: [Qemu-devel] [PATCH v2 05/20] trace: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> 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>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

This reminds me of this project:

https://github.com/noidontdig/gitdown

    gitdown is a script which moderates your git
    committing activity based on your blood alcohol
    content (BAC).

:P

> ---
>  trace/control.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/trace/control.h b/trace/control.h
> index 1903e22..eb65c8e 100644
> --- a/trace/control.h
> +++ b/trace/control.h
> @@ -267,6 +267,6 @@ char *trace_opt_parse(const char *optarg);
>  uint32_t trace_get_vcpu_event_count(void);
>  
>  
> -#include "trace/control-internal.h"
> +#include "control-internal.h"
>  
>  #endif /* TRACE__CONTROL_H */
> 

Re: [Qemu-devel] [PATCH v2 13/20] sd: fix up include

[Philippe Mathieu-Daudé]

On 05/25/2018 01:48 PM, Michael S. Tsirkin wrote:
> include files shouldn't have the "include/" part,
> that is implied.
> 
> 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>

> ---
>  hw/sd/milkymist-memcard.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c
> index 5570c1e..fe1cccc 100644
> --- a/hw/sd/milkymist-memcard.c
> +++ b/hw/sd/milkymist-memcard.c
> @@ -27,7 +27,7 @@
>  #include "hw/sysbus.h"
>  #include "sysemu/sysemu.h"
>  #include "trace.h"
> -#include "include/qapi/error.h"
> +#include "qapi/error.h"
>  #include "sysemu/block-backend.h"
>  #include "sysemu/blockdev.h"
>  #include "hw/sd/sd.h"
> 

Re: [Qemu-devel] [PATCH v2 18/20] trace: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:48 PM, Michael S. Tsirkin wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  trace/qmp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/trace/qmp.c b/trace/qmp.c
> index 756086c..ea99b00 100644
> --- a/trace/qmp.c
> +++ b/trace/qmp.c
> @@ -10,7 +10,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "qapi/qapi-commands-trace.h"
> -#include "trace/control.h"
> +#include "control.h"
>  
>  
>  static CPUState *get_cpu(bool has_vcpu, int vcpu, Error **errp)
> 

Re: [Qemu-devel] [PATCH v2 10/20] rocker: drop an unused include

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> We don't use net/clients.h, drop that include.
> 
> 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>

> ---
>  hw/net/rocker/rocker_fp.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c
> index 27b17c8..4aa7da7 100644
> --- a/hw/net/rocker/rocker_fp.c
> +++ b/hw/net/rocker/rocker_fp.c
> @@ -15,7 +15,6 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "net/clients.h"
>  #include "qapi/qapi-types-rocker.h"
>  #include "rocker.h"
>  #include "rocker_hw.h"
> 

Re: [Qemu-devel] [PATCH v2 14/20] usb: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:48 PM, Michael S. Tsirkin wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  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
> 

Re: [Qemu-devel] [PATCH v2 09/20] e1000e: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> 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/net/e1000e.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
> index 16a9417..cda8d48 100644
> --- a/hw/net/e1000e.c
> +++ b/hw/net/e1000e.c
> @@ -41,7 +41,7 @@
>  #include "hw/pci/msi.h"
>  #include "hw/pci/msix.h"
>  
> -#include "hw/net/e1000_regs.h"
> +#include "e1000_regs.h"
>  

Can you remove this extra newline while here?

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>  #include "e1000x_common.h"
>  #include "e1000e_core.h"
> 

Re: [Qemu-devel] [PATCH v2 08/20] ioapic: fix up includes

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> include files shouldn't have the "include/" part,
> that is implied.
> 
> Also, drop an unused include.
> 
> 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>

> ---
>  hw/intc/ioapic.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
> index 36139a4..c45f073 100644
> --- a/hw/intc/ioapic.c
> +++ b/hw/intc/ioapic.c
> @@ -28,9 +28,8 @@
>  #include "hw/i386/apic.h"
>  #include "hw/i386/ioapic.h"
>  #include "hw/i386/ioapic_internal.h"
> -#include "include/hw/pci/msi.h"
> +#include "hw/pci/msi.h"
>  #include "sysemu/kvm.h"
> -#include "target/i386/cpu.h"
>  #include "hw/i386/apic-msidef.h"
>  #include "hw/i386/x86-iommu.h"
>  #include "trace.h"
> 

Re: [Qemu-devel] [PATCH v2 07/20] ide: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/ide/ahci-allwinner.c | 2 +-
>  hw/ide/ahci.c           | 2 +-
>  hw/ide/ich.c            | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ide/ahci-allwinner.c b/hw/ide/ahci-allwinner.c
> index 2fd9507..f98e6cb 100644
> --- a/hw/ide/ahci-allwinner.c
> +++ b/hw/ide/ahci-allwinner.c
> @@ -20,7 +20,7 @@
>  #include "qemu/error-report.h"
>  #include "sysemu/dma.h"
>  #include "hw/ide/internal.h"
> -#include "hw/ide/ahci_internal.h"
> +#include "ahci_internal.h"
>  
>  #include "trace.h"
>  
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index e22d7be..24dbad5 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -31,7 +31,7 @@
>  #include "sysemu/dma.h"
>  #include "hw/ide/internal.h"
>  #include "hw/ide/pci.h"
> -#include "hw/ide/ahci_internal.h"
> +#include "ahci_internal.h"
>  
>  #include "trace.h"
>  
> diff --git a/hw/ide/ich.c b/hw/ide/ich.c
> index 134478e..51c935a 100644
> --- a/hw/ide/ich.c
> +++ b/hw/ide/ich.c
> @@ -67,7 +67,7 @@
>  #include "hw/isa/isa.h"
>  #include "sysemu/dma.h"
>  #include "hw/ide/pci.h"
> -#include "hw/ide/ahci_internal.h"
> +#include "ahci_internal.h"
>  
>  #define ICH9_MSI_CAP_OFFSET     0x80
>  #define ICH9_SATA_CAP_OFFSET    0xA8
> 

Re: [Qemu-devel] [PATCH v2 02/20] crypto: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  crypto/block-luks.h    | 2 +-
>  crypto/block-qcow.h    | 2 +-
>  crypto/ivgen-essiv.h   | 2 +-
>  crypto/ivgen-plain.h   | 2 +-
>  crypto/ivgen-plain64.h | 2 +-
>  crypto/block-luks.c    | 2 +-
>  crypto/block-qcow.c    | 2 +-
>  crypto/block.c         | 6 +++---
>  crypto/cipher.c        | 6 +++---
>  crypto/ivgen-essiv.c   | 2 +-
>  crypto/ivgen-plain.c   | 2 +-
>  crypto/ivgen-plain64.c | 2 +-
>  crypto/ivgen.c         | 8 ++++----
>  crypto/tlscreds.c      | 2 +-
>  crypto/tlscredsanon.c  | 2 +-
>  crypto/tlscredsx509.c  | 2 +-
>  16 files changed, 23 insertions(+), 23 deletions(-)
> 
> diff --git a/crypto/block-luks.h b/crypto/block-luks.h
> index b2d8a35..befd8b2 100644
> --- a/crypto/block-luks.h
> +++ b/crypto/block-luks.h
> @@ -21,7 +21,7 @@
>  #ifndef QCRYPTO_BLOCK_LUKS_H
>  #define QCRYPTO_BLOCK_LUKS_H
>  
> -#include "crypto/blockpriv.h"
> +#include "blockpriv.h"
>  
>  extern const QCryptoBlockDriver qcrypto_block_driver_luks;
>  
> diff --git a/crypto/block-qcow.h b/crypto/block-qcow.h
> index 3e2c0a8..6988fb2 100644
> --- a/crypto/block-qcow.h
> +++ b/crypto/block-qcow.h
> @@ -21,7 +21,7 @@
>  #ifndef QCRYPTO_BLOCK_QCOW_H
>  #define QCRYPTO_BLOCK_QCOW_H
>  
> -#include "crypto/blockpriv.h"
> +#include "blockpriv.h"
>  
>  extern const QCryptoBlockDriver qcrypto_block_driver_qcow;
>  
> diff --git a/crypto/ivgen-essiv.h b/crypto/ivgen-essiv.h
> index 4a00af8..f34dbab 100644
> --- a/crypto/ivgen-essiv.h
> +++ b/crypto/ivgen-essiv.h
> @@ -18,7 +18,7 @@
>   *
>   */
>  
> -#include "crypto/ivgenpriv.h"
> +#include "ivgenpriv.h"
>  
>  #ifndef QCRYPTO_IVGEN_ESSIV_H__
>  #define QCRYPTO_IVGEN_ESSIV_H__
> diff --git a/crypto/ivgen-plain.h b/crypto/ivgen-plain.h
> index 0fe8835..16e1ae5 100644
> --- a/crypto/ivgen-plain.h
> +++ b/crypto/ivgen-plain.h
> @@ -18,7 +18,7 @@
>   *
>   */
>  
> -#include "crypto/ivgenpriv.h"
> +#include "ivgenpriv.h"
>  
>  #ifndef QCRYPTO_IVGEN_PLAIN_H__
>  #define QCRYPTO_IVGEN_PLAIN_H__
> diff --git a/crypto/ivgen-plain64.h b/crypto/ivgen-plain64.h
> index c410445..f8611bd 100644
> --- a/crypto/ivgen-plain64.h
> +++ b/crypto/ivgen-plain64.h
> @@ -18,7 +18,7 @@
>   *
>   */
>  
> -#include "crypto/ivgenpriv.h"
> +#include "ivgenpriv.h"
>  
>  #ifndef QCRYPTO_IVGEN_PLAIN64_H__
>  #define QCRYPTO_IVGEN_PLAIN64_H__
> diff --git a/crypto/block-luks.c b/crypto/block-luks.c
> index d418ac3..5738124 100644
> --- a/crypto/block-luks.c
> +++ b/crypto/block-luks.c
> @@ -22,7 +22,7 @@
>  #include "qapi/error.h"
>  #include "qemu/bswap.h"
>  
> -#include "crypto/block-luks.h"
> +#include "block-luks.h"
>  
>  #include "crypto/hash.h"
>  #include "crypto/afsplit.h"
> diff --git a/crypto/block-qcow.c b/crypto/block-qcow.c
> index 8817d6a..4284e05 100644
> --- a/crypto/block-qcow.c
> +++ b/crypto/block-qcow.c
> @@ -27,7 +27,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  
> -#include "crypto/block-qcow.h"
> +#include "block-qcow.h"
>  #include "crypto/secret.h"
>  
>  #define QCRYPTO_BLOCK_QCOW_SECTOR_SIZE 512
> diff --git a/crypto/block.c b/crypto/block.c
> index f206d5e..e59d114 100644
> --- a/crypto/block.c
> +++ b/crypto/block.c
> @@ -20,9 +20,9 @@
>  
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
> -#include "crypto/blockpriv.h"
> -#include "crypto/block-qcow.h"
> -#include "crypto/block-luks.h"
> +#include "blockpriv.h"
> +#include "block-qcow.h"
> +#include "block-luks.h"
>  
>  static const QCryptoBlockDriver *qcrypto_block_drivers[] = {
>      [Q_CRYPTO_BLOCK_FORMAT_QCOW] = &qcrypto_block_driver_qcow,
> diff --git a/crypto/cipher.c b/crypto/cipher.c
> index bcbfb3d..b3af579 100644
> --- a/crypto/cipher.c
> +++ b/crypto/cipher.c
> @@ -150,11 +150,11 @@ qcrypto_cipher_munge_des_rfb_key(const uint8_t *key,
>  #endif /* CONFIG_GCRYPT || CONFIG_NETTLE */
>  
>  #ifdef CONFIG_GCRYPT
> -#include "crypto/cipher-gcrypt.c"
> +#include "cipher-gcrypt.c"
>  #elif defined CONFIG_NETTLE
> -#include "crypto/cipher-nettle.c"
> +#include "cipher-nettle.c"
>  #else
> -#include "crypto/cipher-builtin.c"
> +#include "cipher-builtin.c"
>  #endif
>  
>  QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
> diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c
> index aeaa8fc..43e258c 100644
> --- a/crypto/ivgen-essiv.c
> +++ b/crypto/ivgen-essiv.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "qemu/bswap.h"
> -#include "crypto/ivgen-essiv.h"
> +#include "ivgen-essiv.h"
>  
>  typedef struct QCryptoIVGenESSIV QCryptoIVGenESSIV;
>  struct QCryptoIVGenESSIV {
> diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c
> index bf2fb7a..06f4145 100644
> --- a/crypto/ivgen-plain.c
> +++ b/crypto/ivgen-plain.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "qemu/bswap.h"
> -#include "crypto/ivgen-plain.h"
> +#include "ivgen-plain.h"
>  
>  static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,
>                                      const uint8_t *key, size_t nkey,
> diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c
> index e4679a1..fbb7724 100644
> --- a/crypto/ivgen-plain64.c
> +++ b/crypto/ivgen-plain64.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "qemu/bswap.h"
> -#include "crypto/ivgen-plain.h"
> +#include "ivgen-plain.h"
>  
>  static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,
>                                      const uint8_t *key, size_t nkey,
> diff --git a/crypto/ivgen.c b/crypto/ivgen.c
> index f664351..6a2b3ad 100644
> --- a/crypto/ivgen.c
> +++ b/crypto/ivgen.c
> @@ -21,10 +21,10 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  
> -#include "crypto/ivgenpriv.h"
> -#include "crypto/ivgen-plain.h"
> -#include "crypto/ivgen-plain64.h"
> -#include "crypto/ivgen-essiv.h"
> +#include "ivgenpriv.h"
> +#include "ivgen-plain.h"
> +#include "ivgen-plain64.h"
> +#include "ivgen-essiv.h"
>  
>  
>  QCryptoIVGen *qcrypto_ivgen_new(QCryptoIVGenAlgorithm alg,
> diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
> index 3cd4103..02255a6 100644
> --- a/crypto/tlscreds.c
> +++ b/crypto/tlscreds.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
> -#include "crypto/tlscredspriv.h"
> +#include "tlscredspriv.h"
>  #include "trace.h"
>  
>  #define DH_BITS 2048
> diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
> index 1464220..7ad66d1 100644
> --- a/crypto/tlscredsanon.c
> +++ b/crypto/tlscredsanon.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "crypto/tlscredsanon.h"
> -#include "crypto/tlscredspriv.h"
> +#include "tlscredspriv.h"
>  #include "qapi/error.h"
>  #include "qom/object_interfaces.h"
>  #include "trace.h"
> diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
> index 50eb54f..98ee042 100644
> --- a/crypto/tlscredsx509.c
> +++ b/crypto/tlscredsx509.c
> @@ -20,7 +20,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "crypto/tlscredsx509.h"
> -#include "crypto/tlscredspriv.h"
> +#include "tlscredspriv.h"
>  #include "crypto/secret.h"
>  #include "qapi/error.h"
>  #include "qom/object_interfaces.h"
> 

Re: [Qemu-devel] [PATCH v2 01/20] block: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  block/crypto.c         | 2 +-
>  block/nbd.c            | 2 +-
>  block/qcow.c           | 2 +-
>  block/qcow2-bitmap.c   | 2 +-
>  block/qcow2-cluster.c  | 2 +-
>  block/qcow2-refcount.c | 2 +-
>  block/qcow2-snapshot.c | 2 +-
>  block/qcow2.c          | 4 ++--
>  block/vhdx-endian.c    | 2 +-
>  block/vhdx-log.c       | 2 +-
>  block/vhdx.c           | 2 +-
>  11 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/block/crypto.c b/block/crypto.c
> index 7e7ad2d..bc322b5 100644
> --- a/block/crypto.c
> +++ b/block/crypto.c
> @@ -29,7 +29,7 @@
>  #include "qapi/qobject-input-visitor.h"
>  #include "qapi/error.h"
>  #include "qemu/option.h"
> -#include "block/crypto.h"
> +#include "crypto.h"
>  
>  typedef struct BlockCrypto BlockCrypto;
>  
> diff --git a/block/nbd.c b/block/nbd.c
> index 3e1693c..ff8333e 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -27,7 +27,7 @@
>   */
>  
>  #include "qemu/osdep.h"
> -#include "block/nbd-client.h"
> +#include "nbd-client.h"
>  #include "qapi/error.h"
>  #include "qemu/uri.h"
>  #include "block/block_int.h"
> diff --git a/block/qcow.c b/block/qcow.c
> index 3ba2ca2..1f866af 100644
> --- a/block/qcow.c
> +++ b/block/qcow.c
> @@ -37,7 +37,7 @@
>  #include "qapi/qapi-visit-block-core.h"
>  #include "crypto/block.h"
>  #include "migration/blocker.h"
> -#include "block/crypto.h"
> +#include "crypto.h"
>  
>  /**************************************************************/
>  /* QEMU COW block driver with compression and encryption support */
> diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
> index 6e93ec4..60d5290 100644
> --- a/block/qcow2-bitmap.c
> +++ b/block/qcow2-bitmap.c
> @@ -30,7 +30,7 @@
>  #include "qemu/cutils.h"
>  
>  #include "block/block_int.h"
> -#include "block/qcow2.h"
> +#include "qcow2.h"
>  
>  /* NOTICE: BME here means Bitmaps Extension and used as a namespace for
>   * _internal_ constants. Please do not use this _internal_ abbreviation for
> diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
> index 1aee726..0d74584 100644
> --- a/block/qcow2-cluster.c
> +++ b/block/qcow2-cluster.c
> @@ -28,7 +28,7 @@
>  #include "qapi/error.h"
>  #include "qemu-common.h"
>  #include "block/block_int.h"
> -#include "block/qcow2.h"
> +#include "qcow2.h"
>  #include "qemu/bswap.h"
>  #include "trace.h"
>  
> diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
> index 2dc2300..4032362 100644
> --- a/block/qcow2-refcount.c
> +++ b/block/qcow2-refcount.c
> @@ -26,7 +26,7 @@
>  #include "qapi/error.h"
>  #include "qemu-common.h"
>  #include "block/block_int.h"
> -#include "block/qcow2.h"
> +#include "qcow2.h"
>  #include "qemu/range.h"
>  #include "qemu/bswap.h"
>  #include "qemu/cutils.h"
> diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
> index 74293be..bb6a5b7 100644
> --- a/block/qcow2-snapshot.c
> +++ b/block/qcow2-snapshot.c
> @@ -25,7 +25,7 @@
>  #include "qemu/osdep.h"
>  #include "qapi/error.h"
>  #include "block/block_int.h"
> -#include "block/qcow2.h"
> +#include "qcow2.h"
>  #include "qemu/bswap.h"
>  #include "qemu/error-report.h"
>  #include "qemu/cutils.h"
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 6d53247..db13109 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -27,7 +27,7 @@
>  #include "sysemu/block-backend.h"
>  #include "qemu/module.h"
>  #include <zlib.h>
> -#include "block/qcow2.h"
> +#include "qcow2.h"
>  #include "qemu/error-report.h"
>  #include "qapi/error.h"
>  #include "qapi/qapi-events-block-core.h"
> @@ -39,7 +39,7 @@
>  #include "qemu/bswap.h"
>  #include "qapi/qobject-input-visitor.h"
>  #include "qapi/qapi-visit-block-core.h"
> -#include "block/crypto.h"
> +#include "crypto.h"
>  
>  /*
>    Differences with QCOW:
> diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
> index 429d755..41fbdd2 100644
> --- a/block/vhdx-endian.c
> +++ b/block/vhdx-endian.c
> @@ -19,7 +19,7 @@
>  #include "qemu-common.h"
>  #include "block/block_int.h"
>  #include "qemu/bswap.h"
> -#include "block/vhdx.h"
> +#include "vhdx.h"
>  
>  /*
>   * All the VHDX formats on disk are little endian - the following
> diff --git a/block/vhdx-log.c b/block/vhdx-log.c
> index 0ac4863..d2f1b98 100644
> --- a/block/vhdx-log.c
> +++ b/block/vhdx-log.c
> @@ -24,7 +24,7 @@
>  #include "qemu/error-report.h"
>  #include "qemu/module.h"
>  #include "qemu/bswap.h"
> -#include "block/vhdx.h"
> +#include "vhdx.h"
>  
>  
>  typedef struct VHDXLogSequence {
> diff --git a/block/vhdx.c b/block/vhdx.c
> index 0b1e21c..79c68a2 100644
> --- a/block/vhdx.c
> +++ b/block/vhdx.c
> @@ -23,7 +23,7 @@
>  #include "qemu/option.h"
>  #include "qemu/crc32c.h"
>  #include "qemu/bswap.h"
> -#include "block/vhdx.h"
> +#include "vhdx.h"
>  #include "migration/blocker.h"
>  #include "qemu/uuid.h"
>  #include "qapi/qmp/qdict.h"
> 

Re: [Qemu-devel] [PATCH v2 05/20] trace: use local path for local headers

[Michael S. Tsirkin]

On Fri, May 25, 2018 at 06:29:29PM -0300, Philippe Mathieu-Daudé wrote:
> On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> > 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>
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> 
> This reminds me of this project:
> 
> https://github.com/noidontdig/gitdown
> 
>     gitdown is a script which moderates your git
>     committing activity based on your blood alcohol
>     content (BAC).
> 
> :P

Oh I have a script that attaches signatures, and it does not check for duplicates.

I started rewriting it using git interpret-trailers but Junio asked me
to rework interpret-trailers first and I didn't bother yet.

> > ---
> >  trace/control.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/trace/control.h b/trace/control.h
> > index 1903e22..eb65c8e 100644
> > --- a/trace/control.h
> > +++ b/trace/control.h
> > @@ -267,6 +267,6 @@ char *trace_opt_parse(const char *optarg);
> >  uint32_t trace_get_vcpu_event_count(void);
> >  
> >  
> > -#include "trace/control-internal.h"
> > +#include "control-internal.h"
> >  
> >  #endif /* TRACE__CONTROL_H */
> > 

Re: [Qemu-devel] [PATCH v2 00/20] include cleanups

[Michael S. Tsirkin]

On Fri, May 25, 2018 at 01:32:40PM -0500, Eric Blake wrote:
> On 05/25/2018 11:47 AM, Michael S. Tsirkin wrote:
> > Right now, a local header can be included with either
> > 
> > #include "foo.h"
> >      or
> > #include "dir/foo.h"
> > 
> > since the later doesn't tell you where the header is
> > (in source or include directory), the former is preferable.
> > 
> > I intend to look for ways to prevent the second way from working, but
> > that will take time. For now, fix all instances for the later way I
> > could find.
> > 
> > In a couple of places I just dropped the include instead.
> > 
> > Finally, arch_init huge list of includes is sorted, which will be
> > helpful in future cleanups.
> > 
> > This was part of the include path cleanup patchset
> > (https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg00739.html).
> > 
> > Changes from v1
> >      drop patches not dealing with local headers
> >      stop saying include through root works by accident -
> >          it's not by accident, just not how we'd like code to look like
> 
> You mostly did that, but I still think some of the commit messages can be
> improved. See 15/20.
> 
> >      address comments by eric, philip, others
> 
> At any rate, I think we are getting closer; and splitting this into a
> less-controversial part compared to the rest of v1 makes it more likely that
> this half can go in soon.  Many of the patches are independent, but it's
> still probably easier if this goes in through one tree (Paolo's misc tree,
> perhaps?), once you've collected reviews.

I plan to just merge these through my tree.

> -- 
> Eric Blake, Principal Software Engineer
> Red Hat, Inc.           +1-919-301-3266
> Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH v2 11/20] ppc: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> 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>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/ppc/ppc440_uc.c | 2 +-
>  hw/ppc/sam460ex.c  | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
> index e312fdb..123f4ac 100644
> --- a/hw/ppc/ppc440_uc.c
> +++ b/hw/ppc/ppc440_uc.c
> @@ -20,7 +20,7 @@
>  #include "hw/ppc/ppc.h"
>  #include "hw/pci/pci.h"
>  #include "sysemu/block-backend.h"
> -#include "hw/ppc/ppc440.h"
> +#include "ppc440.h"
>  
>  /*****************************************************************************/
>  /* L2 Cache as SRAM */
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index a48e6e6..cb2ab1d 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -27,8 +27,8 @@
>  #include "elf.h"
>  #include "exec/address-spaces.h"
>  #include "exec/memory.h"
> -#include "hw/ppc/ppc440.h"
> -#include "hw/ppc/ppc405.h"
> +#include "ppc440.h"
> +#include "ppc405.h"
>  #include "hw/block/flash.h"
>  #include "sysemu/sysemu.h"
>  #include "sysemu/qtest.h"
> 

Re: [Qemu-devel] [PATCH v2 12/20] vhost-scsi: drop an unused include

[Philippe Mathieu-Daudé]

On 05/25/2018 01:47 PM, Michael S. Tsirkin wrote:
> No reason for vhost-scsi to pull in migration headers directly.
> 
> 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>

> ---
>  hw/scsi/vhost-scsi-common.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/hw/scsi/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
> index 77e9897..e2a5828 100644
> --- a/hw/scsi/vhost-scsi-common.c
> +++ b/hw/scsi/vhost-scsi-common.c
> @@ -17,7 +17,6 @@
>  
>  #include "qemu/osdep.h"
>  #include "qemu/error-report.h"
> -#include "migration/migration.h"
>  #include "hw/virtio/vhost.h"
>  #include "hw/virtio/vhost-scsi-common.h"
>  #include "hw/virtio/virtio-scsi.h"
> 

Re: [Qemu-devel] [PATCH v2 16/20] colo: use local path for local headers

[Philippe Mathieu-Daudé]

On 05/25/2018 01:48 PM, Michael S. Tsirkin wrote:
> 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.
> 
> Reviewed-by: Zhang Chen <zhangckid@gmail.com>
> 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>

> ---
>  net/colo-compare.c    | 2 +-
>  net/colo.c            | 2 +-
>  net/filter-rewriter.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/colo-compare.c b/net/colo-compare.c
> index 23b2d2c..c3a2be4 100644
> --- a/net/colo-compare.c
> +++ b/net/colo-compare.c
> @@ -25,7 +25,7 @@
>  #include "net/queue.h"
>  #include "chardev/char-fe.h"
>  #include "qemu/sockets.h"
> -#include "net/colo.h"
> +#include "colo.h"
>  #include "sysemu/iothread.h"
>  
>  #define TYPE_COLO_COMPARE "colo-compare"
> diff --git a/net/colo.c b/net/colo.c
> index 8426265..6dda4ed 100644
> --- a/net/colo.c
> +++ b/net/colo.c
> @@ -14,7 +14,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "trace.h"
> -#include "net/colo.h"
> +#include "colo.h"
>  
>  uint32_t connection_key_hash(const void *opaque)
>  {
> diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
> index 62dad2d..f584e4e 100644
> --- a/net/filter-rewriter.c
> +++ b/net/filter-rewriter.c
> @@ -11,7 +11,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "trace.h"
> -#include "net/colo.h"
> +#include "colo.h"
>  #include "net/filter.h"
>  #include "net/net.h"
>  #include "qemu-common.h"
> 

Re: [Qemu-devel] [PATCH v2 20/20] arch_init: sort architectures

[Laszlo Ersek]

On 05/25/18 18:48, Michael S. Tsirkin wrote:
> Sort alphabetically. Will help us see if anything is missing (e.g. tile
> is not there now).
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  arch_init.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch_init.c b/arch_init.c
> index 9597218..f4f3f61 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -52,14 +52,14 @@ int graphic_depth = 32;
>  #define QEMU_ARCH QEMU_ARCH_ARM
>  #elif defined(TARGET_CRIS)
>  #define QEMU_ARCH QEMU_ARCH_CRIS
> -#elif defined(TARGET_I386)
> -#define QEMU_ARCH QEMU_ARCH_I386
>  #elif defined(TARGET_HPPA)
>  #define QEMU_ARCH QEMU_ARCH_HPPA
> -#elif defined(TARGET_M68K)
> -#define QEMU_ARCH QEMU_ARCH_M68K
> +#elif defined(TARGET_I386)
> +#define QEMU_ARCH QEMU_ARCH_I386
>  #elif defined(TARGET_LM32)
>  #define QEMU_ARCH QEMU_ARCH_LM32
> +#elif defined(TARGET_M68K)
> +#define QEMU_ARCH QEMU_ARCH_M68K
>  #elif defined(TARGET_MICROBLAZE)
>  #define QEMU_ARCH QEMU_ARCH_MICROBLAZE
>  #elif defined(TARGET_MIPS)
> @@ -80,12 +80,12 @@ int graphic_depth = 32;
>  #define QEMU_ARCH QEMU_ARCH_SH4
>  #elif defined(TARGET_SPARC)
>  #define QEMU_ARCH QEMU_ARCH_SPARC
> -#elif defined(TARGET_XTENSA)
> -#define QEMU_ARCH QEMU_ARCH_XTENSA
> -#elif defined(TARGET_UNICORE32)
> -#define QEMU_ARCH QEMU_ARCH_UNICORE32
>  #elif defined(TARGET_TRICORE)
>  #define QEMU_ARCH QEMU_ARCH_TRICORE
> +#elif defined(TARGET_UNICORE32)
> +#define QEMU_ARCH QEMU_ARCH_UNICORE32
> +#elif defined(TARGET_XTENSA)
> +#define QEMU_ARCH QEMU_ARCH_XTENSA
>  #endif
>  
>  const uint32_t arch_type = QEMU_ARCH;
> 

I sorted the list from scratch, using some regexes to temporarily move
the #define's to the same lines as the #[el]if's. My results were
identical to those of this patch.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Thanks
Laszlo

Re: [Qemu-devel] [PATCH v2 02/20] crypto: use local path for local headers

[Daniel P. Berrangé]

On Fri, May 25, 2018 at 07:47:41PM +0300, Michael S. Tsirkin wrote:
> 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>
> ---
>  crypto/block-luks.h    | 2 +-
>  crypto/block-qcow.h    | 2 +-
>  crypto/ivgen-essiv.h   | 2 +-
>  crypto/ivgen-plain.h   | 2 +-
>  crypto/ivgen-plain64.h | 2 +-
>  crypto/block-luks.c    | 2 +-
>  crypto/block-qcow.c    | 2 +-
>  crypto/block.c         | 6 +++---
>  crypto/cipher.c        | 6 +++---
>  crypto/ivgen-essiv.c   | 2 +-
>  crypto/ivgen-plain.c   | 2 +-
>  crypto/ivgen-plain64.c | 2 +-
>  crypto/ivgen.c         | 8 ++++----
>  crypto/tlscreds.c      | 2 +-
>  crypto/tlscredsanon.c  | 2 +-
>  crypto/tlscredsx509.c  | 2 +-
>  16 files changed, 23 insertions(+), 23 deletions(-)

Acked-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|