From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=pass (2048-bit key; secure) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202502 header.b=T47CjLwy; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 74F995A0275 for ; Thu, 06 Feb 2025 06:50:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202502; t=1738820984; bh=zb5OY0HwNS3/7HLU+u3L+djquzPMM/f856TPUxpHOEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T47CjLwybsZtAgApvHGe3qg4TP16C/uwhaA8cT3dKk8kUwW3XhPjDOXj1SHNjC8tV ml+I0m0a5A5MLx6Zwyff8t1l/KGSFE2KzS3lm39SJkbl3P36dkkMTB3vtlCYO4e/4F yRr9egd+OX3h3WK+OP6JWJaDoMZ0iGLjPk7PNrIP1Ubc+r8WZbOi0Ypxu+A8jLFXsP iQzU7IngaWSLdvKft5tnLz69UuMIVOAq7+v3o1ko+gTQldpAlnJ/JbIroU5co4tWoO JbIlfkornlN80FeMfr4TeXXsd0M3LZe+eDTXzeiCb5j6sGW9WLqkzgkgbyoX6KDMlr ymNYy14JntAwA== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4YpR543mx3z4wcr; Thu, 6 Feb 2025 16:49:44 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH v10 03/10] fixup: Fix errors in modes that don't support migration Date: Thu, 6 Feb 2025 16:49:44 +1100 Message-ID: <20250206054951.1041610-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250206054951.1041610-1-david@gibson.dropbear.id.au> References: <20250206054951.1041610-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: W63VARXJ55YOZW7I6JTNGLBRTV6B6AN2 X-Message-ID-Hash: W63VARXJ55YOZW7I6JTNGLBRTV6B6AN2 X-MailFrom: dgibson@gandalf.ozlabs.org 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: 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 669016e1..b5d87547 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 fc93a765..935a69f1 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.48.1