From: Thomas Huth <thuth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org
Cc: Amit Shah <amit.shah@redhat.com>,
Thomas Huth <thuth@linux.vnet.ibm.com>,
Juan Quintela <quintela@redhat.com>
Subject: [Qemu-devel] [PATCH v2 1/7] migration: Remove unused functions
Date: Sat, 14 Mar 2015 07:19:28 +0100 [thread overview]
Message-ID: <1426313974-25607-2-git-send-email-thuth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1426313974-25607-1-git-send-email-thuth@linux.vnet.ibm.com>
migrate_rdma_pin_all(), qsb_clone() and qsb_set_length()
are completely unused and thus can be deleted.
Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Cc: Juan Quintela <quintela@redhat.com>
Cc: Amit Shah <amit.shah@redhat.com>
---
include/migration/migration.h | 1 -
include/migration/qemu-file.h | 2 -
migration/migration.c | 9 -------
migration/qemu-file-buf.c | 53 -----------------------------------------
4 files changed, 0 insertions(+), 65 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index 703b7d7..0a1cea0 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -139,7 +139,6 @@ void migrate_add_blocker(Error *reason);
*/
void migrate_del_blocker(Error *reason);
-bool migrate_rdma_pin_all(void);
bool migrate_zero_blocks(void);
bool migrate_auto_converge(void);
diff --git a/include/migration/qemu-file.h b/include/migration/qemu-file.h
index a923cec..45d7f71 100644
--- a/include/migration/qemu-file.h
+++ b/include/migration/qemu-file.h
@@ -133,9 +133,7 @@ bool qemu_file_mode_is_not_valid(const char *mode);
bool qemu_file_is_writable(QEMUFile *f);
QEMUSizedBuffer *qsb_create(const uint8_t *buffer, size_t len);
-QEMUSizedBuffer *qsb_clone(const QEMUSizedBuffer *);
void qsb_free(QEMUSizedBuffer *);
-size_t qsb_set_length(QEMUSizedBuffer *qsb, size_t length);
size_t qsb_get_length(const QEMUSizedBuffer *qsb);
ssize_t qsb_get_buffer(const QEMUSizedBuffer *, off_t start, size_t count,
uint8_t *buf);
diff --git a/migration/migration.c b/migration/migration.c
index b3adbc6..6f1a490 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -540,15 +540,6 @@ void qmp_migrate_set_downtime(double value, Error **errp)
max_downtime = (uint64_t)value;
}
-bool migrate_rdma_pin_all(void)
-{
- MigrationState *s;
-
- s = migrate_get_current();
-
- return s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL];
-}
-
bool migrate_auto_converge(void)
{
MigrationState *s;
diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c
index e56a8ad..d075569 100644
--- a/migration/qemu-file-buf.c
+++ b/migration/qemu-file-buf.c
@@ -128,28 +128,6 @@ size_t qsb_get_length(const QEMUSizedBuffer *qsb)
}
/**
- * Set the length of the buffer; the primary usage of this
- * function is to truncate the number of used bytes in the buffer.
- * The size will not be extended beyond the current number of
- * allocated bytes in the QEMUSizedBuffer.
- *
- * @qsb: A QEMUSizedBuffer
- * @new_len: The new length of bytes in the buffer
- *
- * Returns the number of bytes the buffer was truncated or extended
- * to.
- */
-size_t qsb_set_length(QEMUSizedBuffer *qsb, size_t new_len)
-{
- if (new_len <= qsb->size) {
- qsb->used = new_len;
- } else {
- qsb->used = qsb->size;
- }
- return qsb->used;
-}
-
-/**
* Get the iovec that holds the data for a given position @pos.
*
* @qsb: A QEMUSizedBuffer
@@ -365,37 +343,6 @@ ssize_t qsb_write_at(QEMUSizedBuffer *qsb, const uint8_t *source,
return count;
}
-/**
- * Create a deep copy of the given QEMUSizedBuffer.
- *
- * @qsb: A QEMUSizedBuffer
- *
- * Returns a clone of @qsb or NULL on allocation failure
- */
-QEMUSizedBuffer *qsb_clone(const QEMUSizedBuffer *qsb)
-{
- QEMUSizedBuffer *out = qsb_create(NULL, qsb_get_length(qsb));
- size_t i;
- ssize_t res;
- off_t pos = 0;
-
- if (!out) {
- return NULL;
- }
-
- for (i = 0; i < qsb->n_iov; i++) {
- res = qsb_write_at(out, qsb->iov[i].iov_base,
- pos, qsb->iov[i].iov_len);
- if (res < 0) {
- qsb_free(out);
- return NULL;
- }
- pos += res;
- }
-
- return out;
-}
-
typedef struct QEMUBuffer {
QEMUSizedBuffer *qsb;
QEMUFile *file;
--
1.7.1
next prev parent reply other threads:[~2015-03-14 6:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-14 6:19 [Qemu-devel] [PATCH v2 0/7] Remove more unused functions Thomas Huth
2015-03-14 6:19 ` Thomas Huth [this message]
2015-03-17 13:44 ` [Qemu-devel] [PATCH v2 1/7] migration: Remove " Juan Quintela
2015-03-14 6:19 ` [Qemu-devel] [PATCH v2 2/7] vmxnet: Remove unused function vmxnet_rx_pkt_get_num_frags() Thomas Huth
2015-03-14 7:35 ` Dmitry Fleytman
2015-03-14 6:19 ` [Qemu-devel] [PATCH v2 3/7] pci: Remove unused function ich9_d2pbr_init() Thomas Huth
2015-03-18 13:20 ` Michael S. Tsirkin
2015-03-20 7:40 ` Thomas Huth
2015-03-14 6:19 ` [Qemu-devel] [PATCH v2 4/7] monitor: Remove unused functions Thomas Huth
2015-03-14 6:19 ` [Qemu-devel] [PATCH v2 5/7] usb: " Thomas Huth
2015-03-14 6:19 ` [Qemu-devel] [PATCH v2 6/7] util: " Thomas Huth
2015-03-14 6:19 ` [Qemu-devel] [PATCH v2 7/7] Remove various " Thomas Huth
2015-04-27 11:27 ` [Qemu-devel] [PATCH v2 0/7] Remove more " Michael Tokarev
2015-04-27 18:09 ` Stefan Weil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1426313974-25607-2-git-send-email-thuth@linux.vnet.ibm.com \
--to=thuth@linux.vnet.ibm.com \
--cc=amit.shah@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).