- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Make probing for commands declarative
by Jiri Denemark 21 Jun '13

21 Jun '13

--- src/qemu/qemu_capabilities.c | 53 ++++++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7cac6e4..c4e076a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1316,6 +1316,22 @@ struct virQEMUCapsStringFlags { }; +struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { + { "system_wakeup", QEMU_CAPS_WAKEUP }, + { "transaction", QEMU_CAPS_TRANSACTION }, + { "block_job_cancel", QEMU_CAPS_BLOCKJOB_SYNC }, + { "block-job-cancel", QEMU_CAPS_BLOCKJOB_ASYNC }, + { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, + { "query-spice", QEMU_CAPS_SPICE }, + { "query-kvm", QEMU_CAPS_KVM }, + { "block-commit", QEMU_CAPS_BLOCK_COMMIT }, + { "query-vnc", QEMU_CAPS_VNC }, + { "drive-mirror", QEMU_CAPS_DRIVE_MIRROR }, + { "blockdev-snapshot-sync", QEMU_CAPS_DISK_SNAPSHOT }, + { "add-fd", QEMU_CAPS_ADD_FD }, + { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, +}; + struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { { "BALLOON_CHANGE", QEMU_CAPS_BALLOON_EVENT }, { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, @@ -1956,42 +1972,15 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, { char **commands = NULL; int ncommands; - size_t i; if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) return -1; - for (i = 0; i < ncommands; i++) { - char *name = commands[i]; - if (STREQ(name, "system_wakeup")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_WAKEUP); - else if (STREQ(name, "transaction")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_TRANSACTION); - else if (STREQ(name, "block_job_cancel")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC); - else if (STREQ(name, "block-job-cancel")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC); - else if (STREQ(name, "dump-guest-memory")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DUMP_GUEST_MEMORY); - else if (STREQ(name, "query-spice")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SPICE); - else if (STREQ(name, "query-kvm")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM); - else if (STREQ(name, "block-commit")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCK_COMMIT); - else if (STREQ(name, "query-vnc")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_VNC); - else if (STREQ(name, "drive-mirror")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_MIRROR); - else if (STREQ(name, "blockdev-snapshot-sync")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISK_SNAPSHOT); - else if (STREQ(name, "add-fd")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_ADD_FD); - else if (STREQ(name, "nbd-server-start")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NBD_SERVER); - VIR_FREE(name); - } - VIR_FREE(commands); + virQEMUCapsProcessStringFlags(qemuCaps, + ARRAY_CARDINALITY(virQEMUCapsCommands), + virQEMUCapsCommands, + ncommands, commands); + virQEMUCapsFreeStringList(ncommands, commands); /* QMP add-fd was introduced in 1.2, but did not support * management control of set numbering, and did not have a -- 1.8.2.1

2 2

[libvirt] [PATCH] qemu: Make probing for events declarative
by Jiri Denemark 21 Jun '13

21 Jun '13

--- src/qemu/qemu_capabilities.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 406dca9..7cac6e4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1316,6 +1316,11 @@ struct virQEMUCapsStringFlags { }; +struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { + { "BALLOON_CHANGE", QEMU_CAPS_BALLOON_EVENT }, + { "SPICE_MIGRATE_COMPLETED", QEMU_CAPS_SEAMLESS_MIGRATION }, +}; + struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, @@ -2014,21 +2019,15 @@ virQEMUCapsProbeQMPEvents(virQEMUCapsPtr qemuCaps, { char **events = NULL; int nevents; - size_t i; if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; - for (i = 0; i < nevents; i++) { - char *name = events[i]; - - if (STREQ(name, "BALLOON_CHANGE")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_BALLOON_EVENT); - if (STREQ(name, "SPICE_MIGRATE_COMPLETED")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION); - VIR_FREE(name); - } - VIR_FREE(events); + virQEMUCapsProcessStringFlags(qemuCaps, + ARRAY_CARDINALITY(virQEMUCapsEvents), + virQEMUCapsEvents, + nevents, events); + virQEMUCapsFreeStringList(nevents, events); return 0; } -- 1.8.2.1

2 2

[libvirt] [PATCH] build: Fix build with -Werror
by Jim Fehlig 21 Jun '13

21 Jun '13

Commit 752596b5 broke the build with -Werror qemu/qemu_hotplug.c: In function 'qemuDomainChangeGraphics': qemu/qemu_hotplug.c:1980:39: error: declaration of 'listen' shadows a global declaration [-Werror=shadow] Fix with s/listen/newlisten/ --- Pushing under the build-breaker rule. src/qemu/qemu_hotplug.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 637dbc5..18f5fa5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1977,18 +1977,18 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, } for (i = 0; i < dev->nListens; i++) { - virDomainGraphicsListenDefPtr listen = &dev->listens[i]; + virDomainGraphicsListenDefPtr newlisten = &dev->listens[i]; virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; - if (listen->type != oldlisten->type) { + if (newlisten->type != oldlisten->type) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("cannot change the type of listen address")); goto cleanup; } - switch ((enum virDomainGraphicsListenType) listen->type) { + switch ((enum virDomainGraphicsListenType) newlisten->type) { case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: - if (STRNEQ_NULLABLE(listen->address, oldlisten->address)) { + if (STRNEQ_NULLABLE(newlisten->address, oldlisten->address)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? _("cannot change listen address setting on vnc graphics") : @@ -1998,7 +1998,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: - if (STRNEQ_NULLABLE(listen->network, oldlisten->network)) { + if (STRNEQ_NULLABLE(newlisten->network, oldlisten->network)) { virReportError(VIR_ERR_INVALID_ARG, "%s", dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? _("cannot change listen network setting on vnc graphics") : -- 1.7.7

1 0

[libvirt] [PATCH] network: increase max number of routes
by Laine Stump 21 Jun '13

21 Jun '13

This fixes the problem reported in: https://bugzilla.redhat.com/show_bug.cgi?id=972690 When checking for a collision of a new libvirt network's subnet with any existing routes, we read all of /proc/net/route into memory, then parse all the entries. The function that we use to read this file requires a "maximum length" parameter, which had previously been set to 64*1024. As each line in /proc/net/route is 128 bytes, this would allow for a maximum of 512 entries in the routing table. This patch increases that number to 128 * 100000, which allows for 100,000 routing table entries. This means that it's possible that 12MB would be allocated, but that would only happen if there really were 100,000 route table entries on the system, it's only held for a very short time. Since there is no method of specifying and unlimited max (and that would create a potential denial of service anyway) hopefully this limit is large enough to accomodate everyone. --- src/network/bridge_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d5886fe..f7c2470 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2305,7 +2305,8 @@ networkCheckRouteCollision(virNetworkObjPtr network) { int ret = 0, len; char *cur, *buf = NULL; - enum {MAX_ROUTE_SIZE = 1024*64}; + /* allow for up to 100000 routes (each line is 128 bytes) */ + enum {MAX_ROUTE_SIZE = 128*100000}; /* Read whole routing table into memory */ if ((len = virFileReadAll(PROC_NET_ROUTE, MAX_ROUTE_SIZE, &buf)) < 0) -- 1.7.11.7

2 2

[libvirt] [PATCH v2] qemuDomainChangeGraphics: Check listen address change by listen type
by Michal Privoznik 21 Jun '13

21 Jun '13

Currently, we have a bug when updating a graphics device. A graphics device can have a listen address set. This address is either defined by user (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) or it can be inherited from a network (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK). However, in both cases we have a listen address to process (e.g. during migration, as I've tried to fix in 7f15ebc7). Later, when a user tries to update the graphics device (e.g. set a password), we check if listen addresses match the original as qemu doesn't know how to change listen address yet. Hence, users are required to not change the listen address. The implementation then just dumps listen addresses and compare them. Previously, while dumping the listen addresses, NULL was returned for NETWORK. After my patch, this is no longer true, and we get a listen address for olddev even if it is a type of NETWORK. So we have a real string on one side, the NULL from user's XML on the other side and hence we think user wants to change the listen address and we refuse it. Therefore, we must take the type of listen address into account as well. --- src/qemu/qemu_hotplug.c | 70 +++++++++++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6c07af5..637dbc5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1960,10 +1960,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr dev) { virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev); - const char *oldListenAddr, *newListenAddr; - const char *oldListenNetwork, *newListenNetwork; int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + size_t i; if (!olddev) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1971,10 +1970,49 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, goto cleanup; } - oldListenAddr = virDomainGraphicsListenGetAddress(olddev, 0); - newListenAddr = virDomainGraphicsListenGetAddress(dev, 0); - oldListenNetwork = virDomainGraphicsListenGetNetwork(olddev, 0); - newListenNetwork = virDomainGraphicsListenGetNetwork(dev, 0); + if (dev->nListens != olddev->nListens) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the number of listen addresses")); + goto cleanup; + } + + for (i = 0; i < dev->nListens; i++) { + virDomainGraphicsListenDefPtr listen = &dev->listens[i]; + virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; + + if (listen->type != oldlisten->type) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the type of listen address")); + goto cleanup; + } + + switch ((enum virDomainGraphicsListenType) listen->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + if (STRNEQ_NULLABLE(listen->address, oldlisten->address)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen address setting on vnc graphics") : + _("cannot change listen address setting on spice graphics")); + goto cleanup; + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (STRNEQ_NULLABLE(listen->network, oldlisten->network)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen network setting on vnc graphics") : + _("cannot change listen network setting on spice graphics")); + goto cleanup; + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + /* nada */ + break; + } + } switch (dev->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -1985,16 +2023,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on vnc graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr,newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on vnc graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork,newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on vnc graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change keymap setting on vnc graphics")); @@ -2040,16 +2068,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on spice graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr, newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on spice graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork, newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on spice graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.1.5

2 1

[libvirt] [PATCH] qemuDomainChangeGraphics: Check listen address change by listen type
by Michal Privoznik 21 Jun '13

21 Jun '13

Currently, we have a bug when updating a graphics device. A graphics device can have a listen address set. This address is either defined by user (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS) or it can be inherited from a network (in which case it's type is VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK). However, in both cases we have a listen address to process (e.g. during migration, as I've tried to fix in 7f15ebc7). Later, when an user tries to update the graphics device (e.g. set a password), we check if listen addresses match the original as qemu doesn't know how to change listen address yet. Hence, users are required to not change the listen address. The implementation then just dumps listen addresses and compare them. Previously, while dumping the listen addresses, NULL was returned for NETWORK. After my patch, this is no longer true, and we get a listen address for olddev even if it is a type of NETWORK. So we have a real string on one side, the NULL from user's XML on the other side and hence we think user wants to change the listen address and we refuse it. Therefore, we must take the type of listen address into account as well. --- src/qemu/qemu_hotplug.c | 71 +++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6c07af5..8563457 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1960,10 +1960,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, virDomainGraphicsDefPtr dev) { virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev); - const char *oldListenAddr, *newListenAddr; - const char *oldListenNetwork, *newListenNetwork; int ret = -1; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + size_t i; if (!olddev) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1971,10 +1970,50 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, goto cleanup; } - oldListenAddr = virDomainGraphicsListenGetAddress(olddev, 0); - newListenAddr = virDomainGraphicsListenGetAddress(dev, 0); - oldListenNetwork = virDomainGraphicsListenGetNetwork(olddev, 0); - newListenNetwork = virDomainGraphicsListenGetNetwork(dev, 0); + if (dev->nListens != olddev->nListens) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the number of listen addresses")); + goto cleanup; + } + + for (i = 0; i < dev->nListens; i++) { + virDomainGraphicsListenDefPtr listen = &dev->listens[i]; + virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; + + if (listen->type != oldlisten->type) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("cannot change the type of listen address")); + goto cleanup; + } + + switch (listen->type) { + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: + if (STRNEQ_NULLABLE(listen->address, oldlisten->address)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen address setting on vnc graphics") : + _("cannot change listen address setting on spice graphics")); + goto cleanup; + } + break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: + if (STRNEQ_NULLABLE(listen->network, oldlisten->network)) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? + _("cannot change listen network setting on vnc graphics") : + _("cannot change listen network setting on spice graphics")); + goto cleanup; + } + break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("listen of type %d not handled yet"), + listen->type); + goto cleanup; + } + } switch (dev->type) { case VIR_DOMAIN_GRAPHICS_TYPE_VNC: @@ -1985,16 +2024,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on vnc graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr,newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on vnc graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork,newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on vnc graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.vnc.keymap, dev->data.vnc.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cannot change keymap setting on vnc graphics")); @@ -2040,16 +2069,6 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, _("cannot change port settings on spice graphics")); goto cleanup; } - if (STRNEQ_NULLABLE(oldListenAddr, newListenAddr)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen address setting on spice graphics")); - goto cleanup; - } - if (STRNEQ_NULLABLE(oldListenNetwork, newListenNetwork)) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("cannot change listen network setting on spice graphics")); - goto cleanup; - } if (STRNEQ_NULLABLE(olddev->data.spice.keymap, dev->data.spice.keymap)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.1.5

2 1

[libvirt] [PATCH for v1.0.5-maint 0/2] Resolve issues seen with schedinfo
by John Ferlan 21 Jun '13

21 Jun '13

This is a backport of: https://www.redhat.com/archives/libvir-list/2013-June/msg00453.html submitted upstread as commit id 'b2375453' and '38ada092' John Ferlan (2): qemu: Resolve issue with GetScheduler APIs for non running domain lxc: Resolve issue with GetScheduler APIs for non running domain src/lxc/lxc_driver.c | 11 ++++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) -- 1.8.1.4

2 4

[libvirt] [PATCH for v1.0.6-maint 0/2] Resolve issues seen with schedinfo
by John Ferlan 20 Jun '13

20 Jun '13

This is a backport of: https://www.redhat.com/archives/libvir-list/2013-June/msg00453.html submitted upstread as commit id 'b2375453' and '38ada092' John Ferlan (2): qemu: Resolve issue with GetScheduler APIs for non running domain lxc: Resolve issue with GetScheduler APIs for non running domain src/lxc/lxc_driver.c | 11 ++++++++++- src/qemu/qemu_driver.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) -- 1.8.1.4

2 4

[libvirt] [PATCH] spec: Enable KVM support on ARM
by Cole Robinson 20 Jun '13

20 Jun '13

F20/rawhide has will support this. From: Peter Robinson <pbrobinson(a)gmail.com> --- libvirt.spec.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8d43e6d..e357a3d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -54,7 +54,11 @@ %define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts %if 0%{?fedora} >= 18 - %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %if 0%{?fedora} >= 20 + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %{arm} + %else + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %endif %else %define qemu_kvm_arches %{ix86} x86_64 %endif -- 1.8.2.1

3 4

[libvirt] [PATCH 00/11] Support CHAP authentication for iscsi pool
by Osier Yang 20 Jun '13

20 Jun '13

The XMLs like (<auth type='chap' login='foo' passwd='kudo'/>) was introduced long ago, but it's never used for any pool backend. This implements the support first (See 6/11 for details), and based on it, using "secret" object for the authentication is added too. E.g. <auth type='chap' username='foo'> <secret uuid='48dcd4a4-b25f-4fc6-8874-84797c6e3678'/> </auth> Osier Yang (11): storage: Refactor the rng schema for storage pool auth storage: Support "username" for "chap" type "auth" storage: Add a struct for auth secret storage: Introduce XMLs to use secret object for pool auth storage: Output auth type before username storage: Support "chap" authentication for iscsi pool storage: Support to use secret object for iscsi chap "auth" storage: Update docs/formatsecret.html storage: Use the internal API to get the secret value instead storage: Improve the pool auth type parsing and formating Storage: Fix the indention of rbd test file docs/formatsecret.html.in | 10 +- docs/schemas/storagepool.rng | 51 +++--- src/conf/storage_conf.c | 179 ++++++++++++++------- src/conf/storage_conf.h | 28 +++- src/storage/storage_backend_iscsi.c | 114 ++++++++++++- src/storage/storage_backend_rbd.c | 13 +- .../storagepoolxml2xmlin/pool-iscsi-auth-login.xml | 17 ++ .../pool-iscsi-auth-secret.xml | 19 +++ .../pool-iscsi-auth-username.xml | 17 ++ tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 17 -- tests/storagepoolxml2xmlin/pool-rbd.xml | 2 +- .../pool-iscsi-auth-login.xml | 20 +++ .../pool-iscsi-auth-secret.xml | 22 +++ .../pool-iscsi-auth-username.xml | 20 +++ tests/storagepoolxml2xmlout/pool-iscsi-auth.xml | 20 --- .../pool-iscsi-vendor-product.xml | 2 +- tests/storagepoolxml2xmlout/pool-rbd.xml | 2 +- tests/storagepoolxml2xmltest.c | 3 +- 18 files changed, 424 insertions(+), 132 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth-login.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth-secret.xml create mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth-username.xml delete mode 100644 tests/storagepoolxml2xmlin/pool-iscsi-auth.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth-login.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth-secret.xml create mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth-username.xml delete mode 100644 tests/storagepoolxml2xmlout/pool-iscsi-auth.xml -- 1.8.1.4

2 30