[Qemu-devel] [PULL 0/5] Trivial patches for July 3 to 13 2012

[Qemu-devel] [PULL 0/5] Trivial patches for July 3 to 13 2012

[Stefan Hajnoczi]

The following changes since commit c0958559b1a589a0d189c45ea1adaa6b345f4256:

  iov: Fix do_send_recv() for MinGW (also fixes a build breakage) (2012-07-11 08:51:50 -0500)

are available in the git repository at:

  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to 8f67aa8265b7aef104ffab6431048dec8d5656c7:

  make: Remove 'build-all' rule (2012-07-13 10:38:16 +0100)

----------------------------------------------------------------
Amos Kong (1):
      vnc: add a more descriptive error message

Hannes Reinecke (1):
      megasas: mark mfi_frame_desc as 'static'

Michael Tokarev (1):
      qemu-keymaps: Finnish keyboard mapping broken

Stefan Weil (2):
      bitops: Fix documentation
      make: Remove 'build-all' rule

 Makefile           |    6 +++---
 bitops.h           |    8 ++++----
 hw/megasas.c       |    2 +-
 pc-bios/keymaps/fi |    2 --
 vl.c               |    5 ++++-
 5 files changed, 12 insertions(+), 11 deletions(-)

-- 
1.7.10.4

[Qemu-devel] [PATCH 1/5] megasas: mark mfi_frame_desc as 'static'

[Stefan Hajnoczi]

From: Hannes Reinecke <hare@suse.de>

Suggested by blue swirl. Patch is on top of Paolo's
scsi-next tree.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/megasas.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/megasas.c b/hw/megasas.c
index b48836f..b99fa97 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -45,7 +45,7 @@
 #define MEGASAS_FLAG_USE_QUEUE64   2
 #define MEGASAS_MASK_USE_QUEUE64   (1 << MEGASAS_FLAG_USE_QUEUE64)
 
-const char *mfi_frame_desc[] = {
+static const char *mfi_frame_desc[] = {
     "MFI init", "LD Read", "LD Write", "LD SCSI", "PD SCSI",
     "MFI Doorbell", "MFI Abort", "MFI SMP", "MFI Stop"};
 
-- 
1.7.10.4

[Qemu-devel] [PATCH 2/5] bitops: Fix documentation

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 bitops.h |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitops.h b/bitops.h
index b967ef3..c456232 100644
--- a/bitops.h
+++ b/bitops.h
@@ -319,8 +319,8 @@ static inline uint64_t extract64(uint64_t value, int start, int length)
  * @value. Bits of @value outside the bit field are not modified.
  * Bits of @fieldval above the least significant @length bits are
  * ignored. The bit field must lie entirely within the 32 bit word.
- * It is valid to request that all 64 bits are modified (ie @length
- * 64 and @start 0).
+ * It is valid to request that all 32 bits are modified (ie @length
+ * 32 and @start 0).
  *
  * Returns: the modified @value.
  */
@@ -334,7 +334,7 @@ static inline uint32_t deposit32(uint32_t value, int start, int length,
 }
 
 /**
- * deposit32:
+ * deposit64:
  * @value: initial value to insert bit field into
  * @start: the lowest bit in the bit field (numbered from 0)
  * @length: the length of the bit field
@@ -344,7 +344,7 @@ static inline uint32_t deposit32(uint32_t value, int start, int length,
  * by the @start and @length parameters, and return the modified
  * @value. Bits of @value outside the bit field are not modified.
  * Bits of @fieldval above the least significant @length bits are
- * ignored. The bit field must lie entirely within the 32 bit word.
+ * ignored. The bit field must lie entirely within the 64 bit word.
  * It is valid to request that all 64 bits are modified (ie @length
  * 64 and @start 0).
  *
-- 
1.7.10.4

[Qemu-devel] [PATCH 3/5] vnc: add a more descriptive error message

[Stefan Hajnoczi]

From: Amos Kong <akong@redhat.com>

Currently qemu outputs some low-level error in qemu-sockets.c
when failed to start vnc server.
eg. 'getaddrinfo(127.0.0.1,5902): Name or service not known'

Some libvirt users could not know what's happened with this
unclear error message. This patch added a more descriptive
error message.

Signed-off-by: Amos Kong <akong@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 vl.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vl.c b/vl.c
index 2e140f5..46248b9 100644
--- a/vl.c
+++ b/vl.c
@@ -3584,8 +3584,11 @@ int main(int argc, char **argv, char **envp)
     /* init remote displays */
     if (vnc_display) {
         vnc_display_init(ds);
-        if (vnc_display_open(ds, vnc_display) < 0)
+        if (vnc_display_open(ds, vnc_display) < 0) {
+            fprintf(stderr, "Failed to start VNC server on `%s'\n",
+                    vnc_display);
             exit(1);
+        }
 
         if (show_vnc_port) {
             printf("VNC server running on `%s'\n", vnc_display_local_addr(ds));
-- 
1.7.10.4

[Qemu-devel] [PATCH 4/5] qemu-keymaps: Finnish keyboard mapping broken

[Stefan Hajnoczi]

From: Michael Tokarev <mjt@tls.msk.ru>

As mentioned in http://bugs.debian.org/660154 , finnish keyboard mapping
is kind of broken.  Fix it as Timo Sirainen suggests in #660154.

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 pc-bios/keymaps/fi |    2 --
 1 file changed, 2 deletions(-)

diff --git a/pc-bios/keymaps/fi b/pc-bios/keymaps/fi
index 2a4e0f0..4be7586 100644
--- a/pc-bios/keymaps/fi
+++ b/pc-bios/keymaps/fi
@@ -99,9 +99,7 @@ asterisk 0x2b shift
 acute 0x2b altgr
 multiply 0x2b shift altgr
 guillemotleft 0x2c altgr
-less 0x2c shift altgr
 guillemotright 0x2d altgr
-greater 0x2d shift altgr
 copyright 0x2e altgr
 leftdoublequotemark 0x2f altgr
 grave 0x2f shift altgr
-- 
1.7.10.4

[Qemu-devel] [PATCH 5/5] make: Remove 'build-all' rule

[Stefan Hajnoczi]

From: Stefan Weil <sw@weilnetz.de>

It is not needed, because the 'all' rule does the same.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 34d6a9e..6eeabd0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ BUILD_DIR=$(CURDIR)
 # All following code might depend on configuration variables
 ifneq ($(wildcard config-host.mak),)
 # Put the all: rule here so that config-host.mak can contain dependencies.
-all: build-all
+all:
 include config-host.mak
 include $(SRC_PATH)/rules.mak
 config-host.mak: $(SRC_PATH)/configure
@@ -31,7 +31,7 @@ Makefile: ;
 configure: ;
 
 .PHONY: all clean cscope distclean dvi html info install install-doc \
-	pdf recurse-all speed tar tarbin test build-all
+	pdf recurse-all speed tar tarbin test
 
 $(call set-vpath, $(SRC_PATH))
 
@@ -82,7 +82,7 @@ defconfig:
 
 -include config-all-devices.mak
 
-build-all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
+all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
 
 config-host.h: config-host.h-timestamp
 config-host.h-timestamp: config-host.mak
-- 
1.7.10.4

Re: [Qemu-devel] [PULL 0/5] Trivial patches for July 3 to 13 2012

[Blue Swirl]

On Fri, Jul 13, 2012 at 10:37 AM, Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com> wrote:
> The following changes since commit c0958559b1a589a0d189c45ea1adaa6b345f4256:
>
>   iov: Fix do_send_recv() for MinGW (also fixes a build breakage) (2012-07-11 08:51:50 -0500)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git trivial-patches

Thanks, pulled.

>
> for you to fetch changes up to 8f67aa8265b7aef104ffab6431048dec8d5656c7:
>
>   make: Remove 'build-all' rule (2012-07-13 10:38:16 +0100)
>
> ----------------------------------------------------------------
> Amos Kong (1):
>       vnc: add a more descriptive error message
>
> Hannes Reinecke (1):
>       megasas: mark mfi_frame_desc as 'static'
>
> Michael Tokarev (1):
>       qemu-keymaps: Finnish keyboard mapping broken
>
> Stefan Weil (2):
>       bitops: Fix documentation
>       make: Remove 'build-all' rule
>
>  Makefile           |    6 +++---
>  bitops.h           |    8 ++++----
>  hw/megasas.c       |    2 +-
>  pc-bios/keymaps/fi |    2 --
>  vl.c               |    5 ++++-
>  5 files changed, 12 insertions(+), 11 deletions(-)
>
> --
> 1.7.10.4
>
>