From nobody Tue Feb 10 00:25:06 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1583859178; cv=none; d=zohomail.com; s=zohoarc; b=EgbYSFRIAFcTcShySLyF0c0Ds7/TmTScyGOJreUrbvg/JrfdNQhFP8S+j13QRwPMN1CNL41GgsiOazL/DwMdcf+tLqiJQlozX/4JCNjFfH27gakSrjPrfiB2atKCKdvz0/yL7FcDCVtbsVYe+cndgCzs2FpbvZHYuaAPf+js2mg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583859178; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HZDCswLkofKqT1CocQZaTBU9Ra3S3FQjSz77kMT5qfA=; b=TCFuagielGoOJBEpG0tsMF52duDd/m5J1awHkFtVwOE3J92OwKPQQyxf9GPhmHxb+YbUnoMdn7/4fLccWeVXKN9+y6MJn0oG1lunaHZL9Cn48X6vqrsT7ozBtzP6iSTgOWUnYdNycup6nuy15x5R5VYyIF5fWP2TQMPSZrCJ1/A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583859178869804.1232402022815; Tue, 10 Mar 2020 09:52:58 -0700 (PDT) Received: from localhost ([::1]:36902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBi7k-0008Dz-To for importer@patchew.org; Tue, 10 Mar 2020 12:52:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49230) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBi6T-0006M8-CA for qemu-devel@nongnu.org; Tue, 10 Mar 2020 12:51:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBi6S-0005WS-8i for qemu-devel@nongnu.org; Tue, 10 Mar 2020 12:51:37 -0400 Received: from userp2120.oracle.com ([156.151.31.85]:48074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBi6S-0005Re-0Z for qemu-devel@nongnu.org; Tue, 10 Mar 2020 12:51:36 -0400 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 02AGdJge103990; Tue, 10 Mar 2020 16:51:34 GMT Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2120.oracle.com with ESMTP id 2yp7hm35ps-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 16:51:33 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 02AGcJCW054662; Tue, 10 Mar 2020 16:51:33 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserp3030.oracle.com with ESMTP id 2yp8psg44c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 16:51:33 +0000 Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id 02AGpWSR030590; Tue, 10 Mar 2020 16:51:32 GMT Received: from spark.ravello.local (/213.57.127.2) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 10 Mar 2020 09:51:32 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2020-01-29; bh=HZDCswLkofKqT1CocQZaTBU9Ra3S3FQjSz77kMT5qfA=; b=CwpQ+pl79x/dDIeL4LAnAwscBkf3c4/qf2+hHL8DECC21B5bPm0yqqkpf97wX6Ge3IRK 5RX4Hn7SZ34jBamY8hpbRLKGIiEBAZlQVqbrhniaK3RtD+Ch1YxTq0mLDwV5ZJdDBk0g 8SlFs8o97OufwtoVcuRnFEgK/2D0LAaQuHlz6zaCwNPTVo2tmc8oGv+mLSAJSjLvWETj mo+CfGa2ch5APfuZhmI90kRt5JwnuaLNlNmXyY9rNnp1kKLtCo9/GlUgtkEHQgZQvjlk 6h3BsM8g5G91tPBW+7o89Bn4vP1jvJH6ERa/rQLjgGYHJXWLrl4YViada2uuu63VXAHR fg== From: Liran Alon To: qemu-devel@nongnu.org Subject: [PATCH v2 03/16] hw/i386/vmport: Propagate IOPort read to vCPU EAX register Date: Tue, 10 Mar 2020 18:53:19 +0200 Message-Id: <20200310165332.140774-4-liran.alon@oracle.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200310165332.140774-1-liran.alon@oracle.com> References: <20200310165332.140774-1-liran.alon@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9556 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 suspectscore=1 mlxscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003100103 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9556 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 priorityscore=1501 clxscore=1015 mlxscore=0 impostorscore=0 mlxlogscore=999 suspectscore=1 phishscore=0 malwarescore=0 adultscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003100103 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 156.151.31.85 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ehabkost@redhat.com, mst@redhat.com, Liran Alon , nikita.leshchenko@oracle.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" vmport_ioport_read() returns the value that should propagate to vCPU EAX register when guest reads VMPort IOPort (i.e. By x86 IN instruction). However, because vmport_ioport_read() calls cpu_synchronize_state(), the returned value gets overridden by the value in QEMU vCPU EAX register. i.e. cpu->env.regs[R_EAX]. To fix this issue, change vmport_ioport_read() to explicitly override cpu->env.regs[R_EAX] with the value it wish to propagate to vCPU EAX register. Reviewed-by: Nikita Leshenko Signed-off-by: Liran Alon --- hw/core/machine.c | 1 + hw/i386/vmport.c | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 9e8c06036faf..b9da40460d52 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,6 +39,7 @@ GlobalProperty hw_compat_4_2[] =3D { { "usb-redir", "suppress-remote-wake", "off" }, { "qxl", "revision", "4" }, { "qxl-vga", "revision", "4" }, + { "vmport", "version", "1" }, }; const size_t hw_compat_4_2_len =3D G_N_ELEMENTS(hw_compat_4_2); =20 diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c index ca4d95fc017f..736d78263889 100644 --- a/hw/i386/vmport.c +++ b/hw/i386/vmport.c @@ -75,17 +75,33 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr= addr, =20 eax =3D env->regs[R_EAX]; if (eax !=3D VMPORT_MAGIC) { - return eax; + goto out; } =20 command =3D env->regs[R_ECX]; trace_vmport_command(command); if (command >=3D VMPORT_ENTRIES || !s->func[command]) { qemu_log_mask(LOG_UNIMP, "vmport: unknown command %x\n", command); - return eax; + goto out; } =20 - return s->func[command](s->opaque[command], addr); + eax =3D s->func[command](s->opaque[command], addr); + +out: + /* + * The call above to cpu_synchronize_state() gets vCPU registers values + * to QEMU but also cause QEMU to write QEMU vCPU registers values to + * vCPU implementation (e.g. Accelerator such as KVM) just before + * resuming guest. + * + * Therefore, in order to make IOPort return value propagate to + * guest EAX, we need to explicitly update QEMU EAX register value. + */ + if (s->version > 1) { + cpu->env.regs[R_EAX] =3D eax; + } + + return eax; } =20 static void vmport_ioport_write(void *opaque, hwaddr addr, @@ -163,7 +179,7 @@ static Property vmport_properties[] =3D { * On every guest-visible change, should make changes conditioned on * version and define proper version for previous machine-types. */ - DEFINE_PROP_UINT8("version", VMPortState, version, 1), + DEFINE_PROP_UINT8("version", VMPortState, version, 2), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.20.1