[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V7 26/29] chardev: cpr for simple devices
From: |
Steve Sistare |
Subject: |
[PATCH V7 26/29] chardev: cpr for simple devices |
Date: |
Wed, 22 Dec 2021 11:05:31 -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 ee2d47b..d47fa31 100644
--- a/chardev/char-mux.c
+++ b/chardev/char-mux.c
@@ -337,6 +337,7 @@ static void qemu_chr_open_mux(Chardev *chr,
*/
*be_opened = muxes_opened;
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 403da30..9410c16 100644
--- a/chardev/char-stdio.c
+++ b/chardev/char-stdio.c
@@ -114,9 +114,17 @@ static void qemu_chr_open_stdio(Chardev *chr,
stdio_allow_signal = !opts->has_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 3c14c6a..137deeb 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -3569,6 +3569,7 @@ int gdbserver_start(const char *device)
mon_chr = gdbserver_state.mon_chr;
reset_gdbserver_state();
}
+ mon_chr->reopen_on_cpr = true;
create_processes(&gdbserver_state);
diff --git a/include/chardev/char.h b/include/chardev/char.h
index 299e129..fc24d28 100644
--- a/include/chardev/char.h
+++ b/include/chardev/char.h
@@ -327,5 +327,6 @@ void resume_mux_open(void);
void qemu_chr_parse_vc(QemuOpts *opts, ChardevBackend *backend, Error **errp);
bool qemu_chr_is_cpr_capable(Error **errp);
+void qemu_term_exit(void);
#endif
diff --git a/migration/cpr.c b/migration/cpr.c
index 3bda83e..eb8ce2a 100644
--- a/migration/cpr.c
+++ b/migration/cpr.c
@@ -112,6 +112,7 @@ void qmp_cpr_exec(strList *args, Error **errp)
return;
}
vhost_dev_reset_all();
+ qemu_term_exit();
qemu_system_exec_request(args);
}
--
1.8.3.1
- [PATCH V7 04/29] migration: simplify savevm, (continued)
- [PATCH V7 04/29] migration: simplify savevm, Steve Sistare, 2021/12/22
- [PATCH V7 13/29] cpr: preserve extra state, Steve Sistare, 2021/12/22
- [PATCH V7 15/29] cpr: restart HMP interfaces, Steve Sistare, 2021/12/22
- [PATCH V7 17/29] pci: export functions for cpr, Steve Sistare, 2021/12/22
- [PATCH V7 20/29] vfio-pci: cpr part 2 (msi), Steve Sistare, 2021/12/22
- [PATCH V7 19/29] vfio-pci: cpr part 1 (fd and dma), Steve Sistare, 2021/12/22
- [PATCH V7 16/29] hostmem-memfd: cpr for memory-backend-memfd, Steve Sistare, 2021/12/22
- [PATCH V7 14/29] cpr: restart mode, Steve Sistare, 2021/12/22
- [PATCH V7 18/29] vfio-pci: refactor for cpr, Steve Sistare, 2021/12/22
- [PATCH V7 25/29] chardev: cpr framework, Steve Sistare, 2021/12/22
- [PATCH V7 26/29] chardev: cpr for simple devices,
Steve Sistare <=
- [PATCH V7 29/29] cpr: only-cpr-capable option, Steve Sistare, 2021/12/22
- [PATCH V7 21/29] vfio-pci: cpr part 3 (intx), Steve Sistare, 2021/12/22
- [PATCH V7 22/29] vfio-pci: recover from unmap-all-vaddr failure, Steve Sistare, 2021/12/22
- [PATCH V7 24/29] loader: suppress rom_reset during cpr, Steve Sistare, 2021/12/22
- [PATCH V7 23/29] vhost: reset vhost devices for cpr, Steve Sistare, 2021/12/22
- [PATCH V7 27/29] chardev: cpr for pty, Steve Sistare, 2021/12/22
- [PATCH V7 10/29] machine: memfd-alloc option, Steve Sistare, 2021/12/22
- [PATCH V7 08/29] memory: flat section iterator, Steve Sistare, 2021/12/22
- [PATCH V7 28/29] chardev: cpr for sockets, Steve Sistare, 2021/12/22