From patchwork Wed Nov 10 17:14:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 314752 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAAHEmGd009063 for ; Wed, 10 Nov 2010 17:14:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757253Ab0KJROo (ORCPT ); Wed, 10 Nov 2010 12:14:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35724 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757221Ab0KJRO0 (ORCPT ); Wed, 10 Nov 2010 12:14:26 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAAHEOtY028600 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Nov 2010 12:14:24 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAAHENBT010512; Wed, 10 Nov 2010 12:14:24 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 5EC3C133A0D; Wed, 10 Nov 2010 19:14:22 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, blauwirbel@gmail.com, armbru@redhat.com, alex.williamson@redhat.com, mst@redhat.com Subject: [PATCHv3 12/14] Add bootindex parameter to pci assigned device. Date: Wed, 10 Nov 2010 19:14:19 +0200 Message-Id: <1289409261-5418-13-git-send-email-gleb@redhat.com> In-Reply-To: <1289409261-5418-1-git-send-email-gleb@redhat.com> References: <1289409261-5418-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 10 Nov 2010 17:14:50 +0000 (UTC) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index bde231d..15c2b42 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -39,6 +39,7 @@ #include "loader.h" #include "monitor.h" #include +#include "sysemu.h" /* From linux/ioport.h */ #define IORESOURCE_IO 0x00000100 /* Resource type */ @@ -1490,6 +1491,11 @@ static int assigned_initfn(struct PCIDevice *pci_dev) assigned_dev_load_option_rom(dev); QLIST_INSERT_HEAD(&devs, dev, next); + + if (dev->bootindex >= 0) { + add_boot_device_path(dev->bootindex, &pci_dev->qdev, NULL); + } + return 0; assigned_out: @@ -1549,6 +1555,7 @@ static PCIDeviceInfo assign_info = { ASSIGNED_DEVICE_USE_IOMMU_BIT, true), DEFINE_PROP_BIT("prefer_msi", AssignedDevice, features, ASSIGNED_DEVICE_PREFER_MSI_BIT, true), + DEFINE_PROP_INT32("bootindex", AssignedDevice, bootindex, -1), DEFINE_PROP_STRING("configfd", AssignedDevice, configfd_name), DEFINE_PROP_END_OF_LIST(), }, diff --git a/hw/device-assignment.h b/hw/device-assignment.h index c94a730..86af0a9 100644 --- a/hw/device-assignment.h +++ b/hw/device-assignment.h @@ -111,6 +111,7 @@ typedef struct AssignedDevice { int mmio_index; int need_emulate_cmd; char *configfd_name; + int32_t bootindex; QLIST_ENTRY(AssignedDevice) next; } AssignedDevice;