From nobody Mon Feb 9 09:08:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513310095546114.128957856885; Thu, 14 Dec 2017 19:54:55 -0800 (PST) Received: from localhost ([::1]:44219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePh59-0006A4-BM for importer@patchew.org; Thu, 14 Dec 2017 22:54:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgk5-0003hY-6X for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:32:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePgk4-0006tR-4W for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:32:57 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:44189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePgk3-0006t7-Vj; Thu, 14 Dec 2017 22:32:56 -0500 Received: by mail-qt0-x242.google.com with SMTP id m59so10550375qte.11; Thu, 14 Dec 2017 19:32:55 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id q24sm3794605qkq.63.2017.12.14.19.32.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 19:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6TkBvKqs/HPy10vsij4QQ5Q0y/71VQSpDwmmh+UDQGs=; b=mtcjaEnB9EnLzcy5FEZRzKdrKJZdsbuvEi5w9+Ty2rVXYtBAtOpbYkUeuLAhpvryK+ opF8UWO3layQk8iTL3UyBpBt9PWAdKHXuaxBRi2amEsum/GnsiiyxhjnOefJHzLBKipf DSb85Q5lW4ty6IoQPlgUPhiMXH2+7KnVudldgVPalXKF6qme9mmmU5LIQqWBQZjSoDtF uhzfk9zUNJXnI60h3ed1iRD4hFD161HSBqHpmBNsDwDIhVhJxMlxWgy0+86dQt2gDizF yAROUMR4RWc3P1mbGP5LNFGoVCF+xXoZoZJQDkhE2wprj6WYQWeAashPp47nlSRNRKN9 af5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6TkBvKqs/HPy10vsij4QQ5Q0y/71VQSpDwmmh+UDQGs=; b=KDh2BkanWgYwqYFo6j8c8pWPH7riaBwn1oo+ktHOGF0zYYcaIqrZ148tdPBTMWvOzo uZn7Al294lSDYG67aKysHTbAZCuDVgkcew9kCmvLawgazNeKDPvVHXcpbbI1stYMB2V+ MeYTi2RUZTNyix0h5foQGAB2XbWZXk2z/n6ciRxz96br+ywtyZL/qfaklfobsgPS53HR I5t2gyxcFITJMVPJbJfnvYkhYHpWc1AGPHm5GfF952q1mD/OJkM1naAYaLbQWBcHvd7+ hrGh6CrbYQZARdi6SLX+jxyRrFSmx/dVEAP2bVqfT2dmN3nXp/ykBpiKAye1rjd5eQRJ fxWA== X-Gm-Message-State: AKGB3mI90xbDYxXnL75oamaEiHEc85ITyQyzPwiYV8MKEwmtLT0BLY7h TtJMGf/CgK7HS+8eoA1jpc8= X-Google-Smtp-Source: ACJfBouo7RzCJW6mv47q8lIjEnoQ/zLWAauKNEYyVcxBnMpJk+pMDYqKaG+vo9mcn2YkoiDnYk1cxA== X-Received: by 10.237.42.123 with SMTP id k56mr19760701qtf.175.1513308775493; Thu, 14 Dec 2017 19:32:55 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S. Tsirkin" , Michael Tokarev Date: Fri, 15 Dec 2017 00:30:12 -0300 Message-Id: <20171215033015.738-41-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215033015.738-1-f4bug@amsat.org> References: <20171215033015.738-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v4 40/43] i386/pc: move vmport.c to hw/i386/ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 It's a x86-only device, so it does not make sense to keep it in the shared misc folder. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/{misc =3D> i386}/vmport.c | 17 +++++++++-------- hw/i386/Makefile.objs | 1 + hw/misc/Makefile.objs | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-) rename hw/{misc =3D> i386}/vmport.c (95%) diff --git a/hw/misc/vmport.c b/hw/i386/vmport.c similarity index 95% rename from hw/misc/vmport.c rename to hw/i386/vmport.c index 165500223f..eb880c6def 100644 --- a/hw/misc/vmport.c +++ b/hw/i386/vmport.c @@ -28,7 +28,7 @@ #include "sysemu/hw_accel.h" #include "hw/qdev.h" =20 -//#define VMPORT_DEBUG +/* #define VMPORT_DEBUG */ =20 #define VMPORT_CMD_GETVERSION 0x0a #define VMPORT_CMD_GETRAMSIZE 0x14 @@ -38,8 +38,7 @@ =20 #define VMPORT(obj) OBJECT_CHECK(VMPortState, (obj), TYPE_VMPORT) =20 -typedef struct VMPortState -{ +typedef struct VMPortState { ISADevice parent_obj; =20 MemoryRegion io; @@ -51,8 +50,9 @@ static VMPortState *port_state; =20 void vmport_register(unsigned char command, VMPortReadFunc *func, void *op= aque) { - if (command >=3D VMPORT_ENTRIES) + if (command >=3D VMPORT_ENTRIES) { return; + } =20 port_state->func[command] =3D func; port_state->opaque[command] =3D opaque; @@ -71,14 +71,15 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr= addr, cpu_synchronize_state(cs); =20 eax =3D env->regs[R_EAX]; - if (eax !=3D VMPORT_MAGIC) + if (eax !=3D VMPORT_MAGIC) { return eax; + } =20 command =3D env->regs[R_ECX]; - if (command >=3D VMPORT_ENTRIES) + if (command >=3D VMPORT_ENTRIES) { return eax; - if (!s->func[command]) - { + } + if (!s->func[command]) { #ifdef VMPORT_DEBUG fprintf(stderr, "vmport: unknown command %x\n", command); #endif diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 2e5e1299ad..1548ad1ad0 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -5,6 +5,7 @@ obj-y +=3D pc_sysfw.o obj-y +=3D x86-iommu.o intel_iommu.o obj-y +=3D amd_iommu.o obj-$(CONFIG_XEN) +=3D ../xenpv/ xen/ +obj-$(CONFIG_VMPORT) +=3D vmport.o =20 obj-y +=3D kvmvapic.o obj-y +=3D acpi-build.o diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 10c88a84b4..d517f83e81 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -11,8 +11,6 @@ common-obj-$(CONFIG_EDU) +=3D edu.o common-obj-y +=3D unimp.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D vmcoreinfo.o =20 -obj-$(CONFIG_VMPORT) +=3D vmport.o - # ARM devices common-obj-$(CONFIG_PL310) +=3D arm_l2x0.o common-obj-$(CONFIG_INTEGRATOR_DEBUG) +=3D arm_integrator_debug.o --=20 2.15.1