mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 22:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQIcBAABAgAGBQJYRdyFAAoJEL2+eyfA3jBXmeMP/3YEOj1SJV/k435gP8kKsb9S
 fVQtgqLbbYVy5dDbLh3Puuug67W2zVNer8qbwWTfODv4ZAhrTQHRBrnsQshoQRUI
 8v+GirupIIVbKScC7ziChxrvh0FsyE6EgOGY9MsA5kyGMcjhRPDkEvW0KzQ3tfNL
 MXmQJayxg2hG/wMRSA4LN87BftFWH5s6MXiEnc4VwlCoZj5ar5fCIow5698as8Mu
 +mE/APknbDFmxzsUnc5H/vAd76YyVdtMAKrgHvs7iow7YKLTAxbpRrHLM/66UdFF
 4lGqYAGxEMOtb2Ypx1P9TJdigADqE9sBFZJcHoxmjWs0fr3r57SLHuKA+5l4QwQE
 j8JCCNYQKvgnnVgNsvy8fNLZg0glq/ySlfMowrBmtEGegb7uG+/ctb2GUOHOPVKa
 CJMRqsBpDWimnPAQPG+SdHYTAh23VlwJUUK7dZW+X+Xb4JneZEdSxHre1qum/TQf
 dMzlHAmwljif5eJefiX+zX+bRkfwJYfT1wbtBjd8i0kjKhxmduqE8uNmPju2R1cK
 cTiFroI5wrw15GTxHaG4K/aiDhnlQGFV6hfAixQuZQVHDv7XMVfKpDEqmTnxyydf
 PrDGUToLHgM626OZ4jOJuskAhkEWEPDR07VzhnazNZtFxuL7Y82JoqeA3s4wz72r
 7AGfWj14YP/cn/T9GmsT
 =KIAo
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'jtc/tags/block-pull-request' into staging

# gpg: Signature made Mon 05 Dec 2016 09:30:45 PM GMT
# gpg:                using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* jtc/tags/block-pull-request:
  qemu-doc: update gluster protocol usage guide
  block/nfs: fix QMP to match debug option
  block/gluster: fix QMP to match debug option

Message-id: 1480973521-28945-1-git-send-email-jcody@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2016-12-06 09:55:57 +00:00
commit 8a04c80f9f
5 changed files with 93 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
block/gluster.c
View File

@ -48,7 +48,7 @@ typedef struct BDRVGlusterState {
struct glfs_fd *fd; struct glfs_fd *fd;
char *logfile; char *logfile;
bool supports_seek_data; bool supports_seek_data;
int debug_level; int debug;
} BDRVGlusterState; } BDRVGlusterState;
typedef struct BDRVGlusterReopenState { typedef struct BDRVGlusterReopenState {
@ -434,7 +434,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
} }
} }
ret = glfs_set_logging(glfs, gconf->logfile, gconf->debug_level); ret = glfs_set_logging(glfs, gconf->logfile, gconf->debug);
if (ret < 0) { if (ret < 0) {
goto out; goto out;
} }
@ -788,17 +788,17 @@ static int qemu_gluster_open(BlockDriverState *bs, QDict *options,
filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME); filename = qemu_opt_get(opts, GLUSTER_OPT_FILENAME);
s->debug_level = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG, s->debug = qemu_opt_get_number(opts, GLUSTER_OPT_DEBUG,
GLUSTER_DEBUG_DEFAULT); GLUSTER_DEBUG_DEFAULT);
if (s->debug_level < 0) { if (s->debug < 0) {
s->debug_level = 0; s->debug = 0;
} else if (s->debug_level > GLUSTER_DEBUG_MAX) { } else if (s->debug > GLUSTER_DEBUG_MAX) {
s->debug_level = GLUSTER_DEBUG_MAX; s->debug = GLUSTER_DEBUG_MAX;
} }
gconf = g_new0(BlockdevOptionsGluster, 1); gconf = g_new0(BlockdevOptionsGluster, 1);
gconf->debug_level = s->debug_level; gconf->debug = s->debug;
gconf->has_debug_level = true; gconf->has_debug = true;
logfile = qemu_opt_get(opts, GLUSTER_OPT_LOGFILE); logfile = qemu_opt_get(opts, GLUSTER_OPT_LOGFILE);
s->logfile = g_strdup(logfile ? logfile : GLUSTER_LOGFILE_DEFAULT); s->logfile = g_strdup(logfile ? logfile : GLUSTER_LOGFILE_DEFAULT);
@ -874,8 +874,8 @@ static int qemu_gluster_reopen_prepare(BDRVReopenState *state,
qemu_gluster_parse_flags(state->flags, &open_flags); qemu_gluster_parse_flags(state->flags, &open_flags);
gconf = g_new0(BlockdevOptionsGluster, 1); gconf = g_new0(BlockdevOptionsGluster, 1);
gconf->debug_level = s->debug_level; gconf->debug = s->debug;
gconf->has_debug_level = true; gconf->has_debug = true;
gconf->logfile = g_strdup(s->logfile); gconf->logfile = g_strdup(s->logfile);
gconf->has_logfile = true; gconf->has_logfile = true;
reop_s->glfs = qemu_gluster_init(gconf, state->bs->filename, NULL, errp); reop_s->glfs = qemu_gluster_init(gconf, state->bs->filename, NULL, errp);
@ -1011,14 +1011,14 @@ static int qemu_gluster_create(const char *filename,
char *tmp = NULL; char *tmp = NULL;
gconf = g_new0(BlockdevOptionsGluster, 1); gconf = g_new0(BlockdevOptionsGluster, 1);
gconf->debug_level = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG, gconf->debug = qemu_opt_get_number_del(opts, GLUSTER_OPT_DEBUG,
GLUSTER_DEBUG_DEFAULT); GLUSTER_DEBUG_DEFAULT);
if (gconf->debug_level < 0) { if (gconf->debug < 0) {
gconf->debug_level = 0; gconf->debug = 0;
} else if (gconf->debug_level > GLUSTER_DEBUG_MAX) { } else if (gconf->debug > GLUSTER_DEBUG_MAX) {
gconf->debug_level = GLUSTER_DEBUG_MAX; gconf->debug = GLUSTER_DEBUG_MAX;
} }
gconf->has_debug_level = true; gconf->has_debug = true;
gconf->logfile = qemu_opt_get_del(opts, GLUSTER_OPT_LOGFILE); gconf->logfile = qemu_opt_get_del(opts, GLUSTER_OPT_LOGFILE);
if (!gconf->logfile) { if (!gconf->logfile) {

4
block/nfs.c
View File

@ -134,7 +134,7 @@ static int nfs_parse_uri(const char *filename, QDict *options, Error **errp)
qdict_put(options, "page-cache-size", qdict_put(options, "page-cache-size",
qstring_from_str(qp->p[i].value)); qstring_from_str(qp->p[i].value));
} else if (!strcmp(qp->p[i].name, "debug")) { } else if (!strcmp(qp->p[i].name, "debug")) {
qdict_put(options, "debug-level", qdict_put(options, "debug",
qstring_from_str(qp->p[i].value)); qstring_from_str(qp->p[i].value));
} else { } else {
error_setg(errp, "Unknown NFS parameter name: %s", error_setg(errp, "Unknown NFS parameter name: %s",
@ -165,7 +165,7 @@ static bool nfs_has_filename_options_conflict(QDict *options, Error **errp)
!strcmp(qe->key, "tcp-syn-count") || !strcmp(qe->key, "tcp-syn-count") ||
!strcmp(qe->key, "readahead-size") || !strcmp(qe->key, "readahead-size") ||
!strcmp(qe->key, "page-cache-size") || !strcmp(qe->key, "page-cache-size") ||
!strcmp(qe->key, "debug-level") || !strcmp(qe->key, "debug") ||
strstart(qe->key, "server.", NULL)) strstart(qe->key, "server.", NULL))
{ {
error_setg(errp, "Option %s cannot be used with a filename", error_setg(errp, "Option %s cannot be used with a filename",

8
qapi/block-core.json
View File

@ -2195,7 +2195,7 @@
# #
# @server: gluster servers description # @server: gluster servers description
# #
# @debug-level: #optional libgfapi log level (default '4' which is Error) # @debug: #optional libgfapi log level (default '4' which is Error)
# #
# @logfile: #optional libgfapi log file (default /dev/stderr) (Since 2.8) # @logfile: #optional libgfapi log file (default /dev/stderr) (Since 2.8)
# #
@ -2205,7 +2205,7 @@
'data': { 'volume': 'str', 'data': { 'volume': 'str',
'path': 'str', 'path': 'str',
'server': ['GlusterServer'], 'server': ['GlusterServer'],
'*debug-level': 'int', '*debug': 'int',
'*logfile': 'str' } } '*logfile': 'str' } }
## ##
@ -2292,7 +2292,7 @@
# @page-cache-size: #optional set the pagecache size in bytes (defaults # @page-cache-size: #optional set the pagecache size in bytes (defaults
# to libnfs default) # to libnfs default)
# #
# @debug-level: #optional set the NFS debug level (max 2) (defaults # @debug: #optional set the NFS debug level (max 2) (defaults
# to libnfs default) # to libnfs default)
# #
# Since: 2.8 # Since: 2.8
@ -2305,7 +2305,7 @@
'*tcp-syn-count': 'int', '*tcp-syn-count': 'int',
'*readahead-size': 'int', '*readahead-size': 'int',
'*page-cache-size': 'int', '*page-cache-size': 'int',
'*debug-level': 'int' } } '*debug': 'int' } }
## ##
# @BlockdevOptionsCurl: # @BlockdevOptionsCurl:

59
qemu-doc.texi
View File

@ -1041,35 +1041,55 @@ GlusterFS is an user space distributed file system.
You can boot from the GlusterFS disk image with the command: You can boot from the GlusterFS disk image with the command:
@example @example
qemu-system-x86_64 -drive file=gluster[+@var{transport}]://[@var{server}[:@var{port}]]/@var{volname}/@var{image}[?socket=...] URI:
qemu-system-x86_64 -drive file=gluster[+@var{type}]://[@var{host}[:@var{port}]]/@var{volume}/@var{path}
[?socket=...][,file.debug=9][,file.logfile=...]
JSON:
qemu-system-x86_64 'json:@{"driver":"qcow2",
"file":@{"driver":"gluster",
"volume":"testvol","path":"a.img","debug":9,"logfile":"...",
"server":[@{"type":"tcp","host":"...","port":"..."@},
@{"type":"unix","socket":"..."@}]@}@}'
@end example @end example
@var{gluster} is the protocol. @var{gluster} is the protocol.
@var{transport} specifies the transport type used to connect to gluster @var{type} specifies the transport type used to connect to gluster
management daemon (glusterd). Valid transport types are management daemon (glusterd). Valid transport types are
tcp, unix and rdma. If a transport type isn't specified, then tcp tcp and unix. In the URI form, if a transport type isn't specified,
type is assumed. then tcp type is assumed.
@var{server} specifies the server where the volume file specification for @var{host} specifies the server where the volume file specification for
the given volume resides. This can be either hostname, ipv4 address the given volume resides. This can be either a hostname or an ipv4 address.
or ipv6 address. ipv6 address needs to be within square brackets [ ]. If transport type is unix, then @var{host} field should not be specified.
If transport type is unix, then @var{server} field should not be specified.
Instead @var{socket} field needs to be populated with the path to unix domain Instead @var{socket} field needs to be populated with the path to unix domain
socket. socket.
@var{port} is the port number on which glusterd is listening. This is optional @var{port} is the port number on which glusterd is listening. This is optional
and if not specified, QEMU will send 0 which will make gluster to use the and if not specified, it defaults to port 24007. If the transport type is unix,
default port. If the transport type is unix, then @var{port} should not be then @var{port} should not be specified.
specified.
@var{volume} is the name of the gluster volume which contains the disk image.
@var{path} is the path to the actual disk image that resides on gluster volume.
@var{debug} is the logging level of the gluster protocol driver. Debug levels
are 0-9, with 9 being the most verbose, and 0 representing no debugging output.
The default level is 4. The current logging levels defined in the gluster source
are 0 - None, 1 - Emergency, 2 - Alert, 3 - Critical, 4 - Error, 5 - Warning,
6 - Notice, 7 - Info, 8 - Debug, 9 - Trace
@var{logfile} is a commandline option to mention log file path which helps in
logging to the specified file and also help in persisting the gfapi logs. The
default is stderr.
@var{volname} is the name of the gluster volume which contains the disk image.
@var{image} is the path to the actual disk image that resides on gluster volume.
You can create a GlusterFS disk image with the command: You can create a GlusterFS disk image with the command:
@example @example
qemu-img create gluster://@var{server}/@var{volname}/@var{image} @var{size} qemu-img create gluster://@var{host}/@var{volume}/@var{path} @var{size}
@end example @end example
Examples Examples
@ -1082,6 +1102,17 @@ qemu-system-x86_64 -drive file=gluster+tcp://[1:2:3:4:5:6:7:8]:24007/testvol/dir
qemu-system-x86_64 -drive file=gluster+tcp://server.domain.com:24007/testvol/dir/a.img qemu-system-x86_64 -drive file=gluster+tcp://server.domain.com:24007/testvol/dir/a.img
qemu-system-x86_64 -drive file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket qemu-system-x86_64 -drive file=gluster+unix:///testvol/dir/a.img?socket=/tmp/glusterd.socket
qemu-system-x86_64 -drive file=gluster+rdma://1.2.3.4:24007/testvol/a.img qemu-system-x86_64 -drive file=gluster+rdma://1.2.3.4:24007/testvol/a.img
qemu-system-x86_64 -drive file=gluster://1.2.3.4/testvol/a.img,file.debug=9,file.logfile=/var/log/qemu-gluster.log
qemu-system-x86_64 'json:@{"driver":"qcow2",
"file":@{"driver":"gluster",
"volume":"testvol","path":"a.img",
"debug":9,"logfile":"/var/log/qemu-gluster.log",
"server":[@{"type":"tcp","host":"1.2.3.4","port":24007@},
@{"type":"unix","socket":"/var/run/glusterd.socket"@}]@}@}'
qemu-system-x86_64 -drive driver=qcow2,file.driver=gluster,file.volume=testvol,file.path=/path/a.img,
file.debug=9,file.logfile=/var/log/qemu-gluster.log,
file.server.0.type=tcp,file.server.0.host=1.2.3.4,file.server.0.port=24007,
file.server.1.type=unix,file.server.1.socket=/var/run/glusterd.socket
@end example @end example
@node disk_images_ssh @node disk_images_ssh

25
qemu-options.hx
View File

@ -2595,13 +2595,34 @@ TCP, Unix Domain Sockets and RDMA transport protocols.
Syntax for specifying a VM disk image on GlusterFS volume is Syntax for specifying a VM disk image on GlusterFS volume is
@example @example
gluster[+transport]://[server[:port]]/volname/image[?socket=...]
URI:
gluster[+type]://[host[:port]]/volume/path[?socket=...][,debug=N][,logfile=...]
JSON:
'json:@{"driver":"qcow2","file":@{"driver":"gluster","volume":"testvol","path":"a.img","debug":N,"logfile":"...",
@ "server":[@{"type":"tcp","host":"...","port":"..."@},
@ @{"type":"unix","socket":"..."@}]@}@}'
@end example @end example
Example Example
@example @example
qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img URI:
qemu-system-x86_64 --drive file=gluster://192.0.2.1/testvol/a.img,
@ file.debug=9,file.logfile=/var/log/qemu-gluster.log
JSON:
qemu-system-x86_64 'json:@{"driver":"qcow2",
@ "file":@{"driver":"gluster",
@ "volume":"testvol","path":"a.img",
@ "debug":9,"logfile":"/var/log/qemu-gluster.log",
@ "server":[@{"type":"tcp","host":"1.2.3.4","port":24007@},
@ @{"type":"unix","socket":"/var/run/glusterd.socket"@}]@}@}'
qemu-system-x86_64 -drive driver=qcow2,file.driver=gluster,file.volume=testvol,file.path=/path/a.img,
@ file.debug=9,file.logfile=/var/log/qemu-gluster.log,
@ file.server.0.type=tcp,file.server.0.host=1.2.3.4,file.server.0.port=24007,
@ file.server.1.type=unix,file.server.1.socket=/var/run/glusterd.socket
@end example @end example
See also @url{http://www.gluster.org}. See also @url{http://www.gluster.org}.