evan/qemu-esp-boards
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,070 Commits 2 Branches 0 Tags
2063392ae5d00a9ea13039f971e2b9e61bd68dbc
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Christoph Hellwig 2063392ae5 cow: use qemu block API 
Use bdrv_pwrite to access the backing device instead of pread, and
convert the driver to implementing the bdrv_open method which gives
it an already opened BlockDriverState for the underlying device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
2010-06-15 09:41:59 +02:00
audio
Fix %lld or %llx printf format use
2010-05-22 08:02:12 +00:00
block
cow: use qemu block API
2010-06-15 09:41:59 +02:00
bsd-user
rename CONFIG_QEMU_PREFIX
2010-06-10 00:09:49 +02:00
darwin-user
Fix %lld or %llx printf format use
2010-05-22 08:02:12 +00:00
default-configs
Compile dma only once
2010-05-22 08:00:52 +00:00
docs
docs: New qdev-device-use.txt
2010-01-13 17:14:16 -06:00
fpu
softfloat: remove dead assignments, spotted by clang
2010-03-07 13:49:58 +00:00
fsdev
virtio-9p: Add a virtio 9p device to qemu
2010-05-03 12:17:37 -05:00
gdb-xml
…
hw
acpi_piix4: save gpe and pci hotplug slot status
2010-06-14 15:46:28 -05:00
linux-user
s390x: Avoid _llseek.
2010-06-11 18:15:35 +02:00
net
Remove dead assignments in various common files, spotted by clang analyzer
2010-04-25 18:35:52 +00:00
pc-bios
Fix multiboot compilation
2010-06-09 12:35:18 +02:00
QMP
monitor/QMP: Drop info hpet / query-hpet
2010-06-13 15:33:02 +03:00
roms
Update SeaBIOS
2010-05-14 10:55:58 -05:00
slirp
Remove dead assignments in various common files, spotted by clang analyzer
2010-04-25 18:35:52 +00:00
sysconfigs/target
Add cpu model configuration support..
2010-02-22 16:16:17 -06:00
target-alpha
target-alpha: Implement RPCC.
2010-04-27 05:50:42 +02:00
target-arm
NEON vldN optimization
2010-06-11 20:37:51 +01:00
target-cris
cris: Break out image loading to hw/cris-boot.c.
2010-06-10 14:45:46 +02:00
target-i386
target-i386: fix decoding of negative 4-byte displacements
2010-06-04 19:48:53 +00:00
target-m68k
m68k: remove dead assignments, spotted by clang analyzer
2010-04-25 19:50:51 +00:00
target-microblaze
microblaze: Make MSR_UM and MSR_VM part of the tb flags
2010-06-07 11:54:27 +02:00
target-mips
target-mips: Fix compilation
2010-06-09 23:37:36 +02:00
target-ppc
target-ppc: remove useless line
2010-05-31 19:18:25 +02:00
target-s390x
target-s390: enable SIGP Initial Reset
2010-05-18 21:23:24 +02:00
target-sh4
target-sh4: Remove duplicate CPU log.
2010-05-05 12:20:05 +02:00
target-sparc
sparc64: fix umul and smul insns
2010-06-02 20:08:44 +00:00
tcg
tcg: fix DEF macro after commit c61aaf7a38
2010-06-11 18:39:47 +02:00
tests
Add missing 'static' attribute
2010-05-07 16:28:10 +00:00
.gitignore
Remove i386 from .gitignore
2010-05-20 21:04:47 +02:00
.gitmodules
use absolute URLs for .gitmodules
2010-03-06 23:09:28 +01:00
a.out.h
…
acl.c
…
acl.h
…
aes.c
…
aes.h
…
aio.c
block: fix aio_flush segfaults for read-only protocols (e.g. curl)
2010-05-21 11:49:18 +02:00
alpha-dis.c
…
alpha.ld
…
arch_init.c
ram_blocks: Convert to a QLIST
2010-06-14 11:12:53 -05:00
arch_init.h
Refactor target specific handling, compile vl.c only once
2010-03-29 19:23:52 +00:00
arm-dis.c
arm: remove dead assignments, spotted by clang analyzer
2010-04-25 19:31:06 +00:00
arm-semi.c
…
arm.ld
…
async.c
…
balloon.c
move balloon handling to balloon.c
2010-04-09 18:55:56 +02:00
balloon.h
move balloon handling to balloon.c
2010-04-09 18:55:56 +02:00
block_int.h
block: Add wr_highest_sector blockstat
2010-05-03 10:07:32 +02:00
block-migration.c
block: Do not export bdrv_first
2010-04-23 16:21:57 +02:00
block-migration.h
block migration: Report progress also via info migration
2009-12-03 10:48:53 -06:00
block.c
savevm: Really verify if a drive supports snapshots
2010-06-15 09:41:58 +02:00
block.h
savevm: Really verify if a drive supports snapshots
2010-06-15 09:41:58 +02:00
blockdev.c
Fix regression for "-drive file="
2010-06-15 09:41:58 +02:00
blockdev.h
blockdev: Collect block device code in new blockdev.c
2010-06-04 15:20:47 +02:00
bswap.h
Fix leul_to_cpu on big endian hosts
2010-05-31 20:55:23 +02:00
bt-host.c
bt: remove dead assignments, spotted by clang analyzer
2010-04-25 18:20:28 +00:00
bt-host.h
…
bt-vhci.c
…
buffered_file.c
Do not use dprintf
2010-02-07 02:03:50 +03:00
buffered_file.h
…
cache-utils.c
FreeBSD ppc_init_cacheline_sizes(): add missing #includes
2010-03-13 01:14:01 +03:00
cache-utils.h
…
Changelog
Update version and changelog to sync with stable branch
2009-12-19 08:26:03 -06:00
check-qdict.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
check-qfloat.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
check-qint.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
check-qjson.c
Merge remote branch 'qmp/for-anthony' into staging
2010-06-14 09:39:01 -05:00
check-qlist.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
check-qstring.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
cmd.c
Fix dead initialization, spotted by clang analyzer
2010-04-25 15:27:14 +00:00
cmd.h
…
cocoa.m
Cocoa: Use optimized drawing for the window
2010-01-07 10:57:34 +03:00
CODING_STYLE
CODING_STYLE: Reserve qemu_ prefix for library wrappers
2010-03-19 15:27:27 -05:00
config.h
…
configure
tcg-s390: correctly detect s390 with a 64-bit kernel
2010-06-13 12:28:21 +02:00
console.c
Add support for depth 15 to qemu_default_pixelformat()
2010-06-01 12:53:36 -05:00
console.h
un-register kbd driver in case of USB kbd unplug.
2010-06-14 15:46:28 -05:00
COPYING
…
COPYING.LIB
…
cpu-all.h
ram_blocks: Convert to a QLIST
2010-06-14 11:12:53 -05:00
cpu-common.h
Remove IO_MEM_SUBWIDTH.
2010-04-25 12:59:33 +00:00
cpu-defs.h
move stop/stopped CPU_COMMON fields after area zeroed by reset
2010-05-11 14:02:22 -03:00
cpu-exec.c
tcg-s390: Compute is_write in cpu_signal_handler.
2010-06-11 18:15:41 +02:00
cpus.c
make qemu_thread_create block all signals
2010-06-14 15:46:28 -05:00
cpus.h
Fix cpu list("-cpu ?") breakage, spotted by TeLeMan
2010-05-04 19:55:35 +00:00
create_config
configure: Fix evaluation of config-host.mak in create_config
2010-06-13 12:50:30 +02:00
cris-dis.c
…
curses_keys.h
Fix curses interaction with keymaps
2010-03-06 23:15:30 +01:00
curses.c
Revert 'Fix build'
2010-03-21 19:44:06 +00:00
cursor_hidden.xpm
cursor: add cursor functions.
2010-05-24 15:18:23 -05:00
cursor_left_ptr.xpm
cursor: add cursor functions.
2010-05-24 15:18:23 -05:00
cursor.c
cursor: add cursor functions.
2010-05-24 15:18:23 -05:00
cutils.c
split out qemu-timer.c
2010-03-17 11:16:15 -05:00
d3des.c
…
d3des.h
…
def-helper.h
…
device_tree.c
…
device_tree.h
…
dis-asm.h
ia64 disas support
2010-04-01 21:51:59 +02:00
disas.c
ia64 disas support
2010-04-01 21:51:59 +02:00
disas.h
Disassembler symbol lookup fix
2010-03-01 04:39:50 +00:00
dma-helpers.c
…
dma.h
…
dyngen-exec.h
Move stdbool.h
2010-06-13 19:00:50 +01:00
elf.h
microblaze: Update elf machine nums.
2010-05-19 15:24:17 +02:00
envlist.c
…
envlist.h
…
exec-all.h
tcg: get rid of copy_size in TCGOpDef
2010-06-09 16:10:50 +02:00
exec.c
ram_blocks: Convert to a QLIST
2010-06-14 11:12:53 -05:00
feature_to_c.sh
…
gdbstub.c
sparc: Fix lazy flag calculation on interrupts, refactor
2010-05-09 20:19:04 +00:00
gdbstub.h
Allow various header files to be included from non-CPU code
2010-03-29 19:23:47 +00:00
gen-icount.h
Compile qemu-timer only once
2010-03-29 19:24:00 +00:00
host-utils.c
…
host-utils.h
target-alpha: Fix generic ctz64.
2009-12-17 18:12:04 +01:00
hpet.h
…
hppa-dis.c
tcg-hppa: Fix const errors in hppa-dis.c
2010-03-23 22:00:43 +01:00
hppa.ld
…
hxtool
hxtool: Fix line number reporting on SQMP/EQMP errors
2010-06-11 16:35:46 -03:00
i386-dis.c
i386-dis: Fix unused return value, spotted by clang
2010-04-18 14:27:44 +00:00
i386.ld
Fix missing symbols in .rel/.rela.plt sections
2010-02-06 22:22:27 +01:00
ia64-dis.c
Fix %lld or %llx printf format use
2010-05-22 08:02:12 +00:00
ia64.ld
…
input.c
un-register kbd driver in case of USB kbd unplug.
2010-06-14 15:46:28 -05:00
ioport-user.c
…
ioport.c
…
ioport.h
…
iov.c
iov: Move from hw/ to topdir
2010-05-10 11:36:03 -05:00
iov.h
iov: Move from hw/ to topdir
2010-05-10 11:36:03 -05:00
json-lexer.c
remove unnecessary lookaheads
2010-06-11 15:25:14 -03:00
json-lexer.h
…
json-parser.c
Merge remote branch 'qmp/for-anthony' into staging
2010-06-14 09:39:01 -05:00
json-parser.h
…
json-streamer.c
json-streamer: Don't use qdict_put_obj()
2010-06-11 15:25:14 -03:00
json-streamer.h
…
keymaps.c
Fix curses interaction with keymaps
2010-03-06 23:15:30 +01:00
keymaps.h
Fix curses interaction with keymaps
2010-03-06 23:15:30 +01:00
kvm-all.c
Do not stop VM if emulation failed in userspace.
2010-05-11 14:03:44 -03:00
kvm-stub.c
provide a stub version of kvm-all.c if !CONFIG_KVM
2010-04-19 18:59:30 +00:00
kvm.h
Move stdbool.h
2010-06-13 19:00:50 +01:00
libfdt_env.h
…
LICENSE
…
linux-aio.c
linux-aio: Fix typo in read() EINTR check
2010-04-23 16:21:57 +02:00
m68k-dis.c
m68k-dis: fix unused return value, spotted by clang
2010-04-23 19:22:17 +00:00
m68k-semi.c
…
m68k.ld
…
MAINTAINERS
Update MAINTAINERS
2010-02-06 19:24:42 +01:00
Makefile
vnc: add missing target for vnc-encodings-*.o
2010-06-01 16:15:51 -05:00
Makefile.dis
Compile disassemblers only once
2010-03-21 08:28:47 +00:00
Makefile.hw
Clean libhw subdirs as well
2010-05-22 08:24:49 +00:00
Makefile.objs
Merge remote branch 'kwolf/for-anthony' into staging
2010-06-14 10:33:36 -05:00
Makefile.target
cris: Break out image loading to hw/cris-boot.c.
2010-06-10 14:45:46 +02:00
Makefile.user
Use vpath directive
2010-01-08 09:58:40 -06:00
microblaze-dis.c
microblaze: fix custom fprintf
2010-04-27 18:56:11 +00:00
migration-exec.c
migration-exec: fix OpenBSD build warning
2010-06-04 20:01:07 +00:00
migration-fd.c
remove useless cast
2010-03-19 15:27:27 -05:00
migration-tcp.c
migration-tcp: call migrate_fd_error() instead of close() and free().
2010-06-14 15:46:28 -05:00
migration-unix.c
migration: unix migration should obey autostart are the other ones
2010-03-17 11:16:15 -05:00
migration.c
migration: use qemu_free() instead of free().
2010-06-14 15:46:28 -05:00
migration.h
migration: respect exit status with exec:
2010-06-03 14:55:45 -05:00
mips-dis.c
mips-dis: Add missing static attributes
2010-05-09 06:47:20 +00:00
mips.ld
…
module.c
…
module.h
…
monitor.c
Merge remote branch 'kwolf/for-anthony' into staging
2010-06-14 10:33:36 -05:00
monitor.h
QMP: Introduce RESUME event
2010-05-03 12:39:12 -05:00
nbd.c
Fix %lld or %llx printf format use
2010-05-22 08:02:12 +00:00
nbd.h
Move stdbool.h
2010-06-13 19:00:50 +01:00
net-checksum.c
…
net.c
Make netdev_del delete the netdev even when it's in use
2010-06-14 11:12:53 -05:00
net.h
Move stdbool.h
2010-06-13 19:00:50 +01:00
notify.c
Add support for generic notifier lists
2010-03-19 15:27:32 -05:00
notify.h
Add support for generic notifier lists
2010-03-19 15:27:32 -05:00
os-posix.c
Move set_proc_name() to OS specific files.
2010-06-12 08:49:15 +03:00
os-win32.c
Move daemonize handling to OS specific files
2010-06-12 08:49:15 +03:00
osdep.c
documentation: qemu_write_full don't work with non-blocking fd's
2010-03-09 11:23:00 -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
…
poison.h
move targphys.h and hw/poison.h inclusion to cpu-common.h
2010-04-09 18:55:55 +02:00
posix-aio-compat.c
posix-aio-compat: Expand tabs that have crept in
2010-05-28 13:14:26 +02:00
ppc64.ld
…
ppc-dis.c
…
ppc.ld
…
qbool.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qbool.h
…
qdict-test-data.txt
…
qdict.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qdict.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qemu_socket.h
move socket_init to qemu-sockets.c
2010-04-09 18:55:54 +02:00
qemu-aio.h
…
qemu-barrier.h
kvm-all.c: define smp_wmb and use it for coalesced mmio
2010-02-22 19:04:13 +02:00
qemu-binfmt-conf.sh
target-alpha: Add binfmt entry.
2009-12-13 20:32:36 +01:00
qemu-char.c
blockdev: Collect block device code in new blockdev.c
2010-06-04 15:20:47 +02:00
qemu-char.h
Always notify consumers of char devices if they're open
2010-04-09 22:03:22 +02:00
qemu-common.h
cow: stop using mmap
2010-06-15 09:41:59 +02:00
qemu-config.c
Add cache=unsafe parameter to -drive
2010-05-26 20:05:14 +02:00
qemu-config.h
virtio-9p: Create a syntactic shortcut for the file-system pass-thru
2010-05-03 12:17:39 -05:00
qemu-doc.texi
Pre-allocate guest address space
2010-05-29 02:27:35 +01:00
qemu-error.c
error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
2010-03-27 14:30:38 +01:00
qemu-error.h
error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
2010-03-27 14:30:38 +01:00
qemu-img-cmds.hx
Fix TEXI section mark imbalance in qemu-img-cmd.hx
2010-05-22 08:33:50 +00:00
qemu-img.c
add support for protocol driver create_options
2010-05-28 13:14:25 +02:00
qemu-img.texi
qemu-img: Add 'resize' command to grow/shrink disk images
2010-05-03 10:07:32 +02:00
qemu-io.c
qemu-io: Fix error messages
2010-06-04 11:43:39 +02:00
qemu-lock.h
…
qemu-log.h
…
qemu-malloc.c
cow: stop using mmap
2010-06-15 09:41:59 +02:00
qemu-monitor.hx
monitor/QMP: Drop info hpet / query-hpet
2010-06-13 15:33:02 +03:00
qemu-nbd.c
qemu-nbd: Improve error reporting
2010-05-17 10:20:04 +02:00
qemu-nbd.texi
qemu-nbd: Fix wrong description in qemu-nbd.texi
2010-03-06 23:03:50 +01:00
qemu-objects.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qemu-option.c
qemu-option: Reject anti-social IDs
2010-06-14 15:46:28 -05:00
qemu-option.h
add support for protocol driver create_options
2010-05-28 13:14:25 +02:00
qemu-options.h
Introduce OS specific cmdline argument handling and move SMB arg to os-posix.c
2010-06-12 08:49:15 +03:00
qemu-options.hx
Make cache=unsafe the default for -snapshot
2010-05-27 00:08:09 +02:00
qemu-os-posix.h
Move set_proc_name() to OS specific files.
2010-06-12 08:49:15 +03:00
qemu-os-win32.h
Move set_proc_name() to OS specific files.
2010-06-12 08:49:15 +03:00
qemu-queue.h
Import a simple queue implementation from NetBSD
2009-12-03 10:48:52 -06:00
qemu-sockets.c
qemu-sockets: avoid strlen of NULL pointer
2010-05-18 19:49:16 +02: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
make qemu_thread_create block all signals
2010-06-14 15:46:28 -05:00
qemu-thread.h
…
qemu-timer.c
Compile qemu-timer only once
2010-03-29 19:24:00 +00:00
qemu-timer.h
Implement cpu_get_real_ticks for Alpha.
2010-04-27 05:50:42 +02:00
qemu-tool.c
error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o
2010-03-27 14:30:38 +01:00
qemu-x509.h
move x509 file name defines to qemu-x509.h
2010-03-08 11:30:09 -06:00
qemu.sasl
…
qerror.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qerror.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qfloat.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qfloat.h
…
qint.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qint.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qjson.c
qjson: Handle "\f"
2010-06-11 15:25:14 -03:00
qjson.h
QJSON: Introduce qobject_from_jsonv()
2009-12-03 09:41:18 -06:00
qlist.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qlist.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qobject.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qstring.c
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
qstring.h
Fix qtypes' licenses
2010-05-19 12:45:54 -03:00
readline.c
cope with printf macro definition in readline.c
2010-02-08 12:12:40 +03:00
readline.h
…
README
…
rules.mak
Put dependency files in proper subdir
2010-05-22 08:31:20 +00:00
rwhandler.c
Don't compile rwhandler.c for user targets
2010-02-20 09:27:38 +00:00
rwhandler.h
rwhandler: simplified way to register for mem/io
2010-02-14 16:10:53 +02:00
s390-dis.c
s390: Disassemble some general-instruction-extension insns.
2010-06-10 00:46:41 +02:00
s390.ld
…
savevm.c
savevm: Really verify if a drive supports snapshots
2010-06-15 09:41:58 +02:00
sdl_keysym.h
…
sdl_zoom_template.h
…
sdl_zoom.c
…
sdl_zoom.h
…
sdl.c
use new cursor struct + functions for vmware vga and sdl.
2010-05-24 15:18:24 -05:00
sh4-dis.c
sh4: Fix compiler warning (fprintf format string)
2010-04-14 01:04:02 +02:00
softmmu_defs.h
…
softmmu_exec.h
sparc64: handle asi referencing nucleus and secondary MMU contexts
2010-05-06 23:14:26 +03:00
softmmu_header.h
sparc64: fix 32bit load sign extension
2010-06-02 20:04:52 +00:00
softmmu_template.h
Split TLB addend and target_phys_addr_t
2010-04-05 00:28:53 +01:00
softmmu-semi.h
…
sparc64.ld
…
sparc-dis.c
sparc64: more ultrasparc asi extensions for disassembler
2010-05-06 20:13:02 +00:00
sparc.ld
…
sysemu.h
Add exit notifiers.
2010-06-14 15:46:28 -05:00
targphys.h
Split TLB addend and target_phys_addr_t
2010-04-05 00:28:53 +01:00
tcg-runtime.c
tcg: add div/rem 32-bit helpers
2010-03-14 22:04:50 +01:00
texi2pod.pl
…
thunk.c
…
thunk.h
…
TODO
…
translate-all.c
tcg: get rid of copy_size in TCGOpDef
2010-06-09 16:10:50 +02:00
uboot_image.h
…
usb-bsd.c
qdev: Replace device names containing whitespace
2009-12-12 07:59:38 -06:00
usb-linux.c
Changes to usb-linux to conform to coding style
2010-05-03 12:39:53 -05: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
Add exit notifiers.
2010-06-14 15:46:28 -05:00
vnc_keysym.h
…
vnc-auth-sasl.c
vnc: Fix compile error on x86_64 with -D_VNC_DEBUG=1
2010-05-03 12:09:22 -05:00
vnc-auth-sasl.h
…
vnc-auth-vencrypt.c
…
vnc-auth-vencrypt.h
…
vnc-encoding-hextile.c
vnc: return the number of rectangles
2010-06-01 12:53:09 -05:00
vnc-encoding-tight.c
Move stdbool.h
2010-06-13 19:00:50 +01:00
vnc-encoding-tight.h
vnc: add basic tight support
2010-06-01 12:53:09 -05:00
vnc-encoding-zlib.c
vnc: add basic tight support
2010-06-01 12:53:09 -05:00
vnc-tls.c
move x509 file name defines to qemu-x509.h
2010-03-08 11:30:09 -06:00
vnc-tls.h
…
vnc.c
Monitor: Drop QMP documentation from code
2010-06-01 13:48:43 -05:00
vnc.h
vnc: keep track of client desktop size
2010-06-01 13:30:08 -05:00
vnchextile.h
vnc: rich cursor support.
2010-05-24 15:18:24 -05: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.
Reference in New Issue View Git Blame Copy Permalink
S
Description
No description provided
Readme 600 MiB
Languages
C 83.1%
C++ 6.4%
Python 3.3%
Dylan 2.8%
Shell 1.5%
Other 2.6%