diff options
author | Anthony Liguori <aliguori@amazon.com> | 2013-11-25 09:41:24 -0800 |
---|---|---|
committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-25 09:41:24 -0800 |
commit | d916adaa606dd1b871316acb295d5979361133b7 (patch) | |
tree | 4d1fcc63be4818ec20b0616c463cf7c55c7bc03e /hw/misc | |
parent | 833637d46dd5a0859abdff085352ae7d48dc8189 (diff) | |
parent | d607a52364e7bfc1cd6d3e425b898e86be4e525d (diff) | |
download | qemu-d916adaa606dd1b871316acb295d5979361133b7.zip qemu-d916adaa606dd1b871316acb295d5979361133b7.tar.gz qemu-d916adaa606dd1b871316acb295d5979361133b7.tar.bz2 |
Merge remote-tracking branch 'bonzini/tags/for-anthony' into staging
Here are a bunch of 1.7-tagged patches that I was afraid
were getting forgotten or that did not have a clear maintainer responsible
for making a pull request.
# gpg: Signature made Thu 21 Nov 2013 08:40:59 AM PST using RSA key ID 9B4D86F2
# gpg: Can't check signature: public key not found
# By Peter Maydell (3) and others
# Via Paolo Bonzini
* bonzini/tags/for-anthony:
qga: Fix compiler warnings (missing format attribute, wrong format strings)
mips jazz: do not raise data bus exception when accessing invalid addresses
target-i386: yield to another VCPU on PAUSE
rng-egd: offset the point when repeatedly read from the buffer
rng-egd: remove redundant free
target-i386: Fix build by providing stub kvm_arch_get_supported_cpuid()
vfio-pci: Fix multifunction=on
atomic.h: Fix build with clang
pc: get rid of builtin pvpanic for "-M pc-1.5"
configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0
sun4m: Add FCode ROM for TCX framebuffer
Message-id: 1385052578-32352-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'hw/misc')
-rw-r--r-- | hw/misc/pvpanic.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 226e298..5377fee 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -112,11 +112,6 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) isa_register_ioport(d, &s->io, s->ioport); } -void pvpanic_init(ISABus *bus) -{ - isa_create_simple(bus, TYPE_ISA_PVPANIC_DEVICE); -} - #define PVPANIC_IOPORT_PROP "ioport" uint16_t pvpanic_port(void) |