david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,689 Commits 1 Branch 0 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Alexander Graf a2236d4820 PPC: Add USB per default on U3 
Linux with CONFIG_PPC64 doesn't support ADB devices anymore, so we have to
use USB for keyboard and mouse.

This patch enables USB per default on U3 and adds a virtual keyboard and mouse
there.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
2010-02-14 16:10:54 +02:00
audio
audio: include more information into audio_bug's output
2010-01-17 02:03:30 +03:00
block
don't dereference NULL after failed strdup
2010-02-10 14:00:53 -06:00
bsd-user
bsd/darwin-user: mmap_frag() users only check for -1 error
2010-01-31 13:41:07 +00:00
darwin-user
bsd/darwin-user: mmap_frag() users only check for -1 error
2010-01-31 13:41:07 +00:00
default-configs
Add support for S390x system emulation
2009-12-05 17:36:05 +01:00
docs
docs: New qdev-device-use.txt
2010-01-13 17:14:16 -06:00
fpu
arm host: fix compiler warning
2010-02-06 23:16:05 +01:00
gdb-xml
gdb-xml: fix hacks in powerpc register numbering
2009-07-12 23:42:05 +02:00
hw
PPC: Add USB per default on U3
2010-02-14 16:10:54 +02:00
linux-user
linux-user: adapt uname machine to emulated CPU
2010-02-06 17:19:43 +01:00
net
Fix BSD build
2010-01-27 17:47:33 +00:00
pc-bios
Sparc32: Update OpenBIOS image to r666
2010-01-17 20:36:13 +00:00
QMP
QMP: spec: Capability negotiation updates
2010-02-10 12:46:05 -06:00
roms
seabios: use correct submodule hash
2010-02-03 12:36:25 -06:00
slirp
don't dereference NULL after failed strdup
2010-02-10 14:00:53 -06:00
target-alpha
Fix incorrect exception_index use
2010-02-14 07:23:50 +00:00
target-arm
target-arm: refactor cp15.c13 register access
2010-02-06 17:19:43 +01:00
target-cris
cris: Prettify register dumps.
2010-01-31 11:26:54 +01:00
target-i386
Merge remote branch 'qemu-kvm/uq/master' into staging-tmp
2010-02-08 10:06:54 -06:00
target-m68k
kill regs_to_env and env_to_regs
2010-01-19 16:31:02 -06:00
target-microblaze
kill regs_to_env and env_to_regs
2010-01-19 16:31:02 -06:00
target-mips
target-mips: don't call cpu_loop_exit() from helper.c
2010-02-06 17:23:33 +01:00
target-ppc
PPC: tell the guest about the time base frequency
2010-02-14 16:10:54 +02:00
target-s390x
Fix incorrect exception_index use
2010-02-14 07:23:50 +00:00
target-sh4
Fix incorrect exception_index use
2010-02-14 07:23:50 +00:00
target-sparc
sparc32 don't mark page dirty when failing
2010-01-31 07:49:26 +00:00
tcg
tcg/mips: fix crash in tcg_out_qemu_ld()
2010-02-09 22:54:22 +01:00
tests
Use vpath directive
2010-01-08 09:58:40 -06:00
.gitignore
Documentation: Add build support for documentation in pdf format
2010-02-10 11:56:56 -06:00
.gitmodules
Switch pc bios from pc-bios to seabios
2009-10-30 09:42:36 -05:00
a.out.h
…
acl.c
Fix sys-queue.h conflict for good
2009-09-12 07:36:22 +00:00
acl.h
Fix sys-queue.h conflict for good
2009-09-12 07:36:22 +00:00
aes.c
…
aes.h
…
aio.c
Add qemu_aio_process_queue()
2009-10-27 12:28:59 -05:00
alpha-dis.c
Remove PARAMS() macro
2009-09-25 19:53:21 +00:00
alpha.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
arm-dis.c
bdf: Remove last users of FALSE/TRUE
2009-10-05 09:32:44 -05:00
arm-semi.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
arm.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
async.c
Introduce contexts for asynchronous callbacks
2009-10-27 12:28:59 -05:00
balloon.h
virtio: Add memory statistics reporting to the balloon driver
2010-01-26 17:08:03 -06:00
block_int.h
block: add topology qdev properties
2010-02-10 16:53:25 -06:00
block-migration.c
Try not to exceed max downtime on stage3
2010-02-09 16:56:14 -06:00
block-migration.h
block migration: Report progress also via info migration
2009-12-03 10:48:53 -06:00
block.c
Monitor: remove unneeded checks
2010-02-10 13:46:17 -06:00
block.h
block: BLOCK_IO_ERROR QMP event
2010-02-10 11:57:03 -06:00
bswap.h
bwap: add qemu_bswap helper
2010-02-14 16:10:53 +02:00
bt-host.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
bt-host.h
…
bt-vhci.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
buffered_file.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
buffered_file.h
…
cache-utils.c
…
cache-utils.h
…
Changelog
Update version and changelog to sync with stable branch
2009-12-19 08:26:03 -06:00
check-qdict.c
QDict: Fix size update
2009-12-18 11:26:27 -06:00
check-qfloat.c
Add unit test for QFloat
2009-11-17 08:49:38 -06:00
check-qint.c
Fix and improve qint_from_int64_test
2009-09-26 21:26:26 +02:00
check-qjson.c
Add test suite for json marshalling
2009-11-17 08:49:40 -06:00
check-qlist.c
Introduce QList unit-tests
2009-10-08 21:17:18 -05:00
check-qstring.c
utests: Add qstring_from_substr() unit-test
2009-12-03 09:41:19 -06:00
cmd.c
Fix OpenBSD build of qemu-io
2009-11-21 09:06:46 +00:00
cmd.h
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
cocoa.m
Cocoa: Use optimized drawing for the window
2010-01-07 10:57:34 +03:00
CODING_STYLE
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
config.h
Makefile dependencies for device configs
2009-11-22 21:24:54 +00:00
configure
configure: fix the static compilation for sdl
2010-02-08 12:29:20 +01:00
console.c
vc: colorize chardev title line with blue background.
2009-12-12 07:59:42 -06:00
console.h
VNC: Convert do_info_vnc() to QObject
2009-12-12 07:59:49 -06:00
COPYING
…
COPYING.LIB
…
cpu-all.h
kvm: Flush coalesced MMIO buffer periodly
2010-02-03 19:47:33 -02:00
cpu-common.h
qemu: memory notifiers
2010-02-09 16:56:13 -06:00
cpu-defs.h
KVM: Move and rename regs_modified
2010-02-03 19:47:34 -02:00
cpu-exec.c
avoid unreachable statement after break
2010-01-19 16:31:03 -06:00
create_config
Configurable block format whitelist
2009-11-09 08:43:02 -06:00
cris-dis.c
bdf: Remove last users of FALSE/TRUE
2009-10-05 09:32:44 -05:00
curses_keys.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
curses.c
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
cutils.c
Probe for fdatasync()
2009-09-20 06:56:26 +00:00
d3des.c
…
d3des.h
…
def-helper.h
def-helper.h allow helpers returning pointers
2009-08-22 17:23:55 +00:00
device_tree.c
Fix device tree compile broken by ca20cf32ab3d945155141ef737f5d08ebb373e1d
2009-09-23 08:41:45 +02:00
device_tree.h
…
dis-asm.h
bdf: Remove last users of FALSE/TRUE
2009-10-05 09:32:44 -05:00
disas.c
sh4 disasm fixes
2009-11-14 01:19:12 +01:00
disas.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
dma-helpers.c
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
dma.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
dyngen-exec.h
S/390 fake TCG implementation
2009-12-05 17:36:00 +01:00
elf.h
tcg-i386: Implement small forward branches.
2010-02-06 22:23:39 +01:00
envlist.c
Fix sys-queue.h conflict for good
2009-09-12 07:36:22 +00:00
envlist.h
linux-user: compile envlist.c only once
2009-08-15 08:47:42 +00:00
exec-all.h
tcg: increase TCG_MAX_OP_SIZE to 192
2009-12-01 00:06:15 +00:00
exec.c
kvm: move kvm to use memory notifiers
2010-02-09 16:56:13 -06:00
feature_to_c.sh
Fix Sparse warnings: "Using plain integer as NULL pointer"
2009-07-31 21:16:51 +00:00
gdbstub.c
target-m68k: fix a typo in 'P' packet processing
2010-01-14 20:00:23 +01:00
gdbstub.h
…
gen-icount.h
target-arm: remove cpu_T for ARM once and for all
2009-10-17 23:52:18 +02:00
host-utils.c
user: compile host-utils.c only once
2009-08-16 08:03:26 +00:00
host-utils.h
target-alpha: Fix generic ctz64.
2009-12-17 18:12:04 +01:00
hostregs_helper.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
hpet.h
…
hppa-dis.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
hppa.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
hxtool
Fix hxtool.
2009-07-02 17:54:34 +00:00
i386-dis.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
i386.ld
Fix missing symbols in .rel/.rela.plt sections
2010-02-06 22:22:27 +01:00
ia64.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
input.c
move kbd/mouse handling to input.c
2010-01-13 17:14:14 -06:00
ioport-user.c
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
ioport.c
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
ioport.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
json-lexer.c
json: fix PRId64 on Win32
2010-02-10 12:47:58 -06:00
json-lexer.h
Add a lexer for JSON
2009-11-17 08:49:39 -06:00
json-parser.c
json: fix PRId64 on Win32
2010-02-10 12:47:58 -06:00
json-parser.h
Add a JSON parser
2009-11-17 08:49:39 -06:00
json-streamer.c
Add a JSON message boundary identifier
2009-11-17 08:49:39 -06:00
json-streamer.h
Add a JSON message boundary identifier
2009-11-17 08:49:39 -06:00
keymaps.c
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
keymaps.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
kvm-all.c
kvm: reduce code duplication in config_iothread
2010-02-10 12:45:04 -06:00
kvm.h
kvm: move kvm to use memory notifiers
2010-02-09 16:56:13 -06:00
libfdt_env.h
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
LICENSE
…
linux-aio.c
linux-aio: Honour AsyncContext
2009-10-27 12:28:59 -05:00
m68k-dis.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
m68k-semi.c
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
m68k.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
MAINTAINERS
Update MAINTAINERS
2010-02-06 19:24:42 +01:00
Makefile
Documentation: Add build support for documentation in pdf format
2010-02-10 11:56:56 -06:00
Makefile.hw
Use vpath directive
2010-01-08 09:58:40 -06:00
Makefile.objs
virtio-console: Rename virtio-serial.c back to virtio-console.c
2010-01-26 15:42:02 -06:00
Makefile.target
rwhandler: simplified way to register for mem/io
2010-02-14 16:10:53 +02:00
Makefile.user
Use vpath directive
2010-01-08 09:58:40 -06:00
microblaze-dis.c
microblaze: Update disasm to latest GPLv2 version.
2009-12-10 12:33:49 +01:00
migration-exec.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
migration-fd.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
migration-tcp.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
migration-unix.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
migration.c
Monitor: remove unneeded checks
2010-02-10 13:46:17 -06:00
migration.h
monitor: convert do_migrate_set_downtime() to QObject
2010-02-03 12:36:26 -06:00
mips-dis.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
mips.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
module.c
Fix sys-queue.h conflict for good
2009-09-12 07:36:22 +00:00
module.h
…
monitor.c
QMP: Don't leak on connection close
2010-02-10 13:46:17 -06:00
monitor.h
QMP: BLOCK_IO_ERROR event handling
2010-02-10 11:57:02 -06:00
nbd.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
nbd.h
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
net-checksum.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
net.c
don't dereference NULL after failed strdup
2010-02-10 14:00:53 -06:00
net.h
net: add API to disable/enable polling
2010-01-08 09:58:40 -06:00
osdep.c
fix placement of config-host.h inclusion
2010-02-10 11:56:56 -06:00
osdep.h
qdev: move DO_UPCAST() into osdep.h
2009-12-03 09:41:29 -06:00
path.c
path.c fix warning with _FORTIFY_SOURCE
2009-12-25 18:19:15 +00:00
pci-ids.txt
…
posix-aio-compat.c
posix-aio-compat.c: fix warning with _FORTIFY_SOURCE
2010-01-26 14:59:19 -06:00
ppc64.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
ppc-dis.c
Work around OpenSolaris sys/regset.h namespace pollution
2009-09-12 12:36:11 +00:00
ppc.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
qbool.c
Add a QBool type
2009-11-17 08:49:39 -06:00
qbool.h
Add a QBool type
2009-11-17 08:49:39 -06:00
qdict-test-data.txt
Introduce QDict test data file
2009-09-04 09:37:34 -05:00
qdict.c
QDict: New qdict_get_double()
2010-02-03 12:36:25 -06:00
qdict.h
QDict: New qdict_get_double()
2010-02-03 12:36:25 -06:00
qemu_socket.h
net: Make inet_strfamily() public
2010-01-20 08:25:23 -06:00
qemu-aio.h
Add qemu_aio_process_queue()
2009-10-27 12:28:59 -05:00
qemu-binfmt-conf.sh
target-alpha: Add binfmt entry.
2009-12-13 20:32:36 +01:00
qemu-char.c
Do not ignore error, if open file failed (-serial /dev/tty)
2010-02-10 11:56:56 -06:00
qemu-char.h
char: Convert qemu_chr_info() to QObject
2009-12-12 07:59:49 -06:00
qemu-common.h
pci: move pcibus_t to qemu-common
2010-02-14 16:10:53 +02:00
qemu-config.c
rework -monitor handling, switch to QemuOpts
2009-12-12 07:59:43 -06:00
qemu-config.h
defaults: update device_list[]
2009-12-18 11:26:27 -06:00
qemu-doc.texi
Documentation: Enhance documentation (index, keywords)
2010-02-10 12:44:15 -06:00
qemu-img-cmds.hx
qemu-img rebase
2010-01-13 17:14:15 -06:00
qemu-img.c
qemu-img: use the heap instead of the huge stack array for win32
2010-02-10 14:00:53 -06:00
qemu-img.texi
Documentation: Add options to image format descriptions
2009-11-09 08:43:12 -06:00
qemu-io.c
block: kill BDRV_O_CREAT
2010-01-26 15:42:02 -06:00
qemu-lock.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
qemu-log.h
…
qemu-malloc.c
Do not abort on qemu_malloc(0) in production builds
2009-12-12 07:59:37 -06:00
qemu-monitor.hx
QMP: Introduce the qmp_capabilities command
2010-02-10 12:46:05 -06:00
qemu-nbd.c
win32: pair qemu_memalign() with qemu_vfree()
2010-01-26 16:41:06 -06:00
qemu-nbd.texi
…
qemu-objects.h
Introduce qemu-objects.h header file
2009-12-12 07:59:45 -06:00
qemu-option.c
qemu-option: Make qemu_opts_foreach() accumulate return values
2010-02-03 12:39:01 -06:00
qemu-option.h
Add qemu_opts_validate() for post parsing validation
2009-10-06 14:36:11 -05:00
qemu-options.hx
Documentation: Add command line options to function index
2010-02-10 12:44:25 -06:00
qemu-queue.h
Import a simple queue implementation from NetBSD
2009-12-03 10:48:52 -06:00
qemu-sockets.c
fix inet_parse typo
2010-02-10 12:46:06 -06:00
qemu-tech.texi
Documentation: Use UTF-8 encoding and fix one wrong encoding
2010-02-10 12:43:04 -06:00
qemu-thread.c
qemu-thread: use pthread_equal
2009-07-22 10:58:49 -05:00
qemu-thread.h
…
qemu-timer.h
add qemu_get_clock_ns
2010-02-09 16:56:13 -06:00
qemu-tool.c
QMP: Asynchronous events infrastructure
2009-12-03 09:41:23 -06:00
qemu.sasl
…
qerror.c
Revert "QError: New QERR_INVALID_CPU_INDEX"
2010-02-03 12:39:01 -06:00
qerror.h
Revert "QError: New QERR_INVALID_CPU_INDEX"
2010-02-03 12:39:01 -06:00
qfloat.c
Add a QFloat datatype
2009-11-17 08:49:38 -06:00
qfloat.h
Add a QFloat datatype
2009-11-17 08:49:38 -06:00
qint.c
Shuffle lines to avoid gcc 3 warning about redundant redeclaration
2009-09-04 17:43:37 +00:00
qint.h
Introduce QInt
2009-09-04 09:37:29 -05:00
qjson.c
qjson: Improve debugging
2010-02-10 13:46:17 -06:00
qjson.h
QJSON: Introduce qobject_from_jsonv()
2009-12-03 09:41:18 -06:00
qlist.c
Add operations to qlist to allow it to be used as a stack
2009-11-17 08:49:38 -06:00
qlist.h
QList: Introduce QLIST_FOREACH_ENTRY()
2010-01-26 15:42:01 -06:00
qobject.h
Introduce QError
2009-12-03 09:41:20 -06:00
qstring.c
QString: Introduce qstring_from_substr()
2009-12-03 09:41:19 -06:00
qstring.h
QString: Introduce qstring_from_substr()
2009-12-03 09:41:19 -06:00
readline.c
cope with printf macro definition in readline.c
2010-02-08 12:12:40 +03:00
readline.h
…
README
…
rules.mak
finish VPATH -> vpath translation
2010-01-08 16:55:03 -06:00
rwhandler.c
rwhandler: simplified way to register for mem/io
2010-02-14 16:10:53 +02:00
rwhandler.h
rwhandler: simplified way to register for mem/io
2010-02-14 16:10:53 +02:00
s390-dis.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
s390.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
savevm.c
fix savevm command without id or tag
2010-01-26 15:45:06 -06:00
sdl_keysym.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
sdl_zoom_template.h
…
sdl_zoom.c
…
sdl_zoom.h
Remove SDL/ prefix
2009-07-08 18:25:37 +04:00
sdl.c
win32/sdl: Fix toggle full screen
2010-01-26 16:28:46 -06:00
sh4-dis.c
sh4 disasm fixes
2009-11-14 01:19:12 +01:00
softmmu_defs.h
…
softmmu_exec.h
…
softmmu_header.h
Remove dead i386 assembly code from softmmu_header.h
2009-07-16 17:28:50 -05:00
softmmu_template.h
softmmu: Dont clobber retaddr in slow_ldx().
2010-01-28 22:46:13 +01:00
softmmu-semi.h
…
sparc64.ld
set SEARCH_PATH for the linker script from output of ld --verbose -v
2009-07-27 14:10:56 -05:00
sparc-dis.c
Sparc: comment out unused variable, spotted by clang
2010-01-13 18:54:54 +00:00
sparc.ld
Fix sparc.ld
2009-09-13 19:38:43 +00:00
sysemu.h
virtio-console: qdev conversion, new virtio-serial-bus
2010-01-20 08:25:23 -06:00
targphys.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
tcg-runtime.c
Compile TCG runtime library only once
2009-09-20 19:06:34 +00:00
texi2pod.pl
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
thunk.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
thunk.h
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
TODO
…
translate-all.c
Update to a hopefully more future proof FSF address
2009-07-16 20:47:01 +00:00
uboot_image.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
usb-bsd.c
qdev: Replace device names containing whitespace
2009-12-12 07:59:38 -06:00
usb-linux.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
usb-stub.c
…
VERSION
Update version and changelog to sync with stable branch
2009-12-19 08:26:03 -06:00
vgafont.h
…
vl.c
iothread: fix vcpu stop with smp tcg
2010-02-10 12:46:06 -06:00
vnc_keysym.h
Revert "Get rid of _t suffix"
2009-10-01 16:12:16 -05:00
vnc-auth-sasl.c
…
vnc-auth-sasl.h
…
vnc-auth-vencrypt.c
…
vnc-auth-vencrypt.h
…
vnc-tls.c
…
vnc-tls.h
…
vnc.c
vnc: Migrate to using QTAILQ instead of custom implementation
2010-02-10 12:45:05 -06:00
vnc.h
Increase VNC_MAX_WIDTH
2010-02-10 14:00:53 -06:00
vnchextile.h
vnc: Fix artifacts in hextile decoding
2010-01-07 07:55:34 -06:00
x86_64.ld
Fix missing symbols in .rel/.rela.plt sections
2010-02-06 22:22:27 +01:00
x_keymap.c
…
x_keymap.h
…

README 

Read the documentation in qemu-doc.html.

Fabrice Bellard.
Description
A fork of QEMU-Nyx which is better suited for my bachelors thesis
Readme 154 MiB
Languages
C 90.3%
Dylan 2.5%
Python 2.1%
C++ 2%
Shell 1.7%
Other 1.4%