[Qemu-commits] [qemu/qemu] 660db8: glib-compat: move G_SOURCE

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 660db8: glib-compat: move G_SOURCE_CONTINUE/R

From:	GitHub
Subject:	[Qemu-commits] [qemu/qemu] 660db8: glib-compat: move G_SOURCE_CONTINUE/REMOVE there
Date:	Wed, 11 Oct 2017 06:26:07 -0700
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 660db84d9b42c28927a095d23ecf8796ac47e801
      
https://github.com/qemu/qemu/commit/660db84d9b42c28927a095d23ecf8796ac47e801
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c
    M include/glib-compat.h

  Log Message:
  -----------
  glib-compat: move G_SOURCE_CONTINUE/REMOVE there

Signed-off-by: Marc-André Lureau <address@hidden>
Acked-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: de97cdede39f74136e57ec1fd293e4e49d4bc34c
      
https://github.com/qemu/qemu/commit/de97cdede39f74136e57ec1fd293e4e49d4bc34c
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M Makefile
    M tests/Makefile.include

  Log Message:
  -----------
  build-sys: fix libvhost-user.a build

And actually link to it from vhost-user-bridge.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d59a031c7e6424ba302af00346b55e8318613719
      
https://github.com/qemu/qemu/commit/d59a031c7e6424ba302af00346b55e8318613719
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M Makefile
    M Makefile.objs

  Log Message:
  -----------
  build-sys: make vhost-user-scsi depend on libvhost-user.a

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: eb078a9f0c1e4af31cfc91501bf210df7b200f11
      
https://github.com/qemu/qemu/commit/eb078a9f0c1e4af31cfc91501bf210df7b200f11
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/libvhost-user/libvhost-user.c

  Log Message:
  -----------
  libvhost-user: drop dependency on glib

libvhost-user is meant to be free of glib dependency. Make sure it is
by droping qemu/osdep.h (which included glib.h)

This fixes a bad malloc()/g_free() pair.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 19409df8835674ca9b3c30517b032abb5eca01e6
      
https://github.com/qemu/qemu/commit/19409df8835674ca9b3c30517b032abb5eca01e6
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/libvhost-user/libvhost-user.h

  Log Message:
  -----------
  libvhost-user: improve vu_queue_pop() doc

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: b085b050c6a6ad5160ffc371b97e2113b7de9f66
      
https://github.com/qemu/qemu/commit/b085b050c6a6ad5160ffc371b97e2113b7de9f66
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: use g_strdup()

Since vhost-user-scsi uses glib.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0644fe4ad07ea00f45cf0a641dfa44a4247315b5
      
https://github.com/qemu/qemu/commit/0644fe4ad07ea00f45cf0a641dfa44a4247315b5
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: connect unix socket before allocating

This simplify a little bit memory management in the following patches.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 8c36ed6e0275613e2c3191d251e5ff96eb4e8727
      
https://github.com/qemu/qemu/commit/8c36ed6e0275613e2c3191d251e5ff96eb4e8727
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: code style fixes

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3d9ad8be3d83519304bf8d935913567ce40a25b8
      
https://github.com/qemu/qemu/commit/3d9ad8be3d83519304bf8d935913567ce40a25b8
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: use glib allocation

Use g_new/g_free instead of plain malloc. This simplify a bit memory
handling since glib will abort if it cannot allocate.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: b4fe56e9ed8d981519802d39a13a0ebb28c546d4
      
https://github.com/qemu/qemu/commit/b4fe56e9ed8d981519802d39a13a0ebb28c546d4
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: glib calls that allocate don't return NULL

They abort instead, so get rid of failure conditions.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 9a6903dbe3bf809d9a8333d39b9171a3701a5ff2
      
https://github.com/qemu/qemu/commit/9a6903dbe3bf809d9a8333d39b9171a3701a5ff2
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: also free the gtree

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 4309251a8c67c0893489dea18b30cc48f859c9fd
      
https://github.com/qemu/qemu/commit/4309251a8c67c0893489dea18b30cc48f859c9fd
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: remove vdev_scsi_find_by_vu()

The *dev pointer belongs to the vhost_scsi_dev_t parent.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 245792ddb71df93ef4f8b25834734c8dfa17af9e
      
https://github.com/qemu/qemu/commit/245792ddb71df93ef4f8b25834734c8dfa17af9e
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: simplify unix path cleanup

Always remove the unix path when leaving the program (instead of when
freeing scsi_dev). Note that unix_sock_new() also unlink() exisiting
path before creating the socket.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 689a9945e658b714097652413976b639798150c8
      
https://github.com/qemu/qemu/commit/689a9945e658b714097652413976b639798150c8
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: use NULL pointer

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: fa2cd143bf381b06f86cce62f16dfa97f387c20d
      
https://github.com/qemu/qemu/commit/fa2cd143bf381b06f86cce62f16dfa97f387c20d
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: assert() in iscsi_add_lun()

Instead of a preliminary check, add an assert to the function that has
the pre-condition.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: a755d271d8cb419afb1f237cc034d3a97af3a304
      
https://github.com/qemu/qemu/commit/a755d271d8cb419afb1f237cc034d3a97af3a304
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: remove vdev_scsi_add_iscsi_lun()

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: d0dba9f4e75cac260a23c1f335318a8c02728146
      
https://github.com/qemu/qemu/commit/d0dba9f4e75cac260a23c1f335318a8c02728146
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: remove VUS_MAX_LUNS

There is no code to support more than 1 yet, no need for that today.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: c7226ee77f7e6013e71ada642dbadf09549e97ad
      
https://github.com/qemu/qemu/commit/c7226ee77f7e6013e71ada642dbadf09549e97ad
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: remove unimplemented functions

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: ade9ab222eea0ea50e9b6b857358b196a09e1217
      
https://github.com/qemu/qemu/commit/ade9ab222eea0ea50e9b6b857358b196a09e1217
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: rename VUS types

- use Vus prefix consistently
- use CamelCase, since that's glib & libvhost-user style
- avoid _t postfix, usually for system headers

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: ca853813f7b5180a2037ce10b781e189adaa7b4c
      
https://github.com/qemu/qemu/commit/ca853813f7b5180a2037ce10b781e189adaa7b4c
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: avoid use of iscsi_ namespace

It is confusing and could easily conflict with future versions.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 49a48824384cca914e20b30de3d2a99916d8cf02
      
https://github.com/qemu/qemu/commit/49a48824384cca914e20b30de3d2a99916d8cf02
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h

There is no need to include hw/virtio/virtio-scsi.h, then the conflict
with SCSI_XFER enum goes away.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 3e7bd3ad47b86d0ec4d85c0ae839bdd9f49dad46
      
https://github.com/qemu/qemu/commit/3e7bd3ad47b86d0ec4d85c0ae839bdd9f49dad46
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: drop extra callback pointer

Use the one from the source with casting, like any other glib source.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 7fb5a569a42102c778dc6eba971ccb91008a713b
      
https://github.com/qemu/qemu/commit/7fb5a569a42102c778dc6eba971ccb91008a713b
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: simplify source handling

Using a hashtable.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 422a26872e4c14292ad2adc1411d6eb2032255e9
      
https://github.com/qemu/qemu/commit/422a26872e4c14292ad2adc1411d6eb2032255e9
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: use glib logging

- PLOG is unused
- code is compiled out unless debug is enabled
- logging is too verbose
- you can pipe to ts to have timestamp if needed, or use structured
  logging with more recent glib

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 8bb7ddb78a1c68f2408a66a61c748330903fd5f2
      
https://github.com/qemu/qemu/commit/8bb7ddb78a1c68f2408a66a61c748330903fd5f2
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/libvhost-user/Makefile.objs
    A contrib/libvhost-user/libvhost-user-glib.c
    A contrib/libvhost-user/libvhost-user-glib.h

  Log Message:
  -----------
  libvhost-user: add glib source helper

This file implements a bridge from the vu_init API of libvhost-user to
GSource, so that libvhost-user can be used inside a GLib main loop.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 62ddfba03452beff05dffe40abc44e8b10429d58
      
https://github.com/qemu/qemu/commit/62ddfba03452beff05dffe40abc44e8b10429d58
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: use libvhost-user glib helper

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>


  Commit: 53a2e1b523e9015423583e431f4229a0ad35e6cd
      
https://github.com/qemu/qemu/commit/53a2e1b523e9015423583e431f4229a0ad35e6cd
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M contrib/vhost-user-scsi/vhost-user-scsi.c

  Log Message:
  -----------
  vhost-user-scsi: remove server_sock from VusDev

It is unneeded in the VusDev device structure, and also simplify a bit
the code.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: bac960832015bf4c4c1b873011612e2675e4464c
      
https://github.com/qemu/qemu/commit/bac960832015bf4c4c1b873011612e2675e4464c
  Author: Peter Maydell <address@hidden>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M Makefile
    M Makefile.objs
    M contrib/libvhost-user/Makefile.objs
    A contrib/libvhost-user/libvhost-user-glib.c
    A contrib/libvhost-user/libvhost-user-glib.h
    M contrib/libvhost-user/libvhost-user.c
    M contrib/libvhost-user/libvhost-user.h
    M contrib/vhost-user-scsi/vhost-user-scsi.c
    M include/glib-compat.h
    M tests/Makefile.include

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/elmarco/tags/vus-pull-request' into 
staging

# gpg: Signature made Tue 10 Oct 2017 22:33:56 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <address@hidden>"
# gpg:                 aka "Marc-André Lureau <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/vus-pull-request: (27 commits)
  vhost-user-scsi: remove server_sock from VusDev
  vhost-user-scsi: use libvhost-user glib helper
  libvhost-user: add glib source helper
  vhost-user-scsi: use glib logging
  vhost-user-scsi: simplify source handling
  vhost-user-scsi: drop extra callback pointer
  vhost-user-scsi: don't copy iscsi/scsi-lowlevel.h
  vhost-user-scsi: avoid use of iscsi_ namespace
  vhost-user-scsi: rename VUS types
  vhost-user-scsi: remove unimplemented functions
  vhost-user-scsi: remove VUS_MAX_LUNS
  vhost-user-scsi: remove vdev_scsi_add_iscsi_lun()
  vhost-user-scsi: assert() in iscsi_add_lun()
  vhost-user-scsi: use NULL pointer
  vhost-user-scsi: simplify unix path cleanup
  vhost-user-scsi: remove vdev_scsi_find_by_vu()
  vhost-user-scsi: also free the gtree
  vhost-user-scsi: glib calls that allocate don't return NULL
  vhost-user-scsi: use glib allocation
  vhost-user-scsi: code style fixes
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e74c0cfa5732...bac960832015
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 660db8: glib-compat: move G_SOURCE_CONTINUE/REMOVE there, GitHub <=
Prev by Date: [Qemu-commits] [qemu/qemu] 83974c: cputlb: bring back tlb_flush_count under !TLB_DEBU...
Next by Date: [Qemu-commits] [qemu/qemu] 43851b: iotests: Set up Python logging
Previous by thread: [Qemu-commits] [qemu/qemu] 83974c: cputlb: bring back tlb_flush_count under !TLB_DEBU...
Next by thread: [Qemu-commits] [qemu/qemu] 43851b: iotests: Set up Python logging
Index(es):
- Date
- Thread