[Qemu-devel] [PATCH 0/2] block/nfs: fix build breakage due to missing includes

[Qemu-devel] [PATCH 0/2] block/nfs: fix build breakage due to missing includes

[Stefan Hajnoczi]

Header files included by almost every source files have been slimmed down
recently to speed up the build and eliminate unnecessary dependencies.  The
block/nfs.c file must have been forgotten when build testing because it
currently fails to build.

This series adds the necessary #include statements to make block/nfs.c build
successfully again.

Stefan Hajnoczi (2):
  block/nfs: add missing #include "qapi/error.h"
  block/nfs: add missing #include "qemu/cutils.h"

 block/nfs.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.5.5

[Qemu-devel] [PATCH 1/2] block/nfs: add missing #include "qapi/error.h"

[Stefan Hajnoczi]

error_setg() used to be included indirectly through qemu/osdep.h.  Since
commit da34e65cb4025728566d6504a99916f6e7e1dd6a ("include/qemu/osdep.h:
Don't include qapi/error.h") it requires an explicit include.

Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/nfs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block/nfs.c b/block/nfs.c
index 7220e89..0c43dc7 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -28,6 +28,7 @@
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
+#include "qapi/error.h"
 #include "block/block_int.h"
 #include "trace.h"
 #include "qemu/iov.h"
-- 
2.5.5

[Qemu-devel] [PATCH 2/2] block/nfs: add missing #include "qemu/cutils.h"

[Stefan Hajnoczi]

parse_uint_full() used to be included from qemu-common.h but was moved
to qemu/cutils.h in commit f348b6d1a53e5271cf1c9f9acc4646b4b98c1771
("util: move declarations out of qemu-common.h").

Cc: Veronia Bahaa <veroniabahaa@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 block/nfs.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/block/nfs.c b/block/nfs.c
index 0c43dc7..9f51cc3 100644
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -33,6 +33,7 @@
 #include "trace.h"
 #include "qemu/iov.h"
 #include "qemu/uri.h"
+#include "qemu/cutils.h"
 #include "sysemu/sysemu.h"
 #include <nfsc/libnfs.h>
 
-- 
2.5.5

Re: [Qemu-devel] [PATCH 0/2] block/nfs: fix build breakage due to missing includes

[Jeff Cody]

On Wed, Mar 30, 2016 at 01:46:32PM +0100, Stefan Hajnoczi wrote:
> Header files included by almost every source files have been slimmed down
> recently to speed up the build and eliminate unnecessary dependencies.  The
> block/nfs.c file must have been forgotten when build testing because it
> currently fails to build.
> 
> This series adds the necessary #include statements to make block/nfs.c build
> successfully again.
> 
> Stefan Hajnoczi (2):
>   block/nfs: add missing #include "qapi/error.h"
>   block/nfs: add missing #include "qemu/cutils.h"
> 
>  block/nfs.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> -- 
> 2.5.5
> 

Thanks,

Applied to my block branch:

git://github.com/codyprime/qemu-kvm-jtc.git block

-Jeff

Re: [Qemu-devel] [PATCH 0/2] block/nfs: fix build breakage due to missing includes

[Stefan Weil]

[-- Attachment #1: Type: text/plain, Size: 860 bytes --]

Am 30.03.2016 um 14:46 schrieb Stefan Hajnoczi:
> Header files included by almost every source files have been slimmed down
> recently to speed up the build and eliminate unnecessary dependencies.  The
> block/nfs.c file must have been forgotten when build testing because it
> currently fails to build.
>
> This series adds the necessary #include statements to make block/nfs.c build
> successfully again.
>
> Stefan Hajnoczi (2):
>   block/nfs: add missing #include "qapi/error.h"
>   block/nfs: add missing #include "qemu/cutils.h"
>
>  block/nfs.c | 2 ++
>  1 file changed, 2 insertions(+)
>

Tested-by: Stefan Weil <sw@weilnetz.de>

I noticed these patches after I had just prepared my own patch...

Maybe Peter M. can apply both patches without waiting for a pull request
to fix the current broken git master.

Regards
Stefan


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]