From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Peter Crosthwaite <peter.crosthwaite@xilinx.com>,
Andreas Faerber <afaerber@suse.de>,
Stefan Hajnoczi <stefanha@redhat.com>,
Frederic Konrad <fred.konrad@greensocs.com>
Subject: [Qemu-devel] [PATCH 5/7] virtio-blk: drop virtio_blk_set_conf()
Date: Wed, 21 May 2014 22:22:50 +0200 [thread overview]
Message-ID: <1400703772-3324-6-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1400703772-3324-1-git-send-email-stefanha@redhat.com>
This function is no longer used since parent objects now use child
aliases to set the VirtIOBlkConf directly.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/block/virtio-blk.c | 6 ------
include/hw/virtio/virtio-blk.h | 2 --
2 files changed, 8 deletions(-)
diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index 52cd3c9..469e2b4 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -642,12 +642,6 @@ static const BlockDevOps virtio_block_ops = {
.resize_cb = virtio_blk_resize,
};
-void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk)
-{
- VirtIOBlock *s = VIRTIO_BLK(dev);
- memcpy(&(s->blk), blk, sizeof(struct VirtIOBlkConf));
-}
-
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
/* Disable dataplane thread during live migration since it does not
* update the dirty memory bitmap yet.
diff --git a/include/hw/virtio/virtio-blk.h b/include/hw/virtio/virtio-blk.h
index bea540c..794801c 100644
--- a/include/hw/virtio/virtio-blk.h
+++ b/include/hw/virtio/virtio-blk.h
@@ -159,8 +159,6 @@ typedef struct VirtIOBlock {
DEFINE_PROP_BIT("config-wce", _state, _field.config_wce, 0, true), \
DEFINE_PROP_IOTHREAD("x-iothread", _state, _field.iothread)
-void virtio_blk_set_conf(DeviceState *dev, VirtIOBlkConf *blk);
-
void virtio_blk_add_child_aliases(Object *obj, VirtIOBlock *s);
#endif
--
1.9.0
next prev parent reply other threads:[~2014-05-21 20:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 20:22 [Qemu-devel] [PATCH 0/7] virtio-blk: use alias properties in transport devices Stefan Hajnoczi
2014-05-21 20:22 ` [Qemu-devel] [PATCH 1/7] qom: add object_property_add_alias() Stefan Hajnoczi
2014-05-21 22:05 ` Paolo Bonzini
2014-05-22 10:23 ` Stefan Hajnoczi
2014-05-22 11:16 ` Paolo Bonzini
2014-05-22 14:02 ` Peter Crosthwaite
2014-05-22 14:05 ` Andreas Färber
2014-05-22 14:38 ` Stefan Hajnoczi
2014-05-23 6:23 ` Peter Crosthwaite
2014-05-22 14:05 ` Igor Mammedov
2014-05-22 14:39 ` Stefan Hajnoczi
2014-05-21 20:22 ` [Qemu-devel] [PATCH 2/7] virtio-blk: avoid qdev property definition duplication Stefan Hajnoczi
2014-05-21 20:22 ` [Qemu-devel] [PATCH 3/7] virtio-blk: move x-data-plane qdev property to virtio-blk.h Stefan Hajnoczi
2014-05-21 20:22 ` [Qemu-devel] [PATCH 4/7] virtio-blk: use aliases instead of duplicate qdev properties Stefan Hajnoczi
2014-05-21 22:04 ` Paolo Bonzini
2014-05-22 10:17 ` Stefan Hajnoczi
2014-05-22 11:15 ` Paolo Bonzini
2014-05-22 10:18 ` Andreas Färber
2014-05-22 10:24 ` Stefan Hajnoczi
2014-05-22 10:32 ` Andreas Färber
2014-05-22 14:08 ` Peter Crosthwaite
2014-05-21 20:22 ` Stefan Hajnoczi [this message]
2014-05-21 20:22 ` [Qemu-devel] [PATCH 6/7] virtio: fix virtio-blk child refcount in transports Stefan Hajnoczi
2014-05-21 20:22 ` [Qemu-devel] [PATCH 7/7] virtio-blk: move qdev properties into virtio-blk.c Stefan Hajnoczi
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=1400703772-3324-6-git-send-email-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=afaerber@suse.de \
--cc=fred.konrad@greensocs.com \
--cc=pbonzini@redhat.com \
--cc=peter.crosthwaite@xilinx.com \
--cc=qemu-devel@nongnu.org \
/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).