| Message ID | 20191018134754.16362-5-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
Philippe Mathieu-Daudé <philmd@redhat.com> 于2019年10月18日周五 下午9:50写道： > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > This function isn't used anymore. > > This reverts commit 22ec3283efba9ba0792790da786d6776d83f2a92. > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Li Qiang <liq3ea@gmail.com> > --- > hw/core/irq.c | 14 -------------- > include/hw/irq.h | 5 ----- > 2 files changed, 19 deletions(-) > > diff --git a/hw/core/irq.c b/hw/core/irq.c > index 7cc0295d0e..fb3045b912 100644 > --- a/hw/core/irq.c > +++ b/hw/core/irq.c > @@ -120,20 +120,6 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2) > return qemu_allocate_irq(qemu_splitirq, s, 0); > } > > -static void proxy_irq_handler(void *opaque, int n, int level) > -{ > - qemu_irq **target = opaque; > - > - if (*target) { > - qemu_set_irq((*target)[n], level); > - } > -} > - > -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n) > -{ > - return qemu_allocate_irqs(proxy_irq_handler, target, n); > -} > - > void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, > int n) > { > int i; > diff --git a/include/hw/irq.h b/include/hw/irq.h > index fe527f6f51..24ba0ece11 100644 > --- a/include/hw/irq.h > +++ b/include/hw/irq.h > @@ -51,11 +51,6 @@ qemu_irq qemu_irq_invert(qemu_irq irq); > */ > qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); > > -/* Returns a new IRQ set which connects 1:1 to another IRQ set, which > - * may be set later. > - */ > -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n); > - > /* For internal use in qtest. Similar to qemu_irq_split, but operating > on an existing vector of qemu_irq. */ > void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, > int n); > -- > 2.21.0 > > >
El vie, 18-10-2019 a las 15:47 +0200, Philippe Mathieu-Daudé escribió: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > This function isn't used anymore. > > This reverts commit 22ec3283efba9ba0792790da786d6776d83f2a92. > > Reviewed-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/core/irq.c | 14 -------------- > include/hw/irq.h | 5 ----- > 2 files changed, 19 deletions(-) > > diff --git a/hw/core/irq.c b/hw/core/irq.c > index 7cc0295d0e..fb3045b912 100644 > --- a/hw/core/irq.c > +++ b/hw/core/irq.c > @@ -120,20 +120,6 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq > irq2) > return qemu_allocate_irq(qemu_splitirq, s, 0); > } > > -static void proxy_irq_handler(void *opaque, int n, int level) > -{ > - qemu_irq **target = opaque; > - > - if (*target) { > - qemu_set_irq((*target)[n], level); > - } > -} > - > -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n) > -{ > - return qemu_allocate_irqs(proxy_irq_handler, target, n); > -} > - > void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler > handler, int n) > { > int i; > diff --git a/include/hw/irq.h b/include/hw/irq.h > index fe527f6f51..24ba0ece11 100644 > --- a/include/hw/irq.h > +++ b/include/hw/irq.h > @@ -51,11 +51,6 @@ qemu_irq qemu_irq_invert(qemu_irq irq); > */ > qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); > > -/* Returns a new IRQ set which connects 1:1 to another IRQ set, > which > - * may be set later. > - */ > -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n); > - > /* For internal use in qtest. Similar to qemu_irq_split, but > operating > on an existing vector of qemu_irq. */ > void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler > handler, int n); Reviewed-by: Esteban Bosse <estebanbosse@gmail.com>
diff --git a/hw/core/irq.c b/hw/core/irq.c index 7cc0295d0e..fb3045b912 100644 --- a/hw/core/irq.c +++ b/hw/core/irq.c @@ -120,20 +120,6 @@ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2) return qemu_allocate_irq(qemu_splitirq, s, 0); } -static void proxy_irq_handler(void *opaque, int n, int level) -{ - qemu_irq **target = opaque; - - if (*target) { - qemu_set_irq((*target)[n], level); - } -} - -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n) -{ - return qemu_allocate_irqs(proxy_irq_handler, target, n); -} - void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n) { int i; diff --git a/include/hw/irq.h b/include/hw/irq.h index fe527f6f51..24ba0ece11 100644 --- a/include/hw/irq.h +++ b/include/hw/irq.h @@ -51,11 +51,6 @@ qemu_irq qemu_irq_invert(qemu_irq irq); */ qemu_irq qemu_irq_split(qemu_irq irq1, qemu_irq irq2); -/* Returns a new IRQ set which connects 1:1 to another IRQ set, which - * may be set later. - */ -qemu_irq *qemu_irq_proxy(qemu_irq **target, int n); - /* For internal use in qtest. Similar to qemu_irq_split, but operating on an existing vector of qemu_irq. */ void qemu_irq_intercept_in(qemu_irq *gpio_in, qemu_irq_handler handler, int n);