[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v8 3/9] apic: save apic_delivered flag
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH v8 3/9] apic: save apic_delivered flag |
Date: |
Thu, 26 Jan 2017 13:49:38 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 |
On 26/01/2017 13:34, Pavel Dovgalyuk wrote:
> This patch implements saving/restoring of static apic_delivered variable.
>
> v8: saving static variable only for one of the APICs
>
> Signed-off-by: Pavel Dovgalyuk <address@hidden>
> ---
> hw/intc/apic_common.c | 37 +++++++++++++++++++++++++++++++++++++
> include/hw/i386/apic_internal.h | 2 ++
> 2 files changed, 39 insertions(+)
>
> diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
> index d78c885..edacb16 100644
> --- a/hw/intc/apic_common.c
> +++ b/hw/intc/apic_common.c
> @@ -384,6 +384,29 @@ static bool apic_common_sipi_needed(void *opaque)
> return s->wait_for_sipi != 0;
> }
>
> +static bool apic_irq_delivered_needed(void *opaque)
> +{
> + static APICCommonState *first_apic;
> + APICCommonState *s = APIC_COMMON(opaque);
> + if (!first_apic) {
> + first_apic = s;
> + }
> + return s == first_apic;
Should also check " && apic_irq_delivered != 0".
Paolo
> +}
> +
> +static void apic_irq_delivered_pre_save(void *opaque)
> +{
> + APICCommonState *s = APIC_COMMON(opaque);
> + s->apic_irq_delivered = apic_irq_delivered;
> +}
> +
> +static int apic_irq_delivered_post_load(void *opaque, int version_id)
> +{
> + APICCommonState *s = APIC_COMMON(opaque);
> + apic_irq_delivered = s->apic_irq_delivered;
> + return 0;
> +}
> +
> static const VMStateDescription vmstate_apic_common_sipi = {
> .name = "apic_sipi",
> .version_id = 1,
> @@ -396,6 +419,19 @@ static const VMStateDescription vmstate_apic_common_sipi
> = {
> }
> };
>
> +static const VMStateDescription vmstate_apic_irq_delivered = {
> + .name = "apic_irq_delivered",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .needed = apic_irq_delivered_needed,
> + .pre_save = apic_irq_delivered_pre_save,
> + .post_load = apic_irq_delivered_post_load,
> + .fields = (VMStateField[]) {
> + VMSTATE_INT32(apic_irq_delivered, APICCommonState),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> static const VMStateDescription vmstate_apic_common = {
> .name = "apic",
> .version_id = 3,
> @@ -430,6 +466,7 @@ static const VMStateDescription vmstate_apic_common = {
> },
> .subsections = (const VMStateDescription*[]) {
> &vmstate_apic_common_sipi,
> + &vmstate_apic_irq_delivered,
> NULL
> }
> };
> diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
> index 1209eb4..20ad28c 100644
> --- a/include/hw/i386/apic_internal.h
> +++ b/include/hw/i386/apic_internal.h
> @@ -189,6 +189,8 @@ struct APICCommonState {
> DeviceState *vapic;
> hwaddr vapic_paddr; /* note: persistence via kvmvapic */
> bool legacy_instance_id;
> +
> + int apic_irq_delivered; /* for saving static variable */
> };
>
> typedef struct VAPICState {
>
[Qemu-devel] [PATCH v8 4/9] integratorcp: adding vmstate for save/restore, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 5/9] block: implement bdrv_snapshot_goto for blkreplay, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 6/9] blkreplay: create temporary overlay for underlaying devices, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 7/9] replay: disable default snapshot for record/replay, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 8/9] audio: make audio poll timer deterministic, Pavel Dovgalyuk, 2017/01/26
[Qemu-devel] [PATCH v8 9/9] replay: add record/replay for audio passthrough, Pavel Dovgalyuk, 2017/01/26
Re: [Qemu-devel] [PATCH v8 0/9] replay additions, Paolo Bonzini, 2017/01/26