From a97ad268f137421fda1c84fa5898bd9a9850a472 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Wed, 4 Jul 2012 12:02:07 +0200 Subject: [PATCH 1/5] megasas: mark mfi_frame_desc as 'static' Suggested by blue swirl. Patch is on top of Paolo's scsi-next tree. Signed-off-by: Hannes Reinecke Cc: Paolo Bonzini Cc: Blue Swirl Signed-off-by: Stefan Hajnoczi --- hw/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/megasas.c b/hw/megasas.c index b48836fff1..b99fa9792e 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"}; From ab411770440379765e492a8613c4ed6a0761e417 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 8 Jul 2012 22:31:21 +0200 Subject: [PATCH 2/5] bitops: Fix documentation Signed-off-by: Stefan Weil Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- bitops.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bitops.h b/bitops.h index b967ef36c5..c45623245f 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). * From 94b204ca4eb03ae01e5c05509a40903c779ea83c Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Sat, 30 Jun 2012 10:02:20 +0800 Subject: [PATCH 3/5] vnc: add a more descriptive error message 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 Reviewed-by: Michael Tokarev Signed-off-by: Stefan Hajnoczi --- vl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 2e140f57c7..46248b9c1c 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)); From 0ef62ccd010b835858e81412e6c0cd52c60950dd Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Thu, 12 Jul 2012 12:59:12 +0100 Subject: [PATCH 4/5] qemu-keymaps: Finnish keyboard mapping broken 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 Signed-off-by: Stefan Hajnoczi --- pc-bios/keymaps/fi | 2 -- 1 file changed, 2 deletions(-) diff --git a/pc-bios/keymaps/fi b/pc-bios/keymaps/fi index 2a4e0f0454..4be75865a9 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 From 8f67aa8265b7aef104ffab6431048dec8d5656c7 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 9 Jul 2012 20:36:36 +0200 Subject: [PATCH 5/5] make: Remove 'build-all' rule It is not needed, because the 'all' rule does the same. Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 34d6a9e52c..6eeabd0b74 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