From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNRZF-0007hx-1j for qemu-devel@nongnu.org; Mon, 28 May 2018 19:28:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNRZD-0001ci-Uz for qemu-devel@nongnu.org; Mon, 28 May 2018 19:28:45 -0400 Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Mon, 28 May 2018 20:27:12 -0300 Message-Id: <20180528232719.4721-15-f4bug@amsat.org> In-Reply-To: <20180528232719.4721-1-f4bug@amsat.org> References: <20180528232719.4721-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v4 14/21] hw: Do not include "sysemu/blockdev.h" if it is not necessary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth , "Michael S . Tsirkin" Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, qemu-trivial@nongnu.org, Paolo Bonzini , Peter Crosthwaite , Alistair Francis , Kevin Wolf , Max Reitz , Stefano Stabellini , Anthony Perard , Marcel Apfelbaum , Richard Henderson , Eduardo Habkost , Cornelia Huck , Christian Borntraeger , Alexander Graf , David Hildenbrand , Fam Zheng , Gerd Hoffmann , "Dr. David Alan Gilbert" , Markus Armbruster , "open list:Block layer core" , "open list:X86" , "open list:virtio-ccw" Remove those unneeded includes to speed up the compilation process a little bit. Code change produced with: $ git grep '#include "sysemu/blockdev.h"' | \ cut -d: -f-1 | \ xargs egrep -L "(BlockInterfaceType|DriveInfo|drive_get|blk_legacy_dinfo|blockdev_mark_auto_del)" | \ xargs sed -i.bak '/#include "sysemu\/blockdev.h"/d' Signed-off-by: Philippe Mathieu-Daudé --- hw/block/m25p80.c | 1 - hw/block/onenand.c | 1 - hw/i386/xen/xen-mapcache.c | 1 - hw/s390x/virtio-ccw.c | 1 - hw/scsi/scsi-generic.c | 1 - hw/sd/sdhci.c | 1 - hw/usb/dev-storage.c | 1 - monitor.c | 1 - 8 files changed, 8 deletions(-) diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index b49c8e9caa..a5ccffb4aa 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" #include "hw/ssi/ssi.h" #include "qemu/bitops.h" #include "qemu/log.h" diff --git a/hw/block/onenand.c b/hw/block/onenand.c index ab0c7ea1b3..0cb8d7fa13 100644 --- a/hw/block/onenand.c +++ b/hw/block/onenand.c @@ -25,7 +25,6 @@ #include "hw/block/flash.h" #include "hw/irq.h" #include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" #include "exec/memory.h" #include "hw/sysbus.h" #include "qemu/error-report.h" diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index efa35dc6e0..541b7693b3 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -14,7 +14,6 @@ #include #include "hw/xen/xen_backend.h" -#include "sysemu/blockdev.h" #include "qemu/bitmap.h" #include diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index b68798ac52..0a9bec484b 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "hw/hw.h" -#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "net/net.h" diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 381f04e339..03bce8ff39 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -17,7 +17,6 @@ #include "qemu/error-report.h" #include "hw/scsi/scsi.h" #include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" #ifdef __linux__ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b65403947b..3017e5a95a 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -26,7 +26,6 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" -#include "sysemu/blockdev.h" #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index b56c75a73a..d02acda945 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -20,7 +20,6 @@ #include "monitor/monitor.h" #include "sysemu/sysemu.h" #include "sysemu/block-backend.h" -#include "sysemu/blockdev.h" #include "qapi/visitor.h" #include "qemu/cutils.h" diff --git a/monitor.c b/monitor.c index 46814af533..d75cb20815 100644 --- a/monitor.c +++ b/monitor.c @@ -44,7 +44,6 @@ #include "qemu/readline.h" #include "ui/console.h" #include "ui/input.h" -#include "sysemu/blockdev.h" #include "sysemu/block-backend.h" #include "audio/audio.h" #include "disas/disas.h" -- 2.17.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 14/21] hw: Do not include "sysemu/blockdev.h" if it is not necessary Date: Mon, 28 May 2018 20:27:12 -0300 Message-ID: <20180528232719.4721-15-f4bug@amsat.org> References: <20180528232719.4721-1-f4bug@amsat.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fNRZE-0000aI-Ix for xen-devel@lists.xenproject.org; Mon, 28 May 2018 23:28:44 +0000 Received: by mail-qt0-x241.google.com with SMTP id f13-v6so16557084qtp.10 for ; Mon, 28 May 2018 16:28:43 -0700 (PDT) In-Reply-To: <20180528232719.4721-1-f4bug@amsat.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Thomas Huth , "Michael S . Tsirkin" Cc: David Hildenbrand , qemu-devel@nongnu.org, Markus Armbruster , Gerd Hoffmann , Stefano Stabellini , "open list:Block layer core" , qemu-trivial@nongnu.org, Alexander Graf , Christian Borntraeger , Marcel Apfelbaum , Anthony Perard , "open list:X86" , Fam Zheng , Eduardo Habkost , Alistair Francis , "Dr. David Alan Gilbert" , "open list:virtio-ccw" , Richard Henderson , Kevin Wolf , Peter Crosthwaite , Cornelia Huck , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= List-Id: xen-devel@lists.xenproject.org UmVtb3ZlIHRob3NlIHVubmVlZGVkIGluY2x1ZGVzIHRvIHNwZWVkIHVwIHRoZSBjb21waWxhdGlv bgpwcm9jZXNzIGEgbGl0dGxlIGJpdC4KCkNvZGUgY2hhbmdlIHByb2R1Y2VkIHdpdGg6CgogICAg JCBnaXQgZ3JlcCAnI2luY2x1ZGUgInN5c2VtdS9ibG9ja2Rldi5oIicgfCBcCiAgICAgIGN1dCAt ZDogLWYtMSB8IFwKICAgICAgeGFyZ3MgZWdyZXAgLUwgIihCbG9ja0ludGVyZmFjZVR5cGV8RHJp dmVJbmZvfGRyaXZlX2dldHxibGtfbGVnYWN5X2RpbmZvfGJsb2NrZGV2X21hcmtfYXV0b19kZWwp IiB8IFwKICAgICAgeGFyZ3Mgc2VkIC1pLmJhayAnLyNpbmNsdWRlICJzeXNlbXVcL2Jsb2NrZGV2 LmgiL2QnCgpTaWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8ZjRidWdAYW1z YXQub3JnPgotLS0KIGh3L2Jsb2NrL20yNXA4MC5jICAgICAgICAgIHwgMSAtCiBody9ibG9jay9v bmVuYW5kLmMgICAgICAgICB8IDEgLQogaHcvaTM4Ni94ZW4veGVuLW1hcGNhY2hlLmMgfCAxIC0K IGh3L3MzOTB4L3ZpcnRpby1jY3cuYyAgICAgIHwgMSAtCiBody9zY3NpL3Njc2ktZ2VuZXJpYy5j ICAgICB8IDEgLQogaHcvc2Qvc2RoY2kuYyAgICAgICAgICAgICAgfCAxIC0KIGh3L3VzYi9kZXYt c3RvcmFnZS5jICAgICAgIHwgMSAtCiBtb25pdG9yLmMgICAgICAgICAgICAgICAgICB8IDEgLQog OCBmaWxlcyBjaGFuZ2VkLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2Jsb2NrL20y NXA4MC5jIGIvaHcvYmxvY2svbTI1cDgwLmMKaW5kZXggYjQ5YzhlOWNhYS4uYTVjY2ZmYjRhYSAx MDA2NDQKLS0tIGEvaHcvYmxvY2svbTI1cDgwLmMKKysrIGIvaHcvYmxvY2svbTI1cDgwLmMKQEAg LTI0LDcgKzI0LDYgQEAKICNpbmNsdWRlICJxZW11L29zZGVwLmgiCiAjaW5jbHVkZSAiaHcvaHcu aCIKICNpbmNsdWRlICJzeXNlbXUvYmxvY2stYmFja2VuZC5oIgotI2luY2x1ZGUgInN5c2VtdS9i bG9ja2Rldi5oIgogI2luY2x1ZGUgImh3L3NzaS9zc2kuaCIKICNpbmNsdWRlICJxZW11L2JpdG9w cy5oIgogI2luY2x1ZGUgInFlbXUvbG9nLmgiCmRpZmYgLS1naXQgYS9ody9ibG9jay9vbmVuYW5k LmMgYi9ody9ibG9jay9vbmVuYW5kLmMKaW5kZXggYWIwYzdlYTFiMy4uMGNiOGQ3ZmExMyAxMDA2 NDQKLS0tIGEvaHcvYmxvY2svb25lbmFuZC5jCisrKyBiL2h3L2Jsb2NrL29uZW5hbmQuYwpAQCAt MjUsNyArMjUsNiBAQAogI2luY2x1ZGUgImh3L2Jsb2NrL2ZsYXNoLmgiCiAjaW5jbHVkZSAiaHcv aXJxLmgiCiAjaW5jbHVkZSAic3lzZW11L2Jsb2NrLWJhY2tlbmQuaCIKLSNpbmNsdWRlICJzeXNl bXUvYmxvY2tkZXYuaCIKICNpbmNsdWRlICJleGVjL21lbW9yeS5oIgogI2luY2x1ZGUgImh3L3N5 c2J1cy5oIgogI2luY2x1ZGUgInFlbXUvZXJyb3ItcmVwb3J0LmgiCmRpZmYgLS1naXQgYS9ody9p Mzg2L3hlbi94ZW4tbWFwY2FjaGUuYyBiL2h3L2kzODYveGVuL3hlbi1tYXBjYWNoZS5jCmluZGV4 IGVmYTM1ZGM2ZTAuLjU0MWI3NjkzYjMgMTAwNjQ0Ci0tLSBhL2h3L2kzODYveGVuL3hlbi1tYXBj YWNoZS5jCisrKyBiL2h3L2kzODYveGVuL3hlbi1tYXBjYWNoZS5jCkBAIC0xNCw3ICsxNCw2IEBA CiAjaW5jbHVkZSA8c3lzL3Jlc291cmNlLmg+CiAKICNpbmNsdWRlICJody94ZW4veGVuX2JhY2tl bmQuaCIKLSNpbmNsdWRlICJzeXNlbXUvYmxvY2tkZXYuaCIKICNpbmNsdWRlICJxZW11L2JpdG1h cC5oIgogCiAjaW5jbHVkZSA8eGVuL2h2bS9wYXJhbXMuaD4KZGlmZiAtLWdpdCBhL2h3L3MzOTB4 L3ZpcnRpby1jY3cuYyBiL2h3L3MzOTB4L3ZpcnRpby1jY3cuYwppbmRleCBiNjg3OThhYzUyLi4w YTliZWM0ODRiIDEwMDY0NAotLS0gYS9ody9zMzkweC92aXJ0aW8tY2N3LmMKKysrIGIvaHcvczM5 MHgvdmlydGlvLWNjdy5jCkBAIC0xMyw3ICsxMyw2IEBACiAjaW5jbHVkZSAicWVtdS9vc2RlcC5o IgogI2luY2x1ZGUgInFhcGkvZXJyb3IuaCIKICNpbmNsdWRlICJody9ody5oIgotI2luY2x1ZGUg InN5c2VtdS9ibG9ja2Rldi5oIgogI2luY2x1ZGUgInN5c2VtdS9zeXNlbXUuaCIKICNpbmNsdWRl ICJzeXNlbXUva3ZtLmgiCiAjaW5jbHVkZSAibmV0L25ldC5oIgpkaWZmIC0tZ2l0IGEvaHcvc2Nz aS9zY3NpLWdlbmVyaWMuYyBiL2h3L3Njc2kvc2NzaS1nZW5lcmljLmMKaW5kZXggMzgxZjA0ZTMz OS4uMDNiY2U4ZmYzOSAxMDA2NDQKLS0tIGEvaHcvc2NzaS9zY3NpLWdlbmVyaWMuYworKysgYi9o dy9zY3NpL3Njc2ktZ2VuZXJpYy5jCkBAIC0xNyw3ICsxNyw2IEBACiAjaW5jbHVkZSAicWVtdS9l cnJvci1yZXBvcnQuaCIKICNpbmNsdWRlICJody9zY3NpL3Njc2kuaCIKICNpbmNsdWRlICJzeXNl bXUvYmxvY2stYmFja2VuZC5oIgotI2luY2x1ZGUgInN5c2VtdS9ibG9ja2Rldi5oIgogCiAjaWZk ZWYgX19saW51eF9fCiAKZGlmZiAtLWdpdCBhL2h3L3NkL3NkaGNpLmMgYi9ody9zZC9zZGhjaS5j CmluZGV4IGI2NTQwMzk0N2IuLjMwMTdlNWE5NWEgMTAwNjQ0Ci0tLSBhL2h3L3NkL3NkaGNpLmMK KysrIGIvaHcvc2Qvc2RoY2kuYwpAQCAtMjYsNyArMjYsNiBAQAogI2luY2x1ZGUgInFlbXUvZXJy b3ItcmVwb3J0LmgiCiAjaW5jbHVkZSAicWFwaS9lcnJvci5oIgogI2luY2x1ZGUgImh3L2h3Lmgi Ci0jaW5jbHVkZSAic3lzZW11L2Jsb2NrZGV2LmgiCiAjaW5jbHVkZSAic3lzZW11L2RtYS5oIgog I2luY2x1ZGUgInFlbXUvdGltZXIuaCIKICNpbmNsdWRlICJxZW11L2JpdG9wcy5oIgpkaWZmIC0t Z2l0IGEvaHcvdXNiL2Rldi1zdG9yYWdlLmMgYi9ody91c2IvZGV2LXN0b3JhZ2UuYwppbmRleCBi NTZjNzVhNzNhLi5kMDJhY2RhOTQ1IDEwMDY0NAotLS0gYS9ody91c2IvZGV2LXN0b3JhZ2UuYwor KysgYi9ody91c2IvZGV2LXN0b3JhZ2UuYwpAQCAtMjAsNyArMjAsNiBAQAogI2luY2x1ZGUgIm1v bml0b3IvbW9uaXRvci5oIgogI2luY2x1ZGUgInN5c2VtdS9zeXNlbXUuaCIKICNpbmNsdWRlICJz eXNlbXUvYmxvY2stYmFja2VuZC5oIgotI2luY2x1ZGUgInN5c2VtdS9ibG9ja2Rldi5oIgogI2lu Y2x1ZGUgInFhcGkvdmlzaXRvci5oIgogI2luY2x1ZGUgInFlbXUvY3V0aWxzLmgiCiAKZGlmZiAt LWdpdCBhL21vbml0b3IuYyBiL21vbml0b3IuYwppbmRleCA0NjgxNGFmNTMzLi5kNzVjYjIwODE1 IDEwMDY0NAotLS0gYS9tb25pdG9yLmMKKysrIGIvbW9uaXRvci5jCkBAIC00NCw3ICs0NCw2IEBA CiAjaW5jbHVkZSAicWVtdS9yZWFkbGluZS5oIgogI2luY2x1ZGUgInVpL2NvbnNvbGUuaCIKICNp bmNsdWRlICJ1aS9pbnB1dC5oIgotI2luY2x1ZGUgInN5c2VtdS9ibG9ja2Rldi5oIgogI2luY2x1 ZGUgInN5c2VtdS9ibG9jay1iYWNrZW5kLmgiCiAjaW5jbHVkZSAiYXVkaW8vYXVkaW8uaCIKICNp bmNsdWRlICJkaXNhcy9kaXNhcy5oIgotLSAKMi4xNy4wCgoKX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2 ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWls bWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==