diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-04-01 11:31:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-01 11:31:31 +0100 |
| commit | b8a86c4ac4d04c106ba38fbd707041cba334a155 (patch) | |
| tree | fb3bcf6306d7b1b9ccaa42b2c9e8c1a83c936f81 /hw | |
| parent | 033a20359aaf93f4d8aa2be12558901e8e028baa (diff) | |
| parent | 4025446f0ac6213335c22ec43f3c3d8362ce7286 (diff) | |
| download | qemu-b8a86c4ac4d04c106ba38fbd707041cba334a155.zip qemu-b8a86c4ac4d04c106ba38fbd707041cba334a155.tar.gz qemu-b8a86c4ac4d04c106ba38fbd707041cba334a155.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Fix for object_del of in-use memory, pvpanic
regression, PPC regression and bogus error message with
Oxygen theme.
# gpg: Signature made Wed Apr 1 09:08:20 2015 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
Revert "exec: Respect as_tranlsate_internal length clamp"
rcu: do not create thread in pthread_atfork callback
pc: acpi: fix pvpanic regression
hostmem: Prevent removing an in-use memory backend
qom: Add can_be_deleted callback to UserCreatableClass
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/acpi-build.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d0a5c85..e761005 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -788,7 +788,7 @@ build_ssdt(GArray *table_data, GArray *linker, scope = aml_scope("\\_SB.PCI0.ISA"); dev = aml_device("PEVR"); - aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0002"))); + aml_append(dev, aml_name_decl("_HID", aml_string("QEMU0001"))); crs = aml_resource_template(); aml_append(crs, |