[Qemu-devel] [PULL 0/4] trivial patches for 2013-08-02

[Qemu-devel] [PULL 0/4] trivial patches for 2013-08-02

[Michael Tokarev]

The following changes since commit 2ddc463725d0fa24e0910fba77fef2777fa94a74:

  Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging (2013-08-01 17:09:35 -0500)

are available in the git repository at:

  git://git.corpit.ru/qemu.git trivial-patches

for you to fetch changes up to 8e50724313895a87057cc243ad805f2eb21feb9f:

  vmdk: fix comment for vmdk_co_write_zeroes (2013-08-02 18:07:04 +0400)

----------------------------------------------------------------
Fam Zheng (1):
      vmdk: fix comment for vmdk_co_write_zeroes

Michael S. Tsirkin (1):
      memory.c: drop kvm.h dependency

Michael Tokarev (1):
      qemu-ga: build it even if !system

Richard W.M. Jones (1):
      block/iscsi.c: Fix printf format error.

 block/iscsi.c |    4 +++-
 block/vmdk.c  |    8 ++++++--
 configure     |   11 ++++++++---
 memory.c      |    1 -
 4 files changed, 17 insertions(+), 7 deletions(-)

[Qemu-devel] [PULL 1/4] qemu-ga: build it even if !system

[Michael Tokarev]

Move qemu-ga build check out of if softmmu.. into its own section.
We want to build qemu-ga for _guest_ even if system build isn't
done.  It is controlled separately using --enable-guest-agent.
Additionally, give error message if guest agent is requested but
not supported.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 configure |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index f0761ea..293f167 100755
--- a/configure
+++ b/configure
@@ -231,7 +231,7 @@ libusb=""
 usb_redir=""
 glx=""
 zlib="yes"
-guest_agent="yes"
+guest_agent=""
 want_tools="yes"
 libiscsi=""
 coroutine=""
@@ -3444,10 +3444,15 @@ if test "$softmmu" = yes ; then
       virtfs=no
     fi
   fi
+fi
+if [ "$guest_agent" != "no" ]; then
   if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
-    if [ "$guest_agent" = "yes" ]; then
       tools="qemu-ga\$(EXESUF) $tools"
-    fi
+      guest_agent=yes
+  elif [ "$guest_agent" != yes ]; then
+      guest_agent=no
+  else
+      error_exit "Guest agent is not supported on this platform"
   fi
 fi
 
-- 
1.7.10.4

Re: [Qemu-devel] [PULL 1/4] qemu-ga: build it even if !system

[Andreas Färber]

Am 02.08.2013 16:20, schrieb Michael Tokarev:
> Move qemu-ga build check out of if softmmu.. into its own section.
> We want to build qemu-ga for _guest_ even if system build isn't
> done.  It is controlled separately using --enable-guest-agent.
> Additionally, give error message if guest agent is requested but
> not supported.
> 
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
>  configure |   11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/configure b/configure
> index f0761ea..293f167 100755
> --- a/configure
> +++ b/configure
> @@ -231,7 +231,7 @@ libusb=""
>  usb_redir=""
>  glx=""
>  zlib="yes"
> -guest_agent="yes"
> +guest_agent=""
>  want_tools="yes"
>  libiscsi=""
>  coroutine=""
> @@ -3444,10 +3444,15 @@ if test "$softmmu" = yes ; then
>        virtfs=no
>      fi
>    fi
> +fi
> +if [ "$guest_agent" != "no" ]; then
>    if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
> -    if [ "$guest_agent" = "yes" ]; then
>        tools="qemu-ga\$(EXESUF) $tools"
> -    fi
> +      guest_agent=yes
> +  elif [ "$guest_agent" != yes ]; then
> +      guest_agent=no
> +  else
> +      error_exit "Guest agent is not supported on this platform"
>    fi
>  fi

You are mixing 2- and 4-char indentation here...

Andreas

>  
> 


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PULL 2/4] block/iscsi.c: Fix printf format error.

[Michael Tokarev]

From: "Richard W.M. Jones" <rjones@redhat.com>

The error on armv7hl was:

block/iscsi.c: In function ‘is_request_lun_aligned’:
block/iscsi.c:251:26: error: format ‘%ld’ expects argument of type ‘long int’, but argument 3 has type ‘int64_t’ [-Werror=format=]
                          iscsilun->block_size, sector_num, nb_sectors);
                          ^

This also splits the long line to comply with qemu coding guidelines.

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 block/iscsi.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/block/iscsi.c b/block/iscsi.c
index 5f28c6a..e7c1c2b 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -247,7 +247,9 @@ static bool is_request_lun_aligned(int64_t sector_num, int nb_sectors,
 {
     if ((sector_num * BDRV_SECTOR_SIZE) % iscsilun->block_size ||
         (nb_sectors * BDRV_SECTOR_SIZE) % iscsilun->block_size) {
-            error_report("iSCSI misaligned request: iscsilun->block_size %u, sector_num %ld, nb_sectors %d",
+            error_report("iSCSI misaligned request: "
+                         "iscsilun->block_size %u, sector_num %" PRIi64
+                         ", nb_sectors %d",
                          iscsilun->block_size, sector_num, nb_sectors);
             return 0;
     }
-- 
1.7.10.4

[Qemu-devel] [PULL 3/4] memory.c: drop kvm.h dependency

[Michael Tokarev]

From: "Michael S. Tsirkin" <mst@redhat.com>

memory.c does not use any kvm specific interfaces,
don't include kvm.h

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 memory.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/memory.c b/memory.c
index ac6f3c6..886f838 100644
--- a/memory.c
+++ b/memory.c
@@ -18,7 +18,6 @@
 #include "exec/ioport.h"
 #include "qemu/bitops.h"
 #include "qom/object.h"
-#include "sysemu/kvm.h"
 #include "trace.h"
 #include <assert.h>
 
-- 
1.7.10.4

[Qemu-devel] [PULL 4/4] vmdk: fix comment for vmdk_co_write_zeroes

[Michael Tokarev]

From: Fam Zheng <famz@redhat.com>

The comment was truncated. Add the missing parts, especially explain why
we need zero_dry_run.

Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 block/vmdk.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/block/vmdk.c b/block/vmdk.c
index 3756333..e6c50b1 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -1200,8 +1200,10 @@ static coroutine_fn int vmdk_co_read(BlockDriverState *bs, int64_t sector_num,
 /**
  * vmdk_write:
  * @zeroed:       buf is ignored (data is zero), use zeroed_grain GTE feature
- * if possible, otherwise return -ENOTSUP.
- * @zero_dry_run: used for zeroed == true only, don't update L2 table, just
+ *                if possible, otherwise return -ENOTSUP.
+ * @zero_dry_run: used for zeroed == true only, don't update L2 table, just try
+ *                with each cluster. By dry run we can find if the zero write
+ *                is possible without modifying image data.
  *
  * Returns: error code with 0 for success.
  */
@@ -1328,6 +1330,8 @@ static int coroutine_fn vmdk_co_write_zeroes(BlockDriverState *bs,
     int ret;
     BDRVVmdkState *s = bs->opaque;
     qemu_co_mutex_lock(&s->lock);
+    /* write zeroes could fail if sectors not aligned to cluster, test it with
+     * dry_run == true before really updating image */
     ret = vmdk_write(bs, sector_num, NULL, nb_sectors, true, true);
     if (!ret) {
         ret = vmdk_write(bs, sector_num, NULL, nb_sectors, true, false);
-- 
1.7.10.4