mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,346 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
Eduardo Habkost 394e1bb795 Create qemu-types.h for struct typedefs 
Instead of keeping all those struct typedefs in qemu-common.h, move it
to a header that can be safely included by other headers, containing
only the struct typedefs and not pulling in other dependencies.

Also, move some of the qdev-core.h typedefs to the new file, too, so
other headers don't need to include qdev-core.h only because of
DeviceState and other typedefs.

This will help us remove qemu-common.h dependencies from some headers
later.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
2012-12-06 09:17:05 +01:00
audio
Revert "audio/wavcapture: Clarify licensing"
2012-11-30 09:04:47 -06:00
backends
rng-random: only build on POSIX platforms
2012-11-19 08:22:28 -06:00
block
iscsi: do not assume device is zero initialized
2012-11-28 12:51:58 +01:00
bsd-user
user: Rename qemu-types.h to qemu-user-types.h
2012-12-06 09:17:04 +01:00
default-configs
target-sparc64: disable VGA cirrus
2012-10-27 14:36:04 +00:00
docs
Merge remote-tracking branch 'stefanha/tracing' into staging
2012-11-19 08:32:03 -06:00
fpu
softfloat: implement fused multiply-add NaN propagation for MIPS
2012-10-31 22:20:45 +01:00
fsdev
qemu-fsdev-dummy.c: Include module.h
2012-11-15 02:21:03 +01:00
gdb-xml
…
hw
Create qemu-types.h for struct typedefs
2012-12-06 09:17:05 +01:00
include/qemu
stream: fix ratelimit_set_speed
2012-11-30 11:33:24 +01:00
libcacard
libcacard: link in stubs
2012-11-19 10:48:32 +01:00
linux-headers
linux-headers: Update to 3.7-rc5
2012-11-13 12:27:40 -07:00
linux-user
user: Rename qemu-types.h to qemu-user-types.h
2012-12-06 09:17:04 +01:00
net
tap: reset vnet header size on open
2012-11-20 15:38:37 +01:00
pc-bios
Merge remote-tracking branch 'kraxel/seabios-b1c35f2' into staging
2012-11-30 10:24:57 -06:00
pixman @ 97336fad32
pixman: add submodule
2012-11-01 13:10:06 +01:00
qapi
qapi/qmp-registry.c: Include headers it needs
2012-12-06 09:17:05 +01:00
qga
qga/channel-posix.c: Include headers it needs
2012-12-06 09:17:05 +01:00
QMP
qmp: add pull_event function
2012-10-24 10:26:22 +02:00
qom
qom: make object_finalize static
2012-11-26 13:41:01 -06:00
roms
roms: also copy the dsdt when updating seabios.
2012-11-30 16:24:40 +01:00
scripts
Merge remote-tracking branch 'stefanha/tracing' into staging
2012-11-19 08:32:03 -06:00
slirp
slirp: Add domain-search option to slirp's DHCP server
2012-11-15 10:27:14 +01:00
stubs
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
sysconfigs/target
…
target-alpha
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-arm
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-cris
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-i386
target-i386: cpu: add missing flags to Haswell CPU model
2012-11-26 14:24:11 -06:00
target-lm32
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-m68k
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-microblaze
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-mips
target-mips: Fix incorrect shift for SHILO and SHILOV
2012-12-06 08:12:14 +01:00
target-openrisc
target-openrisc: remove conflicting definitions from cpu.h
2012-11-24 13:19:54 +01:00
target-ppc
PPC: Fix missing TRACE exception
2012-11-26 19:53:26 +01:00
target-s390x
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-sh4
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-sparc
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-unicore32
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
target-xtensa
TCG: Use gen_opc_buf from context instead of global variable.
2012-11-17 13:53:36 +00:00
tcg
tcg: mark local temps as MEM in dead_temp()
2012-11-24 13:24:13 +01:00
tests
target-mips: Fix incorrect shift for SHILO and SHILOV
2012-12-06 08:12:14 +01:00
trace
trace: allow disabling events in events file
2012-11-16 13:12:13 +01:00
ui
ui/vnc-palette.c: Include headers it needs
2012-12-06 09:17:05 +01:00
.exrc
…
.gitignore
Remove libhw
2012-10-05 16:07:49 -05:00
.gitmodules
pixman: add submodule
2012-11-01 13:10:06 +01:00
.mailmap
…
a.out.h
…
acl.c
…
acl.h
…
aes.c
…
aes.h
…
aio-posix.c
aio: call aio_notify after setting I/O handlers
2012-10-30 09:30:53 +01:00
aio-win32.c
aio: avoid livelock behavior for Win32
2012-11-26 09:37:06 -06:00
alpha-dis.c
…
alpha.ld
…
arch_init.c
migration: Add dirty_pages_rate to query migrate output
2012-10-17 18:34:58 +02:00
arch_init.h
compiler: use weak aliases to provide default definitions
2012-10-30 09:18:43 +01:00
arm-dis.c
…
arm.ld
…
async.c
aio: fix aio_ctx_prepare with idle bottom halves
2012-11-12 20:02:09 +04:00
balloon.c
…
balloon.h
…
bitmap.c
…
bitmap.h
…
bitops.c
…
bitops.h
…
block_int.h
Merge remote-tracking branch 'kwolf/for-anthony' into staging
2012-10-29 10:34:05 -05:00
block-migration.c
block-migration: handle errors with the return codes correctly
2012-10-17 18:34:59 +02:00
block-migration.h
…
block.c
block: Fix regression for MinGW (assertion caused by short string)
2012-11-24 19:54:43 +00:00
block.h
Merge remote-tracking branch 'kwolf/for-anthony' into staging
2012-10-29 10:34:05 -05:00
blockdev-nbd.c
nbd-server-add: Fix the default for 'writable'
2012-11-28 11:56:39 +01:00
blockdev.c
Issue warning when deprecated drive parameter boot=on|off is used
2012-10-30 23:39:52 -02:00
blockdev.h
…
blockjob.c
iostatus: forward block_job_iostatus_reset to block job
2012-10-24 10:26:22 +02:00
blockjob.h
iostatus: forward block_job_iostatus_reset to block job
2012-10-24 10:26:22 +02:00
bswap.h
…
bt-host.c
…
bt-host.h
…
bt-vhci.c
…
buffered_file.c
migration: add qemu_get_fd
2012-11-02 18:34:59 +01:00
buffered_file.h
buffered_file: We can access directly to bandwidth_limit
2012-10-17 18:34:59 +02:00
cache-utils.c
…
cache-utils.h
…
Changelog
…
cmd.c
…
cmd.h
…
CODING_STYLE
…
compatfd.c
…
compatfd.h
…
compiler.h
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
config.h
…
configure
build: compile translate.o with -fno-gcse option on GCC 4.6.x and 4.7.[012]
2012-11-28 13:18:33 -06:00
console.c
pixman: drop obsolete fields from DisplaySurface
2012-11-01 14:00:05 +01:00
console.h
spice: switch to pixman
2012-11-05 11:54:49 +01:00
COPYING
…
COPYING.LIB
…
coroutine-gthread.c
…
coroutine-sigaltstack.c
coroutine-sigaltstack.c: Use stack_t, not struct sigaltstack
2012-11-30 11:33:24 +01:00
coroutine-ucontext.c
…
coroutine-win32.c
…
cpu-all.h
user: Rename qemu-types.h to qemu-user-types.h
2012-12-06 09:17:04 +01:00
cpu-common.h
exec: make some functions static
2012-11-01 19:49:45 +01:00
cpu-defs.h
cpu: Move thread_id to CPUState
2012-10-31 04:12:23 +01:00
cpu-exec.c
cpus: Pass CPUState to [qemu_]cpu_has_work()
2012-10-31 04:11:37 +01:00
cpus.c
cpu: Move thread_id to CPUState
2012-10-31 04:12:23 +01:00
cpus.h
…
cputlb.c
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
cputlb.h
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
cris-dis.c
…
cursor_hidden.xpm
…
cursor_left_ptr.xpm
…
cursor.c
…
cutils.c
fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c
2012-10-30 09:18:44 +01:00
def-helper.h
…
device_tree.c
…
device_tree.h
…
dis-asm.h
…
disas.c
disas: avoid using cpu_single_env
2012-11-10 13:49:20 +00:00
disas.h
disas: avoid using cpu_single_env
2012-11-10 13:49:20 +00:00
dma-helpers.c
aio: rename AIOPool to AIOCBInfo
2012-11-14 18:19:21 +01:00
dma.h
dma: Define dma_context_memory and use in sysbus-ohci
2012-11-12 16:44:57 +01:00
dump-stub.c
…
dump.c
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
dump.h
…
elf.h
…
envlist.c
…
envlist.h
…
error.c
error: add error_set_errno and error_setg_errno
2012-10-23 13:54:55 +02:00
error.h
error: add error_set_errno and error_setg_errno
2012-10-23 13:54:55 +02:00
event_notifier-posix.c
event_notifier: enable it to use pipes
2012-10-30 09:30:52 +01:00
event_notifier-win32.c
event notifier: Fix setup for win32
2012-11-28 13:33:01 -06:00
event_notifier.h
event_notifier: enable it to use pipes
2012-10-30 09:30:52 +01:00
exec-all.h
tci: fix build breakage for target MIPS
2012-11-18 20:37:04 +00:00
exec-memory.h
memory: use AddressSpace for MemoryListener filtering
2012-10-22 14:50:07 +02:00
exec.c
dma: Define dma_context_memory and use in sysbus-ohci
2012-11-12 16:44:57 +01:00
gdbstub.c
…
gdbstub.h
…
gen-icount.h
TCG: Use gen_opparam_ptr from context instead of global variable.
2012-11-17 13:53:34 +00:00
HACKING
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
hmp-commands.hx
trace: Remove "info trace" from documents
2012-11-16 13:35:48 +01:00
hmp.c
hmp: add NBD server commands
2012-11-12 14:38:29 +01:00
hmp.h
hmp: add NBD server commands
2012-11-12 14:38:29 +01:00
host-utils.c
…
host-utils.h
…
hppa-dis.c
…
hppa.ld
…
hwaddr.h
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
i386-dis.c
…
i386.ld
…
ia64-dis.c
…
ia64.ld
…
input.c
…
int128.h
…
iohandler.c
aio: introduce AioContext, move bottom halves there
2012-10-30 09:30:53 +01:00
ioport.c
…
ioport.h
…
iorange.h
…
iov.c
Merge remote-tracking branch 'origin/master' into threadpool
2012-10-31 10:42:51 +01:00
iov.h
iov: add iov_cpy
2012-10-29 18:25:22 +02:00
json-lexer.c
…
json-lexer.h
…
json-parser.c
…
json-parser.h
…
json-streamer.c
…
json-streamer.h
…
kvm-all.c
kvm: fix incorrect length in a loop over kvm dirty pages map
2012-11-26 19:53:26 +01:00
kvm-stub.c
memory: manage coalesced mmio via a MemoryListener
2012-10-22 14:50:00 +02:00
kvm.h
pc_piix: Move kvm irq routing functions out of pc_piix.c
2012-11-26 09:35:35 -06:00
libfdt_env.h
…
LICENSE
…
lm32-dis.c
…
m68k-dis.c
…
m68k.ld
…
main-loop.c
vl: delay thread initialization after daemonization
2012-11-02 13:07:55 -05:00
main-loop.h
main-loop: use GSource to poll AIO file descriptors
2012-10-30 09:30:53 +01:00
MAINTAINERS
MAINTAINERS: add Stefan Hajnoczi as block and virtio-blk co-maintainer
2012-11-14 18:19:21 +01:00
Makefile
Build system fix distclean error for pixman
2012-11-24 20:03:04 +00:00
Makefile.dis
…
Makefile.objs
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
Makefile.target
build: compile translate.o with -fno-gcse option on GCC 4.6.x and 4.7.[012]
2012-11-28 13:18:33 -06:00
Makefile.user
…
memory_mapping-stub.c
…
memory_mapping.c
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
memory_mapping.h
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
memory-internal.h
exec: make some functions static
2012-11-01 19:49:45 +01:00
memory.c
memory: Don't dump disabled regions
2012-11-10 13:24:39 +00:00
memory.h
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
microblaze-dis.c
…
migration-exec.c
migration: move qemu_fclose to process_incoming_migration
2012-11-02 18:35:07 +01:00
migration-fd.c
migration: move qemu_fclose to process_incoming_migration
2012-11-02 18:35:07 +01:00
migration-tcp.c
migration: move qemu_fclose to process_incoming_migration
2012-11-02 18:35:07 +01:00
migration-unix.c
migration: move qemu_fclose to process_incoming_migration
2012-11-02 18:35:07 +01:00
migration.c
migration: move process_incoming_migration to a coroutine
2012-11-02 18:35:08 +01:00
migration.h
migration (incoming): add error propagation to fd and exec protocols
2012-10-23 13:54:56 +02:00
mips-dis.c
…
mips.ld
…
module.c
…
module.h
…
monitor.c
target-i386: Pass X86CPU to cpu_x86_inject_mce()
2012-10-31 04:12:23 +01:00
monitor.h
block: introduce BLOCK_JOB_READY event
2012-10-24 10:26:19 +02:00
nbd.c
nbd: fix use of two uninitialized bytes when connecting to a named export
2012-11-28 11:56:35 +01:00
nbd.h
…
net.c
net: Reject non-netdevs in qmp_netdev_del()
2012-11-01 11:05:57 +01:00
net.h
…
notify.c
…
notify.h
…
os-posix.c
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
2012-10-06 18:54:14 +02:00
os-win32.c
…
osdep.c
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
osdep.h
osdep: Move qemu_{open,close}() prototypes
2012-11-15 02:38:06 +01:00
oslib-posix.c
aio: clean up now-unused functions
2012-10-30 09:30:54 +01:00
oslib-win32.c
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
page_cache.c
…
path.c
…
pci-ids.txt
…
poison.h
…
ppc64.ld
…
ppc-dis.c
…
ppc.ld
…
qapi-schema-guest.json
…
qapi-schema-test.json
…
qapi-schema.json
slirp: Add domain-search option to slirp's DHCP server
2012-11-15 10:27:14 +01:00
qbool.c
…
qbool.h
…
qdict-test-data.txt
…
qdict.c
…
qdict.h
…
qemu_socket.h
qemu-sockets: add socket_listen, socket_connect, socket_parse
2012-10-23 22:39:16 +02:00
qemu-aio.h
aio: rename AIOPool to AIOCBInfo
2012-11-14 18:19:21 +01:00
qemu-barrier.h
qemu-barrier: Fix compilation on i386 hosts
2012-10-07 20:07:11 +02:00
qemu-bridge-helper.c
…
qemu-char.c
chardev: Use real-time clock for open timer
2012-11-24 20:03:25 +00:00
qemu-char.h
Merge remote-tracking branch 'bonzini/threadpool' into staging
2012-11-01 11:13:39 -05:00
qemu-common.h
Create qemu-types.h for struct typedefs
2012-12-06 09:17:05 +01:00
qemu-config.c
vl: add -object option to create QOM objects from the command line
2012-11-16 08:36:12 -06:00
qemu-config.h
qemu-config.h: Include headers it needs
2012-11-15 02:34:42 +01:00
qemu-coroutine-int.h
…
qemu-coroutine-io.c
…
qemu-coroutine-lock.c
aio: introduce AioContext, move bottom halves there
2012-10-30 09:30:53 +01:00
qemu-coroutine-sleep.c
…
qemu-coroutine.c
…
qemu-coroutine.h
…
qemu-doc.texi
Documentation: Update image format information
2012-11-30 11:33:24 +01:00
qemu-error.c
…
qemu-error.h
…
qemu-file.h
migration: replace qemu_stdio_fd with qemu_get_fd
2012-11-02 18:35:06 +01:00
qemu-ga.c
qemu-ga: ga_open_pidfile(): add new line to pidfile
2012-10-09 03:42:42 -05:00
qemu-img-cmds.hx
qemu-img: document 'info --backing-chain'
2012-10-24 10:26:19 +02:00
qemu-img.c
tools: initialize main loop before block layer
2012-11-06 04:37:57 +04:00
qemu-img.texi
Documentation: Update image format information
2012-11-30 11:33:24 +01:00
qemu-io.c
qemu-io: Use bdrv_drain_all instead of qemu_aio_flush
2012-11-14 18:20:06 +01:00
qemu-lock.h
…
qemu-log.c
qemu-log: Add new log category for guest bugs
2012-10-20 07:56:22 +00:00
qemu-log.h
disas: avoid using cpu_single_env
2012-11-10 13:49:20 +00:00
qemu-nbd.c
qemu-nbd: initialize main loop before block layer
2012-11-12 11:33:29 +01:00
qemu-nbd.texi
…
qemu-objects.h
…
qemu-option-internal.h
…
qemu-option.c
…
qemu-option.h
…
qemu-options-wrapper.h
…
qemu-options.h
…
qemu-options.hx
Documentation: Update block cache mode information
2012-11-30 11:33:24 +01:00
qemu-os-posix.h
…
qemu-os-win32.h
event_notifier: add Win32 implementation
2012-10-30 09:30:52 +01:00
qemu-pixman.c
fbdev: fix pixman compile on old pixman
2012-11-26 19:53:26 +01:00
qemu-pixman.h
Merge remote-tracking branch 'kraxel/pixman.v5' into staging
2012-11-14 08:53:03 -06:00
qemu-progress.c
…
qemu-queue.h
…
qemu-seccomp.c
seccomp: adding new syscalls (bugzilla 855162)
2012-11-30 08:27:27 -06:00
qemu-seccomp.h
…
qemu-sockets.c
qemu-sockets: Fix parsing of the inet option 'to'.
2012-11-21 12:07:59 +04:00
qemu-tech.texi
qemu-tech.texi: update implemented xtensa features list
2012-11-29 13:00:52 -06:00
qemu-thread-posix.c
semaphore: implement fallback counting semaphores with mutex+condvar
2012-11-02 13:07:54 -05:00
qemu-thread-posix.h
semaphore: implement fallback counting semaphores with mutex+condvar
2012-11-02 13:07:54 -05:00
qemu-thread-win32.c
qemu-thread: add QemuSemaphore
2012-10-31 09:45:47 +01:00
qemu-thread-win32.h
qemu-thread: add QemuSemaphore
2012-10-31 09:45:47 +01:00
qemu-thread.h
qemu-thread: add QemuSemaphore
2012-10-31 09:45:47 +01:00
qemu-timer-common.c
…
qemu-timer.c
qemu-timer: Fix compilation for non-POSIX hosts
2012-11-10 12:28:52 +00:00
qemu-timer.h
…
qemu-tls.h
…
qemu-tool.c
qemu-tool: do not depend on qemu-timer.c
2012-10-30 09:18:44 +01:00
qemu-types.h
Create qemu-types.h for struct typedefs
2012-12-06 09:17:05 +01:00
qemu-user-types.h
user: Rename qemu-types.h to qemu-user-types.h
2012-12-06 09:17:04 +01:00
qemu-user.c
fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c
2012-10-30 09:18:44 +01:00
qemu-x509.h
…
qemu-xattr.h
…
qemu.sasl
…
qerror.c
…
qerror.h
Merge remote-tracking branch 'kwolf/for-anthony' into staging
2012-10-29 10:34:05 -05:00
qfloat.c
…
qfloat.h
…
qint.c
…
qint.h
…
qjson.c
…
qjson.h
…
qlist.c
…
qlist.h
qlist.h: Do not include qemu-common.h
2012-12-06 09:17:05 +01:00
qmp-commands.hx
Merge remote-tracking branch 'kwolf/for-anthony' into staging
2012-10-29 10:34:05 -05:00
qmp.c
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
qobject.h
…
qstring.c
…
qstring.h
…
qtest.c
…
qtest.h
…
range.h
…
readline.c
…
readline.h
…
README
…
rules.mak
build: replace weak symbols with a static library
2012-11-18 19:19:23 +00:00
s390-dis.c
…
s390.ld
…
savevm.c
migration: handle EAGAIN while reading QEMUFile
2012-11-02 18:35:07 +01:00
sh4-dis.c
…
softmmu_defs.h
…
softmmu_exec.h
…
softmmu_header.h
…
softmmu_template.h
tcg: Add extended GETPC mechanism for MMU helpers with ldst optimization
2012-11-03 09:44:20 +00:00
softmmu-semi.h
…
sparc64.ld
…
sparc-dis.c
tcg-sparc: Dump illegal opode contents
2012-10-13 10:39:53 +00:00
sparc.ld
…
spice-qemu-char.c
…
sysemu.h
vl.c: add missing static
2012-11-01 19:49:44 +01:00
tcg-runtime.c
…
tci-dis.c
…
tci.c
tci: Fix type of tci_read_label
2012-11-24 19:52:00 +00:00
thread-pool.c
aio: rename AIOPool to AIOCBInfo
2012-11-14 18:19:21 +01:00
thread-pool.h
aio: add generic thread-pool facility
2012-10-31 10:37:48 +01:00
thunk.c
…
thunk.h
…
TODO
…
trace-events
usb-host: update tracing
2012-11-16 11:27:32 +01:00
translate-all.c
TCG: Remove unused global variables
2012-11-17 13:53:38 +00:00
uboot_image.h
…
uri.c
…
uri.h
…
user-exec.c
…
VERSION
Open up 1.4 development branch
2012-12-03 14:08:40 -06:00
version.rc
…
vgafont.h
…
vl.c
vl.c: Fix broken -usb option
2012-11-26 13:53:52 -06:00
vmstate.h
vmstate: Add support for saving/loading bitmaps
2012-10-30 07:45:12 +00:00
x86_64.ld
…
xen-all.c
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
xen-mapcache.c
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
xen-mapcache.h
Rename target_phys_addr_t to hwaddr
2012-10-23 08:58:25 -05:00
xen-stub.c
…

README 

Read the documentation in qemu-doc.html or on http://wiki.qemu.org

- QEMU team
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%