qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, pbonzini@redhat.com,
	peter.crosthwaite@xilinx.com, mjt@tls.msk.ru,
	stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v2 0/7] build-sys: Fix iscsi module loading failure
Date: Fri, 22 Aug 2014 18:54:16 +0800	[thread overview]
Message-ID: <1408704863-12343-1-git-send-email-famz@redhat.com> (raw)

v2: 
[01/07] build-sys: Move fifo8.c to hw/misc
        Move to hw/misc/ instead of hw/. (Peter)

[02/07] configure: Add -lutil to libs_qga if necessary
        To replace "stubs: Add openpty.c" in v1. (Paolo)

[04/07] stubs: Merge set-fd-handler.c into iohandler.c
        New. (Paolo)

[05/07] util: Move throttle.c out to top level
        To replace "stubs: Add timer.c" in v1. (Paolo)

[06/07] build-sys: Change libqemuutil.a to qemuutil.o and link whole object
        LD_REL. (Paolo)

[07/07] iscsi: Move iqn generation code to util
        Drop parameter of iqn_generate(). (Paolo)

The iscsi driver doesn't work if built with --enable-modules:

$ ~/build/last/qemu-img
Failed to open module: /home/fam/build/master/block-iscsi.so: undefined symbol: qmp_query_uuid
qemu-img: Not enough arguments
Try 'qemu-img --help' for more information

This fixes it by completely linking libqemuutil.a (now qemuutil.o) rather than
on demand.

A few stub functions are added into libqemustub to make linker happy.

Lastly, iqn generation code is moved from iscsi.c to util, so that
qmp_query_uuid or its stub is not missed.

Fam


Fam Zheng (7):
  build-sys: Move fifo8.c to hw/misc
  configure: Add -lutil to libs_qga if necessary
  stubs: Add iohandler.c
  stubs: Merge set-fd-handler.c into iohandler.c
  util: Move throttle.c out to top level
  build-sys: Change libqemuutil.a to qemuutil.o and link whole object
  iscsi: Move iqn generation code to util

 Makefile                      | 17 +++++++-----
 Makefile.objs                 |  4 +--
 Makefile.target               |  2 +-
 block/iscsi.c                 | 15 +----------
 configure                     |  1 +
 hw/misc/Makefile.objs         |  1 +
 {util => hw/misc}/fifo8.c     |  0
 include/qemu-common.h         |  3 +++
 stubs/Makefile.objs           |  2 +-
 stubs/iohandler.c             | 29 +++++++++++++++++++++
 stubs/set-fd-handler.c        | 11 --------
 tests/Makefile                | 60 +++++++++++++++++++++----------------------
 util/throttle.c => throttle.c |  0
 util/Makefile.objs            |  3 +--
 util/iqn.c                    | 37 ++++++++++++++++++++++++++
 15 files changed, 117 insertions(+), 68 deletions(-)
 rename {util => hw/misc}/fifo8.c (100%)
 create mode 100644 stubs/iohandler.c
 delete mode 100644 stubs/set-fd-handler.c
 rename util/throttle.c => throttle.c (100%)
 create mode 100644 util/iqn.c

-- 
2.0.3

             reply	other threads:[~2014-08-22 10:54 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-22 10:54 Fam Zheng [this message]
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 1/7] build-sys: Move fifo8.c to hw/misc Fam Zheng
2014-08-22 12:20   ` Peter Crosthwaite
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 2/7] configure: Add -lutil to libs_qga if necessary Fam Zheng
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 3/7] stubs: Add iohandler.c Fam Zheng
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 4/7] stubs: Merge set-fd-handler.c into iohandler.c Fam Zheng
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 5/7] util: Move throttle.c out to top level Fam Zheng
2014-08-25 13:22   ` Paolo Bonzini
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 6/7] build-sys: Change libqemuutil.a to qemuutil.o and link whole object Fam Zheng
2014-08-22 10:54 ` [Qemu-devel] [PATCH v2 7/7] iscsi: Move iqn generation code to util Fam Zheng
2014-08-22 13:35 ` [Qemu-devel] [PATCH v2 0/7] build-sys: Fix iscsi module loading failure Stefan Hajnoczi
2014-08-22 13:42   ` Paolo Bonzini
2014-08-25  2:27   ` Fam Zheng
2014-08-28 11:17     ` Stefan Hajnoczi
2014-08-28 12:12       ` Fam Zheng
2014-08-28 12:20         ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1408704863-12343-1-git-send-email-famz@redhat.com \
    --to=famz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=mjt@tls.msk.ru \
    --cc=pbonzini@redhat.com \
    --cc=peter.crosthwaite@xilinx.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).