From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id 2DB6A5A061E; Fri, 07 Feb 2025 02:07:25 +0100 (CET) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH v11 2/9] fixup: Fix errors in modes that don't support migration Date: Fri, 7 Feb 2025 02:07:17 +0100 Message-ID: <20250207010724.3121569-3-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207010724.3121569-1-sbrivio@redhat.com> References: <20250207010724.3121569-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: YTIN2QWAC6GZSWXU5OHGJFXBQ5RHUQPH X-Message-ID-Hash: YTIN2QWAC6GZSWXU5OHGJFXBQ5RHUQPH X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: David Gibson Migration is only supported in vhost user mode. But, we need to initialise c->device_state_fd to -1 even in modes without migration so that migrate_handler() knows it doesn't have anything to do. Signed-off-by: David Gibson --- migrate.c | 1 - passt.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/migrate.c b/migrate.c index 669016e..b5d8754 100644 --- a/migrate.c +++ b/migrate.c @@ -156,7 +156,6 @@ static int migrate_target(struct ctx *c, int fd) */ void migrate_init(struct ctx *c) { - c->device_state_fd = -1; c->device_state_result = -1; } diff --git a/passt.c b/passt.c index fc93a76..935a69f 100644 --- a/passt.c +++ b/passt.c @@ -202,6 +202,7 @@ int main(int argc, char **argv) isolate_initial(argc, argv); c.pasta_netns_fd = c.fd_tap = c.pidfile_fd = -1; + c.device_state_fd = -1; sigemptyset(&sa.sa_mask); sa.sa_flags = 0; -- 2.43.0