diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-18 16:59:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-18 16:59:29 +0100 |
| commit | 147fc419734b057b9d9154c2ca0d9d397054104b (patch) | |
| tree | 8f2c28dfbbf07df5269fbc9747f4772cfba62dc7 /hw/i386 | |
| parent | 50a2c45da92383138e0d3f22952f3813814e18b3 (diff) | |
| parent | 748bfb4eee8e699f3d2dd6a95820d1a9e57e4aa6 (diff) | |
| download | qemu-147fc419734b057b9d9154c2ca0d9d397054104b.tar.gz qemu-147fc419734b057b9d9154c2ca0d9d397054104b.tar.bz2 qemu-147fc419734b057b9d9154c2ca0d9d397054104b.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-07-18' into staging
trivial patches for 2014-07-18
# gpg: Signature made Fri 18 Jul 2014 15:04:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-07-18:
tests: Add missing 'static' attributes (fix warnings from smatch)
migration: Add missing 'static' attribute
qga: Add missing 'static' attribute
hw/usb: Add missing 'static' attribute
doc: slirp supports ICMP echo if enabled in Linux
qemu-img: Remove redundancy "ret = -1"
Fix new typos in comments (found by codespell)
slirp: Give error message if hostfwd_add/remove for unrecognized vlan/stack
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 2 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ec8ccdb673..7081c08a69 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -114,7 +114,7 @@ static void pc_init1(MachineState *machine, lowmem = 0xe0000000; } - /* Handle the machine opt max-ram-below-4g. It is basicly doing + /* Handle the machine opt max-ram-below-4g. It is basically doing * min(qemu limit, user limit). */ if (lowmem > pc_machine->max_ram_below_4g) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 36b6ab0bce..f55196150c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -103,7 +103,7 @@ static void pc_q35_init(MachineState *machine) lowmem = 0xb0000000; } - /* Handle the machine opt max-ram-below-4g. It is basicly doing + /* Handle the machine opt max-ram-below-4g. It is basically doing * min(qemu limit, user limit). */ if (lowmem > pc_machine->max_ram_below_4g) { |