From patchwork Wed Oct 3 16:03:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 188861 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0CC4B2C00DE for ; Thu, 4 Oct 2012 03:26:51 +1000 (EST) Received: from localhost ([::1]:51259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJRS8-0008Jk-W3 for incoming@patchwork.ozlabs.org; Wed, 03 Oct 2012 12:05:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJRRF-0006a6-Si for qemu-devel@nongnu.org; Wed, 03 Oct 2012 12:04:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TJRR8-0007rT-SQ for qemu-devel@nongnu.org; Wed, 03 Oct 2012 12:04:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TJRR8-0007rJ-J9 for qemu-devel@nongnu.org; Wed, 03 Oct 2012 12:04:38 -0400 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.14.4/8.14.4) with ESMTP id q93G4Zvt025909 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Oct 2012 12:04:35 -0400 Received: from s01.tlv.redhat.com (s01.tlv.redhat.com [10.35.255.8]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q93G47Iu016728; Wed, 3 Oct 2012 12:04:34 -0400 From: Avi Kivity To: qemu-devel@nongnu.org, Anthony Liguori , liu ping fan , "Michael S. Tsirkin" , Paolo Bonzini , Blue Swirl Date: Wed, 3 Oct 2012 18:03:55 +0200 Message-Id: <1349280245-16341-13-git-send-email-avi@redhat.com> In-Reply-To: <1349280245-16341-1-git-send-email-avi@redhat.com> References: <1349280245-16341-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v1 12/22] kvm: use new MEMORY_LISTENER_DEFAULT_OPS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Removes quite a bit of useless code. Signed-off-by: Avi Kivity --- kvm-all.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index c69e012..5e9215d 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -703,14 +703,6 @@ static void kvm_set_phys_mem(MemoryRegionSection *section, bool add) } } -static void kvm_begin(MemoryListener *listener) -{ -} - -static void kvm_commit(MemoryListener *listener) -{ -} - static void kvm_region_add(MemoryListener *listener, MemoryRegionSection *section) { @@ -723,11 +715,6 @@ static void kvm_region_del(MemoryListener *listener, kvm_set_phys_mem(section, false); } -static void kvm_region_nop(MemoryListener *listener, - MemoryRegionSection *section) -{ -} - static void kvm_log_sync(MemoryListener *listener, MemoryRegionSection *section) { @@ -755,10 +742,6 @@ static void kvm_log_global_stop(struct MemoryListener *listener) assert(r >= 0); } -static void kvm_log_nop(struct MemoryListener *listener) -{ -} - static void kvm_mem_ioeventfd_add(MemoryListener *listener, MemoryRegionSection *section, bool match_data, uint64_t data, @@ -825,11 +808,9 @@ static void kvm_io_ioeventfd_del(MemoryListener *listener, } static MemoryListener kvm_memory_listener = { - .begin = kvm_begin, - .commit = kvm_commit, + MEMORY_LISTENER_DEFAULT_OPS, .region_add = kvm_region_add, .region_del = kvm_region_del, - .region_nop = kvm_region_nop, .log_start = kvm_log_start, .log_stop = kvm_log_stop, .log_sync = kvm_log_sync, @@ -841,16 +822,7 @@ static void kvm_io_ioeventfd_del(MemoryListener *listener, }; static MemoryListener kvm_io_listener = { - .begin = kvm_begin, - .commit = kvm_commit, - .region_add = kvm_region_nop, - .region_del = kvm_region_nop, - .region_nop = kvm_region_nop, - .log_start = kvm_region_nop, - .log_stop = kvm_region_nop, - .log_sync = kvm_region_nop, - .log_global_start = kvm_log_nop, - .log_global_stop = kvm_log_nop, + MEMORY_LISTENER_DEFAULT_OPS, .eventfd_add = kvm_io_ioeventfd_add, .eventfd_del = kvm_io_ioeventfd_del, .priority = 10,