From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [PATCH kvm-next 2/2] kvm: remove dead code Date: Sun, 29 Dec 2013 12:13:08 -0800 Message-ID: <20131229121308.58f2a077@nehalam.linuxnetplumber.net> References: <20131229121229.19a97822@nehalam.linuxnetplumber.net> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Gleb Natapov , Paolo Bonzini , kvm@vger.kernel.org To: Stephen Hemminger Return-path: Received: from mail-pb0-f43.google.com ([209.85.160.43]:57388 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752268Ab3L2UNY (ORCPT ); Sun, 29 Dec 2013 15:13:24 -0500 Received: by mail-pb0-f43.google.com with SMTP id rq2so10922043pbb.2 for ; Sun, 29 Dec 2013 12:13:23 -0800 (PST) In-Reply-To: <20131229121229.19a97822@nehalam.linuxnetplumber.net> Sender: kvm-owner@vger.kernel.org List-ID: The function kvm_io_bus_read_cookie is defined but never used in current in-tree code. Signed-off-by: Stephen Hemminger --- a/include/linux/kvm_host.h 2013-12-27 13:12:19.409612858 -0800 +++ b/include/linux/kvm_host.h 2013-12-27 13:12:42.261259369 -0800 @@ -172,8 +172,6 @@ int kvm_io_bus_write_cookie(struct kvm * int len, const void *val, long cookie); int kvm_io_bus_read(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, int len, void *val); -int kvm_io_bus_read_cookie(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, - int len, void *val, long cookie); int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, int len, struct kvm_io_device *dev); int kvm_io_bus_unregister_dev(struct kvm *kvm, enum kvm_bus bus_idx, --- a/virt/kvm/kvm_main.c 2013-12-27 13:12:19.413612796 -0800 +++ b/virt/kvm/kvm_main.c 2013-12-27 13:12:42.261259369 -0800 @@ -2937,33 +2937,6 @@ int kvm_io_bus_read(struct kvm *kvm, enu return r < 0 ? r : 0; } -/* kvm_io_bus_read_cookie - called under kvm->slots_lock */ -int kvm_io_bus_read_cookie(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr, - int len, void *val, long cookie) -{ - struct kvm_io_bus *bus; - struct kvm_io_range range; - - range = (struct kvm_io_range) { - .addr = addr, - .len = len, - }; - - bus = srcu_dereference(kvm->buses[bus_idx], &kvm->srcu); - - /* First try the device referenced by cookie. */ - if ((cookie >= 0) && (cookie < bus->dev_count) && - (kvm_io_bus_cmp(&range, &bus->range[cookie]) == 0)) - if (!kvm_iodevice_read(bus->range[cookie].dev, addr, len, - val)) - return cookie; - - /* - * cookie contained garbage; fall back to search and return the - * correct cookie value. - */ - return __kvm_io_bus_read(bus, &range, val); -} /* Caller must hold slots_lock. */ int kvm_io_bus_register_dev(struct kvm *kvm, enum kvm_bus bus_idx, gpa_t addr,