From patchwork Tue Apr 12 11:55:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 8809791 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 055889F39A for ; Tue, 12 Apr 2016 12:00:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 19C2A2035B for ; Tue, 12 Apr 2016 12:00:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6BEDD20148 for ; Tue, 12 Apr 2016 12:00:46 +0000 (UTC) Received: from localhost ([::1]:47957 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apwzt-0006dk-Sr for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Apr 2016 08:00:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apwvA-0004jI-Fd for qemu-devel@nongnu.org; Tue, 12 Apr 2016 07:55:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1apwv9-0008Pl-L4 for qemu-devel@nongnu.org; Tue, 12 Apr 2016 07:55:52 -0400 Received: from mail-qg0-x231.google.com ([2607:f8b0:400d:c04::231]:33188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1apwv9-0008PZ-EX for qemu-devel@nongnu.org; Tue, 12 Apr 2016 07:55:51 -0400 Received: by mail-qg0-x231.google.com with SMTP id j35so13218953qge.0 for ; Tue, 12 Apr 2016 04:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=z+wo7Jz1vVe0PgQNDbgSs4hFajlvJtScSROBwoCz20A=; b=h2V2D23POh2j7qnAqz9B4ZdVRi513bWFocxW19+8ZOo3QXTUx5bEUeq03BqSLICd6d WDOKqfrs9cG2nViQBjg8oarVLoMR3IMpBZFeBfna+h1Z88si2cnB9HUsUc5AuSHoaszD ZO59JUt0pGsJiWgqnUiaCh9L0M6IH/f9uPhhd50wdJ/7g1Uw+UsqjBj8V8Iu0MBjnev6 4j7s/TRkvZc/j80IzZuOwFdp7WTKHDPlusoiur8jDTUlPQENzcaDzLJeQko1WVPT6Xy/ WRcK+wgSTpvGaRtj4SAF46kWQ6jFmRU3MMo3ybgrOVeyR9TxUUzhayU+5hESmI+hT7+d 99bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=z+wo7Jz1vVe0PgQNDbgSs4hFajlvJtScSROBwoCz20A=; b=C4wpTL7Ie1VmdygbvwzLtcKfhuojskiR4tULCQnunApkUQ4t9UDAkORjo5rWEj1WLe eGRG7FgyxBFj+2dzWF71iYA++63EIaP164zlCs01qific1s+GswpGMupFClOmiMEoe1w o7XJP+iwrPPC0DVwQ+pCODk2mFsGULESavEoXpsTEVq/qXkbK685Cj4DhfX2P0Z95ZQe oxVyAy7sI1oPIuTSRTL46kspGVOhHnXzcQXpyBnPVVTgdy1GUvzjiZoiFvXysKdsPGGR wOZYM3uqKtcyIa2eTbUxjqr2OymSuvbFH19LJI0eZvGthMpt/uQBU6oRUU7KhZebURIf ZiNw== X-Gm-Message-State: AOPr4FWZYhB4pjbS+ZHd+i+UQZ6QEEVu/wvRW6jUT9S8Ia3Bdcfy7E0bPr9pOd5fssphEg== X-Received: by 10.140.159.18 with SMTP id f18mr3321114qhf.61.1460462150751; Tue, 12 Apr 2016 04:55:50 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id f139sm1429609qke.43.2016.04.12.04.55.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Apr 2016 04:55:50 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Tue, 12 Apr 2016 13:55:26 +0200 Message-Id: <1460462129-17363-7-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460462129-17363-1-git-send-email-marcandre.lureau@redhat.com> References: <1460462129-17363-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c04::231 Subject: [Qemu-devel] [PATCH 6/9] exec: remove qemu_set_ram_fd() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc-André Lureau If the previous ivshmem patch is applied, qemu_set_ram_fd() is no longer used. Signed-off-by: Marc-André Lureau --- exec.c | 10 ---------- include/exec/ram_addr.h | 1 - 2 files changed, 11 deletions(-) diff --git a/exec.c b/exec.c index 8675b5e..ec72064 100644 --- a/exec.c +++ b/exec.c @@ -1873,16 +1873,6 @@ int qemu_get_ram_fd(ram_addr_t addr) return fd; } -void qemu_set_ram_fd(ram_addr_t addr, int fd) -{ - RAMBlock *block; - - rcu_read_lock(); - block = qemu_get_ram_block(addr); - block->fd = fd; - rcu_read_unlock(); -} - void *qemu_get_ram_block_host_ptr(ram_addr_t addr) { RAMBlock *block; diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 153f1b2..3a21aee 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -109,7 +109,6 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t max_size, void *host), MemoryRegion *mr, Error **errp); int qemu_get_ram_fd(ram_addr_t addr); -void qemu_set_ram_fd(ram_addr_t addr, int fd); void *qemu_get_ram_block_host_ptr(ram_addr_t addr); void qemu_ram_free(RAMBlock *block);