From patchwork Mon Mar 20 11:59:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 740987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vmvfc0jY1z9s3w for ; Mon, 20 Mar 2017 23:00:56 +1100 (AEDT) Received: from localhost ([::1]:60592 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cpvzZ-00047Q-HL for incoming@patchwork.ozlabs.org; Mon, 20 Mar 2017 08:00:53 -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) 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 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) 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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[] = { static void vmgenid_realize(DeviceState *dev, Error **errp) { VmGenIdState *vms = VMGENID(dev); + Object *one_vmgenid; + bool ambiguous; 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; } + one_vmgenid = object_resolve_path_type("", VMGENID_DEVICE, &ambiguous); + if (one_vmgenid == NULL) { + assert(ambiguous); + error_setg(errp, "at most one %s device is permitted", VMGENID_DEVICE); + return; + } + assert(one_vmgenid == OBJECT(vms)); + qemu_register_reset(vmgenid_handle_reset, vms); }