From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40172) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1HH0-0000vS-AX for qemu-devel@nongnu.org; Tue, 24 Nov 2015 12:20:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1HGx-0002Kg-6N for qemu-devel@nongnu.org; Tue, 24 Nov 2015 12:20:58 -0500 Received: from mx4-phx2.redhat.com ([209.132.183.25]:32859) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1HGw-0002JP-S5 for qemu-devel@nongnu.org; Tue, 24 Nov 2015 12:20:55 -0500 Date: Tue, 24 Nov 2015 12:20:49 -0500 (EST) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <995141504.16573140.1448385649670.JavaMail.zimbra@redhat.com> In-Reply-To: <1448384789-14830-6-git-send-email-armbru@redhat.com> References: <1448384789-14830-1-git-send-email-armbru@redhat.com> <1448384789-14830-6-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.5 5/5] ivshmem: Rename property memdev to x-memdev for 2.5 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: marcandre lureau , claudio fontana , qemu-devel@nongnu.org ----- Original Message ----- > The device's guest interface and its QEMU user interface are > flawed^Whotly debated. We'll resolve that in the next development > cycle, probably by deprecating the device in favour of a cleaned up, > but not quite compatible revision. >=20 > To avoid adding more baggage to the soon-to-be-deprecated interface, > mark property "memdev" as experimental, by renaming it to "x-memdev". > It's the only recent user interface change. Sounds good to me, Reviewed-by: Marc-Andr=C3=A9 Lureau >=20 > Signed-off-by: Markus Armbruster > --- > hw/misc/ivshmem.c | 8 +++----- > tests/ivshmem-test.c | 2 +- > 2 files changed, 4 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c > index a6bfdde..e24f9ee 100644 > --- a/hw/misc/ivshmem.c > +++ b/hw/misc/ivshmem.c > @@ -60,8 +60,6 @@ > #define IVSHMEM(obj) \ > OBJECT_CHECK(IVShmemState, (obj), TYPE_IVSHMEM) > =20 > -#define IVSHMEM_MEMDEV_PROP "memdev" > - I agree the define is unneeded, I probably adapted the code from pc-dimm wh= ich declare it in public header (not sure why btw) > typedef struct Peer { > int nb_eventfds; > EventNotifier *eventfds; > @@ -857,8 +855,8 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error > **errp) > PCI_BASE_ADDRESS_MEM_PREFETCH; > =20 > if (!!s->server_chr + !!s->shmobj + !!s->hostmem !=3D 1) { > - error_setg(errp, "You must specify either a shmobj, a chardev" > - " or a hostmem"); > + error_setg(errp, > + "You must specify either 'shm', 'chardev' or > 'x-memdev'"); nice improvement > return; > } > =20 > @@ -1182,7 +1180,7 @@ static void ivshmem_init(Object *obj) > { > IVShmemState *s =3D IVSHMEM(obj); > =20 > - object_property_add_link(obj, IVSHMEM_MEMDEV_PROP, TYPE_MEMORY_BACKE= ND, > + object_property_add_link(obj, "x-memdev", TYPE_MEMORY_BACKEND, > (Object **)&s->hostmem, > ivshmem_check_memdev_is_busy, > OBJ_PROP_LINK_UNREF_ON_RELEASE, > diff --git a/tests/ivshmem-test.c b/tests/ivshmem-test.c > index 8f1a849..03c7b96 100644 > --- a/tests/ivshmem-test.c > +++ b/tests/ivshmem-test.c > @@ -393,7 +393,7 @@ static void test_ivshmem_memdev(void) > =20 > /* just for the sake of checking memory-backend property */ > setup_vm_cmd(&state, "-object memory-backend-ram,size=3D1M,id=3Dmb1" > - " -device ivshmem,memdev=3Dmb1", false); > + " -device ivshmem,x-memdev=3Dmb1", false); > =20 > qtest_quit(state.qtest); > } > -- > 2.4.3 >=20 >=20