From: Anthony Liguori <anthony@codemonkey.ws>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v6 1/2] ptimer: move declarations to ptimer.h
Date: Fri, 13 Jan 2012 10:55:13 -0600 [thread overview]
Message-ID: <4F1061F1.3090102@codemonkey.ws> (raw)
In-Reply-To: <1326470840-21106-1-git-send-email-pbonzini@redhat.com>
On 01/13/2012 10:07 AM, Paolo Bonzini wrote:
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
Applied. Thanks.
Regards,
Anthony Liguori
> ---
> v5->v6: Just yet another rebase.
>
> hw/arm_timer.c | 1 +
> hw/etraxfs_timer.c | 1 +
> hw/grlib_apbuart.c | 1 +
> hw/grlib_gptimer.c | 1 +
> hw/lan9118.c | 1 +
> hw/leon3.c | 1 +
> hw/lm32_timer.c | 1 +
> hw/mcf5206.c | 1 +
> hw/mcf5208.c | 1 +
> hw/milkymist-sysctl.c | 1 +
> hw/musicpal.c | 1 +
> hw/ptimer.c | 1 +
> hw/ptimer.h | 27 +++++++++++++++++++++++++++
> hw/sh_timer.c | 1 +
> hw/slavio_timer.c | 1 +
> hw/xilinx_axidma.c | 1 +
> hw/xilinx_timer.c | 1 +
> qemu-timer.h | 13 -------------
> 18 files changed, 43 insertions(+), 13 deletions(-)
> create mode 100644 hw/ptimer.h
>
> diff --git a/hw/arm_timer.c b/hw/arm_timer.c
> index 60e1c63..1902f1a 100644
> --- a/hw/arm_timer.c
> +++ b/hw/arm_timer.c
> @@ -11,6 +11,7 @@
> #include "qemu-timer.h"
> #include "qemu-common.h"
> #include "qdev.h"
> +#include "ptimer.h"
>
> /* Common timer implementation. */
>
> diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c
> index 319cee1..2dfdb30 100644
> --- a/hw/etraxfs_timer.c
> +++ b/hw/etraxfs_timer.c
> @@ -24,6 +24,7 @@
> #include "sysbus.h"
> #include "sysemu.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
>
> #define D(x)
>
> diff --git a/hw/grlib_apbuart.c b/hw/grlib_apbuart.c
> index 62bdb03..f8a64e1 100644
> --- a/hw/grlib_apbuart.c
> +++ b/hw/grlib_apbuart.c
> @@ -24,6 +24,7 @@
>
> #include "sysbus.h"
> #include "qemu-char.h"
> +#include "ptimer.h"
>
> #include "trace.h"
>
> diff --git a/hw/grlib_gptimer.c b/hw/grlib_gptimer.c
> index 5645054..9c98a83 100644
> --- a/hw/grlib_gptimer.c
> +++ b/hw/grlib_gptimer.c
> @@ -24,6 +24,7 @@
>
> #include "sysbus.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
>
> #include "trace.h"
>
> diff --git a/hw/lan9118.c b/hw/lan9118.c
> index 7e64c5d..341a521 100644
> --- a/hw/lan9118.c
> +++ b/hw/lan9118.c
> @@ -11,6 +11,7 @@
> #include "net.h"
> #include "devices.h"
> #include "sysemu.h"
> +#include "ptimer.h"
> /* For crc32 */
> #include<zlib.h>
>
> diff --git a/hw/leon3.c b/hw/leon3.c
> index e25bb04..71d79a6 100644
> --- a/hw/leon3.c
> +++ b/hw/leon3.c
> @@ -23,6 +23,7 @@
> */
> #include "hw.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "qemu-char.h"
> #include "sysemu.h"
> #include "boards.h"
> diff --git a/hw/lm32_timer.c b/hw/lm32_timer.c
> index 445847f..115e1e9 100644
> --- a/hw/lm32_timer.c
> +++ b/hw/lm32_timer.c
> @@ -25,6 +25,7 @@
> #include "sysbus.h"
> #include "trace.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "qemu-error.h"
>
> #define DEFAULT_FREQUENCY (50*1000000)
> diff --git a/hw/mcf5206.c b/hw/mcf5206.c
> index 7b6d501..5110d83 100644
> --- a/hw/mcf5206.c
> +++ b/hw/mcf5206.c
> @@ -8,6 +8,7 @@
> #include "hw.h"
> #include "mcf.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "sysemu.h"
> #include "exec-memory.h"
>
> diff --git a/hw/mcf5208.c b/hw/mcf5208.c
> index 3b0636d..aa11a75 100644
> --- a/hw/mcf5208.c
> +++ b/hw/mcf5208.c
> @@ -8,6 +8,7 @@
> #include "hw.h"
> #include "mcf.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "sysemu.h"
> #include "net.h"
> #include "boards.h"
> diff --git a/hw/milkymist-sysctl.c b/hw/milkymist-sysctl.c
> index 6326b70..bd2a298 100644
> --- a/hw/milkymist-sysctl.c
> +++ b/hw/milkymist-sysctl.c
> @@ -26,6 +26,7 @@
> #include "sysemu.h"
> #include "trace.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "qemu-error.h"
>
> enum {
> diff --git a/hw/musicpal.c b/hw/musicpal.c
> index a01e3d2..522559d 100644
> --- a/hw/musicpal.c
> +++ b/hw/musicpal.c
> @@ -14,6 +14,7 @@
> #include "boards.h"
> #include "pc.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "block.h"
> #include "flash.h"
> #include "console.h"
> diff --git a/hw/ptimer.c b/hw/ptimer.c
> index b6cabd5..de7d664 100644
> --- a/hw/ptimer.c
> +++ b/hw/ptimer.c
> @@ -7,6 +7,7 @@
> */
> #include "hw.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "host-utils.h"
>
> struct ptimer_state
> diff --git a/hw/ptimer.h b/hw/ptimer.h
> new file mode 100644
> index 0000000..69cdddc
> --- /dev/null
> +++ b/hw/ptimer.h
> @@ -0,0 +1,27 @@
> +/*
> + * General purpose implementation of a simple periodic countdown timer.
> + *
> + * Copyright (c) 2007 CodeSourcery.
> + *
> + * This code is licensed under the GNU LGPL.
> + */
> +#ifndef PTIMER_H
> +#define PTIMER_H
> +
> +#include "qemu-common.h"
> +#include "qemu-timer.h"
> +
> +/* ptimer.c */
> +typedef struct ptimer_state ptimer_state;
> +typedef void (*ptimer_cb)(void *opaque);
> +
> +ptimer_state *ptimer_init(QEMUBH *bh);
> +void ptimer_set_period(ptimer_state *s, int64_t period);
> +void ptimer_set_freq(ptimer_state *s, uint32_t freq);
> +void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload);
> +uint64_t ptimer_get_count(ptimer_state *s);
> +void ptimer_set_count(ptimer_state *s, uint64_t count);
> +void ptimer_run(ptimer_state *s, int oneshot);
> +void ptimer_stop(ptimer_state *s);
> +
> +#endif
> diff --git a/hw/sh_timer.c b/hw/sh_timer.c
> index d2c0cec..64bf604 100644
> --- a/hw/sh_timer.c
> +++ b/hw/sh_timer.c
> @@ -12,6 +12,7 @@
> #include "sh.h"
> #include "qemu-timer.h"
> #include "exec-memory.h"
> +#include "ptimer.h"
>
> //#define DEBUG_TIMER
>
> diff --git a/hw/slavio_timer.c b/hw/slavio_timer.c
> index 2353c43..44b500a 100644
> --- a/hw/slavio_timer.c
> +++ b/hw/slavio_timer.c
> @@ -24,6 +24,7 @@
>
> #include "sun4m.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "sysbus.h"
> #include "trace.h"
>
> diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
> index 596ec0e..0da20d9 100644
> --- a/hw/xilinx_axidma.c
> +++ b/hw/xilinx_axidma.c
> @@ -25,6 +25,7 @@
> #include "sysbus.h"
> #include "qemu-char.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
> #include "qemu-log.h"
> #include "qdev-addr.h"
>
> diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
> index 0b2f32a..adca53b 100644
> --- a/hw/xilinx_timer.c
> +++ b/hw/xilinx_timer.c
> @@ -24,6 +24,7 @@
>
> #include "sysbus.h"
> #include "qemu-timer.h"
> +#include "ptimer.h"
>
> #define D(x)
>
> diff --git a/qemu-timer.h b/qemu-timer.h
> index 67ca72e..de17f3b 100644
> --- a/qemu-timer.h
> +++ b/qemu-timer.h
> @@ -139,19 +139,6 @@ static inline int64_t get_clock(void)
> void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);
> void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
>
> -/* ptimer.c */
> -typedef struct ptimer_state ptimer_state;
> -typedef void (*ptimer_cb)(void *opaque);
> -
> -ptimer_state *ptimer_init(QEMUBH *bh);
> -void ptimer_set_period(ptimer_state *s, int64_t period);
> -void ptimer_set_freq(ptimer_state *s, uint32_t freq);
> -void ptimer_set_limit(ptimer_state *s, uint64_t limit, int reload);
> -uint64_t ptimer_get_count(ptimer_state *s);
> -void ptimer_set_count(ptimer_state *s, uint64_t count);
> -void ptimer_run(ptimer_state *s, int oneshot);
> -void ptimer_stop(ptimer_state *s);
> -
> /* icount */
> int64_t cpu_get_icount(void);
> int64_t cpu_get_clock(void);
prev parent reply other threads:[~2012-01-13 16:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-13 16:07 [Qemu-devel] [PATCH v6 1/2] ptimer: move declarations to ptimer.h Paolo Bonzini
2012-01-13 16:07 ` [Qemu-devel] [PATCH v6 2/2] vmstate: extract declarations out of hw/hw.h Paolo Bonzini
2012-01-13 16:55 ` Anthony Liguori [this message]
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=4F1061F1.3090102@codemonkey.ws \
--to=anthony@codemonkey.ws \
--cc=pbonzini@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.