[Qemu-devel] [PULL for-2.6 0/2] Block patches

[Qemu-devel] [PULL for-2.6 0/2] Block patches

[Jeff Cody]

The following changes since commit 9370a3bbc478f623dd21d783560629ea2064625b:

  Update version for v2.6.0-rc0 release (2016-03-30 19:25:40 +0100)

are available in the git repository at:

  git@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 0d94b74655adadbeee135aee9bc105a41a524436:

  block/nfs: add missing #include "qemu/cutils.h" (2016-03-30 16:50:39 -0400)

----------------------------------------------------------------
Block patch for 2.6, to fix build failure for libnfs
----------------------------------------------------------------

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(+)

-- 
1.9.3

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

[Jeff Cody]

From: Stefan Hajnoczi <stefanha@redhat.com>

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>
Message-id: 1459341994-20567-2-git-send-email-stefanha@redhat.com
Signed-off-by: Jeff Cody <jcody@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"
-- 
1.9.3

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

[Jeff Cody]

From: Stefan Hajnoczi <stefanha@redhat.com>

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>
Message-id: 1459341994-20567-3-git-send-email-stefanha@redhat.com
Signed-off-by: Jeff Cody <jcody@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>
 
-- 
1.9.3

Re: [Qemu-devel] [PULL for-2.6 0/2] Block patches

[Peter Maydell]

On 30 March 2016 at 21:52, Jeff Cody <jcody@redhat.com> wrote:
> The following changes since commit 9370a3bbc478f623dd21d783560629ea2064625b:
>
>   Update version for v2.6.0-rc0 release (2016-03-30 19:25:40 +0100)
>
> are available in the git repository at:
>
>   git@github.com:codyprime/qemu-kvm-jtc.git tags/block-pull-request
>
> for you to fetch changes up to 0d94b74655adadbeee135aee9bc105a41a524436:
>
>   block/nfs: add missing #include "qemu/cutils.h" (2016-03-30 16:50:39 -0400)
>
> ----------------------------------------------------------------
> Block patch for 2.6, to fix build failure for libnfs
> ----------------------------------------------------------------

Applied, thanks.

-- PMM