From patchwork Wed Apr 30 14:26:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 886042 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp883247wrq; Wed, 30 Apr 2025 07:27:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVAh25rsCCkS0+P9T9rPjqWa+gvVo3Vsgzug2pShKVFgngaflj5dyyxwNsPExLYERPkJ5b0dg==@linaro.org X-Google-Smtp-Source: AGHT+IGQGv2ofoqf8NjfCeYT/NU7YUcnd6cByPIgxocLE6slC+PygoHliHjfSmb4kOSJPvEnZ9nT X-Received: by 2002:a05:6102:c15:b0:4c4:e3c7:cc8e with SMTP id ada2fe7eead31-4dad4b611e0mr2104408137.24.1746023249264; Wed, 30 Apr 2025 07:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746023249; cv=none; d=google.com; s=arc-20240605; b=SIdRoTk5F67mU9FQkYQYYxGuy60Irvz3PY/+q9/vaRjH6zvP699KxfcW0lyHFE1uWb J04pRxV6MoH7Z2MNhWud26gm+jo3H9Kx0kvWZfMz6XKUa5fENxdECx0llEkmbR7UyK/7 TscOwVHt7DH1PFlZszhvxdYmBvlxytrB3HCnewOGt72Tmfs9JBKA0uSF1kfk2Sr3+o+O AjC/e35TcliDD5jIkiR7nkaWUe0DCQhWEUHoboOC0HzultgsKQWVW6b6to2cT29nLWs+ pj/Thw4d42hrgwv9pFQmYMoedqO5hTTG2wJd/zy0RzCDNqIU0hRw9MnVFOI52onL7Lxl Y2Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; fh=TqYEK5+2juc2mhgfaATFgi48YFwlNKK4yheibt76CUA=; b=bLeRDSoj3l1TbP4ZtReIfL8GLqSosE+KPgoe5e8wbgliVATmV3IfevgN44CUARfFJF TrP+F2jt6MKyd7NEdSgxGKG7IMuwbL06/Gu2sVb43RdmQSiLujxomoeCL8q8o3gnYPHk rlB8g+ntFZz89ybvdj6v7UFOfnrkh4Xi6k6RvyH0pr+oJ7n75/BVvohiZJmcWeZzWnnR ug1amYx16cLSH0mtHxsh2nNFKqT0W18sNdtECkxPMJCVEDf+El8OysDdApbgEVIxFALA lOdc69R7p2YsahBMuttMIqSF2iM6yz+1gRiR+dPmDNfT79h9jq+CQKC/yOamxdzVnTer /54g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XJXNs4g4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ada2fe7eead31-4dad40dce5esi408211137.167.2025.04.30.07.27.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 07:27:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XJXNs4g4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uA8PG-0001fW-Cb; Wed, 30 Apr 2025 10:27:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uA8Oi-0001Hp-FU for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:27:01 -0400 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uA8Og-00077b-CZ for qemu-devel@nongnu.org; Wed, 30 Apr 2025 10:26:51 -0400 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7c59e7039eeso1002332985a.2 for ; Wed, 30 Apr 2025 07:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746023209; x=1746628009; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; b=XJXNs4g4/CECHEBVM94ehfMQKXmcE+Sn2jz7SrpxonivDIN/DwCbjAgZv38YRPmGPM j8m1m/A88SDGi2/XXxRPWuxjiqqf5sdnPIHQoc7jMSCSDY3dT7KoGhDUYStpZeMzrsJZ 1t0pH6+YyOZVVbaqKTchicolgKnYGnL7g8zDBNqHQpSCWoc8p8IBylcyhuvHLfQ83MEh YIunNBlvbf8oTVdniKqeFTBcCxzX6HPLkXaj4Xn7xKuwZcxu/wRGqvSyU87aHBsa2hGn ENbwgW65e8CJ9BwHpl33uyrT9xZWiD5lZdVu+Ucr2hG23xk1SxnnkE1a4WQ6E9RrG0tm J+jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746023209; x=1746628009; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/F9wfO6J1RL2avC/Q42x6BrmpISj7RT0yS78rOyo2P0=; b=lJHv6Wx+bkQ1O3zJy/wrLsIE+lOxiz/e8T14yuc9buKX8kd+lTk49f+15Ypgd/5Pg7 OC5qmPtYaRDRzBMNLZMX6fMectOCNeyEcsd8T1+ugY1Z/Vew32MJq7qjUhnObq3DopGT FBT7SxE/fXF0hCPUU7SQoZisjlO77YTj8Ttvs9n9MrOu3Ku6BGqcMjupmQAl7ZxJrh5x 6fyjkxlOXxq5Vm3Y+GPDeCbXzayVcKpV4MR08a46XOUuQoTkRqgCRgPoZZaLHjffrpDe r6WSkQLBjY1A8hbwTsttHDCT27RHZ/LEOpRWScTR3SzRp7cFUjU2sC53Y9rBzq1JOAlD vHQQ== X-Gm-Message-State: AOJu0Yyrgzz06EEVasffm42ujor0v6i8tC3PqMl+wxwzimS9vvU9Udqu 2pDxvKZW0/v4aHcn+Mtfi7omETf6KDvlJD3zdz4MLr2m50WgBAKr1bKKazgmhtaKoyVq8C8eRud b X-Gm-Gg: ASbGnct5tZJPaaVyeYZOF17d8RdAstMRTwPYtzKGWULZz25tDKAeLf+VsZLb9/NpsTr +jA3crnpfA+f0qmT6ZFoo8Y6YYhiw3tE1QVyhXKaV1Rqq1kPGRwwyJC2pPBpTJU/nG4nTTjXV0E Bfnl3npUC30PGWrOmEnrrCKgMctId8dOJWvCmrc65xeP8OwxzrO1l1LPvA129e6pBir7HBVwxuS PZOFDM/3EnB3iiWGxGSfI8KYpysBAwCKZHfKO1irCkW7z1QlFUs39pbp0d4vH+H8S02L4yVeIpu cLaH43oxn2w1dQcvlEBjlUVfBjDCJvwl3UhTrzG3FfxbH2PXSr4aijp6ENbDKeCdciM6xO5n9GN /r9I1AEAAwYVIQOg= X-Received: by 2002:a05:620a:29d3:b0:7c5:a2f8:e6e4 with SMTP id af79cd13be357-7cac7e1db3amr389000785a.29.1746023208843; Wed, 30 Apr 2025 07:26:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c958cbe447sm861896785a.46.2025.04.30.07.26.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 30 Apr 2025 07:26:48 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Cl=C3=A9ment_Mathieu--Dri?= =?utf-8?q?f?= , Amit Shah , Jason Wang , =?utf-8?q?Da?= =?utf-8?q?niel_P_=2E_Berrang=C3=A9?= , Yi Liu , Thomas Huth , Laurent Vivier , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH 4/5] hw/char/virtio-serial: Do not expose the 'emergency-write' property Date: Wed, 30 Apr 2025 16:26:08 +0200 Message-ID: <20250430142609.84134-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250430142609.84134-1-philmd@linaro.org> References: <20250430142609.84134-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::736; envelope-from=philmd@linaro.org; helo=mail-qk1-x736.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The VIRTIO_CONSOLE_F_EMERG_WRITE feature bit was only set in the hw_compat_2_7[] array, via the 'emergency-write=off' property. We removed all machines using that array, lets remove that property. All instances have this feature bit set and it can not be disabled. Signed-off-by: Philippe Mathieu-Daudé --- hw/char/virtio-serial-bus.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c index eb79f5258b6..31bd1b7535d 100644 --- a/hw/char/virtio-serial-bus.c +++ b/hw/char/virtio-serial-bus.c @@ -1019,6 +1019,13 @@ static void virtser_port_device_unrealize(DeviceState *dev) } } +static void virtio_serial_instance_init(Object *obj) +{ + VirtIOSerial *vser = VIRTIO_SERIAL(obj); + + vser->host_features |= BIT_ULL(VIRTIO_CONSOLE_F_EMERG_WRITE); +} + static void virtio_serial_device_realize(DeviceState *dev, Error **errp) { VirtIODevice *vdev = VIRTIO_DEVICE(dev); @@ -1155,8 +1162,6 @@ static const VMStateDescription vmstate_virtio_console = { static const Property virtio_serial_properties[] = { DEFINE_PROP_UINT32("max_ports", VirtIOSerial, serial.max_virtserial_ports, 31), - DEFINE_PROP_BIT64("emergency-write", VirtIOSerial, host_features, - VIRTIO_CONSOLE_F_EMERG_WRITE, true), }; static void virtio_serial_class_init(ObjectClass *klass, const void *data) @@ -1186,6 +1191,7 @@ static void virtio_serial_class_init(ObjectClass *klass, const void *data) static const TypeInfo virtio_device_info = { .name = TYPE_VIRTIO_SERIAL, .parent = TYPE_VIRTIO_DEVICE, + .instance_init = virtio_serial_instance_init, .instance_size = sizeof(VirtIOSerial), .class_init = virtio_serial_class_init, .interfaces = (const InterfaceInfo[]) {