* [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28
@ 2014-04-28 5:07 Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 01/18] misc: Use cpu_physical_memory_read and cpu_physical_memory_write Michael Tokarev
` (18 more replies)
0 siblings, 19 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev
Here's another trivial-patches pull request. I removed all
questionable or still-being-discussed patchses from there
which accumulated recently.
What's left are either code cleanups and rearrangements,
spelling fixes or --help output improvements, adding Qemu
logo file, one feature patch which's been waiting for too
long (conversion of -m to QemuOpts), and several small
bugfixes.
One change I want to mention especially, it is this one:
slirp/smb: Move ncalrpc directory to tmp
While slirp code has a maintainer, Jan Kiszka, he never commented
on this change since initial patch submission back at Nov-2013,
despite several subsequent pings. The change _is_ trivial and
fixes -smb with modern versions of samba. We've been waiting
for this (trivial) fix for too long.
Thanks,
/mjt
The following changes since commit 411f491e0af173cf8f39347574941bd26fbae381:
Merge remote-tracking branch 'remotes/rth/tags/tgt-axp-pull-20140424' into staging (2014-04-25 13:25:22 +0100)
are available in the git repository at:
git://git.corpit.ru/qemu.git tags/trivial-patches-2014-04-28
for you to fetch changes up to b87b8a8b32518df9e5285f9b3d4f9d9a0c426a06:
slirp/smb: Move ncalrpc directory to tmp (2014-04-28 08:55:32 +0400)
----------------------------------------------------------------
trivial patches for 2014-04-28
----------------------------------------------------------------
Chen Gang (3):
vl: Remove useless 'continue'
vl: Eliminate a superfluous local variable
vl: avoid closing stdout with 'writeconfig'
Cole Robinson (1):
tests/.gitignore: Ignore test-rfifolock
Fam Zheng (1):
configure: Improve help behavior
Igor Mammedov (1):
vl: convert -m to QemuOpts
Igor Ryzhov (1):
net/net.c: remove unnecessary semicolon
Kirill Batuzov (1):
init_paths: fix minor memory leak
Laszlo Ersek (1):
move test-* from .gitignore to tests/.gitignore
Michael Buesch (1):
slirp/smb: Move ncalrpc directory to tmp
Michael Tokarev (3):
gitignore: cleanups #2
po/Makefile: fix $SRC_PATH reference
po: add proper Language: tags to .po files
Paolo Bonzini (1):
qemu-option: introduce qemu_find_opts_singleton
Stefan Weil (3):
misc: Use cpu_physical_memory_read and cpu_physical_memory_write
xilinx: Fix typo in comment (Marvel -> Marvell)
Add QEMU logo (SVG file)
Tim Comer (1):
virtfs-proxy-helper: fix call to accept
.gitignore | 18 +-
configure | 7 +-
cpus.c | 2 +-
fsdev/virtfs-proxy-helper.c | 1 +
hw/i386/kvmvapic.c | 31 +-
hw/intc/apic.c | 4 +-
hw/net/xilinx_axienet.c | 2 +-
include/qemu/config-file.h | 2 +
net/net.c | 2 +-
net/slirp.c | 2 +
pc-bios/qemu_logo.svg | 1010 +++++++++++++++++++++++++++++++++++++++++++
po/Makefile | 4 +-
po/de_DE.po | 2 +-
po/fr_FR.po | 2 +-
po/hu.po | 2 +-
po/it.po | 2 +-
po/tr.po | 2 +-
qemu-options.hx | 9 +-
target-s390x/misc_helper.c | 12 +-
tests/.gitignore | 12 +-
util/path.c | 4 +-
util/qemu-config.c | 14 +
vl.c | 103 +++--
23 files changed, 1156 insertions(+), 93 deletions(-)
create mode 100644 pc-bios/qemu_logo.svg
^ permalink raw reply [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 01/18] misc: Use cpu_physical_memory_read and cpu_physical_memory_write
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 02/18] qemu-option: introduce qemu_find_opts_singleton Michael Tokarev
` (17 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil, Michael Tokarev
From: Stefan Weil <sw@weilnetz.de>
These functions don't need type casts (as does cpu_physical_memory_rw)
and also make the code better readable.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
cpus.c | 2 +-
hw/i386/kvmvapic.c | 31 ++++++++++++++-----------------
hw/intc/apic.c | 4 ++--
target-s390x/misc_helper.c | 12 ++++++------
4 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/cpus.c b/cpus.c
index 1104d61..7bbe153 100644
--- a/cpus.c
+++ b/cpus.c
@@ -1454,7 +1454,7 @@ void qmp_pmemsave(int64_t addr, int64_t size, const char *filename,
l = sizeof(buf);
if (l > size)
l = size;
- cpu_physical_memory_rw(addr, buf, l, 0);
+ cpu_physical_memory_read(addr, buf, l);
if (fwrite(buf, 1, l, f) != l) {
error_set(errp, QERR_IO_ERROR);
goto exit;
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index a1c3d1c..a967b48 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -124,14 +124,14 @@ static const TPRInstruction tpr_instr[] = {
static void read_guest_rom_state(VAPICROMState *s)
{
- cpu_physical_memory_rw(s->rom_state_paddr, (void *)&s->rom_state,
- sizeof(GuestROMState), 0);
+ cpu_physical_memory_read(s->rom_state_paddr, &s->rom_state,
+ sizeof(GuestROMState));
}
static void write_guest_rom_state(VAPICROMState *s)
{
- cpu_physical_memory_rw(s->rom_state_paddr, (void *)&s->rom_state,
- sizeof(GuestROMState), 1);
+ cpu_physical_memory_write(s->rom_state_paddr, &s->rom_state,
+ sizeof(GuestROMState));
}
static void update_guest_rom_state(VAPICROMState *s)
@@ -311,16 +311,14 @@ static int update_rom_mapping(VAPICROMState *s, CPUX86State *env, target_ulong i
for (pos = le32_to_cpu(s->rom_state.fixup_start);
pos < le32_to_cpu(s->rom_state.fixup_end);
pos += 4) {
- cpu_physical_memory_rw(paddr + pos - s->rom_state.vaddr,
- (void *)&offset, sizeof(offset), 0);
+ cpu_physical_memory_read(paddr + pos - s->rom_state.vaddr,
+ &offset, sizeof(offset));
offset = le32_to_cpu(offset);
- cpu_physical_memory_rw(paddr + offset, (void *)&patch,
- sizeof(patch), 0);
+ cpu_physical_memory_read(paddr + offset, &patch, sizeof(patch));
patch = le32_to_cpu(patch);
patch += rom_state_vaddr - le32_to_cpu(s->rom_state.vaddr);
patch = cpu_to_le32(patch);
- cpu_physical_memory_rw(paddr + offset, (void *)&patch,
- sizeof(patch), 1);
+ cpu_physical_memory_write(paddr + offset, &patch, sizeof(patch));
}
read_guest_rom_state(s);
s->vapic_paddr = paddr + le32_to_cpu(s->rom_state.vapic_vaddr) -
@@ -364,8 +362,8 @@ static int vapic_enable(VAPICROMState *s, X86CPU *cpu)
}
vapic_paddr = s->vapic_paddr +
(((hwaddr)cpu_number) << VAPIC_CPU_SHIFT);
- cpu_physical_memory_rw(vapic_paddr + offsetof(VAPICState, enabled),
- (void *)&enabled, sizeof(enabled), 1);
+ cpu_physical_memory_write(vapic_paddr + offsetof(VAPICState, enabled),
+ &enabled, sizeof(enabled));
apic_enable_vapic(cpu->apic_state, vapic_paddr);
s->state = VAPIC_ACTIVE;
@@ -535,7 +533,7 @@ static int patch_hypercalls(VAPICROMState *s)
uint8_t *rom;
rom = g_malloc(s->rom_size);
- cpu_physical_memory_rw(rom_paddr, rom, s->rom_size, 0);
+ cpu_physical_memory_read(rom_paddr, rom, s->rom_size);
for (pos = 0; pos < s->rom_size - sizeof(vmcall_pattern); pos++) {
if (kvm_irqchip_in_kernel()) {
@@ -551,8 +549,7 @@ static int patch_hypercalls(VAPICROMState *s)
}
if (memcmp(rom + pos, pattern, 7) == 0 &&
(rom[pos + 7] == alternates[0] || rom[pos + 7] == alternates[1])) {
- cpu_physical_memory_rw(rom_paddr + pos + 5, (uint8_t *)patch,
- 3, 1);
+ cpu_physical_memory_write(rom_paddr + pos + 5, patch, 3);
/*
* Don't flush the tb here. Under ordinary conditions, the patched
* calls are miles away from the current IP. Under malicious
@@ -760,8 +757,8 @@ static int vapic_post_load(void *opaque, int version_id)
run_on_cpu(first_cpu, do_vapic_enable, s);
} else {
zero = g_malloc0(s->rom_state.vapic_size);
- cpu_physical_memory_rw(s->vapic_paddr, zero,
- s->rom_state.vapic_size, 1);
+ cpu_physical_memory_write(s->vapic_paddr, zero,
+ s->rom_state.vapic_size);
g_free(zero);
}
}
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index b8c061b..2f40cba 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -98,8 +98,8 @@ static void apic_sync_vapic(APICCommonState *s, int sync_type)
return;
}
if (sync_type & SYNC_FROM_VAPIC) {
- cpu_physical_memory_rw(s->vapic_paddr, (void *)&vapic_state,
- sizeof(vapic_state), 0);
+ cpu_physical_memory_read(s->vapic_paddr, &vapic_state,
+ sizeof(vapic_state));
s->tpr = vapic_state.tpr;
}
if (sync_type & (SYNC_TO_VAPIC | SYNC_ISR_IRR_TO_VAPIC)) {
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 294b3ed..cdbbb79 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -336,7 +336,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
ebcdic_put(sysib.model, "QEMU ", 16);
ebcdic_put(sysib.sequence, "QEMU ", 16);
ebcdic_put(sysib.plant, "QEMU", 4);
- cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);
+ cpu_physical_memory_write(a0, &sysib, sizeof(sysib));
} else if ((sel1 == 2) && (sel2 == 1)) {
/* Basic Machine CPU */
struct sysib_121 sysib;
@@ -346,7 +346,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
ebcdic_put(sysib.sequence, "QEMUQEMUQEMUQEMU", 16);
ebcdic_put(sysib.plant, "QEMU", 4);
stw_p(&sysib.cpu_addr, env->cpu_num);
- cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);
+ cpu_physical_memory_write(a0, &sysib, sizeof(sysib));
} else if ((sel1 == 2) && (sel2 == 2)) {
/* Basic Machine CPUs */
struct sysib_122 sysib;
@@ -358,7 +358,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
stw_p(&sysib.active_cpus, 1);
stw_p(&sysib.standby_cpus, 0);
stw_p(&sysib.reserved_cpus, 0);
- cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);
+ cpu_physical_memory_write(a0, &sysib, sizeof(sysib));
} else {
cc = 3;
}
@@ -375,7 +375,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
ebcdic_put(sysib.plant, "QEMU", 4);
stw_p(&sysib.cpu_addr, env->cpu_num);
stw_p(&sysib.cpu_id, 0);
- cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);
+ cpu_physical_memory_write(a0, &sysib, sizeof(sysib));
} else if ((sel1 == 2) && (sel2 == 2)) {
/* LPAR CPUs */
struct sysib_222 sysib;
@@ -392,7 +392,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
stl_p(&sysib.caf, 1000);
stw_p(&sysib.dedicated_cpus, 0);
stw_p(&sysib.shared_cpus, 0);
- cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);
+ cpu_physical_memory_write(a0, &sysib, sizeof(sysib));
} else {
cc = 3;
}
@@ -414,7 +414,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0,
ebcdic_put(sysib.vm[0].name, "KVMguest", 8);
stl_p(&sysib.vm[0].caf, 1000);
ebcdic_put(sysib.vm[0].cpi, "KVM/Linux ", 16);
- cpu_physical_memory_rw(a0, (uint8_t *)&sysib, sizeof(sysib), 1);
+ cpu_physical_memory_write(a0, &sysib, sizeof(sysib));
} else {
cc = 3;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 02/18] qemu-option: introduce qemu_find_opts_singleton
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 01/18] misc: Use cpu_physical_memory_read and cpu_physical_memory_write Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 03/18] vl: convert -m to QemuOpts Michael Tokarev
` (16 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev, Igor Mammedov
From: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
include/qemu/config-file.h | 2 ++
util/qemu-config.c | 14 ++++++++++++++
vl.c | 11 +----------
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h
index dbd97c4..d4ba20e 100644
--- a/include/qemu/config-file.h
+++ b/include/qemu/config-file.h
@@ -8,6 +8,8 @@
QemuOptsList *qemu_find_opts(const char *group);
QemuOptsList *qemu_find_opts_err(const char *group, Error **errp);
+QemuOpts *qemu_find_opts_singleton(const char *group);
+
void qemu_add_opts(QemuOptsList *list);
void qemu_add_drive_opts(QemuOptsList *list);
int qemu_set_option(const char *str);
diff --git a/util/qemu-config.c b/util/qemu-config.c
index f610101..60051df 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -39,6 +39,20 @@ QemuOptsList *qemu_find_opts(const char *group)
return ret;
}
+QemuOpts *qemu_find_opts_singleton(const char *group)
+{
+ QemuOptsList *list;
+ QemuOpts *opts;
+
+ list = qemu_find_opts(group);
+ assert(list);
+ opts = qemu_opts_find(list, NULL);
+ if (!opts) {
+ opts = qemu_opts_create(list, NULL, 0, &error_abort);
+ }
+ return opts;
+}
+
static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc *desc)
{
CommandLineParameterInfoList *param_list = NULL, *entry;
diff --git a/vl.c b/vl.c
index db9ea90..5aad3bc 100644
--- a/vl.c
+++ b/vl.c
@@ -517,16 +517,7 @@ static QemuOptsList qemu_name_opts = {
*/
QemuOpts *qemu_get_machine_opts(void)
{
- QemuOptsList *list;
- QemuOpts *opts;
-
- list = qemu_find_opts("machine");
- assert(list);
- opts = qemu_opts_find(list, NULL);
- if (!opts) {
- opts = qemu_opts_create(list, NULL, 0, &error_abort);
- }
- return opts;
+ return qemu_find_opts_singleton("machine");
}
const char *qemu_get_vm_name(void)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 03/18] vl: convert -m to QemuOpts
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 01/18] misc: Use cpu_physical_memory_read and cpu_physical_memory_write Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 02/18] qemu-option: introduce qemu_find_opts_singleton Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 04/18] configure: Improve help behavior Michael Tokarev
` (15 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Igor Mammedov, Michael Tokarev, Paolo Bonzini
From: Igor Mammedov <imammedo@redhat.com>
Adds option to -m
"size" - startup memory amount
For compatibility with legacy CLI if suffix-less number is passed,
it assumes amount in Mb.
Otherwise user is free to use suffixed number using suffixes b,k/K,M,G
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
qemu-options.hx | 9 ++++---
vl.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 63 insertions(+), 17 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 6457034..926349b 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -210,10 +210,13 @@ use is discouraged as it may be removed from future versions.
ETEXI
DEF("m", HAS_ARG, QEMU_OPTION_m,
- "-m megs set virtual RAM size to megs MB [default="
- stringify(DEFAULT_RAM_SIZE) "]\n", QEMU_ARCH_ALL)
+ "-m [size=]megs\n"
+ " configure guest RAM\n"
+ " size: initial amount of guest memory (default: "
+ stringify(DEFAULT_RAM_SIZE) "MiB)\n",
+ QEMU_ARCH_ALL)
STEXI
-@item -m @var{megs}
+@item -m [size=]@var{megs}
@findex -m
Set virtual RAM size to @var{megs} megabytes. Default is 128 MiB. Optionally,
a suffix of ``M'' or ``G'' can be used to signify a value in megabytes or
diff --git a/vl.c b/vl.c
index 5aad3bc..d6c5df1 100644
--- a/vl.c
+++ b/vl.c
@@ -510,6 +510,20 @@ static QemuOptsList qemu_name_opts = {
},
};
+static QemuOptsList qemu_mem_opts = {
+ .name = "memory",
+ .implied_opt_name = "size",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_mem_opts.head),
+ .merge_lists = true,
+ .desc = {
+ {
+ .name = "size",
+ .type = QEMU_OPT_SIZE,
+ },
+ { /* end of list */ }
+ },
+};
+
/**
* Get machine options
*
@@ -2955,6 +2969,8 @@ int main(int argc, char **argv, char **envp)
};
const char *trace_events = NULL;
const char *trace_file = NULL;
+ const ram_addr_t default_ram_size = (ram_addr_t)DEFAULT_RAM_SIZE *
+ 1024 * 1024;
atexit(qemu_run_exit_notifiers);
error_set_progname(argv[0]);
@@ -2978,6 +2994,7 @@ int main(int argc, char **argv, char **envp)
qemu_add_opts(&qemu_trace_opts);
qemu_add_opts(&qemu_option_rom_opts);
qemu_add_opts(&qemu_machine_opts);
+ qemu_add_opts(&qemu_mem_opts);
qemu_add_opts(&qemu_smp_opts);
qemu_add_opts(&qemu_boot_opts);
qemu_add_opts(&qemu_sandbox_opts);
@@ -3002,7 +3019,7 @@ int main(int argc, char **argv, char **envp)
module_call_init(MODULE_INIT_MACHINE);
machine_class = find_default_machine();
cpu_model = NULL;
- ram_size = 0;
+ ram_size = default_ram_size;
snapshot = 0;
cyls = heads = secs = 0;
translation = BIOS_ATA_TRANSLATION_AUTO;
@@ -3289,20 +3306,48 @@ int main(int argc, char **argv, char **envp)
exit(0);
break;
case QEMU_OPTION_m: {
- int64_t value;
uint64_t sz;
- char *end;
+ const char *mem_str;
- value = strtosz(optarg, &end);
- if (value < 0 || *end) {
- fprintf(stderr, "qemu: invalid ram size: %s\n", optarg);
- exit(1);
+ opts = qemu_opts_parse(qemu_find_opts("memory"),
+ optarg, 1);
+ if (!opts) {
+ exit(EXIT_FAILURE);
+ }
+
+ mem_str = qemu_opt_get(opts, "size");
+ if (!mem_str) {
+ error_report("invalid -m option, missing 'size' option");
+ exit(EXIT_FAILURE);
+ }
+ if (!*mem_str) {
+ error_report("missing 'size' option value");
+ exit(EXIT_FAILURE);
+ }
+
+ sz = qemu_opt_get_size(opts, "size", ram_size);
+
+ /* Fix up legacy suffix-less format */
+ if (g_ascii_isdigit(mem_str[strlen(mem_str) - 1])) {
+ uint64_t overflow_check = sz;
+
+ sz <<= 20;
+ if ((sz >> 20) != overflow_check) {
+ error_report("too large 'size' option value");
+ exit(EXIT_FAILURE);
+ }
+ }
+
+ /* backward compatibility behaviour for case "-m 0" */
+ if (sz == 0) {
+ sz = default_ram_size;
}
- sz = QEMU_ALIGN_UP((uint64_t)value, 8192);
+
+ sz = QEMU_ALIGN_UP(sz, 8192);
ram_size = sz;
if (ram_size != sz) {
- fprintf(stderr, "qemu: ram size too large\n");
- exit(1);
+ error_report("ram size too large");
+ exit(EXIT_FAILURE);
}
break;
}
@@ -4145,10 +4190,8 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
- /* init the memory */
- if (ram_size == 0) {
- ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
- }
+ /* store value for the future use */
+ qemu_opt_set_number(qemu_find_opts_singleton("memory"), "size", ram_size);
if (qemu_opts_foreach(qemu_find_opts("device"), device_help_func, NULL, 0)
!= 0) {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 04/18] configure: Improve help behavior
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (2 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 03/18] vl: convert -m to QemuOpts Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 05/18] move test-* from .gitignore to tests/.gitignore Michael Tokarev
` (14 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Fam Zheng
From: Fam Zheng <famz@redhat.com>
Old:
There are two paths to show help and exit 1, one is with "-h" or
"--help", one is with invalid options.
New:
Show help and exit 0 for --help.
On invalid option, don't show the long help and bury the early "ERROR:"
line, just give a message pointing to --help.
Signed-off-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
configure | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index b08afc3..2fbec59 100755
--- a/configure
+++ b/configure
@@ -1087,7 +1087,10 @@ for opt do
;;
--enable-quorum) quorum="yes"
;;
- *) echo "ERROR: unknown option $opt"; show_help="yes"
+ *)
+ echo "ERROR: unknown option $opt"
+ echo "Try '$0 --help' for more information"
+ exit 1
;;
esac
done
@@ -1353,7 +1356,7 @@ Advanced options (experts only):
NOTE: The object files are built at the place where configure is launched
EOF
-exit 1
+exit 0
fi
# Now we have handled --enable-tcg-interpreter and know we're not just
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 05/18] move test-* from .gitignore to tests/.gitignore
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (3 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 04/18] configure: Improve help behavior Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 06/18] tests/.gitignore: Ignore test-rfifolock Michael Tokarev
` (13 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Laszlo Ersek
From: Laszlo Ersek <lersek@redhat.com>
Also sort the test-* entries in the latter.
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
.gitignore | 9 ---------
tests/.gitignore | 11 +++++++++--
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index de90463..2748526 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,15 +49,6 @@ libuser
/qemu-monitor.texi
/qmp-commands.txt
/vscclient
-/test-bitops
-/test-coroutine
-/test-int128
-/test-opts-visitor
-/test-qmp-input-visitor
-/test-qmp-output-visitor
-/test-string-input-visitor
-/test-string-output-visitor
-/test-visitor-serialization
/fsdev/virtfs-proxy-helper
/fsdev/virtfs-proxy-helper.1
/fsdev/virtfs-proxy-helper.pod
diff --git a/tests/.gitignore b/tests/.gitignore
index 9ba9d96..3aa1e95 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -7,20 +7,27 @@ check-qstring
check-qom-interface
test-aio
test-bitops
-test-throttle
+test-coroutine
test-cutils
test-hbitmap
test-int128
test-iov
test-mul64
+test-opts-visitor
test-qapi-types.[ch]
test-qapi-visit.[ch]
test-qdev-global-props
-test-qmp-commands.h
test-qmp-commands
+test-qmp-commands.h
test-qmp-input-strict
+test-qmp-input-visitor
test-qmp-marshal.c
+test-qmp-output-visitor
+test-string-input-visitor
+test-string-output-visitor
test-thread-pool
+test-throttle
+test-visitor-serialization
test-vmstate
test-x86-cpuid
test-xbzrle
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 06/18] tests/.gitignore: Ignore test-rfifolock
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (4 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 05/18] move test-* from .gitignore to tests/.gitignore Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 07/18] gitignore: cleanups #2 Michael Tokarev
` (12 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Cole Robinson
From: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
tests/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/tests/.gitignore b/tests/.gitignore
index 3aa1e95..c71c110 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -23,6 +23,7 @@ test-qmp-input-strict
test-qmp-input-visitor
test-qmp-marshal.c
test-qmp-output-visitor
+test-rfifolock
test-string-input-visitor
test-string-output-visitor
test-thread-pool
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 07/18] gitignore: cleanups #2
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (5 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 06/18] tests/.gitignore: Ignore test-rfifolock Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 08/18] vl: Remove useless 'continue' Michael Tokarev
` (11 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev
A few more cleanups for .gitignore file.
The final goal is to have only files in there which
are generated during build. Things like .orig or
.gdbinit are definitely not generated during build.
Also, anchor a few more build-time directories.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
.gitignore | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 2748526..8a52709 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,8 +18,8 @@
/*-darwin-user
/*-linux-user
/*-bsd-user
-libdis*
-libuser
+/libdis*
+/libuser
/linux-headers/asm
/qga/qapi-generated
/qapi-generated
@@ -52,7 +52,6 @@ libuser
/fsdev/virtfs-proxy-helper
/fsdev/virtfs-proxy-helper.1
/fsdev/virtfs-proxy-helper.pod
-/.gdbinit
*.a
*.aux
*.cp
@@ -81,12 +80,8 @@ libuser
*.pc
.libs
.sdk
-*.swp
-*.orig
-.pc
*.gcda
*.gcno
-patches
/pc-bios/bios-pq/status
/pc-bios/vgabios-pq/status
/pc-bios/optionrom/linuxboot.asm
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 08/18] vl: Remove useless 'continue'
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (6 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 07/18] gitignore: cleanups #2 Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 09/18] vl: Eliminate a superfluous local variable Michael Tokarev
` (10 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Chen Gang
From: Chen Gang <gang.chen.5i5j@gmail.com>
"This if else has no code between it and the end of the enclosing
while loop. This makes this continue redundant."
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
vl.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/vl.c b/vl.c
index d6c5df1..0b08a02 100644
--- a/vl.c
+++ b/vl.c
@@ -3042,7 +3042,6 @@ int main(int argc, char **argv, char **envp)
if (argv[optind][0] != '-') {
/* disk image */
optind++;
- continue;
} else {
const QEMUOption *popt;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 09/18] vl: Eliminate a superfluous local variable
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (7 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 08/18] vl: Remove useless 'continue' Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 10/18] xilinx: Fix typo in comment (Marvel -> Marvell) Michael Tokarev
` (9 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Chen Gang
From: Chen Gang <gang.chen.5i5j@gmail.com>
CODING_STYLE frowns upon mixing declarations and statements. main()
has such a declaration. Clean up by eliminating the variable.
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
vl.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/vl.c b/vl.c
index 0b08a02..773649f 100644
--- a/vl.c
+++ b/vl.c
@@ -4404,15 +4404,15 @@ int main(int argc, char **argv, char **envp)
qdev_machine_init();
- QEMUMachineInitArgs args = { .machine = machine,
- .ram_size = ram_size,
- .boot_order = boot_order,
- .kernel_filename = kernel_filename,
- .kernel_cmdline = kernel_cmdline,
- .initrd_filename = initrd_filename,
- .cpu_model = cpu_model };
-
- current_machine->init_args = args;
+ current_machine->init_args = (QEMUMachineInitArgs) {
+ .machine = machine,
+ .ram_size = ram_size,
+ .boot_order = boot_order,
+ .kernel_filename = kernel_filename,
+ .kernel_cmdline = kernel_cmdline,
+ .initrd_filename = initrd_filename,
+ .cpu_model = cpu_model };
+
machine->init(¤t_machine->init_args);
audio_init();
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 10/18] xilinx: Fix typo in comment (Marvel -> Marvell)
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (8 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 09/18] vl: Eliminate a superfluous local variable Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 11/18] vl: avoid closing stdout with 'writeconfig' Michael Tokarev
` (8 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil, Michael Tokarev
From: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/net/xilinx_axienet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 839d97c..6dc665f 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -98,7 +98,7 @@ static unsigned int tdk_read(struct PHY *phy, unsigned int req)
r |= 1;
break;
case 17:
- /* Marvel PHY on many xilinx boards. */
+ /* Marvell PHY on many xilinx boards. */
r = 0x8000; /* 1000Mb */
break;
case 18:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 11/18] vl: avoid closing stdout with 'writeconfig'
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (9 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 10/18] xilinx: Fix typo in comment (Marvel -> Marvell) Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 12/18] Add QEMU logo (SVG file) Michael Tokarev
` (7 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Chen Gang
From: Chen Gang <gang.chen.5i5j@gmail.com>
'writeconfig' supports output to stdout (with '-'); when that happens,
we must not close stdout, or further command line options that also use
stdout will be impacted. (Although 'writeconfig' was copied from
'readconfig', the latter does not have the problem because it does not
support reading from '-')
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
vl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/vl.c b/vl.c
index 773649f..236f95e 100644
--- a/vl.c
+++ b/vl.c
@@ -3890,7 +3890,9 @@ int main(int argc, char **argv, char **envp)
}
}
qemu_config_write(fp);
- fclose(fp);
+ if (fp != stdout) {
+ fclose(fp);
+ }
break;
}
case QEMU_OPTION_qtest:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 12/18] Add QEMU logo (SVG file)
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (10 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 11/18] vl: avoid closing stdout with 'writeconfig' Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 11:50 ` Benoît Canet
2014-04-28 5:07 ` [Qemu-trivial] [PULL 13/18] net/net.c: remove unnecessary semicolon Michael Tokarev
` (6 subsequent siblings)
18 siblings, 1 reply; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Stefan Weil, Michael Tokarev, Benoît Canet
From: Stefan Weil <sw@weilnetz.de>
The "Q" of the logo is already included in pc-bios/qemu_logo_no_text.svg.
This file now adds the complete logo as it was designed by Benoît Canet.
Benoît licensed it under CC-BY 3.0, see
http://lists.gnu.org/archive/html/qemu-devel/2012-02/msg02865.html.
Unneeded borders from Benoît's original logo were removed,
and metadata (license, author, date) was added in this version.
Cc: Benoît Canet <benoit@irqsave.net>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
pc-bios/qemu_logo.svg | 1010 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 1010 insertions(+)
create mode 100644 pc-bios/qemu_logo.svg
diff --git a/pc-bios/qemu_logo.svg b/pc-bios/qemu_logo.svg
new file mode 100644
index 0000000..07b5b51
--- /dev/null
+++ b/pc-bios/qemu_logo.svg
@@ -0,0 +1,1010 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="351.84259"
+ height="111.86757"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.48.3.1 r9886"
+ sodipodi:docname="qemu_logo.svg">
+ <title
+ id="title3182">Kew the Angry Emu</title>
+ <defs
+ id="defs4">
+ <linearGradient
+ id="linearGradient4686">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4688" />
+ <stop
+ id="stop3956"
+ offset="0.75"
+ style="stop-color:#000000;stop-opacity:0.87843138;" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.43921569;"
+ offset="0.75"
+ id="stop3958" />
+ <stop
+ id="stop3960"
+ offset="0.88"
+ style="stop-color:#181818;stop-opacity:1;" />
+ <stop
+ style="stop-color:#242424;stop-opacity:1;"
+ offset="0.88"
+ id="stop3962" />
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="1"
+ id="stop4690" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4467">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4469" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.8974359;"
+ offset="1"
+ id="stop4471" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4431">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4433" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4435" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4466">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4468" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4470" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4321">
+ <stop
+ style="stop-color:#ff6702;stop-opacity:1;"
+ offset="0"
+ id="stop4323" />
+ <stop
+ style="stop-color:#ff9a55;stop-opacity:1;"
+ offset="1"
+ id="stop4325" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4283">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4285" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4287" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4251">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4253" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4255" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4007">
+ <stop
+ style="stop-color:#ff6600;stop-opacity:1;"
+ offset="0"
+ id="stop4009" />
+ <stop
+ style="stop-color:#ff9148;stop-opacity:1;"
+ offset="1"
+ id="stop4011" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3999">
+ <stop
+ style="stop-color:#fff7f2;stop-opacity:1;"
+ offset="0"
+ id="stop4001" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4003" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3890">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3892" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3894" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3880">
+ <stop
+ style="stop-color:#eb7400;stop-opacity:1;"
+ offset="0"
+ id="stop3882" />
+ <stop
+ style="stop-color:#f7b06a;stop-opacity:1;"
+ offset="1"
+ id="stop3884" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4011">
+ <stop
+ style="stop-color:#042dc8;stop-opacity:1;"
+ offset="0"
+ id="stop4013" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3879">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.90598291;"
+ offset="0"
+ id="stop3881" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3869">
+ <stop
+ style="stop-color:#c95000;stop-opacity:1;"
+ offset="0"
+ id="stop3871" />
+ <stop
+ style="stop-color:#ff9e5e;stop-opacity:1;"
+ offset="1"
+ id="stop3873" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3861">
+ <stop
+ style="stop-color:#f06000;stop-opacity:1;"
+ offset="0"
+ id="stop3863" />
+ <stop
+ style="stop-color:#ffccaa;stop-opacity:1;"
+ offset="1"
+ id="stop3865" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3826">
+ <stop
+ style="stop-color:#ff6600;stop-opacity:1;"
+ offset="0"
+ id="stop3828" />
+ <stop
+ style="stop-color:#ff893b;stop-opacity:1;"
+ offset="1"
+ id="stop3830" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3879-6">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.90598291;"
+ offset="0"
+ id="stop3881-4" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-7" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3869-5">
+ <stop
+ style="stop-color:#c95000;stop-opacity:1;"
+ offset="0"
+ id="stop3871-9" />
+ <stop
+ style="stop-color:#ff9e5e;stop-opacity:1;"
+ offset="1"
+ id="stop3873-4" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3879-4"
+ id="linearGradient3885-6"
+ x1="76.025352"
+ y1="124.8497"
+ x2="75.874107"
+ y2="143.03978"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3879-4">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3869-2">
+ <stop
+ style="stop-color:#c95000;stop-opacity:1;"
+ offset="0"
+ id="stop3871-99" />
+ <stop
+ style="stop-color:#ff9e5e;stop-opacity:1;"
+ offset="1"
+ id="stop3873-6" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011"
+ id="radialGradient4017"
+ cx="66.639"
+ cy="93.096375"
+ fx="66.639"
+ fy="93.096375"
+ r="11.515625"
+ gradientTransform="matrix(0.23244854,1.600893,-1.0124495,0.14700695,145.40424,-26.300303)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3879-4-7"
+ id="linearGradient3885-6-2"
+ x1="76.025352"
+ y1="124.8497"
+ x2="75.874107"
+ y2="143.03978"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3879-4-7">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-7" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-6" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011-5"
+ id="radialGradient4017-7"
+ cx="66.639"
+ cy="93.096375"
+ fx="66.639"
+ fy="93.096375"
+ r="11.515625"
+ gradientTransform="matrix(0.99779178,6.8718773,-4.3459674,0.6310314,452.75975,-225.98471)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4011-5">
+ <stop
+ style="stop-color:#042dc8;stop-opacity:1;"
+ offset="0"
+ id="stop4013-1" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015-3" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3879-4-75"
+ id="linearGradient3885-6-8"
+ x1="76.025352"
+ y1="124.8497"
+ x2="75.874107"
+ y2="143.03978"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3879-4-75">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-1" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-4" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011-0"
+ id="radialGradient4017-5"
+ cx="66.639"
+ cy="93.096375"
+ fx="66.639"
+ fy="93.096375"
+ r="11.515625"
+ gradientTransform="matrix(0.23244854,1.600893,-1.0124495,0.14700695,146.34996,53.681728)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4011-0">
+ <stop
+ style="stop-color:#042dc8;stop-opacity:1;"
+ offset="0"
+ id="stop4013-4" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015-0" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011-0"
+ id="linearGradient4117"
+ x1="107.03001"
+ y1="189.72537"
+ x2="107.18476"
+ y2="173.47537"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3879-4-7-2"
+ id="linearGradient3885-6-2-8"
+ x1="76.025352"
+ y1="124.8497"
+ x2="75.874107"
+ y2="143.03978"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3879-4-7-2">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-7-9" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-6-9" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011-5-1"
+ id="radialGradient4017-7-9"
+ cx="66.639"
+ cy="93.096375"
+ fx="66.639"
+ fy="93.096375"
+ r="11.515625"
+ gradientTransform="matrix(0.99779178,6.8718773,-4.3459674,0.6310314,448.94742,-406.99277)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4011-5-1">
+ <stop
+ style="stop-color:#042dc8;stop-opacity:1;"
+ offset="0"
+ id="stop4013-1-9" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015-3-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3879-4-7-2-7"
+ id="linearGradient3885-6-2-8-0"
+ x1="76.025352"
+ y1="124.8497"
+ x2="75.874107"
+ y2="143.03978"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3879-4-7-2-7">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-7-9-3" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-6-9-6" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011-5-1-5"
+ id="radialGradient4017-7-9-5"
+ cx="66.639"
+ cy="93.096375"
+ fx="66.639"
+ fy="93.096375"
+ r="11.515625"
+ gradientTransform="matrix(0.55965334,3.8543806,-2.4376181,0.3539404,454.75182,-145.44353)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4011-5-1-5">
+ <stop
+ style="stop-color:#042dc8;stop-opacity:1;"
+ offset="0"
+ id="stop4013-1-9-6" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015-3-8-9" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3879-4-7-2-4"
+ id="linearGradient3885-6-2-8-4"
+ x1="76.025352"
+ y1="124.8497"
+ x2="75.874107"
+ y2="143.03978"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient3879-4-7-2-4">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-7-9-9" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-6-9-3" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4011-5-1-7"
+ id="radialGradient4017-7-9-7"
+ cx="66.639"
+ cy="93.096375"
+ fx="66.639"
+ fy="93.096375"
+ r="11.515625"
+ gradientTransform="matrix(0.26837158,1.8482981,-1.1689154,0.16972569,466.57614,26.180822)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4011-5-1-7">
+ <stop
+ style="stop-color:#042dc8;stop-opacity:1;"
+ offset="0"
+ id="stop4013-1-9-1" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015-3-8-5" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3879-4-7-2-0">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-7-9-7" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-6-9-8" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4011-5-1-55">
+ <stop
+ style="stop-color:#000a30;stop-opacity:1;"
+ offset="0"
+ id="stop4013-1-9-8" />
+ <stop
+ style="stop-color:#4260d5;stop-opacity:1;"
+ offset="1"
+ id="stop4015-3-8-3" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3890-9">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop3892-0" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3894-9" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3880-4">
+ <stop
+ style="stop-color:#eb7400;stop-opacity:1;"
+ offset="0"
+ id="stop3882-5" />
+ <stop
+ style="stop-color:#f7b06a;stop-opacity:1;"
+ offset="1"
+ id="stop3884-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3999-7">
+ <stop
+ style="stop-color:#fff7f2;stop-opacity:1;"
+ offset="0"
+ id="stop4001-9" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4003-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4007-9">
+ <stop
+ style="stop-color:#ff6600;stop-opacity:1;"
+ offset="0"
+ id="stop4009-1" />
+ <stop
+ style="stop-color:#ff9148;stop-opacity:1;"
+ offset="1"
+ id="stop4011-9" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4007-9-5">
+ <stop
+ style="stop-color:#ff6600;stop-opacity:1;"
+ offset="0"
+ id="stop4009-1-9" />
+ <stop
+ style="stop-color:#ff9148;stop-opacity:1;"
+ offset="1"
+ id="stop4011-9-5" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3999-7-1">
+ <stop
+ style="stop-color:#fff7f2;stop-opacity:1;"
+ offset="0"
+ id="stop4001-9-1" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4003-4-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4007-9-5-3">
+ <stop
+ style="stop-color:#ff6600;stop-opacity:1;"
+ offset="0"
+ id="stop4009-1-9-3" />
+ <stop
+ style="stop-color:#ff9148;stop-opacity:1;"
+ offset="1"
+ id="stop4011-9-5-9" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3999-7-1-4">
+ <stop
+ style="stop-color:#fff7f2;stop-opacity:1;"
+ offset="0"
+ id="stop4001-9-1-4" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4003-4-4-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3879-4-7-2-3">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0.93162394;"
+ offset="0"
+ id="stop3881-6-7-9-1" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop3883-74-6-9-87" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4011-5-1-1">
+ <stop
+ style="stop-color:#fde8a1;stop-opacity:1;"
+ offset="0"
+ id="stop4013-1-9-63" />
+ <stop
+ style="stop-color:#2947b9;stop-opacity:1;"
+ offset="1"
+ id="stop4015-3-8-8" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4466"
+ id="linearGradient4472"
+ x1="161.7561"
+ y1="540.72662"
+ x2="161.7561"
+ y2="579.80206"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4321"
+ id="radialGradient4474"
+ cx="130.8242"
+ cy="575.27838"
+ fx="130.8242"
+ fy="575.27838"
+ r="49.498173"
+ gradientTransform="matrix(0.95670828,0.96684666,-0.72623533,0.71862001,423.45109,35.05138)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4466-5"
+ id="linearGradient4472-9"
+ x1="161.7561"
+ y1="540.72662"
+ x2="161.7561"
+ y2="579.80206"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4466-5">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4468-2" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4470-3" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4321-0"
+ id="radialGradient4474-6"
+ cx="130.8242"
+ cy="575.27838"
+ fx="130.8242"
+ fy="575.27838"
+ r="49.498173"
+ gradientTransform="matrix(0.95670828,0.96684666,-0.72623533,0.71862001,442.64399,170.9169)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4321-0">
+ <stop
+ style="stop-color:#ff6702;stop-opacity:1;"
+ offset="0"
+ id="stop4323-3" />
+ <stop
+ style="stop-color:#ff9a55;stop-opacity:1;"
+ offset="1"
+ id="stop4325-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4466-5-5">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4468-2-9" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4470-3-4" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4321-0-0">
+ <stop
+ style="stop-color:#ff6702;stop-opacity:1;"
+ offset="0"
+ id="stop4323-3-9" />
+ <stop
+ style="stop-color:#ff9a55;stop-opacity:1;"
+ offset="1"
+ id="stop4325-1-1" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4466-5-9">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4468-2-7" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4470-3-7" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4321-0-7">
+ <stop
+ style="stop-color:#ff6702;stop-opacity:1;"
+ offset="0"
+ id="stop4323-3-3" />
+ <stop
+ style="stop-color:#ff9a55;stop-opacity:1;"
+ offset="1"
+ id="stop4325-1-6" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4431"
+ id="linearGradient4437"
+ x1="142.81854"
+ y1="831.52283"
+ x2="142.81854"
+ y2="878.90735"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4467"
+ id="radialGradient4475"
+ cx="116.51958"
+ cy="98.282051"
+ fx="116.51958"
+ fy="98.282051"
+ r="55.859375"
+ gradientTransform="matrix(0.97442557,1.5088911,-0.83559154,0.53961599,79.641615,-130.28522)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4431-3"
+ id="linearGradient4437-6"
+ x1="142.81854"
+ y1="831.52283"
+ x2="142.81854"
+ y2="878.90735"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4431-3">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4433-0" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4435-2" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4467-7"
+ id="radialGradient4475-0"
+ cx="116.51958"
+ cy="98.282051"
+ fx="116.51958"
+ fy="98.282051"
+ r="55.859375"
+ gradientTransform="matrix(0.97442557,1.5088911,-0.83559154,0.53961599,225.10358,63.664066)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient4467-7">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4469-4" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0.8974359;"
+ offset="1"
+ id="stop4471-7" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.0170184"
+ inkscape:cx="539.34448"
+ inkscape:cy="-81.088823"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="992"
+ inkscape:window-height="547"
+ inkscape:window-x="30"
+ inkscape:window-y="24"
+ inkscape:window-maximized="0"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0">
+ <sodipodi:guide
+ orientation="0,1"
+ position="52.563745,58.089579"
+ id="guide2989" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="54.584055,28.037549"
+ id="guide2991" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="51.048515,41.169529"
+ id="guide2993" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="77.817565,40.916989"
+ id="guide2995" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="51.048515,41.169529"
+ id="guide3017" />
+ <inkscape:grid
+ type="xygrid"
+ id="grid3019"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true"
+ originx="-62.341105px"
+ originy="-884.63528px" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="85.658895,8.3647193"
+ id="guide3021" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="106.6589,4.3647193"
+ id="guide3023" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="90.658895,17.364719"
+ id="guide3025" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="90.658895,-6.6352807"
+ id="guide3027" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-0.341105,-14.635281"
+ id="guide3810" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="1.658895,-49.635281"
+ id="guide3814" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-17.698248,11.257579"
+ id="guide3856" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="6.601806,11.257579"
+ id="guide3887" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="24.658283,58.089579"
+ id="guide4019" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="106.6589,-6.6352807"
+ id="guide4481" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="139.08747,-193.20671"
+ id="guide4483" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Kew the Angry Emu</dc:title>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Benoît Canet</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:rights>
+ <cc:Agent>
+ <dc:title>CC BY 3.0</dc:title>
+ </cc:Agent>
+ </dc:rights>
+ <dc:publisher>
+ <cc:Agent>
+ <dc:title>QEMU Community</dc:title>
+ </cc:Agent>
+ </dc:publisher>
+ <dc:date>2012-02-15</dc:date>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>QEMU logo</rdf:li>
+ <rdf:li>QEMU mascot</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <dc:source>http://lists.gnu.org/archive/html/qemu-devel/2012-02/msg01961.html</dc:source>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/by/3.0/">
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Notice" />
+ <cc:requires
+ rdf:resource="http://creativecommons.org/ns#Attribution" />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-62.341105,-55.859333)">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:url(#radialGradient4475);fill-opacity:1;stroke:none"
+ d="m 118.2161,55.859333 c -30.850815,0 -55.874995,24.87043 -55.874995,55.562497 0,30.69207 25.02418,55.56249 55.874995,55.56249 10.09496,0 19.54625,-2.6525 27.71875,-7.3125 l 2.90625,7.3125 2.40625,0 20,0 0.125,0 -8.8125,-21.78124 c 7.21537,-9.3622 11.5,-21.07236 11.5,-33.78125 0,-30.692067 -24.99293,-55.562497 -55.84375,-55.562497 z"
+ id="path3834-7-7-2-5-5-0-5-4" />
+ <path
+ sodipodi:type="arc"
+ style="fill:url(#linearGradient4437);fill-opacity:1;stroke:none"
+ id="path3661"
+ sodipodi:cx="142.5"
+ sodipodi:cy="856.29077"
+ sodipodi:rx="35.357143"
+ sodipodi:ry="24.642857"
+ d="m 177.85714,856.29077 c 0,13.60988 -15.82993,24.64286 -35.35714,24.64286 -19.52721,0 -35.35714,-11.03298 -35.35714,-24.64286 0,-13.60987 15.82993,-24.64286 35.35714,-24.64286 19.52721,0 35.35714,11.03299 35.35714,24.64286 z"
+ transform="matrix(1.0465082,0,0,1.2920463,-31.641235,-1016.8612)" />
+ <path
+ sodipodi:type="arc"
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ id="path4442"
+ sodipodi:cx="115.66247"
+ sodipodi:cy="856.39258"
+ sodipodi:rx="6.5659914"
+ sodipodi:ry="6.5659914"
+ d="m 122.22846,856.39258 c 0,3.6263 -2.9397,6.56599 -6.56599,6.56599 -3.6263,0 -6.56599,-2.93969 -6.56599,-6.56599 0,-3.6263 2.93969,-6.56599 6.56599,-6.56599 3.62629,0 6.56599,2.93969 6.56599,6.56599 z"
+ transform="translate(7.6700247,-777.60351)" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ id="rect4444"
+ width="37.643608"
+ height="5.5005069"
+ x="125.01157"
+ y="65.255234"
+ transform="matrix(0.98974903,0.14281759,-0.18972639,0.981837,0,0)" />
+ <rect
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ id="rect4446"
+ width="6.5659914"
+ height="2.9041886"
+ x="144.92451"
+ y="89.016899" />
+ <path
+ style="fill:#ff6600;fill-opacity:1"
+ d="m 103.38797,65.010543 c -0.057,2.18531 -3.865755,0.28296 -4.031245,2.78125 -4.22387,-1.88052 0.32884,2.87188 -0.0937,3.3125 l -0.0312,0 -0.3125,-0.0312 c -0.20386,-0.0728 -0.49977,-0.19904 -0.9375,-0.46875 -2.9499,2.35025 -3.02157,7.23369 -6.0625,9.9375 -1.99467,4.30504 -2.47977,8.98337 -3.9375,13.46875 -0.71796,4.30292 -1.34881,8.597857 -0.28125,12.906247 0.32053,3.50159 -0.68919,8.25865 2.5,10.71875 4.72728,3.88304 8.65575,8.79543 12.624995,13.46875 6.21914,7.65333 11.72948,15.86251 16.59375,24.4375 0.32431,-2.11756 1.10954,4.26459 2.53125,4.6875 -0.49161,-3.19231 -1.13213,-8.26328 -1.4375,-12.1875 -1.5814,-10.2909 -6.65305,-19.64903 -8.5625,-29.84375 -0.0587,-0.43037 -0.12809,-0.87203 -0.1875,-1.3125 l 0,-1.28125 -0.15625,0 c -0.62551,-5.04297 -0.8504,-10.46546 2.8125,-14.40625 3.73968,-3.772097 9.30633,-4.722447 13.8125,-7.343747 1.00194,-0.59119 2.04921,-1.07174 3.125,-1.40625 0.009,-0.003 0.0228,0.003 0.0312,0 3.11701,-0.96341 6.44862,-0.93323 9.6875,-0.40625 0.0479,
0.008 0.10841,0.0233 0.15625,0.0312 0.29455,0.0493 0.61389,0.099 0.90625,0.15625 2.37136,0.21133 7.14463,1.13687 8,-0.5 -3.27225,-2.78631 -7.98526,-2.59211 -11.96875,-3.6875 -0.63059,-0.11469 -1.41182,-0.24041 -2.1875,-0.3125 l -3.90625,-0.875 -0.96875,-0.25 0,0.0312 -13.96875,-2.71875 c -0.22212,-0.20226 -0.46434,-0.40933 -0.6875,-0.5625 l 13.625,1.6875 0,-0.0625 c 0.48011,0.10699 0.95576,0.19361 1.4375,0.25 l 0,0.0312 9.625,1.78125 c 1.66103,0.61952 3.4322,1.08374 5.09375,1.1875 2.74263,0.39907 6.22526,4.49092 7.125,4.6875 -0.44096,-4.307 -4.7422,-6.23586 -8.3125,-7.5 -4.1712,-2.02803 -10.4023,-1.95417 -11.0625,-7.5625 -0.1756,-0.39076 -0.34902,-0.78118 -0.5625,-1.15625 l -1.625,-2.15625 0.0625,-0.0312 c -2.21724,-2.61691 -5.34011,-4.52196 -8.65625,-5.25 -3.2914,-1.13611 -6.98773,-2.2671 -10.46875,-2.71875 -1.18132,3.47826 -2.5031,-2.75561 -5.34375,-0.90625 -2.48996,0.29488 -2.14614,0.95256 -4,-0.625 z m 17.90625,10.15625 c 0.90187,-0.0238 1.93277,0.14208 2.96875,0.5 2.76259,0.954
47 4.56151,2.96523 4.03125,4.5 -0.53026,1.53477 -3.20616,1.98572 -5.96875,1.03125 -2.76259,-0.95447 -4.5615,-2.93398 -4.03125,-4.46875 0.33141,-0.95923 1.49689,-1.52281 3,-1.5625 z"
+ id="path3499-9-7"
+ inkscape:connector-curvature="0" />
+ <text
+ xml:space="preserve"
+ style="font-size:95.54121399px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
+ x="184.89412"
+ y="166.37402"
+ id="text4477"
+ sodipodi:linespacing="125%"><tspan
+ sodipodi:role="line"
+ id="tspan4479"
+ x="184.89412"
+ y="166.37402"
+ style="fill:#000000;fill-opacity:1">EMU</tspan></text>
+ </g>
+</svg>
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 13/18] net/net.c: remove unnecessary semicolon
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (11 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 12/18] Add QEMU logo (SVG file) Michael Tokarev
@ 2014-04-28 5:07 ` Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 14/18] virtfs-proxy-helper: fix call to accept Michael Tokarev
` (5 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:07 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Igor Ryzhov
From: Igor Ryzhov <iryzhov@arccn.ru>
Signed-off-by: Igor Ryzhov <iryzhov@arccn.ru>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
net/net.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/net.c b/net/net.c
index a4aadff..bc9ed6d 100644
--- a/net/net.c
+++ b/net/net.c
@@ -473,7 +473,7 @@ ssize_t qemu_deliver_packet(NetClientState *sender,
if (ret == 0) {
nc->receive_disabled = 1;
- };
+ }
return ret;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 14/18] virtfs-proxy-helper: fix call to accept
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (12 preceding siblings ...)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 13/18] net/net.c: remove unnecessary semicolon Michael Tokarev
@ 2014-04-28 5:08 ` Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 15/18] init_paths: fix minor memory leak Michael Tokarev
` (4 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Mike Frysinger, Tim Comer
From: Tim Comer <comer0@gmail.com>
The current code calls accept() without initializing the size parameter
which means the accept call might write too much to the stack.
URL: https://bugs.gentoo.org/486714
Signed-off-by: Tim Comer <comer0@gmail.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
fsdev/virtfs-proxy-helper.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
index bfecb87..cd291d3 100644
--- a/fsdev/virtfs-proxy-helper.c
+++ b/fsdev/virtfs-proxy-helper.c
@@ -760,6 +760,7 @@ static int proxy_socket(const char *path, uid_t uid, gid_t gid)
return -1;
}
+ size = sizeof(qemu);
client = accept(sock, (struct sockaddr *)&qemu, &size);
if (client < 0) {
do_perror("accept");
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 15/18] init_paths: fix minor memory leak
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (13 preceding siblings ...)
2014-04-28 5:08 ` [Qemu-trivial] [PULL 14/18] virtfs-proxy-helper: fix call to accept Michael Tokarev
@ 2014-04-28 5:08 ` Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 16/18] po/Makefile: fix $SRC_PATH reference Michael Tokarev
` (3 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Kirill Batuzov
From: Kirill Batuzov <batuzovk@ispras.ru>
Fields "name" (created with strdup in new_entry) and "pathname"
(created with g_strdup_printf in new_entry) of pathelem struct should
be freed before the whole struct is.
Signed-off-by: Kirill Batuzov <batuzovk@ispras.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
util/path.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/util/path.c b/util/path.c
index 623219e..5c59d9f 100644
--- a/util/path.c
+++ b/util/path.c
@@ -160,7 +160,9 @@ void init_paths(const char *prefix)
base = new_entry("", NULL, pref_buf);
base = add_dir_maybe(base);
if (base->num_entries == 0) {
- free (base);
+ g_free(base->pathname);
+ free(base->name);
+ free(base);
base = NULL;
} else {
set_parents(base, base);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 16/18] po/Makefile: fix $SRC_PATH reference
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (14 preceding siblings ...)
2014-04-28 5:08 ` [Qemu-trivial] [PULL 15/18] init_paths: fix minor memory leak Michael Tokarev
@ 2014-04-28 5:08 ` Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 17/18] po: add proper Language: tags to .po files Michael Tokarev
` (2 subsequent siblings)
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev
The rule for messages.po appears to be slightly wrong.
Move the `cd' command within parens.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Tested-by: Stefan Weil <sw@weilnetz.de>
---
po/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/po/Makefile b/po/Makefile
index 705166e..669f865 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -37,8 +37,8 @@ install: $(OBJS)
$(call quiet-command, msgfmt -o $@ $<, " GEN $@")
$(PO_PATH)/messages.po: $(SRC_PATH)/ui/gtk.c
- $(call quiet-command, cd $(SRC_PATH) && \
- (xgettext -o - --from-code=UTF-8 --foreign-user \
+ $(call quiet-command, ( cd $(SRC_PATH) && \
+ xgettext -o - --from-code=UTF-8 --foreign-user \
--package-name=QEMU --package-version=$(VERSION) \
--msgid-bugs-address=qemu-devel@nongnu.org -k_ -C ui/gtk.c | \
sed -e s/CHARSET/UTF-8/) >$@, " GEN $@")
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 17/18] po: add proper Language: tags to .po files
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (15 preceding siblings ...)
2014-04-28 5:08 ` [Qemu-trivial] [PULL 16/18] po/Makefile: fix $SRC_PATH reference Michael Tokarev
@ 2014-04-28 5:08 ` Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 18/18] slirp/smb: Move ncalrpc directory to tmp Michael Tokarev
2014-04-28 13:16 ` [Qemu-trivial] [Qemu-devel] [PULL 00/18] Trivial patches for 2014-04-28 Peter Maydell
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
po/de_DE.po | 2 +-
po/fr_FR.po | 2 +-
po/hu.po | 2 +-
po/it.po | 2 +-
po/tr.po | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/po/de_DE.po b/po/de_DE.po
index fcbde95..dec68c9 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -10,7 +10,7 @@ msgstr ""
"PO-Revision-Date: 2012-02-28 16:00+0100\n"
"Last-Translator: Kevin Wolf <kwolf@redhat.com>\n"
"Language-Team: Deutsch <de@li.org>\n"
-"Language: \n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 45b2c01..ec54eb9 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgstr ""
"PO-Revision-Date: 2013-03-31 19:39+0200\n"
"Last-Translator: Aurelien Jarno <aurelien@aurel32.net>\n"
"Language-Team: French <FR@li.org>\n"
-"Language: \n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/hu.po b/po/hu.po
index 0a44c66..401ed21 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@ msgstr ""
"PO-Revision-Date: 2013-05-06 20:42+0200\n"
"Last-Translator: Ákos Kovács <akoskovacs@gmx.com>\n"
"Language-Team: Hungarian <hu@li.org>\n"
-"Language: \n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it.po b/po/it.po
index 592d3d8..a62665c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgstr ""
"PO-Revision-Date: 2012-02-27 08:23+0100\n"
"Last-Translator: Paolo Bonzini <pbonzini@redhat.com>\n"
"Language-Team: Italian <it@li.org>\n"
-"Language: \n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/po/tr.po b/po/tr.po
index d57995a..d712ced 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgstr ""
"PO-Revision-Date: 2013-04-22 18:35+0300\n"
"Last-Translator: Ozan Çağlayan <ozancag@gmail.com>\n"
"Language-Team: Türkçe <>\n"
-"Language: \n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Qemu-trivial] [PULL 18/18] slirp/smb: Move ncalrpc directory to tmp
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (16 preceding siblings ...)
2014-04-28 5:08 ` [Qemu-trivial] [PULL 17/18] po: add proper Language: tags to .po files Michael Tokarev
@ 2014-04-28 5:08 ` Michael Tokarev
2014-04-28 13:16 ` [Qemu-trivial] [Qemu-devel] [PULL 00/18] Trivial patches for 2014-04-28 Peter Maydell
18 siblings, 0 replies; 21+ messages in thread
From: Michael Tokarev @ 2014-04-28 5:08 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Michael Tokarev, Jan Kiszka, Michael Buesch
From: Michael Buesch <m@bues.ch>
The smbd forked by qemu still uses the default ncalrpc directory
in /var/run/samba. This may lead to problems, if /var/run/samba
does not exist (for example if /var/run is a tmpfs and the host
smbd was not started).
This leads to the following error message from samba
and an unworkable smbd:
Failed to create pipe directory /var/run/samba/ncalrpc - No such file or directory
Fix this by pointing smbd to /tmp/qemu-smb.%d.%d/ncalrpc as ncalrpc directory.
Smbd will create the actual ncalrpc subdirectory on its own.
Signed-off-by: Michael Buesch <m@bues.ch>
Cc: Jan Kiszka <jan.kiszka@web.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
(Applying this to -trivial because it _is_ rather trivial
and because Jan does not reply for months)
---
net/slirp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/slirp.c b/net/slirp.c
index cce026b..8fddc03 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -527,6 +527,7 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
"pid directory=%s\n"
"lock directory=%s\n"
"state directory=%s\n"
+ "ncalrpc dir=%s/ncalrpc\n"
"log file=%s/log.smbd\n"
"smb passwd file=%s/smbpasswd\n"
"security = user\n"
@@ -542,6 +543,7 @@ static int slirp_smb(SlirpState* s, const char *exported_dir,
s->smb_dir,
s->smb_dir,
s->smb_dir,
+ s->smb_dir,
exported_dir,
passwd->pw_name
);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [Qemu-trivial] [PULL 12/18] Add QEMU logo (SVG file)
2014-04-28 5:07 ` [Qemu-trivial] [PULL 12/18] Add QEMU logo (SVG file) Michael Tokarev
@ 2014-04-28 11:50 ` Benoît Canet
0 siblings, 0 replies; 21+ messages in thread
From: Benoît Canet @ 2014-04-28 11:50 UTC (permalink / raw)
To: Michael Tokarev; +Cc: qemu-trivial, Stefan Weil, qemu-devel
The Monday 28 Apr 2014 à 09:07:58 (+0400), Michael Tokarev wrote :
> From: Stefan Weil <sw@weilnetz.de>
>
> The "Q" of the logo is already included in pc-bios/qemu_logo_no_text.svg.
>
> This file now adds the complete logo as it was designed by Benoît Canet.
> Benoît licensed it under CC-BY 3.0, see
> http://lists.gnu.org/archive/html/qemu-devel/2012-02/msg02865.html.
>
> Unneeded borders from Benoît's original logo were removed,
> and metadata (license, author, date) was added in this version.
>
> Cc: Benoît Canet <benoit@irqsave.net>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Acked-by: Benoit Canet <benoit@irqsave.net>
> ---
> pc-bios/qemu_logo.svg | 1010 +++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 1010 insertions(+)
> create mode 100644 pc-bios/qemu_logo.svg
>
> diff --git a/pc-bios/qemu_logo.svg b/pc-bios/qemu_logo.svg
> new file mode 100644
> index 0000000..07b5b51
> --- /dev/null
> +++ b/pc-bios/qemu_logo.svg
> @@ -0,0 +1,1010 @@
> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
> +<!-- Created with Inkscape (http://www.inkscape.org/) -->
> +
> +<svg
> + xmlns:dc="http://purl.org/dc/elements/1.1/"
> + xmlns:cc="http://creativecommons.org/ns#"
> + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
> + xmlns:svg="http://www.w3.org/2000/svg"
> + xmlns="http://www.w3.org/2000/svg"
> + xmlns:xlink="http://www.w3.org/1999/xlink"
> + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
> + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
> + width="351.84259"
> + height="111.86757"
> + id="svg2"
> + version="1.1"
> + inkscape:version="0.48.3.1 r9886"
> + sodipodi:docname="qemu_logo.svg">
> + <title
> + id="title3182">Kew the Angry Emu</title>
> + <defs
> + id="defs4">
> + <linearGradient
> + id="linearGradient4686">
> + <stop
> + style="stop-color:#000000;stop-opacity:1;"
> + offset="0"
> + id="stop4688" />
> + <stop
> + id="stop3956"
> + offset="0.75"
> + style="stop-color:#000000;stop-opacity:0.87843138;" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.43921569;"
> + offset="0.75"
> + id="stop3958" />
> + <stop
> + id="stop3960"
> + offset="0.88"
> + style="stop-color:#181818;stop-opacity:1;" />
> + <stop
> + style="stop-color:#242424;stop-opacity:1;"
> + offset="0.88"
> + id="stop3962" />
> + <stop
> + style="stop-color:#000000;stop-opacity:1;"
> + offset="1"
> + id="stop4690" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4467">
> + <stop
> + style="stop-color:#000000;stop-opacity:1;"
> + offset="0"
> + id="stop4469" />
> + <stop
> + style="stop-color:#000000;stop-opacity:0.8974359;"
> + offset="1"
> + id="stop4471" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4431">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop4433" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4435" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4466">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop4468" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4470" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4321">
> + <stop
> + style="stop-color:#ff6702;stop-opacity:1;"
> + offset="0"
> + id="stop4323" />
> + <stop
> + style="stop-color:#ff9a55;stop-opacity:1;"
> + offset="1"
> + id="stop4325" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4283">
> + <stop
> + style="stop-color:#000000;stop-opacity:1;"
> + offset="0"
> + id="stop4285" />
> + <stop
> + style="stop-color:#000000;stop-opacity:0;"
> + offset="1"
> + id="stop4287" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4251">
> + <stop
> + style="stop-color:#000000;stop-opacity:1;"
> + offset="0"
> + id="stop4253" />
> + <stop
> + style="stop-color:#000000;stop-opacity:0;"
> + offset="1"
> + id="stop4255" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4007">
> + <stop
> + style="stop-color:#ff6600;stop-opacity:1;"
> + offset="0"
> + id="stop4009" />
> + <stop
> + style="stop-color:#ff9148;stop-opacity:1;"
> + offset="1"
> + id="stop4011" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3999">
> + <stop
> + style="stop-color:#fff7f2;stop-opacity:1;"
> + offset="0"
> + id="stop4001" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4003" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3890">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop3892" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3894" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3880">
> + <stop
> + style="stop-color:#eb7400;stop-opacity:1;"
> + offset="0"
> + id="stop3882" />
> + <stop
> + style="stop-color:#f7b06a;stop-opacity:1;"
> + offset="1"
> + id="stop3884" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4011">
> + <stop
> + style="stop-color:#042dc8;stop-opacity:1;"
> + offset="0"
> + id="stop4013" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3879">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.90598291;"
> + offset="0"
> + id="stop3881" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3869">
> + <stop
> + style="stop-color:#c95000;stop-opacity:1;"
> + offset="0"
> + id="stop3871" />
> + <stop
> + style="stop-color:#ff9e5e;stop-opacity:1;"
> + offset="1"
> + id="stop3873" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3861">
> + <stop
> + style="stop-color:#f06000;stop-opacity:1;"
> + offset="0"
> + id="stop3863" />
> + <stop
> + style="stop-color:#ffccaa;stop-opacity:1;"
> + offset="1"
> + id="stop3865" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3826">
> + <stop
> + style="stop-color:#ff6600;stop-opacity:1;"
> + offset="0"
> + id="stop3828" />
> + <stop
> + style="stop-color:#ff893b;stop-opacity:1;"
> + offset="1"
> + id="stop3830" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3879-6">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.90598291;"
> + offset="0"
> + id="stop3881-4" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-7" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3869-5">
> + <stop
> + style="stop-color:#c95000;stop-opacity:1;"
> + offset="0"
> + id="stop3871-9" />
> + <stop
> + style="stop-color:#ff9e5e;stop-opacity:1;"
> + offset="1"
> + id="stop3873-4" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3879-4"
> + id="linearGradient3885-6"
> + x1="76.025352"
> + y1="124.8497"
> + x2="75.874107"
> + y2="143.03978"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient3879-4">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3869-2">
> + <stop
> + style="stop-color:#c95000;stop-opacity:1;"
> + offset="0"
> + id="stop3871-99" />
> + <stop
> + style="stop-color:#ff9e5e;stop-opacity:1;"
> + offset="1"
> + id="stop3873-6" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011"
> + id="radialGradient4017"
> + cx="66.639"
> + cy="93.096375"
> + fx="66.639"
> + fy="93.096375"
> + r="11.515625"
> + gradientTransform="matrix(0.23244854,1.600893,-1.0124495,0.14700695,145.40424,-26.300303)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3879-4-7"
> + id="linearGradient3885-6-2"
> + x1="76.025352"
> + y1="124.8497"
> + x2="75.874107"
> + y2="143.03978"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient3879-4-7">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-7" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-6" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011-5"
> + id="radialGradient4017-7"
> + cx="66.639"
> + cy="93.096375"
> + fx="66.639"
> + fy="93.096375"
> + r="11.515625"
> + gradientTransform="matrix(0.99779178,6.8718773,-4.3459674,0.6310314,452.75975,-225.98471)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4011-5">
> + <stop
> + style="stop-color:#042dc8;stop-opacity:1;"
> + offset="0"
> + id="stop4013-1" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015-3" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3879-4-75"
> + id="linearGradient3885-6-8"
> + x1="76.025352"
> + y1="124.8497"
> + x2="75.874107"
> + y2="143.03978"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient3879-4-75">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-1" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-4" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011-0"
> + id="radialGradient4017-5"
> + cx="66.639"
> + cy="93.096375"
> + fx="66.639"
> + fy="93.096375"
> + r="11.515625"
> + gradientTransform="matrix(0.23244854,1.600893,-1.0124495,0.14700695,146.34996,53.681728)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4011-0">
> + <stop
> + style="stop-color:#042dc8;stop-opacity:1;"
> + offset="0"
> + id="stop4013-4" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015-0" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011-0"
> + id="linearGradient4117"
> + x1="107.03001"
> + y1="189.72537"
> + x2="107.18476"
> + y2="173.47537"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3879-4-7-2"
> + id="linearGradient3885-6-2-8"
> + x1="76.025352"
> + y1="124.8497"
> + x2="75.874107"
> + y2="143.03978"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient3879-4-7-2">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-7-9" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-6-9" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011-5-1"
> + id="radialGradient4017-7-9"
> + cx="66.639"
> + cy="93.096375"
> + fx="66.639"
> + fy="93.096375"
> + r="11.515625"
> + gradientTransform="matrix(0.99779178,6.8718773,-4.3459674,0.6310314,448.94742,-406.99277)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4011-5-1">
> + <stop
> + style="stop-color:#042dc8;stop-opacity:1;"
> + offset="0"
> + id="stop4013-1-9" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015-3-8" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3879-4-7-2-7"
> + id="linearGradient3885-6-2-8-0"
> + x1="76.025352"
> + y1="124.8497"
> + x2="75.874107"
> + y2="143.03978"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient3879-4-7-2-7">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-7-9-3" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-6-9-6" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011-5-1-5"
> + id="radialGradient4017-7-9-5"
> + cx="66.639"
> + cy="93.096375"
> + fx="66.639"
> + fy="93.096375"
> + r="11.515625"
> + gradientTransform="matrix(0.55965334,3.8543806,-2.4376181,0.3539404,454.75182,-145.44353)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4011-5-1-5">
> + <stop
> + style="stop-color:#042dc8;stop-opacity:1;"
> + offset="0"
> + id="stop4013-1-9-6" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015-3-8-9" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient3879-4-7-2-4"
> + id="linearGradient3885-6-2-8-4"
> + x1="76.025352"
> + y1="124.8497"
> + x2="75.874107"
> + y2="143.03978"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient3879-4-7-2-4">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-7-9-9" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-6-9-3" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4011-5-1-7"
> + id="radialGradient4017-7-9-7"
> + cx="66.639"
> + cy="93.096375"
> + fx="66.639"
> + fy="93.096375"
> + r="11.515625"
> + gradientTransform="matrix(0.26837158,1.8482981,-1.1689154,0.16972569,466.57614,26.180822)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4011-5-1-7">
> + <stop
> + style="stop-color:#042dc8;stop-opacity:1;"
> + offset="0"
> + id="stop4013-1-9-1" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015-3-8-5" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3879-4-7-2-0">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-7-9-7" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-6-9-8" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4011-5-1-55">
> + <stop
> + style="stop-color:#000a30;stop-opacity:1;"
> + offset="0"
> + id="stop4013-1-9-8" />
> + <stop
> + style="stop-color:#4260d5;stop-opacity:1;"
> + offset="1"
> + id="stop4015-3-8-3" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3890-9">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop3892-0" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3894-9" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3880-4">
> + <stop
> + style="stop-color:#eb7400;stop-opacity:1;"
> + offset="0"
> + id="stop3882-5" />
> + <stop
> + style="stop-color:#f7b06a;stop-opacity:1;"
> + offset="1"
> + id="stop3884-1" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3999-7">
> + <stop
> + style="stop-color:#fff7f2;stop-opacity:1;"
> + offset="0"
> + id="stop4001-9" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4003-4" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4007-9">
> + <stop
> + style="stop-color:#ff6600;stop-opacity:1;"
> + offset="0"
> + id="stop4009-1" />
> + <stop
> + style="stop-color:#ff9148;stop-opacity:1;"
> + offset="1"
> + id="stop4011-9" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4007-9-5">
> + <stop
> + style="stop-color:#ff6600;stop-opacity:1;"
> + offset="0"
> + id="stop4009-1-9" />
> + <stop
> + style="stop-color:#ff9148;stop-opacity:1;"
> + offset="1"
> + id="stop4011-9-5" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3999-7-1">
> + <stop
> + style="stop-color:#fff7f2;stop-opacity:1;"
> + offset="0"
> + id="stop4001-9-1" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4003-4-4" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4007-9-5-3">
> + <stop
> + style="stop-color:#ff6600;stop-opacity:1;"
> + offset="0"
> + id="stop4009-1-9-3" />
> + <stop
> + style="stop-color:#ff9148;stop-opacity:1;"
> + offset="1"
> + id="stop4011-9-5-9" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3999-7-1-4">
> + <stop
> + style="stop-color:#fff7f2;stop-opacity:1;"
> + offset="0"
> + id="stop4001-9-1-4" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4003-4-4-4" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient3879-4-7-2-3">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0.93162394;"
> + offset="0"
> + id="stop3881-6-7-9-1" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop3883-74-6-9-87" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4011-5-1-1">
> + <stop
> + style="stop-color:#fde8a1;stop-opacity:1;"
> + offset="0"
> + id="stop4013-1-9-63" />
> + <stop
> + style="stop-color:#2947b9;stop-opacity:1;"
> + offset="1"
> + id="stop4015-3-8-8" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4466"
> + id="linearGradient4472"
> + x1="161.7561"
> + y1="540.72662"
> + x2="161.7561"
> + y2="579.80206"
> + gradientUnits="userSpaceOnUse" />
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4321"
> + id="radialGradient4474"
> + cx="130.8242"
> + cy="575.27838"
> + fx="130.8242"
> + fy="575.27838"
> + r="49.498173"
> + gradientTransform="matrix(0.95670828,0.96684666,-0.72623533,0.71862001,423.45109,35.05138)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4466-5"
> + id="linearGradient4472-9"
> + x1="161.7561"
> + y1="540.72662"
> + x2="161.7561"
> + y2="579.80206"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4466-5">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop4468-2" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4470-3" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4321-0"
> + id="radialGradient4474-6"
> + cx="130.8242"
> + cy="575.27838"
> + fx="130.8242"
> + fy="575.27838"
> + r="49.498173"
> + gradientTransform="matrix(0.95670828,0.96684666,-0.72623533,0.71862001,442.64399,170.9169)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4321-0">
> + <stop
> + style="stop-color:#ff6702;stop-opacity:1;"
> + offset="0"
> + id="stop4323-3" />
> + <stop
> + style="stop-color:#ff9a55;stop-opacity:1;"
> + offset="1"
> + id="stop4325-1" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4466-5-5">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop4468-2-9" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4470-3-4" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4321-0-0">
> + <stop
> + style="stop-color:#ff6702;stop-opacity:1;"
> + offset="0"
> + id="stop4323-3-9" />
> + <stop
> + style="stop-color:#ff9a55;stop-opacity:1;"
> + offset="1"
> + id="stop4325-1-1" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4466-5-9">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop4468-2-7" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4470-3-7" />
> + </linearGradient>
> + <linearGradient
> + id="linearGradient4321-0-7">
> + <stop
> + style="stop-color:#ff6702;stop-opacity:1;"
> + offset="0"
> + id="stop4323-3-3" />
> + <stop
> + style="stop-color:#ff9a55;stop-opacity:1;"
> + offset="1"
> + id="stop4325-1-6" />
> + </linearGradient>
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4431"
> + id="linearGradient4437"
> + x1="142.81854"
> + y1="831.52283"
> + x2="142.81854"
> + y2="878.90735"
> + gradientUnits="userSpaceOnUse" />
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4467"
> + id="radialGradient4475"
> + cx="116.51958"
> + cy="98.282051"
> + fx="116.51958"
> + fy="98.282051"
> + r="55.859375"
> + gradientTransform="matrix(0.97442557,1.5088911,-0.83559154,0.53961599,79.641615,-130.28522)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4431-3"
> + id="linearGradient4437-6"
> + x1="142.81854"
> + y1="831.52283"
> + x2="142.81854"
> + y2="878.90735"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4431-3">
> + <stop
> + style="stop-color:#ffffff;stop-opacity:1;"
> + offset="0"
> + id="stop4433-0" />
> + <stop
> + style="stop-color:#ffffff;stop-opacity:0;"
> + offset="1"
> + id="stop4435-2" />
> + </linearGradient>
> + <radialGradient
> + inkscape:collect="always"
> + xlink:href="#linearGradient4467-7"
> + id="radialGradient4475-0"
> + cx="116.51958"
> + cy="98.282051"
> + fx="116.51958"
> + fy="98.282051"
> + r="55.859375"
> + gradientTransform="matrix(0.97442557,1.5088911,-0.83559154,0.53961599,225.10358,63.664066)"
> + gradientUnits="userSpaceOnUse" />
> + <linearGradient
> + id="linearGradient4467-7">
> + <stop
> + style="stop-color:#000000;stop-opacity:1;"
> + offset="0"
> + id="stop4469-4" />
> + <stop
> + style="stop-color:#000000;stop-opacity:0.8974359;"
> + offset="1"
> + id="stop4471-7" />
> + </linearGradient>
> + </defs>
> + <sodipodi:namedview
> + id="base"
> + pagecolor="#ffffff"
> + bordercolor="#666666"
> + borderopacity="1.0"
> + inkscape:pageopacity="0.0"
> + inkscape:pageshadow="2"
> + inkscape:zoom="1.0170184"
> + inkscape:cx="539.34448"
> + inkscape:cy="-81.088823"
> + inkscape:document-units="px"
> + inkscape:current-layer="layer1"
> + showgrid="false"
> + showguides="false"
> + inkscape:guide-bbox="true"
> + inkscape:window-width="992"
> + inkscape:window-height="547"
> + inkscape:window-x="30"
> + inkscape:window-y="24"
> + inkscape:window-maximized="0"
> + fit-margin-top="0"
> + fit-margin-left="0"
> + fit-margin-right="0"
> + fit-margin-bottom="0">
> + <sodipodi:guide
> + orientation="0,1"
> + position="52.563745,58.089579"
> + id="guide2989" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="54.584055,28.037549"
> + id="guide2991" />
> + <sodipodi:guide
> + orientation="1,0"
> + position="51.048515,41.169529"
> + id="guide2993" />
> + <sodipodi:guide
> + orientation="1,0"
> + position="77.817565,40.916989"
> + id="guide2995" />
> + <sodipodi:guide
> + orientation="1,0"
> + position="51.048515,41.169529"
> + id="guide3017" />
> + <inkscape:grid
> + type="xygrid"
> + id="grid3019"
> + empspacing="5"
> + visible="true"
> + enabled="true"
> + snapvisiblegridlinesonly="true"
> + originx="-62.341105px"
> + originy="-884.63528px" />
> + <sodipodi:guide
> + orientation="1,0"
> + position="85.658895,8.3647193"
> + id="guide3021" />
> + <sodipodi:guide
> + orientation="1,0"
> + position="106.6589,4.3647193"
> + id="guide3023" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="90.658895,17.364719"
> + id="guide3025" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="90.658895,-6.6352807"
> + id="guide3027" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="-0.341105,-14.635281"
> + id="guide3810" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="1.658895,-49.635281"
> + id="guide3814" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="-17.698248,11.257579"
> + id="guide3856" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="6.601806,11.257579"
> + id="guide3887" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="24.658283,58.089579"
> + id="guide4019" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="106.6589,-6.6352807"
> + id="guide4481" />
> + <sodipodi:guide
> + orientation="0,1"
> + position="139.08747,-193.20671"
> + id="guide4483" />
> + </sodipodi:namedview>
> + <metadata
> + id="metadata7">
> + <rdf:RDF>
> + <cc:Work
> + rdf:about="">
> + <dc:format>image/svg+xml</dc:format>
> + <dc:type
> + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
> + <dc:title>Kew the Angry Emu</dc:title>
> + <dc:creator>
> + <cc:Agent>
> + <dc:title>Benoît Canet</dc:title>
> + </cc:Agent>
> + </dc:creator>
> + <dc:rights>
> + <cc:Agent>
> + <dc:title>CC BY 3.0</dc:title>
> + </cc:Agent>
> + </dc:rights>
> + <dc:publisher>
> + <cc:Agent>
> + <dc:title>QEMU Community</dc:title>
> + </cc:Agent>
> + </dc:publisher>
> + <dc:date>2012-02-15</dc:date>
> + <cc:license
> + rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
> + <dc:subject>
> + <rdf:Bag>
> + <rdf:li>QEMU logo</rdf:li>
> + <rdf:li>QEMU mascot</rdf:li>
> + </rdf:Bag>
> + </dc:subject>
> + <dc:source>http://lists.gnu.org/archive/html/qemu-devel/2012-02/msg01961.html</dc:source>
> + </cc:Work>
> + <cc:License
> + rdf:about="http://creativecommons.org/licenses/by/3.0/">
> + <cc:permits
> + rdf:resource="http://creativecommons.org/ns#Reproduction" />
> + <cc:permits
> + rdf:resource="http://creativecommons.org/ns#Distribution" />
> + <cc:requires
> + rdf:resource="http://creativecommons.org/ns#Notice" />
> + <cc:requires
> + rdf:resource="http://creativecommons.org/ns#Attribution" />
> + <cc:permits
> + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
> + </cc:License>
> + </rdf:RDF>
> + </metadata>
> + <g
> + inkscape:label="Layer 1"
> + inkscape:groupmode="layer"
> + id="layer1"
> + transform="translate(-62.341105,-55.859333)">
> + <path
> + inkscape:connector-curvature="0"
> + style="fill:url(#radialGradient4475);fill-opacity:1;stroke:none"
> + d="m 118.2161,55.859333 c -30.850815,0 -55.874995,24.87043 -55.874995,55.562497 0,30.69207 25.02418,55.56249 55.874995,55.56249 10.09496,0 19.54625,-2.6525 27.71875,-7.3125 l 2.90625,7.3125 2.40625,0 20,0 0.125,0 -8.8125,-21.78124 c 7.21537,-9.3622 11.5,-21.07236 11.5,-33.78125 0,-30.692067 -24.99293,-55.562497 -55.84375,-55.562497 z"
> + id="path3834-7-7-2-5-5-0-5-4" />
> + <path
> + sodipodi:type="arc"
> + style="fill:url(#linearGradient4437);fill-opacity:1;stroke:none"
> + id="path3661"
> + sodipodi:cx="142.5"
> + sodipodi:cy="856.29077"
> + sodipodi:rx="35.357143"
> + sodipodi:ry="24.642857"
> + d="m 177.85714,856.29077 c 0,13.60988 -15.82993,24.64286 -35.35714,24.64286 -19.52721,0 -35.35714,-11.03298 -35.35714,-24.64286 0,-13.60987 15.82993,-24.64286 35.35714,-24.64286 19.52721,0 35.35714,11.03299 35.35714,24.64286 z"
> + transform="matrix(1.0465082,0,0,1.2920463,-31.641235,-1016.8612)" />
> + <path
> + sodipodi:type="arc"
> + style="fill:#000000;fill-opacity:1;stroke:none"
> + id="path4442"
> + sodipodi:cx="115.66247"
> + sodipodi:cy="856.39258"
> + sodipodi:rx="6.5659914"
> + sodipodi:ry="6.5659914"
> + d="m 122.22846,856.39258 c 0,3.6263 -2.9397,6.56599 -6.56599,6.56599 -3.6263,0 -6.56599,-2.93969 -6.56599,-6.56599 0,-3.6263 2.93969,-6.56599 6.56599,-6.56599 3.62629,0 6.56599,2.93969 6.56599,6.56599 z"
> + transform="translate(7.6700247,-777.60351)" />
> + <rect
> + style="fill:#000000;fill-opacity:1;stroke:none"
> + id="rect4444"
> + width="37.643608"
> + height="5.5005069"
> + x="125.01157"
> + y="65.255234"
> + transform="matrix(0.98974903,0.14281759,-0.18972639,0.981837,0,0)" />
> + <rect
> + style="fill:#000000;fill-opacity:1;stroke:none"
> + id="rect4446"
> + width="6.5659914"
> + height="2.9041886"
> + x="144.92451"
> + y="89.016899" />
> + <path
> + style="fill:#ff6600;fill-opacity:1"
> + d="m 103.38797,65.010543 c -0.057,2.18531 -3.865755,0.28296 -4.031245,2.78125 -4.22387,-1.88052 0.32884,2.87188 -0.0937,3.3125 l -0.0312,0 -0.3125,-0.0312 c -0.20386,-0.0728 -0.49977,-0.19904 -0.9375,-0.46875 -2.9499,2.35025 -3.02157,7.23369 -6.0625,9.9375 -1.99467,4.30504 -2.47977,8.98337 -3.9375,13.46875 -0.71796,4.30292 -1.34881,8.597857 -0.28125,12.906247 0.32053,3.50159 -0.68919,8.25865 2.5,10.71875 4.72728,3.88304 8.65575,8.79543 12.624995,13.46875 6.21914,7.65333 11.72948,15.86251 16.59375,24.4375 0.32431,-2.11756 1.10954,4.26459 2.53125,4.6875 -0.49161,-3.19231 -1.13213,-8.26328 -1.4375,-12.1875 -1.5814,-10.2909 -6.65305,-19.64903 -8.5625,-29.84375 -0.0587,-0.43037 -0.12809,-0.87203 -0.1875,-1.3125 l 0,-1.28125 -0.15625,0 c -0.62551,-5.04297 -0.8504,-10.46546 2.8125,-14.40625 3.73968,-3.772097 9.30633,-4.722447 13.8125,-7.343747 1.00194,-0.59119 2.04921,-1.07174 3.125,-1.40625 0.009,-0.003 0.0228,0.003 0.0312,0 3.11701,-0.96341 6.44862,-0.93323 9.6875,-0.40625 0.0479,
> 0.008 0.10841,0.0233 0.15625,0.0312 0.29455,0.0493 0.61389,0.099 0.90625,0.15625 2.37136,0.21133 7.14463,1.13687 8,-0.5 -3.27225,-2.78631 -7.98526,-2.59211 -11.96875,-3.6875 -0.63059,-0.11469 -1.41182,-0.24041 -2.1875,-0.3125 l -3.90625,-0.875 -0.96875,-0.25 0,0.0312 -13.96875,-2.71875 c -0.22212,-0.20226 -0.46434,-0.40933 -0.6875,-0.5625 l 13.625,1.6875 0,-0.0625 c 0.48011,0.10699 0.95576,0.19361 1.4375,0.25 l 0,0.0312 9.625,1.78125 c 1.66103,0.61952 3.4322,1.08374 5.09375,1.1875 2.74263,0.39907 6.22526,4.49092 7.125,4.6875 -0.44096,-4.307 -4.7422,-6.23586 -8.3125,-7.5 -4.1712,-2.02803 -10.4023,-1.95417 -11.0625,-7.5625 -0.1756,-0.39076 -0.34902,-0.78118 -0.5625,-1.15625 l -1.625,-2.15625 0.0625,-0.0312 c -2.21724,-2.61691 -5.34011,-4.52196 -8.65625,-5.25 -3.2914,-1.13611 -6.98773,-2.2671 -10.46875,-2.71875 -1.18132,3.47826 -2.5031,-2.75561 -5.34375,-0.90625 -2.48996,0.29488 -2.14614,0.95256 -4,-0.625 z m 17.90625,10.15625 c 0.90187,-0.0238 1.93277,0.14208 2.96875,0.5 2.76259,0.954
> 47 4.56151,2.96523 4.03125,4.5 -0.53026,1.53477 -3.20616,1.98572 -5.96875,1.03125 -2.76259,-0.95447 -4.5615,-2.93398 -4.03125,-4.46875 0.33141,-0.95923 1.49689,-1.52281 3,-1.5625 z"
> + id="path3499-9-7"
> + inkscape:connector-curvature="0" />
> + <text
> + xml:space="preserve"
> + style="font-size:95.54121399px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
> + x="184.89412"
> + y="166.37402"
> + id="text4477"
> + sodipodi:linespacing="125%"><tspan
> + sodipodi:role="line"
> + id="tspan4479"
> + x="184.89412"
> + y="166.37402"
> + style="fill:#000000;fill-opacity:1">EMU</tspan></text>
> + </g>
> +</svg>
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [Qemu-trivial] [Qemu-devel] [PULL 00/18] Trivial patches for 2014-04-28
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
` (17 preceding siblings ...)
2014-04-28 5:08 ` [Qemu-trivial] [PULL 18/18] slirp/smb: Move ncalrpc directory to tmp Michael Tokarev
@ 2014-04-28 13:16 ` Peter Maydell
18 siblings, 0 replies; 21+ messages in thread
From: Peter Maydell @ 2014-04-28 13:16 UTC (permalink / raw)
To: Michael Tokarev; +Cc: QEMU Trivial, QEMU Developers
On 28 April 2014 06:07, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Here's another trivial-patches pull request. I removed all
> questionable or still-being-discussed patchses from there
> which accumulated recently.
>
> What's left are either code cleanups and rearrangements,
> spelling fixes or --help output improvements, adding Qemu
> logo file, one feature patch which's been waiting for too
> long (conversion of -m to QemuOpts), and several small
> bugfixes.
>
> One change I want to mention especially, it is this one:
>
> slirp/smb: Move ncalrpc directory to tmp
>
> While slirp code has a maintainer, Jan Kiszka, he never commented
> on this change since initial patch submission back at Nov-2013,
> despite several subsequent pings. The change _is_ trivial and
> fixes -smb with modern versions of samba. We've been waiting
> for this (trivial) fix for too long.
>
> Thanks,
>
> /mjt
>
> The following changes since commit 411f491e0af173cf8f39347574941bd26fbae381:
>
> Merge remote-tracking branch 'remotes/rth/tags/tgt-axp-pull-20140424' into staging (2014-04-25 13:25:22 +0100)
>
> are available in the git repository at:
>
> git://git.corpit.ru/qemu.git tags/trivial-patches-2014-04-28
>
> for you to fetch changes up to b87b8a8b32518df9e5285f9b3d4f9d9a0c426a06:
>
> slirp/smb: Move ncalrpc directory to tmp (2014-04-28 08:55:32 +0400)
>
> ----------------------------------------------------------------
> trivial patches for 2014-04-28
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2014-04-28 13:17 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-28 5:07 [Qemu-trivial] [PULL 00/18] Trivial patches for 2014-04-28 Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 01/18] misc: Use cpu_physical_memory_read and cpu_physical_memory_write Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 02/18] qemu-option: introduce qemu_find_opts_singleton Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 03/18] vl: convert -m to QemuOpts Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 04/18] configure: Improve help behavior Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 05/18] move test-* from .gitignore to tests/.gitignore Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 06/18] tests/.gitignore: Ignore test-rfifolock Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 07/18] gitignore: cleanups #2 Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 08/18] vl: Remove useless 'continue' Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 09/18] vl: Eliminate a superfluous local variable Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 10/18] xilinx: Fix typo in comment (Marvel -> Marvell) Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 11/18] vl: avoid closing stdout with 'writeconfig' Michael Tokarev
2014-04-28 5:07 ` [Qemu-trivial] [PULL 12/18] Add QEMU logo (SVG file) Michael Tokarev
2014-04-28 11:50 ` Benoît Canet
2014-04-28 5:07 ` [Qemu-trivial] [PULL 13/18] net/net.c: remove unnecessary semicolon Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 14/18] virtfs-proxy-helper: fix call to accept Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 15/18] init_paths: fix minor memory leak Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 16/18] po/Makefile: fix $SRC_PATH reference Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 17/18] po: add proper Language: tags to .po files Michael Tokarev
2014-04-28 5:08 ` [Qemu-trivial] [PULL 18/18] slirp/smb: Move ncalrpc directory to tmp Michael Tokarev
2014-04-28 13:16 ` [Qemu-trivial] [Qemu-devel] [PULL 00/18] Trivial patches for 2014-04-28 Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).