| Message ID | 20131125145620.7562.67873.stgit@bahia.lab.toulouse-stg.fr.ibm.com |
|---|---|
| State | New |
| Headers | show |
Is anyone going to pull this series anywhere? Thanks! On Tue, Nov 26, 2013 at 1:56 AM, Greg Kurz <gkurz@linux.vnet.ibm.com> wrote: > Note that st*_raw and ld*_raw are effectively replaced by st*_p and ld*_p. > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > --- > hw/9pfs/virtio-9p-device.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c > index f0ffbe8..72ef60a 100644 > --- a/hw/9pfs/virtio-9p-device.c > +++ b/hw/9pfs/virtio-9p-device.c > @@ -19,6 +19,7 @@ > #include "fsdev/qemu-fsdev.h" > #include "virtio-9p-xattr.h" > #include "virtio-9p-coth.h" > +#include "hw/virtio/virtio-access.h" > > static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t > features) > { > @@ -34,7 +35,7 @@ static void virtio_9p_get_config(VirtIODevice *vdev, > uint8_t *config) > > len = strlen(s->tag); > cfg = g_malloc0(sizeof(struct virtio_9p_config) + len); > - stw_raw(&cfg->tag_len, len); > + virtio_stw_p(&cfg->tag_len, len); > /* We don't copy the terminating null to config space */ > memcpy(cfg->tag, s->tag, len); > memcpy(config, cfg, s->config_size); > > >
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index f0ffbe8..72ef60a 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -19,6 +19,7 @@ #include "fsdev/qemu-fsdev.h" #include "virtio-9p-xattr.h" #include "virtio-9p-coth.h" +#include "hw/virtio/virtio-access.h" static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features) { @@ -34,7 +35,7 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) len = strlen(s->tag); cfg = g_malloc0(sizeof(struct virtio_9p_config) + len); - stw_raw(&cfg->tag_len, len); + virtio_stw_p(&cfg->tag_len, len); /* We don't copy the terminating null to config space */ memcpy(cfg->tag, s->tag, len); memcpy(config, cfg, s->config_size);
Note that st*_raw and ld*_raw are effectively replaced by st*_p and ld*_p. Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> --- hw/9pfs/virtio-9p-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)