From nobody Fri May 3 17:12:31 2024 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.zoho.com; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490011254113180.0448772542145; Mon, 20 Mar 2017 05:00:54 -0700 (PDT) Received: from localhost ([::1]:60555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvzY-0003vY-CY for importer@patchew.org; Mon, 20 Mar 2017 08:00:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvyk-0003uG-V8 for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:00:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpvyi-0000Nb-RA for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:00:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36998) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpvyi-0000My-Il for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:00:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 743B6624A8; Mon, 20 Mar 2017 12:00:00 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-55.phx2.redhat.com [10.3.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AE3878C0A; Mon, 20 Mar 2017 11:59:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 743B6624A8 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 743B6624A8 From: Laszlo Ersek To: qemu devel list Date: Mon, 20 Mar 2017 12:59:50 +0100 Message-Id: <20170320115951.25345-2-lersek@redhat.com> In-Reply-To: <20170320115951.25345-1-lersek@redhat.com> References: <20170320115951.25345-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 20 Mar 2017 12:00:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] hw/acpi/vmgenid: prevent device realization on pre-2.9 machine types 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: Igor Mammedov , Ben Warren , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The WRITE_POINTER linker/loader command that underlies VMGENID depends on commit baf2d5bfbac0 ("fw-cfg: support writeable blobs", 2017-01-12). That commit is not available in 2.8. Cc: "Michael S. Tsirkin" Cc: Ben Warren Cc: Igor Mammedov Signed-off-by: Laszlo Ersek --- include/hw/acpi/vmgenid.h | 1 + include/hw/compat.h | 4 ++++ hw/acpi/vmgenid.c | 14 ++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/include/hw/acpi/vmgenid.h b/include/hw/acpi/vmgenid.h index db7fa0e63303..8578476baebe 100644 --- a/include/hw/acpi/vmgenid.h +++ b/include/hw/acpi/vmgenid.h @@ -21,6 +21,7 @@ typedef struct VmGenIdState { DeviceClass parent_obj; QemuUUID guid; /* The 128-bit GUID seen by the guest */ uint8_t vmgenid_addr_le[8]; /* Address of the GUID (little-endian) */ + bool write_pointer_available; } VmGenIdState; =20 static inline Object *find_vmgenid_dev(void) diff --git a/include/hw/compat.h b/include/hw/compat.h index fc8c3e060007..c9caa8cd1bdd 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -42,6 +42,10 @@ .driver =3D "isa-cirrus-vga",\ .property =3D "vgamem_mb",\ .value =3D "8",\ + },{\ + .driver =3D "vmgenid",\ + .property =3D "x-write-pointer-available",\ + .value =3D "off",\ }, =20 #define HW_COMPAT_2_7 \ diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index 7a3ad17d66ef..c3ddcc8e7cb0 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -205,9 +205,22 @@ static void vmgenid_handle_reset(void *opaque) memset(vms->vmgenid_addr_le, 0, ARRAY_SIZE(vms->vmgenid_addr_le)); } =20 +static Property vmgenid_properties[] =3D { + DEFINE_PROP_BOOL("x-write-pointer-available", VmGenIdState, + write_pointer_available, true), + DEFINE_PROP_END_OF_LIST(), +}; + static void vmgenid_realize(DeviceState *dev, Error **errp) { VmGenIdState *vms =3D VMGENID(dev); + + if (!vms->write_pointer_available) { + error_setg(errp, "%s requires DMA write support in fw_cfg, " + "which this machine type does not provide", VMGENID_DEV= ICE); + return; + } + qemu_register_reset(vmgenid_handle_reset, vms); } =20 @@ -218,6 +231,7 @@ static void vmgenid_device_class_init(ObjectClass *klas= s, void *data) dc->vmsd =3D &vmstate_vmgenid; dc->realize =3D vmgenid_realize; dc->hotpluggable =3D false; + dc->props =3D vmgenid_properties; =20 object_class_property_add_str(klass, VMGENID_GUID, NULL, vmgenid_set_guid, NULL); --=20 2.9.3 From nobody Fri May 3 17:12:31 2024 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.zoho.com; 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1490011267610729.7180918840917; Mon, 20 Mar 2017 05:01:07 -0700 (PDT) Received: from localhost ([::1]:60592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvzm-00047Q-Gx for importer@patchew.org; Mon, 20 Mar 2017 08:01:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvyq-0003yx-Ho for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:00:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cpvyk-0000P2-P0 for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:00:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37042) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cpvyk-0000OM-JT for qemu-devel@nongnu.org; Mon, 20 Mar 2017 08:00:02 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8780761D15; Mon, 20 Mar 2017 12:00:02 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-55.phx2.redhat.com [10.3.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id C558378C0A; Mon, 20 Mar 2017 12:00:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8780761D15 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8780761D15 From: Laszlo Ersek To: qemu devel list Date: Mon, 20 Mar 2017 12:59:51 +0100 Message-Id: <20170320115951.25345-3-lersek@redhat.com> In-Reply-To: <20170320115951.25345-1-lersek@redhat.com> References: <20170320115951.25345-1-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 20 Mar 2017 12:00:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] hw/acpi/vmgenid: prevent more than one vmgenid device 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: Igor Mammedov , Ben Warren , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Multiple instances make no sense. Cc: "Michael S. Tsirkin" Cc: Ben Warren Cc: Igor Mammedov Signed-off-by: Laszlo Ersek --- hw/acpi/vmgenid.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index c3ddcc8e7cb0..b5c0dfcf19e1 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -214,6 +214,8 @@ static Property vmgenid_properties[] =3D { static void vmgenid_realize(DeviceState *dev, Error **errp) { VmGenIdState *vms =3D VMGENID(dev); + Object *one_vmgenid; + bool ambiguous; =20 if (!vms->write_pointer_available) { error_setg(errp, "%s requires DMA write support in fw_cfg, " @@ -221,6 +223,14 @@ static void vmgenid_realize(DeviceState *dev, Error **= errp) return; } =20 + one_vmgenid =3D object_resolve_path_type("", VMGENID_DEVICE, &ambiguou= s); + if (one_vmgenid =3D=3D NULL) { + assert(ambiguous); + error_setg(errp, "at most one %s device is permitted", VMGENID_DEV= ICE); + return; + } + assert(one_vmgenid =3D=3D OBJECT(vms)); + qemu_register_reset(vmgenid_handle_reset, vms); } =20 --=20 2.9.3