From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Andreas Färber" <afaerber@suse.de>,
"Juan Quintela" <quintela@redhat.com>
Subject: [Qemu-devel] [PATCH RFC for-1.6 qom-next 3/3] pci: Move AER log into VMStateSubsection
Date: Sun, 28 Jul 2013 03:41:10 +0200 [thread overview]
Message-ID: <1374975670-8820-4-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1374975670-8820-1-git-send-email-afaerber@suse.de>
XHCI does not call pcie_aer_init(), so use allocation of the AER log as
indicator for whether vmstate_pcie_aer_log is needed.
Go safe and zero the log pointer to support unrealizing and re-realizing
a PCIDevice without AER.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
hw/pci/pci.c | 24 ++++++++++++++++++++++--
hw/pci/pcie_aer.c | 1 +
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index b69421a..4f373f9 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -477,6 +477,25 @@ const VMStateDescription vmstate_pci_device = {
}
};
+static bool pcie_aer_log_needed(void *opaque)
+{
+ PCIDevice *s = opaque;
+
+ return s->exp.aer_log.log != NULL;
+}
+
+static const VMStateDescription vmstate_pcie_device_aer_log = {
+ .name = "PCIEDevice/AER_Log",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_STRUCT(exp.aer_log, PCIDevice, 0,
+ vmstate_pcie_aer_log, PCIEAERLog),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static bool pcie_msix_needed(void *opaque)
{
PCIDevice *s = opaque;
@@ -497,12 +516,13 @@ const VMStateDescription vmstate_pcie_device = {
VMSTATE_BUFFER_UNSAFE_INFO(irq_state, PCIDevice, 2,
vmstate_info_pci_irq_state,
PCI_NUM_PINS * sizeof(int32_t)),
- VMSTATE_STRUCT(exp.aer_log, PCIDevice, 0,
- vmstate_pcie_aer_log, PCIEAERLog),
VMSTATE_END_OF_LIST()
},
.subsections = (VMStateSubsection[]) {
{
+ .vmsd = &vmstate_pcie_device_aer_log,
+ .needed = pcie_aer_log_needed,
+ }, {
.vmsd = &vmstate_msix,
.needed = pcie_msix_needed,
}, {
diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index ca762ab..2767ebc 100644
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -166,6 +166,7 @@ int pcie_aer_init(PCIDevice *dev, uint16_t offset)
void pcie_aer_exit(PCIDevice *dev)
{
g_free(dev->exp.aer_log.log);
+ dev->exp.aer_log.log = NULL;
}
static void pcie_aer_update_uncor_status(PCIDevice *dev)
--
1.8.1.4
next prev parent reply other threads:[~2013-07-28 1:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-28 1:41 [Qemu-devel] [PATCH RFC for-1.6 qom-next 0/3] PCIe VMState cleanups for 1.6 Andreas Färber
2013-07-28 1:41 ` [Qemu-devel] [PATCH RFC for-1.6 qom-next 1/3] pcie: Move AER log into VMSTATE_PCIE_DEVICE() Andreas Färber
2013-07-28 1:41 ` [Qemu-devel] [PATCH RFC for-1.6 qom-next 2/3] pci: Add MSIX subsection for vmstate_pcie_device Andreas Färber
2013-07-28 1:41 ` Andreas Färber [this message]
2013-07-28 13:44 ` [Qemu-devel] [PATCH RFC for-1.6 qom-next 0/3] PCIe VMState cleanups for 1.6 Andreas Färber
2013-07-28 14:26 ` Andreas Färber
2013-07-28 14:08 ` Michael S. Tsirkin
2013-07-28 14:59 ` Andreas Färber
2013-07-28 15:52 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374975670-8820-4-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).