qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrange" <berrange@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Jason Zeng" <jason.zeng@linux.intel.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Juan Quintela" <quintela@redhat.com>,
	"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
	"Eric Blake" <eblake@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Steve Sistare" <steven.sistare@oracle.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH V4 22/25] chardev: cpr for pty
Date: Tue,  6 Jul 2021 09:45:53 -0700	[thread overview]
Message-ID: <1625589956-81651-23-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1625589956-81651-1-git-send-email-steven.sistare@oracle.com>

Save and restore pty descriptors across cprsave and cprload.

Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
 chardev/char-pty.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/chardev/char-pty.c b/chardev/char-pty.c
index a2d1e7c..c91151d 100644
--- a/chardev/char-pty.c
+++ b/chardev/char-pty.c
@@ -30,6 +30,7 @@
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"
 #include "qemu/module.h"
+#include "qemu/env.h"
 #include "qemu/qemu-print.h"
 
 #include "chardev/char-io.h"
@@ -191,6 +192,7 @@ static void char_pty_finalize(Object *obj)
     Chardev *chr = CHARDEV(obj);
     PtyChardev *s = PTY_CHARDEV(obj);
 
+    unsetenv_fd(chr->label);
     pty_chr_state(chr, 0);
     object_unref(OBJECT(s->ioc));
     pty_chr_timer_cancel(s);
@@ -207,19 +209,28 @@ static void char_pty_open(Chardev *chr,
     char pty_name[PATH_MAX];
     char *name;
 
+    master_fd = getenv_fd(chr->label);
+    if (master_fd >= 0) {
+        chr->filename = g_strdup_printf("pty:unknown");
+        goto have_fd;
+    }
+
     master_fd = qemu_openpty_raw(&slave_fd, pty_name);
     if (master_fd < 0) {
         error_setg_errno(errp, errno, "Failed to create PTY");
         return;
     }
-
+    if (!chr->close_on_cpr) {
+        setenv_fd(chr->label, master_fd);
+    }
     close(slave_fd);
     qemu_set_nonblock(master_fd);
-
     chr->filename = g_strdup_printf("pty:%s", pty_name);
     qemu_printf("char device redirected to %s (label %s)\n",
                 pty_name, chr->label);
 
+have_fd:
+    qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_CPR);
     s = PTY_CHARDEV(chr);
     s->ioc = QIO_CHANNEL(qio_channel_file_new_fd(master_fd));
     name = g_strdup_printf("chardev-pty-%s", chr->label);
-- 
1.8.3.1



  parent reply	other threads:[~2021-07-06 17:11 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-06 16:45 [PATCH V4 00/25] Live Update Steve Sistare
2021-07-06 16:45 ` [PATCH V4 01/25] qemu_ram_volatile Steve Sistare
2021-07-06 16:45 ` [PATCH V4 02/25] cpr: reboot mode Steve Sistare
2021-07-06 16:45 ` [PATCH V4 03/25] cpr: QMP interfaces for reboot Steve Sistare
2021-07-06 16:45 ` [PATCH V4 04/25] cpr: HMP " Steve Sistare
2021-07-06 16:45 ` [PATCH V4 05/25] as_flat_walk Steve Sistare
2021-07-06 16:45 ` [PATCH V4 06/25] oslib: qemu_clr_cloexec Steve Sistare
2021-07-06 16:45 ` [PATCH V4 07/25] machine: memfd-alloc option Steve Sistare
2021-07-06 16:45 ` [PATCH V4 08/25] vl: add helper to request re-exec Steve Sistare
2021-07-06 16:45 ` [PATCH V4 09/25] string to strList Steve Sistare
2021-07-06 16:45 ` [PATCH V4 10/25] util: env var helpers Steve Sistare
2021-07-06 16:45 ` [PATCH V4 11/25] cpr: restart mode Steve Sistare
2021-07-06 16:45 ` [PATCH V4 12/25] cpr: QMP interfaces for restart Steve Sistare
2021-07-06 16:45 ` [PATCH V4 13/25] cpr: HMP " Steve Sistare
2021-07-06 16:45 ` [PATCH V4 14/25] pci: export functions for cpr Steve Sistare
2021-07-06 16:45 ` [PATCH V4 15/25] vfio-pci: refactor " Steve Sistare
2021-07-06 16:45 ` [PATCH V4 16/25] vfio-pci: cpr part 1 Steve Sistare
2021-07-06 16:45 ` [PATCH V4 17/25] vfio-pci: cpr part 2 Steve Sistare
2021-07-06 16:45 ` [PATCH V4 18/25] vhost: reset vhost devices upon cprsave Steve Sistare
2021-07-13 15:47   ` Michael S. Tsirkin
2021-07-06 16:45 ` [PATCH V4 19/25] hostmem-memfd: cpr support Steve Sistare
2021-07-06 16:45 ` [PATCH V4 20/25] chardev: cpr framework Steve Sistare
2021-07-06 16:45 ` [PATCH V4 21/25] chardev: cpr for simple devices Steve Sistare
2021-07-06 16:45 ` Steve Sistare [this message]
2021-07-06 16:45 ` [PATCH V4 23/25] chardev: cpr for sockets Steve Sistare
2021-07-06 16:45 ` [PATCH V4 24/25] cpr: only-cpr-capable option Steve Sistare
2021-07-06 16:45 ` [PATCH V4 25/25] simplify savevm Steve Sistare
2021-07-07 12:31 ` [PATCH V4 00/25] Live Update Marc-André Lureau
2021-07-07 12:36   ` Steven Sistare

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=1625589956-81651-23-git-send-email-steven.sistare@oracle.com \
    --to=steven.sistare@oracle.com \
    --cc=alex.bennee@linaro.org \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=berrange@redhat.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jason.zeng@linux.intel.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).