From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCnop-0003xr-GQ for qemu-devel@nongnu.org; Fri, 23 Aug 2013 05:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCnoj-0003NM-C7 for qemu-devel@nongnu.org; Fri, 23 Aug 2013 05:38:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCnoj-0003NB-3h for qemu-devel@nongnu.org; Fri, 23 Aug 2013 05:38:05 -0400 Message-ID: <52172D4E.50806@redhat.com> Date: Fri, 23 Aug 2013 11:37:18 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1377248615-23039-1-git-send-email-pbonzini@redhat.com> <1377248615-23039-10-git-send-email-pbonzini@redhat.com> <20130823093712.GA32232@weiyang.vnet.ibm.com> In-Reply-To: <20130823093712.GA32232@weiyang.vnet.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 9/9] kvm: shorten the parameter list for get_real_device() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wei Yang Cc: anthony@codemonkey.ws, qemu-devel@nongnu.org, gleb@redhat.com Il 23/08/2013 11:37, Wei Yang ha scritto: > Paolo, > > Is it necessary to add this? > > From: Wei Yang Right, I'll send v2 right away. Paolo > On Fri, Aug 23, 2013 at 11:03:35AM +0200, Paolo Bonzini wrote: >> get_real_device() has 5 parameters with the last 4 is contained in the first >> structure. >> >> This patch removes the last 4 parameters and directly use them from the first >> parameter. >> >> Acked-by: Alex Williamson >> Signed-off-by: Wei Yang >> Signed-off-by: Paolo Bonzini >> --- >> hw/i386/kvm/pci-assign.c | 9 ++++----- >> 1 file changed, 4 insertions(+), 5 deletions(-) >> >> diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c >> index ff33dc8..73941b2 100644 >> --- a/hw/i386/kvm/pci-assign.c >> +++ b/hw/i386/kvm/pci-assign.c >> @@ -568,8 +568,7 @@ static int get_real_device_id(const char *devpath, uint16_t *val) >> return get_real_id(devpath, "device", val); >> } >> >> -static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg, >> - uint8_t r_bus, uint8_t r_dev, uint8_t r_func) >> +static int get_real_device(AssignedDevice *pci_dev) >> { >> char dir[128], name[128]; >> int fd, r = 0, v; >> @@ -582,7 +581,8 @@ static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg, >> dev->region_number = 0; >> >> snprintf(dir, sizeof(dir), "/sys/bus/pci/devices/%04x:%02x:%02x.%x/", >> - r_seg, r_bus, r_dev, r_func); >> + pci_dev->host.domain, pci_dev->host.bus, >> + pci_dev->host.slot, pci_dev->host.function); >> >> snprintf(name, sizeof(name), "%sconfig", dir); >> >> @@ -1769,8 +1769,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev) >> memcpy(dev->emulate_config_write, dev->emulate_config_read, >> sizeof(dev->emulate_config_read)); >> >> - if (get_real_device(dev, dev->host.domain, dev->host.bus, >> - dev->host.slot, dev->host.function)) { >> + if (get_real_device(dev)) { >> error_report("pci-assign: Error: Couldn't get real device (%s)!", >> dev->dev.qdev.id); >> goto out; >> -- >> 1.8.3.1 >