From nobody Sun Nov 24 17:47:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1720943398; cv=none; d=zohomail.com; s=zohoarc; b=KYbzZ/Tu3tgtrsG1m1AIq5QVQB1pHbLBVJa1jS+4k7jucBenYmO8J21YRWZHJY7rqFVoBQxfLj3BiSbPhP+nPkqdnUOz5ndf16Y+0rgo+3tHfnWmMJyRkdKdVV2C1rylbkTQpaN8hgnMAEDpZVNgjwlQubPMve80032Dfq08bR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720943398; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iUYzEcnP1I3fIISMCAmJ4EzGqqLnO8BreYmG+l4tYic=; b=h7ZzN1ya6aWOPB0CEPX9v6yNiVIttW/oEYuHi0l9Tx55yvughUsUpK+lnuge3HJCsVNpMIiENUOe1GYCfHjIgN69Z4rXrDr2qcooSjUMAHyVo7gW0hdwkoenhiFebXNzrtEg72+Lhry4Xy8S7BGvGtsRN59AuYUYRgVLYE828UA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 172094339826317.051419121714503; Sun, 14 Jul 2024 00:49:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sStyj-0004pA-4z; Sun, 14 Jul 2024 03:49:05 -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 1sStyh-0004nZ-Lj for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:03 -0400 Received: from mail-yw1-x112b.google.com ([2607:f8b0:4864:20::112b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sStyf-0007eC-GJ for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:03 -0400 Received: by mail-yw1-x112b.google.com with SMTP id 00721157ae682-65fcf21002dso7360547b3.0 for ; Sun, 14 Jul 2024 00:49:01 -0700 (PDT) Received: from localhost ([157.82.204.135]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-70b7ebb66b8sm2199455b3a.52.2024.07.14.00.48.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Jul 2024 00:48:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1720943340; x=1721548140; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=iUYzEcnP1I3fIISMCAmJ4EzGqqLnO8BreYmG+l4tYic=; b=Z2Jov9x9rpGDWYiHFF1fw8HhoEmjHsY1ww3//FhMiaYG34jTTKihJePhRbSmO5VnVu V2dYJwzl+BfGRZb6f/ZbpFSd/SRZ9vyT2jTGn+FuQ2uZLVo/4Q0lszBBSTF6VsVFaYPR dcYk82cINhlJ6D9s7iPRCniNodOLoGlJf9EaAthWQo5AY+34HrsXm0gFBDQR7h+rKTIo LSDoYMKbKIdDtnVWaTCd90YP3PGbih1jJvC/9OJR9zLHDRm1EiPR+pjq+s0IsJZ/g9/W DMhLa6r+0Unf9Trz9lNk1n5mLjgWz3bue3JzbVyWhbhnSOLNgUETy/QMrZXg8DeM/JK6 bwOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720943340; x=1721548140; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iUYzEcnP1I3fIISMCAmJ4EzGqqLnO8BreYmG+l4tYic=; b=SRsyQVBCPha23QX8jMyY05fykuU8yXRc1fTvNRVJPbzIaEuAaSZ+8zkOCVpUWuqM90 pSOgo7YB8HyJN11kjlTirfFX4O0PRWa3yHhf6rQJipHUBnHQvqhaqUGXa7fhXzNyhck5 ehXtSHelgV5UA4fEtitBPf8wLGb76ncVfrf78kJbou7Oje/Y/EEbK0A8eofFtgvAmdBL AUS1rBUdNk9tpshfdWOe0nR+WUH2Pe1sCdDezG+rlyiygteO/PQSQcTh0TlJKiI1sLNc FkHoblt7l/WQX/bi/Xw36M7Fxo3fwRhzoo/fcsbWiqx/5F7KAccmcu4ieb5q2aYMAPeB kmHA== X-Gm-Message-State: AOJu0Yy8NOq2fDQphki0ec18QZSzzxR+tOwHHQU5KrBi1vZK7ySDaZYd CgOZCNvM0hwzHAkbxBUXirugV6Fn5nYRF2tQ08f+laHcyXF731TFVeZAH5BEwbI= X-Google-Smtp-Source: AGHT+IFNp1jWibAMstpywqXLVPrejfhRCh/jR56Yu0Dt2JQlfBIxoJST+P3jhnoPzndVVDaRJCCLFw== X-Received: by 2002:a05:690c:7442:b0:64b:9f5f:67b2 with SMTP id 00721157ae682-658ef24c009mr194049447b3.31.1720943340142; Sun, 14 Jul 2024 00:49:00 -0700 (PDT) From: Akihiko Odaki Date: Sun, 14 Jul 2024 16:48:31 +0900 Subject: [PATCH v2 1/4] qapi: Add visit_type_str_preserving() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240714-rombar-v2-1-af1504ef55de@daynix.com> References: <20240714-rombar-v2-0-af1504ef55de@daynix.com> In-Reply-To: <20240714-rombar-v2-0-af1504ef55de@daynix.com> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen , Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::112b; envelope-from=akihiko.odaki@daynix.com; helo=mail-yw1-x112b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1720943399946116600 visit_type_str_preserving() is mostly indentical with visit_type_str() but leaves the value intact. This is useful when the caller may interpret the value with a different type. Signed-off-by: Akihiko Odaki --- include/qapi/visitor-impl.h | 3 ++- include/qapi/visitor.h | 20 ++++++++++++++++++++ qapi/opts-visitor.c | 7 +++++-- qapi/qapi-clone-visitor.c | 2 +- qapi/qapi-dealloc-visitor.c | 4 ++-- qapi/qapi-forward-visitor.c | 4 +++- qapi/qapi-visit-core.c | 17 +++++++++++++++-- qapi/qobject-input-visitor.c | 23 ++++++++++++----------- qapi/qobject-output-visitor.c | 2 +- qapi/string-input-visitor.c | 2 +- qapi/string-output-visitor.c | 2 +- 11 files changed, 63 insertions(+), 23 deletions(-) diff --git a/include/qapi/visitor-impl.h b/include/qapi/visitor-impl.h index 2badec5ba460..7b61f55995b5 100644 --- a/include/qapi/visitor-impl.h +++ b/include/qapi/visitor-impl.h @@ -95,7 +95,8 @@ struct Visitor bool (*type_bool)(Visitor *v, const char *name, bool *obj, Error **err= p); =20 /* Must be set */ - bool (*type_str)(Visitor *v, const char *name, char **obj, Error **err= p); + bool (*type_str)(Visitor *v, const char *name, char **obj, bool consum= e, + Error **errp); =20 /* Must be set to visit numbers */ bool (*type_number)(Visitor *v, const char *name, double *obj, diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index 27b85d4700f2..b3ae3188edfb 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -654,6 +654,26 @@ bool visit_type_bool(Visitor *v, const char *name, boo= l *obj, Error **errp); */ bool visit_type_str(Visitor *v, const char *name, char **obj, Error **errp= ); =20 +/* + * Visit a string value but do not consume it. + * + * @name expresses the relationship of this string to its parent + * container; see the general description of @name above. + * + * @obj must be non-NULL. Input and clone visitors set *@obj to the + * value (always using "" rather than NULL for an empty string). + * Other visitors leave *@obj unchanged, and commonly treat NULL like + * "". + * + * This function must be called only with an input visitor. + * + * This is mostly identical with visit_type_str() but leaves the value int= act. + * This is useful when the caller may interpret the value with a different + * type. + */ +bool visit_type_str_preserving(Visitor *v, const char *name, char **obj, + Error **errp); + /* * Visit a number (i.e. double) value. * diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 3d1a28b41918..e9fad756e189 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -347,7 +347,8 @@ processed(OptsVisitor *ov, const char *name) =20 =20 static bool -opts_type_str(Visitor *v, const char *name, char **obj, Error **errp) +opts_type_str(Visitor *v, const char *name, char **obj, bool consume, + Error **errp) { OptsVisitor *ov =3D to_ov(v); const QemuOpt *opt; @@ -363,7 +364,9 @@ opts_type_str(Visitor *v, const char *name, char **obj,= Error **errp) * valid enum value; this is harmless because tracking what gets * consumed only matters to visit_end_struct() as the final error * check if there were no other failures during the visit. */ - processed(ov, name); + if (consume) { + processed(ov, name); + } return true; } =20 diff --git a/qapi/qapi-clone-visitor.c b/qapi/qapi-clone-visitor.c index bbf953698f38..90e6641835a7 100644 --- a/qapi/qapi-clone-visitor.c +++ b/qapi/qapi-clone-visitor.c @@ -108,7 +108,7 @@ static bool qapi_clone_type_bool(Visitor *v, const char= *name, bool *obj, } =20 static bool qapi_clone_type_str(Visitor *v, const char *name, char **obj, - Error **errp) + bool consume, Error **errp) { QapiCloneVisitor *qcv =3D to_qcv(v); =20 diff --git a/qapi/qapi-dealloc-visitor.c b/qapi/qapi-dealloc-visitor.c index ef283f296601..6b0f957047d5 100644 --- a/qapi/qapi-dealloc-visitor.c +++ b/qapi/qapi-dealloc-visitor.c @@ -62,9 +62,9 @@ static void qapi_dealloc_end_list(Visitor *v, void **obj) } =20 static bool qapi_dealloc_type_str(Visitor *v, const char *name, char **obj, - Error **errp) + bool consume, Error **errp) { - if (obj) { + if (obj && consume) { g_free(*obj); } return true; diff --git a/qapi/qapi-forward-visitor.c b/qapi/qapi-forward-visitor.c index e36d9bc9ba7e..891282e0c3b3 100644 --- a/qapi/qapi-forward-visitor.c +++ b/qapi/qapi-forward-visitor.c @@ -180,6 +180,7 @@ static bool forward_field_type_bool(Visitor *v, const c= har *name, bool *obj, } =20 static bool forward_field_type_str(Visitor *v, const char *name, char **ob= j, + bool consume, Error **errp) { ForwardFieldVisitor *ffv =3D to_ffv(v); @@ -187,7 +188,8 @@ static bool forward_field_type_str(Visitor *v, const ch= ar *name, char **obj, if (!forward_field_translate_name(ffv, &name, errp)) { return false; } - return visit_type_str(ffv->target, name, obj, errp); + return (consume ? visit_type_str : visit_type_str_preserving)( + ffv->target, name, obj, errp); } =20 static bool forward_field_type_size(Visitor *v, const char *name, uint64_t= *obj, diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 6c13510a2bc7..89b52fc99202 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -336,7 +336,8 @@ bool visit_type_bool(Visitor *v, const char *name, bool= *obj, Error **errp) return v->type_bool(v, name, obj, errp); } =20 -bool visit_type_str(Visitor *v, const char *name, char **obj, Error **errp) +static bool visit_type_str_common(Visitor *v, const char *name, char **obj, + bool consume, Error **errp) { bool ok; =20 @@ -346,13 +347,25 @@ bool visit_type_str(Visitor *v, const char *name, cha= r **obj, Error **errp) assert(!(v->type & VISITOR_OUTPUT) || *obj); */ trace_visit_type_str(v, name, obj); - ok =3D v->type_str(v, name, obj, errp); + ok =3D v->type_str(v, name, obj, consume, errp); if (v->type & VISITOR_INPUT) { assert(ok !=3D !*obj); } return ok; } =20 +bool visit_type_str(Visitor *v, const char *name, char **obj, Error **errp) +{ + return visit_type_str_common(v, name, obj, true, errp); +} + +bool visit_type_str_preserving(Visitor *v, const char *name, char **obj, + Error **errp) +{ + assert(v->type & VISITOR_INPUT); + return visit_type_str_common(v, name, obj, false, errp); +} + bool visit_type_number(Visitor *v, const char *name, double *obj, Error **errp) { diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c index f110a804b2ae..facbbf01bd27 100644 --- a/qapi/qobject-input-visitor.c +++ b/qapi/qobject-input-visitor.c @@ -174,13 +174,13 @@ static QObject *qobject_input_get_object(QObjectInput= Visitor *qiv, } =20 static const char *qobject_input_get_keyval(QObjectInputVisitor *qiv, - const char *name, + const char *name, bool consume, Error **errp) { QObject *qobj; QString *qstr; =20 - qobj =3D qobject_input_get_object(qiv, name, true, errp); + qobj =3D qobject_input_get_object(qiv, name, consume, errp); if (!qobj) { return NULL; } @@ -416,7 +416,7 @@ static bool qobject_input_type_int64_keyval(Visitor *v,= const char *name, int64_t *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - const char *str =3D qobject_input_get_keyval(qiv, name, errp); + const char *str =3D qobject_input_get_keyval(qiv, name, true, errp); =20 if (!str) { return false; @@ -467,7 +467,7 @@ static bool qobject_input_type_uint64_keyval(Visitor *v= , const char *name, uint64_t *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - const char *str =3D qobject_input_get_keyval(qiv, name, errp); + const char *str =3D qobject_input_get_keyval(qiv, name, true, errp); =20 if (!str) { return false; @@ -507,7 +507,7 @@ static bool qobject_input_type_bool_keyval(Visitor *v, = const char *name, bool *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - const char *str =3D qobject_input_get_keyval(qiv, name, errp); + const char *str =3D qobject_input_get_keyval(qiv, name, true, errp); =20 if (!str) { return false; @@ -522,10 +522,10 @@ static bool qobject_input_type_bool_keyval(Visitor *v= , const char *name, } =20 static bool qobject_input_type_str(Visitor *v, const char *name, char **ob= j, - Error **errp) + bool consume, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - QObject *qobj =3D qobject_input_get_object(qiv, name, true, errp); + QObject *qobj =3D qobject_input_get_object(qiv, name, consume, errp); QString *qstr; =20 *obj =3D NULL; @@ -544,10 +544,11 @@ static bool qobject_input_type_str(Visitor *v, const = char *name, char **obj, } =20 static bool qobject_input_type_str_keyval(Visitor *v, const char *name, - char **obj, Error **errp) + char **obj, bool consume, + Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - const char *str =3D qobject_input_get_keyval(qiv, name, errp); + const char *str =3D qobject_input_get_keyval(qiv, name, consume, errp); =20 *obj =3D g_strdup(str); return !!str; @@ -578,7 +579,7 @@ static bool qobject_input_type_number_keyval(Visitor *v= , const char *name, double *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - const char *str =3D qobject_input_get_keyval(qiv, name, errp); + const char *str =3D qobject_input_get_keyval(qiv, name, true, errp); double val; =20 if (!str) { @@ -635,7 +636,7 @@ static bool qobject_input_type_size_keyval(Visitor *v, = const char *name, uint64_t *obj, Error **errp) { QObjectInputVisitor *qiv =3D to_qiv(v); - const char *str =3D qobject_input_get_keyval(qiv, name, errp); + const char *str =3D qobject_input_get_keyval(qiv, name, true, errp); =20 if (!str) { return false; diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index 74770edd73c6..36a9fc245b79 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -173,7 +173,7 @@ static bool qobject_output_type_bool(Visitor *v, const = char *name, bool *obj, } =20 static bool qobject_output_type_str(Visitor *v, const char *name, char **o= bj, - Error **errp) + bool consume, Error **errp) { QObjectOutputVisitor *qov =3D to_qov(v); if (*obj) { diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c index 3f1b9e9b4137..6562bbe3cfd4 100644 --- a/qapi/string-input-visitor.c +++ b/qapi/string-input-visitor.c @@ -336,7 +336,7 @@ static bool parse_type_bool(Visitor *v, const char *nam= e, bool *obj, } =20 static bool parse_type_str(Visitor *v, const char *name, char **obj, - Error **errp) + bool consume, Error **errp) { StringInputVisitor *siv =3D to_siv(v); =20 diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c index 5115536b1539..9a8cca0d5c68 100644 --- a/qapi/string-output-visitor.c +++ b/qapi/string-output-visitor.c @@ -269,7 +269,7 @@ static bool print_type_bool(Visitor *v, const char *nam= e, bool *obj, } =20 static bool print_type_str(Visitor *v, const char *name, char **obj, - Error **errp) + bool consume, Error **errp) { StringOutputVisitor *sov =3D to_sov(v); char *out; --=20 2.45.2 From nobody Sun Nov 24 17:47:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1720943398; cv=none; d=zohomail.com; s=zohoarc; b=jD9NrZQpJ9f9uVyoq+mGf5VDhiQnTOD7uLoFzwMZsVHLzYn38C8h0u1iLUPBHYBtWdbOoSn/slpjSjxmQtZ0Mnq7/fGg2KRFiARYPP9aHTvHlILgRdYrPiEba0QEQ0MKwJfesNdkMovViIMbDa+z7Xg4V06zTCwqdgL9hDQgSM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720943398; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=jiaYdGJdtPWsnfbPGe8XqhPOhb333O5wAJMSGqRo6p4=; b=dAROafcfyxBWqcKEP/9WJfPv+T14K/35CHPGBlokXVIcByYiYfV5QAGBKsp56kHMMs6oUl/ANfowE+4ocgo6hfInA9XVcMkG2MivgDiQ9UaV0TSYl8278UgPmzcW5yNCwSVwn+r0qdin755wZCsAgFIhlFq1DPl1H4yGjh5G/Ec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1720943398423570.0780174223219; Sun, 14 Jul 2024 00:49:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sStyp-00056I-22; Sun, 14 Jul 2024 03:49:11 -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 1sStyl-00050P-Vr for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:09 -0400 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sStyk-0007ep-EL for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:07 -0400 Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-7f684af6af1so182689539f.2 for ; Sun, 14 Jul 2024 00:49:06 -0700 (PDT) Received: from localhost ([157.82.204.135]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-1fc0bb73f45sm19877665ad.13.2024.07.14.00.49.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Jul 2024 00:49:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1720943345; x=1721548145; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=jiaYdGJdtPWsnfbPGe8XqhPOhb333O5wAJMSGqRo6p4=; b=T5UKe5fBpg9TLgDv9On6XoxnDE7/2W1YlEugvrnrI0/+5XklS5flkLkIzzhwayrqDT cXMpzQFboC9IFq+IDA+qJw3uN7rjNsKMsSnOXo7IRDjGlcJQ8TTcSNvRivvE25gssQV9 vXaRbQEPAi//ZwHzyNh37wjnMS18bxQv/Aqt9Xq+badvtZDA+HAihz5dLNwhlCOaQI2X 3aJaRCcAjxpZ+HDslk7GohSdP2kf9yj5Q6MqLzEyPKNcpuVPqDITp34Cgy1GtalYwj42 iYqiZ13sgDKRd9O8IhSjuT0OwIc8YYYkyF+NU1x4hpumMw2DtVLG/gKEWgifsXbPgv1o BpPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720943345; x=1721548145; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jiaYdGJdtPWsnfbPGe8XqhPOhb333O5wAJMSGqRo6p4=; b=PF7zwmwDysFcyjUUwVYwy0SybkVPTy4UTkmJ1SKjYAm5hs1t8PNnXiyw9aVcWndnua 59XFJv0AN85aaG2XMQQJOqQXy2yJzOgbWz53CQBlh37TaGZvFbPi5lSKaaiKp+APgGbh R9/skShB3nPfU6jIwERYNKaJNwGPgLHZanuyDWz5DfKuV+r34109xWqO+RNaxAte3p57 f2BDucF1QxQ5gBkrlp4wL10pW9dwcXWrjzZY4oMEDYxpSoG10e+jK9k9bGXCgh4JhrBr 5WedaYAFkboMHJR6apTwmnCHETq/xzFnYXyNy9PnsGUkAyOMXrfZw1a8yc/1EaoDCKCR vjeA== X-Gm-Message-State: AOJu0YxMT5QgV1NYtViF5KUrKHoZkfwbBP1E2R9HQupY49dGGb3Yi+6t Iy7y/YMSu+6zsfMmS86xH6mwVckNQGP3ms1kBF6X4tFW3+0N7col+CvBNEG1BQY= X-Google-Smtp-Source: AGHT+IGeyT9Io5WCPCLinwvALS4/z429E0AdR3OuBJQgaQ8pTSd42NePCPmMkJmKNnJowZIOUw0IaQ== X-Received: by 2002:a05:6e02:b49:b0:383:284:113 with SMTP id e9e14a558f8ab-38a57214449mr215364005ab.4.1720943345127; Sun, 14 Jul 2024 00:49:05 -0700 (PDT) From: Akihiko Odaki Date: Sun, 14 Jul 2024 16:48:32 +0900 Subject: [PATCH v2 2/4] qapi: Do not consume a value when visit_type_enum() fails MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240714-rombar-v2-2-af1504ef55de@daynix.com> References: <20240714-rombar-v2-0-af1504ef55de@daynix.com> In-Reply-To: <20240714-rombar-v2-0-af1504ef55de@daynix.com> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen , Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::d35; envelope-from=akihiko.odaki@daynix.com; helo=mail-io1-xd35.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1720943399930116600 Consuming a value when visit_type_enum() fails makes it impossible to reinterpret the value with a different type. Signed-off-by: Akihiko Odaki --- include/qapi/visitor.h | 5 ----- qapi/opts-visitor.c | 5 ----- qapi/qapi-visit-core.c | 4 +++- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h index b3ae3188edfb..8e841b26428b 100644 --- a/include/qapi/visitor.h +++ b/include/qapi/visitor.h @@ -513,11 +513,6 @@ void visit_set_policy(Visitor *v, CompatPolicy *policy= ); * is an input visitor. * * Return true on success, false on failure. - * - * May call visit_type_str() under the hood, and the enum visit may - * fail even if the corresponding string visit succeeded; this implies - * that an input visitor's visit_type_str() must have no unwelcome - * side effects. */ bool visit_type_enum(Visitor *v, const char *name, int *obj, const QEnumLookup *lookup, Error **errp); diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index e9fad756e189..d83434b95a56 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -359,11 +359,6 @@ opts_type_str(Visitor *v, const char *name, char **obj= , bool consume, return false; } *obj =3D g_strdup(opt->str ? opt->str : ""); - /* Note that we consume a string even if this is called as part of - * an enum visit that later fails because the string is not a - * valid enum value; this is harmless because tracking what gets - * consumed only matters to visit_end_struct() as the final error - * check if there were no other failures during the visit. */ if (consume) { processed(ov, name); } diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 89b52fc99202..1137d472290b 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -411,7 +411,7 @@ static bool input_type_enum(Visitor *v, const char *nam= e, int *obj, int64_t value; g_autofree char *enum_str =3D NULL; =20 - if (!visit_type_str(v, name, &enum_str, errp)) { + if (!visit_type_str_preserving(v, name, &enum_str, errp)) { return false; } =20 @@ -430,6 +430,8 @@ static bool input_type_enum(Visitor *v, const char *nam= e, int *obj, return false; } =20 + enum_str =3D NULL; + visit_type_str(v, name, &enum_str, &error_abort); *obj =3D value; return true; } --=20 2.45.2 From nobody Sun Nov 24 17:47:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1720943365; cv=none; d=zohomail.com; s=zohoarc; b=WNV1myHwiGz2mFQkTZvRbRoqCuemvOADHdANabuTq8VT8r3j/Ate8L5Pc8g7J3sWdX3GvB3aWiLOERwDa5praRwYHLHIbIPhlQGfDJ2rGwFQNE5kCWiVIEo3iJ9wCJblbXorOVUU4ZDnD0HlarFRfyHXbeoeOCQIS3SRX8/2zEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720943365; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=98E8dJlFqRnilc3EcOnsbhM2ggIX+Do5H9shCOBykdE=; b=n5CRbGGlHf7+3/d7v3Xyyd2SUu/TvULOQ8zvwA/Sj+ZP/l/gGdAbB6vjFAdRxZ3BoJ+rp20LjMMkVS7/uMUQHr/4wsXP3gl2yejcPgCZLM/ikx7S82LcWSHOuSIgD2FaAWHbieFmAiqIoltx6WscEq6DrdlpCcl6b83pqNKYuz8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1720943365520993.058088300063; Sun, 14 Jul 2024 00:49:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sStyv-0005LI-Jj; Sun, 14 Jul 2024 03:49:18 -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 1sStyr-0005Hw-IR for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:14 -0400 Received: from mail-ua1-x933.google.com ([2607:f8b0:4864:20::933]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sStyp-0007fJ-5i for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:13 -0400 Received: by mail-ua1-x933.google.com with SMTP id a1e0cc1a2514c-810418672f9so1213498241.1 for ; Sun, 14 Jul 2024 00:49:10 -0700 (PDT) Received: from localhost ([157.82.204.135]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-70b7eb9c856sm2211238b3a.4.2024.07.14.00.49.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Jul 2024 00:49:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1720943350; x=1721548150; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=98E8dJlFqRnilc3EcOnsbhM2ggIX+Do5H9shCOBykdE=; b=Mql1bZ8HFmW4bYLuO7u80idpwaOoPIs8+ptKDHVfDjrMXklcWQZ85dwi+2sDN+lFLu pnM/SwnVkgmLmeRJWtN+i1RUujbJWXFMK1DGCCd7ry7EsTSt8nsDyTn4EE1g1BXz2r7p ilQXgQG7NO5DsrYRK23wdzP6/+R9Pn9gMOz3BnXlgaYuUQpdKt9W/G2O3XeGGrOS2MHv u9xsmTjI2Muyk6FGYUzH0zMAdr+GEtPZYXvKrIL+j4/RUgqfuCNXySkGlQsecSdut/7c 2bWQfdL6igjNVkFQZm836M4GtFyga5UoQWvqJUtWV8adBFnfWQMCz5iPZGB6w6v6s/Jo 4lfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720943350; x=1721548150; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=98E8dJlFqRnilc3EcOnsbhM2ggIX+Do5H9shCOBykdE=; b=q1OfeSH9fvHs51tubafnFQvmZaQOBXeZcsgH2zGondD/waDRjccdTNJCj/ZsZcoyyM J1jnlA73x5m9MU+uiPjhKKo4Ya/K09ubaholPsNVksuPEdyUQwpxodeq4YYha7maVYK0 9spIaibB6YsyXn6bFBVjz1zjxVWwCi29E6mgSlZcA8NjjwXwOB/zesTmGaBTevvj/RvT TksRLQ1NAMYCljTNAo+F10pcAUAmI5o8TjBnsorEhQ3W/2LmANwskIJDnrbCyLsWUhO+ 6JRAC0XdLzHsEbPMfdXjrNE6+rPsHVMlHTeg6iUZQx9bH5VH3in+METt0NrwQPQQft7m Li7w== X-Gm-Message-State: AOJu0YziUkD6CurjQSHPSD/mfIFJ5udSbEBBoYkoTbpxkkcHYUCW1v+S 4KVIeQwA8ysnBlwQ1SxmoQu16QEsPmK34asDGZ/tCEN7eBh2O+ZX/P58UPfBeaI= X-Google-Smtp-Source: AGHT+IFHRqceqA90G09KSQ0EhV+eyEA9xYfaE5iTpHjEDPo2TmkBZcHB6d7yj1i3X1jb4IrN3nknXQ== X-Received: by 2002:a05:6102:3e84:b0:491:110e:cb03 with SMTP id ada2fe7eead31-491110ece05mr11502911137.32.1720943349951; Sun, 14 Jul 2024 00:49:09 -0700 (PDT) From: Akihiko Odaki Date: Sun, 14 Jul 2024 16:48:33 +0900 Subject: [PATCH v2 3/4] hw/pci: Convert rom_bar into OnOffAuto MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240714-rombar-v2-3-af1504ef55de@daynix.com> References: <20240714-rombar-v2-0-af1504ef55de@daynix.com> In-Reply-To: <20240714-rombar-v2-0-af1504ef55de@daynix.com> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen , Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::933; envelope-from=akihiko.odaki@daynix.com; helo=mail-ua1-x933.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1720943367062116600 rom_bar is tristate but was defined as uint32_t so convert it into OnOffAuto to clarify that. For compatibility, a uint32 value set via QOM will be converted into OnOffAuto. Signed-off-by: Akihiko Odaki --- docs/about/deprecated.rst | 7 +++++ docs/igd-assign.txt | 2 +- include/hw/pci/pci_device.h | 2 +- hw/pci/pci.c | 57 +++++++++++++++++++++++++++++++++++= ++-- hw/vfio/pci-quirks.c | 2 +- hw/vfio/pci.c | 11 ++++---- hw/xen/xen_pt_load_rom.c | 4 +-- tests/qtest/virtio-net-failover.c | 32 +++++++++++----------- 8 files changed, 88 insertions(+), 29 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 20b7a17cf07e..ac8d40fd0e84 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -389,6 +389,13 @@ recommending to switch to their stable counterparts: SD physical layer specification v2.00 supersedes the v1.10 one. v2.00 is the default since QEMU 3.0.0. =20 +Integer specification of PCI device's ``rombar`` property (since 9.1) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Specifying an integer for the ``rombar`` property of a PCI device is being +deprecated starting in 9.1 due to obscurity of such an specification. Repl= ace +zero with ``off`` and a non-zero value with ``on``, respectively. + Block device options '''''''''''''''''''' =20 diff --git a/docs/igd-assign.txt b/docs/igd-assign.txt index e17bb50789ad..35c6c8e28493 100644 --- a/docs/igd-assign.txt +++ b/docs/igd-assign.txt @@ -35,7 +35,7 @@ IGD has two different modes for assignment using vfio-pci: ISA/LPC bridge device (vfio-pci-igd-lpc-bridge) on the root bus at PCI address 1f.0. * The IGD device must have a VGA ROM, either provided via the romfile - option or loaded automatically through vfio (standard). rombar=3D0 + option or loaded automatically through vfio (standard). rombar=3Doff will disable legacy mode support. * Hotplug of the IGD device is not supported. * The IGD device must be a SandyBridge or newer model device. diff --git a/include/hw/pci/pci_device.h b/include/hw/pci/pci_device.h index ca151325085d..49b341ce2e27 100644 --- a/include/hw/pci/pci_device.h +++ b/include/hw/pci/pci_device.h @@ -147,7 +147,7 @@ struct PCIDevice { uint32_t romsize; bool has_rom; MemoryRegion rom; - uint32_t rom_bar; + OnOffAuto rom_bar; =20 /* INTx routing notifier */ PCIINTxRoutingNotifier intx_routing_notifier; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 4c7be5295110..ca8fb5383765 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -67,11 +67,64 @@ static char *pcibus_get_fw_dev_path(DeviceState *dev); static void pcibus_reset_hold(Object *obj, ResetType type); static bool pcie_has_upstream_port(PCIDevice *dev); =20 +static void rom_bar_get(Object *obj, Visitor *v, const char *name, void *o= paque, + Error **errp) +{ + Property *prop =3D opaque; + int *ptr =3D object_field_prop_ptr(obj, prop); + + visit_type_enum(v, name, ptr, prop->info->enum_table, errp); +} + +static void rom_bar_set(Object *obj, Visitor *v, const char *name, void *o= paque, + Error **errp) +{ + Property *prop =3D opaque; + Error *local_err =3D NULL; + int *ptr =3D object_field_prop_ptr(obj, prop); + uint32_t value; + + visit_type_enum(v, name, ptr, prop->info->enum_table, &local_err); + if (!local_err) { + return; + } + + if (visit_type_uint32(v, name, &value, NULL)) { + if (value) { + *ptr =3D ON_OFF_AUTO_ON; + warn_report("Specifying a number for rombar is deprecated; rep= lace a non-zero value with 'on'"); + } else { + *ptr =3D ON_OFF_AUTO_OFF; + warn_report("Specifying a number for rombar is deprecated; rep= lace 0 with 'off'"); + } + + return; + } + + error_propagate(errp, local_err); +} + +static void rom_bar_set_default_value(ObjectProperty *op, const Property *= prop) +{ + object_property_set_default_str(op, + qapi_enum_lookup(prop->info->enum_table, prop->defval.i)); +} + +static const PropertyInfo qdev_prop_rom_bar =3D { + .name =3D "OnOffAuto", + .description =3D "on/off/auto", + .enum_table =3D &OnOffAuto_lookup, + .get =3D rom_bar_get, + .set =3D rom_bar_set, + .set_default_value =3D rom_bar_set_default_value, +}; + static Property pci_props[] =3D { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), DEFINE_PROP_STRING("romfile", PCIDevice, romfile), DEFINE_PROP_UINT32("romsize", PCIDevice, romsize, UINT32_MAX), - DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1), + DEFINE_PROP_SIGNED("rombar", PCIDevice, rom_bar, ON_OFF_AUTO_AUTO, + qdev_prop_rom_bar, OnOffAuto), DEFINE_PROP_BIT("multifunction", PCIDevice, cap_present, QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false), DEFINE_PROP_BIT("x-pcie-lnksta-dllla", PCIDevice, cap_present, @@ -2334,7 +2387,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool = is_default_rom, return; } =20 - if (!pdev->rom_bar) { + if (pdev->rom_bar =3D=3D ON_OFF_AUTO_OFF) { /* * Load rom via fw_cfg instead of creating a rom bar, * for 0.11 compatibility. diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 39dae72497e0..0e920ed0691a 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -33,7 +33,7 @@ * execution as noticed with the BCM 57810 card for lack of a * more better way to handle such issues. * The user can still override by specifying a romfile or - * rombar=3D1. + * rombar=3Don. * Please see https://bugs.launchpad.net/qemu/+bug/1284874 * for an analysis of the 57810 card hang. When adding * a new vendor id/device id combination below, please also add diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index e03d9f3ba546..502ee2ed0489 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -902,7 +902,7 @@ static void vfio_pci_load_rom(VFIOPCIDevice *vdev) error_report("vfio-pci: Cannot read device rom at " "%s", vdev->vbasedev.name); error_printf("Device option ROM contents are probably invalid " - "(check dmesg).\nSkip option ROM probe with rombar=3D0= , " + "(check dmesg).\nSkip option ROM probe with rombar=3Do= ff, " "or load from file with romfile=3D\n"); return; } @@ -1012,11 +1012,10 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) { uint32_t orig, size =3D cpu_to_le32((uint32_t)PCI_ROM_ADDRESS_MASK); off_t offset =3D vdev->config_offset + PCI_ROM_ADDRESS; - DeviceState *dev =3D DEVICE(vdev); char *name; int fd =3D vdev->vbasedev.fd; =20 - if (vdev->pdev.romfile || !vdev->pdev.rom_bar) { + if (vdev->pdev.romfile || vdev->pdev.rom_bar =3D=3D ON_OFF_AUTO_OFF) { /* Since pci handles romfile, just print a message and return */ if (vfio_opt_rom_in_denylist(vdev) && vdev->pdev.romfile) { warn_report("Device at %s is known to cause system instability" @@ -1046,17 +1045,17 @@ static void vfio_pci_size_rom(VFIOPCIDevice *vdev) } =20 if (vfio_opt_rom_in_denylist(vdev)) { - if (dev->opts && qdict_haskey(dev->opts, "rombar")) { + if (vdev->pdev.rom_bar =3D=3D ON_OFF_AUTO_ON) { warn_report("Device at %s is known to cause system instability" " issues during option rom execution", vdev->vbasedev.name); error_printf("Proceeding anyway since user specified" - " non zero value for rombar\n"); + " on for rombar\n"); } else { warn_report("Rom loading for device at %s has been disabled" " due to system instability issues", vdev->vbasedev.name); - error_printf("Specify rombar=3D1 or romfile to force\n"); + error_printf("Specify rombar=3Don or romfile to force\n"); return; } } diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c index 6bc64acd3352..025a6b25a916 100644 --- a/hw/xen/xen_pt_load_rom.c +++ b/hw/xen/xen_pt_load_rom.c @@ -26,7 +26,7 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, Object *owner =3D OBJECT(dev); =20 /* If loading ROM from file, pci handles it */ - if (dev->romfile || !dev->rom_bar) { + if (dev->romfile || dev->rom_bar =3D=3D ON_OFF_AUTO_OFF) { return NULL; } =20 @@ -71,7 +71,7 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, if (!fread(ptr, 1, st.st_size, fp)) { error_report("pci-assign: Cannot read from host %s", rom_file); error_printf("Device option ROM contents are probably invalid " - "(check dmesg).\nSkip option ROM probe with rombar=3D= 0, " + "(check dmesg).\nSkip option ROM probe with rombar=3D= off, " "or load from file with romfile=3D\n"); goto close_rom; } diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 73dfabc2728b..f65b97683fb6 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -568,7 +568,7 @@ static void test_hotplug_2_reverse(void) "{'bus': 'root0'," "'failover': true," "'netdev': 'hs0'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_STANDBY0"'}"); =20 @@ -655,7 +655,7 @@ static void test_migrate_out(gconstpointer opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -765,7 +765,7 @@ static void test_migrate_in(gconstpointer opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -819,7 +819,7 @@ static void test_off_migrate_out(gconstpointer opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -887,7 +887,7 @@ static void test_off_migrate_in(gconstpointer opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -938,7 +938,7 @@ static void test_guest_off_migrate_out(gconstpointer op= aque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1014,7 +1014,7 @@ static void test_guest_off_migrate_in(gconstpointer o= paque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1065,7 +1065,7 @@ static void test_migrate_guest_off_abort(gconstpointe= r opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1170,7 +1170,7 @@ static void test_migrate_abort_wait_unplug(gconstpoin= ter opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1259,7 +1259,7 @@ static void test_migrate_abort_active(gconstpointer o= paque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1358,7 +1358,7 @@ static void test_migrate_off_abort(gconstpointer opaq= ue) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1450,7 +1450,7 @@ static void test_migrate_abort_timeout(gconstpointer = opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1543,7 +1543,7 @@ static void test_multi_out(gconstpointer opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1574,7 +1574,7 @@ static void test_multi_out(gconstpointer opaque) "{'bus': 'root3'," "'failover_pair_id': 'standby1'," "'netdev': 'hs3'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY1"'}"); =20 @@ -1713,7 +1713,7 @@ static void test_multi_in(gconstpointer opaque) "{'bus': 'root1'," "'failover_pair_id': 'standby0'," "'netdev': 'hs1'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY0"'}"); =20 @@ -1737,7 +1737,7 @@ static void test_multi_in(gconstpointer opaque) "{'bus': 'root3'," "'failover_pair_id': 'standby1'," "'netdev': 'hs3'," - "'rombar': 0," + "'rombar': 'off'," "'romfile': ''," "'mac': '"MAC_PRIMARY1"'}"); =20 --=20 2.45.2 From nobody Sun Nov 24 17:47:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1720943424; cv=none; d=zohomail.com; s=zohoarc; b=AnbHeGpPP6Ho51S8od/UY8rMdCJO+XZajrUNby5UTi6BiQA3Grv9qHDRUXgZ1MURbPz25VRN1WtI8pndVJIk3RWBSrB+vHmednSOiCV/6TCptd0qh/pRoV5OCK9Dgwh6GdFg7X4pnyI4a8hWBnAJ3I/cRPhjzvxTMdPgbJ9TL00= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1720943424; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=0VSYKVQCF4c9EWbUkbZPOSynuO1Ww6rZL2afZDm8mb0=; b=d3RQJFuy1uefXMgDixuj96facheWCY5Ofb1VNnM3hcK+g+j3F1Dd2ah7L0no4MdMMJRxTUxV9Ga7eTsDXp/6H3doPELGXiBaw0e82/v6/PGuPlcdjhRS1eqaXbrAXEKbmJpfxaN3ddn8ie4PuNq4Cy8sSSaI3M7jWjaWqsufqfY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1720943424805250.7767681991395; Sun, 14 Jul 2024 00:50:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sStz5-0005ce-17; Sun, 14 Jul 2024 03:49:27 -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 1sStyz-0005Sz-8z for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:21 -0400 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sStyu-0007fm-9B for qemu-devel@nongnu.org; Sun, 14 Jul 2024 03:49:21 -0400 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-70af8128081so2392155b3a.1 for ; Sun, 14 Jul 2024 00:49:15 -0700 (PDT) Received: from localhost ([157.82.204.135]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-70b7eb9b3aasm2213754b3a.6.2024.07.14.00.49.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 14 Jul 2024 00:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1720943355; x=1721548155; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=0VSYKVQCF4c9EWbUkbZPOSynuO1Ww6rZL2afZDm8mb0=; b=Z3//t0lAuC5c7cDHMdP9RW2/oezUGCg+MCAu1rz3xUNCfkrrcLp4XyNMnNxCeVpwOG kjh2lldXxZPb3xgF0runKoTglda0wNl11AJVUIbb3fOuqkk31OrCDPiKqbw/uGOe8Crt hx+rUEfohN680dV8BA2fNCGf16Ez5y5no5TbUZy7PdZBjHMGsakbH93lsTsrsouJRWvY 1Lw/3yX3pXZWRfb3Jf12R9pCnt7ETUfyFJl04VjabJSLvqt87TvREfpJ8UvSCrwucWl0 BIuQffczt0R9geZ9pOf/QegNye++sGZPp+GRQPr3Vmn99UxByGeF6oV7SMVDYZS9aT/H n4NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720943355; x=1721548155; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0VSYKVQCF4c9EWbUkbZPOSynuO1Ww6rZL2afZDm8mb0=; b=meC6IRPTpz01GHaiI3jjIKOQEChqHpFa5L8JOhIFN0I9/4RaFK+8eRSNumRokIcD8H 0YvK4TeE9oW1nofWeZcBfR3Mwof3qZj5lW4+g7KYIjo6iYbDgKi4KO6Bz0Oh4ZTYl5ro AJb/TwSMi3Bwo5lsNei/Jbpso+6Nb1rJYKjPvL/S1HzyUMSdZD3uF37ip+kWJ1CWa4xq meWoXmbA1Fd5znanBhJpnplo9NItmfk1KnI46lDF7oYxceivXoo6IOeeZbR+fYIi8etE QFQy88yWYHmqqa5uBmniPcjM+++Suia6I/urLWbNPZ81EwsVu39h+zsNmk8RG4D6grmr GoTA== X-Gm-Message-State: AOJu0Ywh9sWtX0iaOFn2JDeeFVX2CzVgFzZ5Knagn5v7fTz1L6MQCHba fQX8ARjzTGUm90EKtEWYgpEhRVJqeAD28om7/VJbmiNwvR2HeFm5Jjo00GaJO/M= X-Google-Smtp-Source: AGHT+IHjl9twXCA9eQvJfVQb1xfkFskT71A2789HR/NoA4zrPc2snsuB9tNAMTOGNzwgCUIxtqa6Ig== X-Received: by 2002:a05:6a00:c86:b0:70b:23d9:98ae with SMTP id d2e1a72fcca58-70b43668370mr16055569b3a.28.1720943354825; Sun, 14 Jul 2024 00:49:14 -0700 (PDT) From: Akihiko Odaki Date: Sun, 14 Jul 2024 16:48:34 +0900 Subject: [PATCH v2 4/4] hw/qdev: Remove opts member MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240714-rombar-v2-4-af1504ef55de@daynix.com> References: <20240714-rombar-v2-0-af1504ef55de@daynix.com> In-Reply-To: <20240714-rombar-v2-0-af1504ef55de@daynix.com> To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" , Marcel Apfelbaum , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Sriram Yagnaraman , Jason Wang , Keith Busch , Klaus Jensen , Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Akihiko Odaki X-Mailer: b4 0.14-dev-fd6e3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::429; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x429.google.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1720943425011116600 It is no longer used. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster --- include/hw/qdev-core.h | 4 ---- hw/core/qdev.c | 1 - system/qdev-monitor.c | 12 +++++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 5336728a23f6..40f2d185f17c 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -237,10 +237,6 @@ struct DeviceState { * @pending_deleted_expires_ms: optional timeout for deletion events */ int64_t pending_deleted_expires_ms; - /** - * @opts: QDict of options for the device - */ - QDict *opts; /** * @hotplugged: was device added after PHASE_MACHINE_READY? */ diff --git a/hw/core/qdev.c b/hw/core/qdev.c index f3a996f57dee..2fc84699d432 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -706,7 +706,6 @@ static void device_finalize(Object *obj) dev->canonical_path =3D NULL; } =20 - qobject_unref(dev->opts); g_free(dev->id); } =20 diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 6af6ef7d667f..3551989d5153 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -624,6 +624,7 @@ DeviceState *qdev_device_add_from_qdict(const QDict *op= ts, char *id; DeviceState *dev =3D NULL; BusState *bus =3D NULL; + QDict *properties; =20 driver =3D qdict_get_try_str(opts, "driver"); if (!driver) { @@ -705,13 +706,14 @@ DeviceState *qdev_device_add_from_qdict(const QDict *= opts, } =20 /* set properties */ - dev->opts =3D qdict_clone_shallow(opts); - qdict_del(dev->opts, "driver"); - qdict_del(dev->opts, "bus"); - qdict_del(dev->opts, "id"); + properties =3D qdict_clone_shallow(opts); + qdict_del(properties, "driver"); + qdict_del(properties, "bus"); + qdict_del(properties, "id"); =20 - object_set_properties_from_keyval(&dev->parent_obj, dev->opts, from_js= on, + object_set_properties_from_keyval(&dev->parent_obj, properties, from_j= son, errp); + qobject_unref(properties); if (*errp) { goto err_del_dev; } --=20 2.45.2