Merge branch 'icount-update' into HEAD

[qemu.git] / hw / core / irq.c

diff --git a/hw/core/irq.c b/hw/core/irq.c
index 03c8cb31ea9b89ce11a7f1473b766902ae4fb9dd..b98d1d69f5ccb2d30750ea183a45367909000b48 100644 (file)
--- a/hw/core/irq.c
+++ b/hw/core/irq.c
@@ -21,10 +21,17 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

+#include "qemu/osdep.h"
+#include "qemu/main-loop.h"

 #include "qemu-common.h"
 #include "hw/irq.h"
 #include "qemu-common.h"
 #include "hw/irq.h"

+#include "qom/object.h"
+
+#define IRQ(obj) OBJECT_CHECK(struct IRQState, (obj), TYPE_IRQ)

 
 struct IRQState {
 
 struct IRQState {

+    Object parent_obj;
+

     qemu_irq_handler handler;
     void *opaque;
     int n;
     qemu_irq_handler handler;
     void *opaque;
     int n;


@@ -42,23 +49,14 @@ qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler,
                            void *opaque, int n)
 {
     qemu_irq *s;
                            void *opaque, int n)
 {
     qemu_irq *s;

-    struct IRQState *p;

     int i;
 
     if (!old) {
         n_old = 0;
     }
     s = old ? g_renew(qemu_irq, old, n + n_old) : g_new(qemu_irq, n);
     int i;
 
     if (!old) {
         n_old = 0;
     }
     s = old ? g_renew(qemu_irq, old, n + n_old) : g_new(qemu_irq, n);

-    p = old ? g_renew(struct IRQState, s[0], n + n_old) :
-                g_new(struct IRQState, n);
-    for (i = 0; i < n + n_old; i++) {
-        if (i >= n_old) {
-            p->handler = handler;
-            p->opaque = opaque;
-            p->n = i;
-        }
-        s[i] = p;
-        p++;
+    for (i = n_old; i < n + n_old; i++) {
+        s[i] = qemu_allocate_irq(handler, opaque, i);

     }
     return s;
 }
     }
     return s;
 }


@@ -72,7 +70,7 @@ qemu_irq qemu_allocate_irq(qemu_irq_handler handler, void *opaque, int n)
 {
     struct IRQState *irq;
 
 {
     struct IRQState *irq;
 

-    irq = g_new(struct IRQState, 1);
+    irq = IRQ(object_new(TYPE_IRQ));

     irq->handler = handler;
     irq->opaque = opaque;
     irq->n = n;
     irq->handler = handler;
     irq->opaque = opaque;
     irq->n = n;


@@ -80,15 +78,18 @@ qemu_irq qemu_allocate_irq(qemu_irq_handler handler, void *opaque, int n)
     return irq;
 }
 
     return irq;
 }
 

-void qemu_free_irqs(qemu_irq *s)
+void qemu_free_irqs(qemu_irq *s, int n)

 {
 {

-    g_free(s[0]);
+    int i;
+    for (i = 0; i < n; i++) {
+        qemu_free_irq(s[i]);
+    }

     g_free(s);
 }
 
 void qemu_free_irq(qemu_irq irq)
 {
     g_free(s);
 }
 
 void qemu_free_irq(qemu_irq irq)
 {

-    g_free(irq);
+    object_unref(OBJECT(irq));

 }
 
 static void qemu_notirq(void *opaque, int line, int level)
 }
 
 static void qemu_notirq(void *opaque, int line, int level)


@@ -102,7 +103,7 @@ qemu_irq qemu_irq_invert(qemu_irq irq)
 {
     /* The default state for IRQs is low, so raise the output now.  */
     qemu_irq_raise(irq);
 {
     /* The default state for IRQs is low, so raise the output now.  */
     qemu_irq_raise(irq);

-    return qemu_allocate_irqs(qemu_notirq, irq, 1)[0];
+    return qemu_allocate_irq(qemu_notirq, irq, 0);

 }
 
 static void qemu_splitirq(void *opaque, int line, int level)
 }
 
 static void qemu_splitirq(void *opaque, int line, int level)


@@ -117,7 +118,7 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2)
     qemu_irq *s = g_malloc0(2 * sizeof(qemu_irq));
     s[0] = irq1;
     s[1] = irq2;
     qemu_irq *s = g_malloc0(2 * sizeof(qemu_irq));
     s[0] = irq1;
     s[1] = irq2;

-    return qemu_allocate_irqs(qemu_splitirq, s, 1)[0];
+    return qemu_allocate_irq(qemu_splitirq, s, 0);

 }
 
 static void proxy_irq_handler(void *opaque, int n, int level)
 }
 
 static void proxy_irq_handler(void *opaque, int n, int level)


@@ -141,12 +142,19 @@ void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n)
     for (i = 0; i < n; i++) {
         *old_irqs[i] = *gpio_in[i];
         gpio_in[i]->handler = handler;
     for (i = 0; i < n; i++) {
         *old_irqs[i] = *gpio_in[i];
         gpio_in[i]->handler = handler;

-        gpio_in[i]->opaque = old_irqs;
+        gpio_in[i]->opaque = &old_irqs[i];

     }
 }
 
     }
 }
 

-void qemu_irq_intercept_out(qemu_irq **gpio_out, qemu_irq_handler handler, int n)
+static const TypeInfo irq_type_info = {
+   .name = TYPE_IRQ,
+   .parent = TYPE_OBJECT,
+   .instance_size = sizeof(struct IRQState),
+};
+
+static void irq_register_types(void)

 {
 {

-    qemu_irq *old_irqs = *gpio_out;
-    *gpio_out = qemu_allocate_irqs(handler, old_irqs, n);
+    type_register_static(&irq_type_info);

 }
 }

+
+type_init(irq_register_types)