mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,352 Commits 50 Branches 394 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Tsuneo Saito 321365ab17 SPARC64: introduce a convenience function for getting physical addresses 
Introduce cpu_sparc_get_phys_page() to be used as a help for splitting
cpu_get_phys_page_debug() from cpu_get_phys_page_nofault().

Signed-off-by: Tsuneo Saito <tsnsaito@gmail.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
2011-07-21 19:59:29 +00:00
audio
coreaudio: Fix OSStatus format specifier
2011-06-23 18:56:58 +04:00
block
block/raw-posix: Linux compat-ioctl warning workaround
2011-07-05 11:23:29 +02:00
bsd-user
user: Fix -d debug logging for usermode emulation
2011-06-28 20:57:09 +02:00
darwin-user
user: Fix -d debug logging for usermode emulation
2011-06-28 20:57:09 +02:00
default-configs
target-alpha: Enable the alpha-softmmu target.
2011-05-31 10:18:05 -07:00
docs
usb: update documentation
2011-07-08 11:25:56 +02:00
fpu
softfloat: add float*_is_zero_or_denormal()
2011-06-03 16:07:53 +02:00
fsdev
fsdev: Fix archs that dont use fsdev
2011-06-10 15:29:11 +02:00
gdb-xml
…
hw
ds1225y: convert to qdev device, and use it in MIPS Jazz emulation
2011-07-20 20:54:51 +00:00
libcacard
libcacard: add libcacard.la target
2011-06-14 09:34:34 -05:00
linux-headers
Import kernel headers
2011-06-20 15:13:34 -03:00
linux-user
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
2011-07-19 07:43:51 -05:00
net
Strip trailing '\n' from error_report()'s first argument
2011-06-24 09:13:36 +01:00
pc-bios
Update OpenBIOS images for Sparc32 and Sparc64
2011-07-20 22:06:33 +00:00
QMP
QMP: add server mode to QEMUMonitorProtocol
2011-06-01 11:43:18 -03:00
roms
Revert SeaBIOS change due to overzealous commit -a
2011-04-13 08:16:53 -05:00
scripts
checkpatch: Fix bracing false positives on #if
2011-07-20 21:07:24 +00:00
slirp
add a service to reap zombies, use it in SLIRP
2011-03-29 08:14:11 -05:00
sysconfigs/target
…
target-alpha
Fix unassigned memory access handling
2011-07-20 21:28:08 +00:00
target-arm
Merge branch 'for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
2011-07-20 20:23:01 +00:00
target-cris
cris: Handle opcode zero
2011-06-28 20:52:37 +02:00
target-i386
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
target-lm32
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
target-m68k
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
target-microblaze
Fix unassigned memory access handling
2011-07-20 21:28:08 +00:00
target-mips
Fix unassigned memory access handling
2011-07-20 21:28:08 +00:00
target-ppc
target-alpha, target-ppc: Remove unnecessary setjmp.h include
2011-07-12 21:01:20 +00:00
target-s390x
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
target-sh4
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
target-sparc
SPARC64: introduce a convenience function for getting physical addresses
2011-07-21 19:59:29 +00:00
target-unicore32
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
tcg
tcg/mips: Fix regression caused by typo (copy + paste bug)
2011-07-20 21:03:37 +00:00
tests
Fix spelling in comments (intruction -> instruction)
2011-05-08 10:59:15 +01:00
ui
qxl: set mm_time in vga update
2011-07-04 15:35:12 +02:00
.gitignore
Makefile: Clean up after "make pdf"
2011-04-16 12:24:28 +01:00
.gitmodules
Add ipxe submodule
2011-04-08 13:03:34 -06:00
a.out.h
…
acl.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
acl.h
…
aes.c
…
aes.h
…
aio.c
…
alpha-dis.c
target-alpha: Disassemble EV6 PALcode instructions.
2011-05-31 10:18:04 -07:00
alpha.ld
…
arch_init.c
Introduce -machine command option.
2011-05-08 10:09:59 +02:00
arch_init.h
Introduce -machine command option.
2011-05-08 10:09:59 +02:00
arm-dis.c
arm-dis: Include opcode hex when doing disassembly
2011-01-12 15:10:47 +01:00
arm-semi.c
arm-semi: Provide access to CLI arguments passed through the "-append" option
2011-07-11 16:05:46 +03:00
arm.ld
…
async.c
Allow nested qemu_bh_poll() after BH deletion
2011-06-15 15:43:20 +02:00
balloon.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
balloon.h
…
bitmap.c
bitmap: add a generic bitmap and bitops library
2011-02-23 16:28:29 -06:00
bitmap.h
bitmap: add a generic bitmap and bitops library
2011-02-23 16:28:29 -06:00
bitops.c
bitmap: add a generic bitmap and bitops library
2011-02-23 16:28:29 -06:00
bitops.h
bitops: fix error on OpenBSD and mingw32
2011-02-25 17:21:22 +00:00
block_int.h
Replaced tabs with spaces in block.h and block_int.h
2011-06-15 14:36:15 +02:00
block-migration.c
Strip trailing '\n' from error_report()'s first argument
2011-06-24 09:13:36 +01:00
block-migration.h
…
block.c
bdrv_img_create: Fix segfault
2011-06-08 11:56:40 +02:00
block.h
Replaced tabs with spaces in block.h and block_int.h
2011-06-15 14:36:15 +02:00
blockdev.c
block: drive_init(): Improve CHS setting error message
2011-07-05 11:23:30 +02:00
blockdev.h
blockdev: Store -drive option media in DriveInfo
2011-05-19 10:26:21 +02:00
bswap.h
bswap.h: add cpu_to_be64wu()
2011-01-10 10:55:10 +01:00
bt-host.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
bt-host.h
…
bt-vhci.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
buffered_file.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
buffered_file.h
…
cache-utils.c
Remove trailing whitespace
2010-11-01 00:54:06 +03:00
cache-utils.h
Delete useless 'extern' qualifiers for functions
2011-01-23 16:21:20 +00:00
Changelog
Changelog: Add explanatory note that this file is no longer updated
2011-06-13 21:16:27 +02:00
check-qdict.c
check-qdict: Fix possible crash
2011-02-20 18:45:09 +01:00
check-qfloat.c
…
check-qint.c
…
check-qjson.c
Silence compiler warning in json test case
2010-10-22 10:08:37 -02:00
check-qlist.c
…
check-qstring.c
…
cmd.c
cmd: fix operator precedence
2011-06-20 17:08:57 +01:00
cmd.h
Delete useless 'extern' qualifiers for functions
2011-01-23 16:21:20 +00:00
CODING_STYLE
checkpatch: adjust to QEMUisms
2011-01-20 20:58:56 +00:00
compatfd.c
sigfd: use pthread_sigmask
2011-06-10 23:18:19 +02:00
compatfd.h
signalfd compatibility
2010-10-20 16:15:04 -05:00
config.h
…
configure
xen: Clean up build system
2011-07-17 01:54:24 +02:00
console.c
Align dummy display to fixed-size active console
2011-06-24 09:13:36 +01:00
console.h
Make VNC support optional
2011-03-22 08:39:12 -05:00
COPYING
…
COPYING.LIB
…
cpu-all.h
exec.h: fix coding style and change cpu_has_work to return bool
2011-06-26 18:25:26 +00:00
cpu-common.h
Avoid CPU endian memory accesses in devices
2011-07-20 21:22:43 +00:00
cpu-defs.h
Expose thread_id in info cpus
2011-03-16 17:11:07 -03:00
cpu-exec.c
tcg: Reload local variables after return from longjmp
2011-07-12 20:53:28 +00:00
cpus.c
Fix signal handling of SIG_IPI when io-thread is enabled
2011-07-16 19:43:00 +00:00
cpus.h
Command line support for altering the log file location
2011-06-15 16:51:24 +00:00
cris-dis.c
cris: Support disassembly of crisv10
2011-01-10 22:31:09 +01:00
cursor_hidden.xpm
…
cursor_left_ptr.xpm
…
cursor.c
…
cutils.c
QCOW2: bug fix - read base image beyond its size
2011-02-10 13:23:44 +01:00
def-helper.h
…
device_tree.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
device_tree.h
Allow qemu_devtree_setprop() to take arbitrary values
2011-04-01 18:34:54 +02:00
dis-asm.h
target-alpha: Disassemble EV6 PALcode instructions.
2011-05-31 10:18:04 -07:00
disas.c
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
disas.h
Remove special handling of system include files (no longer needed)
2010-10-22 17:11:28 +00:00
dma-helpers.c
make dma_bdrv_io available to drivers
2011-06-15 14:36:16 +02:00
dma.h
make dma_bdrv_io available to drivers
2011-06-15 14:36:16 +02:00
dyngen-exec.h
Remove special handling of system include files (no longer needed)
2010-10-22 17:11:28 +00:00
elf.h
unicore32: necessary modifications for other files to support unicore32
2011-04-12 18:49:05 +00:00
envlist.c
…
envlist.h
Delete useless 'extern' qualifiers for functions
2011-01-23 16:21:20 +00:00
error_int.h
Introduce the new error framework
2011-06-07 13:52:10 -05:00
error.c
error framework: Fix compilation for w32/w64
2011-06-16 11:42:40 -03:00
error.h
error framework: Fix compilation for w32/w64
2011-06-16 11:42:40 -03:00
exec-all.h
Fix unassigned memory access handling
2011-07-20 21:28:08 +00:00
exec.c
Fix unassigned memory access handling
2011-07-20 21:28:08 +00:00
gdbstub.c
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
gdbstub.h
Add scripts directory
2011-01-20 20:54:21 +00:00
gen-icount.h
Fix conversions from pointer to tcg_target_long
2011-04-10 00:45:16 +02:00
HACKING
HACKING: Update status of format checking
2011-02-25 16:31:05 -06:00
hmp-commands.hx
HMP: Use QMP inject nmi implementation
2011-06-01 11:42:25 -03:00
host-utils.c
…
host-utils.h
…
hpet.h
…
hppa-dis.c
hppa: Fix printf warnings in hppa-dis.c.
2011-07-01 21:06:48 +00:00
hppa.ld
…
i386-dis.c
…
i386.ld
…
ia64-dis.c
…
ia64.ld
…
input.c
pxa2xx_lcd: add proper rotation support
2011-07-04 22:12:21 +02:00
iohandler.c
add a service to reap zombies, use it in SLIRP
2011-03-29 08:14:11 -05:00
ioport-user.c
…
ioport.c
ioport: Improve error output
2011-03-06 21:01:32 +01:00
ioport.h
Type-safe ioport callbacks
2010-11-21 09:16:57 -06:00
iorange.h
Type-safe ioport callbacks
2010-11-21 09:16:57 -06:00
iov.c
…
iov.h
…
json-lexer.c
json-lexer: make lexer error-recovery more deterministic
2011-06-07 13:52:11 -05:00
json-lexer.h
json-lexer: make lexer error-recovery more deterministic
2011-06-07 13:52:11 -05:00
json-parser.c
json-parser: add handling for NULL token list
2011-06-07 13:52:11 -05:00
json-parser.h
json-parser: propagate error from parser
2011-06-07 13:52:10 -05:00
json-streamer.c
json-streamer: add handling for JSON_ERROR token/state
2011-06-07 13:52:11 -05:00
json-streamer.h
json-streamer: make sure to reset token_size after emitting a token list
2011-06-07 13:52:11 -05:00
kvm-all.c
kvm: Drop KVM_CAP build dependencies
2011-06-20 15:18:43 -03:00
kvm-stub.c
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
kvm.h
kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid
2011-06-20 15:24:00 -03:00
libfdt_env.h
Fix libfdt warnings on Darwin
2011-06-14 03:08:57 +02:00
LICENSE
…
linux-aio.c
…
m68k-dis.c
*-dis: Replace fprintf_ftype by fprintf_function (format checking)
2010-12-04 20:50:30 +00:00
m68k-semi.c
m68k-semi.c: Use correct check for failure of do_brk()
2011-06-21 20:29:01 +03:00
m68k.ld
…
MAINTAINERS
MAINTAINERS: Fix typo in email address
2011-06-24 09:13:37 +01:00
Makefile
libcacard: add libcacard.la target
2011-06-14 09:34:34 -05:00
Makefile.dis
…
Makefile.hw
…
Makefile.objs
Avoid CPU endian memory accesses in devices
2011-07-20 21:22:43 +00:00
Makefile.target
Avoid CPU endian memory accesses in devices
2011-07-20 21:22:43 +00:00
Makefile.user
…
microblaze-dis.c
*-dis: Replace fprintf_ftype by fprintf_function (format checking)
2010-12-04 20:50:30 +00:00
migration-exec.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
migration-fd.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
migration-tcp.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
migration-unix.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
migration.c
Improve vm_stop reason declarations
2011-02-14 12:39:46 -02:00
migration.h
migration: move some declarations to migration.h
2011-04-15 20:14:54 +00:00
mips-dis.c
*-dis: Replace fprintf_ftype by fprintf_function (format checking)
2010-12-04 20:50:30 +00:00
mips.ld
…
module.c
…
module.h
…
monitor.c
Remove exec-all.h include directives
2011-06-26 18:25:35 +00:00
monitor.h
spice: connection events.
2010-12-09 14:23:24 +01:00
nbd.c
NBD: Use qemu_socket functions to open TCP and UNIX sockets
2011-04-07 13:51:48 +02:00
nbd.h
NBD: Use qemu_socket functions to open TCP and UNIX sockets
2011-04-07 13:51:48 +02:00
net.c
Strip trailing '\n' from error_report()'s first argument
2011-06-24 09:13:36 +01:00
net.h
net: Warn about "-net nic" options which were ignored
2011-06-22 07:18:39 -05:00
notify.c
…
notify.h
…
os-posix.c
os-posix: set groups properly for -runas
2011-07-12 21:41:29 +00:00
os-win32.c
Introduce format string for pid_t
2011-06-15 19:58:48 +00:00
osdep.c
Remove unused sysemu.h include directives
2011-04-15 18:25:41 +00:00
osdep.h
Introduce format string for pid_t
2011-06-15 19:58:48 +00:00
oslib-posix.c
Darwin: Fix compilation warning regarding the deprecated daemon() function
2011-06-14 03:10:47 +02:00
oslib-win32.c
w32: Remove implementation of function ffs
2011-02-20 20:18:21 +00:00
path.c
user: speed up init_paths a bit
2011-02-09 10:33:54 +02:00
pci-ids.txt
…
pflib.c
add pflib: PixelFormat conversion library.
2010-09-21 18:35:30 +02:00
pflib.h
add pflib: PixelFormat conversion library.
2010-09-21 18:35:30 +02:00
poison.h
Avoid CPU endian memory accesses in devices
2011-07-20 21:22:43 +00:00
posix-aio-compat.c
Fix compilation warning due to missing header for sigaction (followup)
2011-06-08 09:04:29 +01:00
ppc64.ld
…
ppc-dis.c
…
ppc.ld
…
qbool.c
…
qbool.h
…
qdict-test-data.txt
…
qdict.c
QDict: Introduce qdict_get_try_bool()
2010-07-01 14:27:13 -03:00
qdict.h
QDict: Introduce qdict_get_try_bool()
2010-07-01 14:27:13 -03:00
qemu_socket.h
net: remove parse_host_src_port() function
2011-03-06 20:06:50 +01:00
qemu-aio.h
…
qemu-barrier.h
Introduce proper compiler barrier
2010-07-22 05:52:08 +02:00
qemu-char.c
Fix compilation warning due to missing header for sigaction (followup)
2011-06-08 09:04:29 +01:00
qemu-char.h
char: Allow devices to use a single multiplexed chardev.
2011-04-28 11:03:07 +05:30
qemu-common.h
Remove unneeded setjmp.h (fix compilation on Debian "lenny")
2011-07-12 20:57:08 +00:00
qemu-config.c
qemu-config: comment spell fix
2011-06-06 09:14:42 +02:00
qemu-config.h
spice: core bits
2010-09-21 18:36:42 +02:00
qemu-doc.texi
doc: Add explanation that -alt-grab and -ctrl-grab affect special keys
2011-05-15 00:13:48 +02:00
qemu-error.c
Strip trailing '\n' from error_report()'s first argument
2011-06-24 09:13:36 +01:00
qemu-error.h
Use GCC_FMT_ATTR (format checking)
2010-10-03 06:34:51 +00:00
qemu-img-cmds.hx
qemu-img: Add cache command line option
2011-07-05 11:23:29 +02:00
qemu-img.c
qemu-img: Add cache command line option
2011-07-05 11:23:29 +02:00
qemu-img.texi
Documentation: Remove outdated host_device note
2011-07-05 11:23:29 +02:00
qemu-io.c
block: clarify the meaning of BDRV_O_NOCACHE
2011-06-08 10:39:32 +02:00
qemu-lock.h
qemu-lock.h: Remove non-pthreads spinlock implementations
2011-02-20 15:20:06 +01:00
qemu-log.h
…
qemu-malloc.c
Add missing tracing to qemu_mallocz()
2010-12-14 15:44:21 +01:00
qemu-nbd.c
Darwin: Fix compilation warning regarding the deprecated daemon() function
2011-06-14 03:10:47 +02:00
qemu-nbd.texi
…
qemu-objects.h
…
qemu-option.c
qemu-option: Fix parse_option_parameters() documentation typo
2010-12-14 15:44:21 +01:00
qemu-option.h
error: New qemu_opts_loc_restore()
2010-07-06 17:05:49 +02:00
qemu-options.h
…
qemu-options.hx
pxa2xx_lcd: add proper rotation support
2011-07-04 22:12:21 +02:00
qemu-os-posix.h
virtio-9p: fix build on !CONFIG_UTIMENSAT
2010-12-02 16:08:40 -08:00
qemu-os-win32.h
w32: Fix missing declaration of ffs()
2011-05-15 12:34:39 +02:00
qemu-progress.c
Fix compilation warning due to missing header for sigaction (followup)
2011-06-08 09:04:29 +01:00
qemu-queue.h
…
qemu-sockets.c
Set errno=ENOTSUP for attempts to use UNIX sockets on Windows platforms
2011-04-07 13:51:48 +02:00
qemu-tech.texi
qemu-tech: Spelling fixes
2011-01-09 20:59:53 +00:00
qemu-thread-posix.c
qemu-thread: delete unused functions
2011-03-19 08:30:28 +00:00
qemu-thread-posix.h
add Win32 IPI service
2011-03-13 14:44:22 +00:00
qemu-thread-win32.c
w32: Add missing functions qemu_mutex_destroy, qemu_cond_destroy
2011-03-19 08:29:35 +00:00
qemu-thread-win32.h
add win32 qemu-thread implementation
2011-03-13 14:44:21 +00:00
qemu-thread.h
qemu-thread.h: include inttypes.h
2011-04-01 19:07:48 -05:00
qemu-timer-common.c
Add OpenBSD to ifdef list since it has CLOCK_MONOTONIC.
2010-12-21 19:44:42 +00:00
qemu-timer.c
timer: drop HPET and RTC
2011-06-06 08:54:55 -05:00
qemu-timer.h
qemu-timer: Remove unneeded include statement (w32)
2011-04-27 13:30:18 +02:00
qemu-tool.c
qemu-tool: Stub out qemu-timer functions
2011-05-18 14:38:46 +02:00
qemu-x509.h
…
qemu.sasl
…
qerror.c
Merge remote-tracking branch 'qmp/for-anthony' into staging
2011-06-08 12:16:24 -05:00
qerror.h
Merge remote-tracking branch 'qmp/for-anthony' into staging
2011-06-08 12:16:24 -05:00
qfloat.c
…
qfloat.h
…
qint.c
…
qint.h
…
qjson.c
Add support for JSON pretty printing
2010-10-01 10:12:43 -03:00
qjson.h
Merge remote branch 'qmp/for-anthony' into staging
2010-10-05 13:54:49 -05:00
qlist.c
…
qlist.h
…
qmp-commands.hx
HMP: Use QMP inject nmi implementation
2011-06-01 11:42:25 -03:00
qobject.h
…
qstring.c
…
qstring.h
…
range.h
Introduce range.h
2010-09-18 05:53:14 +00:00
readline.c
…
readline.h
…
README
…
rules.mak
libcacard: add libcacard.la target
2011-06-14 09:34:34 -05:00
rwhandler.c
Make simple io mem handler endian aware
2010-12-11 15:24:25 +00:00
rwhandler.h
Make simple io mem handler endian aware
2010-12-11 15:24:25 +00:00
s390-dis.c
…
s390.ld
…
savevm.c
Reset system before loadvm
2011-06-16 11:42:40 -03:00
sh4-dis.c
*-dis: Replace fprintf_ftype by fprintf_function (format checking)
2010-12-04 20:50:30 +00:00
simpletrace.c
simpletrace: Move st_init() error reporting
2011-03-15 18:03:26 +00:00
simpletrace.h
simpletrace: Move st_init() error reporting
2011-03-15 18:03:26 +00:00
softmmu_defs.h
…
softmmu_exec.h
…
softmmu_header.h
…
softmmu_template.h
…
softmmu-semi.h
…
sparc64.ld
…
sparc-dis.c
…
sparc.ld
…
spice-qemu-char.c
spice-qemu-char: Fix flow control in client -> guest direction
2011-06-06 09:14:42 +02:00
sysemu.h
Allow silent system resets
2011-06-16 11:42:40 -03:00
targphys.h
…
tcg-runtime.c
…
thunk.c
…
thunk.h
…
TODO
…
trace-events
ds1225y: use trace framework
2011-07-20 20:54:50 +00:00
translate-all.c
Delegate setup of TCG temporaries to targets
2011-06-26 18:25:43 +00:00
uboot_image.h
…
usb-bsd.c
usb: Add a speedmask to devices
2011-06-23 11:28:06 +02:00
usb-linux.c
usb-linux: allow "compatible" high speed devices to connect at fullspeed
2011-06-23 11:28:06 +02:00
usb-stub.c
…
user-exec.c
cpu_loop_exit: avoid using AREG0
2011-06-26 18:25:13 +00:00
VERSION
Open up the 0.15 development branch
2011-02-02 08:39:28 +01:00
version.rc
mingw: add version information to the executables
2010-09-26 16:07:57 +00:00
vgafont.h
…
vl.c
pxa2xx_lcd: add proper rotation support
2011-07-04 22:12:21 +02:00
x86_64.ld
…
xen-all.c
xen_console: support the new extended xenstore protocol
2011-07-17 01:54:25 +02:00
xen-mapcache.c
xen: Clean up map cache API naming
2011-07-17 01:54:24 +02:00
xen-mapcache.h
xen: Clean up map cache API naming
2011-07-17 01:54:24 +02:00
xen-stub.c
xen_console: support the new extended xenstore protocol
2011-07-17 01:54:25 +02:00

README 

Read the documentation in qemu-doc.html.

Fabrice Bellard.
Description
No description provided
Readme 404 MiB
Languages
C 82.6%
C++ 6.5%
Python 3.4%
Dylan 2.9%
Shell 1.6%
Other 2.8%