Patchwork [2/4] qdev: add audio capability

login
register
mail settings
Submitter Gerd Hoffmann
Date Aug. 11, 2009, 9:20 a.m.
Message ID <1249982427-14481-2-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/31129/
State Superseded
Headers show

Comments

Gerd Hoffmann - Aug. 11, 2009, 9:20 a.m.
... and tag sound drivers (well, only the pci ones as the others are not
yet converted to qdev).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/ac97.c   |    1 +
 hw/es1370.c |    1 +
 hw/qdev.c   |    1 +
 hw/qdev.h   |    4 +++-
 4 files changed, 6 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/ac97.c b/hw/ac97.c
index 6c818c9..8d9c202 100644
--- a/hw/ac97.c
+++ b/hw/ac97.c
@@ -1368,6 +1368,7 @@  static PCIDeviceInfo ac97_info = {
     .qdev.name    = "AC97",
     .qdev.desc    = "Intel 82801AA AC97 Audio",
     .qdev.size    = sizeof (PCIAC97LinkState),
+    .qdev.caps    = DEV_CAP_AUDIO,
     .init         = ac97_initfn,
 };
 
diff --git a/hw/es1370.c b/hw/es1370.c
index 5c9af0e..028db61 100644
--- a/hw/es1370.c
+++ b/hw/es1370.c
@@ -1056,6 +1056,7 @@  static PCIDeviceInfo es1370_info = {
     .qdev.name    = "ES1370",
     .qdev.desc    = "ENSONIQ AudioPCI ES1370",
     .qdev.size    = sizeof (PCIES1370State),
+    .qdev.caps    = DEV_CAP_AUDIO,
     .init         = es1370_initfn,
 };
 
diff --git a/hw/qdev.c b/hw/qdev.c
index 568d249..e501610 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -108,6 +108,7 @@  DeviceState *qdev_create(BusState *bus, const char *name)
 static int qdev_print_devinfo(DeviceInfo *info, char *dest, int len)
 {
     static const char *capname[] = {
+        [ DEV_CAP_BIT_AUDIO       ] = "audio",
     };
     const char *sep;
     int pos = 0;
diff --git a/hw/qdev.h b/hw/qdev.h
index 7beb756..90a4446 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -103,9 +103,11 @@  typedef void (*SCSIAttachFn)(DeviceState *host, BlockDriverState *bdrv,
               int unit);
 
 enum DeviceCapBits {
-    dummy
+    DEV_CAP_BIT_AUDIO      = 0,
 };
 
+#define DEV_CAP_AUDIO      (1 << DEV_CAP_BIT_AUDIO)
+
 struct DeviceInfo {
     const char *name;
     const char *alias;