mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,920 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
Avi Kivity ae0a54664c 440fx: fix PAM, PCI holes 
The current implementation of PAM and the PCI holes is broken in several
ways:

  - PCI BARs are not restricted to the PCI hole (a BAR may hide memory)
  - PCI devices do not respect PAM (if a PCI device maps a region while
    PAM maps the region to RAM, the request will be honored)

This patch fixes things by introducing a pci address space, and using
memory region aliases to represent PAM regions, SMRAM, and PCI holes.

The memory hierarchy looks something like

system_memory
 |
 +--- low memory alias (0-0xe0000000)
 |      |
 |      +-- ram@0
 |
 +--- high memory alias (0x100000000-EOM)
 |      |
 |      +-- ram@0xe0000000
 |
 +--- pci hole alias (end of low memory-0x100000000)
 |      |
 |      +-- pci@end-of-low-memory
 |
 |
 +--- pam[n] (0xc0000-0xc3fff etc) (when set to pci, priority 1)
 |      |
 |      +-- pci@0xc4000 etc
 |
 +--- smram (0xa0000-0xbffff) (when set to pci/vga, priority 1)
        |
        +-- pci@0xa0000 etc

ram (simple ram region)

pci
 |
 +--- BARn
 |
 +--- VGA 0xa0000-0xbffff
 |
 +--- ROMs

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2011-08-22 10:47:49 -05:00
audio
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
block
w32: Fix qemu_ftruncate64
2011-08-22 10:19:00 -05:00
bsd-user
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
darwin-user
darwin-user: Remove two unused variables
2011-08-07 09:37:49 +00:00
default-configs
target-alpha: Enable the alpha-softmmu target.
2011-05-31 10:18:05 -07:00
docs
memory: correct documentation typos
2011-08-12 08:31:30 -05:00
fpu
softfloat: change default nan definitions to variables
2011-07-29 08:25:45 -05:00
fsdev
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
gdb-xml
…
hw
440fx: fix PAM, PCI holes
2011-08-22 10:47:49 -05:00
libcacard
Improvements to libtool support.
2011-08-22 10:20:10 -05:00
linux-headers
Import kernel headers
2011-06-20 15:13:34 -03:00
linux-user
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
net
char: rename qemu_chr_open() -> qemu_chr_new()
2011-08-22 10:17:43 -05:00
pc-bios
seabios: update to master
2011-08-10 17:34:13 +02:00
qapi
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qga
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
QMP
QMP: add server mode to QEMUMonitorProtocol
2011-06-01 11:43:18 -03:00
roms
seabios: update to master
2011-08-10 17:34:13 +02:00
scripts
qapi: fix build issue due to missing newline in generated header
2011-08-12 08:31:30 -05:00
slirp
char: rename qemu_chr_write() -> qemu_chr_fe_write()
2011-08-22 10:17:15 -05:00
sysconfigs/target
…
target-alpha
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-arm
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-cris
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-i386
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-lm32
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-m68k
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-microblaze
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-mips
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-ppc
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-s390x
Fix conversions from pointer to tcg_target_long
2011-08-21 15:32:21 +00:00
target-sh4
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-sparc
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
target-unicore32
Fix conversions from pointer to tcg_target_long
2011-08-21 15:32:21 +00:00
tcg
tcg/ppc64: fix 16/32 mixup
2011-08-22 18:26:15 +04:00
tests
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
ui
Convert last qemu_free and qemu_malloc uses
2011-08-21 18:42:08 +00:00
.gitignore
coroutine: add test-coroutine automated tests
2011-08-02 15:53:40 +02:00
.gitmodules
…
a.out.h
…
acl.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
acl.h
…
aes.c
…
aes.h
…
aio.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
alpha-dis.c
target-alpha: Disassemble EV6 PALcode instructions.
2011-05-31 10:18:04 -07:00
alpha.ld
…
arch_init.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
arch_init.h
…
arm-dis.c
…
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
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
balloon.c
balloon: Reject negative balloon values
2011-08-04 16:43:09 -05:00
balloon.h
balloon: Don't allow multiple balloon handler registrations
2011-08-04 16:43:09 -05:00
bitmap.c
…
bitmap.h
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
bitops.c
…
bitops.h
…
block_int.h
block: Add bdrv_co_readv/writev
2011-08-02 15:53:40 +02:00
block-migration.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
block-migration.h
…
block.c
fix code format
2011-08-22 10:17:52 -05:00
block.h
block: Add bdrv_co_readv/writev
2011-08-02 15:53:40 +02:00
blockdev.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
blockdev.h
blockdev: Store -drive option media in DriveInfo
2011-05-19 10:26:21 +02:00
bswap.h
move unaligned memory access functions to bswap.h
2011-07-29 08:25:45 -05:00
bt-host.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
bt-host.h
…
bt-vhci.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
buffered_file.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
buffered_file.h
…
cache-utils.c
…
cache-utils.h
…
Changelog
Changelog: Add explanatory note that this file is no longer updated
2011-06-13 21:16:27 +02:00
check-qdict.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
check-qfloat.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
check-qint.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
check-qjson.c
…
check-qlist.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
check-qstring.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
cmd.c
cmd: fix operator precedence
2011-06-20 17:08:57 +01:00
cmd.h
…
CODING_STYLE
CODING_STYLE: explicitly allow braceless 'else if'
2011-07-29 09:33:56 -05:00
compatfd.c
Register Linux dyntick timer as per-thread signal
2011-07-23 11:26:12 -05:00
compatfd.h
Register Linux dyntick timer as per-thread signal
2011-07-23 11:26:12 -05:00
compiler.h
Introduce compiler.h header file
2011-07-21 16:48:13 -03:00
config.h
…
configure
Improvements to libtool support.
2011-08-22 10:20:10 -05:00
console.c
char: remove qemu_chr_send_event()
2011-08-22 10:17:44 -05:00
console.h
Introduce a 'client_add' monitor command accepting an open FD
2011-07-23 11:19:02 -05:00
COPYING
…
COPYING.LIB
…
coroutine-gthread.c
Convert last qemu_free and qemu_malloc uses
2011-08-21 18:42:08 +00:00
coroutine-ucontext.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
coroutine-win32.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
cpu-all.h
fix QLIST usage for RAM list
2011-08-12 13:07:58 +01:00
cpu-common.h
Merge remote-tracking branch 'agraf/xen-next' into staging
2011-07-29 09:42:12 -05:00
cpu-defs.h
…
cpu-exec.c
tcg: Reload local variables after return from longjmp
2011-07-12 20:53:28 +00:00
cpus.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
cpus.h
Command line support for altering the log file location
2011-06-15 16:51:24 +00:00
cris-dis.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
cursor_hidden.xpm
…
cursor_left_ptr.xpm
…
cursor.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
cutils.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
def-helper.h
…
device_tree.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
device_tree.h
…
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
…
dma-helpers.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
dma.h
move QEMUSGList typedef
2011-08-04 15:51:22 +02:00
dyngen-exec.h
exec.h cleanup
2011-07-30 09:41:14 +00:00
elf.h
…
envlist.c
…
envlist.h
…
error_int.h
Introduce the new error framework
2011-06-07 13:52:10 -05:00
error.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
error.h
Error: Fix build when qemu-common.h is not included
2011-07-21 16:48:13 -03:00
exec-all.h
Fix unassigned memory access handling
2011-07-20 21:28:08 +00:00
exec-memory.h
Integrate I/O memory regions into qemu
2011-08-08 10:15:53 -05:00
exec.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
gdbstub.c
char: rename qemu_chr_close() -> qemu_chr_delete()
2011-08-22 10:17:43 -05:00
gdbstub.h
…
gen-icount.h
…
HACKING
Convert last qemu_free and qemu_malloc uses
2011-08-21 18:42:08 +00:00
hmp-commands.hx
HMP: Remove the duplicated info "info kvm" in hmp-commands.hx.
2011-08-03 11:17:36 +01: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
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
iohandler.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
ioport-user.c
…
ioport.c
ioport: register ranges by byte aligned addresses always
2011-07-29 08:25:44 -05:00
ioport.h
report serial devices created with -device in the PIIX4 config space
2011-07-23 10:56:55 -05:00
iorange.h
…
iov.c
Add iov_clear()
2011-08-04 15:51:22 +02:00
iov.h
Add iov_clear()
2011-08-04 15:51:22 +02:00
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
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05: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
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
m68k-dis.c
…
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: add entry for Xen
2011-08-05 10:57:34 -05:00
Makefile
guest agent: remove uneeded dependencies
2011-08-21 18:27:34 -05:00
Makefile.dis
…
Makefile.hw
move unaligned memory access functions to bswap.h
2011-07-29 08:25:45 -05:00
Makefile.objs
Improvements to libtool support.
2011-08-22 10:20:10 -05:00
Makefile.target
Remove qemu_malloc/qemu_free
2011-08-20 23:01:08 -05:00
Makefile.user
…
memory.c
memory: crack wide ioport accesses into smaller ones when needed
2011-08-21 18:27:33 -05:00
memory.h
memory: add API for creating ROM/device regions
2011-08-12 08:31:30 -05:00
microblaze-dis.c
…
migration-exec.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
migration-fd.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
migration-tcp.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
migration-unix.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
migration.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
migration.h
…
mips-dis.c
…
mips.ld
…
module.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
module.h
qapi: add module init types for qapi
2011-07-21 16:48:13 -03:00
monitor.c
char: rename qemu_chr_get_msgfd() -> qemu_chr_fe_get_msgfd()
2011-08-22 10:17:44 -05:00
monitor.h
…
nbd.c
Wrap recv to avoid warnings
2011-07-25 14:38:56 +00:00
nbd.h
…
net.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
net.h
net: Consistently use qemu_macaddr_default_if_unset
2011-07-23 10:19:50 -05:00
notify.c
notifier: Pass data argument to callback
2011-07-23 11:26:06 -05:00
notify.h
notifier: Pass data argument to callback
2011-07-23 11:26:06 -05:00
os-posix.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
os-win32.c
w32: Fix format string regression
2011-08-21 15:33:33 +00:00
osdep.c
…
osdep.h
w64: Add definition of FMT_pid
2011-08-21 15:33:22 +00:00
oslib-posix.c
Add missing trace call to oslib-posix.c:qemu_vmalloc()
2011-07-29 09:33:48 -05:00
oslib-win32.c
…
path.c
…
pci-ids.txt
…
pflib.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
pflib.h
…
poison.h
Avoid CPU endian memory accesses in devices
2011-07-20 21:22:43 +00:00
posix-aio-compat.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
ppc64.ld
…
ppc-dis.c
…
ppc.ld
…
qapi-schema-guest.json
guest agent: add guest agent RPCs/commands
2011-07-21 16:48:15 -03:00
qapi-schema-test.json
qapi: test schema used for unit tests
2011-07-21 16:48:14 -03:00
qbool.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qbool.h
…
qdict-test-data.txt
…
qdict.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qdict.h
…
qemu_socket.h
…
qemu-aio.h
…
qemu-barrier.h
…
qemu-char.c
char: remove qemu_chr_send_event()
2011-08-22 10:17:44 -05:00
qemu-char.h
char: document the functions that will be the public interface
2011-08-22 10:17:44 -05:00
qemu-common.h
Remove qemu_malloc/qemu_free
2011-08-20 23:01:08 -05:00
qemu-config.c
showing a splash picture when start
2011-07-29 08:25:44 -05:00
qemu-config.h
…
qemu-coroutine-int.h
coroutines: Locks
2011-08-02 15:53:40 +02:00
qemu-coroutine-lock.c
coroutines: Use one global bottom half for CoQueue
2011-08-02 15:53:41 +02:00
qemu-coroutine.c
coroutine: introduce coroutines
2011-08-01 12:14:09 +02:00
qemu-coroutine.h
coroutines: Locks
2011-08-02 15:53:40 +02:00
qemu-doc.texi
sdl: Add zoom hot keys
2011-08-05 10:57:35 -05:00
qemu-error.c
Strip trailing '\n' from error_report()'s first argument
2011-06-24 09:13:36 +01:00
qemu-error.h
…
qemu-ga.c
guest agent: remove g_strcmp0 usage
2011-08-21 18:27:34 -05:00
qemu-img-cmds.hx
Add missing documentation for qemu-img -p
2011-07-20 11:13:52 +02:00
qemu-img.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-img.texi
Add missing documentation for qemu-img -p
2011-07-20 11:13:52 +02:00
qemu-io.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-lock.h
…
qemu-log.h
…
qemu-nbd.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-nbd.texi
…
qemu-objects.h
…
qemu-option.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-option.h
…
qemu-options.h
…
qemu-options.hx
revamp acpitable parsing and allow to specify complete (headerful) table
2011-07-30 09:33:31 +00:00
qemu-os-posix.h
…
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
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-tech.texi
…
qemu-thread-posix.c
…
qemu-thread-posix.h
…
qemu-thread-win32.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-thread-win32.h
…
qemu-thread.h
…
qemu-timer-common.c
…
qemu-timer.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-timer.h
qemu-timer: Introduce clock reset notifier
2011-07-23 11:26:12 -05:00
qemu-tool.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qemu-x509.h
…
qemu.sasl
…
qerror.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qerror.h
Introduce a 'client_add' monitor command accepting an open FD
2011-07-23 11:19:02 -05:00
qfloat.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qfloat.h
…
qint.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qint.h
…
qjson.c
…
qjson.h
…
qlist.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qlist.h
qlist: add qlist_first()/qlist_next()
2011-07-21 16:48:13 -03:00
qmp-commands.hx
qmp: fix efect -> effect typo in qmp-commands.hx
2011-07-27 15:57:09 +01:00
qobject.h
…
qstring.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
qstring.h
…
range.h
…
readline.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
readline.h
…
README
…
rules.mak
Improvements to libtool support.
2011-08-22 10:20:10 -05:00
rwhandler.c
…
rwhandler.h
…
s390-dis.c
…
s390.ld
…
savevm.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
sh4-dis.c
…
simpletrace.c
simpletrace: suppress a warning from unused variable
2011-07-25 14:40:18 +00:00
simpletrace.h
…
softmmu_defs.h
…
softmmu_exec.h
…
softmmu_header.h
…
softmmu_template.h
…
softmmu-semi.h
Correct spelling of licensed
2011-07-23 11:26:12 -05:00
sparc64.ld
…
sparc-dis.c
…
sparc.ld
…
spice-qemu-char.c
char: rename qemu_chr_can_read() -> qemu_chr_be_can_read()
2011-08-22 10:17:16 -05:00
sysemu.h
showing a splash picture when start
2011-07-29 08:25:44 -05:00
targphys.h
…
tcg-runtime.c
…
test-coroutine.c
coroutine: add test-coroutine --benchmark-lifecycle
2011-08-02 15:53:40 +02:00
test-qmp-commands.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
test-visitor.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
thunk.c
…
thunk.h
…
TODO
…
trace-events
escc: replace DPRINTFs with tracepoints
2011-08-21 20:02:02 +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
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
usb-linux.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
usb-redir.c
char: rename qemu_chr_close() -> qemu_chr_delete()
2011-08-22 10:17:43 -05:00
usb-stub.c
…
user-exec.c
Remove unused is_softmmu parameter from cpu_handle_mmu_fault
2011-08-07 09:32:01 +00:00
VERSION
Open 1.0 development branch.
2011-07-23 11:57:53 -05:00
version.rc
…
vgafont.h
…
vl.c
char: qemu_chr_open_opts() -> qemu_chr_new_from_opts()
2011-08-22 10:17:43 -05:00
x86_64.ld
…
xen-all.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
xen-mapcache.c
Use glib memory allocation and free functions
2011-08-20 23:01:08 -05:00
xen-mapcache.h
xen: fix xen-mapcache build on non-Xen capable targets
2011-07-22 17:43:42 +00: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%