summaryrefslogtreecommitdiff
path: root/qemu-nbd.c
diff options
context:
space:
mode:
authorLaurent Vivier <laurent@vivier.eu>2010-08-25 22:48:33 +0200
committerKevin Wolf <kwolf@redhat.com>2010-08-30 18:29:22 +0200
commit1d45f8b542f6b80b24c44533ef0dd9e1a3b17ea5 (patch)
treea94959416cdcfc3d9317d31e1026533563a59c79 /qemu-nbd.c
parent2aa326be0d2039f51192707bdb2fc935d0e87c21 (diff)
downloadqemu-1d45f8b542f6b80b24c44533ef0dd9e1a3b17ea5.tar.gz
qemu-1d45f8b542f6b80b24c44533ef0dd9e1a3b17ea5.tar.bz2
qemu-1d45f8b542f6b80b24c44533ef0dd9e1a3b17ea5.zip
nbd: Introduce NBD named exports.
This patch allows to connect Qemu using NBD protocol to an nbd-server using named exports. For instance, if on the host "isoserver", in /etc/nbd-server/config, you have: [generic] [debian-500-ppc-netinst] exportname = /ISO/debian-500-powerpc-netinst.iso [Fedora-10-ppc-netinst] exportname = /ISO/Fedora-10-ppc-netinst.iso You can connect to it, using: qemu -cdrom nbd:isoserver:exportname=debian-500-ppc-netinst qemu -cdrom nbd:isoserver:exportname=Fedora-10-ppc-netinst NOTE: you need at least nbd-server 2.9.18 Signed-off-by: Laurent Vivier <laurent@vivier.eu> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-nbd.c')
-rw-r--r--qemu-nbd.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 4e607cfb61..41e5c5d857 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -230,6 +230,7 @@ int main(int argc, char **argv)
int nb_fds = 0;
int max_fd;
int persistent = 0;
+ uint32_t nbdflags;
while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
switch (ch) {
@@ -398,7 +399,8 @@ int main(int argc, char **argv)
goto out;
}
- ret = nbd_receive_negotiate(sock, &size, &blocksize);
+ ret = nbd_receive_negotiate(sock, NULL, &nbdflags,
+ &size, &blocksize);
if (ret == -1) {
ret = 1;
goto out;