diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2020-09-07 03:55:33 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-09-30 19:09:20 +0200 |
| commit | 1fa2c0eb6c7e5a5cf714c2a9dfea7633429af76d (patch) | |
| tree | 0ef2ff6c6199144455b5489b7c052393e7d13c14 | |
| parent | f2336b5fbdfcf0aef9a66e4b170648e10faf7a8e (diff) | |
hw/char/serial: Make 'wakeup' property boolean
Make the "wakeup" property introduced in commit 9826fd597df
("suspend: make serial ports wakeup the guest") a boolean.
As we want to reuse the generic serial properties in the
ISA model (next commit), expose this property.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200907015535.827885-6-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/char/serial-isa.c | 2 | ||||
| -rw-r--r-- | hw/char/serial.c | 1 | ||||
| -rw-r--r-- | include/hw/char/serial.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 32c2fc0ebe..fc8ff7823a 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -117,7 +117,7 @@ static Property serial_isa_properties[] = { DEFINE_PROP_UINT32("iobase", ISASerialState, iobase, -1), DEFINE_PROP_UINT32("irq", ISASerialState, isairq, -1), DEFINE_PROP_CHR("chardev", ISASerialState, state.chr), - DEFINE_PROP_UINT32("wakeup", ISASerialState, state.wakeup, 0), + DEFINE_PROP_BOOL("wakeup", ISASerialState, state.wakeup, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/char/serial.c b/hw/char/serial.c index 7b5ef872bd..4386adabd4 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -975,6 +975,7 @@ const MemoryRegionOps serial_io_ops = { static Property serial_properties[] = { DEFINE_PROP_CHR("chardev", SerialState, chr), DEFINE_PROP_UINT32("baudbase", SerialState, baudbase, 115200), + DEFINE_PROP_BOOL("wakeup", SerialState, wakeup, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h index 23bd7d3dde..8ba7eca3d6 100644 --- a/include/hw/char/serial.h +++ b/include/hw/char/serial.h @@ -61,7 +61,7 @@ struct SerialState { uint32_t baudbase; uint32_t tsr_retry; guint watch_tag; - uint32_t wakeup; + bool wakeup; /* Time when the last byte was successfully sent out of the tsr */ uint64_t last_xmit_ts; |