All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cao jin <caoj.fnst@cn.fujitsu.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Marcel Apfelbaum <marcel@redhat.com>
Subject: [Qemu-devel] [PATCH v9 04/13] intel-hda: change msi property type
Date: Mon, 20 Jun 2016 14:13:35 +0800	[thread overview]
Message-ID: <1466403224-16604-5-git-send-email-caoj.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1466403224-16604-1-git-send-email-caoj.fnst@cn.fujitsu.com>

>From uint32 to enum OnOffAuto.

cc: Gerd Hoffmann <kraxel@redhat.com>
cc: Michael S. Tsirkin <mst@redhat.com>
cc: Markus Armbruster <armbru@redhat.com>
cc: Marcel Apfelbaum <marcel@redhat.com>

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 hw/audio/intel-hda.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 93d7669..6b4dda0 100644
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -191,7 +191,7 @@ struct IntelHDAState {
 
     /* properties */
     uint32_t debug;
-    uint32_t msi;
+    OnOffAuto msi;
     bool old_msi_addr;
 };
 
@@ -259,7 +259,7 @@ static void intel_hda_update_int_sts(IntelHDAState *d)
 
 static void intel_hda_update_irq(IntelHDAState *d)
 {
-    int msi = d->msi && msi_enabled(&d->pci);
+    bool msi = msi_enabled(&d->pci);
     int level;
 
     intel_hda_update_int_sts(d);
@@ -1146,7 +1146,8 @@ static void intel_hda_realize(PCIDevice *pci, Error **errp)
     memory_region_init_io(&d->mmio, OBJECT(d), &intel_hda_mmio_ops, d,
                           "intel-hda", 0x4000);
     pci_register_bar(&d->pci, 0, 0, &d->mmio);
-    if (d->msi) {
+    if (d->msi != ON_OFF_AUTO_OFF) {
+         /* TODO check for errors */
         msi_init(&d->pci, d->old_msi_addr ? 0x50 : 0x60, 1, true, false);
     }
 
@@ -1238,7 +1239,7 @@ static const VMStateDescription vmstate_intel_hda = {
 
 static Property intel_hda_properties[] = {
     DEFINE_PROP_UINT32("debug", IntelHDAState, debug, 0),
-    DEFINE_PROP_UINT32("msi", IntelHDAState, msi, 1),
+    DEFINE_PROP_ON_OFF_AUTO("msi", IntelHDAState, msi, ON_OFF_AUTO_AUTO),
     DEFINE_PROP_BOOL("old_msi_addr", IntelHDAState, old_msi_addr, false),
     DEFINE_PROP_END_OF_LIST(),
 };
-- 
2.1.0

  parent reply	other threads:[~2016-06-20  6:08 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-20  6:13 [Qemu-devel] [PATCH v9 00/13] Add param Error ** for msi_init()--part2 Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 01/13] change pvscsi_init_msi() type to void Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 02/13] mptsas: change .realize function name Cao jin
2016-07-06  3:02   ` Cao jin
2016-09-14  7:57   ` Michael Tokarev
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 03/13] usb xhci: change msi/msix property type Cao jin
2016-06-20  6:13 ` Cao jin [this message]
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 05/13] mptsas: change msi " Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 06/13] megasas: change msi/msix " Cao jin
2016-06-20  6:12   ` Hannes Reinecke
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 07/13] pci bridge dev: change msi " Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 08/13] pci: Convert msi_init() to Error and fix callers to check it Cao jin
2016-06-20  6:14   ` Hannes Reinecke
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 09/13] megasas: remove unnecessary megasas_use_msi() Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 10/13] mptsas: remove unnecessary internal msi state flag Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 11/13] vmxnet3: " Cao jin
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 12/13] e1000e: " Cao jin
2016-06-29 13:42   ` Markus Armbruster
2016-06-20  6:13 ` [Qemu-devel] [PATCH v9 13/13] vmw_pvscsi: " Cao jin
2016-06-29 13:44   ` Markus Armbruster
2016-06-28 11:19 ` [Qemu-devel] [PATCH v9 00/13] Add param Error ** for msi_init()--part2 Cao jin
2016-06-29  1:24   ` Cao jin

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=1466403224-16604-5-git-send-email-caoj.fnst@cn.fujitsu.com \
    --to=caoj.fnst@cn.fujitsu.com \
    --cc=armbru@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=marcel@redhat.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.