From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VD4s5-0007NH-Eu for qemu-devel@nongnu.org; Fri, 23 Aug 2013 23:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VD4rw-0002YS-W8 for qemu-devel@nongnu.org; Fri, 23 Aug 2013 23:50:41 -0400 Received: from mail-ee0-x235.google.com ([2a00:1450:4013:c00::235]:41688) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VD4rw-0002YD-MX for qemu-devel@nongnu.org; Fri, 23 Aug 2013 23:50:32 -0400 Received: by mail-ee0-f53.google.com with SMTP id b15so599992eek.40 for ; Fri, 23 Aug 2013 20:50:31 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 24 Aug 2013 05:50:02 +0200 Message-Id: <1377316202-2849-10-git-send-email-pbonzini@redhat.com> In-Reply-To: <1377316202-2849-1-git-send-email-pbonzini@redhat.com> References: <1377316202-2849-1-git-send-email-pbonzini@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: Wei Yang , anthony@codemonkey.ws, gleb@redhat.com 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