[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V2 15/22] chardev: cpr for simple devices
From: |
Steve Sistare |
Subject: |
[PATCH V2 15/22] chardev: cpr for simple devices |
Date: |
Tue, 5 Jan 2021 07:42:03 -0800 |
Set QEMU_CHAR_FEATURE_CPR for devices that trivially support cpr.
char-stdio is slightly less trivial. Allow the gdb server by
closing it on exec.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
chardev/char-mux.c | 1 +
chardev/char-null.c | 1 +
chardev/char-serial.c | 1 +
chardev/char-stdio.c | 8 ++++++++
gdbstub.c | 1 +
include/chardev/char.h | 1 +
migration/cpr.c | 1 +
7 files changed, 14 insertions(+)
diff --git a/chardev/char-mux.c b/chardev/char-mux.c
index 6f980bb..2a6989e 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -330,6 +330,7 @@ static void qemu_chr_open_mux(Chardev *chr,
*/
*be_opened = machine_init_done;
qemu_chr_fe_init(&d->chr, drv, errp);
+ qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_CPR);
}
static void qemu_chr_parse_mux(QemuOpts *opts, ChardevBackend *backend,
diff --git a/chardev/char-null.c b/chardev/char-null.c
index 1c6a290..02acaff 100644
--- a/chardev/char-null.c
+++ b/chardev/char-null.c
@@ -32,6 +32,7 @@ static void null_chr_open(Chardev *chr,
Error **errp)
{
*be_opened = false;
+ qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_CPR);
}
static void char_null_class_init(ObjectClass *oc, void *data)
diff --git a/chardev/char-serial.c b/chardev/char-serial.c
index 7c3d84a..b585085 100644
--- a/chardev/char-serial.c
+++ b/chardev/char-serial.c
@@ -274,6 +274,7 @@ static void qmp_chardev_open_serial(Chardev *chr,
qemu_set_nonblock(fd);
tty_serial_init(fd, 115200, 'N', 8, 1);
+ qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_CPR);
qemu_chr_open_fd(chr, fd, fd);
}
#endif /* __linux__ || __sun__ */
diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c
index 82eaebc..db6218c 100644
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -116,9 +116,17 @@ static void qemu_chr_open_stdio(Chardev *chr,
stdio_allow_signal = opts->signal;
}
qemu_chr_set_echo_stdio(chr, false);
+ qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_CPR);
}
#endif
+void qemu_term_exit(void)
+{
+#ifndef _WIN32
+ term_exit();
+#endif
+}
+
static void qemu_chr_parse_stdio(QemuOpts *opts, ChardevBackend *backend,
Error **errp)
{
diff --git a/gdbstub.c b/gdbstub.c
index f3a318c..0e8ed91 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -3417,6 +3417,7 @@ int gdbserver_start(const char *device)
mon_chr = gdbserver_state.mon_chr;
reset_gdbserver_state();
}
+ mon_chr->close_on_cpr = true;
create_processes(&gdbserver_state);
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 35d04e9..affcc12 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -294,5 +294,6 @@ GSource *qemu_chr_timeout_add_ms(Chardev *chr, guint ms,
void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp);
bool qemu_chr_cpr_capable(Error **errp);
+void qemu_term_exit(void);
#endif
diff --git a/migration/cpr.c b/migration/cpr.c
index 93f6800..de85d56 100644
--- a/migration/cpr.c
+++ b/migration/cpr.c
@@ -139,6 +139,7 @@ void cprsave(const char *file, CprMode mode, Error **errp)
}
walkenv(FD_PREFIX, preserve_fd, 0);
vhost_dev_reset_all();
+ qemu_term_exit();
setenv("QEMU_START_FREEZE", "", 1);
qemu_system_exec_request();
}
--
1.8.3.1
- [PATCH V2 19/22] monitor: cpr support, (continued)
- [PATCH V2 19/22] monitor: cpr support, Steve Sistare, 2021/01/05
- [PATCH V2 17/22] chardev: socket accept subroutine, Steve Sistare, 2021/01/05
- [PATCH V2 20/22] cpr: only-cpr-capable option, Steve Sistare, 2021/01/05
- [PATCH V2 22/22] simplify savevm, Steve Sistare, 2021/01/05
- [PATCH V2 14/22] chardev: cpr framework, Steve Sistare, 2021/01/05
- [PATCH V2 21/22] cpr: maintainers, Steve Sistare, 2021/01/05
- [PATCH V2 02/22] qemu_ram_volatile, Steve Sistare, 2021/01/05
- [PATCH V2 13/22] vhost: reset vhost devices upon cprsave, Steve Sistare, 2021/01/05
- [PATCH V2 01/22] as_flat_walk, Steve Sistare, 2021/01/05
- [PATCH V2 11/22] vfio-pci: refactor for cpr, Steve Sistare, 2021/01/05
- [PATCH V2 15/22] chardev: cpr for simple devices,
Steve Sistare <=