From patchwork Tue Jun 28 17:33:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 641649 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 3rfCqJ59C9z9sBM for ; Wed, 29 Jun 2016 03:44:28 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=eliIT1nv; dkim-atps=neutral Received: from localhost ([::1]:38462 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHx3i-0004Lz-Aj for incoming@patchwork.ozlabs.org; Tue, 28 Jun 2016 13:44:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwu6-0000OM-Iy for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHwu5-000329-Mm for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:34:30 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHwu5-00031v-Fa for qemu-devel@nongnu.org; Tue, 28 Jun 2016 13:34:29 -0400 Received: by mail-wm0-x242.google.com with SMTP id a66so7647883wme.2 for ; Tue, 28 Jun 2016 10:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=14TvZmeBYoyrI1FM6/pqcya3OacTbjxa6MYi0oIYeWs=; b=eliIT1nvOxhsKC+NRLSc3A1n8uKuvRM+y2U0NMnTlBoRCwEIugslYSHwUHYnMvxw7U cTZvhzmIoyAOt3u/OP/1kuXQd3H9Po2eLAYk2vVjn1Q293t0XtYGjMrMKK1S4Qfbi7qK aeNCTTLqxjFtPFPHUpUh49RUpCqKH248/CHnW9cGCZtqE5d3irYg22AKkzzYN8udkrKn oII59sRhobQrLkeugFTud5YISP48c/BOxKxBRuQmTCazgZuJDs0oZ7CWN1GKw22xkmeP oTGwZmGIgqGB4UnCsAIDptSjGzCRveQA0NTvZqa0KYLUVXdL96/wvSkh+xOaVvJrS6Y0 Wpiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=14TvZmeBYoyrI1FM6/pqcya3OacTbjxa6MYi0oIYeWs=; b=lUuq+KU84FHFR1FLGmZs8fRn/xcpCk/SRsvWwe/WgE9caeNv/e53Bohg9P2Yenq4zl Dplsy2lXU6sUQ9OkS/r5IuWJUzNvhDORsMRz1HPDtJ5VRnU+z4cNbzpLg6qsBCaR4Jcu zWNopKO5rGpDDHz8tr4p0UtRhUMovktAs+OxlfVt7KBt3W5r6q+izOp2qgZLAhIi+zA0 D2TKPCTyESavPsCtKzO5Sn71m4pUdXdJ1eZIvogL8cTm3uZlURudMmV8/Rbj9dU9uPkq trGoELbt3/0+XZNXMdkNEg6G+b19l6dewIsLomL16CoGReYnRxIwrl5+F4QWI3D5NG6k mtGg== X-Gm-Message-State: ALyK8tLre485IbmprX/tHY842BioIxT1zoFhWX7hN3bLOnJzbuFp/GoB5mQ/Roxj834R9Q== X-Received: by 10.194.9.38 with SMTP id w6mr4144222wja.62.1467135268792; Tue, 28 Jun 2016 10:34:28 -0700 (PDT) Received: from donizetti.lan (94-39-188-118.adsl-ull.clienti.tiscali.it. [94.39.188.118]) by smtp.gmail.com with ESMTPSA id c142sm5305wme.18.2016.06.28.10.34.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 10:34:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 19:33:36 +0200 Message-Id: <1467135242-874-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467135242-874-1-git-send-email-pbonzini@redhat.com> References: <1467135242-874-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 06/32] pc_q35: configure Q35 instance using properties 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: Efimov Vasily Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Efimov Vasily Currently, Q35 instance is configured using direct access to structure fields. The patch uses property interface to set the fields. Signed-off-by: Efimov Vasily Reviewed-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- hw/i386/pc_q35.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 97a8835..65ae78a 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -159,12 +159,18 @@ static void pc_q35_init(MachineState *machine) q35_host = Q35_HOST_DEVICE(qdev_create(NULL, TYPE_Q35_HOST_DEVICE)); object_property_add_child(qdev_get_machine(), "q35", OBJECT(q35_host), NULL); - q35_host->mch.ram_memory = ram_memory; - q35_host->mch.pci_address_space = pci_memory; - q35_host->mch.system_memory = get_system_memory(); - q35_host->mch.address_space_io = system_io; - q35_host->mch.below_4g_mem_size = pcms->below_4g_mem_size; - q35_host->mch.above_4g_mem_size = pcms->above_4g_mem_size; + object_property_set_link(OBJECT(q35_host), OBJECT(ram_memory), + MCH_HOST_PROP_RAM_MEM, NULL); + object_property_set_link(OBJECT(q35_host), OBJECT(pci_memory), + MCH_HOST_PROP_PCI_MEM, NULL); + object_property_set_link(OBJECT(q35_host), OBJECT(get_system_memory()), + MCH_HOST_PROP_SYSTEM_MEM, NULL); + object_property_set_link(OBJECT(q35_host), OBJECT(system_io), + MCH_HOST_PROP_IO_MEM, NULL); + object_property_set_int(OBJECT(q35_host), pcms->below_4g_mem_size, + PCI_HOST_BELOW_4G_MEM_SIZE, NULL); + object_property_set_int(OBJECT(q35_host), pcms->above_4g_mem_size, + PCI_HOST_ABOVE_4G_MEM_SIZE, NULL); /* pci */ qdev_init_nofail(DEVICE(q35_host)); phb = PCI_HOST_BRIDGE(q35_host);