|
 |
218e99 |
From 7b4859ac57e46ec333b331f114afc65232bea76c Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 16:32:30 +0100
|
|
|
218e99 |
Subject: [PATCH 71/81] pvpanic: use FWCfgState explicitly
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
218e99 |
Message-id: <1383755557-21590-3-git-send-email-marcel.a@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55547
|
|
|
218e99 |
O-Subject: [RHEL-7 qemu-kvm PATCH v3 2/9] pvpanic: use FWCfgState explicitly
|
|
|
218e99 |
Bugzilla: 990601
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Use the type-safe FWCfgState structure instead
|
|
|
218e99 |
of the unsafe void *.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
218e99 |
(cherry picked from commit c3c4fe35be9f6c37388ba7615c6c33e8f4034438)
|
|
|
218e99 |
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/misc/pvpanic.c | 2 +-
|
|
|
218e99 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/misc/pvpanic.c | 2 +-
|
|
|
218e99 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
|
|
|
218e99 |
index d17c3c9..ddd8bdd 100644
|
|
|
218e99 |
--- a/hw/misc/pvpanic.c
|
|
|
218e99 |
+++ b/hw/misc/pvpanic.c
|
|
|
218e99 |
@@ -90,7 +90,7 @@ static int pvpanic_isa_initfn(ISADevice *dev)
|
|
|
218e99 |
{
|
|
|
218e99 |
PVPanicState *s = ISA_PVPANIC_DEVICE(dev);
|
|
|
218e99 |
static bool port_configured;
|
|
|
218e99 |
- void *fw_cfg;
|
|
|
218e99 |
+ FWCfgState *fw_cfg;
|
|
|
218e99 |
|
|
|
218e99 |
memory_region_init_io(&s->io, &pvpanic_ops, s, "pvpanic", 1);
|
|
|
218e99 |
isa_register_ioport(dev, &s->io, s->ioport);
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|