Skip to contentSkip to conversation

ivshmem: Last minute changes

PATCH In review Markus Armbruster 2 participants 19 messages Nov 24, 2015 – Nov 25, 2015

lore
Share & tools
lore
#0 lore raw

cover ivshmem: Last minute changes

Straightforward fixes [PATCH 1-4] and a property rename to prepare for fixing of design flaws in the next development cycle [PATCH 5].

Markus Armbruster (5):
qemu-doc: Fix ivshmem example markup
qemu-doc: Fix ivshmem usage example with shm=... tests/ivshmem-test: Supply missing initializer in get_device()
ivshmem: Mark questionable socket type test FIXME
ivshmem: Rename property memdev to x-memdev for 2.5

 hw/misc/ivshmem.c    | 9 ++++-----
 qemu-doc.texi        | 8 ++++----
 tests/ivshmem-test.c | 3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/5 qemu-doc: Fix ivshmem example markup

Use @var{foo} like we do everywhere else, not <foo>.

---
 qemu-doc.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
qemu-doc.texi +4 -4
index 460ab71..c9b7069 100644
@@ -1256,7 +1256,7 @@ zero-copy communication to the application level of the guests.  The basic
 syntax is:
 
 @example
-qemu-system-i386 -device ivshmem,size=<size in format accepted by -m>[,shm=<shm name>]
+qemu-system-i386 -device ivshmem,size=@var{size}[,shm=@var{shm-name}]
 @end example
 
 If desired, interrupts can be sent between guest VMs accessing the same shared
@@ -1267,12 +1267,12 @@ memory server is:
 
 @example
 # First start the ivshmem server once and for all
-ivshmem-server -p <pidfile> -S <path> -m <shm name> -l <shm size> -n <vectors n>
+ivshmem-server -p @var{pidfile} -S @var{path} -m @var{shm-name} -l @var{shm-size} -n @var{vectors}
 
 # Then start your qemu instances with matching arguments
-qemu-system-i386 -device ivshmem,size=<shm size>,vectors=<vectors n>,chardev=<id>
+qemu-system-i386 -device ivshmem,size=@var{shm-size},vectors=@var{vectors},chardev=@var{id}
                  [,msi=on][,ioeventfd=on][,role=peer|master]
-                 -chardev socket,path=<path>,id=<id>
+                 -chardev socket,path=@var{path},id=@var{id}
 @end example
 
 When using the server, the guest will be assigned a VM ID (>=0) that allows guests
Signature · 1 line
2.4.3
Reviewed-by on v1 1/5
#2 lore raw

Re: [Qemu-devel] [PATCH for-2.5 1/5] qemu-doc: Fix ivshmem example markup

----- Original Message -----

Quoted 3 lines

Use @var{foo} like we do everywhere else, not <foo>.

Quoted 45 lines
---
 qemu-doc.texi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
qemu-doc.texi +0 -0
index 460ab71..c9b7069 100644
@@ -1256,7 +1256,7 @@ zero-copy communication to the application level of the

guests. The basic
syntax is:

@example

qemu-doc.texi +1 -3
-qemu-system-i386 -device ivshmem,size=<size in format accepted by
-m>[,shm=<shm name>]
+qemu-system-i386 -device ivshmem,size=@var{size}[,shm=@var{shm-name}]
 @end example
 
 If desired, interrupts can be sent between guest VMs accessing the same
 shared
@@ -1267,12 +1267,12 @@ memory server is:
 
 @example
 # First start the ivshmem server once and for all
-ivshmem-server -p <pidfile> -S <path> -m <shm name> -l <shm size> -n

<vectors n>
+ivshmem-server -p @var{pidfile} -S @var{path} -m @var{shm-name} -l @var{shm-size} -n @var{vectors}

# Then start your qemu instances with matching arguments
-qemu-system-i386 -device ivshmem,size=<shm size>,vectors=<vectors n>,chardev=<id>
+qemu-system-i386 -device ivshmem,size=@var{shm-size},vectors=@var{vectors},chardev=@var{id}

                  [,msi=on][,ioeventfd=on][,role=peer|master]
qemu-doc.texi +1 -2
-                 -chardev socket,path=<path>,id=<id>
+                 -chardev socket,path=@var{path},id=@var{id}
 @end example
 
 When using the server, the guest will be assigned a VM ID (>=0) that allows
 guests
--

2.4.3

#3 lore raw

PATCH 2/5 qemu-doc: Fix ivshmem usage example with shm=...

In reply to Markus Armbruster

The example suggests you can omit "shm". This isn't true; you must specify exactly one of "shm", "chardev", "memdev". Fix it.

---
 qemu-doc.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-doc.texi +1 -1
index c9b7069..68ca075 100644
@@ -1256,7 +1256,7 @@ zero-copy communication to the application level of the guests.  The basic
 syntax is:
 
 @example
-qemu-system-i386 -device ivshmem,size=@var{size}[,shm=@var{shm-name}]
+qemu-system-i386 -device ivshmem,size=@var{size},shm=@var{shm-name}
 @end example
 
 If desired, interrupts can be sent between guest VMs accessing the same shared
Signature · 1 line
2.4.3
Reviewed-by on v1 2/5
#4 lore raw

Re: [Qemu-devel] [PATCH for-2.5 2/5] qemu-doc: Fix ivshmem usage example with shm=...

----- Original Message -----

Quoted 4 lines

The example suggests you can omit "shm". This isn't true; you must specify exactly one of "shm", "chardev", "memdev". Fix it.

Quoted 23 lines
---
 qemu-doc.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
qemu-doc.texi +0 -0
index c9b7069..68ca075 100644
@@ -1256,7 +1256,7 @@ zero-copy communication to the application level of the

guests. The basic
syntax is:

@example

qemu-doc.texi +1 -2
-qemu-system-i386 -device ivshmem,size=@var{size}[,shm=@var{shm-name}]
+qemu-system-i386 -device ivshmem,size=@var{size},shm=@var{shm-name}
 @end example
 
 If desired, interrupts can be sent between guest VMs accessing the same
 shared
--

2.4.3

#5 lore raw

PATCH 3/5 tests/ivshmem-test: Supply missing initializer in get_device()

In reply to Markus Armbruster

If the device isn't found, the assertion uses dev without initialization. Fix that.

---
 tests/ivshmem-test.c | 1 +
 1 file changed, 1 insertion(+)
tests/ivshmem-test.c +1 -0
index f1793ba..8f1a849 100644
@@ -40,6 +40,7 @@ static QPCIDevice *get_device(void)
     QPCIBus *pcibus;
 
     pcibus = qpci_init_pc();
+    dev = NULL;
     qpci_device_foreach(pcibus, 0x1af4, 0x1110, save_fn, &dev);
     g_assert(dev != NULL);
 
Signature · 1 line
2.4.3
Reviewed-by on v1 3/5
#6 lore raw

Re: [Qemu-devel] [PATCH for-2.5 3/5] tests/ivshmem-test: Supply missing initializer in get_device()

----- Original Message -----

Quoted 4 lines

If the device isn't found, the assertion uses dev without initialization. Fix that.

my bad :)

Quoted 20 lines
---
 tests/ivshmem-test.c | 1 +
 1 file changed, 1 insertion(+)
tests/ivshmem-test.c +1 -1
index f1793ba..8f1a849 100644
@@ -40,6 +40,7 @@ static QPCIDevice *get_device(void)
     QPCIBus *pcibus;
 
     pcibus = qpci_init_pc();
+    dev = NULL;
     qpci_device_foreach(pcibus, 0x1af4, 0x1110, save_fn, &dev);
     g_assert(dev != NULL);
 
--

2.4.3

#7 lore raw

PATCH 4/5 ivshmem: Mark questionable socket type test FIXME

In reply to Markus Armbruster
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/misc/ivshmem.c +1 -0
index 83d7bd3..a6bfdde 100644
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error **errp)
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {
+        /* FIXME replace this test, it works basically by chance */
         if (strncmp(s->server_chr->filename, "unix:", 5)) {
             error_setg(errp, "chardev is not a unix client socket");
             return;
Signature · 1 line
2.4.3
Reviewed-by on v1 4/5
#8 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

----- Original Message -----

Quoted 10 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/misc/ivshmem.c +0 -0
index 83d7bd3..a6bfdde 100644

hw/misc/ivshmem.c static void pci_ivshmem_realize(PCIDevice *dev, Error · line 943

Quoted 5 lines
hw/misc/ivshmem.c +1 -0
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
 **errp)
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {
+        /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

Quoted 7 lines
hw/misc/ivshmem.c +0 -0
         if (strncmp(s->server_chr->filename, "unix:", 5)) {
             error_setg(errp, "chardev is not a unix client socket");
             return;

--
2.4.3

#9 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

Quoted 6 lines · Marc-André Lureau

----- Original Message -----

Quoted 5 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
Quoted 12 lines

hw/misc/ivshmem.c static void pci_ivshmem_realize(PCIDevice *dev, Error · line 943

Quoted 10 lines
hw/misc/ivshmem.c +1 -0
index 83d7bd3..a6bfdde 100644
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
 **errp)
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {
+        /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

I'm happy to consider a rephrased comment.

Quoted 1 line

Thanks!

Quoted 7 lines
Quoted 7 lines
hw/misc/ivshmem.c +0 -0
         if (strncmp(s->server_chr->filename, "unix:", 5)) {
             error_setg(errp, "chardev is not a unix client socket");
             return;

--
2.4.3

#10 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

Hi

----- Original Message -----

Quoted 21 lines
Quoted 6 lines · Marc-André Lureau

----- Original Message -----

Quoted 5 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
Quoted 12 lines

hw/misc/ivshmem.c static void pci_ivshmem_realize(PCIDevice *dev, Error · line 943

Quoted 10 lines
hw/misc/ivshmem.c +1 -0
index 83d7bd3..a6bfdde 100644
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
 **errp)
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {
+        /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

Quoted 1 line

I'm happy to consider a rephrased comment.

Although Paolo used "chance" too, I think the proper comment would be the following:

FIXME: only pty and socket chardevs set chr->filename, other set to the default---the backend name.

ie, to me it's not just by "chance" :)

Quoted 12 lines
Quoted 1 line

Thanks!

Quoted 7 lines
Quoted 7 lines
hw/misc/ivshmem.c +0 -0
         if (strncmp(s->server_chr->filename, "unix:", 5)) {
             error_setg(errp, "chardev is not a unix client socket");
             return;

--
2.4.3

#11 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

Quoted 24 lines · Marc-André Lureau

Hi

----- Original Message -----

Quoted 21 lines
Quoted 18 lines · Marc-André Lureau

----- Original Message -----

Quoted 10 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/misc/ivshmem.c +0 -0
index 83d7bd3..a6bfdde 100644

hw/misc/ivshmem.c static void pci_ivshmem_realize(PCIDevice *dev, Error · line 943

Quoted 5 lines
hw/misc/ivshmem.c +1 -0
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev, Error
 **errp)
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {
+        /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

Quoted 7 lines
Quoted 1 line

I'm happy to consider a rephrased comment.

Although Paolo used "chance" too, I think the proper comment would be the following:

FIXME: only pty and socket chardevs set chr->filename, other set to the default---the backend name.

I'm afraid that doesn't convey what needs fixing.

Quoted 1 line

ie, to me it's not just by "chance" :)

Well, it's certainly not by design!

What about:

+ /* FIXME do not rely on what chr drivers put into filename */

[...]

#12 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

----- Original Message -----

Quoted 37 lines
Quoted 25 lines · Marc-André Lureau

Hi

----- Original Message -----

Quoted 22 lines
Quoted 19 lines · Marc-André Lureau

----- Original Message -----

Quoted 12 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/misc/ivshmem.c +0 -0
index 83d7bd3..a6bfdde 100644
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev,

Error
**errp)

Quoted 4 lines
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {

+ /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

Quoted 7 lines
Quoted 1 line

I'm happy to consider a rephrased comment.

Although Paolo used "chance" too, I think the proper comment would be the following:

FIXME: only pty and socket chardevs set chr->filename, other set to the default---the backend name.

I'm afraid that doesn't convey what needs fixing.

Quoted 7 lines
Quoted 1 line

ie, to me it's not just by "chance" :)

Well, it's certainly not by design!

What about:

+ /* FIXME do not rely on what chr drivers put into filename */

ack

Quoted 3 lines

[...]

#13 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

Quoted 40 lines · Marc-André Lureau

----- Original Message -----

Quoted 39 lines
Quoted 25 lines · Marc-André Lureau

Hi

----- Original Message -----

Quoted 22 lines
Quoted 19 lines · Marc-André Lureau

----- Original Message -----

Quoted 12 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/misc/ivshmem.c +0 -0
index 83d7bd3..a6bfdde 100644
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev,

Error
**errp)

Quoted 4 lines
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {

+ /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

Quoted 7 lines
Quoted 1 line

I'm happy to consider a rephrased comment.

Although Paolo used "chance" too, I think the proper comment would be the following:

FIXME: only pty and socket chardevs set chr->filename, other set to the default---the backend name.

I'm afraid that doesn't convey what needs fixing.

Quoted 1 line

ie, to me it's not just by "chance" :)

Quoted 7 lines
Quoted 5 lines

Well, it's certainly not by design!

What about:

+ /* FIXME do not rely on what chr drivers put into filename */

ack

Will you prepare a pull request, or would you like me to do it?

#14 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

Hi

----- Original Message -----

Quoted 44 lines
Quoted 42 lines · Marc-André Lureau

----- Original Message -----

Quoted 41 lines
Quoted 25 lines · Marc-André Lureau

Hi

----- Original Message -----

Quoted 22 lines
Quoted 19 lines · Marc-André Lureau

----- Original Message -----

Quoted 12 lines
---
 hw/misc/ivshmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/misc/ivshmem.c +0 -0
index 83d7bd3..a6bfdde 100644
@@ -939,6 +939,7 @@ static void pci_ivshmem_realize(PCIDevice *dev,

Error
**errp)

Quoted 4 lines
         memory_region_add_subregion(&s->bar, 0, mr);
         pci_register_bar(PCI_DEVICE(s), 2, attr, &s->bar);
     } else if (s->server_chr != NULL) {

+ /* FIXME replace this test, it works basically by chance */

I wouldn't say it like that, but ack anyway.

Quoted 7 lines
Quoted 1 line

I'm happy to consider a rephrased comment.

Although Paolo used "chance" too, I think the proper comment would be the following:

FIXME: only pty and socket chardevs set chr->filename, other set to the default---the backend name.

I'm afraid that doesn't convey what needs fixing.

Quoted 1 line

ie, to me it's not just by "chance" :)

Well, it's certainly not by design!

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

What about:

+ /* FIXME do not rely on what chr drivers put into filename */

ack

Will you prepare a pull request, or would you like me to do it?

Please do it (I am not the ivshmem maintainer ;)

#15 lore raw

Re: [Qemu-devel] [PATCH for-2.5 4/5] ivshmem: Mark questionable socket type test FIXME

Quoted 4 lines · Marc-André Lureau
Quoted 2 lines

Will you prepare a pull request, or would you like me to do it?

Please do it (I am not the ivshmem maintainer ;)

You touched it, you own it! ;-P

One pull request coming up.

#16 lore raw

PATCH 5/5 ivshmem: Rename property memdev to x-memdev for 2.5

In reply to Markus Armbruster

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.

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.

---
 hw/misc/ivshmem.c    | 8 +++-----
 tests/ivshmem-test.c | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
hw/misc/ivshmem.c +3 -5
index a6bfdde..e24f9ee 100644
@@ -60,8 +60,6 @@
 #define IVSHMEM(obj) \
     OBJECT_CHECK(IVShmemState, (obj), TYPE_IVSHMEM)
 
-#define IVSHMEM_MEMDEV_PROP "memdev"
-
 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;
 
     if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 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'");
         return;
     }
 
@@ -1182,7 +1180,7 @@ static void ivshmem_init(Object *obj)
 {
     IVShmemState *s = IVSHMEM(obj);
 
-    object_property_add_link(obj, IVSHMEM_MEMDEV_PROP, TYPE_MEMORY_BACKEND,
+    object_property_add_link(obj, "x-memdev", TYPE_MEMORY_BACKEND,
                              (Object **)&s->hostmem,
                              ivshmem_check_memdev_is_busy,
                              OBJ_PROP_LINK_UNREF_ON_RELEASE,
tests/ivshmem-test.c +1 -1
index 8f1a849..03c7b96 100644
@@ -393,7 +393,7 @@ static void test_ivshmem_memdev(void)
 
     /* just for the sake of checking memory-backend property */
     setup_vm_cmd(&state, "-object memory-backend-ram,size=1M,id=mb1"
-                 " -device ivshmem,memdev=mb1", false);
+                 " -device ivshmem,x-memdev=mb1", false);
 
     qtest_quit(state.qtest);
 }
Signature · 1 line
2.4.3
Reviewed-by on v1 5/5
#17 lore raw

Re: [Qemu-devel] [PATCH for-2.5 5/5] ivshmem: Rename property memdev to x-memdev for 2.5

----- Original Message -----

Quoted 8 lines

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.

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,

Quoted 12 lines
---
 hw/misc/ivshmem.c    | 8 +++-----
 tests/ivshmem-test.c | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
hw/misc/ivshmem.c +0 -0
index a6bfdde..e24f9ee 100644

hw/misc/ivshmem.c line 64

Quoted 5 lines
hw/misc/ivshmem.c +0 -2
@@ -60,8 +60,6 @@
 #define IVSHMEM(obj) \
     OBJECT_CHECK(IVShmemState, (obj), TYPE_IVSHMEM)
 
-#define IVSHMEM_MEMDEV_PROP "memdev"
-

I agree the define is unneeded, I probably adapted the code from pc-dimm which declare it in public header (not sure why btw)

hw/misc/ivshmem.c static void pci_ivshmem_realize(PCIDevice *dev, Error · line 861

Quoted 13 lines
hw/misc/ivshmem.c +2 -2
 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;
 
     if (!!s->server_chr + !!s->shmobj + !!s->hostmem != 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

Quoted 29 lines
hw/misc/ivshmem.c +0 -0
         return;
     }
hw/misc/ivshmem.c +1 -1
@@ -1182,7 +1180,7 @@ static void ivshmem_init(Object *obj)
 {
     IVShmemState *s = IVSHMEM(obj);
 
-    object_property_add_link(obj, IVSHMEM_MEMDEV_PROP, TYPE_MEMORY_BACKEND,
+    object_property_add_link(obj, "x-memdev", TYPE_MEMORY_BACKEND,
                              (Object **)&s->hostmem,
                              ivshmem_check_memdev_is_busy,
                              OBJ_PROP_LINK_UNREF_ON_RELEASE,
tests/ivshmem-test.c +1 -2
index 8f1a849..03c7b96 100644
@@ -393,7 +393,7 @@ static void test_ivshmem_memdev(void)
 
     /* just for the sake of checking memory-backend property */
     setup_vm_cmd(&state, "-object memory-backend-ram,size=1M,id=mb1"
-                 " -device ivshmem,memdev=mb1", false);
+                 " -device ivshmem,x-memdev=mb1", false);
 
     qtest_quit(state.qtest);
 }
--

2.4.3

#18 lore raw

Re: [Qemu-devel] [PATCH for-2.5 5/5] ivshmem: Rename property memdev to x-memdev for 2.5

In reply to Markus Armbruster

Forgot to include the doc update. Need to squash in:

qemu-doc.texi +1 -1
index 460ab71..45d37e5 100644
@@ -1300,7 +1300,7 @@ a memory backend that has hugepage support:
 
 @example
 qemu-system-i386 -object memory-backend-file,size=1G,mem-path=/mnt/hugepages/my-shmem-file,id=mb1
-                 -device ivshmem,memdev=mb1
+                 -device ivshmem,x-memdev=mb1
 @end example
 
 ivshmem-server also supports hugepages mount points with the