On Thu, 2017-04-06 at 16:04 +0200, Francois Gouget wrote:
> On Tue, 4 Apr 2017, Jonathon Jongsma wrote:
>
> > Acked-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
>
> Could you or someone else please commit this patch?
Sure. I've pushed both patches now.
Thanks,
Jonathon
>
>
> > On Tue, 2017-04-04 at 17:02 +0200, Francois Gouget wrote:
> > > Signed-off-by: Francois Gouget <fgouget@xxxxxxxxxxxxxxx>
> > > ---
> > > src/mspace.c | 8 ++++----
> > > src/qxl_mem.c | 2 +-
> > > src/spiceqxl_display.c | 2 +-
> > > src/spiceqxl_io_port.c | 2 +-
> > > src/spiceqxl_main_loop.c | 2 +-
> > > src/spiceqxl_spice_server.c | 2 +-
> > > src/uxa/uxa.h | 2 +-
> > > 7 files changed, 10 insertions(+), 10 deletions(-)
> > >
> > > diff --git a/src/mspace.c b/src/mspace.c
> > > index 822aade..60fc631 100644
> > > --- a/src/mspace.c
> > > +++ b/src/mspace.c
> > > @@ -129,7 +129,7 @@ struct mallinfo {
> > > #define SIZE_T_BITSIZE (sizeof(size_t) << 3)
> > >
> > > /* Some constants coerced to size_t */
> > > -/* Annoying but necessary to avoid errors on some plaftorms */
> > > +/* Annoying but necessary to avoid errors on some platforms */
> > > #define SIZE_T_ZERO ((size_t)0)
> > > #define SIZE_T_ONE ((size_t)1)
> > > #define SIZE_T_TWO ((size_t)2)
> > > @@ -286,7 +286,7 @@ struct mallinfo {
> > > Each freshly allocated chunk must have both cinuse and pinuse
> > > set.
> > > That is, each allocated chunk borders either a previously
> > > allocated
> > > and still in-use chunk, or the base of its memory arena. This
> > > is
> > > - ensured by making all allocations from the the `lowest' part
> > > of
> > > any
> > > + ensured by making all allocations from the `lowest' part of
> > > any
> > > found chunk. Further, no free chunk physically borders
> > > another
> > > one,
> > > so each free chunk is known to be preceded and followed by
> > > either
> > > inuse chunks or the ends of memory.
> > > @@ -480,12 +480,12 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
> > > +-+-
> > > +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
> > > of the same size are arranged in a circularly-linked list,
> > > with
> > > only
> > > the oldest chunk (the next to be used, in our FIFO ordering)
> > > actually in the tree. (Tree members are distinguished by a
> > > non-
> > > null
> > > - parent pointer.) If a chunk with the same size an an existing
> > > node
> > > + parent pointer.) If a chunk with the same size as an existing
> > > node
> > > is inserted, it is linked off the existing node using pointers
> > > that
> > > work in the same way as fd/bk pointers of small chunks.
> > >
> > > Each tree contains a power of 2 sized range of chunk sizes
> > > (the
> > > - smallest is 0x100 <= x < 0x180), which is is divided in half
> > > at
> > > each
> > > + smallest is 0x100 <= x < 0x180), which is divided in half at
> > > each
> > > tree level, with the chunks in the smaller half of the range
> > > (0x100
> > > <= x < 0x140 for the top nose) in the left subtree and the
> > > larger
> > > half (0x140 <= x < 0x180) in the right subtree. This is, of
> > > course,
> > > diff --git a/src/qxl_mem.c b/src/qxl_mem.c
> > > index fde0976..bed0c1f 100644
> > > --- a/src/qxl_mem.c
> > > +++ b/src/qxl_mem.c
> > > @@ -521,7 +521,7 @@ static void
> > > qxl_bo_output_bo_reloc(qxl_screen_t
> > > *qxl, uint32_t dst_offset,
> > > uint8_t slot_id;
> > > uint64_t value;
> > >
> > > - /* take a refernce on the bo */
> > > + /* take a reference on the bo */
> > > src_bo->refcnt++;
> > >
> > > slot_id = src_bo->type == QXL_BO_SURF ? qxl->vram_mem_slot :
> > > qxl->main_mem_slot;
> > > diff --git a/src/spiceqxl_display.c b/src/spiceqxl_display.c
> > > index c3609d8..4e1e382 100644
> > > --- a/src/spiceqxl_display.c
> > > +++ b/src/spiceqxl_display.c
> > > @@ -163,7 +163,7 @@ static int interface_get_command(QXLInstance
> > > *sin, struct QXLCommandExt *ext)
> > > qxl_send_events(qxl, QXL_INTERRUPT_DISPLAY);
> > > }
> > > qxl->guest_primary.commands++;
> > > - // TODO: reenable, useful
> > > + // TODO: re-enable, useful
> > > //qxl_track_command(qxl, ext);
> > > //qxl_log_command(qxl, "cmd", ext);
> > > return TRUE;
> > > diff --git a/src/spiceqxl_io_port.c b/src/spiceqxl_io_port.c
> > > index 6721d3f..4ebb50b 100644
> > > --- a/src/spiceqxl_io_port.c
> > > +++ b/src/spiceqxl_io_port.c
> > > @@ -31,7 +31,7 @@
> > > #include "qxl.h"
> > > #include "spiceqxl_io_port.h"
> > >
> > > -/* TODO: taken from qemu qxl.c, try to remove dupplication */
> > > +/* TODO: taken from qemu qxl.c, try to remove duplication */
> > > #undef SPICE_RING_PROD_ITEM
> > > #define SPICE_RING_PROD_ITEM(r, ret)
> > > { \
> > > typeof(r) start =
> > > r; \
> > > diff --git a/src/spiceqxl_main_loop.c b/src/spiceqxl_main_loop.c
> > > index 0213693..c2e8eef 100644
> > > --- a/src/spiceqxl_main_loop.c
> > > +++ b/src/spiceqxl_main_loop.c
> > > @@ -423,7 +423,7 @@ SpiceCoreInterface
> > > *basic_event_loop_init(void)
> > > #endif
> > > bzero(&core, sizeof(core));
> > > core.base.major_version = SPICE_INTERFACE_CORE_MAJOR;
> > > - core.base.minor_version = SPICE_INTERFACE_CORE_MINOR; //
> > > anything less then 3 and channel_event isn't called
> > > + core.base.minor_version = SPICE_INTERFACE_CORE_MINOR; //
> > > anything less than 3 and channel_event isn't called
> > > core.timer_add = timer_add;
> > > core.timer_start = timer_start;
> > > core.timer_cancel = timer_cancel;
> > > diff --git a/src/spiceqxl_spice_server.c
> > > b/src/spiceqxl_spice_server.c
> > > index 38257d0..1a138b5 100644
> > > --- a/src/spiceqxl_spice_server.c
> > > +++ b/src/spiceqxl_spice_server.c
> > > @@ -113,7 +113,7 @@ static const char *wan_compression_names[] =
> > > {
> > >
> > > void xspice_set_spice_server_options(OptionInfoPtr options)
> > > {
> > > - /* environment variables take precedense. If not then take
> > > + /* environment variables take precedence. If not then take
> > > * parameters from the config file. */
> > > int addr_flags;
> > > int len;
> > > diff --git a/src/uxa/uxa.h b/src/uxa/uxa.h
> > > index 2eb4041..bc00ab8 100644
> > > --- a/src/uxa/uxa.h
> > > +++ b/src/uxa/uxa.h
> > > @@ -494,7 +494,7 @@ typedef struct _UxaDriver {
> > > * get_image() must be implemented and must not fail if
> > > a
> > > driver
> > > * wishes to fail in prepare_access(). prepare_access()
> > > must not
> > > * fail when pPix is the visible screen, because the
> > > visible
> > > screen
> > > - * can not be migrated.
> > > + * cannot be migrated.
> > > *
> > > * @return TRUE if prepare_access() successfully
> > > prepared
> > > the pixmap
> > > * for CPU drawing.
> >
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel@xxxxxxxxxxxxxxxxxxxxx
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel
> >
>
>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel