From patchwork Thu Feb 15 14:20:35 2024 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: 772898 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp854319wre; Thu, 15 Feb 2024 06:21:59 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXeX5piSWCAMvGDFUezR/CLSe+vM6/zoYxP44BI9f3zoJCLAlSvJcudMogjHvUIf0xKJZoQ4N+31d4GQcBFGHcR X-Google-Smtp-Source: AGHT+IGoTq6CuuyePMl+zgCBt9J3H4LlGt1PT6cySGCoBkhS/bmbFP0DZLJQjDfDWygWA3Ajss9V X-Received: by 2002:a0c:f084:0:b0:68f:29f1:7d1c with SMTP id g4-20020a0cf084000000b0068f29f17d1cmr580722qvk.32.1708006919387; Thu, 15 Feb 2024 06:21:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708006919; cv=none; d=google.com; s=arc-20160816; b=b67kjIq3bH01KVUZe2wz4YDO5XTpdpqBRN61qNo9YVVcmm5o9Yn+TxYy6on2ERR8yi MyXbzCdB5TH0hcfO3NOL7Rw5TTI6hU+ugDRIjhJQYIhIPFOh8vvvwNLzA8WvUi5p5bgU nnti4gf7seQt40lB2AwwTpepf+MZ3zebIbrowXY1809KYRK3FxxDjRqAu9Tt/CF4Qnsl d3UnoMhcR5TIdkgwiw9PUnnWVZvwUH2ReQALOkctOTkAt97hDHyy9wIsHu7tciyBCSMm ahNKIOgE/NYllMRWj6wVkyVPCEw09NTMfP1QZ3Cco18fBokYT0TPlWeXLgTHN/ryaUGa JJag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=V9a2tbqcFhv7866Po+eazVne7c9fJyb++6ZKJPt9MeE=; fh=3Hd8qMl8w0TWU/7EzjzjgUkpGqVLHsqXOaZ3eVq4yfA=; b=bv6sTk6opvgtbrp+pRSpbW9sO/rF3gzrX4iIabOkMqOGb3WFTrP0qOFPSx5VIoHbRx l6ZU+rIK3+/EKeshREvTO5EDuNiGKvKUy9J2NamKi/N/Sym3X3eS2/SH3sC9LNp6XT5f 0rRSXtaHOA5WFKSPi7Cht7DBqHztms/6Kp9nbmCDzgoQp0bwA7k/WsZvYT5hRs5BMUeP a8gjS/K3vrfdePK+vMjZgdIAtpvNy+wUDGWMMm7QAaBZ2U/K3Ro0gIisVWvbE0agkKuG vR6Vst8urzKIZNSPJouXlywTxOBJir7cbU0mQBjK0sJY8qjUQUQgPvEePqt3OWhQdVV8 LIOw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jQ5qJT7T; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id eq12-20020ad4596c000000b0068cbb4a23d9si1562547qvb.118.2024.02.15.06.21.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 06:21:59 -0800 (PST) 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=jQ5qJT7T; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1racbu-0005gS-RS; Thu, 15 Feb 2024 09:21:10 -0500 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 1racbs-0005dL-EQ for qemu-devel@nongnu.org; Thu, 15 Feb 2024 09:21:08 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1racbh-0000En-BZ for qemu-devel@nongnu.org; Thu, 15 Feb 2024 09:21:08 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4121954d4c0so3556245e9.0 for ; Thu, 15 Feb 2024 06:20:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708006855; x=1708611655; 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=V9a2tbqcFhv7866Po+eazVne7c9fJyb++6ZKJPt9MeE=; b=jQ5qJT7TFC22SWPzleXZ0K8hWMveJGkAQ6eXr4/RMaXQv6sE0mmFX7JPKTE/2msJE8 krjuisnwpOUV2WelnoK0fde9HgHt5Ms/LhyyIFUovlCrnyM0EDHC1LTmEfyC8G7L6btL Pi5uR/VUPa/Lb2ZBhC21z7lOE/uZk40o9IXPAvAEfPVjPvMHG0JVerHkpSqpprjnk4+T zj8TvmvWTScBREGd9TAlQPZqjqBNpCmyAmtrnCuJ0nBpMYRkAjTweEVzftWufzNxuHVZ GzLGyHDtO2/+nbXykpr2XV59qmrvpgnarB2zD6o4lBf5zlBjmggxhDuI+t0Q7VT2Q7GQ 6BGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708006855; x=1708611655; 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=V9a2tbqcFhv7866Po+eazVne7c9fJyb++6ZKJPt9MeE=; b=HyVa1gfE7elpqrKr9A8UP6bI2g6iTal3W6ee7cBGywUZrg+DYnWaSnDXg28g8Hnn4k i4o2Qhu2hTCOdJKEQxd02EtTsLVs/8P1TzCTcH5RxVQdIKR8XL5gDDyTgdg92fzfLmfg FmY3PRiBtIrLXOP7o5TiugoztrMxZBX2HuKQT6FnMmWUdjhUIoXJu1jiZGaYPiX4HITI ALKoaD8rKB7lexpN+iQHxje02eDR+VzPc70J6Qvt7AGCezEJ8fcSOscnI5JRZBLyaU7W 5TwsvKx2k5QJk2efPiRmeLS6Jfhbpos+xqcJ0EPB99TBDNHVClgsHdeLi8HSdOF3dIYf sgtg== X-Gm-Message-State: AOJu0Yz6d0CaVhoHAmMTRyErKDPOar3veglUF0/XThg28FO62pPKIr+u u79pTPYEV7GB8V2XKycPTaUqE983maeSdYff/WuW7UC+M1nsGLyoQ6ud4gZYIwenTsda59f2Ik7 7/Dg= X-Received: by 2002:a05:600c:1c0a:b0:411:dd82:a23c with SMTP id j10-20020a05600c1c0a00b00411dd82a23cmr1813787wms.0.1708006855024; Thu, 15 Feb 2024 06:20:55 -0800 (PST) Received: from m1x-phil.lan ([176.187.193.50]) by smtp.gmail.com with ESMTPSA id bi20-20020a05600c3d9400b004103e15441dsm2147381wmb.6.2024.02.15.06.20.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Feb 2024 06:20:54 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Eduardo Habkost , Richard Henderson , Paolo Bonzini , kvm@vger.kernel.org, Marcelo Tosatti , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Michael Tokarev Subject: [PATCH v2 3/3] hw/i386/sgx: Use QDev API Date: Thu, 15 Feb 2024 15:20:35 +0100 Message-ID: <20240215142035.73331-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240215142035.73331-1-philmd@linaro.org> References: <20240215142035.73331-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 Prefer the QDev API over the low level QOM one. No logical change intended. Reviewed-by: Michael Tokarev Signed-off-by: Philippe Mathieu-Daudé --- Only build-tested. --- hw/i386/kvm/sgx.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/i386/kvm/sgx.c b/hw/i386/kvm/sgx.c index 70305547d4..de76397bcf 100644 --- a/hw/i386/kvm/sgx.c +++ b/hw/i386/kvm/sgx.c @@ -286,7 +286,6 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) SGXEPCState *sgx_epc = &pcms->sgx_epc; X86MachineState *x86ms = X86_MACHINE(pcms); SgxEPCList *list = NULL; - Object *obj; memset(sgx_epc, 0, sizeof(SGXEPCState)); if (!x86ms->sgx_epc_list) { @@ -300,16 +299,15 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) &sgx_epc->mr); for (list = x86ms->sgx_epc_list; list; list = list->next) { - obj = object_new("sgx-epc"); + DeviceState *dev = qdev_new(TYPE_SGX_EPC); /* set the memdev link with memory backend */ - object_property_parse(obj, SGX_EPC_MEMDEV_PROP, list->value->memdev, - &error_fatal); + object_property_parse(OBJECT(dev), SGX_EPC_MEMDEV_PROP, + list->value->memdev, &error_fatal); /* set the numa node property for sgx epc object */ - object_property_set_uint(obj, SGX_EPC_NUMA_NODE_PROP, list->value->node, - &error_fatal); - object_property_set_bool(obj, "realized", true, &error_fatal); - object_unref(obj); + object_property_set_uint(OBJECT(dev), SGX_EPC_NUMA_NODE_PROP, + list->value->node, &error_fatal); + qdev_realize_and_unref(dev, NULL, &error_fatal); } if ((sgx_epc->base + sgx_epc->size) < sgx_epc->base) {