From: Gerd Hoffmann <kraxel@redhat.com> To: Gleb Natapov <gleb@redhat.com> Cc: xen-devel@lists.xensource.com, qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH v3 1/6] suspend: add infrastructure Date: Thu, 09 Feb 2012 13:46:07 +0100 [thread overview] Message-ID: <4F33C00F.7040408@redhat.com> (raw) In-Reply-To: <20120209123725.GK18866@redhat.com> [-- Attachment #1: Type: text/plain, Size: 384 bytes --] Hi, >> Incremental patch (just infrastructure, no acpi windup yet) attached. >> Something like this? >> > We need to give ACPI ability to prevent wakeup. So, for instance, if RTC > alarm calls wakeup but ACPI detects that RTC_EN is cleared it can > prevent it. Yea, already figured that after reading your rtc reply ... One more incremental attached for review. thanks, Gerd [-- Attachment #2: wakeup-reason-2.diff --] [-- Type: text/plain, Size: 1740 bytes --] commit ef93688e70bf11313ec89c7e609fc142259dfd74 Author: Gerd Hoffmann <kraxel@redhat.com> Date: Thu Feb 9 13:44:37 2012 +0100 enable/disable reasons diff --git a/sysemu.h b/sysemu.h index e7060aa..781bdaf 100644 --- a/sysemu.h +++ b/sysemu.h @@ -47,6 +47,7 @@ void qemu_system_reset_request(void); void qemu_system_suspend_request(void); void qemu_register_suspend_notifier(Notifier *notifier); void qemu_system_wakeup_request(WakeupReason reason); +void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); void qemu_system_shutdown_request(void); void qemu_system_powerdown_request(void); diff --git a/vl.c b/vl.c index 17d4b72..1feac41 100644 --- a/vl.c +++ b/vl.c @@ -1288,6 +1288,7 @@ static NotifierList suspend_notifiers = NOTIFIER_LIST_INITIALIZER(suspend_notifiers); static NotifierList wakeup_notifiers = NOTIFIER_LIST_INITIALIZER(wakeup_notifiers); +static uint32_t wakeup_reason_mask; static RunState vmstop_requested = RUN_STATE_MAX; int qemu_shutdown_requested_get(void) @@ -1423,12 +1424,24 @@ void qemu_system_wakeup_request(WakeupReason reason) if (!is_suspended) { return; } + if (!(wakeup_reason_mask & (1 << reason))) { + return; + } notifier_list_notify(&wakeup_notifiers, &reason); reset_requested = 1; qemu_notify_event(); is_suspended = false; } +void qemu_system_wakeup_enable(WakeupReason reason, bool enabled) +{ + if (enabled) { + wakeup_reason_mask |= (1 << reason); + } else { + wakeup_reason_mask &= ~(1 << reason); + } +} + void qemu_register_wakeup_notifier(Notifier *notifier) { notifier_list_add(&wakeup_notifiers, notifier);
WARNING: multiple messages have this Message-ID (diff)
From: Gerd Hoffmann <kraxel@redhat.com> To: Gleb Natapov <gleb@redhat.com> Cc: xen-devel@lists.xensource.com, qemu-devel@nongnu.org Subject: Re: [PATCH v3 1/6] suspend: add infrastructure Date: Thu, 09 Feb 2012 13:46:07 +0100 [thread overview] Message-ID: <4F33C00F.7040408@redhat.com> (raw) In-Reply-To: <20120209123725.GK18866@redhat.com> [-- Attachment #1: Type: text/plain, Size: 384 bytes --] Hi, >> Incremental patch (just infrastructure, no acpi windup yet) attached. >> Something like this? >> > We need to give ACPI ability to prevent wakeup. So, for instance, if RTC > alarm calls wakeup but ACPI detects that RTC_EN is cleared it can > prevent it. Yea, already figured that after reading your rtc reply ... One more incremental attached for review. thanks, Gerd [-- Attachment #2: wakeup-reason-2.diff --] [-- Type: text/plain, Size: 1740 bytes --] commit ef93688e70bf11313ec89c7e609fc142259dfd74 Author: Gerd Hoffmann <kraxel@redhat.com> Date: Thu Feb 9 13:44:37 2012 +0100 enable/disable reasons diff --git a/sysemu.h b/sysemu.h index e7060aa..781bdaf 100644 --- a/sysemu.h +++ b/sysemu.h @@ -47,6 +47,7 @@ void qemu_system_reset_request(void); void qemu_system_suspend_request(void); void qemu_register_suspend_notifier(Notifier *notifier); void qemu_system_wakeup_request(WakeupReason reason); +void qemu_system_wakeup_enable(WakeupReason reason, bool enabled); void qemu_register_wakeup_notifier(Notifier *notifier); void qemu_system_shutdown_request(void); void qemu_system_powerdown_request(void); diff --git a/vl.c b/vl.c index 17d4b72..1feac41 100644 --- a/vl.c +++ b/vl.c @@ -1288,6 +1288,7 @@ static NotifierList suspend_notifiers = NOTIFIER_LIST_INITIALIZER(suspend_notifiers); static NotifierList wakeup_notifiers = NOTIFIER_LIST_INITIALIZER(wakeup_notifiers); +static uint32_t wakeup_reason_mask; static RunState vmstop_requested = RUN_STATE_MAX; int qemu_shutdown_requested_get(void) @@ -1423,12 +1424,24 @@ void qemu_system_wakeup_request(WakeupReason reason) if (!is_suspended) { return; } + if (!(wakeup_reason_mask & (1 << reason))) { + return; + } notifier_list_notify(&wakeup_notifiers, &reason); reset_requested = 1; qemu_notify_event(); is_suspended = false; } +void qemu_system_wakeup_enable(WakeupReason reason, bool enabled) +{ + if (enabled) { + wakeup_reason_mask |= (1 << reason); + } else { + wakeup_reason_mask &= ~(1 << reason); + } +} + void qemu_register_wakeup_notifier(Notifier *notifier) { notifier_list_add(&wakeup_notifiers, notifier);
next prev parent reply other threads:[~2012-02-09 12:46 UTC|newest] Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-08 11:00 [Qemu-devel] [PATCH v3 0/6] initial suspend support Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-08 11:00 ` [Qemu-devel] [PATCH v3 1/6] suspend: add infrastructure Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-09 8:48 ` [Qemu-devel] " Gleb Natapov 2012-02-09 8:48 ` Gleb Natapov 2012-02-09 10:45 ` [Qemu-devel] " Gerd Hoffmann 2012-02-09 10:45 ` Gerd Hoffmann 2012-02-09 11:19 ` [Qemu-devel] " Gleb Natapov 2012-02-09 11:19 ` Gleb Natapov 2012-02-09 12:02 ` [Qemu-devel] " Gerd Hoffmann 2012-02-09 12:02 ` Gerd Hoffmann 2012-02-09 12:37 ` [Qemu-devel] " Gleb Natapov 2012-02-09 12:37 ` Gleb Natapov 2012-02-09 12:46 ` Gerd Hoffmann [this message] 2012-02-09 12:46 ` Gerd Hoffmann 2012-02-09 13:17 ` [Qemu-devel] " Gleb Natapov 2012-02-09 13:17 ` Gleb Natapov 2012-02-09 13:29 ` [Qemu-devel] " Gerd Hoffmann 2012-02-09 13:29 ` Gerd Hoffmann 2012-02-09 16:00 ` [Qemu-devel] " Gerd Hoffmann 2012-02-09 16:00 ` Gerd Hoffmann 2012-02-09 16:05 ` [Qemu-devel] " Gleb Natapov 2012-02-09 16:05 ` Gleb Natapov 2012-02-08 11:00 ` [Qemu-devel] [PATCH v3 2/6] suspend: switch acpi s3 to new infrastructure Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-09 8:53 ` [Qemu-devel] " Gleb Natapov 2012-02-09 8:53 ` Gleb Natapov 2012-02-09 10:51 ` [Qemu-devel] " Gerd Hoffmann 2012-02-09 10:51 ` Gerd Hoffmann 2012-02-09 11:14 ` [Qemu-devel] " Gleb Natapov 2012-02-09 11:14 ` Gleb Natapov 2012-02-09 11:13 ` [Qemu-devel] [Xen-devel] " Stefano Stabellini 2012-02-09 11:13 ` Stefano Stabellini 2012-02-09 11:17 ` [Qemu-devel] " Paolo Bonzini 2012-02-09 11:17 ` Paolo Bonzini 2012-02-09 12:31 ` [Qemu-devel] " Gleb Natapov 2012-02-09 12:31 ` Gleb Natapov 2012-02-09 12:47 ` [Qemu-devel] " Paolo Bonzini 2012-02-09 12:47 ` Paolo Bonzini 2012-02-09 12:53 ` [Qemu-devel] " Gleb Natapov 2012-02-09 12:53 ` Gleb Natapov 2012-02-08 11:00 ` [Qemu-devel] [PATCH v3 3/6] suspend: add system_wakeup monitor command Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-09 8:54 ` [Qemu-devel] " Gleb Natapov 2012-02-09 8:54 ` Gleb Natapov 2012-02-08 11:00 ` [Qemu-devel] [PATCH v3 4/6] suspend: make ps/2 devices wakeup the guest Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-08 11:00 ` [Qemu-devel] [PATCH v3 5/6] suspend: make serial ports " Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-08 11:00 ` [Qemu-devel] [PATCH v3 6/6] suspend: make rtc alarm " Gerd Hoffmann 2012-02-08 11:00 ` Gerd Hoffmann 2012-02-09 8:56 ` [Qemu-devel] " Gleb Natapov 2012-02-09 8:56 ` Gleb Natapov 2012-02-09 12:00 ` [Qemu-devel] " Gerd Hoffmann 2012-02-09 12:00 ` Gerd Hoffmann 2012-02-09 12:24 ` [Qemu-devel] " Gleb Natapov 2012-02-09 12:24 ` Gleb Natapov
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=4F33C00F.7040408@redhat.com \ --to=kraxel@redhat.com \ --cc=gleb@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=xen-devel@lists.xensource.com \ /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: linkBe 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.