From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGmRc-0003mZ-Qz for qemu-devel@nongnu.org; Wed, 26 Sep 2012 03:54:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGmRX-0006jA-12 for qemu-devel@nongnu.org; Wed, 26 Sep 2012 03:54:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49017) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGmRW-0006j3-PC for qemu-devel@nongnu.org; Wed, 26 Sep 2012 03:54:02 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8Q7s2oo011129 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 26 Sep 2012 03:54:02 -0400 From: Markus Armbruster References: <1348523754-6897-1-git-send-email-lcapitulino@redhat.com> <1348523754-6897-2-git-send-email-lcapitulino@redhat.com> <8762722wlk.fsf@blackfin.pond.sub.org> Date: Wed, 26 Sep 2012 09:54:00 +0200 In-Reply-To: <8762722wlk.fsf@blackfin.pond.sub.org> (Markus Armbruster's message of "Tue, 25 Sep 2012 13:03:19 +0200") Message-ID: <87obktw76v.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/3] pci-assign: use monitor_handle_fd_param List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: pbonzini@redhat.com, eblake@redhat.com, qemu-devel@nongnu.org Markus Armbruster writes: > Luiz Capitulino writes: > >> From: Paolo Bonzini >> >> There is no need to open-code the choice between a file descriptor >> number or a named one. Just use monitor_handle_fd_param, which >> also takes care of printing the error message. >> >> Signed-off-by: Paolo Bonzini >> Signed-off-by: Luiz Capitulino >> --- >> hw/kvm/pci-assign.c | 12 +++--------- >> 1 file changed, 3 insertions(+), 9 deletions(-) >> >> diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c >> index 05b93d9..7a0998c 100644 >> --- a/hw/kvm/pci-assign.c >> +++ b/hw/kvm/pci-assign.c >> @@ -579,15 +579,9 @@ static int get_real_device(AssignedDevice *pci_dev, uint16_t r_seg, >> snprintf(name, sizeof(name), "%sconfig", dir); >> >> if (pci_dev->configfd_name && *pci_dev->configfd_name) { >> - if (qemu_isdigit(pci_dev->configfd_name[0])) { >> - dev->config_fd = strtol(pci_dev->configfd_name, NULL, 0); >> - } else { >> - dev->config_fd = monitor_get_fd(cur_mon, pci_dev->configfd_name); >> - if (dev->config_fd < 0) { >> - error_report("%s: (%s) unkown", __func__, >> - pci_dev->configfd_name); >> - return 1; >> - } >> + dev->config_fd = monitor_handle_fd_param(cur_mon, pci_dev->configfd_name); >> + if (dev->config_fd < 0) { >> + return 1; >> } >> } else { >> dev->config_fd = open(name, O_RDWR); > > Silent change: no longer accepts file descriptors in octal and hex. > > Silent fix: now rejects junk after numeric file descriptor. > > Both are fine with me, but perhaps worth mentioning in the commit > message. One more thought: this parses qdev "kvm-pci-assign" property "configfd". A real "fd" property (qdev_prop_fd & friends) would be cleaner, but as long as this is the only instance, it's not worth the trouble.