mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'trivial-patches' of git://github.com/stefanha/qemu

Browse Source 
* 'trivial-patches' of git://github.com/stefanha/qemu:
  make: Remove 'build-all' rule
  qemu-keymaps: Finnish keyboard mapping broken
  vnc: add a more descriptive error message
  bitops: Fix documentation
  megasas: mark mfi_frame_desc as 'static'
This commit is contained in:
Blue Swirl 2012-07-14 10:58:22 +00:00
commit 39a4ef1be6
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -6,7 +6,7 @@ BUILD_DIR=$(CURDIR)
# All following code might depend on configuration variables # All following code might depend on configuration variables
ifneq ($(wildcard config-host.mak),) ifneq ($(wildcard config-host.mak),)
# Put the all: rule here so that config-host.mak can contain dependencies. # Put the all: rule here so that config-host.mak can contain dependencies.
all: build-all all:
include config-host.mak include config-host.mak
include $(SRC_PATH)/rules.mak include $(SRC_PATH)/rules.mak
config-host.mak: $(SRC_PATH)/configure config-host.mak: $(SRC_PATH)/configure
@ -31,7 +31,7 @@ Makefile: ;
configure: ; configure: ;
.PHONY: all clean cscope distclean dvi html info install install-doc \ .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)) $(call set-vpath, $(SRC_PATH))
@ -82,7 +82,7 @@ defconfig:
-include config-all-devices.mak -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: config-host.h-timestamp
config-host.h-timestamp: config-host.mak config-host.h-timestamp: config-host.mak

8
bitops.h
View File

@ -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. * @value. Bits of @value outside the bit field are not modified.
* Bits of @fieldval above the least significant @length bits are * 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 32 bit word.
* It is valid to request that all 64 bits are modified (ie @length * It is valid to request that all 32 bits are modified (ie @length
* 64 and @start 0). * 32 and @start 0).
* *
* Returns: the modified @value. * 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 * @value: initial value to insert bit field into
* @start: the lowest bit in the bit field (numbered from 0) * @start: the lowest bit in the bit field (numbered from 0)
* @length: the length of the bit field * @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 * by the @start and @length parameters, and return the modified
* @value. Bits of @value outside the bit field are not modified. * @value. Bits of @value outside the bit field are not modified.
* Bits of @fieldval above the least significant @length bits are * 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 * It is valid to request that all 64 bits are modified (ie @length
* 64 and @start 0). * 64 and @start 0).
* *

2
hw/megasas.c
View File

@ -45,7 +45,7 @@
#define MEGASAS_FLAG_USE_QUEUE64 2 #define MEGASAS_FLAG_USE_QUEUE64 2
#define MEGASAS_MASK_USE_QUEUE64 (1 << MEGASAS_FLAG_USE_QUEUE64) #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 init", "LD Read", "LD Write", "LD SCSI", "PD SCSI",
"MFI Doorbell", "MFI Abort", "MFI SMP", "MFI Stop"}; "MFI Doorbell", "MFI Abort", "MFI SMP", "MFI Stop"};

2
pc-bios/keymaps/fi
View File

@ -99,9 +99,7 @@ asterisk 0x2b shift
acute 0x2b altgr acute 0x2b altgr
multiply 0x2b shift altgr multiply 0x2b shift altgr
guillemotleft 0x2c altgr guillemotleft 0x2c altgr
less 0x2c shift altgr
guillemotright 0x2d altgr guillemotright 0x2d altgr
greater 0x2d shift altgr
copyright 0x2e altgr copyright 0x2e altgr
leftdoublequotemark 0x2f altgr leftdoublequotemark 0x2f altgr
grave 0x2f shift altgr grave 0x2f shift altgr

5
vl.c
View File

@ -3584,8 +3584,11 @@ int main(int argc, char **argv, char **envp)
/* init remote displays */ /* init remote displays */
if (vnc_display) { if (vnc_display) {
vnc_display_init(ds); 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); exit(1);
}
if (show_vnc_port) { if (show_vnc_port) {
printf("VNC server running on `%s'\n", vnc_display_local_addr(ds)); printf("VNC server running on `%s'\n", vnc_display_local_addr(ds));