From patchwork Wed Mar 27 16:36:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 231748 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 6A2BE2C007E for ; Thu, 28 Mar 2013 03:37:44 +1100 (EST) Received: from localhost ([::1]:50219 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKtM4-0006zY-DT for incoming@patchwork.ozlabs.org; Wed, 27 Mar 2013 12:37:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45544) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKtL8-00068Q-IW for qemu-devel@nongnu.org; Wed, 27 Mar 2013 12:36:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKtL6-0002q9-NS for qemu-devel@nongnu.org; Wed, 27 Mar 2013 12:36:42 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:48319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKtL6-0002pb-Gl for qemu-devel@nongnu.org; Wed, 27 Mar 2013 12:36:40 -0400 Received: by mail-ee0-f46.google.com with SMTP id e49so4529524eek.33 for ; Wed, 27 Mar 2013 09:36:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=emjSCq0AaMX4BSNTiu4nt43SlCd4imK3yb+sHBx12Yw=; b=NJ0N1GgVK/0a1c4gwdFA3cWmvRHTin2EK1pv19tiMWtvJTe+YVYt3Dfzr7fAIE129+ 9xuIZMKercPmzQFo5dbHHj/pw4PcsrLwgpXO6wuGpk9EPmqgV5dpD6tDWqpK2RH0bXDJ MHlo+OXyj8PLWXu1KVQDqwE+KPi2rhVtxfknhHKQKOrTqP+JqykuYpCvU1pWTC5o1Upp eGN3bEchb+V6xrGoup0cqwciyeHRt6szA26BaeYZgOqTiEQ603guHddmMhJ6r2iCUfO0 MKiiyhOzOOT8dfO4UdYkP0dOtwLNp4/IKPF0KfrrQXCH7QkgvPgfnpQNCTOxmAFPV7HO opeQ== X-Received: by 10.14.111.72 with SMTP id v48mr57589280eeg.11.1364402199663; Wed, 27 Mar 2013 09:36:39 -0700 (PDT) Received: from playground.lan (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id d47sm32366397eem.9.2013.03.27.09.36.37 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 27 Mar 2013 09:36:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 27 Mar 2013 17:36:27 +0100 Message-Id: <1364402192-18169-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1364402192-18169-1-git-send-email-pbonzini@redhat.com> References: <1364402192-18169-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.46 Cc: owasserm@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH 1/6] qemu-file: drop socket_put_buffer 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 It is enough to implement one of socket_writev_buffer and socket_put_buffer. Signed-off-by: Paolo Bonzini Reviewed-by: Juan Quintela --- savevm.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/savevm.c b/savevm.c index 406caa9..0415830 100644 --- a/savevm.c +++ b/savevm.c @@ -219,18 +219,6 @@ static int socket_get_buffer(void *opaque, uint8_t *buf, int64_t pos, int size) return len; } -static int socket_put_buffer(void *opaque, const uint8_t *buf, int64_t pos, int size) -{ - QEMUFileSocket *s = opaque; - ssize_t len; - - len = qemu_send_full(s->fd, buf, size, 0); - if (len < size) { - len = -socket_error(); - } - return len; -} - static int socket_close(void *opaque) { QEMUFileSocket *s = opaque; @@ -404,7 +392,6 @@ static const QEMUFileOps socket_read_ops = { static const QEMUFileOps socket_write_ops = { .get_fd = socket_get_fd, - .put_buffer = socket_put_buffer, .writev_buffer = socket_writev_buffer, .close = socket_close };